aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-06 01:21:42 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-06 01:21:42 +0800
commit16d914886110d57eaf8946000c365de2007728b3 (patch)
treedc91c2e17d9febfc121cfdc3b375cc75162f1877 /widgets
parentc3e0648d8b5a1d73f82f0a7691b9ab1320248392 (diff)
parenta30e0738880809f8e3a6d05a66f82081d91c21a0 (diff)
downloadgsoc2013-evolution-16d914886110d57eaf8946000c365de2007728b3.tar
gsoc2013-evolution-16d914886110d57eaf8946000c365de2007728b3.tar.gz
gsoc2013-evolution-16d914886110d57eaf8946000c365de2007728b3.tar.bz2
gsoc2013-evolution-16d914886110d57eaf8946000c365de2007728b3.tar.lz
gsoc2013-evolution-16d914886110d57eaf8946000c365de2007728b3.tar.xz
gsoc2013-evolution-16d914886110d57eaf8946000c365de2007728b3.tar.zst
gsoc2013-evolution-16d914886110d57eaf8946000c365de2007728b3.zip
Merge branch 'master' into kill-bonobo
Conflicts: calendar/gui/dialogs/comp-editor.c
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/e-attachment-button.h4
-rw-r--r--widgets/misc/e-attachment-dialog.h2
-rw-r--r--widgets/misc/e-attachment-handler-image.h2
-rw-r--r--widgets/misc/e-attachment-handler.h2
-rw-r--r--widgets/misc/e-attachment-store.c19
-rw-r--r--widgets/misc/e-attachment-store.h2
-rw-r--r--widgets/misc/e-attachment-view.h2
7 files changed, 26 insertions, 7 deletions
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 <gtk/gtk.h>
-#include <widgets/misc/e-attachment.h>
-#include <widgets/misc/e-attachment-view.h>
+#include <misc/e-attachment.h>
+#include <misc/e-attachment-view.h>
/* 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 <gtk/gtk.h>
-#include <widgets/misc/e-attachment.h>
+#include <misc/e-attachment.h>
/* 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 <widgets/misc/e-attachment-handler.h>
+#include <misc/e-attachment-handler.h>
/* 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 <widgets/misc/e-attachment-view.h>
+#include <misc/e-attachment-view.h>
/* Standard GObject macros */
#define E_TYPE_ATTACHMENT_HANDLER \
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. */
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 <gtk/gtk.h>
-#include <widgets/misc/e-attachment.h>
+#include <misc/e-attachment.h>
/* Standard GObject macros */
#define E_TYPE_ATTACHMENT_STORE \
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 <gtk/gtk.h>
-#include <widgets/misc/e-attachment-store.h>
+#include <misc/e-attachment-store.h>
/* Standard GObject macros */
#define E_TYPE_ATTACHMENT_VIEW \