[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.24 
graveman/current/src/callbacks.c:1.25
--- graveman/current/src/callbacks.c:1.24       Sat Feb 26 16:15:40 2005
+++ graveman/current/src/callbacks.c    Sun Feb 27 03:34:11 2005
@@ -694,7 +694,7 @@
 void gtk_devices_add(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"));
   Tgrave *Ldialoghash = create_dialog_add_device(Lparent);
   GtkWidget *Lwinadddevice = sc_grave_get_data(Ldialoghash, "window");
@@ -745,50 +745,6 @@
   sc_grave_destroy(Ldialoghash);
 }
 
-/* ajouter manuelement une definition de charset */
-void gtk_charset_add(GtkWidget *Abtn, gpointer Adata)
-{
-
-}
-
-void gtk_charset_edit(GtkWidget *Abtn, gpointer Adata)
-{
-
-}
-
-/* l'utilisateur a cliquer sur supprimer un charset */
-void gtk_charset_remove(GtkWidget *Abtn, gpointer Adata)
-{
-  Tgrave *Lg = (Tgrave *)Adata;
-  GtkWidget *Lwindow1 = GTK_WIDGET(sc_grave_get_widget(Lg, "topwindow"));
-  GtkWidget *Lconfirm;
-  gint Lrep;
-  
-  /* confirmation debut de l'operation */ 
-  Lconfirm = gtk_message_dialog_new(GTK_WINDOW(Lwindow1),
-                      GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION,
-                      GTK_BUTTONS_YES_NO,
-                      _("Do you really want to remove this character sets ?"));
-  Lrep = gtk_dialog_run(GTK_DIALOG(Lconfirm));
-  gtk_widget_destroy(Lconfirm);
-
-  if (Lrep == GTK_RESPONSE_YES) {
-    /* oui on supprime un device */
-    GtkTreeView *Lliste = GTK_TREE_VIEW(sc_grave_get_widget(Lg, 
"charsetdata"));
-    GtkTreeSelection *Lselection = 
gtk_tree_view_get_selection(GTK_TREE_VIEW(Lliste));
-    GtkTreeIter Liter;
-    GtkTreeModel *Ltreemodel;
-    gint Lnum;
-
-    if (gtk_tree_selection_get_selected(Lselection, &Ltreemodel, &Liter)) {
-      gtk_tree_model_get(Ltreemodel, &Liter, 0, &Lnum, -1);
-
-      _DEB("ON SUPRIMME LE CHARSET = %d\n", Lnum);
-      Glistdrives = g_slist_remove(Gcharsetlist, 
g_slist_nth_data(Gcharsetlist, Lnum));
-      gtk_list_store_remove(GTK_LIST_STORE(Ltreemodel), &Liter);
-    } 
-  }
-}
   
 /* selection d'une image iso */
 void gtk_file_sel(GtkWidget *Abtn, gpointer Adata)
@@ -1443,7 +1399,7 @@
 {
   Tgrave *Lg = (Tgrave *)Adata;
   GtkWidget *Lstatusbox;
-  GtkWidget *Lwindow1 = sc_grave_get_widget(Lg, "window");
+  GtkWidget *Lwindow1 = sc_grave_get_data(Lg, "window");
 
   /* mise a jour de la configuration */
   manage_config(Lg, SEARCH_PROG, NULL);
@@ -1458,28 +1414,12 @@
   gtk_widget_destroy(Lstatusbox);
 }
 
-void cherchecharset(GtkWidget *Aobj, gpointer Adata)
-{
-  Tgrave *Lg = (Tgrave *)Adata;
-  GtkWidget *Lwindow1 = sc_grave_get_widget(Lg, "window");
-  GtkWidget *Lstatusbox;
-
-  if (get_builtin_charset(Lg, NULL) == TRUE) {
-    remplirelistecharset(GTK_TREE_VIEW(sc_grave_get_widget(Lg, 
"charsetdata")));
-    
-    /* boite de dialoge operation terminee */
-    Lstatusbox = gtk_message_dialog_new(GTK_WINDOW(Lwindow1), 
GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
-        _("configuration updated."));
-    gtk_dialog_run(GTK_DIALOG(Lstatusbox));
-    gtk_widget_destroy(Lstatusbox);
-  }
-}
 
 /* chercher (a nouveau) les lecteurs */
 void cherchelecteur(GtkWidget *Aobj, gpointer Adata)
 {
   Tgrave *Lparenthash = (Tgrave *)Adata;
-  GtkWidget *Lwindow1 = sc_grave_get_widget(Lparenthash, "window");
+  GtkWidget *Lwindow1 = sc_grave_get_data(Lparenthash, "window");
   Tgrave *Lg = create_window_encours(Lwindow1);
   GtkWidget *Lstatusbox;
   GtkWidget *Lwin;
@@ -1495,7 +1435,7 @@
 
   sc_grave_set_data(Lg, &Lcont, "cont");
   sc_grave_set_data(Lg, &Labort, "gabort");
-  sc_grave_set_data(Lg, sc_grave_get_widget(Lg, "progress"), "progress");
+  sc_grave_ref_wtd(Lg, "progress", "progress");
 
   /* bouton annuler */
   g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "cancelbtn")), "clicked", 
G_CALLBACK(abort_encours), (GtkWidget *)Lg);