Remove unused GObject pointer from dialog functions and update signal connect functio...

diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c
index 02d6d96c763d3064840fe72ebcd6d590aaa4acf7..d8714e7f0e9185de7504c74a80ce3f0d3aae1f9b 100644 (file)
--- 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 bccd8e5e8690e2d745a37eb3f02a14427dd3b1ea..d53283b98946bb99b31e01cd67fea127301895a6 100644 (file)
--- 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 8a98bb3dcac48d8158812d5f9b96bb7c4df6b687..4e0eb3714c48fc1acf3fb366fa2398fbae781194 100644 (file)
--- 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 3611865e15de360bf1fa8d5688e14bbcbf547a20..5267cdd0d297e6d37572b9c7079dfeace714003e 100644 (file)
--- 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 ff6a254552345907a84c3ae4f371aaa1acdf47a8..82a053a3d3182db45efc9244849283e4956bfd9a 100644 (file)
--- 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 532970f584f2136a59f7064755950de733d6b62c..8fbef2195faa2f395199071852b8d7e22f6bd5e2 100644 (file)
--- 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 2b93a77b657afdfd2cdbb78657669c56ae11bb7b..45c856463d6eb029a930f22fec7b7d28ca5e10e1 100644 (file)
--- 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 11da9814cfa462a37ab2960c5c16226f99b6b3ed..34fd4e6f171ade7ff240c64a25bd2f4e27f0940b 100644 (file)
--- 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 cad48b888539988c40c0923aa903a4017665dc3c..f1edf3df95a2e180e6f666cf8872b8780e202ccf 100644 (file)
--- 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 745663e73139eb35ce2d05026a55fb78a0569dc8..84404a202b34eaf147e993e9a09311b1ca041a3d 100644 (file)
--- 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 67523143fc48ea09eedcae8c5acfe67f8979ce5a..ab5514cf79f36ab34548bab4ed722bbbdf10b590 100644 (file)
--- 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 d8e3fb6c259cab1560ff88645c1609689803d61e..189a4d90990fb78a573906a0235ae9407d69e1c8 100644 (file)
--- 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 fb09cc237759eca594066742a7b8cad7c8dda83f..2b27bad157a7aecfc0bf2fe3beb0fc70822c894d 100644 (file)
--- 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 76b7ef9dc77f3390279fc88508928ab378b923b6..be4e584aa28e948322f2042a44e3234f9f5b92c0 100644 (file)
--- 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 ca0c3b5f4a9bb20b378792db2c7f1664a5d44b46..faaa8d6b348991a40274ed7168d154182810d8f6 100644 (file)
--- 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 3d4a50fff4a4f549f611fbd0c54dde9f9ea840f7..b8e1f5acec770df1ffe092d9f48b1bb01d27e9e6 100644 (file)
--- 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 e812d9a3f1a55b18c4bd6ad53ac1d4adf14982b9..cf67058761e0488f40ea1bc2636fd7c12ea9c81d 100644 (file)
--- 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 f4d44f35b35f2e565b49fcacd510856949d51504..46367e387fe2628239d33668e2653a07b3931f7d 100644 (file)
--- 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 9a523943b1c5686e639d4df34b56530d4f1b55a5..92cddb0366ec827b307265554b717c7044ec1f70 100644 (file)
--- 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 7b3da66d59969de80f0320405cf57db29d3ba62c..e3f489e1ebfee78de4698718db61ae35c0f2e89b 100644 (file)
--- 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 57428667a2480a63b5a2956ab7e1a927169594d8..03c0bf3d0ebad4b2c8a3e096eb60e62e35c3bdca 100644 (file)
--- 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 21043b4362a3b71c46b709aeec6d92e9760388c7..adc00f15fed4ee6f17c8e90a6ca7abcd58e599c2 100644 (file)
--- 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 bdd03a2d97fec57378d3be34cca9023d96231f27..ae8a796b9f518c74be97ee215cc8f1796bd076da 100644 (file)
--- 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 aa81e23bbe71fd77fb2e5997f53c3bd93045643a..51a98065f3afe32e7ab299d513b4622f09592c5f 100644 (file)
--- 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 8a5064f5c7e58bbb5c7d9071a4a3cfab5be82447..b6f7038fea4a1e13d3d6a91263006ef853008256 100644 (file)
--- 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 9a1af8d5d7a582a69119fb835b084c86b0ad5cad..44b5ac8c2ee010226d24d10d48552b500c676cf9 100644 (file)
--- 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 8f251e1edd39c831b5d5872e6e62f3b03fd8f3eb..018761fcb17bdfd4bc934dcc58214ae1d9ca1d4e 100644 (file)
--- 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 53010c3ffdc47d342afb5adfc0e2cf025a349103..f4a88db7dfca59521ce19e24dbc7f8f369861c43 100644 (file)
--- 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 d34a61c9f059a496999d873d85d2b9ce8e057383..ca79d271e8f93ff5f6ce15484c18f0aabff58797 100644 (file)
--- 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 9831ab7f66ce7ae20c974cdcdc1593b31a459763..13a384c30806c42b0e05a6440dbd6992e23d9a08 100644 (file)
--- 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 5e8bfbfc18e662a6c8b6d74361d30b06fa43d7a1..c465ecf13b2c1be0cefe11dcaea5a58ed318172b 100644 (file)
--- 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 cf0a831f812edbe3171e4a85220ba8f26b38e215..b82d3fca955c1ce7ce39c1fa42e2cf094af7433e 100644 (file)
--- 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 024498024bca8b7a12f9d793b59c36da9db7a4f8..ef6db2d501fc5161698d96a41cf97a61633fe1ef 100644 (file)
--- 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 5b027825bc6e62ccec66116837e7f085015a9dc7..72762ba014c840b7093ce22dcd5a0a0154bb7478 100644 (file)
--- 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 b585b096fc43c966a342b8b692be714d1939894d..a8d24dc841dac9515b2f93a53272a71a39657b85 100644 (file)
--- 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 22c537812311eb232837062c384b5a91dc22db70..450c369d77ca9c1b7639f36783ed07436339c0aa 100644 (file)
--- 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 000d2c00810634bbecc07a921b8dbca26afe7477..899879ca1c7d5f3753836c062e7e14f33701b9a7 100644 (file)
--- 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 cb226d9fffc095a1f23e7bf668efdca6015ac1bb..59160c7cf43aa15012f902de34d5148a46c64319 100644 (file)
--- 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 012853c1260d44d03198af5d9558ea0161821eee..e1f0aa884b600428d883fd20e45c66457da6b4b7 100644 (file)
--- 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 90c5ab54870b9439548d61ff0fc5efed2d4cedc9..df09f61926b64b3fdf2860423a7df5ff41f259f5 100644 (file)
--- 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 175cbfd63e061a2f2d0ce9c02b6acfc7697577e4..f8d5d0794246822a48badcba90a89998689f014b 100644 (file)
--- 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 9301b2c316893566b5f891bf1f081d5e3de613e1..8e74fa534975f92c9942d5aa72fe95858f12b72a 100644 (file)
--- 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 6d50f1162706af01c43e51bd756a31508191b617..7886675d4ac27b7df5506a9f8002632c4d0581d0 100644 (file)
--- 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 56de59fcc449562702ec6c5aa1b05e2206d88a9c..cf2becd729c518643e9ddad1d83ab8049cdbf2e1 100644 (file)
--- 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 c77d9c11f35529f8c20df8478c7b7b447b8198d9..46389e9f4ae7ba59e03b2e3a81ab52a4c9dc7538 100644 (file)
--- 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 0061193e16b1b86f1d9dfa6c7c26d336e04cfb6b..d20820410a253da54c5d08e5ecef8927c2fd99e6 100644 (file)
--- 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 cdcf0ecf55c042766398fe9c176374ccf770d779..cf2f4eb4e7c17c8dc698bca2f4c8e224fbaeb2eb 100644 (file)
--- 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 6d494495a43698a50e4a8ea28572cb59e7ed803b..acc9b27f97e71716f4c83baa35eba06343e5d361 100644 (file)
--- 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 e775506f3ec30d0eeb2747865dc4425708fda1e2..c959029ed6e992da23471947146a6683ee922b7d 100644 (file)
--- 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 956451b13702fe2097a0a4f05c416a8d4201dffb..c2c5823319dddad9643065bcd01b8b05c796fded 100644 (file)
--- 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 e6572e63bf8550aacc2bb5ada3ef33611e755169..02173cb2fabe477eefdd7262889256d5602ed9f5 100644 (file)
--- 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