GNOME.org
 

evolution r36131 - branches/mail-dbus-remoting/mail

Author: abharath
Date: Wed Aug 27 16:10:11 2008
New Revision: 36131
URL: http://svn.gnome.org/viewvc/evolution?rev=36131&view=rev

Log:
Migrated Store to the remote calls and a double free fix.


Modified:
   branches/mail-dbus-remoting/mail/camel-store-remote-impl.c
   branches/mail-dbus-remoting/mail/camel-store-remote.c
   branches/mail-dbus-remoting/mail/camel-store-remote.h
   branches/mail-dbus-remoting/mail/em-folder-tree-model.c
   branches/mail-dbus-remoting/mail/em-folder-tree.c
   branches/mail-dbus-remoting/mail/em-folder-utils.c
   branches/mail-dbus-remoting/mail/em-migrate.c
   branches/mail-dbus-remoting/mail/em-subscribe-editor.c
   branches/mail-dbus-remoting/mail/em-utils.c
   branches/mail-dbus-remoting/mail/mail-component.c
   branches/mail-dbus-remoting/mail/mail-folder-cache.c
   branches/mail-dbus-remoting/mail/mail-ops.c
   branches/mail-dbus-remoting/mail/mail-tools.c
   branches/mail-dbus-remoting/mail/mail-vfolder.c

Modified: branches/mail-dbus-remoting/mail/camel-store-remote-impl.c
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-store-remote-impl.c	(original)
+++ branches/mail-dbus-remoting/mail/camel-store-remote-impl.c	Wed Aug 27 16:10:11 2008
@@ -62,12 +62,13 @@
 					   ((CamelService *) folder->
 					    parent_store), folder->full_name);
 		g_hash_table_insert(folder_hash, folder_hash_key, folder);
-		g_free(folder_hash_key);
 	}
+
 	camel_exception_free(ex);
 
 	dbus_message_append_args(reply, DBUS_TYPE_STRING, &folder_hash_key,
 				 DBUS_TYPE_STRING, &err, DBUS_TYPE_INVALID);
+	g_free(folder_hash_key);
 	g_free(err);
 	return 0;
 }
@@ -119,7 +120,6 @@
 						   folder->full_name);
 			g_hash_table_insert(folder_hash, folder_hash_key,
 					    folder);
-			g_free(folder_hash_key);
 		}
 		camel_exception_free(ex);
 

Modified: branches/mail-dbus-remoting/mail/camel-store-remote.c
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-store-remote.c	(original)
+++ branches/mail-dbus-remoting/mail/camel-store-remote.c	Wed Aug 27 16:10:11 2008
@@ -16,7 +16,8 @@
 
 CamelFolder *camel_store_get_folder_remote(CamelStoreRemote * store,
 					   const char *folder_name,
-					   guint32 flags)
+					   guint32 flags,
+					   CamelException *ex)
 {
 	DBusError error;
 	char *err;
@@ -34,6 +35,7 @@
 				  flags, &shash, &err);
 
 	CamelFolder *folder = g_hash_table_lookup(folder_hash, shash);
+	
 	return folder;
 }
 

Modified: branches/mail-dbus-remoting/mail/camel-store-remote.h
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-store-remote.h	(original)
+++ branches/mail-dbus-remoting/mail/camel-store-remote.h	Wed Aug 27 16:10:11 2008
@@ -18,7 +18,8 @@
 
 CamelFolder *camel_store_get_folder_remote(CamelStoreRemote * store,
 					   const char *folder_name,
-					   guint32 flags);
+					   guint32 flags,
+					   CamelException *ex);
 CamelFolder *camel_store_get_inbox_remote(CamelStoreRemote * store, CamelException *ex);
 CamelFolder *camel_store_get_trash_remote(CamelStoreRemote * store, CamelException *ex);
 CamelFolder *camel_store_get_junk_remote(CamelStoreRemote * store, CamelException *ex);

Modified: branches/mail-dbus-remoting/mail/em-folder-tree-model.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-tree-model.c	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-tree-model.c	Wed Aug 27 16:10:11 2008
@@ -689,7 +689,7 @@
 	CamelFolderInfo *fi;
 
 	/* we only want created events to do more work if we don't support subscriptions */
