Re: [PATCH] Remove "Use Default Background" from context menu

[Jaap Haitsma <jaap haitsma org>]

Alexander Larsson wrote:
> On Sun, 2004-08-29 at 15:11, Jaap Haitsma wrote:
>
> > Hi,
> >
> > This is my first contribution, so please tell me if I do something 
> > wrong. Ironically my first contribution only removes code.
> >
> > In order to reduce clutter in the context menu this patch removes "Use 
> > Default Background" from the context menu. The user should just select 
> > Change Desktop Background and then select the default one.
> >
> >
> > See also http://bugzilla.gnome.org/show_bug.cgi?id=131790 for a 
> > description of this. I attached the patch also overthere.
>
>
> I agree that its a bit silly on the desktop context menu, but the patch
> removes it everywhere. I'm not sure thats right, since it removes the
> only way to get from a folder-specific background to using the gloabl
> default folder background.
Here's a patch which only removes it from the desktop context menu.
It's also attached in bugzilla. Is it good practice to send it both to 
the mailing list and put it in bugzilla? Or should I do it differently

Index: fm-desktop-icon-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-desktop-icon-view.c,v
retrieving revision 1.214
diff -u -r1.214 fm-desktop-icon-view.c
--- fm-desktop-icon-view.c	8 Jun 2004 17:35:10 -0000	1.214
+++ fm-desktop-icon-view.c	31 Aug 2004 21:38:49 -0000
@@ -607,16 +607,6 @@
 	nautilus_file_operations_empty_trash (GTK_WIDGET (data));
 }
 
-static void
-reset_background_callback (BonoboUIComponent *component, 
-			   gpointer data, 
-			   const char *verb)
-{
-	eel_background_reset 
-		(fm_directory_view_get_background 
-		 (FM_DIRECTORY_VIEW (data)));
-}
-
 static gboolean
 trash_link_is_selection (FMDirectoryView *view)
 {
@@ -657,6 +647,10 @@
 
 	bonobo_ui_component_freeze (desktop_view->details->ui, NULL);
 
+	nautilus_bonobo_set_hidden 
+		(desktop_view->details->ui, 
+		 FM_DIRECTORY_VIEW_COMMAND_RESET_BACKGROUND, 
+		 TRUE);
 	/* Empty Trash */
 	include_empty_trash = trash_link_is_selection (view);
 	nautilus_bonobo_set_hidden
@@ -689,7 +683,6 @@
 		BONOBO_UI_VERB ("Empty Trash Conditional", empty_trash_callback),
 		BONOBO_UI_VERB ("New Terminal", new_terminal_callback),
 		BONOBO_UI_VERB ("New Launcher Desktop", new_launcher_callback),
-		BONOBO_UI_VERB ("Reset Background", reset_background_callback),
 		BONOBO_UI_VERB_END
 	};
 
Index: nautilus-desktop-icon-view-ui.xml
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/nautilus-desktop-icon-view-ui.xml,v
retrieving revision 1.18
diff -u -r1.18 nautilus-desktop-icon-view-ui.xml
--- nautilus-desktop-icon-view-ui.xml	5 Nov 2003 16:20:01 -0000	1.18
+++ nautilus-desktop-icon-view-ui.xml	31 Aug 2004 21:38:50 -0000
@@ -14,9 +14,6 @@
         <cmd name="New Launcher Desktop"
          _label="Create L_auncher"
          _tip="Create a new launcher"/>
-        <cmd name="Reset Background"
-         _label="Use _Default Background"
-         _tip="Use the default desktop background"/>
 </commands>
 <menu>
 	<!-- By re-labelling these submenus to names without underscores, we
@@ -45,7 +42,6 @@
                 </placeholder>
                 <placeholder name="After Zoom Items">
                         <placeholder name="Background Items">
-                                <menuitem name="Use Default Background" verb="Reset Background"/>
                                 <menuitem name="Change Background" verb="Change Background"/>
                         </placeholder>
                 </placeholder>