** Fixes bug #476040

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

	** Fixes bug #476040

	* calendar/gui/e-day-view.c:
	* calendar/gui/e-week-view.c:
	* calendar/gui/dialogs/comp-editor.c:
	* composer/e-msg-composer.c:
	* composer/e-msg-composer-attachment-bar.c:
	* mail/em-folder-browser.c:
	* mail/message-list.c:
	* widgets/misc/e-attachment-bar.c:
	Use "mail-attachment" icon instead of "stock_attach".
	Use "mail-attachment" icon for unknown attachment types.


svn path=/trunk/; revision=34240

12 files changed, 48 insertions, 19 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 05e2858739..e8a67407c4 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-12  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476040
+
+	* gui/e-day-view.c:
+	* gui/e-week-view.c:
+	* gui/dialogs/comp-editor.c:
+	Use "mail-attachment" icon instead of "stock_attach".
+
 2007-09-10  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #300284 (bnc)
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 4ff5055110..dec56852c7 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -1486,8 +1486,8 @@ static BonoboUIVerb verbs [] = {
 };
 
 static EPixmap pixmaps[] = {
-	E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
 
 	E_PIXMAP_END
 };
@@ -1546,7 +1546,7 @@ setup_widgets (CompEditor *editor)
 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5);
 	expander_hbox = gtk_hbox_new (FALSE, 0);
 	
-	attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
+	attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
 	priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf);
 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5);
 	gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index d081e620fb..2d8d7a6c9c 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1419,7 +1419,7 @@ e_day_view_realize (GtkWidget *widget)
 	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_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 ("stock_attach", E_ICON_SIZE_MENU); 
+	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
 
 
 	/* Set the canvas item colors. */
@@ -1493,7 +1493,7 @@ e_day_view_realize (GtkWidget *widget)
 	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_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 ("stock_attach", E_ICON_SIZE_MENU); 
+	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
 
 
 	/* Set the canvas item colors. */
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index b054130e4a..4df59338a6 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -693,7 +693,7 @@ e_week_view_realize (GtkWidget *widget)
 	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->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
-	week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", 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);
 }
 
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 7db08ee174..bd4cad3a76 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-12  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476040
+
+	* e-msg-composer.c:
+	* e-msg-composer-attachment-bar.c:
+	Use "mail-attachment" icon instead of "stock_attach".
+	Use "mail-attachment" icon for unknown attachment types.
+
 2007-09-07  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #473903
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index e39f5f02ae..c6eee4d188 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -231,8 +231,7 @@ update (EMsgComposerAttachmentBar *bar)
 		attachment = p->data;
 
 		if (!attachment->is_available_local || !attachment->body) {
-			/* stock_attach would be better, but its fugly scaled up */
-			pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
+			pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG);
 			if (pixbuf) {
 				attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
 				g_object_unref(pixbuf);
@@ -320,8 +319,7 @@ update (EMsgComposerAttachmentBar *bar)
 			pixbuf = e_icon_for_mime_type (mime_type, 48);
 			if (pixbuf == NULL) {
 				g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
-				/* stock_attach would be better, but its fugly scaled up */
-				pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
+				pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG);
 			}
 			g_free (mime_type);
 		}
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index d8415c9404..b113ccc2f9 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2208,11 +2208,11 @@ static BonoboUIVerb verbs [] = {
 };
 
 static EPixmap pixcache [] = {
-	E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
 	
-/*	E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */
+/*	E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", 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),
@@ -3989,7 +3989,7 @@ create_composer (int visible_mask)
 	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5);
 	expander_hbox = gtk_hbox_new (FALSE, 0);
 	
-	p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);
+	p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU);
 	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5);
 	gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1);
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c69ffcc491..af05f004c4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-12  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476040
+
+	* em-folder-browser.c:
+	* message-list.c:
+	Use "mail-attachment" icon instead of "stock_attach".
+
 2007-09-12  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #473514
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 9f5b635464..17c617e8e3 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -218,7 +218,7 @@ static EMFBSearchBarItem temp_view_items[] = {
 	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
 	{{ 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 }, "stock_attach"},
+	{{ 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"},
 /* 	{ NULL, 0, NULL }, */
diff --git a/mail/message-list.c b/mail/message-list.c
index 8c0c3aaf3f..3b500a8280 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -223,7 +223,7 @@ static struct {
 	{ "stock_mail-unread-multiple",        NULL },
 	{ "stock_mail-open-multiple",          NULL },
 	{ NULL,                                NULL },
-	{ "stock_attach",                      NULL },
+	{ "mail-attachment",                   NULL },
 	{ "emblem-important",                  NULL },
 	{ "stock_score-lowest",                NULL },
 	{ "stock_score-lower",                 NULL },
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index b8eeae44c8..b38e6a0eb2 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-12  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476040
+
+	* e-attachment-bar.c:
+	Use "mail-attachment" icon for unknown attachment types.
+
 2007-08-31  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Move away from g_assert to g_return* critical warnings to debug
diff --git a/widgets/misc/e-attachment-bar.c b/widgets/misc/e-attachment-bar.c
index 5cb9b7b08b..221558f937 100644
--- a/widgets/misc/e-attachment-bar.c
+++ b/widgets/misc/e-attachment-bar.c
@@ -281,8 +281,7 @@ update (EAttachmentBar *bar)
 		attachment = priv->attachments->pdata[i];
 		
 		if (!attachment->is_available_local || !attachment->body) {
-			/* stock_attach would be better, but its fugly scaled up */
-			if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) {
+			if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) {
 				attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
 				g_object_unref (pixbuf);
 			}
@@ -373,8 +372,7 @@ update (EAttachmentBar *bar)
 			pixbuf = e_icon_for_mime_type (mime_type, 48);
 			if (pixbuf == NULL) {
 				g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
-				/* stock_attach would be better, but its fugly scaled up */
-				pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
+				pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG);
 			}
 			g_free (mime_type);
 		}