From 54d4e5e5f8ae9b2273377b1030a9822b4faecba2 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 27 Sep 2007 17:48:23 +0000
Subject: ** Fixes bug #477045

2007-09-27  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #477045

	* addressbook/gui/component/addressbook-component.c:
	* addressbook/gui/component/addressbook-view.c:
	* addressbook/gui/contact-editor/e-contact-editor-address.c:
	* addressbook/gui/contact-editor/e-contact-editor-fullname.c:
	* addressbook/gui/contact-editor/e-contact-editor-im.c:
	* addressbook/gui/widgets/e-addressbook-view.c:
	* addressbook/gui/widgets/eab-contact-display.c:
	* calendar/gui/calendar-commands.c:
	* calendar/gui/calendar-component.c:
	* calendar/gui/dialogs/cal-attachment-select-file.c:
	* calendar/gui/dialogs/comp-editor.c:
	* calendar/gui/dialogs/event-editor.c:
	* calendar/gui/dialogs/task-editor.c:
	* calendar/gui/e-cal-popup.c:
	* calendar/gui/e-calendar-table.c:
	* calendar/gui/e-calendar-view.c:
	* calendar/gui/e-day-view.c:
	* calendar/gui/e-memo-table.c:
	* calendar/gui/e-week-view.c:
	* calendar/gui/memos-component.c:
	* calendar/gui/memos-control.c:
	* calendar/gui/tasks-component.c:
	* calendar/gui/tasks-control.c:
	* composer/e-msg-composer-select-file.c:
	* composer/e-msg-composer.c:
	* mail/em-folder-tree.c:
	* mail/em-folder-view.c:
	* mail/em-popup.c:
	* mail/mail-component.c:
	* mail/mail-mt.c:
	* mail/mail-send-recv.c:
	* mail/message-list.c:
	* plugins/exchange-folder-permission.c:
	* plugins/exchange-folder.c:
	* plugins/groupwise-features/share-folder-common.c:
	* shell/e-shell-window-commands.c:
	* ui/evolution-addressbook.xml:
	* ui/evolution-calendar.xml:
	* ui/evolution-composer-entries.xml:
	* ui/evolution-editor.xml:
	* ui/evolution-event-editor.xml:
	* ui/evolution-mail-list.xml:
	* ui/evolution-mail-message.xml:
	* ui/evolution-memos.xml:
	* ui/evolution-message-composer.xml:
	* ui/evolution-subscribe.xml:
	* ui/evolution-task-editor.xml:
	* ui/evolution-tasks.xml:
	* ui/evolution.xml:
	Use standard icon names where applicable.


svn path=/trunk/; revision=34322
---
 calendar/gui/dialogs/event-editor.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'calendar/gui/dialogs/event-editor.c')

diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index d689ec6be9..eb86ea07b4 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -428,18 +428,19 @@ static EPixmap pixmaps[] = {
 	 * icons is filled in at run-time in event_editor_init() are
 	 * updated, too.
 	 */
+	E_PIXMAP ("/commands/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU),
+
 	E_PIXMAP ("/Toolbar/ActionAlarm", "stock_alarm", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/menu/Options/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/Toolbar/ActionAllDayEvent", "stock_new-24h-appointment", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR),	
 	E_PIXMAP ("/Toolbar/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),	
-	E_PIXMAP ("/menu/Options/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),		
+
 	/* These two will have an absolute path to the png file filled
 	 * in at run-time, see event_editor_init().
 	 */
 	E_PIXMAP ("/Toolbar/ActionFreeBusy", NULL, E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/menu/Options/ActionFreeBusy", NULL, E_ICON_SIZE_MENU),			
+	E_PIXMAP ("/commands/ActionFreeBusy", NULL, E_ICON_SIZE_MENU),			
 	E_PIXMAP_END
 };
 
@@ -561,12 +562,12 @@ event_editor_init (EventEditor *ee)
 		editor->uic, "ActionFreeBusy", 
 		menu_action_freebusy_cb, editor);
 
-	/* NOTE: Make sure the 7 and 8 below correspond to the correct
+	/* NOTE: Make sure the 6 and 7 below correspond to the correct
 	 * elements in the pixmaps array.
 	 */
-	if (!pixmaps[7].name) {
+	if (!pixmaps[6].name) {
+		pixmaps[6].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
 		pixmaps[7].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
-		pixmaps[8].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
 	}
 	e_pixmaps_update (editor->uic, pixmaps);
 
-- 
cgit v1.2.3