[Xfce4-commits] <tumbler:master> GStrv is a boxed type, fix marshallers.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to d240ff8c10407dc58260319c298b6e637c0c93cb (commit)
       from 1d6b8fedc2824903834210dd78f9b2f0e4d16832 (commit)

commit d240ff8c10407dc58260319c298b6e637c0c93cb
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Wed Jan 20 11:58:06 2010 +0100

    GStrv is a boxed type, fix marshallers.

 tumbler/tumbler-marshal.list |    4 ++--
 tumblerd/tumbler-scheduler.c |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tumbler/tumbler-marshal.list b/tumbler/tumbler-marshal.list
index a963dd8..4a83ff1 100644
--- a/tumbler/tumbler-marshal.list
+++ b/tumbler/tumbler-marshal.list
@@ -1,7 +1,7 @@
 VOID:STRING,INT,STRING
 VOID:UINT,STRING,INT,STRING
-VOID:UINT,POINTER,INT,STRING,STRING
+VOID:UINT,BOXED,INT,STRING,STRING
 VOID:STRING,INT,STRING
-VOID:UINT,POINTER,STRING
+VOID:UINT,BOXED,STRING
 VOID:UINT,STRING
 VOID:UINT,POINTER,INT,STRING
diff --git a/tumblerd/tumbler-scheduler.c b/tumblerd/tumbler-scheduler.c
index c0ea82d..4ce2529 100644
--- a/tumblerd/tumbler-scheduler.c
+++ b/tumblerd/tumbler-scheduler.c
@@ -122,11 +122,11 @@ tumbler_scheduler_class_init (TumblerSchedulerIface *klass)
                   G_STRUCT_OFFSET (TumblerSchedulerIface, error),
                   NULL,
                   NULL,
-                  tumbler_marshal_VOID__UINT_POINTER_INT_STRING_STRING,
+                  tumbler_marshal_VOID__UINT_BOXED_INT_STRING_STRING,
                   G_TYPE_NONE,
                   5,
                   G_TYPE_UINT,
-                  G_TYPE_POINTER,
+                  G_TYPE_STRV,
                   G_TYPE_INT,
                   G_TYPE_STRING,
                   G_TYPE_STRING);
@@ -151,11 +151,11 @@ tumbler_scheduler_class_init (TumblerSchedulerIface *klass)
                   G_STRUCT_OFFSET (TumblerSchedulerIface, ready),
                   NULL,
                   NULL,
-                  tumbler_marshal_VOID__UINT_POINTER_STRING,
+                  tumbler_marshal_VOID__UINT_BOXED_STRING,
                   G_TYPE_NONE,
                   3,
                   G_TYPE_UINT,
-                  G_TYPE_POINTER,
+                  G_TYPE_STRV,
                   G_TYPE_STRING);
 
   tumbler_scheduler_signals[SIGNAL_STARTED] =