diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-25 07:52:05 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-25 07:52:05 +0800 |
| commit | 85b2913a380c69f14ae0254ad23b10fabfb33667 (patch) | |
| tree | c1cf143e37294dd9dd3667ebbe0a1d0c00b04b56 /composer | |
| parent | e7a31c5035a0afeed6c1675e30487c1e2bdc139f (diff) | |
| download | gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.gz gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.bz2 gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.lz gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.xz gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.zst gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.zip | |
Merge revisions 36534:36684 from trunk.
svn path=/branches/kill-bonobo/; revision=36685
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 22 | ||||
| -rw-r--r-- | composer/e-composer-actions.c | 2 | ||||
| -rw-r--r-- | composer/e-composer-private.c | 1 |
3 files changed, 24 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 0e5a3dd328..cbc01d7bb4 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,25 @@ +2008-10-13 Bharath Acharya <abharath@novell.com> + + ** Updated fix for bug #555775 + + * e-composer-private.c: (e_composer_private_init): Reverting a hunk + from the previous patch as suggested by Matthew Barnes. + +2008-10-10 Bharath Acharya <abharath@novell.com> + + ** Fix for bug #555775 + + * e-composer-private.c: (e_composer_private_init): Include + e-util-private.h for Win32 redefinition of EVOLUTION_UIDIR and build + the filename using it. + +2008-10-03 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #554664 + + * e-composer-actions.c: (action_attach_cb): + Call attach_remote_file when knows the URI points to it. + 2008-10-01 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #554418 diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index c88f7e301e..4a2f659c99 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -86,7 +86,7 @@ action_attach_cb (GtkAction *action, if (!g_ascii_strcasecmp (url->protocol, "file")) e_attachment_bar_attach (bar, url->path, disposition); else - e_attachment_bar_attach (bar, iter->data, disposition); + e_attachment_bar_attach_remote_file (bar, iter->data, disposition); camel_url_free (url); } diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index c1e463a98b..8985ecd72a 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -18,6 +18,7 @@ */ #include "e-composer-private.h" +#include "e-util/e-util-private.h" #include "mail/e-mail-shell-module.h" |