Unify categories as the "explicit" categories.

[pspp] / src / ui / gui / psppire-dialog-action-barchart.c

diff --git a/src/ui/gui/psppire-dialog-action-barchart.c b/src/ui/gui/psppire-dialog-action-barchart.c
index 87b8fa1318036904d3afd0853a00dfffb8445aad..8858e8b4368bc921fbf932fb32b18722692c094b 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-barchart.c
+++ b/src/ui/gui/psppire-dialog-action-barchart.c
@@ -42,7 +42,7 @@ dialog_state_valid (gpointer rd_)
 {
   PsppireDialogActionBarchart *rd = PSPPIRE_DIALOG_ACTION_BARCHART (rd_);
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->button_summary_func)) )
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->button_summary_func)))
     {
       if (0 == g_strcmp0 ("", gtk_entry_get_text (GTK_ENTRY (rd->var))))
        return FALSE;
@@ -67,7 +67,7 @@ refresh (PsppireDialogAction *rd_)
      This ensures that the signal handler gets called.   */
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->button_summary_func), TRUE);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->button_freq_func[0]), TRUE);
-                               
+
   gtk_widget_set_sensitive (rd->combobox, FALSE);
 
   gtk_combo_box_set_active (GTK_COMBO_BOX (rd->combobox), 0);
@@ -114,13 +114,14 @@ populate_combo_model (GtkComboBox *cb)
 }
 
 
-static void
-psppire_dialog_action_barchart_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_barchart_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogActionBarchart *act = PSPPIRE_DIALOG_ACTION_BARCHART (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
 
   GtkBuilder *xml = builder_new ("barchart.ui");
+
   pda->dialog = get_widget_assert (xml, "barchart-dialog");
   pda->source = get_widget_assert (xml, "dict-view");
 
@@ -131,14 +132,12 @@ psppire_dialog_action_barchart_activate (GtkAction *a)
   act->button_freq_func[1] = get_widget_assert (xml, "radiobutton-percent");
   act->button_freq_func[2] = get_widget_assert (xml, "radiobutton-cum-count");
   act->button_freq_func[3] = get_widget_assert (xml, "radiobutton-cum-percent");
-  
+
   act->button_summary_func = get_widget_assert (xml, "radiobutton3");
   act->summary_variables = get_widget_assert (xml, "hbox1");
   act->combobox = get_widget_assert (xml, "combobox1");
 
   populate_combo_model (GTK_COMBO_BOX(act->combobox));
-  
-  g_object_unref (xml);
 
   g_signal_connect_swapped (act->button_summary_func, "toggled",
                            G_CALLBACK (on_summary_toggle), act);
@@ -146,14 +145,13 @@ psppire_dialog_action_barchart_activate (GtkAction *a)
   psppire_dialog_action_set_refresh (pda, refresh);
 
   psppire_dialog_action_set_valid_predicate (pda,
-                                       dialog_state_valid);
+                                            dialog_state_valid);
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_barchart_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_barchart_parent_class)->activate (pda);
+  return xml;
 }
 
 static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
 {
   PsppireDialogActionBarchart *rd = PSPPIRE_DIALOG_ACTION_BARCHART (a);
   gchar *text;
@@ -213,7 +211,7 @@ generate_syntax (PsppireDialogAction *a)
     g_string_append (string, " BY ");
     g_string_append (string, var_name_cluster);
   }
-  
+
   g_string_append (string, ".\n");
 
   text = string->str;
@@ -226,7 +224,7 @@ generate_syntax (PsppireDialogAction *a)
 static void
 psppire_dialog_action_barchart_class_init (PsppireDialogActionBarchartClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_barchart_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_barchart_activate;
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }