From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 11 May 2010 07:29:37 +0000 (+0200)
Subject: Remove unused GObject pointer from dialog functions and update signal connect functio... 
X-Git-Tag: v0.7.5~25^2~13
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=319711ff80e76a730ec26c86d67c0107143d8747;p=pspp-builds.git

Remove unused GObject pointer from dialog functions and update signal connect functions accordingly
---

diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c
index 02d6d96c..d8714e7f 100644
--- a/src/ui/gui/comments-dialog.c
+++ b/src/ui/gui/comments-dialog.c
@@ -91,7 +91,7 @@ wrap_line (GtkTextBuffer *buffer,
 
 
 void
-comments_dialog (GObject *o, gpointer data)
+comments_dialog (gpointer data)
 {
   GtkTextIter iter;
   gint response ;
diff --git a/src/ui/gui/comments-dialog.h b/src/ui/gui/comments-dialog.h
index bccd8e5e..d53283b9 100644
--- a/src/ui/gui/comments-dialog.h
+++ b/src/ui/gui/comments-dialog.h
@@ -18,6 +18,6 @@
 #ifndef COMMENTS_DIALOG_H
 #define COMMENTS_DIALOG_H
 
-void comments_dialog (GObject *o, gpointer data);
+void comments_dialog (gpointer data);
 
 #endif /*  COMMENTS_DIALOG_H */
diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index 8a98bb3d..4e0eb371 100644
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -363,7 +363,7 @@ contents_plausible (gpointer data)
 
 /* Pops up the Compute dialog box */
 void
-compute_dialog (GObject *o, gpointer data)
+compute_dialog (gpointer data)
 {
   gint response;
   PsppireDataWindow *de = data;
diff --git a/src/ui/gui/compute-dialog.h b/src/ui/gui/compute-dialog.h
index 3611865e..5267cdd0 100644
--- a/src/ui/gui/compute-dialog.h
+++ b/src/ui/gui/compute-dialog.h
@@ -20,6 +20,6 @@
 
 #include <gtk/gtk.h>
 
-void compute_dialog (GObject *o, gpointer data);
+void compute_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/correlation-dialog.c b/src/ui/gui/correlation-dialog.c
index ff6a2545..82a053a3 100644
--- a/src/ui/gui/correlation-dialog.c
+++ b/src/ui/gui/correlation-dialog.c
@@ -83,7 +83,7 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Correlation dialog box */
 void
-correlation_dialog (GObject *o, gpointer data)
+correlation_dialog (gpointer data)
 {
   struct correlation rd;
   gint response;
diff --git a/src/ui/gui/correlation-dialog.h b/src/ui/gui/correlation-dialog.h
index 532970f5..8fbef219 100644
--- a/src/ui/gui/correlation-dialog.h
+++ b/src/ui/gui/correlation-dialog.h
@@ -19,6 +19,6 @@
 
 #include <gtk/gtk.h>
 
-void correlation_dialog (GObject *o, gpointer data);
+void correlation_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/crosstabs-dialog.c b/src/ui/gui/crosstabs-dialog.c
index 2b93a77b..45c85646 100644
--- a/src/ui/gui/crosstabs-dialog.c
+++ b/src/ui/gui/crosstabs-dialog.c
@@ -383,7 +383,7 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Crosstabs dialog box */
 void
-crosstabs_dialog (GObject *o, gpointer data)
+crosstabs_dialog (gpointer data)
 {
   gint response;
   struct crosstabs_dialog cd;
diff --git a/src/ui/gui/crosstabs-dialog.h b/src/ui/gui/crosstabs-dialog.h
index 11da9814..34fd4e6f 100644
--- a/src/ui/gui/crosstabs-dialog.h
+++ b/src/ui/gui/crosstabs-dialog.h
@@ -21,6 +21,6 @@
 #include <gtk/gtk.h>
 
 
-void crosstabs_dialog (GObject *o, gpointer data);
+void crosstabs_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c
index cad48b88..f1edf3df 100644
--- a/src/ui/gui/descriptives-dialog.c
+++ b/src/ui/gui/descriptives-dialog.c
@@ -203,7 +203,7 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Descriptives dialog box */
 void
-descriptives_dialog (GObject *o, gpointer data)
+descriptives_dialog (gpointer data)
 {
   gint response;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
diff --git a/src/ui/gui/descriptives-dialog.h b/src/ui/gui/descriptives-dialog.h
index 745663e7..84404a20 100644
--- a/src/ui/gui/descriptives-dialog.h
+++ b/src/ui/gui/descriptives-dialog.h
@@ -21,6 +21,6 @@
 #include <gtk/gtk.h>
 
 
-void descriptives_dialog (GObject *o, gpointer data);
+void descriptives_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/examine-dialog.c b/src/ui/gui/examine-dialog.c
index 67523143..ab5514cf 100644
--- a/src/ui/gui/examine-dialog.c
+++ b/src/ui/gui/examine-dialog.c
@@ -234,7 +234,7 @@ run_opts_dialog (struct examine_dialog *ed)
 
 /* Pops up the Examine dialog box */
 void
-examine_dialog (GObject *o, gpointer data)
+examine_dialog (gpointer data)
 {
   gint response;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
diff --git a/src/ui/gui/examine-dialog.h b/src/ui/gui/examine-dialog.h
index d8e3fb6c..189a4d90 100644
--- a/src/ui/gui/examine-dialog.h
+++ b/src/ui/gui/examine-dialog.h
@@ -20,6 +20,6 @@
 
 #include <gtk/gtk.h>
 
-void examine_dialog (GObject *o, gpointer data);
+void examine_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/factor-dialog.c b/src/ui/gui/factor-dialog.c
index fb09cc23..2b27bad1 100644
--- a/src/ui/gui/factor-dialog.c
+++ b/src/ui/gui/factor-dialog.c
@@ -200,7 +200,7 @@ on_extract_toggle (GtkToggleButton *button, struct factor *f)
 
 /* Pops up the Factor dialog box */
 void
-factor_dialog (GObject *o, gpointer data)
+factor_dialog (gpointer data)
 {
   struct factor fd;
   gint response;
diff --git a/src/ui/gui/factor-dialog.h b/src/ui/gui/factor-dialog.h
index 76b7ef9d..be4e584a 100644
--- a/src/ui/gui/factor-dialog.h
+++ b/src/ui/gui/factor-dialog.h
@@ -20,6 +20,6 @@
 
 #include <gtk/gtk.h>
 
-void factor_dialog (GObject *o, gpointer data);
+void factor_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c
index ca0c3b5f..faaa8d6b 100644
--- a/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@ -184,7 +184,7 @@ value_labels_toggled (GtkToggleButton *tb, gpointer data)
 /* Pops up the Find dialog box
  */
 void
-find_dialog (GObject *o, gpointer data)
+find_dialog (gpointer data)
 {
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
diff --git a/src/ui/gui/find-dialog.h b/src/ui/gui/find-dialog.h
index 3d4a50ff..b8e1f5ac 100644
--- a/src/ui/gui/find-dialog.h
+++ b/src/ui/gui/find-dialog.h
@@ -22,6 +22,6 @@
 #include <glib-object.h>
 
 /* Pops up the Find dialog box */
-void find_dialog (GObject *o, gpointer data);
+void find_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/frequencies-dialog.c b/src/ui/gui/frequencies-dialog.c
index e812d9a3..cf670587 100644
--- a/src/ui/gui/frequencies-dialog.c
+++ b/src/ui/gui/frequencies-dialog.c
@@ -453,7 +453,7 @@ sensitive_if_active (GtkToggleButton *toggle, GtkWidget *w)
 
 /* Pops up the Frequencies dialog box */
 void
-frequencies_dialog (GObject *o, gpointer data)
+frequencies_dialog (gpointer data)
 {
   gint response;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
diff --git a/src/ui/gui/frequencies-dialog.h b/src/ui/gui/frequencies-dialog.h
index f4d44f35..46367e38 100644
--- a/src/ui/gui/frequencies-dialog.h
+++ b/src/ui/gui/frequencies-dialog.h
@@ -20,6 +20,6 @@
 
 #include <gtk/gtk.h>
 
-void frequencies_dialog (GObject *o, gpointer data);
+void frequencies_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c
index 9a523943..92cddb03 100644
--- a/src/ui/gui/goto-case-dialog.c
+++ b/src/ui/gui/goto-case-dialog.c
@@ -40,7 +40,7 @@ refresh (const PsppireDataWindow *de, GtkBuilder *xml)
 }
 
 void
-goto_case_dialog (GObject *o, gpointer data)
+goto_case_dialog (gpointer data)
 {
   gint response;
   GtkBuilder *xml = builder_new ("psppire.ui");
diff --git a/src/ui/gui/goto-case-dialog.h b/src/ui/gui/goto-case-dialog.h
index 7b3da66d..e3f489e1 100644
--- a/src/ui/gui/goto-case-dialog.h
+++ b/src/ui/gui/goto-case-dialog.h
@@ -20,6 +20,6 @@
 
 #include <gtk/gtk.h>
 
-void goto_case_dialog (GObject *o, gpointer data);
+void goto_case_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c
index 57428667..03c0bf3d 100644
--- a/src/ui/gui/oneway-anova-dialog.c
+++ b/src/ui/gui/oneway-anova-dialog.c
@@ -123,7 +123,7 @@ refresh (struct oneway_anova_dialog *ow)
 
 /* Pops up the dialog box */
 void
-oneway_anova_dialog (GObject *o, gpointer data)
+oneway_anova_dialog (gpointer data)
 {
   gint response;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
diff --git a/src/ui/gui/oneway-anova-dialog.h b/src/ui/gui/oneway-anova-dialog.h
index 21043b43..adc00f15 100644
--- a/src/ui/gui/oneway-anova-dialog.h
+++ b/src/ui/gui/oneway-anova-dialog.h
@@ -1,7 +1,7 @@
 #ifndef ONEWAY_ANOVA_DIALOG
 #define ONEWAY_ANOVA_DIALOG
 
-void oneway_anova_dialog (GObject *o, gpointer data);
+void oneway_anova_dialog (gpointer data);
 
 
 #endif
diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index bdd03a2d..ae8a796b 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -1109,7 +1109,7 @@ psppire_data_window_init (PsppireDataWindow *de)
   }
 
   de->invoke_goto_dialog = get_action_assert (de->builder, "edit_goto-case");
-  g_signal_connect (de->invoke_goto_dialog, "activate", G_CALLBACK (goto_case_dialog), de);
+  g_signal_connect_swapped  (de->invoke_goto_dialog, "activate", G_CALLBACK (goto_case_dialog), de);
 
 
   {
@@ -1139,14 +1139,14 @@ psppire_data_window_init (PsppireDataWindow *de)
   {
     GtkAction *invoke_transpose_dialog = get_action_assert (de->builder, "data_transpose");
 
-    g_signal_connect (invoke_transpose_dialog, "activate", G_CALLBACK (transpose_dialog), de);
+    g_signal_connect_swapped  (invoke_transpose_dialog, "activate", G_CALLBACK (transpose_dialog), de);
   }
 
 
   {
     GtkAction *invoke_sort_cases_dialog = get_action_assert (de->builder, "data_sort-cases");
 
-    g_signal_connect (invoke_sort_cases_dialog, "activate", G_CALLBACK (sort_cases_dialog), de);
+    g_signal_connect_swapped  (invoke_sort_cases_dialog, "activate", G_CALLBACK (sort_cases_dialog), de);
   }
 
 
@@ -1154,27 +1154,27 @@ psppire_data_window_init (PsppireDataWindow *de)
   {
     GtkAction *invoke_compute_dialog = get_action_assert (de->builder, "transform_compute");
 
-    g_signal_connect (invoke_compute_dialog, "activate", G_CALLBACK (compute_dialog), de);
+    g_signal_connect_swapped  (invoke_compute_dialog, "activate", G_CALLBACK (compute_dialog), de);
   }
 
   {
     GtkAction *invoke_find_dialog = get_action_assert (de->builder, "edit_find");
 
-    g_signal_connect (invoke_find_dialog, "activate", G_CALLBACK (find_dialog), de);
+    g_signal_connect_swapped  (invoke_find_dialog, "activate", G_CALLBACK (find_dialog), de);
   }
 
  
    {
      GtkAction *invoke_split_file_dialog = get_action_assert (de->builder, "data_split-file");
 
-     g_signal_connect (invoke_split_file_dialog, "activate", G_CALLBACK (split_file_dialog), de);
+     g_signal_connect_swapped  (invoke_split_file_dialog, "activate", G_CALLBACK (split_file_dialog), de);
   }
 
 
   {
     GtkAction *invoke_weight_cases_dialog = get_action_assert (de->builder, "data_weight-cases");
 
-    g_signal_connect (invoke_weight_cases_dialog, "activate", G_CALLBACK (weight_cases_dialog), de);
+    g_signal_connect_swapped  (invoke_weight_cases_dialog, "activate", G_CALLBACK (weight_cases_dialog), de);
   }
 
 
@@ -1182,7 +1182,7 @@ psppire_data_window_init (PsppireDataWindow *de)
    {
     GtkAction *invoke_variable_info_dialog  =  get_action_assert (de->builder, "utilities_variables");
 
-    g_signal_connect (invoke_variable_info_dialog, "activate", G_CALLBACK (variable_info_dialog), de);
+    g_signal_connect_swapped  (invoke_variable_info_dialog, "activate", G_CALLBACK (variable_info_dialog), de);
   }
 
 
@@ -1190,35 +1190,35 @@ psppire_data_window_init (PsppireDataWindow *de)
   {
     GtkAction *invoke_oneway_anova_dialog = get_action_assert (de->builder, "oneway-anova");
 
-    g_signal_connect (invoke_oneway_anova_dialog, "activate", G_CALLBACK (oneway_anova_dialog), de);
+    g_signal_connect_swapped  (invoke_oneway_anova_dialog, "activate", G_CALLBACK (oneway_anova_dialog), de);
   }
 
 
   {
     GtkAction *invoke_t_test_independent_samples_dialog = get_action_assert (de->builder, "indep-t-test");
 
-    g_signal_connect (invoke_t_test_independent_samples_dialog, "activate", G_CALLBACK (t_test_independent_samples_dialog), de);
+    g_signal_connect_swapped  (invoke_t_test_independent_samples_dialog, "activate", G_CALLBACK (t_test_independent_samples_dialog), de);
   }
 
 
   {
     GtkAction *invoke_t_test_paired_samples_dialog = get_action_assert (de->builder, "paired-t-test");
 
-    g_signal_connect (invoke_t_test_paired_samples_dialog, "activate", G_CALLBACK (t_test_paired_samples_dialog), de);
+    g_signal_connect_swapped  (invoke_t_test_paired_samples_dialog, "activate", G_CALLBACK (t_test_paired_samples_dialog), de);
   }
 
 
   {
     GtkAction *invoke_t_test_one_sample_dialog = get_action_assert (de->builder, "one-sample-t-test");
 
-    g_signal_connect (invoke_t_test_one_sample_dialog, "activate", G_CALLBACK (t_test_one_sample_dialog), de);
+    g_signal_connect_swapped  (invoke_t_test_one_sample_dialog, "activate", G_CALLBACK (t_test_one_sample_dialog), de);
   }
 
 
   {
     GtkAction *invoke_comments_dialog = get_action_assert (de->builder, "utilities_comments");
 
-    g_signal_connect (invoke_comments_dialog, "activate", G_CALLBACK (comments_dialog), de);
+    g_signal_connect_swapped  (invoke_comments_dialog, "activate", G_CALLBACK (comments_dialog), de);
   }
 
 
@@ -1226,14 +1226,14 @@ psppire_data_window_init (PsppireDataWindow *de)
   {
     GtkAction *invoke_rank_dialog = get_action_assert (de->builder, "transform_rank");
 
-    g_signal_connect (invoke_rank_dialog, "activate", G_CALLBACK (rank_dialog), de);
+    g_signal_connect_swapped  (invoke_rank_dialog, "activate", G_CALLBACK (rank_dialog), de);
   }
 
 
   {
     GtkAction *invoke_recode_same_dialog = get_action_assert (de->builder, "transform_recode-same");
 
-    g_signal_connect (invoke_recode_same_dialog, "activate", G_CALLBACK (recode_same_dialog), de);
+    g_signal_connect_swapped  (invoke_recode_same_dialog, "activate", G_CALLBACK (recode_same_dialog), de);
   }
 
 
@@ -1241,66 +1241,66 @@ psppire_data_window_init (PsppireDataWindow *de)
     GtkAction *invoke_recode_different_dialog  = get_action_assert (de->builder, "transform_recode-different");
 
 
-    g_signal_connect (invoke_recode_different_dialog, "activate", G_CALLBACK (recode_different_dialog), de);
+    g_signal_connect_swapped  (invoke_recode_different_dialog, "activate", G_CALLBACK (recode_different_dialog), de);
   }
 
 
   {
     GtkAction *invoke_descriptives_dialog = get_action_assert (de->builder, "analyze_descriptives");
 
-    g_signal_connect (invoke_descriptives_dialog, "activate", G_CALLBACK (descriptives_dialog), de);
+    g_signal_connect_swapped  (invoke_descriptives_dialog, "activate", G_CALLBACK (descriptives_dialog), de);
   }
 
 
   {
     GtkAction *invoke_frequencies_dialog = get_action_assert (de->builder, "analyze_frequencies");
 
-    g_signal_connect (invoke_frequencies_dialog, "activate", G_CALLBACK (frequencies_dialog), de);
+    g_signal_connect_swapped  (invoke_frequencies_dialog, "activate", G_CALLBACK (frequencies_dialog), de);
   }
 
 
   {
     GtkAction *invoke_crosstabs_dialog = get_action_assert (de->builder, "crosstabs");
 
-    g_signal_connect (invoke_crosstabs_dialog, "activate", G_CALLBACK (crosstabs_dialog), de);
+    g_signal_connect_swapped  (invoke_crosstabs_dialog, "activate", G_CALLBACK (crosstabs_dialog), de);
   }
 
 
   {
     GtkAction *invoke_examine_dialog = get_action_assert (de->builder, "analyze_explore");
 
-    g_signal_connect (invoke_examine_dialog, "activate", G_CALLBACK (examine_dialog), de);
+    g_signal_connect_swapped  (invoke_examine_dialog, "activate", G_CALLBACK (examine_dialog), de);
   }
 
 
   {
     GtkAction *invoke_regression_dialog = get_action_assert (de->builder, "linear-regression");
 
-    g_signal_connect (invoke_regression_dialog, "activate", G_CALLBACK (regression_dialog), de);
+    g_signal_connect_swapped  (invoke_regression_dialog, "activate", G_CALLBACK (regression_dialog), de);
   }
 
   {
     GtkAction *invoke_reliability_dialog = get_action_assert (de->builder, "reliability");
 
-    g_signal_connect (invoke_reliability_dialog, "activate", G_CALLBACK (reliability_dialog), de);
+    g_signal_connect_swapped  (invoke_reliability_dialog, "activate", G_CALLBACK (reliability_dialog), de);
  }
 
   {
     GtkAction *invoke_roc_dialog = get_action_assert (de->builder, "roc-curve");
 
-    g_signal_connect (invoke_roc_dialog, "activate", G_CALLBACK (roc_dialog), de);
+    g_signal_connect_swapped  (invoke_roc_dialog, "activate", G_CALLBACK (roc_dialog), de);
   }
 
   {
     GtkAction *invoke_correlation_dialog = get_action_assert (de->builder, "correlation");
 
-    g_signal_connect (invoke_correlation_dialog, "activate", G_CALLBACK (correlation_dialog), de);
+    g_signal_connect_swapped  (invoke_correlation_dialog, "activate", G_CALLBACK (correlation_dialog), de);
   }
 
   {
     GtkAction *invoke_factor_dialog = get_action_assert (de->builder, "factor-analysis");
 
-    g_signal_connect (invoke_factor_dialog, "activate", G_CALLBACK (factor_dialog), de);
+    g_signal_connect_swapped  (invoke_factor_dialog, "activate", G_CALLBACK (factor_dialog), de);
   }
 
 
diff --git a/src/ui/gui/rank-dialog.c b/src/ui/gui/rank-dialog.c
index aa81e23b..51a98065 100644
--- a/src/ui/gui/rank-dialog.c
+++ b/src/ui/gui/rank-dialog.c
@@ -218,7 +218,7 @@ set_sensitivity (struct rank_dialog *rd)
 
 /* Pops up the Rank dialog box */
 void
-rank_dialog (GObject *o, gpointer data)
+rank_dialog (gpointer data)
 {
   gint response;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
diff --git a/src/ui/gui/rank-dialog.h b/src/ui/gui/rank-dialog.h
index 8a5064f5..b6f7038f 100644
--- a/src/ui/gui/rank-dialog.h
+++ b/src/ui/gui/rank-dialog.h
@@ -20,6 +20,6 @@
 
 #include <gtk/gtk.h>
 
-void rank_dialog (GObject *o, gpointer data);
+void rank_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/recode-dialog.c b/src/ui/gui/recode-dialog.c
index 9a1af8d5..44b5ac8c 100644
--- a/src/ui/gui/recode-dialog.c
+++ b/src/ui/gui/recode-dialog.c
@@ -455,7 +455,7 @@ static void recode_dialog (PsppireDataWindow *de, gboolean diff);
 
 /* Pops up the Recode Same version of the dialog box */
 void
-recode_same_dialog (GObject *o, gpointer data)
+recode_same_dialog (gpointer data)
 {
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
@@ -464,7 +464,7 @@ recode_same_dialog (GObject *o, gpointer data)
 
 /* Pops up the Recode Different version of the dialog box */
 void
-recode_different_dialog (GObject *o, gpointer data)
+recode_different_dialog (gpointer data)
 {
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
diff --git a/src/ui/gui/recode-dialog.h b/src/ui/gui/recode-dialog.h
index 8f251e1e..018761fc 100644
--- a/src/ui/gui/recode-dialog.h
+++ b/src/ui/gui/recode-dialog.h
@@ -20,7 +20,7 @@
 
 #include <gtk/gtk.h>
 
-void recode_same_dialog (GObject *o, gpointer data);
-void recode_different_dialog (GObject *o, gpointer data);
+void recode_same_dialog (gpointer data);
+void recode_different_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/regression-dialog.c b/src/ui/gui/regression-dialog.c
index 53010c3f..f4a88db7 100644
--- a/src/ui/gui/regression-dialog.c
+++ b/src/ui/gui/regression-dialog.c
@@ -222,7 +222,7 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Regression dialog box */
 void
-regression_dialog (GObject *o, gpointer data)
+regression_dialog (gpointer data)
 {
   gint response;
   struct regression_dialog rd;
diff --git a/src/ui/gui/regression-dialog.h b/src/ui/gui/regression-dialog.h
index d34a61c9..ca79d271 100644
--- a/src/ui/gui/regression-dialog.h
+++ b/src/ui/gui/regression-dialog.h
@@ -20,6 +20,6 @@
 
 #include <gtk/gtk.h>
 
-void regression_dialog (GObject *o, gpointer data);
+void regression_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/reliability-dialog.c b/src/ui/gui/reliability-dialog.c
index 9831ab7f..13a384c3 100644
--- a/src/ui/gui/reliability-dialog.c
+++ b/src/ui/gui/reliability-dialog.c
@@ -110,7 +110,7 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Reliability dialog box */
 void
-reliability_dialog (GObject *o, gpointer data)
+reliability_dialog (gpointer data)
 {
   struct reliability rd;
   gint response;
diff --git a/src/ui/gui/reliability-dialog.h b/src/ui/gui/reliability-dialog.h
index 5e8bfbfc..c465ecf1 100644
--- a/src/ui/gui/reliability-dialog.h
+++ b/src/ui/gui/reliability-dialog.h
@@ -20,6 +20,6 @@
 
 #include <gtk/gtk.h>
 
-void reliability_dialog (GObject *o, gpointer data);
+void reliability_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/roc-dialog.c b/src/ui/gui/roc-dialog.c
index cf0a831f..b82d3fca 100644
--- a/src/ui/gui/roc-dialog.c
+++ b/src/ui/gui/roc-dialog.c
@@ -119,7 +119,7 @@ on_curve_button_toggle  (GtkCheckButton *curve, struct roc *rd)
 
 /* Pops up the Roc dialog box */
 void
-roc_dialog (GObject *o, gpointer data)
+roc_dialog (gpointer data)
 {
   struct roc rd;
   gint response;
diff --git a/src/ui/gui/roc-dialog.h b/src/ui/gui/roc-dialog.h
index 02449802..ef6db2d5 100644
--- a/src/ui/gui/roc-dialog.h
+++ b/src/ui/gui/roc-dialog.h
@@ -20,6 +20,6 @@
 
 #include <gtk/gtk.h>
 
-void roc_dialog (GObject *o, gpointer data);
+void roc_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c
index 5b027825..72762ba0 100644
--- a/src/ui/gui/select-cases-dialog.c
+++ b/src/ui/gui/select-cases-dialog.c
@@ -237,7 +237,7 @@ set_radiobutton (GtkWidget *button, gpointer data)
 
 /* Pops up the Select Cases dialog box */
 void
-select_cases_dialog (GObject *o, gpointer data)
+select_cases_dialog (gpointer data)
 {
   gint response;
   struct select_cases_dialog scd = {0,0,0,0,0,0};
diff --git a/src/ui/gui/select-cases-dialog.h b/src/ui/gui/select-cases-dialog.h
index b585b096..a8d24dc8 100644
--- a/src/ui/gui/select-cases-dialog.h
+++ b/src/ui/gui/select-cases-dialog.h
@@ -21,6 +21,6 @@
 #include <gtk/gtk.h>
 
 
-void select_cases_dialog (GObject *o, gpointer data);
+void select_cases_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c
index 22c53781..450c369d 100644
--- a/src/ui/gui/sort-cases-dialog.c
+++ b/src/ui/gui/sort-cases-dialog.c
@@ -90,7 +90,7 @@ generate_syntax (const struct sort_cases_dialog *scd)
 
 /* Pops up the Sort Cases dialog box */
 void
-sort_cases_dialog (GObject *o, gpointer data)
+sort_cases_dialog (gpointer data)
 {
   gint response;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
diff --git a/src/ui/gui/sort-cases-dialog.h b/src/ui/gui/sort-cases-dialog.h
index 000d2c00..899879ca 100644
--- a/src/ui/gui/sort-cases-dialog.h
+++ b/src/ui/gui/sort-cases-dialog.h
@@ -20,6 +20,6 @@
 
 #include <gtk/gtk.h>
 
-void sort_cases_dialog (GObject *o, gpointer data);
+void sort_cases_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/split-file-dialog.c b/src/ui/gui/split-file-dialog.c
index cb226d9f..59160c7c 100644
--- a/src/ui/gui/split-file-dialog.c
+++ b/src/ui/gui/split-file-dialog.c
@@ -164,7 +164,7 @@ refresh (PsppireDialog *dialog, struct split_file_dialog *d)
 
 /* Pops up the Split File dialog box */
 void
-split_file_dialog (GObject *o, gpointer data)
+split_file_dialog (gpointer data)
 {
   gint response;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
diff --git a/src/ui/gui/split-file-dialog.h b/src/ui/gui/split-file-dialog.h
index 012853c1..e1f0aa88 100644
--- a/src/ui/gui/split-file-dialog.h
+++ b/src/ui/gui/split-file-dialog.h
@@ -22,7 +22,7 @@
 #include <glib-object.h>
 
 /* Pops up the Split File dialog box */
-void split_file_dialog (GObject *o, gpointer data);
+void split_file_dialog (gpointer data);
 
 
 #endif
diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c
index 90c5ab54..df09f619 100644
--- a/src/ui/gui/t-test-independent-samples-dialog.c
+++ b/src/ui/gui/t-test-independent-samples-dialog.c
@@ -388,7 +388,7 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the dialog box */
 void
-t_test_independent_samples_dialog (GObject *o, gpointer data)
+t_test_independent_samples_dialog (gpointer data)
 {
   struct tt_indep_samples_dialog tt_d;
   gint response;
diff --git a/src/ui/gui/t-test-independent-samples-dialog.h b/src/ui/gui/t-test-independent-samples-dialog.h
index 175cbfd6..f8d5d079 100644
--- a/src/ui/gui/t-test-independent-samples-dialog.h
+++ b/src/ui/gui/t-test-independent-samples-dialog.h
@@ -1,6 +1,6 @@
 #ifndef T_TEST_INDEPENDENT_SAMPLES_DIALOG
 #define T_TEST_INDEPENDENT_SAMPLES_DIALOG
 
-void t_test_independent_samples_dialog (GObject *, gpointer) ;
+void t_test_independent_samples_dialog (gpointer) ;
 
 #endif
diff --git a/src/ui/gui/t-test-one-sample.c b/src/ui/gui/t-test-one-sample.c
index 9301b2c3..8e74fa53 100644
--- a/src/ui/gui/t-test-one-sample.c
+++ b/src/ui/gui/t-test-one-sample.c
@@ -120,7 +120,7 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the dialog box */
 void
-t_test_one_sample_dialog (GObject *o, gpointer data)
+t_test_one_sample_dialog (gpointer data)
 {
   struct tt_one_sample_dialog tt_d;
   gint response;
diff --git a/src/ui/gui/t-test-one-sample.h b/src/ui/gui/t-test-one-sample.h
index 6d50f116..7886675d 100644
--- a/src/ui/gui/t-test-one-sample.h
+++ b/src/ui/gui/t-test-one-sample.h
@@ -1,6 +1,6 @@
 #ifndef T_TEST_ONE_SAMPLE_DIALOG
 #define T_TEST_ONE_SAMPLE_DIALOG
 
-void t_test_one_sample_dialog (GObject *, gpointer) ;
+void t_test_one_sample_dialog (gpointer) ;
 
 #endif
diff --git a/src/ui/gui/t-test-paired-samples.c b/src/ui/gui/t-test-paired-samples.c
index 56de59fc..cf2becd7 100644
--- a/src/ui/gui/t-test-paired-samples.c
+++ b/src/ui/gui/t-test-paired-samples.c
@@ -156,7 +156,7 @@ select_as_pair_member (GtkTreeIter source_iter,
 
 /* Pops up the dialog box */
 void
-t_test_paired_samples_dialog (GObject *o, gpointer data)
+t_test_paired_samples_dialog (gpointer data)
 {
   struct tt_paired_samples_dialog tt_d;
   gint response;
diff --git a/src/ui/gui/t-test-paired-samples.h b/src/ui/gui/t-test-paired-samples.h
index c77d9c11..46389e9f 100644
--- a/src/ui/gui/t-test-paired-samples.h
+++ b/src/ui/gui/t-test-paired-samples.h
@@ -1,6 +1,6 @@
 #ifndef T_TEST_PAIRED_SAMPLES_DIALOG
 #define T_TEST_PAIRED_SAMPLES_DIALOG
 
-void t_test_paired_samples_dialog (GObject *, gpointer) ;
+void t_test_paired_samples_dialog (gpointer) ;
 
 #endif
diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c
index 0061193e..d2082041 100644
--- a/src/ui/gui/transpose-dialog.c
+++ b/src/ui/gui/transpose-dialog.c
@@ -77,7 +77,7 @@ dialog_state_valid (gpointer data)
 
 
 void
-transpose_dialog (GObject *o, gpointer data)
+transpose_dialog (gpointer data)
 {
   gint response ;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
diff --git a/src/ui/gui/transpose-dialog.h b/src/ui/gui/transpose-dialog.h
index cdcf0ecf..cf2f4eb4 100644
--- a/src/ui/gui/transpose-dialog.h
+++ b/src/ui/gui/transpose-dialog.h
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-void transpose_dialog (GObject *o, gpointer data);
+void transpose_dialog (gpointer data);
 
 
 #endif
diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index 6d494495..acc9b27f 100644
--- a/src/ui/gui/variable-info-dialog.c
+++ b/src/ui/gui/variable-info-dialog.c
@@ -17,6 +17,7 @@
 #include <config.h>
 #include <gtk/gtk.h>
 
+#include "variable-info-dialog.h"
 #include "var-display.h"
 #include <data/variable.h>
 #include <data/format.h>
@@ -143,7 +144,7 @@ static gchar * generate_syntax (PsppireDictView *treeview);
 
 
 void
-variable_info_dialog (GObject *o, gpointer data)
+variable_info_dialog (gpointer data)
 {
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
diff --git a/src/ui/gui/variable-info-dialog.h b/src/ui/gui/variable-info-dialog.h
index e775506f..c959029e 100644
--- a/src/ui/gui/variable-info-dialog.h
+++ b/src/ui/gui/variable-info-dialog.h
@@ -19,6 +19,6 @@
 
 #include <gtk/gtk.h>
 
-void variable_info_dialog (GObject *o, gpointer data);
+void variable_info_dialog (gpointer data);
 
 #endif
diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c
index 956451b1..c2c58233 100644
--- a/src/ui/gui/weight-cases-dialog.c
+++ b/src/ui/gui/weight-cases-dialog.c
@@ -102,7 +102,7 @@ static gchar * generate_syntax (const struct weight_cases_dialog *wcd);
 
 /* Pops up the Weight Cases dialog box */
 void
-weight_cases_dialog (GObject *o, gpointer data)
+weight_cases_dialog (gpointer data)
 {
   gint response;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
diff --git a/src/ui/gui/weight-cases-dialog.h b/src/ui/gui/weight-cases-dialog.h
index e6572e63..02173cb2 100644
--- a/src/ui/gui/weight-cases-dialog.h
+++ b/src/ui/gui/weight-cases-dialog.h
@@ -22,7 +22,7 @@
 #include <glib-object.h>
 
 /* Pops up the Weight Cases dialog box */
-void weight_cases_dialog (GObject *o, gpointer data);
+void weight_cases_dialog (gpointer data);
 
 
 #endif