aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/ephy-window.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ad7067c44..21e1d64f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
2006-08-07 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-window.c:
+
+ Don't allow closing the window if quit is locked down.
+ Patch by Diego Escalante Urrelo, bug #320091.
+
+2006-08-07 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/ephy-window.c:
* src/ephy-history-window.c:
Avoid accels on thin characters. Patch by
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 10c2ce1da..d7722a0be 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -911,6 +911,10 @@ ephy_window_delete_event (GtkWidget *widget,
GList *tabs, *l;
gboolean modified = FALSE;
+ /* We ignore the delete_event if the disable_quit lockdown has been set
+ */
+ if (eel_gconf_get_boolean("/apps/epiphany/lockdown/disable_quit")) return TRUE;
+
/* Workaround a crash when closing a window while in print preview mode. See
* mozilla bug #241809. /
* Go back to normal mode instead of closing, see bug #326136.