Get the mailer to use the new menu icons.

svn path=/trunk/; revision=7805

6 files changed, 45 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 2a56bc0cc3..f2f8400270 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
 
+	* art/Makefile.am (images_DATA): Add the missing .xpm files.
+
+2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
+
 	* art/Makefile.am (images_DATA): Add `24_find_contacts.xpm',
 	`16_print_xpm', `16_configure_addressbook'.
 
diff --git a/art/Makefile.am b/art/Makefile.am
index 474f6b66b7..97856c5884 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1,10 +1,22 @@
 imagesdir = $(datadir)/images/evolution
 
 images_DATA = \
-	16_print.xpm			\
 	16_configure_addressbook.xpm	\
-	24_find_contact.xpm		\
+	16_configure_addressbook.xpm	\
+	16_configure_folder.xpm		\
+	16_configure_mail.xpm		\
+	16_copy_message.xpm		\
+	16_edit.xpm			\
+	16_encrypt.xpm			\
+	16_forward.xpm			\
+	16_move_message.xpm		\
+	16_print.xpm			\
+	16_print.xpm			\
+	16_reply.xpm			\
+	16_reply_to_all.xpm		\
+	16_save.xpm			\
 	24_all_contacts.xpm		\
+	24_find_contact.xpm		\
 	briefcase.png       		\
 	butterfly.png			\
 	cellphone.png       		\
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 39ca322278..bcc738c3b8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
+
+	* folder-browser-factory.c (update_pixmaps): Set the pixmaps for
+	the "/menu/Folder/FolderConfig" and "/menu/Settings/SetMailConfig"
+	items.
+	(set_pixmap): Don't prepend the "buttons" prefix.
+	(update_pixmaps): Update accordingly.
+
 2001-01-24  Not Zed  <NotZed@Ximian.com>
 
 	* folder-browser.c (search_string[]): Fix the subject match
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 4654451416..d57b657ac2 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -108,7 +108,7 @@ set_pixmap (BonoboUIComponent *uic,
 	char *path;
 	GdkPixbuf *pixbuf;
 
-	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon);
+	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution", icon);
 
 	pixbuf = gdk_pixbuf_new_from_file (path);
 	g_return_if_fail (pixbuf != NULL);
@@ -123,13 +123,16 @@ set_pixmap (BonoboUIComponent *uic,
 static void
 update_pixmaps (BonoboUIComponent *uic)
 {
-	set_pixmap (uic, "/Toolbar/MailGet", "fetch-mail.png");
-	set_pixmap (uic, "/Toolbar/MailCompose", "compose-message.png");
-	set_pixmap (uic, "/Toolbar/Reply", "reply.png");
-	set_pixmap (uic, "/Toolbar/ReplyAll", "reply-to-all.png");
-	set_pixmap (uic, "/Toolbar/Forward", "forward.png");
-	set_pixmap (uic, "/Toolbar/Move", "move-message.png");
-	set_pixmap (uic, "/Toolbar/Copy", "copy-message.png");
+	set_pixmap (uic, "/menu/Component/Folder/FolderConfig", "16_configure_folder.xpm");
+	set_pixmap (uic, "/menu/Settings/SetMailConfig", "16_configure_mail.xpm");
+
+	set_pixmap (uic, "/Toolbar/MailGet", "buttons/fetch-mail.png");
+	set_pixmap (uic, "/Toolbar/MailCompose", "buttons/compose-message.png");
+	set_pixmap (uic, "/Toolbar/Reply", "buttons/reply.png");
+	set_pixmap (uic, "/Toolbar/ReplyAll", "buttons/reply-to-all.png");
+	set_pixmap (uic, "/Toolbar/Forward", "buttons/forward.png");
+	set_pixmap (uic, "/Toolbar/Move", "buttons/move-message.png");
+	set_pixmap (uic, "/Toolbar/Copy", "buttons/copy-message.png");
 }
 
 static void
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 0a8ee13855..cfb3eb8ae9 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,10 @@
 2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
 
+	* evolution-mail.xml: Set the `pixtype' of the "Configure Folder"
+	and "Mail Configuration" items to "pixbuf".
+
+2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
+
 	* evolution-addressbook.xml: Change the type of the "Find a
 	contact" item to "pixbuf".  Also set the type to "pixbuf" for
 	"Addressbook Configuration", and "Print Contacts".
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index 04480e6cca..7418abfeff 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -70,7 +70,7 @@
 
       <menuitem name="VFolderEdit" verb="SetVFolder" _label="_Virtual Folder Editor..."/>
 
-      <menuitem name="SetMailConfig" verb="" _label="_Mail Configuration..." />
+      <menuitem name="SetMailConfig" verb="" _label="_Mail Configuration..." pixtype="pixbuf"/>
 
       <menuitem name="SetSubscribe" verb="" _label="Manage Subscriptions..."/>
 
@@ -190,7 +190,8 @@
          accel="*Control*x"/>
 
         <menuitem name="FolderConfig" verb=""
-        _label="_Configure Folder..."/>
+        _label="_Configure Folder..."
+	pixtype="pixbuf"/>
 
       </submenu>