[Graveman-cvs] Changes to graveman/current/src/support.c

[sylvain cresto]

Index: graveman/current/src/support.c
diff -u graveman/current/src/support.c:1.5 graveman/current/src/support.c:1.6
--- graveman/current/src/support.c:1.5  Thu Feb 17 01:22:53 2005
+++ graveman/current/src/support.c      Sat Feb 19 17:49:08 2005
@@ -175,6 +175,15 @@
 }
 
 /* traitement Twidget */
+Tgrave *sc_grave_newempty()
+{
+  Tgrave *Agrave = g_malloc0(sizeof(Tgrave));
+
+  Agrave->data = g_hash_table_new(g_str_hash, g_str_equal);
+  
+  return Agrave;
+}
+
 Tgrave *sc_grave_load(gchar *Aname)
 {
   Tgrave *Agrave = g_malloc0(sizeof(Tgrave));
@@ -221,7 +230,7 @@
   GtkWidget *Lptr;
 
   va_start(Largs, Aformat);
-  Lfname = g_strdup_printf(Lfname, Largs);
+  Lfname = g_strdup_vprintf(Aformat, Largs);
   va_end(Largs);
   Lptr = sc_grave_get_widget(Agrave, Lfname); 
   g_free(Lfname);
@@ -243,7 +252,7 @@
   gpointer Lptr;
 
   va_start(Largs, Aformat);
-  Lfname = g_strdup_printf(Lfname, Largs);
+  Lfname = g_strdup_vprintf(Aformat, Largs);
   va_end(Largs);
   Lptr = sc_grave_get_data(Agrave, Lfname); 
   g_free(Lfname);
@@ -266,7 +275,7 @@
   gchar *Lfname;
 
   va_start(Largs, Aformat);
-  Lfname = g_strdup_printf(Lfname, Largs);
+  Lfname = g_strdup_vprintf(Aformat, Largs);
   va_end(Largs);
   sc_grave_set_data(Agrave, Aptr, Lfname); 
   g_free(Lfname);
@@ -289,7 +298,7 @@
   gchar *Lfname;
 
   va_start(Largs, Aformat);
-  Lfname = g_strdup_printf(Lfname, Largs);
+  Lfname = g_strdup_vprintf(Aformat, Largs);
   va_end(Largs);
   sc_grave_replace_data(Agrave, Aptr, Lfname); 
   g_free(Lfname);
@@ -303,7 +312,7 @@
 
   g_hash_table_remove(Agrave->data, Aname);
 
-  return Aptr;
+  return NULL;
 }
 
 gpointer sc_grave_del_datav(Tgrave *Agrave, gchar *Aformat, ...)
@@ -312,22 +321,24 @@
   gchar *Lfname;
 
   va_start(Largs, Aformat);
-  Lfname = g_strdup_printf(Lfname, Largs);
+  Lfname = g_strdup_vprintf(Aformat, Largs);
   va_end(Largs);
   sc_grave_del_data(Agrave, Lfname); 
   g_free(Lfname);
 
-  return Aptr;
+  return NULL;
 }
 
 gpointer sc_grave_ref_wtd(Tgrave *Agrave, gchar *Awidgetsrc, gchar *Adatadst)
 {
   GtkWidget *Awidg;
-  g_return_val_if_fail(Agrave && Agrave->data && Agrave->xml);
+  g_return_val_if_fail(Agrave && Agrave->data && Agrave->xml, NULL);
 
   if (!(Awidg = glade_xml_get_widget(Agrave->xml, Awidgetsrc))) return NULL;
 
   g_hash_table_insert(Agrave->data, Adatadst, Awidg);
+
+  return Awidg;
 }
 
 /*