From a9407524d291e7cf2bd6e489bf17704a78303e80 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Wed, 2 Jul 2008 14:35:14 +0000 Subject: [PATCH] * Fixes NB#86725, fixes NB#86266, show the error banner whenever folder creation fails pmo-trunk-r4867 --- src/modest-ui-actions.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index cb52073..074f866 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -3055,6 +3055,38 @@ modest_ui_actions_on_remove_attachments (GtkAction *action, modest_msg_edit_window_remove_attachments (window, NULL); } + +#ifdef MODEST_PLATFORM_MAEMO +typedef struct { + guint handler; + gchar *name; + GtkWindow *win; + TnyFolderStore *folder; +} CreateFolderHelper; + +static gboolean +show_create_folder_in_timeout (gpointer data) +{ + CreateFolderHelper *helper = (CreateFolderHelper *) data; + + /* Remove the timeout ASAP, we can not wait until the dialog + is shown because it could take a lot of time and so the + timeout could be called twice or more times */ + g_source_remove (helper->handler); + + gdk_threads_enter (); + do_create_folder (helper->win, helper->folder, helper->name); + gdk_threads_leave (); + + g_object_unref (helper->win); + g_object_unref (helper->folder); + g_free (helper->name); + g_slice_free (CreateFolderHelper, helper); + + return FALSE; +} +#endif + static void do_create_folder_cb (ModestMailOperation *mail_op, TnyFolderStore *parent_folder, @@ -3079,7 +3111,21 @@ do_create_folder_cb (ModestMailOperation *mail_op, /* Try again. Do *NOT* show any error because the mail operations system will do it for us because we created the mail_op with new_with_error_handler */ +#ifdef MODEST_PLATFORM_MAEMO + CreateFolderHelper *helper; + helper = g_slice_new0 (CreateFolderHelper); + helper->name = g_strdup (suggested_name); + helper->folder = g_object_ref (parent_folder); + helper->win = g_object_ref (source_win); + + /* Ugly but neccesary stuff. The problem is that the + dialog when is shown calls a function that destroys + all the temporary windows, so the banner is + destroyed */ + helper->handler = g_timeout_add (2000, show_create_folder_in_timeout, helper); +#else do_create_folder (source_win, parent_folder, (const gchar *) suggested_name); +#endif } else { /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog * FIXME: any other? */ -- 1.7.9.5