PATCH for some random stuff.

[Dave Bordoley <bordoley msu edu>]

It's my understanding that nautilus will never again use xalf so i
removed all code references to xalf. (Also changed the schema, is this
ok?)

Also removed an unused define in the menu code for the old nautilus
help.

Finally I removed the oh so annoying switch to manual layout dialog.
Basically this dialog pops up on me daily and i find it pretty annoying
(i think other users do too). IMHO when I choose to use automatic
layout, I have made my choice. I don't need nautilus constantly asking
me if I want to change. Removing this dialog make nautilus's behavior
consistent with that of Mac OS finder as well.

dave

? patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5379
diff -p -u -r1.5379 ChangeLog
--- ChangeLog	25 Jun 2002 01:17:46 -0000	1.5379
+++ ChangeLog	25 Jun 2002 06:57:13 -0000
@@ -1,3 +1,18 @@
+2002-06-25 David Bordoley <bordoley msu edu>
+	
+	* libnautilus-private/apps_nautilus_preferences.schemas
+	* libnautilus-private/nautilus-global-preferences.c
+	* libnautilus-private/nautilus-global-preferences.h
+	* libnautilus-private/nautilus-program-choosing.c
+	Removed xalf preferences and all remaining code references 
+	to xalf since we no longer support xalf in nautilus. 
+
+	* src/nautilus-window-menus.c
+	Removed unused define for old help.
+
+	* libnautilus-private/nautilus-icon-dnd.c
+	Removed the annoying switch to manual layout prompt.	
+
 2002-06-25  Mark McLoughlin  <mark skynet ie>
 
 	* src/file-manager/fm-desktop-icon-view.c:
Index: libnautilus-private/apps_nautilus_preferences.schemas
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/apps_nautilus_preferences.schemas,v
retrieving revision 1.6
diff -p -u -r1.6 apps_nautilus_preferences.schemas
--- libnautilus-private/apps_nautilus_preferences.schemas	2 Jun 2002 03:25:05 -0000	1.6
+++ libnautilus-private/apps_nautilus_preferences.schemas	25 Jun 2002 06:57:18 -0000
@@ -22,36 +22,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/nautilus/preferences/xalf/enabled</key>
-      <applyto>/apps/nautilus/preferences/xalf/enabled</applyto>
-      <owner>nautilus</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Whether to use xalf</short>
-         <long>
-          If set to true, then Xalf will be used to provide
-	  application launch feedback.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/nautilus/preferences/xalf/options</key>
-      <applyto>/apps/nautilus/preferences/xalf/options</applyto>
-      <owner>nautilus</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <locale name="C">
-         <short>xalf options</short>
-         <long>
-	  a set of strings which are passed as options to Xalf if
-	  it is used.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/nautilus/preferences/show_backup_files</key>
       <applyto>/apps/nautilus/preferences/show_backup_files</applyto>
       <owner>nautilus</owner>
Index: libnautilus-private/nautilus-global-preferences.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-global-preferences.c,v
retrieving revision 1.202
diff -p -u -r1.202 nautilus-global-preferences.c
--- libnautilus-private/nautilus-global-preferences.c	13 May 2002 03:45:25 -0000	1.202
+++ libnautilus-private/nautilus-global-preferences.c	25 Jun 2002 06:57:20 -0000
@@ -342,16 +342,6 @@ static const PreferenceDefault preferenc
 	  NULL, NULL,
 	  "click_policy"
 	},
