PATCH: Some random stuff

[Dave Bordoley <bordoley msu edu>]

Does a few things...
1. Don't build the help directory since we aren't using it anyway...

2. Changes the names of the callbacks for "backgrounds and emblems" and
preferences so that the code is clearer. I got really confused while
playing around, so i thought others might find this useful. (no user
visible string changes)

3. Removes unused code for eazel customer feedback

4. Adds l mneumonic to clear button in the clear history dialog cuz it
should have one right???

related to 1. There are alot of empty directories in cvs nautilus, any
reason we don't just remove them????

dave

? patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5331
diff -p -u -r1.5331 ChangeLog
--- ChangeLog	2002/05/24 21:53:52	1.5331
+++ ChangeLog	2002/05/25 09:20:16
@@ -1,3 +1,17 @@
+2002-05-25  David Bordoley <bordoley msu edu>
+
+	* Makefile.am
+	Dont build help directory since we no longer use it
+
+	*src/nautilus-window-menus.c
+	*src/nautilus-shell-ui.xml
+	Changed names of callbacks for "backgrounds and emblems" and preferences
+	to make them more descriptive.
+
+	*src/nautilus-windows-menus.c
+	Removed unused code relating to eazel customer feedback
+	Added 'l' mneumonic for clear button in the clear history dialog
+
 2002-05-24  Anders Carlsson  <andersca gnu org>
 
 	* src/file-manager/fm-desktop-icon-view.c: (volume_ops_callback):
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/Makefile.am,v
retrieving revision 1.70
diff -p -u -r1.70 Makefile.am
--- Makefile.am	2002/03/04 04:29:56	1.70
+++ Makefile.am	2002/05/25 09:20:17
@@ -18,7 +18,6 @@ SUBDIRS =			\
 	data 			\
 	icons 			\
 	user-guide		\
-	help			\
 	omf-install		\
 	docs			\
 	$(NULL)
Index: src/nautilus-shell-ui.xml
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-shell-ui.xml,v
retrieving revision 1.93
diff -p -u -r1.93 nautilus-shell-ui.xml
--- src/nautilus-shell-ui.xml	2002/05/22 16:26:29	1.93
+++ src/nautilus-shell-ui.xml	2002/05/25 09:20:23
@@ -131,16 +131,16 @@
 		
 		<separator/>
 
-		<menuitem name="Customize" 
+		<menuitem name="Backgrounds and Emblems" 
 			  _label="_Backgrounds and Emblems..." 
 			  _tip="Display patterns, colors, and emblems that can be used to customize appearance"
-			  verb="Customize"/>
+			  verb="Backgrounds and Emblems"/>
 		
-		<menuitem name="User Level Customization" 
+		<menuitem name="Preferences" 
 			  _label="P_references" 
 			  _tip="Edit Nautilus preferences"
 			  pixtype="stock" pixname="gtk-preferences" 
-			  verb="User Level Customization"/>
+			  verb="Preferences"/>
 	</submenu>
 
 	<submenu name="View" _label="_View">
Index: src/nautilus-window-menus.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-menus.c,v
retrieving revision 1.241
diff -p -u -r1.241 nautilus-window-menus.c
--- src/nautilus-window-menus.c	2002/05/22 10:24:18	1.241
+++ src/nautilus-window-menus.c	2002/05/25 09:20:26
@@ -92,7 +92,6 @@
 #define COMMAND_PATH_CLOSE_WINDOW			"/commands/Close"
 
 #define USER_MANUAL_URI		"help:nautilus-user-manual"
-#define CUSTOMER_FEEDBACK_URI	"http://www.eazel.com/feedback.html";
 #define START_HERE_URI          "start-here:"
 
 #define RESPONSE_FORGET		1000
@@ -162,7 +161,6 @@ bookmark_holder_free (BookmarkHolder *bo
  * don't want other code relying on their existence.
  */
 
-#define NAUTILUS_MENU_PATH_CUSTOMIZE_ITEM			"/menu/Edit/Customization"
 
 static void
 bookmark_holder_free_cover (gpointer callback_data, GClosure *closure)
@@ -351,7 +349,7 @@ forget_history_if_confirmed (NautilusWin
 	dialog = eel_create_question_dialog (prompt,
 					     _("Clear History?"), 
 					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					     _("Clear"), RESPONSE_FORGET,
+					     _("C_lear"), RESPONSE_FORGET,
 					     GTK_WINDOW (window));
 
 	gtk_widget_show (GTK_WIDGET (dialog));
@@ -525,7 +523,7 @@ bookmarks_menu_edit_bookmarks_callback (
 }
 
 static void
-user_level_customize_callback (BonoboUIComponent *component, 
+preferences_callback (BonoboUIComponent *component, 
 			       gpointer user_data, 
 			       const char *verb)
 {
@@ -533,7 +531,7 @@ user_level_customize_callback (BonoboUIC
 }
 
 static void
-customize_callback (BonoboUIComponent *component, 
+backgrounds_and_emblems_callback (BonoboUIComponent *component, 
 		    gpointer user_data, 
 		    const char *verb)
 {
@@ -637,15 +635,6 @@ help_menu_nautilus_manual_callback (Bono
 }
 
 static void
-help_menu_nautilus_feedback_callback (BonoboUIComponent *component, 
-			              gpointer user_data, 
-			              const char *verb)
-{
-	nautilus_window_go_to (NAUTILUS_WINDOW (user_data),
-			       CUSTOMER_FEEDBACK_URI);
-}
-
-static void
 remove_bookmarks_for_uri_if_yes (GtkDialog *dialog, int response, gpointer callback_data)
 {
 	const char *uri;
@@ -1086,7 +1075,7 @@ nautilus_window_initialize_menus_part_1 
 		BONOBO_UI_VERB ("Toggle Find Mode", toolbar_toggle_find_mode_callback),
 #endif
 		BONOBO_UI_VERB ("Undo", edit_menu_undo_callback),
-		BONOBO_UI_VERB ("Customize", customize_callback),
+		BONOBO_UI_VERB ("Backgrounds and Emblems", backgrounds_and_emblems_callback),
 		BONOBO_UI_VERB ("Back", go_menu_back_callback),
 		BONOBO_UI_VERB ("Forward", go_menu_forward_callback),
 		BONOBO_UI_VERB ("Up", go_menu_up_callback),
@@ -1115,8 +1104,7 @@ nautilus_window_initialize_menus_part_1 
 
 		BONOBO_UI_VERB ("About Nautilus", help_menu_about_nautilus_callback),
 		BONOBO_UI_VERB ("Nautilus Manual", help_menu_nautilus_manual_callback),
-		BONOBO_UI_VERB ("Nautilus Feedback", help_menu_nautilus_feedback_callback),
-		BONOBO_UI_VERB ("User Level Customization", user_level_customize_callback),
+		BONOBO_UI_VERB ("Preferences", preferences_callback),
 		BONOBO_UI_VERB ("Stop", stop_button_callback),
 
 		BONOBO_UI_VERB_END