#include "modest-text-utils.h"
#include "modest-tny-msg.h"
#include "modest-tny-folder.h"
+#include "modest-tny-account-store.h"
#include "modest-tny-platform-factory.h"
#include "modest-marshal.h"
#include "modest-error.h"
UpdateAccountCallback callback,
gpointer user_data)
{
- GThread *thread;
- UpdateAccountInfo *info;
- ModestMailOperationPrivate *priv;
- ModestAccountMgr *mgr;
- TnyStoreAccount *modest_account;
- TnyTransportAccount *transport_account;
+ GThread *thread = NULL;
+ UpdateAccountInfo *info = NULL;
+ ModestMailOperationPrivate *priv = NULL;
+ ModestAccountMgr *mgr = NULL;
+ TnyStoreAccount *store_account = NULL;
+ TnyTransportAccount *transport_account = NULL;
g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE);
g_return_val_if_fail (account_name, FALSE);
priv->done = 0;
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+ /* Get the Modest account */
+ store_account = (TnyStoreAccount *)
+ modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
+ account_name,
+ TNY_ACCOUNT_TYPE_STORE);
+
/* Make sure that we have a connection, and request one
* if necessary:
* TODO: Is there some way to trigger this for every attempt to
* use the network? */
- if (!modest_platform_connect_and_wait (NULL))
+ if (!modest_platform_connect_and_wait (NULL, TNY_ACCOUNT (store_account)))
goto error;
- /* Get the Modest account */
- modest_account = (TnyStoreAccount *)
- modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
- account_name,
- TNY_ACCOUNT_TYPE_STORE);
-
- if (!modest_account) {
+ if (!store_account) {
g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
"cannot get tny store account for %s\n", account_name);
/* Create the helper object */
info = g_slice_new (UpdateAccountInfo);
info->mail_op = self;
- info->account = modest_account;
+ info->account = store_account;
info->transport_account = transport_account;
info->callback = callback;
info->user_data = user_data;
ModestMailOperationPrivate *priv;
TnyFolder *new_folder = NULL;
+ TnyList *list = tny_simple_list_new ();
+ TnyFolderStoreQuery *query = tny_folder_store_query_new ();
+
g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
g_return_val_if_fail (name, NULL);
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+ /* Check for already existing folder */
+ tny_folder_store_query_add_item (query, name, TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME);
+ tny_folder_store_get_folders (parent, list, query, NULL);
+ g_object_unref (G_OBJECT (query));
+
+ if (tny_list_get_length (list) > 0) {
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
+ _CS("ckdg_ib_folder_already_exists"));
+ }
+
+ g_object_unref (G_OBJECT (list));
+
/* Check parent */
if (TNY_IS_FOLDER (parent)) {
/* Check folder rules */
/* Free */
g_object_unref (helper->mail_op);
g_slice_free (XFerMsgAsyncHelper, helper);
- g_object_unref (folder);
- g_object_unref (into);
+}
+
+/**
+ *
+ * This function checks if the new name is a valid name for our local
+ * folders account. The new name could not be the same than then name
+ * of any of the mandatory local folders
+ *
+ * We can not rely on tinymail because tinymail does not check the
+ * name of the virtual folders that the account could have in the case
+ * that we're doing a rename (because it directly calls Camel which
+ * knows nothing about our virtual folders).
+ *
+ * In the case of an actual copy/move (i.e. move/copy a folder between
+ * accounts) tinymail uses the tny_folder_store_create_account which
+ * is reimplemented by our ModestTnyLocalFoldersAccount that indeed
+ * checks the new name of the folder, so this call in that case
+ * wouldn't be needed. *But* NOTE that if tinymail changes its
+ * implementation (if folder transfers within the same account is no
+ * longer implemented as a rename) this call will allow Modest to work
+ * perfectly
+ *
+ * If the new name is not valid, this function will set the status to
+ * failed and will set also an error in the mail operation
+ */
+static gboolean
+new_name_valid_if_local_account (ModestMailOperationPrivate *priv,
+ TnyFolderStore *into,
+ const gchar *new_name)
+{
+ if (TNY_IS_ACCOUNT (into) &&
+ modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (into)) &&
+ modest_tny_local_folders_account_extra_folder_exists (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (into),
+ new_name)) {
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+ _("FIXME: folder name already in use"));
+ return FALSE;
+ } else
+ return TRUE;
}
void
/* Notify the queue */
modest_mail_operation_notify_end (self);
} else {
- /* Pick references for async calls */
- g_object_ref (folder);
- g_object_ref (parent);
-
- /* Create the helper */
- helper = g_slice_new0 (XFerMsgAsyncHelper);
- helper->mail_op = g_object_ref(self);
- helper->dest_folder = NULL;
- helper->headers = NULL;
- helper->user_callback = user_callback;
- helper->user_data = user_data;
-
- /* Move/Copy folder */
- tny_folder_copy_async (folder,
- parent,
- tny_folder_get_name (folder),
- delete_original,
- transfer_folder_cb,
- transfer_folder_status_cb,
- helper);
-/* self); */
+
+
+ /* Check that the new folder name is not used by any
+ special local folder */
+ if (new_name_valid_if_local_account (priv, parent,
+ tny_folder_get_name (folder))) {
+ /* Create the helper */
+ helper = g_slice_new0 (XFerMsgAsyncHelper);
+ helper->mail_op = g_object_ref(self);
+ helper->dest_folder = NULL;
+ helper->headers = NULL;
+ helper->user_callback = user_callback;
+ helper->user_data = user_data;
+
+ /* Move/Copy folder */
+ tny_folder_copy_async (folder,
+ parent,
+ tny_folder_get_name (folder),
+ delete_original,
+ transfer_folder_cb,
+ transfer_folder_status_cb,
+ helper);
+ } else {
+ modest_mail_operation_notify_end (self);
+ }
}
}
} else {
TnyFolderStore *into;
- /* Create the helper */
- helper = g_slice_new0 (XFerMsgAsyncHelper);
- helper->mail_op = g_object_ref(self);
- helper->dest_folder = NULL;
- helper->headers = NULL;
- helper->user_callback = NULL;
- helper->user_data = NULL;
-
- /* Rename. Camel handles folder subscription/unsubscription */
- into = tny_folder_get_folder_store (folder);
- tny_folder_copy_async (folder, into, name, TRUE,
- transfer_folder_cb,
- transfer_folder_status_cb,
- helper);
-/* self); */
- if (into)
- g_object_unref (into);
- }
- }
+ into = tny_folder_get_folder_store (folder);
+
+ /* Check that the new folder name is not used by any
+ special local folder */
+ if (new_name_valid_if_local_account (priv, into, name)) {
+ /* Create the helper */
+ helper = g_slice_new0 (XFerMsgAsyncHelper);
+ helper->mail_op = g_object_ref(self);
+ helper->dest_folder = NULL;
+ helper->headers = NULL;
+ helper->user_callback = NULL;
+ helper->user_data = NULL;
+
+ /* Rename. Camel handles folder subscription/unsubscription */
+ tny_folder_copy_async (folder, into, name, TRUE,
+ transfer_folder_cb,
+ transfer_folder_status_cb,
+ helper);
+ } else {
+ modest_mail_operation_notify_end (self);
+ }
+ g_object_unref (into);
+ }
+}
/* ******************************************************************* */
/* ************************** MSG ACTIONS ************************* */
projects / modest / blobdiff