-	{ NAUTILUS_PREFERENCES_XALF_ENABLED,
-	  PREFERENCE_BOOLEAN,
-	  GINT_TO_POINTER (TRUE),
-	  NULL, NULL, NULL
-	},
-	{ NAUTILUS_PREFERENCES_XALF_OPTIONS,
-	  PREFERENCE_STRING_LIST,
-	  "",
-	  NULL, NULL, NULL
-	},
 	{ NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION,
 	  PREFERENCE_STRING,
 	  "ask",
Index: libnautilus-private/nautilus-global-preferences.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-global-preferences.h,v
retrieving revision 1.112
diff -p -u -r1.112 nautilus-global-preferences.h
--- libnautilus-private/nautilus-global-preferences.h	11 May 2002 23:53:49 -0000	1.112
+++ libnautilus-private/nautilus-global-preferences.h	25 Jun 2002 06:57:21 -0000
@@ -63,10 +63,6 @@ G_BEGIN_DECLS
 /* Single/Double click preference  */
 #define NAUTILUS_PREFERENCES_CLICK_POLICY			"preferences/click_policy"
 
-/* Xalf settings */
-#define NAUTILUS_PREFERENCES_XALF_ENABLED			"preferences/xalf/enabled"
-#define NAUTILUS_PREFERENCES_XALF_OPTIONS			"preferences/xalf/options"
-
 /* Activating executable text files */
 #define NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION		"preferences/executable_text_activation"
 
Index: libnautilus-private/nautilus-icon-dnd.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-dnd.c,v
retrieving revision 1.117
diff -p -u -r1.117 nautilus-icon-dnd.c
--- libnautilus-private/nautilus-icon-dnd.c	24 May 2002 08:44:23 -0000	1.117
+++ libnautilus-private/nautilus-icon-dnd.c	25 Jun 2002 06:57:24 -0000
@@ -608,48 +608,7 @@ stop_auto_scroll (NautilusIconContainer 
 	nautilus_drag_autoscroll_stop (&container->details->dnd_info->drag_info);
 }
 
-static gboolean
-confirm_switch_to_manual_layout (NautilusIconContainer *container)
-{
-	const char *message;
-	GtkDialog *dialog;
-	int response;
-
-	/* FIXME bugzilla.gnome.org 40915: Use of the word "directory"
-	 * makes this FMIconView specific. Move these messages into
-	 * FMIconView so NautilusIconContainer can be used for things
-	 * that are not directories?
-	 */
-	if (nautilus_icon_container_has_stored_icon_positions (container)) {
-		if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
-			message = _("This folder uses automatic layout. "
-			"Do you want to switch to manual layout and leave this item where you dropped it? "
-			"This will clobber the stored manual layout.");
-		} else {
-			message = _("This folder uses automatic layout. "
-			"Do you want to switch to manual layout and leave these items where you dropped them? "
-			"This will clobber the stored manual layout.");
-		}
-	} else {
-		if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
-			message = _("This folder uses automatic layout. "
-			"Do you want to switch to manual layout and leave this item where you dropped it?");
-		} else {
-			message = _("This folder uses automatic layout. "
-			"Do you want to switch to manual layout and leave these items where you dropped them?");
-		}
-	}
-
-	dialog = eel_show_yes_no_dialog (message, _("Switch to Manual Layout?"),
-					 _("Switch"), GTK_STOCK_CANCEL,
-					 GTK_WINDOW (gtk_widget_get_ancestor 
-						     (GTK_WIDGET (container), GTK_TYPE_WINDOW)));
-	
-	response = gtk_dialog_run (dialog);
-	gtk_object_destroy (GTK_OBJECT (dialog));
 
