X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvar-type-dialog.c;h=44afc84e816dd47d18f8264e76a9cf9d1d5a462d;hb=1f9780e0184a3115d87783fdcfa39f89877a775e;hp=8aad3ada888ab522b0eb1fa157e6c9a3b3e36b91;hpb=9b94efd7513afdb12a6023024e00e50801532fee;p=pspp-builds.git

diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c
index 8aad3ada..44afc84e 100644
--- a/src/ui/gui/var-type-dialog.c
+++ b/src/ui/gui/var-type-dialog.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -324,7 +323,7 @@ set_format_type_from_treeview (GtkTreeView *treeview, gpointer data)
 
 /* Create the structure from the XML definitions */
 struct var_type_dialog *
-var_type_dialog_create (GladeXML *xml)
+var_type_dialog_create (GtkBuilder *xml)
 {
   gint i;
   struct var_type_dialog *dialog = g_malloc (sizeof (struct var_type_dialog));
@@ -332,6 +331,7 @@ var_type_dialog_create (GladeXML *xml)
   g_assert (xml);
 
   dialog->window = get_widget_assert (xml,"var_type_dialog");
+  dialog->active_button = -1;
 
 
   g_signal_connect (dialog->window, "delete-event",
@@ -444,7 +444,7 @@ var_type_dialog_create (GladeXML *xml)
 
   g_object_unref (list_store);
 
-  g_signal_connect (GTK_OBJECT (dialog->date_format_treeview), "cursor-changed",
+  g_signal_connect (dialog->date_format_treeview, "cursor-changed",
 		   GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
 
 
@@ -481,11 +481,11 @@ var_type_dialog_create (GladeXML *xml)
 
   g_object_unref (list_store);
 
-  g_signal_connect (GTK_OBJECT (dialog->dollar_treeview),
+  g_signal_connect (dialog->dollar_treeview,
 		   "cursor-changed",
 		   GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
 
-  g_signal_connect_swapped (GTK_OBJECT (dialog->dollar_treeview),
+  g_signal_connect_swapped (dialog->dollar_treeview,
 		   "cursor-changed",
 		   GTK_SIGNAL_FUNC (update_width_decimals), dialog);
 
@@ -525,22 +525,22 @@ var_type_dialog_create (GladeXML *xml)
   g_object_unref (list_store);
 
 
-  g_signal_connect (GTK_OBJECT (dialog->custom_treeview),
+  g_signal_connect (dialog->custom_treeview,
 		   "cursor-changed",
 		   GTK_SIGNAL_FUNC (set_format_type_from_treeview), dialog);
 
 
-  g_signal_connect (GTK_OBJECT (dialog->custom_treeview),
+  g_signal_connect (dialog->custom_treeview,
 		   "cursor-changed",
 		   GTK_SIGNAL_FUNC (preview_custom), dialog);
 
 
-  g_signal_connect (GTK_OBJECT (dialog->entry_width),
+  g_signal_connect (dialog->entry_width,
 		   "changed",
 		   GTK_SIGNAL_FUNC (preview_custom), dialog);
 
 
-  g_signal_connect (GTK_OBJECT (dialog->entry_decimals),
+  g_signal_connect (dialog->entry_decimals,
 		   "changed",
 		   GTK_SIGNAL_FUNC (preview_custom), dialog);