From 9774adff926e614eecb6845680bcdcf5a2bd732e Mon Sep 17 00:00:00 2001 From: Michael Monreal Date: Fri, 8 Aug 2008 13:07:55 +0000 Subject: ** Additional fix for bug #467115 2008-08-08 Michael Monreal ** Additional fix for bug #467115 * addressbook/gui/contact-editor/e-contact-editor.c: (e_contact_editor_init): * art/Makefile.am: * data/icons/Makefile.am: Get rid of old contact-editor icon. svn path=/trunk/; revision=35937 --- ChangeLog | 10 ++++++++++ addressbook/gui/contact-editor/e-contact-editor.c | 4 +--- art/Makefile.am | 1 - art/evolution-contacts-mini.png | Bin 452 -> 0 bytes data/icons/Makefile.am | 5 +++++ data/icons/hicolor_apps_16x16_contact-editor.png | Bin 0 -> 442 bytes data/icons/hicolor_apps_22x22_contact-editor.png | Bin 0 -> 719 bytes data/icons/hicolor_apps_24x24_contact-editor.png | Bin 0 -> 743 bytes data/icons/hicolor_apps_32x32_contact-editor.png | Bin 0 -> 4218 bytes data/icons/hicolor_apps_48x48_contact-editor.png | Bin 0 -> 4977 bytes 10 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 art/evolution-contacts-mini.png create mode 100644 data/icons/hicolor_apps_16x16_contact-editor.png create mode 100644 data/icons/hicolor_apps_22x22_contact-editor.png create mode 100644 data/icons/hicolor_apps_24x24_contact-editor.png create mode 100644 data/icons/hicolor_apps_32x32_contact-editor.png create mode 100644 data/icons/hicolor_apps_48x48_contact-editor.png diff --git a/ChangeLog b/ChangeLog index 3614b8f6c2..ee729b2c64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-08-08 Michael Monreal + + ** Additional fix for bug #467115 + + * addressbook/gui/contact-editor/e-contact-editor.c: + (e_contact_editor_init): + * art/Makefile.am: + * data/icons/Makefile.am: + Get rid of old contact-editor icon. + 2008-08-08 Michael Monreal ** Fix for bug #546744 diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 9b328de2c2..c0616d9916 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -3381,9 +3381,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) G_CALLBACK (app_delete_event_cb), e_contact_editor); /* set the icon */ - icon_path = g_build_filename (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png", NULL); - gtk_window_set_icon_from_file (GTK_WINDOW (e_contact_editor->app), icon_path, NULL); - g_free (icon_path); + gtk_window_set_icon_name (GTK_WINDOW (e_contact_editor->app), "contact-editor"); /* show window */ gtk_widget_show (e_contact_editor->app); diff --git a/art/Makefile.am b/art/Makefile.am index ea30f68d5f..193be3576c 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -1,5 +1,4 @@ images_DATA = \ - evolution-contacts-mini.png \ offline.png \ online.png \ world_map-960.png \ diff --git a/art/evolution-contacts-mini.png b/art/evolution-contacts-mini.png deleted file mode 100644 index 5ddb92c1ce..0000000000 Binary files a/art/evolution-contacts-mini.png and /dev/null differ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index e97397c5cc..b78d0c1510 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -25,6 +25,11 @@ public_icons = \ $(NULL) private_icons = \ + hicolor_apps_16x16_contact-editor.png \ + hicolor_apps_22x22_contact-editor.png \ + hicolor_apps_24x24_contact-editor.png \ + hicolor_apps_32x32_contact-editor.png \ + hicolor_apps_48x48_contact-editor.png \ hicolor_actions_16x16_folder-copy.png \ hicolor_actions_16x16_folder-move.png \ hicolor_actions_16x16_mail-copy.png \ diff --git a/data/icons/hicolor_apps_16x16_contact-editor.png b/data/icons/hicolor_apps_16x16_contact-editor.png new file mode 100644 index 0000000000..a9653158e1 Binary files /dev/null and b/data/icons/hicolor_apps_16x16_contact-editor.png differ diff --git a/data/icons/hicolor_apps_22x22_contact-editor.png b/data/icons/hicolor_apps_22x22_contact-editor.png new file mode 100644 index 0000000000..38904cf409 Binary files /dev/null and b/data/icons/hicolor_apps_22x22_contact-editor.png differ diff --git a/data/icons/hicolor_apps_24x24_contact-editor.png b/data/icons/hicolor_apps_24x24_contact-editor.png new file mode 100644 index 0000000000..96a8487d49 Binary files /dev/null and b/data/icons/hicolor_apps_24x24_contact-editor.png differ diff --git a/data/icons/hicolor_apps_32x32_contact-editor.png b/data/icons/hicolor_apps_32x32_contact-editor.png new file mode 100644 index 0000000000..92e7a33c41 Binary files /dev/null and b/data/icons/hicolor_apps_32x32_contact-editor.png differ diff --git a/data/icons/hicolor_apps_48x48_contact-editor.png b/data/icons/hicolor_apps_48x48_contact-editor.png new file mode 100644 index 0000000000..07db9c0702 Binary files /dev/null and b/data/icons/hicolor_apps_48x48_contact-editor.png differ -- cgit v1.2.3