-	return response == GTK_RESPONSE_YES;
-}
 
 static void
 handle_local_move (NautilusIconContainer *container,
@@ -660,10 +619,7 @@ handle_local_move (NautilusIconContainer
 	NautilusIcon *icon;
 
 	if (container->details->auto_layout) {
-		if (!confirm_switch_to_manual_layout (container)) {
-			return;
-		}
-		nautilus_icon_container_freeze_icon_positions (container);
+		return;
 	}
 
 	/* Move and select the icons. */
Index: libnautilus-private/nautilus-program-choosing.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-program-choosing.c,v
retrieving revision 1.55
diff -p -u -r1.55 nautilus-program-choosing.c
--- libnautilus-private/nautilus-program-choosing.c	1 Mar 2002 22:57:29 -0000	1.55
+++ libnautilus-private/nautilus-program-choosing.c	25 Jun 2002 06:57:25 -0000
@@ -592,64 +592,7 @@ nautilus_launch_application (GnomeVFSMim
 	g_free (parameter);
 }
 
-static void
-concat_option_cb (const char *string,
-		  gpointer    callback_data)
-{
-	char *quoted;
-	GString *s;
-	
-	s = callback_data;
-	quoted = g_shell_quote (string);
-
-	g_string_append (s, quoted);
-	g_string_append_c (s, ' ');
-
-	g_free (quoted);
-}
-
-static char *
-get_xalf_prefix (const char *name)
-{
-	char *xalf_executable;
-	GString *s;
-	char *quoted;
-	EelStringList *str_list;
 
-	/* FIXME bugzilla.gnome.org 48206: At time I am writing this,
-	 * xalf is still pretty buggy, and Nautilus uses it a lot more
-	 * than the Panel does with no way to turn it off for
-	 * individual programs the way you can in the Panel. Sadly,
-	 * Ximian GNOME 1.4 ships with xalf on by default. So we did
-	 * this lame thing and turned it off unless you define this
-	 * environment variable. Some day we can remove this.
-	 */
-	if (g_getenv ("NAUTILUS_USE_XALF") == NULL) {
-		return g_strdup ("");
-	}
-	if (!eel_preferences_get_boolean (NAUTILUS_PREFERENCES_XALF_ENABLED)) {
-		return g_strdup ("");
-	}
-	xalf_executable = g_find_program_in_path ("xalf");
-	if (xalf_executable == NULL) {
-		return g_strdup ("");
-	}
-
-	s = g_string_new (xalf_executable);
-	g_string_append (s, " --title ");
-	quoted = g_shell_quote (name);
-	g_string_append (s, quoted);
-	g_free (quoted);
-	g_string_append_c (s, ' ');
-
-	str_list = eel_preferences_get_string_list (NAUTILUS_PREFERENCES_XALF_OPTIONS);
-	if (str_list) {
-		eel_string_list_for_each (str_list, concat_option_cb, s);
-		eel_string_list_free (str_list);
-	}
-
-	return g_string_free (s, FALSE);
-}
 
 /**
  * nautilus_launch_application_from_command:
@@ -669,8 +612,6 @@ nautilus_launch_application_from_command
 {
 	char *full_command;
 	char *quoted_parameter; 
-	char *final_command;
-	char *xalf_prefix;
 
 	if (parameter != NULL) {
 		quoted_parameter = g_shell_quote (parameter);
@@ -680,17 +621,11 @@ nautilus_launch_application_from_command
 		full_command = g_strdup (command_string);
 	}
 
-	xalf_prefix = get_xalf_prefix (name);
-	final_command = g_strconcat (xalf_prefix, full_command, NULL);
-
-	g_free (full_command);
-	g_free (xalf_prefix);
-	
 	if (use_terminal) {
-		eel_gnome_open_terminal (final_command);
+		eel_gnome_open_terminal (full_command);
 	} else {
-	    	eel_gnome_shell_execute (final_command);
+	    	eel_gnome_shell_execute (full_command);
 	}
 
-	g_free (final_command);
+	g_free (full_command);
 }
Index: src/nautilus-window-menus.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-menus.c,v
retrieving revision 1.244
diff -p -u -r1.244 nautilus-window-menus.c
--- src/nautilus-window-menus.c	2 Jun 2002 04:06:20 -0000	1.244
+++ src/nautilus-window-menus.c	25 Jun 2002 06:57:29 -0000
@@ -92,7 +92,6 @@
 
 #define COMMAND_PATH_CLOSE_WINDOW			"/commands/Close"
 
-#define USER_MANUAL_URI		"help:nautilus-user-manual"
 #define START_HERE_URI          "start-here:"
 
 #define RESPONSE_FORGET		1000