GNOME.org
 

[evolution-patches] fix for save-as icons

I was going to just commit this, but it seemed a little suspicious that
no one else had fixed it, so I figured I'd send it here first in case
this is some 2.4 vs 2.6 thing or something... But without this patch I
just get broken image icons everywhere there should be a "save as" icon.



Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1739
diff -u -r1.1739 ChangeLog
--- addressbook/ChangeLog	2 Jun 2004 21:27:08 -0000	1.1739
+++ addressbook/ChangeLog	3 Jun 2004 15:01:58 -0000
@@ -1,3 +1,9 @@
+2004-06-03  Dan Winship  <danw novell com>
+
+	* gui/component/addressbook-view.c: s/stock_save_as/stock_save-as/
+
+	* gui/contact-list-editor/e-contact-list-editor.c: Likewise
+
 2004-06-02  Hans Petter Jansson  <hpj ximian com>
 
 	* gui/component/addressbook-migrate.c
Index: addressbook/gui/component/addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-view.c,v
retrieving revision 1.9
diff -u -r1.9 addressbook-view.c
--- addressbook/gui/component/addressbook-view.c	25 May 2004 14:57:04 -0000	1.9
+++ addressbook/gui/component/addressbook-view.c	3 Jun 2004 15:01:58 -0000
@@ -423,7 +423,7 @@
 };
 
 static EPixmap pixmaps [] = {
-	E_PIXMAP ("/menu/File/FileOps/ContactsSaveAsVCard", "stock_save_as", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/menu/File/FileOps/ContactsSaveAsVCard", "stock_save-as", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/File/Print/ContactsPrint", "stock_print", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "stock_print-preview", E_ICON_SIZE_MENU),
 
Index: addressbook/gui/contact-list-editor/e-contact-list-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/e-contact-list-editor.c,v
retrieving revision 1.56
diff -u -r1.56 e-contact-list-editor.c
--- addressbook/gui/contact-list-editor/e-contact-list-editor.c	2 Jun 2004 06:23:27 -0000	1.56
+++ addressbook/gui/contact-list-editor/e-contact-list-editor.c	3 Jun 2004 15:01:58 -0000
@@ -580,7 +580,7 @@
 static EPixmap pixmaps[] = {
 	E_PIXMAP ("/commands/ContactListEditorSave", "stock_save", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/ContactListEditorSaveClose", "stock_save", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/ContactListEditorSaveAs", "stock_save_as", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/ContactListEditorSaveAs", "stock_save-as", E_ICON_SIZE_MENU),
 
 	E_PIXMAP ("/commands/ContactListEditorDelete", "stock_delete", E_ICON_SIZE_MENU),
 #if 0 /* Envelope printing is disabled for Evolution 1.0. */
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2363
diff -u -r1.2363 ChangeLog
--- calendar/ChangeLog	2 Jun 2004 21:13:53 -0000	1.2363
+++ calendar/ChangeLog	3 Jun 2004 15:01:58 -0000
@@ -1,3 +1,7 @@
+2004-06-03  Dan Winship  <danw novell com>
+
+	* gui/dialogs/comp-editor.c (pixmaps): s/stock_save_as/stock_save-as/
+
 2004-06-02  Chris Toshok  <toshok ximian com>
 
 	* gui/migration.c (migrate_calendars): remove absolute_uri from
Index: calendar/gui/dialogs/comp-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor.c,v
retrieving revision 1.100
diff -u -r1.100 comp-editor.c
--- calendar/gui/dialogs/comp-editor.c	17 May 2004 20:59:01 -0000	1.100
+++ calendar/gui/dialogs/comp-editor.c	3 Jun 2004 15:01:58 -0000
@@ -124,7 +124,7 @@
 {
 	E_PIXMAP ("/menu/File/FileSave",			"stock_save",          E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/File/FileSaveAndClose",		"stock_save",          E_ICON_SIZE_MENU),
-	E_PIXMAP ("/menu/File/FileSaveAs",			"stock_save_as",       E_ICON_SIZE_MENU),
+	E_PIXMAP ("/menu/File/FileSaveAs",			"stock_save-as",       E_ICON_SIZE_MENU),
 
 	E_PIXMAP ("/menu/File/FileDelete",			"stock_delete",        E_ICON_SIZE_MENU),
 
Index: composer/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.645
diff -u -r1.645 ChangeLog
--- composer/ChangeLog	27 May 2004 22:06:37 -0000	1.645
+++ composer/ChangeLog	3 Jun 2004 15:01:58 -0000
@@ -1,3 +1,7 @@
+2004-06-03  Dan Winship  <danw novell com>
+
+	* e-msg-composer.c (pixcache): s/stock_save_as/stock_save-as/
+
 2004-05-27  Jeffrey Stedfast  <fejj novell com>
 
 	* mail-composer-errors.xml: s/${0}/{0}/g
Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.468
diff -u -r1.468 e-msg-composer.c
--- composer/e-msg-composer.c	25 May 2004 04:10:05 -0000	1.468
+++ composer/e-msg-composer.c	3 Jun 2004 15:01:58 -0000
@@ -1966,7 +1966,7 @@
 /*	E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */
 	E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/FileSaveAs", "stock_save_as", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU),
 	
 	E_PIXMAP_END
 };
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3362
diff -u -r1.3362 ChangeLog
--- mail/ChangeLog	3 Jun 2004 09:30:47 -0000	1.3362
+++ mail/ChangeLog	3 Jun 2004 15:01:59 -0000
@@ -1,3 +1,11 @@
+2004-06-03  Dan Winship  <danw novell com>
+
+	* em-folder-view.c (emfv_popup_menu, emfv_message_pixmaps):
+	s/stock_save_as/stock_save-as/
+
+	* em-popup.c (emp_standard_select_popups,
+	emp_standard_object_popups): Likewise	
+
 2004-06-02  Not Zed  <NotZed Ximian com>
 
 	* mail-component.c (mc_add_local_store_done): put this back in,
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.75
diff -u -r1.75 em-folder-view.c
--- mail/em-folder-view.c	25 May 2004 04:10:24 -0000	1.75
+++ mail/em-folder-view.c	3 Jun 2004 15:01:59 -0000
@@ -893,7 +893,7 @@
 static EMPopupItem emfv_popup_menu[] = {
 	{ EM_POPUP_ITEM, "00.emfv.00", N_("_Open"), G_CALLBACK(emfv_popup_open), NULL, NULL, 0 },
 	{ EM_POPUP_ITEM, "00.emfv.01", N_("_Edit as New Message..."), G_CALLBACK(emfv_popup_edit), NULL, NULL, EM_POPUP_SELECT_EDIT },
-	{ EM_POPUP_ITEM, "00.emfv.02", N_("_Save As..."), G_CALLBACK(emfv_popup_saveas), NULL, "stock_save_as", 0 },
+	{ EM_POPUP_ITEM, "00.emfv.02", N_("_Save As..."), G_CALLBACK(emfv_popup_saveas), NULL, "stock_save-as", 0 },
 	{ EM_POPUP_ITEM, "00.emfv.03", N_("_Print"), G_CALLBACK(emfv_popup_print), NULL, "stock_print", 0 },
 
 	{ EM_POPUP_BAR, "10.emfv" },
@@ -1512,7 +1512,7 @@
 	E_PIXMAP ("/commands/MessageApplyFilters", "stock_mail-filters-apply", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageFilterJunk", "stock_spam", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageSearch", "stock_search", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/MessageSaveAs", "stock_save_as", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MessageSaveAs", "stock_save-as", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageMarkAsRead", "stock_mail-open", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageMarkAsUnRead", "stock_mail-unread", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageMarkAsImportant", "stock_mail-priority-high", E_ICON_SIZE_MENU),
Index: mail/em-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-popup.c,v
retrieving revision 1.22
diff -u -r1.22 em-popup.c
--- mail/em-popup.c	24 May 2004 08:23:26 -0000	1.22
+++ mail/em-popup.c	3 Jun 2004 15:01:59 -0000
@@ -688,7 +688,7 @@
 static EMPopupItem emp_standard_select_popups[] = {
 	/*{ EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },*/
 	{ EM_POPUP_ITEM, "00.select.01", N_("_Edit as New Message..."), G_CALLBACK(emp_popup_edit), NULL, NULL, EM_POPUP_SELECT_EDIT },
-	{ EM_POPUP_ITEM, "00.select.02", N_("_Save As..."), G_CALLBACK(emp_popup_saveas), NULL, "stock_save_as", 0 },	
+	{ EM_POPUP_ITEM, "00.select.02", N_("_Save As..."), G_CALLBACK(emp_popup_saveas), NULL, "stock_save-as", 0 },	
 };
 #endif
 
@@ -804,7 +804,7 @@
 }
 
 static EMPopupItem emp_standard_object_popups[] = {
-	{ EM_POPUP_ITEM, "00.part.00", N_("_Save As..."), G_CALLBACK(emp_part_popup_saveas), NULL, "stock_save_as", 0 },
+	{ EM_POPUP_ITEM, "00.part.00", N_("_Save As..."), G_CALLBACK(emp_part_popup_saveas), NULL, "stock_save-as", 0 },
 	{ EM_POPUP_ITEM, "00.part.10", N_("Set as _Background"), G_CALLBACK(emp_part_popup_set_background), NULL, NULL, EM_POPUP_PART_IMAGE },
 	{ EM_POPUP_BAR, "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE },
 	{ EM_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), G_CALLBACK(emp_part_popup_reply_sender), NULL, "stock_mail-reply" , EM_POPUP_PART_MESSAGE },
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]