-	if (camel_store_supports_subscriptions (store))
+	if (camel_store_supports_subscriptions_remote (store))
 		return;
 
 	camel_object_ref (store);
@@ -703,7 +703,7 @@
 	CamelFolderInfo *fi;
 
 	/* we only want deleted events to do more work if we don't support subscriptions */
-	if (camel_store_supports_subscriptions (store))
+	if (camel_store_supports_subscriptions_remote (store))
 		return;
 
 	camel_object_ref (store);

Modified: branches/mail-dbus-remoting/mail/em-folder-tree.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-tree.c	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-tree.c	Wed Aug 27 16:10:11 2008
@@ -791,7 +791,7 @@
 		goto fail;
 
 	camel_exception_init(&ex);
-	camel_store_delete_folder(store, full_name, &ex);
+	camel_store_delete_folder_remote(store, full_name, &ex);
 	if (camel_exception_is_set(&ex))
 		camel_exception_clear(&ex);
 fail:
@@ -834,7 +834,7 @@
 		break;
 	case DND_DRAG_TYPE_TEXT_URI_LIST:
 		/* dragging to nautilus or something, probably */
-		if ((folder = camel_store_get_folder(store, full_name, 0, &ex))) {
+		if ((folder = camel_store_get_folder_remote(store, full_name, 0, &ex))) {
 			GPtrArray *uids = camel_folder_get_uids(folder);
 
 			em_utils_selection_set_urilist(selection, folder, uids);
@@ -926,7 +926,7 @@
 	} else if (m->full_name == NULL) {
 		camel_exception_set (&m->base.ex, CAMEL_EXCEPTION_SYSTEM,
 				     _("Cannot drop message(s) into toplevel store"));
-	} else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &m->base.ex))) {
+	} else if ((folder = camel_store_get_folder_remote (m->store, m->full_name, 0, &m->base.ex))) {
 		switch (m->info) {
 		case DND_DROP_TYPE_UID_LIST:
 			/* import a list of uids from another evo folder */
@@ -2511,7 +2511,7 @@
 		gtk_tree_model_get (model, &iter, COL_POINTER_CAMEL_STORE, &store,
 				    COL_STRING_FULL_NAME, &full_name, -1);
 
-	folder = camel_store_get_folder (store, full_name, CAMEL_STORE_FOLDER_INFO_FAST, &ex);
+	folder = camel_store_get_folder_remote (store, full_name, CAMEL_STORE_FOLDER_INFO_FAST, &ex);
 
 	camel_exception_clear (&ex);
 

Modified: branches/mail-dbus-remoting/mail/em-folder-utils.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-utils.c	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-utils.c	Wed Aug 27 16:10:11 2008
@@ -154,20 +154,20 @@
 			if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) {
 				d(printf ("this folder is selectable\n"));
 				if (m->tostore == m->fromstore && m->delete) {
-					camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &m->base.ex);
+					camel_store_rename_folder_remote (m->fromstore, info->full_name, toname->str, &m->base.ex);
 					if (camel_exception_is_set (&m->base.ex))
 						goto exception;
 
 					/* this folder no longer exists, unsubscribe it */
-					if (camel_store_supports_subscriptions (m->fromstore))
-						camel_store_unsubscribe_folder (m->fromstore, info->full_name, NULL);
+					if (camel_store_supports_subscriptions_remote (m->fromstore))
+						camel_store_unsubscribe_folder_remote (m->fromstore, info->full_name, NULL);
 
 					deleted = 1;
 				} else {
-					if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &m->base.ex)))
+					if (!(fromfolder = camel_store_get_folder_remote (m->fromstore, info->full_name, 0, &m->base.ex)))
 						goto exception;
 
