evolution r36098 - branches/mail-dbus-remoting/mail

From: psankar svn gnome org
To: svn-commits-list gnome org
Subject: evolution r36098 - branches/mail-dbus-remoting/mail
Date: Wed, 27 Aug 2008 05:15:21 +0000 (UTC)
Author: psankar
Date: Wed Aug 27 05:15:21 2008
New Revision: 36098
URL: http://svn.gnome.org/viewvc/evolution?rev=36098&view=rev

Log:
Change all occurences of CamelStore to CamelObjectRemote



Modified:
   branches/mail-dbus-remoting/mail/em-account-editor.c
   branches/mail-dbus-remoting/mail/em-folder-browser.c
   branches/mail-dbus-remoting/mail/em-folder-properties.c
   branches/mail-dbus-remoting/mail/em-folder-tree-model.c
   branches/mail-dbus-remoting/mail/em-folder-tree-model.h
   branches/mail-dbus-remoting/mail/em-folder-tree.c
   branches/mail-dbus-remoting/mail/em-folder-tree.h
   branches/mail-dbus-remoting/mail/em-folder-utils.c
   branches/mail-dbus-remoting/mail/em-folder-utils.h
   branches/mail-dbus-remoting/mail/em-folder-view.c
   branches/mail-dbus-remoting/mail/em-migrate.c
   branches/mail-dbus-remoting/mail/em-popup.c
   branches/mail-dbus-remoting/mail/em-subscribe-editor.c
   branches/mail-dbus-remoting/mail/mail-autofilter.c
   branches/mail-dbus-remoting/mail/mail-autofilter.h
   branches/mail-dbus-remoting/mail/mail-component.c
   branches/mail-dbus-remoting/mail/mail-component.h
   branches/mail-dbus-remoting/mail/mail-folder-cache.c
   branches/mail-dbus-remoting/mail/mail-folder-cache.h
   branches/mail-dbus-remoting/mail/mail-ops.c
   branches/mail-dbus-remoting/mail/mail-ops.h
   branches/mail-dbus-remoting/mail/mail-send-recv.c
   branches/mail-dbus-remoting/mail/mail-tools.c
   branches/mail-dbus-remoting/mail/mail-vfolder.c
   branches/mail-dbus-remoting/mail/mail-vfolder.h

Modified: branches/mail-dbus-remoting/mail/em-account-editor.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-account-editor.c	(original)
+++ branches/mail-dbus-remoting/mail/em-account-editor.c	Wed Aug 27 05:15:21 2008
@@ -2766,7 +2766,7 @@
 
 /* HACK: FIXME: the component should listen to the account object directly */
 static void
-add_new_store (char *uri, CamelStore *store, void *user_data)
+add_new_store (char *uri, CamelObjectRemote *store, void *user_data)
 {
 	MailComponent *component = mail_component_peek ();
 	EAccount *account = user_data;

Modified: branches/mail-dbus-remoting/mail/em-folder-browser.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-browser.c	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-browser.c	Wed Aug 27 05:15:21 2008
@@ -98,7 +98,7 @@
 #include <gtkhtml/gtkhtml.h>
 
 extern CamelSession *session;
-CamelStore *vfolder_store; /* the 1 static vfolder store */
+CamelObjectRemote *vfolder_store; /* the 1 static vfolder store */
 
 #define d(x)
 
@@ -1096,7 +1096,7 @@
 	char *word = NULL, *storeuri = NULL, *search_word = NULL;
 	gint id, i;
 	CamelFolder *folder;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	GPtrArray *folders;
 	GList *folder_list_account = NULL ;
 	GList *l, *folder_list = NULL ;

Modified: branches/mail-dbus-remoting/mail/em-folder-properties.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-properties.c	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-properties.c	Wed Aug 27 05:15:21 2008
@@ -297,7 +297,7 @@
 	CamelArgV *argv;
 	gboolean hide_deleted;
 	GConfClient *gconf;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	char *uri = (char *)data;
 	guint32 store_flags;
 

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 05:15:21 2008
@@ -185,9 +185,9 @@
 static int
 sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data)
 {
-	extern CamelStore *vfolder_store;
+	extern CamelObjectRemote *vfolder_store;
 	char *aname, *bname;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	gboolean is_store;
 	guint32 aflags, bflags;
 	int rv = -2;
@@ -391,7 +391,7 @@
 	EMFolderTreeModel *model = user_data;
 	struct _EMFolderTreeModelStoreInfo *si;
 	CamelProvider *provider;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelException ex;
 	char *uri;
 
@@ -414,7 +414,7 @@
 	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
 		return;
 
-	if (!(store = (CamelStore *) camel_session_remote_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
+	if (!(store = (CamelObjectRemote *) camel_session_remote_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
 		camel_exception_clear (&ex);
 		return;
 	}
@@ -575,7 +575,7 @@
 
 
 static void
-folder_subscribed (CamelStore *store, CamelFolderInfo *fi, EMFolderTreeModel *model)
+folder_subscribed (CamelObjectRemote *store, CamelFolderInfo *fi, EMFolderTreeModel *model)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	GtkTreeRowReference *row;
@@ -636,7 +636,7 @@
 }
 
 static void
-folder_subscribed_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model)
+folder_subscribed_cb (CamelObjectRemote *store, void *event_data, EMFolderTreeModel *model)
 {
 	CamelFolderInfo *fi;
 
@@ -646,7 +646,7 @@
 }
 
 static void
-folder_unsubscribed (CamelStore *store, CamelFolderInfo *fi, EMFolderTreeModel *model)
+folder_unsubscribed (CamelObjectRemote *store, CamelFolderInfo *fi, EMFolderTreeModel *model)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	GtkTreeRowReference *row;
@@ -674,7 +674,7 @@
 }
 
 static void
-folder_unsubscribed_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model)
+folder_unsubscribed_cb (CamelObjectRemote *store, void *event_data, EMFolderTreeModel *model)
 {
 	CamelFolderInfo *fi;
 
@@ -684,7 +684,7 @@
 }
 
 static void
-folder_created_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model)
+folder_created_cb (CamelObjectRemote *store, void *event_data, EMFolderTreeModel *model)
 {
 	CamelFolderInfo *fi;
 
@@ -698,7 +698,7 @@
 }
 
 static void
-folder_deleted_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model)
+folder_deleted_cb (CamelObjectRemote *store, void *event_data, EMFolderTreeModel *model)
 {
 	CamelFolderInfo *fi;
 
@@ -712,7 +712,7 @@
 }
 
 static void
-folder_renamed (CamelStore *store, CamelRenameInfo *info, EMFolderTreeModel *model)
+folder_renamed (CamelObjectRemote *store, CamelRenameInfo *info, EMFolderTreeModel *model)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	GtkTreeRowReference *row;
@@ -776,7 +776,7 @@
 }
 
 static void
-folder_renamed_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model)
+folder_renamed_cb (CamelObjectRemote *store, void *event_data, EMFolderTreeModel *model)
 {
 	CamelRenameInfo *rinfo, *info = event_data;
 
@@ -790,7 +790,7 @@
 }
 
 void
-em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelStore *store, const char *display_name)
+em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelObjectRemote *store, const char *display_name)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	GtkTreeRowReference *row;
@@ -874,7 +874,7 @@
 
 
 static void
-em_folder_tree_model_remove_store_info (EMFolderTreeModel *model, CamelStore *store)
+em_folder_tree_model_remove_store_info (EMFolderTreeModel *model, CamelObjectRemote *store)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 
@@ -928,7 +928,7 @@
 
 
 void
