Import Assistant: Fix generation of variable names

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

diff --git a/src/ui/gui/psppire-dialog-action-paired.c b/src/ui/gui/psppire-dialog-action-paired.c
index fdd9a2b34df352fa412507214b6b5c5ab32ef3bc..e0102b1405f7ca5ebbadc06a137fcc81c4f9d57f 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-paired.c
+++ b/src/ui/gui/psppire-dialog-action-paired.c
@@ -58,7 +58,7 @@ dialog_state_valid (gpointer data)
 
   if (v == NULL)
     return FALSE;
-    
+
   /* if ( NULL == pd->valid) */
   /*   return TRUE; */
 
@@ -124,7 +124,7 @@ select_as_pair_member (GtkTreeIter source_iter,
 
 
 static gchar *
-generate_syntax (PsppireDialogAction *pda)
+generate_syntax (const PsppireDialogAction *pda)
 {
   PsppireDialogActionPaired *d = PSPPIRE_DIALOG_ACTION_PAIRED (pda);
   gchar *text = NULL;
@@ -150,18 +150,18 @@ generate_syntax (PsppireDialogAction *pda)
 }
 
 static void
-psppire_dialog_action_paired_activate (GtkAction *a)
+psppire_dialog_action_paired_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionPaired *act = PSPPIRE_DIALOG_ACTION_PAIRED (a);
 
-  GHashTable *thing = psppire_dialog_action_get_pointer (pda);
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
   GtkBuilder *xml = g_hash_table_lookup (thing, a);
   if (!xml)
     {
       xml = builder_new ("paired-samples.ui");
       g_hash_table_insert (thing, a, xml);
-      
+
       GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
       GtkWidget *bb = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
       GtkWidget *button = gtk_button_new_with_mnemonic (_("O_ptions..."));
@@ -183,7 +183,7 @@ psppire_dialog_action_paired_activate (GtkAction *a)
       gtk_box_pack_start (GTK_BOX (bb), button, TRUE, TRUE, 5);
       gtk_box_pack_start (GTK_BOX (box), bb, FALSE, FALSE, 5);
       gtk_widget_show_all (box);
- 
+
 
       psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
       psppire_dialog_action_set_refresh (pda, refresh);
@@ -196,9 +196,7 @@ psppire_dialog_action_paired_activate (GtkAction *a)
                                        select_as_pair_member,
                                        act);
     }
-  
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate (pda);
+
 }
 
 static void