summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-04-25 16:28:30 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-04-25 16:28:30 +0000
commitaa3f2a792aceef378a5456e72f59dc023b039061 (patch)
treebf6e8af29022cce85deb2c7fd5d7419386c11789
parent75efa95acbded5faf2bb3c46352534217f55f8ea (diff)
downloadgtk+-aa3f2a792aceef378a5456e72f59dc023b039061.tar.gz
Don't crash if end_run is not set. (#424168, Matthias Hasselmann)
2007-04-25 Matthias Clasen <mclasen@redhat.com> * gtk/gtkprintoperation.c (preview_iface_end_preview): Don't crash if end_run is not set. (#424168, Matthias Hasselmann) svn path=/trunk/; revision=17636
-rw-r--r--ChangeLog5
-rw-r--r--gtk/gtkprintoperation.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d2e01b829..b343ae3c67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-25 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkprintoperation.c (preview_iface_end_preview): Don't
+ crash if end_run is not set. (#424168, Matthias Hasselmann)
+
2007-04-25 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenu.c (gtk_menu_handle_scrolling): fix ACTIVE state of
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index d40465b04b..c04abbc431 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -186,8 +186,9 @@ preview_iface_end_preview (GtkPrintOperationPreview *preview)
if (op->priv->rloop)
g_main_loop_quit (op->priv->rloop);
-
- op->priv->end_run (op, op->priv->is_sync, TRUE);
+
+ if (op->priv->end_run)
+ op->priv->end_run (op, op->priv->is_sync, TRUE);
g_signal_emit (op, signals[DONE], 0,
GTK_PRINT_OPERATION_RESULT_APPLY);