evolution r35937 - in trunk: . addressbook/gui/contact-editor art data/icons

[mmonreal svn gnome org]

Author: mmonreal
Date: Fri Aug  8 13:07:55 2008
New Revision: 35937
URL: http://svn.gnome.org/viewvc/evolution?rev=35937&view=rev

Log:
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.


Added:
   trunk/data/icons/hicolor_apps_16x16_contact-editor.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_22x22_contact-editor.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_24x24_contact-editor.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_32x32_contact-editor.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_48x48_contact-editor.png   (contents, props changed)
Removed:
   trunk/art/evolution-contacts-mini.png
Modified:
   trunk/ChangeLog
   trunk/addressbook/gui/contact-editor/e-contact-editor.c
   trunk/art/Makefile.am
   trunk/data/icons/Makefile.am

Modified: trunk/addressbook/gui/contact-editor/e-contact-editor.c
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-editor.c	(original)
+++ trunk/addressbook/gui/contact-editor/e-contact-editor.c	Fri Aug  8 13:07:55 2008
@@ -3381,9 +3381,7 @@
 			    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);

Modified: trunk/art/Makefile.am
==============================================================================
--- trunk/art/Makefile.am	(original)
+++ trunk/art/Makefile.am	Fri Aug  8 13:07:55 2008
@@ -1,5 +1,4 @@
 images_DATA = \
-	evolution-contacts-mini.png	\
 	offline.png			\
 	online.png			\
 	world_map-960.png		\

Modified: trunk/data/icons/Makefile.am
==============================================================================
--- trunk/data/icons/Makefile.am	(original)
+++ trunk/data/icons/Makefile.am	Fri Aug  8 13:07:55 2008
@@ -25,6 +25,11 @@
 	$(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 \

Added: trunk/data/icons/hicolor_apps_16x16_contact-editor.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_22x22_contact-editor.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_24x24_contact-editor.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_32x32_contact-editor.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_48x48_contact-editor.png
==============================================================================
Binary file. No diff available.