Changed the signature of the VARIABLE_CHANGED signal to take the WHAT and OLDVAR...

Re-implement signal handlers of the variable-changed signal to PsppireDict to take
the new WHAT and OLDVAR parameters.

diff --git a/src/ui/gui/marshaller-list b/src/ui/gui/marshaller-list
index 8fec64decde6491eac44fd835b08354e777d9ec2..0f38e6fc2ea18c1ca6ccfb3c812faf8da4d0a204 100644 (file)
--- a/src/ui/gui/marshaller-list
+++ b/src/ui/gui/marshaller-list
@@ -11,3 +11,4 @@ VOID:BOXED,OBJECT
 VOID:INT,INT
 VOID:OBJECT,OBJECT
 VOID:POINTER,INT,INT
+VOID:INT,UINT,POINTER

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index 279c36953efcb668564fdfd5a92a784e7af246ce..746494eeebc6b0e3ecc8679fc4a23354d9dd43ea 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -1909,6 +1909,7 @@ on_variable_display_width_changed (PsppireDict *dict, int dict_index,
 
 static void
 on_variable_changed (PsppireDict *dict, int dict_index,
+                    guint what, const struct variable *oldvar,
                      PsppireDataSheet *data_sheet)
 {
   PsppireDataStore *data_store = psppire_data_sheet_get_data_store (data_sheet);

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index 047cca78113fddef9a70e1f53becabfc0cacb9fb..7104d3a30a1c2d4a5af0e0a3a0ee0fe9704e31ad 100644 (file)
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -211,7 +211,7 @@ delete_variable_callback (GObject *obj, const struct variable *var UNUSED,
 }
 
 static void
-variable_changed_callback (GObject *obj, gint var_num, gpointer data)
+variable_changed_callback (GObject *obj, gint var_num, guint what, const struct variable *oldvar, gpointer data)
 {
 }
 

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 97115b047426b33b71fbf229e4d9f11fc4c2889b..60ccda5200c38c48576293311c6e5f83f1ff8c42 100644 (file)
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -134,10 +134,13 @@ psppire_dict_class_init (PsppireDictClass *class)
                  G_SIGNAL_RUN_FIRST,
                  0,
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__INT,
+                 psppire_marshal_VOID__INT_UINT_POINTER,
                  G_TYPE_NONE,
-                 1,
-                 G_TYPE_INT);
+                 3,
+                 G_TYPE_INT,
+                 G_TYPE_UINT,
+                 G_TYPE_POINTER
+                 );
 
 
 
@@ -258,7 +261,7 @@ delcb (struct dictionary *d, const struct variable *var,
 static void
 mutcb (struct dictionary *d, int idx, unsigned int what, const struct variable *oldvar, void *pd)
 {
-  g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx);
+  g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx, what, oldvar);
 }
 
 static void

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index 970da7dfbcb491c81ce21e3f0ee5a3cb38c51189..9d23cb9656aa814017d524b88e1b775552dd984c 100644 (file)
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -1288,7 +1288,9 @@ refresh_model (PsppireVarSheet *var_sheet)
 }
 
 static void
-on_var_changed (PsppireDict *dict, glong row, PsppireVarSheet *var_sheet)
+on_var_changed (PsppireDict *dict, glong row,
+               guint what, const struct variable *oldvar,
+               PsppireVarSheet *var_sheet)
 {
   PsppireEmptyListStore *store;