[Gnucash-changes] Finish g1->g2 conversion in this file.

David Hampton hampton at cvs.gnucash.org
Fri Jul 1 23:15:51 EDT 2005


Log Message:
-----------
Finish g1->g2 conversion in this file.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/gnome-utils:
        dialog-query-list.c

Revision Data
-------------
Index: dialog-query-list.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/dialog-query-list.c,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -Lsrc/gnome-utils/dialog-query-list.c -Lsrc/gnome-utils/dialog-query-list.c -u -r1.3.2.3 -r1.3.2.4
--- src/gnome-utils/dialog-query-list.c
+++ src/gnome-utils/dialog-query-list.c
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #include "gnc-book.h"
 #include "QueryNew.h"
@@ -99,7 +99,7 @@
   if (!current)
     return;
 
-  cb = gtk_object_get_data (GTK_OBJECT (button), "data");
+  cb = g_object_get_data (G_OBJECT (button), "data");
   g_return_if_fail (cb);
 
   gnc_dialog_query_run_callback (cb, current, dql);
@@ -126,7 +126,7 @@
   DialogQueryList * dql = data;
 
   g_return_if_fail (dql);
-  gnome_dialog_close (GNOME_DIALOG (dql->dialog));
+  gtk_widget_destroy (dql->dialog);
 }
 
 static void
@@ -151,7 +151,7 @@
 }
 
 static int
-gnc_dialog_query_list_close_cb (GnomeDialog *dialog, DialogQueryList *dql)
+gnc_dialog_query_list_close_cb (GtkDialog *dialog, DialogQueryList *dql)
 {
   g_return_val_if_fail (dql, TRUE);
 
@@ -190,7 +190,7 @@
 
   /* Grab the dialog, save the dialog info */
   dql->dialog = glade_xml_get_widget (xml, "Query List Dialog");
-  gtk_object_set_data (GTK_OBJECT (dql->dialog), "dialog-info", dql);
+  g_object_set_data (G_OBJECT (dql->dialog), "dialog-info", dql);
 
   /* grab the widgets */
   dql->label = glade_xml_get_widget (xml, "dialog_label");
@@ -203,17 +203,17 @@
   gtk_container_add (GTK_CONTAINER (scroller), dql->qlist);
 
   /* connect the double-click signal of the qlist */
-  gtk_signal_connect (GTK_OBJECT (dql->qlist), "double_click_entry",
-		      GTK_SIGNAL_FUNC(gnc_dialog_query_list_double_click_entry), dql);
+  g_signal_connect (G_OBJECT (dql->qlist), "double_click_entry",
+		    G_CALLBACK(gnc_dialog_query_list_double_click_entry), dql);
   
 
   /* connect to the close button */
-  gtk_signal_connect (GTK_OBJECT (close), "clicked",
-		      GTK_SIGNAL_FUNC (gnc_dialog_query_list_close), dql);
+  g_signal_connect (G_OBJECT (close), "clicked",
+		    G_CALLBACK (gnc_dialog_query_list_close), dql);
 
   /* connect to the cleanup */
-  gtk_signal_connect (GTK_OBJECT (dql->dialog), "close",
-		      GTK_SIGNAL_FUNC (gnc_dialog_query_list_close_cb), dql);
+  g_signal_connect (G_OBJECT (dql->dialog), "close",
+		    G_CALLBACK (gnc_dialog_query_list_close_cb), dql);
 
 
   /* register ourselves */
@@ -261,9 +261,9 @@
   /* build up the buttons */
   for (i = 0; buttons[i].label; i++) {
     button = gtk_button_new_with_label (buttons[i].label);
-    gtk_object_set_data (GTK_OBJECT (button), "data", &(dql->buttons[i]));
-    gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			GTK_SIGNAL_FUNC(gnc_dialog_query_list_button_clicked), dql);
+    g_object_set_data (G_OBJECT (button), "data", &(dql->buttons[i]));
+    g_signal_connect (G_OBJECT (button), "clicked",
+		      G_CALLBACK(gnc_dialog_query_list_button_clicked), dql);
     gtk_box_pack_start (GTK_BOX (dql->button_box), button, FALSE, FALSE, 3);
   }
 }


More information about the gnucash-changes mailing list