From 6bf36561f19fede5232329407dbdbd1dec82f33c Mon Sep 17 00:00:00 2001
From: Michael Monreal <mmonreal@svn.gnome.org>
Date: Wed, 6 Aug 2008 09:32:08 +0000
Subject: ** Fix for bug #467115

2008-08-06  Michael Monreal  <mmonreal@svn.gnome.org>

    ** Fix for bug #467115

    * addressbook/gui/component/addressbook-view.c:
    (addressbook_view_init):
    * calendar/gui/GNOME_Evolution_Calendar.server.in.in:
    * calendar/gui/memos-component.c: (create_component_view):
    * calendar/gui/tasks-component.c: (create_component_view):
    * data/icons/Makefile.am:
    * mail/GNOME_Evolution_Mail.server.in.in:
    * mail/mail-component.c: (impl_createView):
    Ship and use tango icons for the mail, tasks and memos components.

svn path=/trunk/; revision=35915
---
 mail/GNOME_Evolution_Mail.server.in.in | 6 +++---
 mail/mail-component.c                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mail')

diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index 5de5a54df5..98eba23c39 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -34,9 +34,9 @@
     <oaf_attribute name="evolution:button_label" type="string" _value="Mail"/>
 	<oaf_attribute name="evolution:button_tooltips" type="string" _value="Mail"/>
     <oaf_attribute name="evolution:button_sort_order" type="string" value="-10"/>
-    <oaf_attribute name="evolution:button_icon" type="string" value="stock_mail"/>
+    <oaf_attribute name="evolution:button_icon" type="string" value="evolution-mail"/>
 
-    <oaf_attribute name="evolution:component_icon" type="string" value="stock_mail"/>
+    <oaf_attribute name="evolution:component_icon" type="string" value="evolution-mail"/>
     <oaf_attribute name="evolution:component_display_order" type="number" value="1"/>
 
     <oaf_attribute name="evolution:uri_schemas" type="stringv">
@@ -59,7 +59,7 @@
 		   _value="Evolution Mail component"/>
 
     <oaf_attribute name="evolution:shell_component_icon" type="string"
-		   value="stock_mail"/>
+		   value="evolution-mail"/>
     <oaf_attribute name="evolution:shell_component_launch_order" type="number"
 		   value="1"/>
   </oaf_server>
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 39d2302ea0..43bf5485e5 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -756,7 +756,7 @@ impl_createView (PortableServer_Servant servant,
 	gtk_widget_show (statusbar_widget);
 
 	vbox = gtk_vbox_new(FALSE, 0);
-	info = e_info_label_new("stock_mail");
+	info = e_info_label_new("evolution-mail");
 	e_info_label_set_info((EInfoLabel *)info, _("Mail"), "");
 	gtk_box_pack_start((GtkBox *)vbox, info, FALSE, TRUE, 0);
 	gtk_box_pack_start((GtkBox *)vbox, tree_widget, TRUE, TRUE, 0);
-- 
cgit