aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Monreal <mmonreal@svn.gnome.org>2008-08-08 21:07:55 +0800
committerMichael Monreal <mmonreal@src.gnome.org>2008-08-08 21:07:55 +0800
commit9774adff926e614eecb6845680bcdcf5a2bd732e (patch)
treeeaa57c3ed101e8bc7c905227b6a6e54b472ac5ce
parent9071747fdb0ca659f1d0118ed69615a4f623e163 (diff)
downloadgsoc2013-evolution-9774adff926e614eecb6845680bcdcf5a2bd732e.tar
gsoc2013-evolution-9774adff926e614eecb6845680bcdcf5a2bd732e.tar.gz
gsoc2013-evolution-9774adff926e614eecb6845680bcdcf5a2bd732e.tar.bz2
gsoc2013-evolution-9774adff926e614eecb6845680bcdcf5a2bd732e.tar.lz
gsoc2013-evolution-9774adff926e614eecb6845680bcdcf5a2bd732e.tar.xz
gsoc2013-evolution-9774adff926e614eecb6845680bcdcf5a2bd732e.tar.zst
gsoc2013-evolution-9774adff926e614eecb6845680bcdcf5a2bd732e.zip
** Additional fix for bug #467115
2008-08-08 Michael Monreal <mmonreal@svn.gnome.org> ** 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
-rw-r--r--ChangeLog10
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c4
-rw-r--r--art/Makefile.am1
-rw-r--r--art/evolution-contacts-mini.pngbin452 -> 0 bytes
-rw-r--r--data/icons/Makefile.am5
-rw-r--r--data/icons/hicolor_apps_16x16_contact-editor.pngbin0 -> 442 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_contact-editor.pngbin0 -> 719 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_contact-editor.pngbin0 -> 743 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_contact-editor.pngbin0 -> 4218 bytes
-rw-r--r--data/icons/hicolor_apps_48x48_contact-editor.pngbin0 -> 4977 bytes
10 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3614b8f6c2..ee729b2c64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2008-08-08 Michael Monreal <mmonreal@svn.gnome.org>
+ ** 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 <mmonreal@svn.gnome.org>
+
** Fix for bug #546744
* addressbook/gui/component/addressbook-view.c:
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
--- a/art/evolution-contacts-mini.png
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_contact-editor.png
Binary files 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
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_contact-editor.png
Binary files 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
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_contact-editor.png
Binary files 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
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_contact-editor.png
Binary files 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
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_contact-editor.png
Binary files differ