src/ui/gui/psppire-dialog-action-runs.c (generate_syntax): Rename 'text' to 'str'

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

diff --git a/src/ui/gui/psppire-dialog-action-runs.c b/src/ui/gui/psppire-dialog-action-runs.c
index 8649fbbe6dd3c070aeefa3d2702daac8094a17a3..3a073e227b05bd215f723aeb834c5e3fe322b8e0 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-runs.c
+++ b/src/ui/gui/psppire-dialog-action-runs.c
@@ -43,31 +43,31 @@ append_fragment (GString *string, const gchar *cut, PsppireVarView *vv)
 {
   g_string_append (string, "\n\t/RUNS");
 
-  g_string_append (string, " ( ");
+  g_string_append (string, " (");
   g_string_append (string, cut);
-  g_string_append (string, " ) = ");
+  g_string_append (string, ") = ");
 
   psppire_var_view_append_names (vv, 0, string);
 }
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionRuns *rd = PSPPIRE_DIALOG_ACTION_RUNS (act);
-  gchar *text;
+  gchar *str;
 
   GString *string = g_string_new ("NPAR TEST");
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEAN])))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEAN])))
     append_fragment (string, "MEAN", PSPPIRE_VAR_VIEW (rd->variables));
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEDIAN])))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEDIAN])))
     append_fragment (string, "MEDIAN", PSPPIRE_VAR_VIEW (rd->variables));
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MODE])))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MODE])))
     append_fragment (string, "MODE", PSPPIRE_VAR_VIEW (rd->variables));
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_CUSTOM])))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_CUSTOM])))
     {
       const char *text = gtk_entry_get_text (GTK_ENTRY (rd->entry));
       append_fragment (string, text, PSPPIRE_VAR_VIEW (rd->variables));
@@ -75,11 +75,11 @@ generate_syntax (PsppireDialogAction *act)
 
   g_string_append (string, ".\n");
 
-  text = string->str;
+  str = string->str;
 
   g_string_free (string, FALSE);
 
-  return text;
+  return str;
 }
 
 
@@ -96,10 +96,10 @@ dialog_state_valid (gpointer data)
 
   for (i = 0; i < 4; ++i)
     {
-      if ( TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->cb[i])))
+      if (TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->cb[i])))
        break;
     }
-  if ( i >= 4)
+  if (i >= 4)
     return FALSE;
 
 
@@ -127,13 +127,14 @@ refresh (PsppireDialogAction *rd_)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->cb[i]), FALSE);
 }
 
-static void
-psppire_dialog_action_runs_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_runs_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionRuns *act = PSPPIRE_DIALOG_ACTION_RUNS (a);
 
   GtkBuilder *xml = builder_new ("runs.ui");
+
   pda->dialog = get_widget_assert   (xml, "runs-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
 
@@ -144,20 +145,15 @@ psppire_dialog_action_runs_activate (GtkAction *a)
   act->cb[CB_CUSTOM] = get_widget_assert (xml, "checkbutton3");
   act->variables = get_widget_assert   (xml, "psppire-var-view1");
 
-
   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_runs_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_runs_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_runs_class_init (PsppireDialogActionRunsClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_runs_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_runs_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }