gedit r6222 - in trunk: . gedit

[pborelli svn gnome org]

Author: pborelli
Date: Sat Mar 22 13:52:16 2008
New Revision: 6222
URL: http://svn.gnome.org/viewvc/gedit?rev=6222&view=rev

Log:
2008-03-18  Paolo Borelli  <pborelli katamail com>

	* gedit/gedit-window.c: make search actions sensitive while
	notifying external modification. Patch by Alon Zakai, bug #519797.



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-window.c

Modified: trunk/gedit/gedit-window.c
==============================================================================
--- trunk/gedit/gedit-window.c	(original)
+++ trunk/gedit/gedit-window.c	Sat Mar 22 13:52:16 2008
@@ -705,7 +705,8 @@
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "EditCopy");
 	gtk_action_set_sensitive (action,
-				  state_normal &&
+				  (state_normal ||
+				   state == GEDIT_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) &&
 				  gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (doc)));
 				  
 	action = gtk_action_group_get_action (window->priv->action_group,
@@ -729,12 +730,14 @@
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "SearchFind");
 	gtk_action_set_sensitive (action,
-				  state_normal);
+				  (state_normal ||
+				   state == GEDIT_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION));
 
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "SearchIncrementalSearch");
 	gtk_action_set_sensitive (action,
-				  state_normal);
+				  (state_normal ||
+				   state == GEDIT_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION));
 
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "SearchReplace");
@@ -744,20 +747,27 @@
 	b = gedit_document_get_can_search_again (doc);
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "SearchFindNext");
-	gtk_action_set_sensitive (action, state_normal && b);
+	gtk_action_set_sensitive (action,
+				  (state_normal ||
+				   state == GEDIT_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) && b);
 
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "SearchFindPrevious");
-	gtk_action_set_sensitive (action, state_normal && b);
+	gtk_action_set_sensitive (action,
+				  (state_normal ||
+				   state == GEDIT_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) && b);
 
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "SearchClearHighlight");
-	gtk_action_set_sensitive (action, state_normal && b);
-
+	gtk_action_set_sensitive (action,
+				  (state_normal ||
+				   state == GEDIT_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) && b);
 
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "SearchGoToLine");
-	gtk_action_set_sensitive (action, state_normal);
+	gtk_action_set_sensitive (action,
+				  (state_normal ||
+				   state == GEDIT_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION));
 	
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "ViewHighlightMode");
@@ -2419,7 +2429,8 @@
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "EditCopy");
 	gtk_action_set_sensitive (action,
-				  state_normal &&
+				  (state_normal ||
+				   state == GEDIT_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) &&
 				  gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (doc)));
 
 	action = gtk_action_group_get_action (window->priv->action_group,