X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvar-type-dialog.c;h=db2e85b5f792bc5b4c5ee96daed8891ae8b0de19;hb=dc44e4b118592d1719d9b9ae23ce64a2861fb198;hp=bee65de8edc44e7febee965eeb030562f6f30c71;hpb=a9acce47d67e0ab35ce1690e4f1b1ac0121c2d78;p=pspp-builds.git

diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c
index bee65de8..db2e85b5 100644
--- a/src/ui/gui/var-type-dialog.c
+++ b/src/ui/gui/var-type-dialog.c
@@ -332,6 +332,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 +445,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);
 
 
@@ -467,7 +468,7 @@ var_type_dialog_create (GladeXML *xml)
 
   for ( i = 0 ; i < sizeof (dollar_format)/sizeof (dollar_format[0]) ; ++i )
     {
-      char *template = fmt_dollar_template (&dollar_format[i]);
+      char *template = settings_dollar_template (&dollar_format[i]);
       gtk_list_store_append (list_store, &iter);
       gtk_list_store_set (list_store, &iter,
                           0, template,
@@ -481,11 +482,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 +526,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);