*** empty log message ***

ChangeLog-20000414

+2000-01-21  John Sullivan <sullivan@eazel.com>
+
+	* src/ntl-window.c: Move Preferences item to Edit menu, its
+	traditional home.
+
 2000-01-21  John Sullivan <sullivan@eazel.com>
 
 	Make icons appear in list view, and do some of the restructuring

src/nautilus-navigation-window.c

@@ -173,7 +173,7 @@ file_menu_exit_cb (GtkWidget *widget,
 }
 
 static void
-file_menu_prefs_cb(GtkWidget *widget,
+edit_menu_prefs_cb(GtkWidget *widget,
                    GtkWindow *mainwin)
 {
   nautilus_prefs_ui_show(mainwin);
@@ -189,8 +189,6 @@ static GnomeUIInfo file_menu_info[] = {
   },
   GNOMEUIINFO_MENU_CLOSE_ITEM(file_menu_close_cb, NULL),
   GNOMEUIINFO_SEPARATOR,
-  GNOMEUIINFO_MENU_PREFERENCES_ITEM(file_menu_prefs_cb, NULL),
-  GNOMEUIINFO_SEPARATOR,
   GNOMEUIINFO_MENU_EXIT_ITEM(file_menu_exit_cb, NULL),
   GNOMEUIINFO_END
 };
@@ -214,6 +212,8 @@ static GnomeUIInfo edit_menu_info[] = {
     GNOME_APP_PIXMAP_NONE, NULL,
     'A', GDK_CONTROL_MASK, NULL
   },
+  GNOMEUIINFO_SEPARATOR,
+  GNOMEUIINFO_MENU_PREFERENCES_ITEM(edit_menu_prefs_cb, NULL),
   GNOMEUIINFO_END
 };
 

src/nautilus-object-window.c

@@ -173,7 +173,7 @@ file_menu_exit_cb (GtkWidget *widget,
 }
 
 static void
-file_menu_prefs_cb(GtkWidget *widget,
+edit_menu_prefs_cb(GtkWidget *widget,
                    GtkWindow *mainwin)
 {
   nautilus_prefs_ui_show(mainwin);
@@ -189,8 +189,6 @@ static GnomeUIInfo file_menu_info[] = {
   },
   GNOMEUIINFO_MENU_CLOSE_ITEM(file_menu_close_cb, NULL),
   GNOMEUIINFO_SEPARATOR,
-  GNOMEUIINFO_MENU_PREFERENCES_ITEM(file_menu_prefs_cb, NULL),
-  GNOMEUIINFO_SEPARATOR,
   GNOMEUIINFO_MENU_EXIT_ITEM(file_menu_exit_cb, NULL),
   GNOMEUIINFO_END
 };
@@ -214,6 +212,8 @@ static GnomeUIInfo edit_menu_info[] = {
     GNOME_APP_PIXMAP_NONE, NULL,
     'A', GDK_CONTROL_MASK, NULL
   },
+  GNOMEUIINFO_SEPARATOR,
+  GNOMEUIINFO_MENU_PREFERENCES_ITEM(edit_menu_prefs_cb, NULL),
   GNOMEUIINFO_END
 };
 

src/nautilus-spatial-window.c

@@ -173,7 +173,7 @@ file_menu_exit_cb (GtkWidget *widget,
 }
 
 static void
-file_menu_prefs_cb(GtkWidget *widget,
+edit_menu_prefs_cb(GtkWidget *widget,
                    GtkWindow *mainwin)
 {
   nautilus_prefs_ui_show(mainwin);
@@ -189,8 +189,6 @@ static GnomeUIInfo file_menu_info[] = {
   },
   GNOMEUIINFO_MENU_CLOSE_ITEM(file_menu_close_cb, NULL),
   GNOMEUIINFO_SEPARATOR,
-  GNOMEUIINFO_MENU_PREFERENCES_ITEM(file_menu_prefs_cb, NULL),
-  GNOMEUIINFO_SEPARATOR,
   GNOMEUIINFO_MENU_EXIT_ITEM(file_menu_exit_cb, NULL),
   GNOMEUIINFO_END
 };
@@ -214,6 +212,8 @@ static GnomeUIInfo edit_menu_info[] = {
     GNOME_APP_PIXMAP_NONE, NULL,
     'A', GDK_CONTROL_MASK, NULL
   },
+  GNOMEUIINFO_SEPARATOR,
+  GNOMEUIINFO_MENU_PREFERENCES_ITEM(edit_menu_prefs_cb, NULL),
   GNOMEUIINFO_END
 };
 

src/nautilus-window.c

@@ -173,7 +173,7 @@ file_menu_exit_cb (GtkWidget *widget,
 }
 
 static void
-file_menu_prefs_cb(GtkWidget *widget,
+edit_menu_prefs_cb(GtkWidget *widget,
                    GtkWindow *mainwin)
 {
   nautilus_prefs_ui_show(mainwin);
@@ -189,8 +189,6 @@ static GnomeUIInfo file_menu_info[] = {
   },
   GNOMEUIINFO_MENU_CLOSE_ITEM(file_menu_close_cb, NULL),
   GNOMEUIINFO_SEPARATOR,
-  GNOMEUIINFO_MENU_PREFERENCES_ITEM(file_menu_prefs_cb, NULL),
-  GNOMEUIINFO_SEPARATOR,
   GNOMEUIINFO_MENU_EXIT_ITEM(file_menu_exit_cb, NULL),
   GNOMEUIINFO_END
 };
@@ -214,6 +212,8 @@ static GnomeUIInfo edit_menu_info[] = {
     GNOME_APP_PIXMAP_NONE, NULL,
     'A', GDK_CONTROL_MASK, NULL
   },
+  GNOMEUIINFO_SEPARATOR,
+  GNOMEUIINFO_MENU_PREFERENCES_ITEM(edit_menu_prefs_cb, NULL),
   GNOMEUIINFO_END
 };
 

src/ntl-window.c

@@ -173,7 +173,7 @@ file_menu_exit_cb (GtkWidget *widget,
 }
 
 static void
-file_menu_prefs_cb(GtkWidget *widget,
+edit_menu_prefs_cb(GtkWidget *widget,
                    GtkWindow *mainwin)
 {
   nautilus_prefs_ui_show(mainwin);
@@ -189,8 +189,6 @@ static GnomeUIInfo file_menu_info[] = {
   },
   GNOMEUIINFO_MENU_CLOSE_ITEM(file_menu_close_cb, NULL),
   GNOMEUIINFO_SEPARATOR,
-  GNOMEUIINFO_MENU_PREFERENCES_ITEM(file_menu_prefs_cb, NULL),
-  GNOMEUIINFO_SEPARATOR,
   GNOMEUIINFO_MENU_EXIT_ITEM(file_menu_exit_cb, NULL),
   GNOMEUIINFO_END
 };
@@ -214,6 +212,8 @@ static GnomeUIInfo edit_menu_info[] = {
     GNOME_APP_PIXMAP_NONE, NULL,
     'A', GDK_CONTROL_MASK, NULL
   },
+  GNOMEUIINFO_SEPARATOR,
+  GNOMEUIINFO_MENU_PREFERENCES_ITEM(edit_menu_prefs_cb, NULL),
   GNOMEUIINFO_END
 };