summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-09-14 00:48:47 -0400
committermonsta <[email protected]>2016-09-18 14:02:36 +0300
commit7c58f04b9bdd6a5b5fdfefb9802e8442d0083f0c (patch)
treef3c8dfb36fe2c1921432fb00e6ce7850b51d0c88
parentf10a3f4f55d386c360cd00f5b8f09a646406e026 (diff)
downloadmate-control-center-7c58f04b9bdd6a5b5fdfefb9802e8442d0083f0c.tar.bz2
mate-control-center-7c58f04b9bdd6a5b5fdfefb9802e8442d0083f0c.tar.xz
GTK+3: fix mate-display-properties with glib 2.49.6
before that version, glib ignored arguments in custom marshalling and always used its own ones, so the mistake in our code was unnoticed for a long time. this commit adds proper marshalling for GTK+3 build. more info: https://bugzilla.gnome.org/769076 fixes https://github.com/mate-desktop/mate-control-center/issues/251
-rw-r--r--capplets/display/scrollarea.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/capplets/display/scrollarea.c b/capplets/display/scrollarea.c
index a94f74ee..7a8845ab 100644
--- a/capplets/display/scrollarea.c
+++ b/capplets/display/scrollarea.c
@@ -324,7 +324,11 @@ foo_scroll_area_class_init (FooScrollAreaClass *class)
G_STRUCT_OFFSET (FooScrollAreaClass,
paint),
NULL, NULL,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ g_cclosure_marshal_VOID__POINTER,
+#else
foo_marshal_VOID__POINTER_BOXED_POINTER,
+#endif
G_TYPE_NONE,
#if GTK_CHECK_VERSION (3, 0, 0)
1,