[Xfce4-commits] [apps/xfdashboard] 01/01: It seems that newer Glib version do better check marshal parameters and now recognize that I have specified the wrong type of G_TYPE_OBJECT at signal actions for the event parameter. ClutterEvent is a boxed type (G_TYPE_BOXED) and therefore the marshal parameter must be corrected to it.
noreply at xfce.org
noreply at xfce.org
Fri Apr 14 18:09:33 CEST 2017
This is an automated email from the git hooks/post-receive script.
nomad pushed a commit to branch master
in repository apps/xfdashboard.
commit 0c1b74b9c2856836dc5ed17a082e94ec9d04a3fe
Author: Stephan Haller <nomad at froevel.de>
Date: Fri Apr 14 18:07:40 2017 +0200
It seems that newer Glib version do better check marshal parameters and now recognize that I have specified the wrong type of G_TYPE_OBJECT at signal actions for the event parameter. ClutterEvent is a boxed type (G_TYPE_BOXED) and therefore the marshal parameter must be corrected to it.
---
libxfdashboard/application.c | 2 +-
libxfdashboard/focus-manager.c | 4 ++--
libxfdashboard/focusable.c | 22 +++++++++++-----------
libxfdashboard/marshal.list | 2 +-
libxfdashboard/quicklaunch.c | 12 ++++++------
libxfdashboard/view.c | 2 +-
libxfdashboard/windows-view.c | 26 +++++++++++++-------------
7 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/libxfdashboard/application.c b/libxfdashboard/application.c
index 7e731e9..a915b5b 100644
--- a/libxfdashboard/application.c
+++ b/libxfdashboard/application.c
@@ -1405,7 +1405,7 @@ static void xfdashboard_application_class_init(XfdashboardApplicationClass *klas
G_STRUCT_OFFSET(XfdashboardApplicationClass, exit),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
diff --git a/libxfdashboard/focus-manager.c b/libxfdashboard/focus-manager.c
index d31c1aa..6171be3 100644
--- a/libxfdashboard/focus-manager.c
+++ b/libxfdashboard/focus-manager.c
@@ -337,7 +337,7 @@ static void xfdashboard_focus_manager_class_init(XfdashboardFocusManagerClass *k
G_STRUCT_OFFSET(XfdashboardFocusManagerClass, focus_move_next),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -351,7 +351,7 @@ static void xfdashboard_focus_manager_class_init(XfdashboardFocusManagerClass *k
G_STRUCT_OFFSET(XfdashboardFocusManagerClass, focus_move_previous),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
diff --git a/libxfdashboard/focusable.c b/libxfdashboard/focusable.c
index fce0d4d..0076be7 100644
--- a/libxfdashboard/focusable.c
+++ b/libxfdashboard/focusable.c
@@ -455,7 +455,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_move_left),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -469,7 +469,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_move_right),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -483,7 +483,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_move_up),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -497,7 +497,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_move_down),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -511,7 +511,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_move_first),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -525,7 +525,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_move_last),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -539,7 +539,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_move_page_left),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -553,7 +553,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_move_page_right),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -567,7 +567,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_move_page_up),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -581,7 +581,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_move_page_down),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -595,7 +595,7 @@ void xfdashboard_focusable_default_init(XfdashboardFocusableInterface *iface)
G_STRUCT_OFFSET(XfdashboardFocusableInterface, selection_activate),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
diff --git a/libxfdashboard/marshal.list b/libxfdashboard/marshal.list
index 923e47c..533335c 100644
--- a/libxfdashboard/marshal.list
+++ b/libxfdashboard/marshal.list
@@ -8,5 +8,5 @@ VOID:STRING,BOOLEAN
BOOLEAN:OBJECT
BOOLEAN:OBJECT,ENUM
BOOLEAN:OBJECT,FLOAT,FLOAT
-BOOLEAN:OBJECT,STRING,OBJECT
+BOOLEAN:OBJECT,STRING,BOXED
OBJECT:VOID
diff --git a/libxfdashboard/quicklaunch.c b/libxfdashboard/quicklaunch.c
index e166ef9..f73bbbf 100644
--- a/libxfdashboard/quicklaunch.c
+++ b/libxfdashboard/quicklaunch.c
@@ -3199,7 +3199,7 @@ static void xfdashboard_quicklaunch_class_init(XfdashboardQuicklaunchClass *klas
G_STRUCT_OFFSET(XfdashboardQuicklaunchClass, selection_add_favourite),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -3213,7 +3213,7 @@ static void xfdashboard_quicklaunch_class_init(XfdashboardQuicklaunchClass *klas
G_STRUCT_OFFSET(XfdashboardQuicklaunchClass, selection_remove_favourite),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -3227,7 +3227,7 @@ static void xfdashboard_quicklaunch_class_init(XfdashboardQuicklaunchClass *klas
G_STRUCT_OFFSET(XfdashboardQuicklaunchClass, favourite_reorder_left),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -3241,7 +3241,7 @@ static void xfdashboard_quicklaunch_class_init(XfdashboardQuicklaunchClass *klas
G_STRUCT_OFFSET(XfdashboardQuicklaunchClass, favourite_reorder_right),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -3255,7 +3255,7 @@ static void xfdashboard_quicklaunch_class_init(XfdashboardQuicklaunchClass *klas
G_STRUCT_OFFSET(XfdashboardQuicklaunchClass, favourite_reorder_up),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -3269,7 +3269,7 @@ static void xfdashboard_quicklaunch_class_init(XfdashboardQuicklaunchClass *klas
G_STRUCT_OFFSET(XfdashboardQuicklaunchClass, favourite_reorder_down),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
diff --git a/libxfdashboard/view.c b/libxfdashboard/view.c
index 3108e2d..e57dabf 100644
--- a/libxfdashboard/view.c
+++ b/libxfdashboard/view.c
@@ -564,7 +564,7 @@ static void xfdashboard_view_class_init(XfdashboardViewClass *klass)
G_STRUCT_OFFSET(XfdashboardViewClass, view_activate),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
diff --git a/libxfdashboard/windows-view.c b/libxfdashboard/windows-view.c
index 2eba276..b7ae993 100644
--- a/libxfdashboard/windows-view.c
+++ b/libxfdashboard/windows-view.c
@@ -2051,7 +2051,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, window_close),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2065,7 +2065,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_show_numbers),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2079,7 +2079,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_hide_numbers),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2093,7 +2093,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_activate_window_one),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2107,7 +2107,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_activate_window_two),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2121,7 +2121,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_activate_window_three),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2135,7 +2135,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_activate_window_four),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2149,7 +2149,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_activate_window_five),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2163,7 +2163,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_activate_window_six),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2177,7 +2177,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_activate_window_seven),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2191,7 +2191,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_activate_window_eight),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2205,7 +2205,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_activate_window_nine),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
@@ -2219,7 +2219,7 @@ static void xfdashboard_windows_view_class_init(XfdashboardWindowsViewClass *kla
G_STRUCT_OFFSET(XfdashboardWindowsViewClass, windows_activate_window_ten),
g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_OBJECT,
+ _xfdashboard_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN,
3,
XFDASHBOARD_TYPE_FOCUSABLE,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list