Revert the change on 2007-04-29 (Also check the default handler when

2007-10-05  Murray Cumming  <murrayc@murrayc.com>

* gtk/gtkprintoperation.c: (print_pages_idle):
Revert the change on 2007-04-29 (Also check
the default handler when deciding whether to emit the
paginate signal.  (#345345, Yevgen Muntyan)).
This stopped printing from working in gtkmm, and is apparently
not appropriate anyway. Bug #482089.

svn path=/trunk/; revision=18885

diff --git a/ChangeLog b/ChangeLog
index d6c8c5d167f4818d69e7cb3a9fad514fc8671c38..bda668c09e150c83abf3322c04a4bdedb22f740e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-05  Murray Cumming  <murrayc@murrayc.com>
+
+       * gtk/gtkprintoperation.c: (print_pages_idle):
+       Revert the change on 2007-04-29 ("Also check
+       the default handler when deciding whether to emit the
+       paginate signal.  (#345345, Yevgen Muntyan)").
+       This stopped printing from working in gtkmm, and is apparently 
+       not appropriate anyway. Bug #482089.
+
 2007-10-05  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
        * gtk/gtkdnd.c: Use g_object_ref() instead of gtk_widget_ref().

diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 4519cd24fba5673412e4b4a2eff588a04b8c11dc..5d2740f5a65437f2d0111501fce6bf96c8306901 100644 (file)
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -2080,8 +2080,7 @@ print_pages_idle (gpointer user_data)
          goto out;
        }
       
-      if (GTK_PRINT_OPERATION_GET_CLASS (data->op)->paginate != NULL ||
-          g_signal_has_handler_pending (data->op, signals[PAGINATE], 0, FALSE))
+      if (g_signal_has_handler_pending (data->op, signals[PAGINATE], 0, FALSE))
        {
          gboolean paginated = FALSE;