callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debian/patches/12_fix_icon_metaphors_bug_339626.patch: Applied upstream

Browse Source 
git-svn-id: file:///svn/pkg-evolution/experimental/evolution@430 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Øystein Gisnås
2006-05-28 13:58:28 +00:00
parent 71f5c2ffc1
commit add5603f59
2 changed files with 3 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -5,8 +5,10 @@ evolution (2.7.2-1) UNRELEASED; urgency=low
upstream
* remove debian/patches/11_window_settings_stored.patch
* debian/patches/11_window_settings_stored.patch: Applied upstream
* debian/patches/12_fix_icon_metaphors_bug_339626.patch: Applied
upstream
-- Oystein Gisnas <oystein@gisnas.net> Sun, 28 May 2006 15:54:21 +0200
-- Oystein Gisnas <oystein@gisnas.net> Sun, 28 May 2006 15:58:19 +0200
evolution (2.6.1-4) UNRELEASED; urgency=low

77
debian/patches/12_fix_icon_metaphors_bug_339626.patch vendored
View File

@ -1,77 +0,0 @@
diff -Nur evolution-2.6.1/mail/em-folder-tree.c evolution-2.6.1.new/mail/em-folder-tree.c
--- evolution-2.6.1/mail/em-folder-tree.c 2006-02-08 12:51:31.000000000 +0100
+++ evolution-2.6.1.new/mail/em-folder-tree.c 2006-04-27 17:51:41.000000000 +0200
@@ -287,7 +287,7 @@
folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_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 ("stock_delete", 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_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);
diff -Nur evolution-2.6.1/mail/em-folder-view.c evolution-2.6.1.new/mail/em-folder-view.c
--- evolution-2.6.1/mail/em-folder-view.c 2006-02-08 12:51:32.000000000 +0100
+++ evolution-2.6.1.new/mail/em-folder-view.c 2006-04-27 17:51:41.000000000 +0200
@@ -1089,7 +1089,7 @@
{ E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL },
{ E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "stock_delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
- { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, "stock_undelete", EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
{ E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "stock_mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
{ E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "stock_mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
@@ -1747,8 +1747,7 @@
E_PIXMAP ("/commands/PrintMessage", "stock_print", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/PrintPreviewMessage", "stock_print-preview", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/MessageDelete", "stock_delete", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/MessageUndelete", "stock_undelete", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageDelete", "gnome-fs-trash-empty", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_MENU),
diff -Nur evolution-2.6.1/ui/evolution-mail-global.xml evolution-2.6.1.new/ui/evolution-mail-global.xml
--- evolution-2.6.1/ui/evolution-mail-global.xml 2006-01-13 17:24:02.000000000 +0100
+++ evolution-2.6.1.new/ui/evolution-mail-global.xml 2006-04-27 17:51:41.000000000 +0200
@@ -45,7 +45,7 @@
<submenu name="File">
<placeholder name="EmptyTrashPlaceholder">
- <menuitem name="EmptyTrash" verb="" _label="Empty _Trash" pixtype="stock" pixname="gtk-delete"/>
+ <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
</placeholder>
</submenu>
diff -Nur evolution-2.6.1/ui/evolution-mail-message.xml evolution-2.6.1.new/ui/evolution-mail-message.xml
--- evolution-2.6.1/ui/evolution-mail-message.xml 2006-02-05 23:41:41.000000000 +0100
+++ evolution-2.6.1.new/ui/evolution-mail-message.xml 2006-04-27 17:51:41.000000000 +0200
@@ -59,7 +59,7 @@
<cmd name="MessageDelete"
_tip="Mark the selected messages for deletion"
accel="*Control*d"
- pixtype="stock" pixname="gtk-delete"/>
+ pixtype="pixbuf"/>
<cmd name="MessageFollowUpFlag"
_tip="Flag selected messages for follow-up"
@@ -166,8 +166,7 @@
<cmd name="MessageUndelete"
_tip="Undelete the selected messages"
- accel="*Control**Shift*d"
- pixtype="stock" pixname="gtk-undelete"/>
+ accel="*Control**Shift*d"/>
<cmd name="PrintMessage"
_tip="Print this message"
@@ -421,7 +420,7 @@
<toolitem name="MessageDelete" verb=""
_label="Delete"
- pixtype="stock" pixname="gtk-delete"/>
+ pixtype="pixbuf"/>
<toolitem name="MessageMarkAsJunk" verb=""
_label="Junk"