From ecc06b08d474ef0aa1a3d8edbe83c083463b45ab Mon Sep 17 00:00:00 2001
From: Not Zed <NotZed@Ximian.com>
Date: Thu, 21 Jul 2005 07:09:23 +0000
Subject: fix the pixmap location for the settings menu.

2005-07-21  Not Zed  <NotZed@Ximian.com>

        * e-shell-window-commands.c: fix the pixmap location for the
        settings menu.

        * e-shell-window.c (setup_widgets): reverted dobey's patch to put
        the components in the useless tools window.

svn path=/trunk/; revision=29827
---
 shell/ChangeLog                 | 8 ++++++++
 shell/e-shell-window-commands.c | 2 +-
 shell/e-shell-window.c          | 5 +++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/shell/ChangeLog b/shell/ChangeLog
index b28005a00e..6b8e3d0641 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-21  Not Zed  <NotZed@Ximian.com>
+
+	* e-shell-window-commands.c: fix the pixmap location for the
+	settings menu.
+
+	* e-shell-window.c (setup_widgets): reverted dobey's patch to put
+	the components in the useless tools window.
+
 2005-07-07  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* e-shell-window.c: (setup_widgets): Free the style here.
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index e5b2b27ad7..f87159fe82 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -715,7 +715,7 @@ static EPixmap pixmaps [] = {
 	E_PIXMAP ("/menu/File/OpenNewWindow", "stock_new-window", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/menu/Tools/Settings", "gnome-settings", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/menu/Edit/Settings", "gnome-settings", E_ICON_SIZE_MENU),
 	
 	E_PIXMAP_END
 };
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index f80312ab82..b4047bc79a 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -703,7 +703,8 @@ setup_widgets (EShellWindow *window)
 					      (BonoboUIVerbFn)menu_component_selected,
 					      window);
 
-		g_string_printf(xml, "<submenu name=\"Tools\">"
+		g_string_printf(xml, "<submenu name=\"View\">"
+				"<submenu name=\"Window\">"
 				"<placeholder name=\"WindowComponent\">"
 				"<menuitem name=\"SwitchComponent-%s\" "
 				"verb=\"\" label=\"%s\" accel=\"%s\" tip=\"",
@@ -713,7 +714,7 @@ setup_widgets (EShellWindow *window)
 		g_string_append_printf(xml, _("Switch to %s"), info->button_label);
 		tmp = bonobo_ui_util_pixbuf_to_xml (info->menu_icon),
 		g_string_append_printf(xml, "\" pixtype=\"pixbuf\" pixname=\"%s\"/>"
-				       "</placeholder></submenu>\n",
+				       "</placeholder></submenu></submenu>\n",
 				       tmp);
 		g_free(tmp);
 		bonobo_ui_component_set_translate (e_shell_window_peek_bonobo_ui_component (window),
-- 
cgit v1.2.3