galeon r8960 - in trunk: . src utils



Author: philipl
Date: Sun Apr 20 21:15:21 2008
New Revision: 8960
URL: http://svn.gnome.org/viewvc/galeon?rev=8960&view=rev

Log:
2008-04-20  Philip Langdale  <philipl alumni utexas net>

	* galeon.schemas.in
	* src/galeon-window.c
	* utils/prefs-strings.h: Add gconf pref to make close
	confirmation optional for pages with modified forms.

	Patch by Paul Dwerryhouse <paul dwerryhouse com au>



Modified:
   trunk/ChangeLog
   trunk/galeon.schemas.in
   trunk/src/galeon-window.c
   trunk/utils/prefs-strings.h

Modified: trunk/galeon.schemas.in
==============================================================================
--- trunk/galeon.schemas.in	(original)
+++ trunk/galeon.schemas.in	Sun Apr 20 21:15:21 2008
@@ -39,6 +39,18 @@
         </locale>
       </schema>
       <schema>
+        <key>/schemas/apps/galeon/Browsing/General/confirm_close</key>
+        <applyto>/apps/galeon/Browsing/General/confirm_close</applyto>
+        <owner>galeon</owner>
+        <type>bool</type>
+        <default>true</default>
+        <locale name="C">
+        <short>Confirm close</short>
+	<long>If true, Galeon will always ask for confirmation, when you 
+	try to close a window with modified forms.</long>
+        </locale>
+      </schema>
+      <schema>
         <key>/schemas/apps/galeon/Browsing/General/offline</key>
         <applyto>/apps/galeon/Browsing/General/offline</applyto>
         <owner>galeon</owner>

Modified: trunk/src/galeon-window.c
==============================================================================
--- trunk/src/galeon-window.c	(original)
+++ trunk/src/galeon-window.c	Sun Apr 20 21:15:21 2008
@@ -915,7 +915,8 @@
 		embed = galeon_tab_get_embed (tab);
 		g_return_val_if_fail (GALEON_IS_EMBED (embed), FALSE);
 
-		if (galeon_embed_has_modified_forms (embed) && 
+		if (eel_gconf_get_boolean(CONF_GENERAL_CONFIRM_CLOSE) && 
+		    galeon_embed_has_modified_forms (embed) && 
 		    confirm_close_with_modified_forms (window, tab) == FALSE)
 		{
 			allow_close = FALSE;
@@ -2420,7 +2421,8 @@
 
 	embed = galeon_tab_get_embed (tab);
 	
-	if (galeon_embed_has_modified_forms (GALEON_EMBED (embed)) &&
+	if (eel_gconf_get_boolean(CONF_GENERAL_CONFIRM_CLOSE) && 
+	    galeon_embed_has_modified_forms (GALEON_EMBED (embed)) &&
 	    confirm_close_with_modified_forms (window, tab) == FALSE)
 	{
 		return FALSE;
@@ -3799,7 +3801,8 @@
 	g_return_val_if_fail (GALEON_IS_TAB (child), FALSE);
 	embed = galeon_tab_get_embed (GALEON_TAB (child));
 
-	if (galeon_embed_has_modified_forms (GALEON_EMBED (embed)))
+	if (eel_gconf_get_boolean(CONF_GENERAL_CONFIRM_CLOSE) && 
+	    galeon_embed_has_modified_forms (GALEON_EMBED (embed)))
 	{
 		return !confirm_close_with_modified_forms (window, GALEON_TAB (child));
 	}

Modified: trunk/utils/prefs-strings.h
==============================================================================
--- trunk/utils/prefs-strings.h	(original)
+++ trunk/utils/prefs-strings.h	Sun Apr 20 21:15:21 2008
@@ -2,6 +2,7 @@
 #define CONF_GENERAL_HOMEPAGE "/apps/galeon/Browsing/General/startpage"
 #define CONF_GENERAL_ALWAYS_SAVE_SESSION "/apps/galeon/Browsing/General/always_save_session"
 #define CONF_GENERAL_NEWPAGE_TYPE "/apps/galeon/Browsing/General/newpage_type"
+#define CONF_GENERAL_CONFIRM_CLOSE "/apps/galeon/Browsing/General/confirm_close"
 #define CONF_GENERAL_OFFLINE "/apps/galeon/Browsing/General/offline"
 
 /* Bookmarks */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]