diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 7 | ||||
| -rw-r--r-- | composer/Makefile.am | 4 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment-bar.c | 18 |
3 files changed, 27 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 6c2ff04411..9cb2154086 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2002-07-26 Ettore Perazzoli <ettore@ximian.com> + + * e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): + Special-case message/digest and give it a nice icon. [#9786] + + * Makefile.am (INCLUDES): Add -D for EVOLUTION_ICONSDIR. + 2002-07-24 Jeffrey Stedfast <fejj@ximian.com> * e-msg-composer-hdrs.c (create_headers): Create the Post-To diff --git a/composer/Makefile.am b/composer/Makefile.am index 16836ccf59..22334d3eeb 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -33,10 +33,11 @@ idldir = $(datadir)/idl idl_DATA = $(IDLS) gladedir = $(datadir)/evolution/glade - glade_DATA = \ e-msg-composer-attachment.glade +iconsdir = $(datadir)/images/evolution + libcomposerincludedir = $(includedir)/composer noinst_LIBRARIES = libcomposer.a @@ -54,6 +55,7 @@ INCLUDES = \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ -DEVOLUTION_DATADIR=\"$(datadir)\" \ + -DEVOLUTION_ICONSDIR=\"$(iconsdir)\" \ -DE_GLADEDIR=\"$(gladedir)\" \ -DG_LOG_DOMAIN=\"composer\" \ $(GNOME_FULL_CFLAGS) diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c index 6df2d65485..5aaf614765 100644 --- a/composer/e-msg-composer-attachment-bar.c +++ b/composer/e-msg-composer-attachment-bar.c @@ -220,7 +220,23 @@ pixbuf_for_mime_type (const char *mime_type) const char *icon_name; char *filename = NULL; GdkPixbuf *pixbuf; - + + /* Special-case these two since GNOME VFS doesn't know about them and + they are used every time the user forwards one or more messages + inline. (See #9786.) */ + if (strcmp (mime_type, "message/digest") == 0 + || strcmp (mime_type, "multipart/digest") == 0 + || strcmp (mime_type, "message/rfc822") == 0) { + char *name; + + name = g_concat_dir_and_file (EVOLUTION_ICONSDIR, "mail.png"); + pixbuf = gdk_pixbuf_new_from_file (name); + g_free (name); + + if (pixbuf != NULL) + return pixbuf; + } + icon_name = gnome_vfs_mime_get_value (mime_type, "icon-filename"); if (icon_name) { if (*icon_name == '/') { |