** Fixes bug #546057

2008-08-02  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #546057

	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
	* gui/contact-list-editor/contact-list-editor.glade:
	Use "x-office-address-book" icon name instead of "stock_addressbook".

	* gui/GNOME_Evolution_Calendar.server.in.in:
	* gui/calendar-component.c:
	* gui/e-calendar-view.c:
	* gui/dialogs/alarm-dialog.c:
	* gui/dialogs/alarm-list-dialog.c:
	* gui/dialogs/changed-comp.c:
	* gui/dialogs/comp-editor.c:
	* gui/dialogs/delete-error.c:
	* gui/dialogs/select-source-dialog.c:
	Use "x-office-calendar" icon name instead of "stock_calendar".


svn path=/trunk/; revision=35892

13 files changed, 36 insertions, 13 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 323d755f34..ad97f391c0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #546057
+
+	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
+	* gui/contact-list-editor/contact-list-editor.glade:
+	Use "x-office-address-book" icon name instead of "stock_addressbook".
+
 2008-07-30  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #211267
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
index feef3bdfc9..4fe2ce7a6a 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
@@ -50,7 +50,7 @@
         <oaf_attribute name="evolution:button_label" type="string" _value="Contacts"/>
 		<oaf_attribute name="evolution:button_tooltips" type="string" _value="Contacts"/>
         <oaf_attribute name="evolution:button_sort_order" type="string" value="-9"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="stock_addressbook"/>
+        <oaf_attribute name="evolution:button_icon" type="string" value="x-office-address-book"/>
 
 </oaf_server>
 
diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.glade b/addressbook/gui/contact-list-editor/contact-list-editor.glade
index 3402e27542..497be08c85 100644
--- a/addressbook/gui/contact-list-editor/contact-list-editor.glade
+++ b/addressbook/gui/contact-list-editor/contact-list-editor.glade
@@ -28,7 +28,7 @@
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="icon_size">6</property>
-                <property name="icon_name">stock_addressbook</property>
+                <property name="icon_name">x-office-address-book</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 01a758e081..8f3ff530b6 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,18 @@
+2008-08-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #546057
+
+	* gui/GNOME_Evolution_Calendar.server.in.in:
+	* gui/calendar-component.c:
+	* gui/e-calendar-view.c:
+	* gui/dialogs/alarm-dialog.c:
+	* gui/dialogs/alarm-list-dialog.c:
+	* gui/dialogs/changed-comp.c:
+	* gui/dialogs/comp-editor.c:
+	* gui/dialogs/delete-error.c:
+	* gui/dialogs/select-source-dialog.c:
+	Use "x-office-calendar" icon name instead of "stock_calendar".
+
 2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #544857
diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
index 577efc4130..831b7d5aa3 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
@@ -47,7 +47,7 @@
 	<oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*3"/>
 	<oaf_attribute name="evolution:button_label" type="string" _value="Calendars"/>
 	<oaf_attribute name="evolution:button_tooltips" type="string" _value="Calendars"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="stock_calendar"/>
+        <oaf_attribute name="evolution:button_icon" type="string" value="x-office-calendar"/>
 	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
 
 <!-- FIXME: See bug 407104: Write a interface to launch without shell.
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 5ec0c400dc..daa274129d 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -613,7 +613,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem ecc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 },
+	{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "x-office-calendar", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 
 	{ E_POPUP_BAR, "20.bar" },
@@ -1399,7 +1399,7 @@ create_component_view (CalendarComponent *calendar_component)
 					     GTK_SHADOW_IN);
 	gtk_widget_show (selector_scrolled_window);
 
-	component_view->info_label = (EInfoLabel *)e_info_label_new("stock_calendar");
+	component_view->info_label = (EInfoLabel *)e_info_label_new("x-office-calendar");
 	e_info_label_set_info (component_view->info_label, _("Calendars"), "");
 	gtk_widget_show (GTK_WIDGET (component_view->info_label));
 
@@ -1621,7 +1621,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 	list->_buffer[3].menuDescription = _("Cale_ndar");
 	list->_buffer[3].tooltip = _("Create a new calendar");
 	list->_buffer[3].menuShortcut = '\0';
-	list->_buffer[3].iconName = "stock_calendar";
+	list->_buffer[3].iconName = "x-office-calendar";
 	list->_buffer[3].type = GNOME_Evolution_CREATABLE_FOLDER;
 
 	return list;
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 9a57a9c8e5..48402bbab3 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -1178,7 +1178,7 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
 
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+	icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
 	if (icon_list) {
 		gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list);
 		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 99230f667e..8bce8f0eaa 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -293,7 +293,7 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
 
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+	icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
 	if (icon_list) {
 		gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list);
 		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index c2d5f4e365..c994fb6303 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -105,7 +105,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet
 					 GTK_MESSAGE_QUESTION,
 					 GTK_BUTTONS_YES_NO, "%s", str);
 
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+	icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
 	if (icon_list) {
 		gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
 		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 840ffc9d9d..fa7054d942 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -927,7 +927,7 @@ update_window_border (CompEditor *editor,
 
 	if (editor->priv->comp == NULL) {
 		title = g_strdup (_("Edit Appointment"));
-		icon_name = "stock_calendar";
+		icon_name = "x-office-calendar";
 		goto exit;
 
 	} else switch (e_cal_component_get_vtype (editor->priv->comp)) {
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index 6c5462837d..d1280da16a 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -106,7 +106,7 @@ delete_error_dialog (GError *error, ECalComponentVType vtype)
 					 GTK_MESSAGE_ERROR,
 					 GTK_BUTTONS_OK, "%s", str);
 	if (vtype == E_CAL_COMPONENT_EVENT)
-		icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+		icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
 	else if (vtype == E_CAL_COMPONENT_TODO)
 		icon_list = e_icon_factory_get_icon_list ("stock_todo");
 
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index 624cfe90fe..a669dfcafc 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -58,7 +58,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
 	dialog = e_source_selector_dialog_new (parent, source_list);
 
 	if (obj_type == E_CAL_SOURCE_TYPE_EVENT)
-		icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+		icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
 	else if (obj_type == E_CAL_SOURCE_TYPE_TODO)
 		icon_list = e_icon_factory_get_icon_list ("stock_todo");
         else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index b1ec9624c0..8fa9c61830 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -62,7 +62,7 @@
 #include "misc.h"
 
 /* Used for the status bar messages */
-#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "stock_calendar"
+#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "x-office-calendar"
 static GdkPixbuf *progress_icon = NULL;
 
 struct _ECalendarViewPrivate {