X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-count.c;h=b1ee11dc1579b504a0c5c8fe1d52cbf58c14820d;hb=b2a81a17bff538c290feb22fabd03c3fafe8d5dc;hp=a439e1a764e6aa729ffda067cc683b3be24d0883;hpb=e2da62d735c597afeef2e0e9b36e5a4a83d7da94;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-count.c b/src/ui/gui/psppire-dialog-action-count.c
index a439e1a764..b1ee11dc15 100644
--- a/src/ui/gui/psppire-dialog-action-count.c
+++ b/src/ui/gui/psppire-dialog-action-count.c
@@ -43,7 +43,7 @@ G_DEFINE_TYPE (PsppireDialogActionCount, psppire_dialog_action_count, PSPPIRE_TY
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionCount *cnt = PSPPIRE_DIALOG_ACTION_COUNT (act);
   gchar *text = NULL;
@@ -51,7 +51,7 @@ generate_syntax (PsppireDialogAction *act)
   gboolean ok;
   GtkTreeIter iter;
   struct string dds;
-  
+
   ds_init_empty (&dds);
 
   ds_put_cstr (&dds, "\nCOUNT ");
@@ -117,7 +117,7 @@ dialog_state_valid (gpointer data)
   if (! cnt->value_list)
     return FALSE;
 
-  if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (cnt->value_list),	&iter) )
+  if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (cnt->value_list),	&iter))
     return FALSE;
 
   if (!gtk_tree_model_get_iter_first (gtk_tree_view_get_model (GTK_TREE_VIEW (cnt->variable_treeview)), &iter))
@@ -144,13 +144,14 @@ refresh (PsppireDialogAction *rd_)
   gtk_list_store_clear (GTK_LIST_STORE (cnt->value_list));
 }
 
-static void
-psppire_dialog_action_count_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_count_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionCount *act = PSPPIRE_DIALOG_ACTION_COUNT (a);
 
   GtkBuilder *xml = builder_new ("count.ui");
+
   GtkWidget *selector = get_widget_assert (xml, "count-selector1");
   GtkWidget *button = get_widget_assert (xml, "button1");
 
@@ -168,22 +169,16 @@ psppire_dialog_action_count_activate (GtkAction *a)
 
   g_signal_connect_swapped (button, "clicked", G_CALLBACK (values_dialog), act);
 
-
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
 
-  g_object_unref (xml);
-
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_count_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_count_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_count_class_init (PsppireDialogActionCountClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_count_activate;
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_count_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }
 
@@ -212,7 +207,7 @@ on_acr_selection_change (GtkTreeSelection *selection, gpointer data)
   PsppireDialogActionCount *cnt = PSPPIRE_DIALOG_ACTION_COUNT (data);
   GValue ov_value = {0};
 
-  if ( ! gtk_tree_selection_get_selected (selection, &model, &iter) )
+  if (! gtk_tree_selection_get_selected (selection, &model, &iter))
     return;
 
   gtk_tree_model_get_value (GTK_TREE_MODEL (model), &iter,
@@ -230,7 +225,7 @@ set_value (gint col, GValue  *val, gpointer data)
   PsppireDialogActionCount *cnt = PSPPIRE_DIALOG_ACTION_COUNT (data);
   PsppireValChooser *vc = PSPPIRE_VAL_CHOOSER (cnt->chooser);
   struct old_value ov;
-	
+
   g_assert (col == 0);
 
   psppire_val_chooser_get_status (vc, &ov);
@@ -268,7 +263,7 @@ values_dialog (PsppireDialogActionCount *cd)
 
   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
 
-  if ( response == PSPPIRE_RESPONSE_CONTINUE )
+  if (response == PSPPIRE_RESPONSE_CONTINUE)
     {
       g_object_unref (cd->value_list);
       cd->value_list = local_store;