# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: geoffrey.antos@gmail.com-20080709043947-\
#   1cgjbiqn4unb79bk
# target_branch: ../upstream
# testament_sha1: 26ab968355b768deee84005da7f87a0c00a80234
# timestamp: 2008-07-09 00:47:39 -0400
# base_revision_id: svn-v3-trunk0:5f21a266-e325-0410-ade5-\
#   ad9d0905bfd5:trunk:2336
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog	2008-05-21 23:58:16 +0000
+++ ChangeLog	2008-07-09 04:39:47 +0000
@@ -1,3 +1,10 @@
+2008-07-07  Geoffrey Antos <dynamotwain@aim.com>
+	* libgthumb/gth-image-list.c: (gth_image_list_class_init)
+	* libgthumb/gthumb-marshal.list:
+	Fix assertions in gthumb_marshal_VOID__POINTER_POINTER by
+	actually using the correct marshaller for the given
+	parameter types.
+
 2008-05-21  Michael J. Chudobiak  <mjc@svn.gnome.org>
 
 	* AUTHORS:

=== modified file 'libgthumb/gth-image-list.c'
--- libgthumb/gth-image-list.c	2007-08-20 16:54:56 +0000
+++ libgthumb/gth-image-list.c	2008-07-09 04:39:47 +0000
@@ -3343,7 +3343,7 @@
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (GthImageListClass, set_scroll_adjustments),
 			      NULL, NULL,
-			      gthumb_marshal_VOID__POINTER_POINTER,
+			      gthumb_marshal_VOID__OBJECT_OBJECT,
 			      G_TYPE_NONE,
 			      2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 

=== modified file 'libgthumb/gthumb-marshal.list'
--- libgthumb/gthumb-marshal.list	2006-12-24 19:15:22 +0000
+++ libgthumb/gthumb-marshal.list	2008-07-09 04:39:47 +0000
@@ -11,6 +11,7 @@
 VOID:INT
 VOID:INT, BOXED
 VOID:INT, INT
+VOID:OBJECT, OBJECT
 VOID:POINTER, POINTER
 VOID:STRING
 VOID:STRING, INT