-em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelStore *store)
+em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelObjectRemote *store)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	GtkTreePath *path;
@@ -1071,14 +1071,14 @@
 emftm_uri_to_key (const char *uri)
 {
 	CamelException ex = { 0 };
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelURL *url;
 	gchar *key;
 
 	if (!uri)
 		return NULL;
 
-	store = (CamelStore *)camel_session_remote_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex);
+	store = (CamelObjectRemote *)camel_session_remote_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex);
 	camel_exception_clear(&ex);
 
 	url = camel_url_new (uri, NULL);
@@ -1218,7 +1218,7 @@
 }
 
 gboolean
-em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelStore *store, const char *full)
+em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelObjectRemote *store, const char *full)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	GtkTreeRowReference *row;
@@ -1259,7 +1259,7 @@
 }
 
 char *
-em_folder_tree_model_get_folder_name (EMFolderTreeModel *model, CamelStore *store, const char *full)
+em_folder_tree_model_get_folder_name (EMFolderTreeModel *model, CamelObjectRemote *store, const char *full)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	GtkTreeRowReference *row;
@@ -1295,7 +1295,7 @@
 }
 
 void
-em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *store, const char *full, int unread)
+em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelObjectRemote *store, const char *full, int unread)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	GtkTreeRowReference *row;

Modified: branches/mail-dbus-remoting/mail/em-folder-tree-model.h
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-tree-model.h	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-tree-model.h	Wed Aug 27 05:15:21 2008
@@ -29,6 +29,7 @@
 #include <libxml/tree.h>
 
 #include <camel/camel-store.h>
+#include <camel-object-remote.h>
 
 #include <libedataserver/e-account-list.h>
 
@@ -50,7 +51,7 @@
 
 enum {
 	COL_STRING_DISPLAY_NAME,  /* string that appears in the tree */
-	COL_POINTER_CAMEL_STORE,  /* CamelStore object */
+	COL_POINTER_CAMEL_STORE,  /* CamelObjectRemote object */
 	COL_STRING_FULL_NAME,   /* if node is a folder, the full path name of the folder, no leading / */
 	COL_STRING_URI,           /* the uri to get the store or folder object */
 	COL_UINT_UNREAD,          /* unread count */
@@ -65,7 +66,7 @@
 
 
 struct _EMFolderTreeModelStoreInfo {
-	CamelStore *store;
+	CamelObjectRemote *store;
 	GtkTreeRowReference *row;
 	GHashTable *full_hash;  /* maps CamelFolderInfo::full_name's to GtkTreeRowReferences */
 	EAccount *account;
@@ -85,7 +86,7 @@
 	char *filename;            /* state filename */
 	xmlDocPtr state;           /* saved expanded state from previous session */
 
-	GHashTable *store_hash;    /* maps CamelStore's to store-info's */
+	GHashTable *store_hash;    /* maps CamelObjectRemote's to store-info's */
 	GHashTable *uri_hash;      /* maps URI's to GtkTreeRowReferences */
 
 	EAccountList *accounts;
@@ -125,8 +126,8 @@
 					   struct _EMFolderTreeModelStoreInfo *si,
 					   CamelFolderInfo *fi, int fully_loaded);
 
-void em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelStore *store, const char *display_name);
-void em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelStore *store);
+void em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelObjectRemote *store, const char *display_name);
+void em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelObjectRemote *store);
 void em_folder_tree_model_remove_folders (EMFolderTreeModel *model, struct _EMFolderTreeModelStoreInfo *si,
 					  GtkTreeIter *toplevel);
 
@@ -144,9 +145,9 @@
 typedef void (* EMFTModelExpandFunc) (EMFolderTreeModel *model, const char *path, void *user_data);
 void em_folder_tree_model_expand_foreach (EMFolderTreeModel *model, EMFTModelExpandFunc func, void *user_data);
 
-void em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *store, const char *path, int unread);
-gboolean em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelStore *store, const char *full);
-char * em_folder_tree_model_get_folder_name (EMFolderTreeModel *model, CamelStore *store, const char *full);
+void em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelObjectRemote *store, const char *path, int unread);
+gboolean em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelObjectRemote *store, const char *full);
+char * em_folder_tree_model_get_folder_name (EMFolderTreeModel *model, CamelObjectRemote *store, const char *full);
 
 #ifdef __cplusplus
 }

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 05:15:21 2008
@@ -81,7 +81,7 @@
 struct _selected_uri {
 	char *key;		/* store:path or account/path */
 	char *uri;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	char *path;
 };
 
