[Nautilus-list] [PATCH] for bugs 72931 and 74907

[Diego González <diego pemas net>]

as it says, one of then was suggested by the HIG (as it reads the bug)
and the other one is the removal of the favorites icon in the start-here
view, it never worked.

regards,
Diego


Index: nautilus-preferences-dialog.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-preferences-dialog.c,v
retrieving revision 1.27
diff -u -r1.27 nautilus-preferences-dialog.c
--- nautilus-preferences-dialog.c	7 Apr 2002 19:42:17 -0000	1.27
+++ nautilus-preferences-dialog.c	19 Apr 2002 11:38:04 -0000
@@ -68,17 +68,7 @@
 	{ NULL }
 };
 
-static EelPreferencesItemDescription windows_and_desktop_items[] = {
-	{ N_("Desktop"),
-	  NAUTILUS_PREFERENCES_SHOW_DESKTOP,
-	  N_("Use Nautilus to draw the desktop"),
-	  EEL_PREFERENCE_ITEM_BOOLEAN
-	},
-        { N_("Desktop"),
-	  NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR,
-	  N_("Use your home folder as the desktop"),
-	  EEL_PREFERENCE_ITEM_BOOLEAN
-	},
+static EelPreferencesItemDescription windows_items[] = {
 	{ N_("Opening New Windows"),
 	  NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW,
 	  N_("Open each file or folder in a separate window"),
@@ -104,6 +94,20 @@
 	  N_("Display sidebar in new windows"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
+	{ NULL }
+};
+
+static EelPreferencesItemDescription desktop_and_trash_items[] = {
+	{ N_("Desktop"),
+	  NAUTILUS_PREFERENCES_SHOW_DESKTOP,
+	  N_("Use Nautilus to draw the desktop"),
+	  EEL_PREFERENCE_ITEM_BOOLEAN
+	},
+        { N_("Desktop"),
+	  NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR,
+	  N_("Use your home folder as the desktop"),
+	  EEL_PREFERENCE_ITEM_BOOLEAN
+	},
 	{ N_("Trash Behavior"),
 	  NAUTILUS_PREFERENCES_CONFIRM_TRASH,
 	  N_("Ask before emptying the Trash or deleting files"),
@@ -379,7 +383,8 @@
 static EelPreferencesPaneDescription panes[] = {
 	{ N_("View Preferences"),	  view_preferences_items },
 	{ N_("Appearance"),		  appearance_items },
-	{ N_("Windows & Desktop"),	  windows_and_desktop_items },
+	{ N_("Windows"),	  	  windows_items },
+	{ N_("Desktop & Trash"),	  desktop_and_trash_items },
 	{ N_("Icon & List Views"),	  directory_views_items },
 	{ N_("Icon Captions"),		  icon_captions_items },
 	{ N_("Sidebar Panels"),		  sidebar_items },

Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/data/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- Makefile.am	14 Dec 2001 13:40:34 -0000	1.18
+++ Makefile.am	19 Apr 2002 11:35:19 -0000
@@ -3,7 +3,7 @@
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_DIRECTORY_RULE@
 
-DESKTOP_IN_FILES=	favorites.desktop.in		\
+DESKTOP_IN_FILES=					\
 			applications.desktop.in		\
 			starthere.desktop.in		\
 			sysconfig.desktop.in		\
@@ -21,7 +21,7 @@
 DIRECTORY_FILES=$(DIRECTORY_IN_FILES:.directory.in=.directory)
 
 startheredir= $(sysconfdir)/X11/starthere
-starthere_DATA= 	favorites.desktop	\
+starthere_DATA= 				\
 			applications.desktop	\
 			sysconfig.desktop	\
 			preferences.desktop	\