[rhythmbox] fix python bindings and marshalling for rb_shell_notify_custom (bug #636994)

[Jonathan Matthew <jmatthew src gnome org>]

commit cea18e3d31669f81a41f90bfc017c80843b9ceec
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sat Dec 11 11:03:31 2010 +1000

    fix python bindings and marshalling for rb_shell_notify_custom (bug #636994)
    
    Based on a patch by Uri Sivan.

 bindings/python/rb.defs |    4 ++--
 lib/rb-marshal.list     |    2 +-
 shell/rb-shell.c        |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/bindings/python/rb.defs b/bindings/python/rb.defs
index 42bcaeb..f55ccba 100644
--- a/bindings/python/rb.defs
+++ b/bindings/python/rb.defs
@@ -557,8 +557,8 @@
     '("guint" "timeout")
     '("const-char*" "primary")
     '("const-char*" "secondary")
-    '("GdkPixbuf*" "pixbuf")
-    '("gboolean" "requested")
+    '("const-char*" "image_uri" (optional) (default "NULL"))
+    '("gboolean" "requested" (optional) (default "FALSE"))
   )
 )
 
diff --git a/lib/rb-marshal.list b/lib/rb-marshal.list
index eb66d79..1fbd99f 100644
--- a/lib/rb-marshal.list
+++ b/lib/rb-marshal.list
@@ -52,7 +52,7 @@ VOID:STRING,STRING
 VOID:STRING,STRING,OBJECT
 VOID:STRING,STRING,STRING
 VOID:STRING,STRING,STRING,UINT,BOOLEAN
-VOID:UINT,STRING,STRING,OBJECT,BOOLEAN
+VOID:UINT,STRING,STRING,STRING,BOOLEAN
 VOID:UINT64
 VOID:UINT64,STRING,POINTER
 VOID:ULONG,FLOAT
diff --git a/shell/rb-shell.c b/shell/rb-shell.c
index 8ced9e9..660dc35 100644
--- a/shell/rb-shell.c
+++ b/shell/rb-shell.c
@@ -833,7 +833,7 @@ rb_shell_class_init (RBShellClass *klass)
 	 * @timeout: length of time (in seconds) to display the notification
 	 * @primary: main notification text
 	 * @secondary: secondary notification text
-	 * @pixbuf: an image to include in the notification (optional)
+	 * @image_uri: URI for an image to include in the notification (optional)
 	 * @requested: if %TRUE, the notification was triggered by an explicit user action
 	 *
 	 * Emitted when a custom notification should be displayed to the user.
@@ -844,10 +844,10 @@ rb_shell_class_init (RBShellClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      rb_marshal_VOID__UINT_STRING_STRING_OBJECT_BOOLEAN,
+			      rb_marshal_VOID__UINT_STRING_STRING_STRING_BOOLEAN,
 			      G_TYPE_NONE,
 			      5,
-			      G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN);
+			      G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 	/**
 	 * RBShell::database-load-complete:
 	 * @shell: the #RBShell