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

[sylvain cresto]

Index: graveman/current/src/callbacks.c
diff -u graveman/current/src/callbacks.c:1.19 
graveman/current/src/callbacks.c:1.20
--- graveman/current/src/callbacks.c:1.19       Sat Feb 19 17:49:08 2005
+++ graveman/current/src/callbacks.c    Sun Feb 20 17:45:02 2005
@@ -62,7 +62,6 @@
   if (sc_str_has_casesuffix(Anom, WAV)) {
     Lstatus = getWavInfo(Anom, &Llennbr, NULL);
   }
-
   if (Lstatus == FALSE) {
     /* erreur format inconnue ou incorecte */
     gchar *Ltmp;
@@ -302,9 +301,9 @@
 void gtk_audio_removetrack(GtkWidget *Abtn, gpointer Adata)
 {
   Tgrave *Lg = (Tgrave *)Adata;
-  GtkTreeView *Lliste = GTK_TREE_VIEW(sc_grave_get_data(Lg, "LISTEAUDIO"));
+  GtkTreeView *Lliste = GTK_TREE_VIEW(sc_grave_get_widget(Lg, "LISTEAUDIO"));
   GtkTreeSelection *Lselection = 
gtk_tree_view_get_selection(GTK_TREE_VIEW(Lliste));
-  GtkProgressBar *Lcontenance = GTK_PROGRESS_BAR(sc_grave_get_data(Lg, 
"audiolenbar"));
+  GtkProgressBar *Lcontenance = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"audiolenbar"));
   guint32 *Laudiolen = (guint32 *)sc_grave_get_data(Lg, "audiolen");
   guint32 *Laudiomaxlen = (guint32 *)sc_grave_get_data(Lg, "audiomaxlen");
   GtkTreeIter Liter;
@@ -490,7 +489,7 @@
 }
 
 /* ajouter des repertoires a graver */
