aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-01-08 22:58:32 +0800
committerChristian Persch <chpe@src.gnome.org>2006-01-08 22:58:32 +0800
commit59442d11a620383fa54ab0416f4a7257dc50543c (patch)
tree47787074d4ab2e950a4d5eec4fd2c5235be58ac6
parent15130661034c26f7b4040c2bb49ffac94b4694ba (diff)
downloadgsoc2013-epiphany-59442d11a620383fa54ab0416f4a7257dc50543c.tar
gsoc2013-epiphany-59442d11a620383fa54ab0416f4a7257dc50543c.tar.gz
gsoc2013-epiphany-59442d11a620383fa54ab0416f4a7257dc50543c.tar.bz2
gsoc2013-epiphany-59442d11a620383fa54ab0416f4a7257dc50543c.tar.lz
gsoc2013-epiphany-59442d11a620383fa54ab0416f4a7257dc50543c.tar.xz
gsoc2013-epiphany-59442d11a620383fa54ab0416f4a7257dc50543c.tar.zst
gsoc2013-epiphany-59442d11a620383fa54ab0416f4a7257dc50543c.zip
Exit ppv mode when clicking the window close button. Bug #326136.
2006-01-08 Christian Persch <chpe@cvs.gnome.org> * src/ephy-window.c: (ephy_window_delete_event): Exit ppv mode when clicking the window close button. Bug #326136.
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-window.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 92511f437..8fdbabeba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-01-08 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-window.c: (ephy_window_delete_event):
+
+ Exit ppv mode when clicking the window close button. Bug #326136.
+
+2006-01-08 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/ContentHandler.cpp:
Make ESC cancel the content handler dialogue. Bug #325811.
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 7f49315c8..2d6dbd37a 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -862,7 +862,8 @@ ephy_window_delete_event (GtkWidget *widget,
gboolean modified = FALSE;
/* Workaround a crash when closing a window while in print preview mode. See
- * mozilla bug #241809
+ * mozilla bug #241809. /
+ * Go back to normal mode instead of closing, see bug #326136.
*/
if (priv->ppv_mode)
{
@@ -872,6 +873,8 @@ ephy_window_delete_event (GtkWidget *widget,
ephy_embed_set_print_preview_mode (embed, FALSE);
ephy_window_set_print_preview (window, FALSE);
+
+ return TRUE;
}
tabs = ephy_window_get_tabs (window);