Updating branch refs/heads/master to 0c5e0a03be51cef6d342ac8e1c480378ffba6487 (commit) from 305141d5b465a3dc5ec4d4768fbca800ea4ec5ff (commit)
commit 0c5e0a03be51cef6d342ac8e1c480378ffba6487 Author: Nick Schermer <n...@xfce.org> Date: Wed Jan 20 11:30:21 2010 +0100 G_TYPE_STRV is a boxed type. This should fixed the following warning when Thunar communicates with Tumbler over D-Bus: GLib-GObject-CRITICAL **: g_value_get_pointer: assertion `G_VALUE_HOLDS_POINTER (value)' failed thunar/thunar-marshal.list | 3 ++- thunar/thunar-thumbnailer.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/thunar/thunar-marshal.list b/thunar/thunar-marshal.list index 58aaa04..c9d116c 100644 --- a/thunar/thunar-marshal.list +++ b/thunar/thunar-marshal.list @@ -6,4 +6,5 @@ VOID:BOXED,OBJECT VOID:BOXED,POINTER VOID:STRING,STRING VOID:UINT64,UINT,UINT,UINT -VOID:UINT,POINTER,UINT,STRING +VOID:UINT,BOXED,UINT,STRING +VOID:UINT,BOXED diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c index 08d3c9a..8146d29 100644 --- a/thunar/thunar-thumbnailer.c +++ b/thunar/thunar-thumbnailer.c @@ -412,8 +412,8 @@ thunar_thumbnailer_init_thumbnailer_proxy (ThunarThumbnailer *thumbnailer, thumbnailer->thumbnailer_proxy = thunar_thumbnailer_proxy; - /* TODO this should actually be VOID:UINT,POINTER,INT,STRING */ - dbus_g_object_register_marshaller (_thunar_marshal_VOID__UINT_POINTER_UINT_STRING, + /* TODO this should actually be VOID:UINT,BOXED,INT,STRING */ + dbus_g_object_register_marshaller (_thunar_marshal_VOID__UINT_BOXED_UINT_STRING, G_TYPE_NONE, G_TYPE_UINT, G_TYPE_STRV, @@ -421,7 +421,7 @@ thunar_thumbnailer_init_thumbnailer_proxy (ThunarThumbnailer *thumbnailer, G_TYPE_STRING, G_TYPE_INVALID); - dbus_g_object_register_marshaller ((GClosureMarshal) g_cclosure_marshal_VOID__UINT_POINTER, + dbus_g_object_register_marshaller ((GClosureMarshal) _thunar_marshal_VOID__UINT_BOXED, G_TYPE_NONE, G_TYPE_UINT, G_TYPE_STRV, _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits