From 94cba78ef8498f70d7f3a7400eecd89d1c0495a3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 May 2009 20:24:39 -0400 Subject: Fix include paths. --- widgets/misc/e-attachment-button.h | 4 ++-- widgets/misc/e-attachment-dialog.h | 2 +- widgets/misc/e-attachment-handler-image.h | 2 +- widgets/misc/e-attachment-handler.h | 2 +- widgets/misc/e-attachment-store.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-attachment-button.h b/widgets/misc/e-attachment-button.h index 6e2f5672ef..72592efefe 100644 --- a/widgets/misc/e-attachment-button.h +++ b/widgets/misc/e-attachment-button.h @@ -23,8 +23,8 @@ #define E_ATTACHMENT_BUTTON_H #include -#include -#include +#include +#include /* Standard GObject macros */ #define E_TYPE_ATTACHMENT_BUTTON \ diff --git a/widgets/misc/e-attachment-dialog.h b/widgets/misc/e-attachment-dialog.h index 8e24e1840c..e8ed583b18 100644 --- a/widgets/misc/e-attachment-dialog.h +++ b/widgets/misc/e-attachment-dialog.h @@ -23,7 +23,7 @@ #define E_ATTACHMENT_DIALOG_H #include -#include +#include /* Standard GObject macros */ #define E_TYPE_ATTACHMENT_DIALOG \ diff --git a/widgets/misc/e-attachment-handler-image.h b/widgets/misc/e-attachment-handler-image.h index 53b076c61f..44ff404a99 100644 --- a/widgets/misc/e-attachment-handler-image.h +++ b/widgets/misc/e-attachment-handler-image.h @@ -22,7 +22,7 @@ #ifndef E_ATTACHMENT_HANDLER_IMAGE_H #define E_ATTACHMENT_HANDLER_IMAGE_H -#include +#include /* Standard GObject macros */ #define E_TYPE_ATTACHMENT_HANDLER_IMAGE \ diff --git a/widgets/misc/e-attachment-handler.h b/widgets/misc/e-attachment-handler.h index 05df3e8bbe..f95bc55123 100644 --- a/widgets/misc/e-attachment-handler.h +++ b/widgets/misc/e-attachment-handler.h @@ -22,7 +22,7 @@ #ifndef E_ATTACHMENT_HANDLER_H #define E_ATTACHMENT_HANDLER_H -#include +#include /* Standard GObject macros */ #define E_TYPE_ATTACHMENT_HANDLER \ diff --git a/widgets/misc/e-attachment-store.h b/widgets/misc/e-attachment-store.h index 5d2271cba0..e7f89b7f6c 100644 --- a/widgets/misc/e-attachment-store.h +++ b/widgets/misc/e-attachment-store.h @@ -23,7 +23,7 @@ #define E_ATTACHMENT_STORE_H #include -#include +#include /* Standard GObject macros */ #define E_TYPE_ATTACHMENT_STORE \ -- cgit v1.2.3 From 825f74be1cb9b20b6a67f1b32ca241ef54ee6df3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 May 2009 21:30:10 -0400 Subject: Another #include path fix. --- widgets/misc/e-attachment-view.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-attachment-view.h b/widgets/misc/e-attachment-view.h index 0fc5118669..38480c30c4 100644 --- a/widgets/misc/e-attachment-view.h +++ b/widgets/misc/e-attachment-view.h @@ -23,7 +23,7 @@ #define E_ATTACHMENT_VIEW_H #include -#include +#include /* Standard GObject macros */ #define E_TYPE_ATTACHMENT_VIEW \ -- cgit v1.2.3 From 3a87c8d166c936ef222e0d90379e9333a727c855 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 May 2009 23:32:41 -0400 Subject: Fix an error extracting URIs from local attachments. --- widgets/misc/e-attachment-store.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'widgets/misc') diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index 0b6e5a2baa..9d0fe6d21e 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -818,6 +818,25 @@ e_attachment_store_get_uris_async (EAttachmentStore *store, uri_context->attachment_list = attachment_list; + /* If we got them all then we're done. */ + if (attachment_list == NULL) { + GSimpleAsyncResult *simple; + gchar **uris; + + /* Steal the result. */ + simple = uri_context->simple; + uri_context->simple = NULL; + + /* And the URI list. */ + uris = uri_context->uris; + uri_context->uris = NULL; + + g_simple_async_result_set_op_res_gpointer (simple, uris, NULL); + g_simple_async_result_complete_in_idle (simple); + attachment_store_uri_context_free (uri_context); + return; + } + /* Any remaining attachments in the list should have MIME parts * only, so we need to save them all to a temporary directory. * We use a directory so the files can retain their basenames. */ -- cgit v1.2.3