-void gtk_data_adddirectory(GtkWidget *btn, gpointer Adata)
+void gtk_data_adddirectory(GtkWidget *Abtn, gpointer Adata)
 {
   Tgrave *Lg = (Tgrave *)Adata;
   GtkWidget *Lwindow1 = GTK_WIDGET(sc_grave_get_widget(Lg, "topwindow"));
@@ -555,7 +554,7 @@
 
 
 /* ajouter des fichiers a graver */
-void gtk_data_addfile(GtkWidget *btn, gpointer Adata)
+void gtk_data_addfile(GtkWidget *Abtn, gpointer Adata)
 {
   Tgrave *Lg = (Tgrave *)Adata;
   GtkTreeView *Lliste = GTK_TREE_VIEW(sc_grave_get_data(Lg, "_current_list"));
@@ -618,7 +617,7 @@
 void gtk_devices_edit(GtkWidget *Abtn, gpointer Adata)
 {
   Tgrave *Lg = (Tgrave *) Adata;
-  GtkWidget *Lparent = GTK_WIDGET(sc_grave_get_widget(Lg, "window"));
+  GtkWidget *Lparent = GTK_WIDGET(sc_grave_get_data(Lg, "window"));
   GtkTreeView *Lliste = GTK_TREE_VIEW(sc_grave_get_widget(Lg, "periphdata"));
   GtkTreeSelection *Lselection = 
gtk_tree_view_get_selection(GTK_TREE_VIEW(Lliste));
   GtkTreeIter Liter;
@@ -634,7 +633,7 @@
     gtk_tree_model_get(Ltreemodel, &Liter, 0, &Lnum, -1);
     Ldrive = (Tdriveinfo *)g_slist_nth_data(Glistdrives, Lnum);
     Ldialoghash = create_dialog_edit_device(Lparent, Ldrive);
-    Lwineditdevice = sc_grave_get_widget(Ldialoghash, "window");
+    Lwineditdevice = sc_grave_get_data(Ldialoghash, "window");
 
     if (gtk_dialog_run(GTK_DIALOG(Lwineditdevice)) != GTK_RESPONSE_CANCEL) {
       GtkEntry *Ldevicename = GTK_ENTRY(sc_grave_get_widget(Ldialoghash, 
"devicename"));
@@ -697,7 +696,7 @@
   GtkWidget *Lparent = GTK_WIDGET(sc_grave_get_widget(Lg, "window"));
   GtkTreeView *Lliste = GTK_TREE_VIEW(sc_grave_get_widget(Lg, "periphdata"));
   Tgrave *Ldialoghash = create_dialog_add_device(Lparent);
-  GtkWidget *Lwinadddevice = sc_grave_get_widget(Ldialoghash, "window");
+  GtkWidget *Lwinadddevice = sc_grave_get_data(Ldialoghash, "window");
   GtkWidget *Lmessage;
 
   while (1) {
@@ -873,7 +872,7 @@
     gint *Lpid = (gint *)sc_grave_get_data(Lg, "pid");
     if (*Lpid) {
       /* on envoi un TERM au process (cdrecord...) pour qu'il s'arrete ! */
-_DEB("kill de %d\n", *Lpid);      
+_DEB("kill de %d\n", *Lpid);
       kill(*Lpid, SIGINT);
     }
     *Labort = TRUE;
@@ -971,7 +970,7 @@
   GtkWidget *Lwindow1 = GTK_WIDGET(sc_grave_get_widget(Lg, "topwindow"));
   Tgrave *Ldialoghash = create_dialog_confirm_operation(Lwindow1, _("Do you 
really want to erase the CD-RW ?"),
         _("_Fast blank disk when erasing CD-RW"), 
conf_get_boolean("fastblank"));
-  GtkWidget *Lconfirm = sc_grave_get_widget(Ldialoghash, "window");
+  GtkWidget *Lconfirm = sc_grave_get_data(Ldialoghash, "window");
 
   /* confirmation debut de l'operation */ 
   if (gtk_dialog_run(GTK_DIALOG(Lconfirm)) == GTK_RESPONSE_YES) {
@@ -1075,7 +1074,7 @@
     /* confirmation gravure dvd */
     Ldialoghash = create_dialog_select_dvdoperation(Lwindow1);
   }
-  Lconfirm = sc_grave_get_widget(Ldialoghash, "window");
+  Lconfirm = sc_grave_get_data(Ldialoghash, "window");
 
   Lrep = gtk_dialog_run(GTK_DIALOG(Lconfirm));
 
@@ -1273,10 +1272,9 @@
   GtkTreeModel *Ltreemodel;
   GtkTreeIter Liter;
   gchar *Lnom;
-  
-  if (Apagenum != 0 && Apagenum != 2) return;
 
-  if (!strcmp(glade_get_widget_name(GTK_WIDGET(Anotebook)), "bodydata")) {
+  if (Apagenum != 0 && Apagenum != 2) return;
+  if (!strcmp(glade_get_widget_name(GTK_WIDGET(Anotebook)), "bodycddata")) {
     Ldatavoli = sc_grave_get_widget(Lg, "datavoli");
     Ltreemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(sc_grave_get_widget(Lg, 
"LISTEDATA")));
   } else {
@@ -1288,17 +1286,15 @@
   
   /* il devrait normalement toujours y avoir une entree dans la liste, au 
moins le nom du cd ! */
   if (!gtk_tree_model_get_iter_first(Ltreemodel, &Liter)) return;
-
-  gtk_tree_model_get(Ltreemodel, &Liter, 2, &Lnom, -1);
   if (Apagenum == 2) {
     /* mise a jour du champ "Nom du volume" */
+    gtk_tree_model_get(Ltreemodel, &Liter, 2, &Lnom, -1);
     gtk_entry_set_text(GTK_ENTRY(Ldatavoli), Lnom);
+    g_free(Lnom);
   } else if (Apagenum == 0) {
     /* mise a jour de l'entre contenant le nom du volume */
     gtk_tree_store_set(GTK_TREE_STORE(Ltreemodel), &Liter, 2, 
gtk_entry_get_text(GTK_ENTRY(Ldatavoli)), -1);
   }
-
-  g_free(Lnom);
 }
 
 /* activer la boite de dialogue proprietes */
@@ -1307,7 +1303,7 @@
   Tgrave *Lg = (Tgrave *) Adata;
   GtkWidget *Lparent = GTK_WIDGET(sc_grave_get_widget(Lg, "topwindow"));
   Tgrave *Ldialoghash = create_dialog_proprietes(Lparent);
-  GtkWidget *Lwinproprietes = sc_grave_get_widget(Ldialoghash, "window");
+  GtkWidget *Lwinproprietes = sc_grave_get_data(Ldialoghash, "window");
   GError *Aerror = NULL;
   GtkWidget *Lptr;
   TProgRequis *Lcurentry;
@@ -1366,11 +1362,10 @@
 gboolean encours_callback(gpointer Adata)
 {
   Tgrave *Lg = (Tgrave *)Adata;
-  GtkProgressBar *Lprog = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"progress"));
+  GtkProgressBar *Lprog = GTK_PROGRESS_BAR(sc_grave_get_data(Lg, "progress"));
   gint *Lcont = (gint *)sc_grave_get_data(Lg, "cont");
 
-  gtk_progress_bar_pulse(
-      Lprog);
+  gtk_progress_bar_pulse(Lprog);
 
   if ((*Lcont) == 1) (*Lcont) = 0;