evolution r35978 - in branches/kill-bonobo: . addressbook/gui/component addressbook/gui/contact-editor art calendar calendar/gui data/icons help help/es po shell

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Aug 13 12:00:21 2008
New Revision: 35978
URL: http://svn.gnome.org/viewvc/evolution?rev=35978&view=rev

Log:
Merge revisions 35931:35950 from trunk.


Added:
   branches/kill-bonobo/data/icons/hicolor_apps_16x16_contact-editor.png
      - copied unchanged from r35950, /trunk/data/icons/hicolor_apps_16x16_contact-editor.png
   branches/kill-bonobo/data/icons/hicolor_apps_22x22_contact-editor.png
      - copied unchanged from r35950, /trunk/data/icons/hicolor_apps_22x22_contact-editor.png
   branches/kill-bonobo/data/icons/hicolor_apps_24x24_contact-editor.png
      - copied unchanged from r35950, /trunk/data/icons/hicolor_apps_24x24_contact-editor.png
   branches/kill-bonobo/data/icons/hicolor_apps_32x32_contact-editor.png
      - copied unchanged from r35950, /trunk/data/icons/hicolor_apps_32x32_contact-editor.png
   branches/kill-bonobo/data/icons/hicolor_apps_48x48_contact-editor.png
      - copied unchanged from r35950, /trunk/data/icons/hicolor_apps_48x48_contact-editor.png
Removed:
   branches/kill-bonobo/art/evolution-contacts-mini.png
Modified:
   branches/kill-bonobo/ChangeLog
   branches/kill-bonobo/addressbook/gui/component/addressbook-view.c
   branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c
   branches/kill-bonobo/art/Makefile.am
   branches/kill-bonobo/calendar/ChangeLog
   branches/kill-bonobo/calendar/gui/itip-utils.c
   branches/kill-bonobo/data/icons/Makefile.am
   branches/kill-bonobo/help/ChangeLog
   branches/kill-bonobo/help/es/es.po
   branches/kill-bonobo/po/ChangeLog
   branches/kill-bonobo/po/et.po
   branches/kill-bonobo/po/zh_HK.po
   branches/kill-bonobo/po/zh_TW.po
   branches/kill-bonobo/shell/ChangeLog

Modified: branches/kill-bonobo/addressbook/gui/component/addressbook-view.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/addressbook-view.c	(original)
+++ branches/kill-bonobo/addressbook/gui/component/addressbook-view.c	Wed Aug 13 12:00:21 2008
@@ -947,14 +947,14 @@
 }
 
 static EPopupItem abv_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "contact-new", 0, 0 },
+	{ E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "address-book-new", 0, 0 },
  	{ E_POPUP_ITEM, "20.saveasvcard", N_("Save As vCard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY },
 
 	{ E_POPUP_BAR,  "30.bar" },
 	{ E_POPUP_ITEM, "30.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY },
 
 	{ E_POPUP_BAR,  "99.bar" },
-	{ E_POPUP_ITEM, "99.properties", N_("_Properties..."), edit_addressbook_cb, NULL,"document-properties", 0, EAB_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_addressbook_cb, NULL,"document-properties", 0, EAB_POPUP_SOURCE_PRIMARY },
 };
 
 static void

Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c	(original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c	Wed Aug 13 12:00:21 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: branches/kill-bonobo/art/Makefile.am
==============================================================================
--- branches/kill-bonobo/art/Makefile.am	(original)
+++ branches/kill-bonobo/art/Makefile.am	Wed Aug 13 12:00:21 2008
@@ -1,5 +1,4 @@
 images_DATA = \
-	evolution-contacts-mini.png	\
 	offline.png			\
 	online.png			\
 	world_map-960.png		\

Modified: branches/kill-bonobo/calendar/gui/itip-utils.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/itip-utils.c	(original)
+++ branches/kill-bonobo/calendar/gui/itip-utils.c	Wed Aug 13 12:00:21 2008
@@ -1142,9 +1142,9 @@
 	ECalComponent *comp = NULL;
 	icalcomponent *top_level = NULL;
 	char *ical_string = NULL;
-	gchar *from;
-	gchar *content_type;
-	gchar *subject;
+	gchar *from = NULL;
+	gchar *content_type = NULL;
+	gchar *subject = NULL;
 	gboolean retval = FALSE;
 
 	/* check whether backend could handle sending requests/updates */

Modified: branches/kill-bonobo/data/icons/Makefile.am
==============================================================================
--- branches/kill-bonobo/data/icons/Makefile.am	(original)
+++ branches/kill-bonobo/data/icons/Makefile.am	Wed Aug 13 12:00:21 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 \