From 9774adff926e614eecb6845680bcdcf5a2bd732e Mon Sep 17 00:00:00 2001 From: Michael Monreal Date: Fri, 8 Aug 2008 13:07:55 +0000 Subject: [PATCH] ** 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 ++++++++++ .../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 5ddb92c1ce1627c69b660a223f2870bb38d2fef0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmV;#0XzPQP)#IU|ANbs?ut;a5xXqv`; z=83DV7-rkcT5Jb^R4N64uIu*u>l8#pSXkdB7zl89l%`lJGwq$^U@!V3{5=?qx?G%| zoin648P*ic>jD6YL;_vcsZ=WD^Z9R+Nk3G2eHK8}&PQK$!8;-MT+OLG}_)Usv`U9PAt#R$MWORzM-y64!_l=ltB< z)VvY~=c3falGGH1^30M9g^-L?1$R&1fcGh?c|hv~JzX3_EKXmYywQu|W+S(RV$2H_e{ATq+C3_i z@$O?|2ChaE-;Lbd4Y3hDh8`EP-YTlAv@c0|s=+etw5p@7hRhRL_x{CA3-Y5k?~E3k zaW+kro#B|ot>3wK!pl|W6sxkw)t&HMx?3jP{Q4e0HHD7`GM~)m7FE}8*ZUx>^1-J6 zyGml-^OQ)pNi`4hf4!ERGp}S~%j5%=Ed_ouWmc{Qx7nljw@0j>?KSxcbMw8Ul~+Aw e{`^h<#bRJ`B}&D0zZftS89ZJ6T-G@yGywnw6{$7= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..38904cf409b52ce2741e32fdd5f89e0190511e8e GIT binary patch literal 719 zcmV;=0xPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOP) z2q_mpSv3R>%Q)v^m27#K($bOqhM*=*8iG?<&4FH@Yoeob=Pu$+#Qm@yUpP%nB zm4ZFbqup+Ed3lL3hRMlE9LGUxO|@G6R3v`|yROUg^D{~*09vgUgM)(@W4OD!$(I%KsK8to6RDGz;#{1Fl1$Ag_oBXmX?;%iAur77$znrux*= zTwh-!r975Osm)rgwxg8#mSa;&d6Fc_=Fg3k)^AqFtOnN*RKfrN002ovPDHLkV1lap BK}rAs literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..96a8487d4965df0a5f5e3cb675e83085608ffae2 GIT binary patch literal 743 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..07db9c0702bd9d0774fcadf8786514c63da21f05 GIT binary patch literal 4977 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 Q@fb)~%TV*Hx^49T0C>-pRsaA1 literal 0 HcmV?d00001