-					if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) {
+					if (!(tofolder = camel_store_get_folder_remote (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) {
 						camel_object_unref (fromfolder);
 						goto exception;
 					}
@@ -190,9 +190,9 @@
 				deleting = g_list_prepend (deleting, info);
 
 			/* subscribe to the new folder if appropriate */
-			if (camel_store_supports_subscriptions (m->tostore)
-			    && !camel_store_folder_subscribed (m->tostore, toname->str))
-				camel_store_subscribe_folder (m->tostore, toname->str, NULL);
+			if (camel_store_supports_subscriptions_remote (m->tostore)
+			    && !camel_store_folder_subscribed_remote (m->tostore, toname->str))
+				camel_store_subscribe_folder_remote (m->tostore, toname->str, NULL);
 
 			info = info->next;
 		}
@@ -208,10 +208,10 @@
 		/* FIXME: we need to do something with the exception
 		   since otherwise the users sees a failed operation
 		   with no error message or even any warnings */
-		if (camel_store_supports_subscriptions (m->fromstore))
-			camel_store_unsubscribe_folder (m->fromstore, info->full_name, NULL);
+		if (camel_store_supports_subscriptions_remote (m->fromstore))
+			camel_store_unsubscribe_folder_remote (m->fromstore, info->full_name, NULL);
 
-		camel_store_delete_folder (m->fromstore, info->full_name, NULL);
+		camel_store_delete_folder_remote (m->fromstore, info->full_name, NULL);
 		l = l->next;
 	}
 
@@ -384,10 +384,10 @@
 		d(printf ("deleting folder '%s'\n", fi->full_name));
 
 		/* shouldn't camel do this itself? */
-		if (camel_store_supports_subscriptions (store))
-			camel_store_unsubscribe_folder (store, fi->full_name, NULL);
+		if (camel_store_supports_subscriptions_remote (store))
+			camel_store_unsubscribe_folder_remote (store, fi->full_name, NULL);
 
-		if (!(folder = camel_store_get_folder (store, fi->full_name, 0, ex)))
+		if (!(folder = camel_store_get_folder_remote (store, fi->full_name, 0, ex)))
 			return;
 
 		if (!CAMEL_IS_VEE_FOLDER (folder)) {
@@ -404,7 +404,7 @@
 			camel_folder_thaw (folder);
 		}
 
-		camel_store_delete_folder (store, fi->full_name, ex);
+		camel_store_delete_folder_remote (store, fi->full_name, ex);
 		if (camel_exception_is_set (ex))
 			return;
 
@@ -540,7 +540,7 @@
 				d(printf ("renaming %s to %s\n", oldpath, newpath));
 
 				camel_exception_clear (&ex);
-				camel_store_rename_folder (folder->parent_store, oldpath, newpath, &ex);
+				camel_store_rename_folder_remote (folder->parent_store, oldpath, newpath, &ex);
 				if (camel_exception_is_set (&ex)) {
 					e_error_run(NULL,
 						    "mail:no-rename-folder", oldpath, newpath, ex.desc, NULL);
@@ -593,9 +593,9 @@
 {
 	d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name));
 
-	if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) {
-		if (camel_store_supports_subscriptions (m->store))
-			camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex);
+	if ((m->fi = camel_store_create_folder_remote (m->store, m->parent, m->name, &m->base.ex))) {
+		if (camel_store_supports_subscriptions_remote (m->store))
+			camel_store_subscribe_folder_remote (m->store, m->full_name, &m->base.ex);
 	}
 }
 

Modified: branches/mail-dbus-remoting/mail/em-migrate.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-migrate.c	(original)
+++ branches/mail-dbus-remoting/mail/em-migrate.c	Wed Aug 27 16:10:11 2008
@@ -1745,11 +1745,11 @@
 		guint32 flags = CAMEL_STORE_FOLDER_CREATE;
 
 		if (!(local_store = camel_session_remote_get_store ((CamelSession *) session, uri, ex))
-		    || !(old_folder = camel_store_get_folder (local_store, name, 0, ex)))
+		    || !(old_folder = camel_store_get_folder_remote (local_store, name, 0, ex)))
 			goto fatal;
 
 		flags |= (index ? CAMEL_STORE_FOLDER_BODY_INDEX : 0);
