gconf-editor r1435 - in trunk: . src

[vuntz svn gnome org]

Author: vuntz
Date: Thu Oct 30 14:27:43 2008
New Revision: 1435
URL: http://svn.gnome.org/viewvc/gconf-editor?rev=1435&view=rev

Log:
2008-10-30  Vincent Untz  <vuntz gnome org>

	* src/gconf-editor-application.c:
	(gconf_editor_application_create_editor_window):
	* src/gconf-editor-window.c: (list_view_button_press_event),
	(gconf_editor_window_list_view_popup_menu):
	Correctly set sensitivity of context menu items for
	Unset/SetDefault/SetMandatory instead of having the items nearly always
	sensitive.
	Fix bug #558483


Modified:
   trunk/ChangeLog
   trunk/src/gconf-editor-application.c
   trunk/src/gconf-editor-window.c

Modified: trunk/src/gconf-editor-application.c
==============================================================================
--- trunk/src/gconf-editor-application.c	(original)
+++ trunk/src/gconf-editor-application.c	Thu Oct 30 14:27:43 2008
@@ -55,23 +55,13 @@
 	gconf_tree_model_set_client (GCONF_TREE_MODEL (gconfwindow->tree_model), gconfwindow->client);
 	gconf_list_model_set_client (GCONF_LIST_MODEL (gconfwindow->list_model), gconfwindow->client);
 
-	if (!gconf_util_can_edit_defaults ()) {
-		gtk_widget_set_sensitive (gtk_ui_manager_get_widget (gconfwindow->ui_manager, "/GConfKeyPopupMenu/DefaultKey"),
-					  FALSE);
+	if (!gconf_util_can_edit_defaults ())
 		gtk_action_set_sensitive (gtk_ui_manager_get_action (gconfwindow->ui_manager, "/GConfEditorMenu/FileMenu/NewDefaultsWindow"),
 					  FALSE);
-	} else if (gconfwindow->type == GCONF_EDITOR_WINDOW_TYPE_DEFAULTS)
-		gtk_widget_set_sensitive (gtk_ui_manager_get_widget (gconfwindow->ui_manager, "/GConfKeyPopupMenu/DefaultKey"),
-					  FALSE);
 
-	if (!gconf_util_can_edit_mandatory ()) {
-		gtk_widget_set_sensitive (gtk_ui_manager_get_widget (gconfwindow->ui_manager, "/GConfKeyPopupMenu/MandatoryKey"),
-					  FALSE);
+	if (!gconf_util_can_edit_mandatory ())
 		gtk_action_set_sensitive (gtk_ui_manager_get_action (gconfwindow->ui_manager, "/GConfEditorMenu/FileMenu/NewMandatoryWindow"),
 					  FALSE);
-	} else if (gconfwindow->type == GCONF_EDITOR_WINDOW_TYPE_MANDATORY)
-		gtk_widget_set_sensitive (gtk_ui_manager_get_widget (gconfwindow->ui_manager, "/GConfKeyPopupMenu/MandatoryKey"),
-					  FALSE);
 	
 	g_signal_connect (window, "destroy",
 			  G_CALLBACK (gconf_editor_application_window_destroyed), NULL);

Modified: trunk/src/gconf-editor-window.c
==============================================================================
--- trunk/src/gconf-editor-window.c	(original)
+++ trunk/src/gconf-editor-window.c	Thu Oct 30 14:27:43 2008
@@ -895,11 +895,13 @@
 			gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/EditKey"), 
 						  TRUE);
 			gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/UnsetKey"), 
-						  TRUE);
+						  window->type != GCONF_EDITOR_WINDOW_TYPE_DEFAULTS);
 			gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/DefaultKey"), 
-						  TRUE);
+						  gconf_util_can_edit_defaults () &&
+						  window->type != GCONF_EDITOR_WINDOW_TYPE_DEFAULTS);
 			gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/MandatoryKey"), 
-						  TRUE);
+						  gconf_util_can_edit_mandatory () &&
+						  window->type != GCONF_EDITOR_WINDOW_TYPE_MANDATORY);
 			
 			gtk_tree_path_free (path);
 		}
@@ -996,11 +998,13 @@
 		gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/EditKey"), 
 					  TRUE);
 		gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/UnsetKey"), 
-					  TRUE);
+					  window->type != GCONF_EDITOR_WINDOW_TYPE_DEFAULTS);
 		gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/DefaultKey"), 
-					  TRUE);
+					  gconf_util_can_edit_defaults () &&
+					  window->type != GCONF_EDITOR_WINDOW_TYPE_DEFAULTS);
 		gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/MandatoryKey"), 
-					  TRUE);
+					  gconf_util_can_edit_mandatory () &&
+					  window->type != GCONF_EDITOR_WINDOW_TYPE_MANDATORY);
 			
 	}
 	else {