diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | data/icons/Makefile.am | 1 | ||||
| -rw-r--r-- | data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png | bin | 0 -> 3191 bytes | |||
| -rw-r--r-- | mail/GNOME_Evolution_Mail.server.in.in | 2 |
4 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2008-08-06 Michael Monreal <mmonreal@svn.gnome.org> + + ** Fix for bug #531288 + + * data/icons/Makefile.am: + * mail/GNOME_Evolution_Mail.server.in.in: + Use proxy icon from tango-icon-theme and fall back to the icon + shipped by gnome-control-center (thanks to Josef Vybíral). + 2008-08-04 Srinivasa Ragavan <sragavan@novell.com> * NEWS: Evolution 2.23.6 release and version bump. diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index ba02344f43..603de08044 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -49,6 +49,7 @@ private_icons = \ hicolor_categories_48x48_preferences-composer.png \ hicolor_categories_48x48_preferences-mail.png \ hicolor_categories_48x48_preferences-mail-accounts.png \ + hicolor_categories_48x48_preferences-system-network-proxy.png \ hicolor_places_16x16_mail-inbox.png \ hicolor_places_16x16_mail-outbox.png \ hicolor_places_16x16_mail-sent.png \ diff --git a/data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png b/data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png Binary files differnew file mode 100644 index 0000000000..e3a4ce2887 --- /dev/null +++ b/data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in index 8df4fc2afa..5de5a54df5 100644 --- a/mail/GNOME_Evolution_Mail.server.in.in +++ b/mail/GNOME_Evolution_Mail.server.in.in @@ -177,7 +177,7 @@ _value="Configure your network connection settings here"/> <oaf_attribute name="evolution2:config_item:icon_name" type="string" - value="stock_proxy"/> + value="preferences-system-network-proxy"/> <oaf_attribute name="evolution2:config_item:priority" type="string" value="-8"/> |