-		if (!(new_folder = camel_store_get_folder (session->store, full_name, flags, ex)))
+		if (!(new_folder = camel_store_get_folder_remote (session->store, full_name, flags, ex)))
 			goto fatal;
 
 		if (thread_list != -1) {
@@ -2854,7 +2854,7 @@
 		char *tmp = g_strdup_printf ("%s/%s", acc, fi->full_name);
 		em_migrate_set_folder_name (tmp);
 		g_free (tmp);
-		folder = camel_store_get_folder (store, fi->full_name, 0, ex);
+		folder = camel_store_get_folder_remote (store, fi->full_name, 0, ex);
 		if (folder != NULL)
 			camel_folder_summary_migrate_infos (folder->summary);
 		migrate_folders(store, fi->child, acc, ex);

Modified: branches/mail-dbus-remoting/mail/em-subscribe-editor.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-subscribe-editor.c	(original)
+++ branches/mail-dbus-remoting/mail/em-subscribe-editor.c	Wed Aug 27 16:10:11 2008
@@ -175,9 +175,9 @@
 sub_folder_exec (struct _zsubscribe_msg *m)
 {
 	if (m->subscribe)
-		camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex);
+		camel_store_subscribe_folder_remote (m->sub->store, m->node->info->full_name, &m->base.ex);
 	else
-		camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex);
+		camel_store_unsubscribe_folder_remote (m->sub->store, m->node->info->full_name, &m->base.ex);
 }
 
 static void
