From bf34b073d751e66757d0b804f974c02df2d88b8c Mon Sep 17 00:00:00 2001 From: Michael Monreal Date: Wed, 6 Aug 2008 09:17:11 +0000 Subject: ** Fix for bug #531288 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-08-06 Michael Monreal ** 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). svn path=/trunk/; revision=35914 --- ChangeLog | 9 +++++++++ data/icons/Makefile.am | 1 + ...categories_48x48_preferences-system-network-proxy.png | Bin 0 -> 3191 bytes mail/GNOME_Evolution_Mail.server.in.in | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png diff --git a/ChangeLog b/ChangeLog index 7cdf72094e..996b784d2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-08-06 Michael Monreal + + ** 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 * 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 new file mode 100644 index 0000000000..e3a4ce2887 Binary files /dev/null and b/data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png differ 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"/> + value="preferences-system-network-proxy"/> -- cgit v1.2.3