diff --git a/ChangeLog b/ChangeLog
index 2911d9d388..22df5f8f82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-29  Matthias Clasen  <mclasen@redhat.com>
+
+	Merge from trunk:
+
+	* gtk/gtkprintoperation.c (print_pages_idle): Also check
+	the default handler when deciding whether to emit the
+	paginate signal.  (#345345, Yevgen Muntyan)
+
 2007-04-29  Matthias Clasen  <mclasen@redhat.com>
 
 	Merge from trunk:
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 56d7e0b0fb..cf2e9c08aa 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -2063,7 +2063,8 @@ print_pages_idle (gpointer user_data)
 	  goto out;
 	}
       
-      if (g_signal_has_handler_pending (data->op, signals[PAGINATE], 0, FALSE))
+      if (GTK_PRINT_OPERATION_GET_CLASS (data->op)->paginage != NULL ||
+          g_signal_has_handler_pending (data->op, signals[PAGINATE], 0, FALSE))
 	{
 	  gboolean paginated = FALSE;