Import assistant: Re-enable automatic inference of the separators

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

diff --git a/src/ui/gui/psppire-dialog-action-two-sample.c b/src/ui/gui/psppire-dialog-action-two-sample.c
index ce08e05271bbc9c782aab1a3bd4bc6127cdac758..1d8d92ca50b55f266b57fa7b99ac4fd76ea9ad76 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-two-sample.c
+++ b/src/ui/gui/psppire-dialog-action-two-sample.c
@@ -68,7 +68,7 @@ dialog_state_valid (gpointer data)
 
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (pd->nts[NT_MCNEMAR].button)))
     return TRUE;
-    
+
   return FALSE;
 }
 
@@ -134,7 +134,7 @@ select_as_pair_member (GtkTreeIter source_iter,
 
 
 static gchar *
-generate_syntax (PsppireDialogAction *pda)
+generate_syntax (const PsppireDialogAction *pda)
 {
   gint i;
 
@@ -169,12 +169,12 @@ generate_syntax (PsppireDialogAction *pda)
 }
 
 static void
-psppire_dialog_action_two_sample_activate (GtkAction *a)
+psppire_dialog_action_two_sample_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionTwoSample *act = PSPPIRE_DIALOG_ACTION_TWO_SAMPLE (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)
     {
@@ -228,9 +228,7 @@ psppire_dialog_action_two_sample_activate (GtkAction *a)
   psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector),
                                    select_as_pair_member,
                                    act);
-  
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_two_sample_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_two_sample_parent_class)->activate (pda);
+
 }
 
 static void