diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 9 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment-bar.c | 6 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 6 |
3 files changed, 14 insertions, 7 deletions
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); |