rpms/evolution/devel evolution-2.11.92-icon-names.patch, NONE, 1.1 evolution.spec, 1.289, 1.290
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Sat Sep 15 21:38:47 UTC 2007
- Previous message (by thread): rpms/zope/FC-6 zope-2.10.4-config.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 zope.spec, 1.34, 1.35 zope-2.7.3-config.patch, 1.2, NONE
- Next message (by thread): rpms/plone/FC-6 .cvsignore, 1.15, 1.16 plone.spec, 1.28, 1.29 sources, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18733
Modified Files:
evolution.spec
Added Files:
evolution-2.11.92-icon-names.patch
Log Message:
* Sat Sep 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-4.fc8
- Add patch for GNOME bug #477045 (use standard icon names).
evolution-2.11.92-icon-names.patch:
--- NEW FILE evolution-2.11.92-icon-names.patch ---
diff -up evolution-2.11.92/mail/em-folder-browser.c.icon-names evolution-2.11.92/mail/em-folder-browser.c
--- evolution-2.11.92/mail/em-folder-browser.c.icon-names 2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/mail/em-folder-browser.c 2007-09-15 16:53:46.000000000 -0400
@@ -206,7 +206,7 @@ enum {
/* Options for View */
static EMFBSearchBarItem emfb_view_items[] = {
{{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL},
- {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "stock_mail-unread"},
+ {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"},
{{ NULL, 0, 0 }, NULL},
{{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL},
{{ NULL, -1, 0 }, NULL}
@@ -215,12 +215,12 @@ static EMFBSearchBarItem emfb_view_items
/* TODO: Following options should be customizable */
static EMFBSearchBarItem temp_view_items[] = {
{{ NULL, 0, 0 }, NULL},
- {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
+ {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"},
{{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},
{{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},
{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"},
{{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},
- {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"},
+ {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"},
/* { NULL, 0, NULL }, */
/* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */
{{ NULL, -1, 0 }, NULL}
diff -up evolution-2.11.92/mail/em-folder-tree.c.icon-names evolution-2.11.92/mail/em-folder-tree.c
--- evolution-2.11.92/mail/em-folder-tree.c.icon-names 2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/mail/em-folder-tree.c 2007-09-15 16:53:46.000000000 -0400
@@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column
guint32 flags;
if (!initialised) {
- folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU);
- folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU);
- folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("stock_sent-mail", E_ICON_SIZE_MENU);
@@ -1002,7 +1002,7 @@ static EPopupItem emft_drop_popup_menu[]
{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 },
{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 },
{ E_POPUP_BAR, "10.emc" },
- { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "stock_cancel", 0 },
+ { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 },
};
static void
@@ -2114,12 +2114,12 @@ static EPopupItem emft_popup_items[] = {
{ E_POPUP_BAR, "20.emc" },
/* FIXME: need to disable for nochildren folders */
- { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS },
+ { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS },
/* FIXME: need to disable for undeletable folders */
- { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
+ { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
{ E_POPUP_ITEM, "20.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
- { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "stock_refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
- { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "stock_mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
+ { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
+ { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
{ E_POPUP_BAR, "80.emc" },
diff -up evolution-2.11.92/mail/mail.error.xml.icon-names evolution-2.11.92/mail/mail.error.xml
--- evolution-2.11.92/mail/mail.error.xml.icon-names 2007-07-28 17:08:12.000000000 -0400
+++ evolution-2.11.92/mail/mail.error.xml 2007-09-15 16:53:46.000000000 -0400
@@ -16,14 +16,14 @@
<_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email:
{0}
Send anyway?</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
<button _label="_Send" response="GTK_RESPONSE_YES"/>
</error>
<error id="ask-send-no-subject" type="question" default="GTK_RESPONSE_YES">
<_primary>Are you sure you want to send a message without a subject?</_primary>
<_secondary xml:space="preserve">Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about.</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
<button _label="_Send" response="GTK_RESPONSE_YES"/>
</error>
@@ -32,14 +32,14 @@ Send anyway?</_secondary>
<_secondary xml:space="preserve">The contact list you are sending to is configured to hide list recipients.
Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. </_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
<button _label="_Send" response="GTK_RESPONSE_YES"/>
</error>
<error id="ask-send-only-bcc" type="warning" default="GTK_RESPONSE_YES">
<_primary>Are you sure you want to send a message with only BCC recipients?</_primary>
<_secondary xml:space="preserve">Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient.</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
<button _label="_Send" response="GTK_RESPONSE_YES"/>
</error>
@@ -51,36 +51,36 @@ Many email systems add an Apparently-To
<error id="ask-default-drafts" type="question" default="GTK_RESPONSE_YES">
<_primary>Use default drafts folder?</_primary>
<_secondary xml:space="preserve">Unable to open the drafts folder for this account. Use the system drafts folder instead?</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
<button _label="Use _Default" response="GTK_RESPONSE_YES"/>
</error>
<error id="ask-expunge" type="question" default="GTK_RESPONSE_CANCEL">
<_primary>Are you sure you want to permanently remove all the deleted messages in folder "{0}"?</_primary>
<_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
<button _label="_Expunge" response="GTK_RESPONSE_YES"/>
</error>
<error id="ask-empty-trash" type="warning" default="GTK_RESPONSE_CANCEL">
<_primary>Are you sure you want to permanently remove all the deleted messages in all folders?</_primary>
<_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
<button _label="_Empty Trash" response="GTK_RESPONSE_YES"/>
</error>
<error id="ask-open-many" type="warning" default="GTK_RESPONSE_CANCEL">
<_primary>Are you sure you want to open {0} messages at once?</_primary>
<_secondary xml:space="preserve">Opening too many messages at once may take a long time.</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
<button _label="_Open Messages" response="GTK_RESPONSE_YES"/>
</error>
<error id="exit-unsaved" type="warning" default="GTK_RESPONSE_NO">
<_primary>You have unsent messages, do you wish to quit anyway?</_primary>
<_secondary xml:space="preserve">If you quit, these messages will not be sent until Evolution is started again.</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
- <button stock="gtk-quit" response="GTK_RESPONSE_YES"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
+ <button stock="application-exit" response="GTK_RESPONSE_YES"/>
</error>
<error id="async-error" type="error">
@@ -99,8 +99,8 @@ Many email systems add an Apparently-To
<error id="session-message-info-cancel" type="info" default="GTK_RESPONSE_CANCEL">
<secondary>{0}</secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
</error>
<error id="session-message-warning" type="warning">
@@ -109,8 +109,8 @@ Many email systems add an Apparently-To
<error id="session-message-warning-cancel" type="warning" default="GTK_RESPONSE_CANCEL">
<secondary>{0}</secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
</error>
<error id="session-message-error" type="info">
@@ -119,15 +119,15 @@ Many email systems add an Apparently-To
<error id="session-message-error-cancel" type="info" default="GTK_RESPONSE_CANCEL">
<secondary>{0}</secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
</error>
<error id="ask-session-password" type="question" default="GTK_RESPONSE_OK">
<_primary>Enter password.</_primary>
<secondary>{0}</secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
</error>
<error id="filter-load-error" type="error">
@@ -179,15 +179,15 @@ Many email systems add an Apparently-To
<_title>Delete "{0}"?</_title>
<_primary>Really delete folder "{0}" and all of its subfolders?</_primary>
<_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.</_secondary>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
[...2080 lines suppressed...]
- E_PIXMAP ("/menu/ActionsPlaceholder/Actions/TasksForward", "stock_mail-forward", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/TasksCopy", "edit-copy", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/TasksCut", "edit-cut", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/TasksDelete", "edit-delete", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/TasksForward", "mail-forward", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/TasksPaste", "edit-paste", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/TasksPrint", "document-print", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/TasksPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
+
+ E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP_END
};
diff -up evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-table.c
--- evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names 2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-calendar-table.c 2007-09-15 16:53:46.000000000 -0400
@@ -1364,7 +1364,7 @@ static EPopupItem tasks_popup_items [] =
{ E_POPUP_BAR, "70.bar" },
{ E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
- { E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE },
+ { E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE },
{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE},
{ E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE },
{ E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE},
diff -up evolution-2.11.92/calendar/gui/e-day-view.c.icon-names evolution-2.11.92/calendar/gui/e-day-view.c
--- evolution-2.11.92/calendar/gui/e-day-view.c.icon-names 2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-day-view.c 2007-09-15 16:53:46.000000000 -0400
@@ -1420,7 +1420,7 @@ e_day_view_realize (GtkWidget *widget)
/* Create the pixmaps. */
day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
- day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+ day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
@@ -1494,7 +1494,7 @@ e_day_view_realize (GtkWidget *widget)
/* Create the pixmaps. */
day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
- day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+ day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
diff -up evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-view.c
--- evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names 2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-calendar-view.c 2007-09-15 16:53:46.000000000 -0400
@@ -1655,7 +1655,7 @@ on_paste (EPopup *ep, EPopupItem *pitem,
}
static EPopupItem ecv_main_items [] = {
- { E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "stock_new-appointment", 0, 0 },
+ { E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "appointment-new", 0, 0 },
{ E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0},
{ E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0},
{ E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0},
@@ -1691,9 +1691,9 @@ static EPopupItem ecv_child_items [] = {
{ E_POPUP_ITEM, "44.moveto", N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
{ E_POPUP_ITEM, "45.delegate", N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING},
{ E_POPUP_ITEM, "46.schedule", N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING },
- { E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "stock_mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
- { E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "stock_mail-reply", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
- { E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "stock_mail-reply-to-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+ { E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
+ { E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+ { E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
{ E_POPUP_BAR, "50." },
diff -up evolution-2.11.92/calendar/gui/tasks-component.c.icon-names evolution-2.11.92/calendar/gui/tasks-component.c
--- evolution-2.11.92/calendar/gui/tasks-component.c.icon-names 2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/tasks-component.c 2007-09-15 16:53:46.000000000 -0400
@@ -454,7 +454,7 @@ edit_task_list_cb (EPopup *ep, EPopupIte
static EPopupItem etc_source_popups[] = {
{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
{ E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
};
diff -up evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names evolution-2.11.92/calendar/gui/calendar-commands.c
--- evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names 2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/calendar-commands.c 2007-09-15 16:53:46.000000000 -0400
@@ -593,15 +593,29 @@ static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB_END
};
-static EPixmap pixmaps [] =
-{
- E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/Prev", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/Next", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR),
+static EPixmap pixmaps [] = {
+ E_PIXMAP ("/commands/CalendarPrev", "go-previous", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/CalendarPrint", "document-print", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/DeleteAllOccurrences", "edit-delete", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/DeleteOccurrence", "edit-delete", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU),
+
+ E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Prev", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Next", "go-next", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Goto", "go-jump", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/MonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP_END
};
diff -up evolution-2.11.92/calendar/gui/memos-control.c.icon-names evolution-2.11.92/calendar/gui/memos-control.c
--- evolution-2.11.92/calendar/gui/memos-control.c.icon-names 2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/memos-control.c 2007-09-15 16:53:46.000000000 -0400
@@ -39,6 +39,7 @@
#include <bonobo/bonobo-ui-util.h>
#include <e-util/e-dialog-utils.h>
#include <e-util/e-print.h>
+#include <e-util/e-icon-factory.h>
#include <e-util/e-util-private.h>
#include "calendar-config.h"
@@ -183,6 +184,23 @@ static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB_END
};
+static EPixmap pixmaps [] = {
+ E_PIXMAP ("/commands/MemosCopy", "edit-copy", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MemosCut", "edit-cut", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MemosDelete", "edit-delete", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MemosPaste", "edit-paste", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MemosPrint", "document-print", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MemosPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
+
+ E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
+
+ E_PIXMAP_END
+};
+
void
memos_control_activate (BonoboControl *control, EMemos *memos)
{
@@ -215,6 +233,8 @@ memos_control_activate (BonoboControl *c
NULL);
g_free (xmlfile);
+ e_pixmaps_update (uic, pixmaps);
+
e_memos_setup_view_menus (memos, uic);
/* Signals from the memos widget; also sensitize the menu items as appropriate */
diff -up evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names evolution-2.11.92/calendar/gui/e-cal-popup.c
--- evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names 2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-cal-popup.c 2007-09-15 16:53:46.000000000 -0400
@@ -276,9 +276,9 @@ ecalp_part_popup_set_background(EPopup *
static const EPopupItem ecalp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" };
static ECalPopupItem ecalp_attachment_object_popups[] = {
- { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_ONE },
+ { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_ONE },
{ E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), ecalp_part_popup_set_background, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_IMAGE },
- { E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE },
+ { E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE },
{ E_POPUP_BAR, "05.attach", },
};
diff -up evolution-2.11.92/calendar/gui/e-week-view.c.icon-names evolution-2.11.92/calendar/gui/e-week-view.c
--- evolution-2.11.92/calendar/gui/e-week-view.c.icon-names 2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-week-view.c 2007-09-15 16:53:46.000000000 -0400
@@ -695,7 +695,7 @@ e_week_view_realize (GtkWidget *widget)
/* Create the pixmaps. */
week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
- week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+ week_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- evolution.spec 12 Sep 2007 01:14:37 -0000 1.289
+++ evolution.spec 15 Sep 2007 21:38:15 -0000 1.290
@@ -45,7 +45,7 @@
Name: evolution
Version: 2.11.92
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2 and GFDL+
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -124,6 +124,9 @@
# GNOME bug #476040
Patch35: evolution-2.11.92-mail-attachment.patch
+# GNOME bug #477045
+Patch36: evolution-2.11.92-icon-names.patch
+
## Dependencies ###
Requires(post): GConf2
@@ -264,6 +267,7 @@
%patch33 -p1 -b .e-passwords
%patch34 -p1 -b .e-source-combo-box
%patch35 -p1 -b .mail-attachment
+%patch36 -p1 -b .icon-names
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -713,6 +717,9 @@
# It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
%changelog
+* Sat Sep 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-4.fc8
+- Add patch for GNOME bug #477045 (use standard icon names).
+
* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-3.fc8
- Add patch for GNOME bug #476040 (fix attachment icon).
- Previous message (by thread): rpms/zope/FC-6 zope-2.10.4-config.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 zope.spec, 1.34, 1.35 zope-2.7.3-config.patch, 1.2, NONE
- Next message (by thread): rpms/plone/FC-6 .cvsignore, 1.15, 1.16 plone.spec, 1.28, 1.29 sources, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list