@@ -581,7 +581,7 @@
 static void
 subscribe_set_store(EMSubscribe *sub, CamelObjectRemote *store)
 {
-	if (store == NULL || !camel_store_supports_subscriptions(store)) {
+	if (store == NULL || !camel_store_supports_subscriptions_remote(store)) {
 		GtkWidget *w = gtk_label_new(_("This store does not support subscriptions, or they are not enabled."));
 
 		gtk_label_set_line_wrap((GtkLabel *)w, TRUE);

Modified: branches/mail-dbus-remoting/mail/em-utils.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-utils.c	(original)
+++ branches/mail-dbus-remoting/mail/em-utils.c	Wed Aug 27 16:10:11 2008
@@ -1395,7 +1395,7 @@
 		
 		if (account->templates_folder_uri) {
 			templates_uri = em_uri_to_camel (account->templates_folder_uri);
-			if (camel_store_folder_uri_equal (folder->parent_store, templates_uri, uri)) {
+			if (camel_store_folder_uri_equal_remote (folder->parent_store, templates_uri, uri)) {
 				g_free (templates_uri);
 				is = TRUE;
 				break;
@@ -1442,7 +1442,7 @@
 
 		if (account->drafts_folder_uri) {
 			drafts_uri = em_uri_to_camel (account->drafts_folder_uri);
-			if (camel_store_folder_uri_equal (folder->parent_store, drafts_uri, uri)) {
+			if (camel_store_folder_uri_equal_remote (folder->parent_store, drafts_uri, uri)) {
 				g_free (drafts_uri);
 				is = TRUE;
 				break;
@@ -1489,7 +1489,7 @@
 
 		if (account->sent_folder_uri) {
 			sent_uri = em_uri_to_camel (account->sent_folder_uri);
-			if (camel_store_folder_uri_equal (folder->parent_store, sent_uri, uri)) {
+			if (camel_store_folder_uri_equal_remote (folder->parent_store, sent_uri, uri)) {
 				g_free (sent_uri);
 				is = TRUE;
 				break;

Modified: branches/mail-dbus-remoting/mail/mail-component.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-component.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-component.c	Wed Aug 27 16:10:11 2008
@@ -308,7 +308,7 @@
 		/* FIXME: should this uri be account relative? */
 		camel_url_set_fragment(url, mc_default_folders[i].name);
 		mc_default_folders[i].uri = camel_url_to_string(url, 0);
-		mc_default_folders[i].folder = camel_store_get_folder(p->local_store, mc_default_folders[i].name,
+		mc_default_folders[i].folder = camel_store_get_folder_remote(p->local_store, mc_default_folders[i].name,
 								      CAMEL_STORE_FOLDER_CREATE, &ex);
 		camel_exception_clear(&ex);
 	}
@@ -844,7 +844,7 @@
 static void
 mc_quit_delete (CamelObjectRemote *store, struct _store_info *si, MailComponent *mc)
 {
-	CamelFolder *folder = camel_store_get_junk (store, NULL);
+	CamelFolder *folder = camel_store_get_junk_remote (store, NULL);
 
 	if (folder) {
 		GPtrArray *uids;

Modified: branches/mail-dbus-remoting/mail/mail-folder-cache.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-folder-cache.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-folder-cache.c	Wed Aug 27 16:10:11 2008
@@ -521,7 +521,7 @@
 store_folder_created(CamelObject *o, void *event_data, void *data)
 {
 	/* we only want created events to do more work if we dont support subscriptions */
-	if (!camel_store_supports_subscriptions(CAMEL_STORE(o)))
+	if (!camel_store_supports_subscriptions_remote(CAMEL_STORE(o)))
 		store_folder_subscribed(o, event_data, data);
 }
 
@@ -561,7 +561,7 @@
 store_folder_deleted(CamelObject *o, void *event_data, void *data)
 {
 	/* we only want deleted events to do more work if we dont support subscriptions */
-	if (!camel_store_supports_subscriptions(CAMEL_STORE(o)))
+	if (!camel_store_supports_subscriptions_remote(CAMEL_STORE(o)))
 		store_folder_unsubscribed(o, event_data, data);
 }
 
@@ -849,7 +849,7 @@
 			online = TRUE;
 	}
 	if (online)
-		camel_store_noop (m->store, &m->base.ex);
+		camel_store_noop_remote (m->store, &m->base.ex);
 }
 
 static void

Modified: branches/mail-dbus-remoting/mail/mail-ops.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-ops.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-ops.c	Wed Aug 27 16:10:11 2008
@@ -1436,11 +1436,11 @@
 	camel_folder_free_uids (folder, uids);
 
 	/* if the store supports subscriptions, unsubscribe from this folder... */
-	if (camel_store_supports_subscriptions (store))
-		camel_store_unsubscribe_folder (store, folder->full_name, NULL);
+	if (camel_store_supports_subscriptions_remote (store))
+		camel_store_unsubscribe_folder_remote (store, folder->full_name, NULL);
 
 	/* Then delete the folder from the store */
-	camel_store_delete_folder (store, folder->full_name, &m->base.ex);
+	camel_store_delete_folder_remote (store, folder->full_name, &m->base.ex);
 	m->removed = !camel_exception_is_set (&m->base.ex);
 	camel_object_unref (folder);
 }
@@ -1570,7 +1570,7 @@
 static void
 sync_store_exec (struct _sync_store_msg *m)
 {
-	camel_store_sync(m->store, m->expunge, &m->base.ex);
+	camel_store_sync_remote(m->store, m->expunge, &m->base.ex);
 }
 
 static void

Modified: branches/mail-dbus-remoting/mail/mail-tools.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-tools.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-tools.c	Wed Aug 27 16:10:11 2008
@@ -71,7 +71,7 @@
 	if (!store)
 		return NULL;
 
-	folder = camel_store_get_inbox (store, ex);
+	folder = camel_store_get_inbox_remote (store, ex);
 	camel_object_unref (store);
 
 	return folder;
@@ -92,7 +92,7 @@
 		return NULL;
 
 	if (connect || ((CamelService *) store)->status == CAMEL_SERVICE_CONNECTED)
-		trash = camel_store_get_trash (store, ex);
+		trash = camel_store_get_trash_remote (store, ex);
 	else
 		trash = NULL;
 
@@ -324,11 +324,11 @@
 
 		if (offset) {
 			if (offset == 7)
-				folder = camel_store_get_trash (store, ex);
+				folder = camel_store_get_trash_remote (store, ex);
 			else if (offset == 6)
-				folder = camel_store_get_junk (store, ex);
+				folder = camel_store_get_junk_remote (store, ex);
 		} else
-			folder = camel_store_get_folder (store, name, flags, ex);
+			folder = camel_store_get_folder_remote (store, name, flags, ex);
 		camel_object_unref (store);
 	}
 

Modified: branches/mail-dbus-remoting/mail/mail-vfolder.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-vfolder.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-vfolder.c	Wed Aug 27 16:10:11 2008
@@ -325,7 +325,7 @@
 mv_find_folder(GList *l, CamelObjectRemote *store, const char *uri)
 {
 	while (l) {
-		if (camel_store_folder_uri_equal(store, l->data, uri))
+		if (camel_store_folder_uri_equal_remote(store, l->data, uri))
 			break;
 		l = l->next;
 	}
@@ -346,9 +346,9 @@
 		 mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_SENT),
 		 mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS)));
 
-	found = camel_store_folder_uri_equal(store, mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_OUTBOX), uri)
-		|| camel_store_folder_uri_equal(store, mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_SENT), uri)
-		|| camel_store_folder_uri_equal(store, mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS), uri);
+	found = camel_store_folder_uri_equal_remote(store, mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_OUTBOX), uri)
+		|| camel_store_folder_uri_equal_remote(store, mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_SENT), uri)
+		|| camel_store_folder_uri_equal_remote(store, mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS), uri);
 
 	if (found)
 		return found;
@@ -365,12 +365,12 @@
 
 		if (account->sent_folder_uri) {
 			curi = em_uri_to_camel(account->sent_folder_uri);
-			found = camel_store_folder_uri_equal(store, uri, curi);
+			found = camel_store_folder_uri_equal_remote(store, uri, curi);
 			g_free(curi);
 		}
 		if (!found && account->drafts_folder_uri) {
 			curi = em_uri_to_camel(account->drafts_folder_uri);
-			found = camel_store_folder_uri_equal(store, uri, curi);
+			found = camel_store_folder_uri_equal_remote(store, uri, curi);
 			g_free(curi);
 		}
 
@@ -499,7 +499,7 @@
 		while (!found && (source = em_vfolder_rule_next_source((EMVFolderRule *)rule, source))) {
 			char *csource;
 			csource = em_uri_to_camel(source);
-			found = camel_store_folder_uri_equal(store, curi, csource);
+			found = camel_store_folder_uri_equal_remote(store, curi, csource);
 			d(printf(found?" '%s' == '%s'?\n":" '%s' != '%s'\n", curi, csource));
 			g_free(csource);
 		}
@@ -566,7 +566,7 @@
 
 			/* Remove all sources that match, ignore changed events though
 			   because the adduri call above does the work async */
-			if (camel_store_folder_uri_equal(store, curi, csource)) {
+			if (camel_store_folder_uri_equal_remote(store, curi, csource)) {
 				vf = g_hash_table_lookup (vfolder_hash, rule->name);
 				if (!vf) {
 					g_warning ("vf is NULL for %s\n", rule->name);
@@ -645,7 +645,7 @@
 
 			/* Remove all sources that match, ignore changed events though
 			   because the adduri call above does the work async */
-			if (camel_store_folder_uri_equal(store, cfrom, csource)) {
+			if (camel_store_folder_uri_equal_remote(store, cfrom, csource)) {
 				d(printf("Vfolder '%s' used '%s' ('%s') now uses '%s'\n", rule->name, source, from, to));
 				vf = g_hash_table_lookup(vfolder_hash, rule->name);
 				if (!vf) {
@@ -746,7 +746,7 @@
 
 		/* TODO: make the folder->full_name var thread accessible */
 		oldname = g_strdup(folder->full_name);
-		camel_store_rename_folder(vfolder_store, oldname, rule->name, NULL);
+		camel_store_rename_folder_remote(vfolder_store, oldname, rule->name, NULL);
 		g_free(oldname);
 	}
 
@@ -777,7 +777,7 @@
 	d(printf("rule added: %s\n", rule->name));
 
 	/* this always runs quickly */
-	folder = camel_store_get_folder(vfolder_store, rule->name, 0, NULL);
+	folder = camel_store_get_folder_remote(vfolder_store, rule->name, 0, NULL);
 	if (folder) {
 		g_signal_connect(rule, "changed", G_CALLBACK(rule_changed), folder);
 
@@ -813,7 +813,7 @@
 	}
 	UNLOCK();
 
-	camel_store_delete_folder(vfolder_store, rule->name, NULL);
+	camel_store_delete_folder_remote(vfolder_store, rule->name, NULL);
 	/* this must be unref'd after its deleted */
 	if (folder)
 		camel_object_unref ((CamelFolder *) folder);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]