fix 344891

diff --git a/ChangeLog b/ChangeLog
index 1c4015d5bae2c39e7aea0109f9cc6848f1e09796..19688c625656441db2fb4d54b17a5f25031a8661 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkprintoperationpreview.c 
+       (gtk_print_operation_preview_base_init): Fix errors in the
+       signal definitions.  (#344891, Marko Anastasov)
+
 2006-06-14  Michael Emmel  <mike.emmel@gmail.com>
        * configure.in: updated mininum  dfb to 0.9.24
        * gdk/directfb/gdkdirectfb.h: added more directfb wrapper functions

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1c4015d5bae2c39e7aea0109f9cc6848f1e09796..19688c625656441db2fb4d54b17a5f25031a8661 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkprintoperationpreview.c 
+       (gtk_print_operation_preview_base_init): Fix errors in the
+       signal definitions.  (#344891, Marko Anastasov)
+
 2006-06-14  Michael Emmel  <mike.emmel@gmail.com>
        * configure.in: updated mininum  dfb to 0.9.24
        * gdk/directfb/gdkdirectfb.h: added more directfb wrapper functions

diff --git a/gtk/gtkprintoperationpreview.c b/gtk/gtkprintoperationpreview.c
index c0252b7b94d431dce17fc4df47f08bb8ac4ba753..776fb362026ad80cdc0895e80051025cc5e68081 100644 (file)
--- a/gtk/gtkprintoperationpreview.c
+++ b/gtk/gtkprintoperationpreview.c
@@ -72,12 +72,12 @@ gtk_print_operation_preview_base_init (gpointer g_iface)
                    NULL, NULL,
                    g_cclosure_marshal_VOID__OBJECT,
                    G_TYPE_NONE, 1,
-                   G_TYPE_OBJECT);
+                   GTK_TYPE_PRINT_CONTEXT);
 
       g_signal_new (I_("got-page-size"),
                    GTK_TYPE_PRINT_OPERATION_PREVIEW,
                    G_SIGNAL_RUN_LAST,
-                   G_STRUCT_OFFSET (GtkPrintOperationPreviewIface, ready),
+                   G_STRUCT_OFFSET (GtkPrintOperationPreviewIface, got_page_size),
                    NULL, NULL,
                    _gtk_marshal_VOID__OBJECT_OBJECT,
                    G_TYPE_NONE, 2,
@@ -111,7 +111,7 @@ gboolean
 gtk_print_operation_preview_is_selected (GtkPrintOperationPreview *preview,
                                         gint                      page_nr)
 {
-  g_return_if_fail (GTK_IS_PRINT_OPERATION_PREVIEW (preview));
+  g_return_val_if_fail (GTK_IS_PRINT_OPERATION_PREVIEW (preview), FALSE);
 
   return GTK_PRINT_OPERATION_PREVIEW_GET_IFACE (preview)->is_selected (preview, page_nr);
 }