X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-k-related.c;h=a9ef4cbfb27746b635cc63049a46b09b17582dee;hb=033449d465fb54526d3984d55772e6a38e7d922c;hp=9f1b588c5fa24dfbea60ada0cca17185f1d26ba2;hpb=69f29abce63bbc3c02da10bc2d6ecf5c061a8238;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-k-related.c b/src/ui/gui/psppire-dialog-action-k-related.c
index 9f1b588c5f..a9ef4cbfb2 100644
--- a/src/ui/gui/psppire-dialog-action-k-related.c
+++ b/src/ui/gui/psppire-dialog-action-k-related.c
@@ -30,26 +30,26 @@ static void psppire_dialog_action_k_related_class_init      (PsppireDialogAction
 G_DEFINE_TYPE (PsppireDialogActionKRelated, psppire_dialog_action_k_related, PSPPIRE_TYPE_DIALOG_ACTION);
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionKRelated *krd = PSPPIRE_DIALOG_ACTION_K_RELATED (act);
   gchar *text;
 
   GString *string = g_string_new ("NPAR TEST");
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman)))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman)))
     {
       g_string_append (string, "\n\t/FRIEDMAN = ");
       psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string);
     }
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal)))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal)))
     {
       g_string_append (string, "\n\t/KENDALL = ");
       psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string);
     }
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran)))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran)))
     {
       g_string_append (string, "\n\t/COCHRAN = ");
       psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string);
@@ -78,13 +78,13 @@ dialog_state_valid (gpointer data)
     return FALSE;
 
   /* At least one checkbutton must be active */
-  if ( 
+  if (
       ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman))
-      && 
+      &&
       ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal))
-      && 
+      &&
       ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran))
-       )
+)
     return FALSE;
 
   return TRUE;
@@ -104,13 +104,14 @@ refresh (PsppireDialogAction *rd_)
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (krd->cochran), FALSE);
 }
 
-static void
-psppire_dialog_action_k_related_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_k_related_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a);
 
   GtkBuilder *xml = builder_new ("k-related.ui");
+
   pda->dialog = get_widget_assert   (xml, "k-related-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
 
@@ -126,18 +127,13 @@ psppire_dialog_action_k_related_activate (GtkAction *a)
 		"predicate", var_is_numeric,
 		NULL);
 
-  g_object_unref (xml);
-
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_k_related_class_init (PsppireDialogActionKRelatedClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_k_related_activate;
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_k_related_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }