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

[sylvain cresto]

Index: graveman/current/src/data.c
diff -u graveman/current/src/data.c:1.5 graveman/current/src/data.c:1.6
--- graveman/current/src/data.c:1.5     Sat Feb 12 16:41:07 2005
+++ graveman/current/src/data.c Sat Feb 19 17:49:08 2005
@@ -28,11 +28,11 @@
 gboolean foreachfiles(GtkTreeModel *Amodel, GtkTreePath *Apath, GtkTreeIter 
*Aiter, gpointer Adata)
 {
   gint Ltype, Lparenttype;
-  GHashTable *Lhash = (GHashTable *)Adata;
+  Tgrave *Lg = (Tgrave *)Adata;
   gchar *Lonlyname = NULL, *Lnom = NULL, *Lnomutf8 = NULL;
   gchar *Lonlynameparent = NULL;
-  gchar **Ltmpdir = (gchar **) g_hash_table_lookup(Lhash, "tmpdir");  
-  GError **Lerror = (GError **) g_hash_table_lookup(Lhash, "gerror");
+  gchar **Ltmpdir = (gchar **) sc_grave_get_data(Lg, "tmpdir");  
+  GError **Lerror = (GError **) sc_grave_get_data(Lg, "gerror");
   gchar Lnewname[10000];
   gchar Lparents[10000], Ltmp[10000];
   GtkTreeIter LparentIter;
@@ -97,11 +97,11 @@
 
 /* preparation pour la gravure, creation du repertorie
  * temporraire et des liens qui vont servir a creer l'image a graver */
-gboolean preparedata(GHashTable *Ahash, GError **Aerror)
+gboolean preparedata(Tgrave *Ag, GError **Aerror)
 {
-  gchar **Ltmpdir = (gchar **)g_hash_table_lookup(Ahash, "tmpdir");
-  GtkLabel *Ltitle = GTK_LABEL(g_hash_table_lookup(Ahash, "gravetitle"));
-  GtkTreeModel *LTreeModel = 
gtk_tree_view_get_model(GTK_TREE_VIEW(g_hash_table_lookup(Ahash, 
"_current_list")));
+  gchar **Ltmpdir = (gchar **)sc_grave_get_data(Ag, "tmpdir");
+  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
+  GtkTreeModel *LTreeModel = 
gtk_tree_view_get_model(GTK_TREE_VIEW(sc_grave_get_data(Ag, "_current_list")));
   gchar *Lnamedir;
   gboolean Lstatus = TRUE;
   
@@ -119,7 +119,7 @@
     *Ltmpdir = Lnamedir;
     
     /* conversion de chaques fichiers */
-    gtk_tree_model_foreach(LTreeModel, foreachfiles, Ahash);
+    gtk_tree_model_foreach(LTreeModel, foreachfiles, Ag);
     
     /* si Aerror n'est plus NULL c'est qu'il y a eu une erreur ! */
     if ((GError *)*Aerror) Lstatus = FALSE;