@@ -608,11 +608,11 @@
 {
 	struct _EMFolderTreePrivate *priv = emft->priv;
 	struct _EMFolderTreeModelStoreInfo *si;
-	extern CamelStore *vfolder_store;
+	extern CamelObjectRemote *vfolder_store;
 	GtkTreeRowReference *row;
 	GtkTreePath *path;
 	EAccount *account;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	const char *p;
 	char *uid;
 	size_t n;
@@ -631,7 +631,7 @@
 		CamelException ex;
 
 		camel_exception_init (&ex);
-		store = (CamelStore *) camel_session_get_service (session, account->source->url, CAMEL_PROVIDER_STORE, &ex);
+		store = (CamelObjectRemote *) camel_session_get_service (session, account->source->url, CAMEL_PROVIDER_STORE, &ex);
 		camel_exception_clear (&ex);
 
 		if (store == NULL)
@@ -679,7 +679,7 @@
 	struct _EMFolderTreePrivate *priv = emft->priv;
 	struct _EMFolderTreeModelStoreInfo *si;
 	gboolean is_store;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	EAccount *account;
 	char *full_name;
 	char *key;
@@ -772,7 +772,7 @@
 	char *full_name = NULL;
 	GtkTreePath *src_path;
 	gboolean is_store;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelException ex;
 	GtkTreeIter iter;
 
@@ -806,7 +806,7 @@
 	char *full_name = NULL, *uri = NULL;
 	GtkTreePath *src_path;
 	CamelFolder *folder;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelException ex;
 	GtkTreeIter iter;
 
@@ -865,7 +865,7 @@
 	/* Only selection->data and selection->length are valid */
 	GtkSelectionData *selection;
 
-	CamelStore *store;
+	CamelObjectRemote *store;
 	char *full_name;
 	guint32 action;
 	guint info;
@@ -1024,7 +1024,7 @@
 	GtkTreePath *dest_path;
 	struct _DragDataReceivedAsync *m;
 	gboolean is_store;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	GtkTreeIter iter;
 	char *full_name;
 	int i;
@@ -1106,7 +1106,7 @@
 {
 	struct _EMFolderTreePrivate *p = emft->priv;
 	char *full_name = NULL, *uri = NULL, *src_uri = NULL;
-	CamelStore *local, *sstore, *dstore;
+	CamelObjectRemote *local, *sstore, *dstore;
 	GdkAtom atom = GDK_NONE;
 	gboolean is_store;
 	GtkTreeIter iter;
@@ -1623,7 +1623,7 @@
 		CamelException ex = { 0 };
 
 		u->uri = g_strdup(list->data);
-		u->store = (CamelStore *)camel_session_get_service (session, u->uri, CAMEL_PROVIDER_STORE, &ex);
+		u->store = (CamelObjectRemote *)camel_session_get_service (session, u->uri, CAMEL_PROVIDER_STORE, &ex);
 		camel_exception_clear(&ex);
 
 		url = camel_url_new(u->uri, NULL);
@@ -1703,7 +1703,7 @@
 	/* input data */
 	GtkTreeRowReference *root;
 	EMFolderTree *emft;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	guint32 flags;
 	char *top;
 
@@ -1845,7 +1845,7 @@
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	gboolean is_store;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	EAccount *account;
 	char *full_name;
 	char *key;
@@ -1878,7 +1878,7 @@
 	struct _EMFolderTreePrivate *priv = emft->priv;
 	struct _EMFolderTreeGetFolderInfo *m;
 	GtkTreeModel *model;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	char *full_name;
 	gboolean load;
 
@@ -2134,7 +2134,7 @@
 {
 	GtkTreeView *treeview;
 	GtkTreeSelection *selection;
-	CamelStore *local, *store;
+	CamelObjectRemote *local, *store;
 	EMPopupTargetFolder *target;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -2499,7 +2499,7 @@
 	GtkTreeIter iter;
 	char *full_name = NULL;
 	CamelException ex;
-	CamelStore *store = NULL;
+	CamelObjectRemote *store = NULL;
 	CamelFolder *folder = NULL;
 
 	g_return_val_if_fail (EM_IS_FOLDER_TREE (emft), NULL);
@@ -2526,7 +2526,7 @@
 	GtkTreeIter iter;
 	char *full_name = NULL, *name = NULL, *uri = NULL;
 	CamelException ex;
-	CamelStore *store = NULL;
+	CamelObjectRemote *store = NULL;
 	CamelFolderInfo *fi = NULL;
 
 	g_return_val_if_fail (EM_IS_FOLDER_TREE (emft), NULL);
@@ -2571,7 +2571,7 @@
 }
 
 EMFolderTreeModelStoreInfo *
-em_folder_tree_get_model_storeinfo (EMFolderTree *emft, CamelStore *store)
+em_folder_tree_get_model_storeinfo (EMFolderTree *emft, CamelObjectRemote *store)
 {
 	struct _EMFolderTreePrivate *priv = emft->priv;
 	struct _EMFolderTreeModelStoreInfo *si;

Modified: branches/mail-dbus-remoting/mail/em-folder-tree.h
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-tree.h	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-tree.h	Wed Aug 27 05:15:21 2008
@@ -91,7 +91,7 @@
 CamelFolderInfo *em_folder_tree_get_selected_folder_info (EMFolderTree *emft);
 
 EMFolderTreeModel *em_folder_tree_get_model (EMFolderTree *emft);
-EMFolderTreeModelStoreInfo *em_folder_tree_get_model_storeinfo (EMFolderTree *emft, CamelStore *store);
+EMFolderTreeModelStoreInfo *em_folder_tree_get_model_storeinfo (EMFolderTree *emft, CamelObjectRemote *store);
 
 gboolean em_folder_tree_create_folder (EMFolderTree *emft, const char *full_name, const char *uri);
 

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 05:15:21 2008
@@ -89,8 +89,8 @@
 	MailMsg base;
 
 	/* input data */
-	CamelStore *fromstore;
-	CamelStore *tostore;
+	CamelObjectRemote *fromstore;
+	CamelObjectRemote *tostore;
 
 	char *frombase;
 	char *tobase;
@@ -243,7 +243,7 @@
 };
 
 int
-em_folder_utils_copy_folders(CamelStore *fromstore, const char *frombase, CamelStore *tostore, const char *tobase, int delete)
+em_folder_utils_copy_folders(CamelObjectRemote *fromstore, const char *frombase, CamelObjectRemote *tostore, const char *tobase, int delete)
 {
 	struct _EMCopyFolders *m;
 	int seq;
@@ -272,7 +272,7 @@
 emfu_copy_folder_selected (const char *uri, void *data)
 {
 	struct _copy_folder_data *cfd = data;
-	CamelStore *fromstore = NULL, *tostore = NULL;
+	CamelObjectRemote *fromstore = NULL, *tostore = NULL;
 	char *tobase = NULL;
 	CamelException ex;
 	CamelURL *url;
@@ -370,7 +370,7 @@
 }
 
 static void
-emfu_delete_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
+emfu_delete_rec (CamelObjectRemote *store, CamelFolderInfo *fi, CamelException *ex)
 {
 	while (fi) {
 		CamelFolder *folder;
@@ -413,7 +413,7 @@
 }
 
 static void
-emfu_delete_folders (CamelStore *store, const char *full_name, CamelException *ex)
+emfu_delete_folders (CamelObjectRemote *store, const char *full_name, CamelException *ex)
 {
 	guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
 	CamelFolderInfo *fi;
@@ -429,7 +429,7 @@
 static void
 emfu_delete_response (GtkWidget *dialog, int response, gpointer data)
 {
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelException ex;
 	char *full_name;
 
@@ -454,7 +454,7 @@
 void
 em_folder_utils_delete_folder (CamelFolder *folder)
 {
-	CamelStore *local;
+	CamelObjectRemote *local;
 	GtkWidget *dialog;
 
 	local = mail_component_peek_local_store (NULL);
@@ -483,7 +483,7 @@
 {
 	char *prompt, *new_name;
 	const char *p;
-	CamelStore *local;
+	CamelObjectRemote *local;
 	gboolean done = FALSE;
 	size_t base_len;
 
@@ -561,7 +561,7 @@
 	MailMsg base;
 
 	/* input data */
-	CamelStore *store;
+	CamelObjectRemote *store;
 	char *full_name;
 	char *parent;
 	char *name;
@@ -626,7 +626,7 @@
 
 
 static int
-emfu_create_folder_real (CamelStore *store, const char *full_name, void (* done) (CamelFolderInfo *fi, void *user_data), void *user_data)
+emfu_create_folder_real (CamelObjectRemote *store, const char *full_name, void (* done) (CamelFolderInfo *fi, void *user_data), void *user_data)
 {
 	char *name, *namebuf = NULL;
 	struct _EMCreateFolder *m;
@@ -681,7 +681,7 @@
 	EMFolderTreeModelStoreInfo *si;
 	const char *uri, *path;
 	CamelException ex;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	struct _EMCreateFolderTempData  *emcftd;
 
 	if (response != GTK_RESPONSE_OK) {
@@ -697,7 +697,7 @@
 	g_print ("DEBUG: %s (%s)\n", path, uri);
 
 	camel_exception_init (&ex);
-	if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
+	if (!(store = (CamelObjectRemote *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
 		camel_exception_clear (&ex);
 		return;
 	}

Modified: branches/mail-dbus-remoting/mail/em-folder-utils.h
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-utils.h	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-utils.h	Wed Aug 27 05:15:21 2008
@@ -24,7 +24,7 @@
 #ifndef _EM_FOLDER_UTILS_H
 #define _EM_FOLDER_UTILS_H
 
-int em_folder_utils_copy_folders(CamelStore *fromstore, const char *frombase, CamelStore *tostore, const char *tobase, int delete);
+int em_folder_utils_copy_folders(CamelObjectRemote *fromstore, const char *frombase, CamelObjectRemote *tostore, const char *tobase, int delete);
 
 /* FIXME: These api's are really busted, there is no consistency and most rely on the wrong data */
 

Modified: branches/mail-dbus-remoting/mail/em-folder-view.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-view.c	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-view.c	Wed Aug 27 05:15:21 2008
@@ -1560,7 +1560,7 @@
 
 	if (CAMEL_IS_DISCO_STORE(service)
 	    || CAMEL_IS_OFFLINE_STORE(service)) {
-		mail_store_prepare_offline((CamelStore *)service);
+		mail_store_prepare_offline((CamelObjectRemote *)service);
 	}
 }
 

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 05:15:21 2008
@@ -1143,7 +1143,7 @@
 typedef struct _EMMigrateSession {
 	CamelSession parent_object;
 
-	CamelStore *store;   /* new folder tree store */
+	CamelObjectRemote *store;   /* new folder tree store */
 	char *srcdir;        /* old folder tree path */
 } EMMigrateSession;
 
@@ -1608,7 +1608,7 @@
 em_migrate_folder(EMMigrateSession *session, const char *dirname, const char *full_name, CamelException *ex)
 {
 	CamelFolder *old_folder = NULL, *new_folder = NULL;
-	CamelStore *local_store = NULL;
+	CamelObjectRemote *local_store = NULL;
 	char *name, *uri;
 	GPtrArray *uids;
 	struct stat st;
@@ -2846,7 +2846,7 @@
 
 
 static void
-migrate_folders(CamelStore *store, CamelFolderInfo *fi, const char *acc, CamelException *ex)
+migrate_folders(CamelObjectRemote *store, CamelFolderInfo *fi, const char *acc, CamelException *ex)
 {
 	CamelFolder *folder;
 
@@ -2862,19 +2862,19 @@
 	}
 }
 
-static CamelStore *
+static CamelObjectRemote *
 setup_local_store (MailComponent *mc)
 {
 	CamelURL *url;
 	char *tmp;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	
 	url = camel_url_new("mbox:", NULL);
 	tmp = g_build_filename (mail_component_peek_base_directory(mc), "local", NULL);
 	camel_url_set_path(url, tmp);
 	g_free(tmp);
 	tmp = camel_url_to_string(url, 0);
-	store = (CamelStore *)camel_session_get_service(session, tmp, CAMEL_PROVIDER_STORE, NULL);
+	store = (CamelObjectRemote *)camel_session_get_service(session, tmp, CAMEL_PROVIDER_STORE, NULL);
 	g_free(tmp);
 
 	return store;
@@ -2887,7 +2887,7 @@
 	EIterator *iter;
 	int i=0, len;
 	MailComponent *component = mail_component_peek ();
-	CamelStore *store = NULL;
+	CamelObjectRemote *store = NULL;
 	CamelFolderInfo *info;
 	
 	if (!(accounts = mail_config_get_accounts ()))
@@ -2930,7 +2930,7 @@
 			camel_exception_init (&ex);
 			mail_component_load_store_by_uri (component, service->url, name);
 
-			store = (CamelStore *) camel_session_get_service (session, service->url, CAMEL_PROVIDER_STORE, &ex);
+			store = (CamelObjectRemote *) camel_session_get_service (session, service->url, CAMEL_PROVIDER_STORE, &ex);
 			info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &ex);
 			if (info) {
 				migrate_folders(store, info, account->name, &ex);

Modified: branches/mail-dbus-remoting/mail/em-popup.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-popup.c	(original)
+++ branches/mail-dbus-remoting/mail/em-popup.c	Wed Aug 27 05:15:21 2008
@@ -38,8 +38,7 @@
 #include "em-utils.h"
 #include "em-composer-utils.h"
 
-#include <camel-store-remote.h>
-#include <camel/camel-store.h>
+#include <camel-object-remote.h>
 #include <camel/camel-folder.h>
 #include <camel/camel-mime-message.h>
 #include <camel/camel-string-utils.h>
@@ -167,7 +166,7 @@
 em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const char *folder_uri, GPtrArray *uids)
 {
 	EMPopupTargetSelect *t = e_popup_target_new(&emp->popup, EM_POPUP_TARGET_SELECT, sizeof(*t));
-	CamelStore *store = CAMEL_STORE (folder->parent_store);
+	CamelObjectRemote *store = CAMEL_STORE (folder->parent_store);
 	guint32 mask = ~0;
 	gboolean draft_or_outbox;
 	int i;

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 05:15:21 2008
@@ -82,7 +82,7 @@
 	char *store_uri;
 	int store_id;		/* looking up a store */
 
-	CamelStore *store;
+	CamelObjectRemote *store;
 	GHashTable *folders;
 
 	GtkWidget *widget;	/* widget to show for this store */
@@ -579,7 +579,7 @@
 }
 
 static void
-subscribe_set_store(EMSubscribe *sub, CamelStore *store)
+subscribe_set_store(EMSubscribe *sub, CamelObjectRemote *store)
 {
 	if (store == NULL || !camel_store_supports_subscriptions(store)) {
 		GtkWidget *w = gtk_label_new(_("This store does not support subscriptions, or they are not enabled."));
@@ -699,7 +699,7 @@
 }
 
 static void
-sub_editor_got_store(char *uri, CamelStore *store, void *data)
+sub_editor_got_store(char *uri, CamelObjectRemote *store, void *data)
 {
 	struct _EMSubscribe *sub = data;
 

Modified: branches/mail-dbus-remoting/mail/mail-autofilter.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-autofilter.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-autofilter.c	Wed Aug 27 05:15:21 2008
@@ -56,6 +56,8 @@
 #include <camel/camel-internet-address.h>
 #include <camel/camel-mime-message.h>
 
+#include <camel-object-remote.h>
+
 #define d(x)
 
 static void
@@ -375,7 +377,7 @@
 }
 
 void
-mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri)
+mail_filter_rename_uri(CamelObjectRemote *store, const char *olduri, const char *newuri)
 {
 	EMFilterContext *fc;
 	char *user, *system;
@@ -407,7 +409,7 @@
 }
 
 void
-mail_filter_delete_uri(CamelStore *store, const char *uri)
+mail_filter_delete_uri(CamelObjectRemote *store, const char *uri)
 {
 	EMFilterContext *fc;
 	char *user, *system;

Modified: branches/mail-dbus-remoting/mail/mail-autofilter.h
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-autofilter.h	(original)
+++ branches/mail-dbus-remoting/mail/mail-autofilter.h	Wed Aug 27 05:15:21 2008
@@ -30,7 +30,7 @@
 struct _EMFilterContext;
 struct _CamelMimeMessage;
 struct _CamelInternetAddress;
-struct _CamelStore;
+struct _CamelObjectRemote;
 
 enum {
 	AUTO_SUBJECT = 1,
@@ -47,7 +47,7 @@
 void  filter_gui_add_from_message(struct _CamelMimeMessage *msg, const char *source, int flags);
 
 /* Also easiest place for these, we should really share a global rule context for this stuff ... */
-void mail_filter_rename_uri(struct _CamelStore *store, const char *olduri, const char *newuri);
-void mail_filter_delete_uri(struct _CamelStore *store, const char *uri);
+void mail_filter_rename_uri(struct _CamelObjectRemote *store, const char *olduri, const char *newuri);
+void mail_filter_delete_uri(struct _CamelObjectRemote *store, const char *uri);
 
 #endif

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 05:15:21 2008
@@ -110,7 +110,7 @@
 #define ONLINE 1
 
 struct _store_info {
-	CamelStore *store;
+	CamelObjectRemote *store;
 	char *name;
 
 	/* we keep a reference to these so they remain around for the session */
@@ -118,7 +118,7 @@
 	CamelFolder *vjunk;
 
 	/* for setup only */
-	void (*done)(CamelStore *store, CamelFolderInfo *info, void *data);
+	void (*done)(CamelObjectRemote *store, CamelFolderInfo *info, void *data);
 	void *done_data;
 
 	int ref_count:31;
@@ -146,7 +146,7 @@
 
 	char *context_path;	/* current path for right-click menu */
 
-	CamelStore *local_store;
+	CamelObjectRemote *local_store;
 	ELogger *logger;
 
 	EComponentView *component_view;
@@ -171,7 +171,7 @@
 };
 
 static struct _store_info *
-store_info_new(CamelStore *store, const char *name)
+store_info_new(CamelObjectRemote *store, const char *name)
 {
 	struct _store_info *si;
 	int store_flags;
@@ -221,7 +221,7 @@
 }
 
 static gboolean
-mc_add_store_done(CamelStore *store, CamelFolderInfo *info, void *data)
+mc_add_store_done(CamelObjectRemote *store, CamelFolderInfo *info, void *data)
 {
 	struct _store_info *si = data;
 
@@ -243,7 +243,7 @@
 
 /* Utility functions.  */
 static void
-mc_add_store(MailComponent *component, CamelStore *store, const char *name, void (*done)(CamelStore *store, CamelFolderInfo *info, void *data))
+mc_add_store(MailComponent *component, CamelObjectRemote *store, const char *name, void (*done)(CamelObjectRemote *store, CamelFolderInfo *info, void *data))
 {
 	struct _store_info *si;
 
@@ -258,7 +258,7 @@
 }
 
 static void
-mc_add_local_store_done(CamelStore *store, CamelFolderInfo *info, void *data)
+mc_add_local_store_done(CamelObjectRemote *store, CamelFolderInfo *info, void *data)
 {
 	/*MailComponent *mc = data;*/
 	int i;
@@ -270,7 +270,7 @@
 }
 
 static void
-mc_add_local_store(CamelStore *store, const char *name, MailComponent *mc)
+mc_add_local_store(CamelObjectRemote *store, const char *name, MailComponent *mc)
 {
 	mc_add_store(mc, store, name, mc_add_local_store_done);
 	camel_object_unref(store);
@@ -299,7 +299,7 @@
 	camel_url_set_path(url, tmp);
 	g_free(tmp);
 	tmp = camel_url_to_string(url, 0);
-	p->local_store = (CamelStore *)camel_session_remote_get_service(session, tmp, CAMEL_PROVIDER_STORE, &ex);
+	p->local_store = (CamelObjectRemote *)camel_session_remote_get_service(session, tmp, CAMEL_PROVIDER_STORE, &ex);
 	g_free(tmp);
 	if (p->local_store == NULL)
 		goto fail;
@@ -827,7 +827,7 @@
 }
 
 static void
-mc_quit_sync_done(CamelStore *store, void *data)
+mc_quit_sync_done(CamelObjectRemote *store, void *data)
 {
 	MailComponent *mc = data;
 
@@ -835,14 +835,14 @@
 }
 
 static void
-mc_quit_sync(CamelStore *store, struct _store_info *si, MailComponent *mc)
+mc_quit_sync(CamelObjectRemote *store, struct _store_info *si, MailComponent *mc)
 {
 	mc->priv->quit_count++;
 	mail_sync_store(store, mc->priv->quit_expunge, mc_quit_sync_done, mc);
 }
 
 static void
-mc_quit_delete (CamelStore *store, struct _store_info *si, MailComponent *mc)
+mc_quit_delete (CamelObjectRemote *store, struct _store_info *si, MailComponent *mc)
 {
 	CamelFolder *folder = camel_store_get_junk (store, NULL);
 
@@ -1095,7 +1095,7 @@
 }
 
 static void
-mc_sync_store_done (CamelStore *store, void *data)
+mc_sync_store_done (CamelObjectRemote *store, void *data)
 {
 	MailComponent *mc = (MailComponent *) data;
 
@@ -1138,7 +1138,7 @@
 };
 
 static void
-setline_done(CamelStore *store, void *data)
+setline_done(CamelObjectRemote *store, void *data)
 {
 	struct _setline_data *sd = data;
 
@@ -1167,7 +1167,7 @@
 	if (CAMEL_IS_DISCO_STORE(service)
 	    || CAMEL_IS_OFFLINE_STORE(service)) {
 		sd->pending++;
-		mail_store_set_offline((CamelStore *)service, !sd->status, setline_done, sd);
+		mail_store_set_offline((CamelObjectRemote *)service, !sd->status, setline_done, sd);
 	}
 }
 
@@ -1365,7 +1365,7 @@
 }
 
 void
-mail_component_add_store (MailComponent *component, CamelStore *store, const char *name)
+mail_component_add_store (MailComponent *component, CamelObjectRemote *store, const char *name)
 {
 	mc_add_store(component, store, name, NULL);
 }
@@ -1376,14 +1376,14 @@
  * @uri: uri of store
  * @name: name of store (used for display purposes)
  *
- * Return value: Pointer to the newly added CamelStore.  The caller is supposed
+ * Return value: Pointer to the newly added CamelObjectRemote.  The caller is supposed
  * to ref the object if it wants to store it.
  **/
-CamelStore *
+CamelObjectRemote *
 mail_component_load_store_by_uri (MailComponent *component, const char *uri, const char *name)
 {
 	CamelException ex;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelProvider *prov;
 
 	MAIL_COMPONENT_DEFAULT(component);
@@ -1407,7 +1407,7 @@
 	if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE))
 		return NULL;
 
-	store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex);
+	store = (CamelObjectRemote *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex);
 	if (store == NULL) {
 		/* EPFIXME: real error dialog */
 		g_warning ("couldn't get service %s: %s\n", uri,
@@ -1423,14 +1423,14 @@
 }
 
 static void
-store_disconnect (CamelStore *store, void *event_data, void *user_data)
+store_disconnect (CamelObjectRemote *store, void *event_data, void *user_data)
 {
 	camel_service_disconnect (CAMEL_SERVICE (store), TRUE, NULL);
 	camel_object_unref (store);
 }
 
 void
-mail_component_remove_store (MailComponent *component, CamelStore *store)
+mail_component_remove_store (MailComponent *component, CamelObjectRemote *store)
 {
 	MailComponentPrivate *priv;
 
@@ -1463,7 +1463,7 @@
 mail_component_remove_store_by_uri (MailComponent *component, const char *uri)
 {
 	CamelProvider *prov;
-	CamelStore *store;
+	CamelObjectRemote *store;
 
 	MAIL_COMPONENT_DEFAULT(component);
 
@@ -1473,7 +1473,7 @@
 	if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE))
 		return;
 
-	store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL);
+	store = (CamelObjectRemote *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL);
 	if (store != NULL) {
 		mail_component_remove_store (component, store);
 		camel_object_unref (store);
@@ -1495,7 +1495,7 @@
 };
 
 static void
-mc_stores_foreach(CamelStore *store, struct _store_info *si, struct _store_foreach_data *data)
+mc_stores_foreach(CamelObjectRemote *store, struct _store_info *si, struct _store_foreach_data *data)
 {
 	data->func((void *)store, (void *)si->name, data->data);
 }
@@ -1511,7 +1511,7 @@
 }
 
 void
-mail_component_remove_folder (MailComponent *component, CamelStore *store, const char *path)
+mail_component_remove_folder (MailComponent *component, CamelObjectRemote *store, const char *path)
 {
 	MAIL_COMPONENT_DEFAULT(component);
 
@@ -1526,7 +1526,7 @@
 	return component->priv->model;
 }
 
-CamelStore *
+CamelObjectRemote *
 mail_component_peek_local_store (MailComponent *mc)
 {
 	MAIL_COMPONENT_DEFAULT (mc);

Modified: branches/mail-dbus-remoting/mail/mail-component.h
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-component.h	(original)
+++ branches/mail-dbus-remoting/mail/mail-component.h	Wed Aug 27 05:15:21 2008
@@ -32,7 +32,7 @@
 
 #include <camel-store-remote.h>
 
-struct _CamelStore;
+struct _CamelObjectRemote;
 
 #define MAIL_TYPE_COMPONENT			(mail_component_get_type ())
 #define MAIL_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_COMPONENT, MailComponent))
@@ -77,14 +77,14 @@
 struct _CamelSession *mail_component_peek_session(MailComponent *);
 
 void        mail_component_add_store            (MailComponent *component,
-						 struct _CamelStore    *store,
+						 struct _CamelObjectRemote    *store,
 						 const char    *name);
-struct _CamelStore *mail_component_load_store_by_uri    (MailComponent *component,
+struct _CamelObjectRemote *mail_component_load_store_by_uri    (MailComponent *component,
 						 const char    *uri,
 						 const char    *name);
 
 void        mail_component_remove_store         (MailComponent *component,
-						 struct _CamelStore    *store);
+						 struct _CamelObjectRemote    *store);
 void        mail_component_remove_store_by_uri  (MailComponent *component,
 						 const char    *uri);
 
@@ -93,11 +93,11 @@
 					      GHFunc         func,
 					      void          *data);
 
-void mail_component_remove_folder (MailComponent *component, struct _CamelStore *store, const char *path);
+void mail_component_remove_folder (MailComponent *component, struct _CamelObjectRemote *store, const char *path);
 
 struct _EMFolderTreeModel *mail_component_peek_tree_model (MailComponent *component);
 
-struct _CamelStore *mail_component_peek_local_store (MailComponent *mc);
+struct _CamelObjectRemote *mail_component_peek_local_store (MailComponent *mc);
 struct _CamelFolder *mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id);
 const char *mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t id);
 

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 05:15:21 2008
@@ -104,14 +104,14 @@
 	char *olduri;
 
 	int unread;
-	CamelStore *store;
+	CamelObjectRemote *store;
 };
 
 struct _store_info {
 	GHashTable *folders;	/* by full_name */
 	GHashTable *folders_uri; /* by uri */
 
-	CamelStore *store;	/* the store for these folders */
+	CamelObjectRemote *store;	/* the store for these folders */
 
 	/* Outstanding folderinfo requests */
 	EDList folderinfo_updates;
@@ -393,7 +393,7 @@
 	static time_t last_newmail = 0;
 	CamelFolderChangeInfo *changes = event_data;
 	CamelFolder *folder = (CamelFolder *)o;
-	CamelStore *store = folder->parent_store;
+	CamelObjectRemote *store = folder->parent_store;
 	CamelMessageInfo *info;
 	struct _store_info *si;
 	struct _folder_info *mfi;
@@ -440,7 +440,7 @@
 folder_finalised(CamelObject *o, gpointer event_data, gpointer user_data)
 {
 	CamelFolder *folder = (CamelFolder *)o;
-	CamelStore *store = folder->parent_store;
+	CamelObjectRemote *store = folder->parent_store;
 	struct _store_info *si;
 	struct _folder_info *mfi;
 
@@ -470,7 +470,7 @@
 
 void mail_note_folder(CamelFolder *folder)
 {
-	CamelStore *store = folder->parent_store;
+	CamelObjectRemote *store = folder->parent_store;
 	struct _store_info *si;
 	struct _folder_info *mfi;
 
@@ -539,7 +539,7 @@
 	struct _store_info *si;
 	CamelFolderInfo *fi = event_data;
 	struct _folder_info *mfi;
-	CamelStore *store = (CamelStore *)o;
+	CamelObjectRemote *store = (CamelObjectRemote *)o;
 
 	d(printf("Store Folder deleted: %s\n", fi->full_name));
 
@@ -566,7 +566,7 @@
 }
 
 static char *
-folder_to_url(CamelStore *store, const char *full_name)
+folder_to_url(CamelObjectRemote *store, const char *full_name)
 {
 	CamelURL *url;
 	char *out;
@@ -693,7 +693,7 @@
 static void
 store_folder_renamed(CamelObject *o, void *event_data, void *data)
 {
-	CamelStore *store = (CamelStore *)o;
+	CamelObjectRemote *store = (CamelObjectRemote *)o;
 	CamelRenameInfo *info = event_data;
 	struct _store_info *si;
 
@@ -729,7 +729,7 @@
 	int id;			/* id for cancellation */
 	guint cancel:1;		/* also tells us we're cancelled */
 
-	gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data);
+	gboolean (*done)(CamelObjectRemote *store, CamelFolderInfo *info, void *data);
 	void *data;
 };
 
@@ -746,7 +746,7 @@
 }
 
 void
-mail_note_store_remove(CamelStore *store)
+mail_note_store_remove(CamelObjectRemote *store)
 {
 	struct _update_data *ud;
 	struct _store_info *si;
@@ -789,7 +789,7 @@
 }
 
 static gboolean
-update_folders(CamelStore *store, CamelFolderInfo *fi, void *data)
+update_folders(CamelObjectRemote *store, CamelFolderInfo *fi, void *data)
 {
 	struct _update_data *ud = data;
 	struct _store_info *si;
@@ -820,7 +820,7 @@
 struct _ping_store_msg {
 	MailMsg base;
 
-	CamelStore *store;
+	CamelObjectRemote *store;
 };
 
 static gchar *
@@ -869,7 +869,7 @@
 static void
 ping_store (gpointer key, gpointer val, gpointer user_data)
 {
-	CamelStore *store = (CamelStore *) key;
+	CamelObjectRemote *store = (CamelObjectRemote *) key;
 	struct _ping_store_msg *m;
 
 	if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED)
@@ -895,7 +895,7 @@
 }
 
 static void
-store_online_cb (CamelStore *store, void *data)
+store_online_cb (CamelObjectRemote *store, void *data)
 {
 	struct _update_data *ud = data;
 
@@ -914,8 +914,8 @@
 }
 
 void
-mail_note_store(CamelStore *store, CamelOperation *op,
-		gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data)
+mail_note_store(CamelObjectRemote *store, CamelOperation *op,
+		gboolean (*done)(CamelObjectRemote *store, CamelFolderInfo *info, void *data), void *data)
 {
 	struct _store_info *si;
 	struct _update_data *ud;
@@ -1001,7 +1001,7 @@
 };
 
 /* look up on each storeinfo using proper hash function for that stores uri's */
-static void storeinfo_find_folder_info(CamelStore *store, struct _store_info *si, struct _find_info *fi)
+static void storeinfo_find_folder_info(CamelObjectRemote *store, struct _store_info *si, struct _find_info *fi)
 {
 	if (fi->fi == NULL) {
 		if (((CamelService *)store)->provider->url_equal(fi->url, ((CamelService *)store)->url)) {

Modified: branches/mail-dbus-remoting/mail/mail-folder-cache.h
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-folder-cache.h	(original)
+++ branches/mail-dbus-remoting/mail/mail-folder-cache.h	Wed Aug 27 05:15:21 2008
@@ -25,19 +25,19 @@
 #ifndef _MAIL_FOLDER_CACHE_H
 #define _MAIL_FOLDER_CACHE_H
 
-#include <camel/camel-store.h>
+#include <camel-object-remote.h>
 
 /* Add a store whose folders should appear in the shell
    The folders are scanned from the store, and/or added at
    runtime via the folder_created event.
    The 'done' function returns if we can free folder info. */
 void
-mail_note_store (CamelStore *store, CamelOperation *op,
-		 gboolean (*done) (CamelStore *store, CamelFolderInfo *info, void *data),
+mail_note_store (CamelObjectRemote *store, CamelOperation *op,
+		 gboolean (*done) (CamelObjectRemote *store, CamelFolderInfo *info, void *data),
 		 void *data);
 
 /* de-note a store */
-void mail_note_store_remove (CamelStore *store);
+void mail_note_store_remove (CamelObjectRemote *store);
 
 /* When a folder has been opened, notify it for watching.
    The folder must have already been created on the store (which has already been noted)

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 05:15:21 2008
@@ -239,7 +239,7 @@
 
 /* Temporary workaround for various issues. Gone before 0.11 */
 static char *
-uid_cachename_hack (CamelStore *store)
+uid_cachename_hack (CamelObjectRemote *store)
 {
 	CamelURL *url = CAMEL_SERVICE (store)->url;
 	char *encoded_url, *filename;
@@ -1040,9 +1040,9 @@
 struct _get_folderinfo_msg {
 	MailMsg base;
 
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelFolderInfo *info;
-	gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data);
+	gboolean (*done)(CamelObjectRemote *store, CamelFolderInfo *info, void *data);
 	void *data;
 	gboolean can_clear; /* whether we can clear folder info */
 };
@@ -1101,7 +1101,7 @@
 };
 
 int
-mail_get_folderinfo (CamelStore *store, CamelOperation *op, gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data)
+mail_get_folderinfo (CamelObjectRemote *store, CamelOperation *op, gboolean (*done)(CamelObjectRemote *store, CamelFolderInfo *info, void *data), void *data)
 {
 	struct _get_folderinfo_msg *m;
 	int id;
@@ -1328,8 +1328,8 @@
 	MailMsg base;
 
 	char *uri;
-	CamelStore *store;
-	void (*done) (char *uri, CamelStore *store, void *data);
+	CamelObjectRemote *store;
+	void (*done) (char *uri, CamelObjectRemote *store, void *data);
 	void *data;
 };
 
@@ -1344,7 +1344,7 @@
 {
 	/*camel_session_get_store connects us, which we don't want to do on startup. */
 
-	m->store = (CamelStore *) camel_session_get_service (session, m->uri,
+	m->store = (CamelObjectRemote *) camel_session_get_service (session, m->uri,
 							     CAMEL_PROVIDER_STORE,
 							     &m->base.ex);
 }
@@ -1373,7 +1373,7 @@
 };
 
 int
-mail_get_store (const char *uri, CamelOperation *op, void (*done) (char *uri, CamelStore *store, void *data), void *data)
+mail_get_store (const char *uri, CamelOperation *op, void (*done) (char *uri, CamelObjectRemote *store, void *data), void *data)
 {
 	struct _get_store_msg *m;
 	int id;
@@ -1413,7 +1413,7 @@
 static void
 remove_folder_exec (struct _remove_folder_msg *m)
 {
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelFolder *folder;
 	GPtrArray *uids;
 	int i;
@@ -1546,9 +1546,9 @@
 struct _sync_store_msg {
 	MailMsg base;
 
-	CamelStore *store;
+	CamelObjectRemote *store;
 	int expunge;
-	void (*done) (CamelStore *store, void *data);
+	void (*done) (CamelObjectRemote *store, void *data);
 	void *data;
 };
 
@@ -1595,7 +1595,7 @@
 };
 
 void
-mail_sync_store(CamelStore *store, int expunge, void (*done) (CamelStore *store, void *data), void *data)
+mail_sync_store(CamelObjectRemote *store, int expunge, void (*done) (CamelObjectRemote *store, void *data), void *data)
 {
 	struct _sync_store_msg *m;
 
@@ -2300,9 +2300,9 @@
 struct _set_offline_msg {
 	MailMsg base;
 
-	CamelStore *store;
+	CamelObjectRemote *store;
 	gboolean offline;
-	void (*done)(CamelStore *store, void *data);
+	void (*done)(CamelObjectRemote *store, void *data);
 	void *data;
 };
 
@@ -2374,8 +2374,8 @@
 };
 
 int
-mail_store_set_offline (CamelStore *store, gboolean offline,
-			void (*done)(CamelStore *, void *data),
+mail_store_set_offline (CamelObjectRemote *store, gboolean offline,
+			void (*done)(CamelObjectRemote *, void *data),
 			void *data)
 {
 	struct _set_offline_msg *m;
@@ -2448,7 +2448,7 @@
 };
 
 int
-mail_store_prepare_offline (CamelStore *store)
+mail_store_prepare_offline (CamelObjectRemote *store)
 {
 	struct _set_offline_msg *m;
 	int id;

Modified: branches/mail-dbus-remoting/mail/mail-ops.h
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-ops.h	(original)
+++ branches/mail-dbus-remoting/mail/mail-ops.h	Wed Aug 27 05:15:21 2008
@@ -32,7 +32,7 @@
 
 #include "mail-mt.h"
 
-#include "camel/camel-store.h"
+#include "camel-object-remote.h"
 #include "camel/camel-folder.h"
 #include "camel/camel-filter-driver.h"
 #include "camel/camel-mime-message.h"
@@ -80,7 +80,7 @@
 
 /* and for a store */
 int mail_get_store (const char *uri, CamelOperation *op,
-		    void (*done) (char *uri, CamelStore *store, void *data), void *data);
+		    void (*done) (char *uri, CamelObjectRemote *store, void *data), void *data);
 
 /* build an attachment */
 void mail_build_attachment (CamelFolder *folder, GPtrArray *uids,
@@ -91,8 +91,8 @@
 void mail_sync_folder (CamelFolder *folder,
 		       void (*done) (CamelFolder *folder, void *data), void *data);
 
-void mail_sync_store(CamelStore *store, int expunge,
-		     void (*done) (CamelStore *store, void *data), void *data);
+void mail_sync_store(CamelObjectRemote *store, int expunge,
+		     void (*done) (CamelObjectRemote *store, void *data), void *data);
 
 void mail_refresh_folder (CamelFolder *folder,
 			  void (*done) (CamelFolder *folder, void *data),
@@ -107,8 +107,8 @@
 		       void *data);
 
 /* get folder info asynchronously */
-int mail_get_folderinfo (CamelStore *store, CamelOperation *op,
-			 gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data),
+int mail_get_folderinfo (CamelObjectRemote *store, CamelOperation *op,
+			 gboolean (*done)(CamelObjectRemote *store, CamelFolderInfo *info, void *data),
 			 void *data);
 
 /* remove an existing folder */
@@ -158,10 +158,10 @@
 void mail_prep_offline(const char *uri, CamelOperation *cancel,
 		       void (*done)(const char *, void *data),
 		       void *data);
-int mail_store_set_offline(CamelStore *store, gboolean offline,
-			   void (*done)(CamelStore *, void *data),
+int mail_store_set_offline(CamelObjectRemote *store, gboolean offline,
+			   void (*done)(CamelObjectRemote *, void *data),
 			   void *data);
-int mail_store_prepare_offline (CamelStore *store);
+int mail_store_prepare_offline (CamelObjectRemote *store);
 
 /* filter driver execute shell command async callback */
 void mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data);

Modified: branches/mail-dbus-remoting/mail/mail-send-recv.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-send-recv.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-send-recv.c	Wed Aug 27 05:15:21 2008
@@ -768,7 +768,7 @@
 /* ********************************************************************** */
 
 static void
-get_folders (CamelStore *store, GPtrArray *folders, CamelFolderInfo *info)
+get_folders (CamelObjectRemote *store, GPtrArray *folders, CamelFolderInfo *info)
 {
 	CamelException ex;
 
@@ -789,7 +789,7 @@
 
 	struct _send_info *info;
 	GPtrArray *folders;
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelFolderInfo *finfo;
 };
 
@@ -854,7 +854,7 @@
 };
 
 static gboolean
-receive_update_got_folderinfo(CamelStore *store, CamelFolderInfo *info, void *data)
+receive_update_got_folderinfo(CamelObjectRemote *store, CamelFolderInfo *info, void *data)
 {
 	if (info) {
 		GPtrArray *folders = g_ptr_array_new();
@@ -880,7 +880,7 @@
 }
 
 static void
-receive_update_got_store (char *uri, CamelStore *store, void *data)
+receive_update_got_store (char *uri, CamelObjectRemote *store, void *data)
 {
 	struct _send_info *info = data;
 

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 05:15:21 2008
@@ -64,7 +64,7 @@
 CamelFolder *
 mail_tool_get_inbox (const gchar *url, CamelException *ex)
 {
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelFolder *folder;
 
 	store = camel_session_get_store (session, url, ex);
@@ -80,13 +80,13 @@
 CamelFolder *
 mail_tool_get_trash (const gchar *url, int connect, CamelException *ex)
 {
-	CamelStore *store;
+	CamelObjectRemote *store;
 	CamelFolder *trash;
 
 	if (connect)
 		store = camel_session_get_store (session, url, ex);
 	else
-		store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, ex);
+		store = (CamelObjectRemote *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, ex);
 
 	if (!store)
 		return NULL;
@@ -279,7 +279,7 @@
 mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex)
 {
 	CamelURL *url;
-	CamelStore *store = NULL;
+	CamelObjectRemote *store = NULL;
 	CamelFolder *folder = NULL;
 	int offset = 0;
 	char *curi = NULL;
@@ -307,7 +307,7 @@
 		return NULL;
 	}
 
-	store = (CamelStore *)camel_session_get_service(session, uri+offset, CAMEL_PROVIDER_STORE, ex);
+	store = (CamelObjectRemote *)camel_session_get_service(session, uri+offset, CAMEL_PROVIDER_STORE, ex);
 	if (store) {
 		const char *name;
 

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 05:15:21 2008
@@ -54,7 +54,7 @@
 #define d(x)  /* (printf("%s:%s: ",  G_STRLOC, G_STRFUNC), (x))*/
 
 static EMVFolderContext *context;	/* context remains open all time */
-CamelStore *vfolder_store; /* the 1 static vfolder store */
+CamelObjectRemote *vfolder_store; /* the 1 static vfolder store */
 
 /* lock for accessing shared resources (below) */
 static pthread_mutex_t vfolder_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -320,7 +320,7 @@
 /* ********************************************************************** */
 
 static GList *
-mv_find_folder(GList *l, CamelStore *store, const char *uri)
+mv_find_folder(GList *l, CamelObjectRemote *store, const char *uri)
 {
 	while (l) {
 		if (camel_store_folder_uri_equal(store, l->data, uri))
@@ -332,7 +332,7 @@
 
 /* uri is a camel uri */
 static int
-uri_is_ignore(CamelStore *store, const char *uri)
+uri_is_ignore(CamelObjectRemote *store, const char *uri)
 {
 	EAccountList *accounts;
 	EAccount *account;
@@ -385,7 +385,7 @@
 
 /* so special we never use it */
 static int
-uri_is_spethal(CamelStore *store, const char *uri)
+uri_is_spethal(CamelObjectRemote *store, const char *uri)
 {
 	CamelURL *url;
 	int res;
@@ -424,7 +424,7 @@
 
 /* called when a new uri becomes (un)available */
 void
-mail_vfolder_add_uri(CamelStore *store, const char *curi, int remove)
+mail_vfolder_add_uri(CamelObjectRemote *store, const char *curi, int remove)
 {
 	FilterRule *rule;
 	const char *source;
@@ -524,7 +524,7 @@
 
 /* called when a uri is deleted from a store */
 void
-mail_vfolder_delete_uri(CamelStore *store, const char *curi)
+mail_vfolder_delete_uri(CamelObjectRemote *store, const char *curi)
 {
 	FilterRule *rule;
 	const char *source;
@@ -614,7 +614,7 @@
 
 /* called when a uri is renamed in a store */
 void
-mail_vfolder_rename_uri(CamelStore *store, const char *cfrom, const char *cto)
+mail_vfolder_rename_uri(CamelObjectRemote *store, const char *cfrom, const char *cto)
 {
 	FilterRule *rule;
 	const char *source;
@@ -798,8 +798,8 @@
 	/* TODO: remove from folder info cache? */
 
 	/* FIXME: is this even necessary? if we remove the folder from
-	 * the CamelStore, the tree should pick it up auto-magically
-	 * because it listens to CamelStore events... */
+	 * the CamelObjectRemote, the tree should pick it up auto-magically
+	 * because it listens to CamelObjectRemote events... */
 	path = g_strdup_printf("/%s", rule->name);
 	mail_component_remove_folder (mail_component_peek (), vfolder_store, path);
 	g_free(path);
@@ -820,7 +820,7 @@
 static void
 store_folder_created(CamelObject *o, void *event_data, void *data)
 {
-	CamelStore *store = (CamelStore *)o;
+	CamelObjectRemote *store = (CamelObjectRemote *)o;
 	CamelFolderInfo *info = event_data;
 
 	store = store;
@@ -830,7 +830,7 @@
 static void
 store_folder_deleted(CamelObject *o, void *event_data, void *data)
 {
-	CamelStore *store = (CamelStore *)o;
+	CamelObjectRemote *store = (CamelObjectRemote *)o;
 	CamelFolderInfo *info = event_data;
 	FilterRule *rule;
 	char *user;

Modified: branches/mail-dbus-remoting/mail/mail-vfolder.h
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-vfolder.h	(original)
+++ branches/mail-dbus-remoting/mail/mail-vfolder.h	Wed Aug 27 05:15:21 2008
@@ -2,7 +2,7 @@
 #ifndef _MAIL_VFOLDER_H
 #define _MAIL_VFOLDER_H
 
-struct _CamelStore;
+struct _CamelObjectRemote;
 struct _FilterPart;
 struct _FilterRule;
 struct _CamelMimeMessage;
@@ -24,13 +24,13 @@
 GList * mail_vfolder_get_sources_remote (void);
 
 /* add a uri that is now (un)available to vfolders in a transient manner */
-void mail_vfolder_add_uri(struct _CamelStore *store, const char *uri, int remove);
+void mail_vfolder_add_uri(struct _CamelObjectRemote *store, const char *uri, int remove);
 
 /* note that a folder has changed name (uri) */
-void mail_vfolder_rename_uri(struct _CamelStore *store, const char *from, const char *to);
+void mail_vfolder_rename_uri(struct _CamelObjectRemote *store, const char *from, const char *to);
 
 /* remove a uri that should be removed from vfolders permanently */
-void mail_vfolder_delete_uri(struct _CamelStore *store, const char *uri);
+void mail_vfolder_delete_uri(struct _CamelObjectRemote *store, const char *uri);
 
 /* close up, clean up */
 void mail_vfolder_shutdown (void);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]