From a98cb0a9820d2119bf10c317e5f6a9d56dd9073c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 23 May 2011 15:28:35 -0400 Subject: Remove emfu_create_folder_real(). Use e_mail_store_create_folder() instead. --- mail/e-mail-store-utils.c | 123 ++++++++++++++++++++ mail/e-mail-store-utils.h | 17 +++ mail/em-folder-utils.c | 278 +++++++++++++++------------------------------- 3 files changed, 231 insertions(+), 187 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-store-utils.c b/mail/e-mail-store-utils.c index 47c9970c25..52aecdcc0d 100644 --- a/mail/e-mail-store-utils.c +++ b/mail/e-mail-store-utils.c @@ -23,6 +23,129 @@ typedef struct _AsyncContext AsyncContext; +struct _AsyncContext { + gchar *full_name; +}; + +static void +async_context_free (AsyncContext *context) +{ + g_free (context->full_name); + + g_slice_free (AsyncContext, context); +} + +static void +mail_store_create_folder_thread (GSimpleAsyncResult *simple, + GObject *object, + GCancellable *cancellable) +{ + AsyncContext *context; + GError *error = NULL; + + context = g_simple_async_result_get_op_res_gpointer (simple); + + e_mail_store_create_folder_sync ( + CAMEL_STORE (object), context->full_name, + cancellable, &error); + + if (error != NULL) { + g_simple_async_result_set_from_error (simple, error); + g_error_free (error); + } +} + +gboolean +e_mail_store_create_folder_sync (CamelStore *store, + const gchar *full_name, + GCancellable *cancellable, + GError **error) +{ + CamelFolderInfo *folder_info; + gchar *copied_full_name; + gchar *display_name; + const gchar *parent; + gboolean success = TRUE; + + g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE); + g_return_val_if_fail (full_name != NULL, FALSE); + + copied_full_name = g_strdup (full_name); + display_name = strrchr (copied_full_name, '/'); + if (display_name == NULL) { + display_name = copied_full_name; + parent = ""; + } else { + *display_name++ = '\0'; + parent = copied_full_name; + } + + folder_info = camel_store_create_folder_sync ( + store, parent, display_name, cancellable, error); + + g_free (copied_full_name); + + if (folder_info == NULL) + return FALSE; + + if (camel_store_supports_subscriptions (store)) + success = camel_store_subscribe_folder_sync ( + store, full_name, cancellable, error); + + camel_store_free_folder_info (store, folder_info); + + return success; +} + +void +e_mail_store_create_folder (CamelStore *store, + const gchar *full_name, + gint io_priority, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *simple; + AsyncContext *context; + + g_return_if_fail (CAMEL_IS_STORE (store)); + g_return_if_fail (full_name != NULL); + + context = g_slice_new0 (AsyncContext); + context->full_name = g_strdup (full_name); + + simple = g_simple_async_result_new ( + G_OBJECT (store), callback, user_data, + e_mail_store_create_folder); + + g_simple_async_result_set_op_res_gpointer ( + simple, context, (GDestroyNotify) async_context_free); + + g_simple_async_result_run_in_thread ( + simple, mail_store_create_folder_thread, + io_priority, cancellable); + + g_object_unref (simple); +} + +gboolean +e_mail_store_create_folder_finish (CamelStore *store, + GAsyncResult *result, + GError **error) +{ + GSimpleAsyncResult *simple; + + g_return_val_if_fail ( + g_simple_async_result_is_valid ( + result, G_OBJECT (store), + e_mail_store_create_folder), FALSE); + + simple = G_SIMPLE_ASYNC_RESULT (result); + + /* Assume success unless a GError is set. */ + return !g_simple_async_result_propagate_error (simple, error); +} + static void mail_store_go_offline_thread (GSimpleAsyncResult *simple, CamelStore *store, diff --git a/mail/e-mail-store-utils.h b/mail/e-mail-store-utils.h index 7610b82f54..de4484c020 100644 --- a/mail/e-mail-store-utils.h +++ b/mail/e-mail-store-utils.h @@ -25,6 +25,21 @@ G_BEGIN_DECLS +gboolean e_mail_store_create_folder_sync (CamelStore *store, + const gchar *full_name, + GCancellable *cancellable, + GError **error); +void e_mail_store_create_folder (CamelStore *store, + const gchar *full_name, + gint io_priority, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean e_mail_store_create_folder_finish + (CamelStore *store, + GAsyncResult *result, + GError **error); + void e_mail_store_go_offline (CamelStore *store, gint io_priority, GCancellable *cancellable, @@ -33,6 +48,7 @@ void e_mail_store_go_offline (CamelStore *store, gboolean e_mail_store_go_offline_finish (CamelStore *store, GAsyncResult *result, GError **error); + void e_mail_store_go_online (CamelStore *store, gint io_priority, GCancellable *cancellable, @@ -41,6 +57,7 @@ void e_mail_store_go_online (CamelStore *store, gboolean e_mail_store_go_online_finish (CamelStore *store, GAsyncResult *result, GError **error); + void e_mail_store_prepare_for_offline (CamelStore *store, gint io_priority, diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 8ea58365f0..a3f7847768 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -62,9 +62,28 @@ #include "e-mail-local.h" #include "e-mail-session.h" #include "e-mail-store.h" +#include "e-mail-store-utils.h" #define d(x) +typedef struct _AsyncContext AsyncContext; + +struct _AsyncContext { + EMFolderTree *folder_tree; + gchar *folder_uri; +}; + +static void +async_context_free (AsyncContext *context) +{ + if (context->folder_tree != NULL) + g_object_unref (context->folder_tree); + + g_free (context->folder_uri); + + g_slice_free (AsyncContext, context); +} + static gboolean emfu_is_special_local_folder (const gchar *name) { @@ -479,228 +498,113 @@ em_folder_utils_copy_folder (GtkWindow *parent, gtk_widget_destroy (dialog); } -struct _EMCreateFolder { - MailMsg base; - - /* input data */ - CamelStore *store; - gchar *full_name; - gchar *parent; - gchar *name; - - /* output data */ - CamelFolderInfo *fi; - - /* callback data */ - void (* done) (CamelFolderInfo *fi, gpointer user_data); - gpointer user_data; -}; - -/* Temporary Structure to hold data to pass across function */ -struct _EMCreateFolderTempData -{ - EMFolderTree * emft; - EMFolderSelector * emfs; - gchar *uri; -}; - -static gchar * -emfu_create_folder__desc (struct _EMCreateFolder *m) -{ - return g_strdup_printf (_("Creating folder '%s'"), m->full_name); -} - static void -emfu_create_folder__exec (struct _EMCreateFolder *m, - GCancellable *cancellable, - GError **error) +new_folder_created_cb (CamelStore *store, + GAsyncResult *result, + AsyncContext *context) { - if ((m->fi = camel_store_create_folder_sync ( - m->store, m->parent, m->name, cancellable, error))) { - - if (camel_store_supports_subscriptions (m->store)) - camel_store_subscribe_folder_sync ( - m->store, m->full_name, - cancellable, error); - } -} - -static void -emfu_create_folder__done (struct _EMCreateFolder *m) -{ - if (m->done) - m->done (m->fi, m->user_data); -} + GError *error = NULL; -static void -emfu_create_folder__free (struct _EMCreateFolder *m) -{ - camel_store_free_folder_info (m->store, m->fi); - g_object_unref (m->store); - g_free (m->full_name); - g_free (m->parent); - g_free (m->name); -} + e_mail_store_create_folder_finish (store, result, &error); -static MailMsgInfo create_folder_info = { - sizeof (struct _EMCreateFolder), - (MailMsgDescFunc) emfu_create_folder__desc, - (MailMsgExecFunc) emfu_create_folder__exec, - (MailMsgDoneFunc) emfu_create_folder__done, - (MailMsgFreeFunc) emfu_create_folder__free -}; + /* FIXME Use an EActivity here. */ + if (error != NULL) { + g_warning ("%s", error->message); + g_error_free (error); -static gint -emfu_create_folder_real (CamelStore *store, - const gchar *full_name, - void (*done) (CamelFolderInfo *fi, - gpointer user_data), - gpointer user_data) -{ - gchar *name, *namebuf = NULL; - struct _EMCreateFolder *m; - const gchar *parent; - gint id; - - namebuf = g_strdup (full_name); - if (!(name = strrchr (namebuf, '/'))) { - name = namebuf; - parent = ""; } else { - *name++ = '\0'; - parent = namebuf; + gpointer data; + gboolean expand_only; + + /* XXX What in the hell kind of lazy hack is this? */ + data = g_object_get_data ( + G_OBJECT (context->folder_tree), "select"); + expand_only = GPOINTER_TO_INT (data) ? TRUE : FALSE; + + em_folder_tree_set_selected ( + context->folder_tree, + context->folder_uri, expand_only); } - m = mail_msg_new (&create_folder_info); - g_object_ref (store); - m->store = store; - m->full_name = g_strdup (full_name); - m->parent = g_strdup (parent); - m->name = g_strdup (name); - m->user_data = user_data; - m->done = done; - - g_free (namebuf); - - id = m->base.seq; - mail_msg_unordered_push (m); - - return id; -} - -static void -new_folder_created_cb (CamelFolderInfo *fi, - gpointer user_data) -{ - struct _EMCreateFolderTempData *emcftd=user_data; - if (fi) { - /* Exapnding newly created folder */ - if (emcftd->emft) - em_folder_tree_set_selected ( - EM_FOLDER_TREE (emcftd->emft), - emcftd->uri, GPOINTER_TO_INT ( - g_object_get_data (G_OBJECT (emcftd->emft), - "select")) ? FALSE : TRUE); - - gtk_widget_destroy ((GtkWidget *) emcftd->emfs); - } - g_object_unref (emcftd->emfs); - g_free (emcftd->uri); - g_free (emcftd); + async_context_free (context); } -static void -emfu_popup_new_folder_response (EMFolderSelector *emfs, - gint response, - EMFolderTree *folder_tree) +void +em_folder_utils_create_folder (GtkWindow *parent, + EMFolderTree *emft, + EMailSession *session, + const gchar *initial_uri) { - EMFolderTreeModelStoreInfo *si; - EMailSession *session; - GtkTreeModel *model; - const gchar *uri, *path; + EMFolderTree *folder_tree; CamelStore *store = NULL; - struct _EMCreateFolderTempData *emcftd; + const gchar *folder_uri; + gchar *folder_name = NULL; + GtkWidget *dialog; GError *error = NULL; - if (response != GTK_RESPONSE_OK) { - gtk_widget_destroy ((GtkWidget *) emfs); - return; - } + /* FIXME The EMailSession argument isn't really necessary. + * We could extract it via em_folder_tree_get_session(). */ - uri = em_folder_selector_get_selected_uri (emfs); - path = em_folder_selector_get_selected_path (emfs); + g_return_if_fail (GTK_IS_WINDOW (parent)); + g_return_if_fail (EM_IS_FOLDER_TREE (emft)); + g_return_if_fail (E_IS_MAIL_SESSION (session)); - d(printf ("Creating new folder: %s (%s)\n", path, uri)); + folder_tree = (EMFolderTree *) em_folder_tree_new (session); + emu_restore_folder_tree_state (folder_tree); + + dialog = em_folder_selector_create_new ( + parent, folder_tree, 0, + _("Create Folder"), + _("Specify where to create the folder:")); + if (initial_uri != NULL) + em_folder_selector_set_selected ( + EM_FOLDER_SELECTOR (dialog), initial_uri); - session = em_folder_tree_get_session (folder_tree); + if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK) + goto exit; + + folder_uri = em_folder_selector_get_selected_uri ( + EM_FOLDER_SELECTOR (dialog)); e_mail_folder_uri_parse ( - CAMEL_SESSION (session), uri, &store, NULL, &error); + CAMEL_SESSION (session), folder_uri, + &store, &folder_name, &error); + /* XXX This is unlikely to fail since the URI comes straight from + * EMFolderSelector, but leave a breadcrumb if it does fail. */ if (error != NULL) { - g_warning ( - "%s: Failed to parse folder uri: %s", - G_STRFUNC, error->message); + g_warn_if_fail (store == NULL); + g_warn_if_fail (folder_name == NULL); + g_warning ("%s", error->message); g_error_free (error); - return; + goto exit; } - model = gtk_tree_view_get_model (GTK_TREE_VIEW (emfs->emft)); - si = em_folder_tree_model_lookup_store_info ( - EM_FOLDER_TREE_MODEL (model), store); - g_return_if_fail (si != NULL); - /* HACK: we need to create vfolders using the vfolder editor */ if (CAMEL_IS_VEE_STORE (store)) { EFilterRule *rule; rule = em_vfolder_rule_new (session); - e_filter_rule_set_name (rule, path); + e_filter_rule_set_name (rule, folder_name); vfolder_gui_add_rule (EM_VFOLDER_RULE (rule)); - gtk_widget_destroy ((GtkWidget *) emfs); } else { - /* Temp data to pass to create_folder_real function */ - emcftd = (struct _EMCreateFolderTempData *) - g_malloc (sizeof (struct _EMCreateFolderTempData)); - emcftd->emfs = emfs; - emcftd->uri = g_strdup (uri); - emcftd->emft = folder_tree; - - g_object_ref (emfs); - emfu_create_folder_real ( - si->store, path, new_folder_created_cb, emcftd); - } -} + AsyncContext *context; -/* FIXME: these functions must be documented */ -void -em_folder_utils_create_folder (GtkWindow *parent, - EMFolderTree *emft, - EMailSession *session, - const gchar *initial_uri) -{ - EMFolderTree *folder_tree; - GtkWidget *dialog; + context = g_slice_new0 (AsyncContext); + context->folder_tree = g_object_ref (emft); + context->folder_uri = g_strdup (folder_uri); - folder_tree = (EMFolderTree *) em_folder_tree_new (session); - emu_restore_folder_tree_state (folder_tree); + /* FIXME Not passing a GCancellable. */ + e_mail_store_create_folder ( + store, folder_name, G_PRIORITY_DEFAULT, NULL, + (GAsyncReadyCallback) new_folder_created_cb, + context); + } - dialog = em_folder_selector_create_new ( - parent, folder_tree, 0, - _("Create Folder"), - _("Specify where to create the folder:")); - if (initial_uri != NULL) - em_folder_selector_set_selected ( - EM_FOLDER_SELECTOR (dialog), initial_uri); - g_signal_connect ( - dialog, "response", - G_CALLBACK (emfu_popup_new_folder_response), - emft ? emft : folder_tree); + g_free (folder_name); - if (!parent || !GTK_IS_DIALOG (parent)) - gtk_widget_show (dialog); - else - gtk_dialog_run (GTK_DIALOG (dialog)); +exit: + gtk_widget_destroy (dialog); } const gchar * -- cgit