evolution r36118 - branches/mail-dbus-remoting/mail

[abharath svn gnome org]

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

Log:
Fixed undefined symbols and some store hacks committed


Modified:
   branches/mail-dbus-remoting/mail/camel-session-remote.c
   branches/mail-dbus-remoting/mail/camel-session-remote.h
   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/mail-vfolder.c

Modified: branches/mail-dbus-remoting/mail/camel-session-remote.c
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-session-remote.c	(original)
+++ branches/mail-dbus-remoting/mail/camel-session-remote.c	Wed Aug 27 10:57:09 2008
@@ -14,13 +14,6 @@
 GHashTable *store_rhash = NULL;
 #define d(x) x
 
-#define camel_session_remote_get_store(session, url_string, ex) \
-	((CamelStore *) camel_session_remote_get_service_connected \
-	(session, url_string, CAMEL_PROVIDER_STORE, ex))
-#define camel_session_remote_get_transport(session, url_string, ex) \
-	((CamelTransport *) camel_session_remote_get_service_connected \
-	(session, url_string, CAMEL_PROVIDER_TRANSPORT, ex))
-
 const char *session_str = "session";
 
 /*

Modified: branches/mail-dbus-remoting/mail/camel-session-remote.h
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-session-remote.h	(original)
+++ branches/mail-dbus-remoting/mail/camel-session-remote.h	Wed Aug 27 10:57:09 2008
@@ -80,5 +80,11 @@
 void camel_session_remote_set_network_state  (CamelSessionRemote *session,
 				     	gboolean network_state);
 
+#define camel_session_remote_get_store(session, url_string, ex) \
+	((CamelStore *) camel_session_remote_get_service_connected \
+	(session, url_string, CAMEL_PROVIDER_STORE, ex))
+#define camel_session_remote_get_transport(session, url_string, ex) \
+	((CamelTransport *) camel_session_remote_get_service_connected \
+	(session, url_string, CAMEL_PROVIDER_TRANSPORT, ex))
 
 #endif

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 10:57:09 2008
@@ -433,6 +433,21 @@
 		url = camel_service_get_url((CamelService *)store);
 		dbus_message_append_args(reply, DBUS_TYPE_STRING,
 					 &url, DBUS_TYPE_INVALID);
+	} else if (!g_strcmp0(method, "camel_store_get_url_flags")) {
+		char *store_hash_key;
+		CamelStore *store;
+		CamelProvider *provider;
+
+		dbus_message_get_args(message,
+				      NULL,
+				      DBUS_TYPE_STRING,
+				      &store_hash_key,
+				      DBUS_TYPE_INVALID);
+
+		store = g_hash_table_lookup(store_hash, store_hash_key);
+		provider = camel_service_get_provider((CamelService *)store);
+		dbus_message_append_args(reply, DBUS_TYPE_INT32,
+					 &provider->url_flags, DBUS_TYPE_INVALID);
 	} else if (strncmp (method, "camel_object", 12) == 0) {
 		return camel_object_store_signal_handler (connection, message, user_data);
 	} else

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 10:57:09 2008
@@ -396,3 +396,21 @@
 
 	return url;
 }
+
+int camel_store_get_url_flags_remote (CamelStoreRemote *store)
+{
+	gboolean ret;
+	DBusError error;
+	int url_flags;;
+
+	dbus_error_init(&error);
+
+	ret = dbind_context_method_call(evolution_dbus_peek_context(),
+					CAMEL_DBUS_NAME,
+					CAMEL_STORE_OBJECT_PATH,
+					CAMEL_STORE_INTERFACE,
+					"camel_store_get_url_flags",
+					&error, "s=>i", store->object_id, &url_flags);
+
+	return url_flags;
+}

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 10:57:09 2008
@@ -51,4 +51,6 @@
 void camel_store_set_flags_remote(CamelStoreRemote * store, guint32 mode);
 
 char *camel_store_get_url_remote(CamelStoreRemote *store);
+
+int camel_store_get_url_flags_remote(CamelStoreRemote *store);
 #endif

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 10:57:09 2008
@@ -1089,7 +1089,7 @@
 		const char *path;
 		EAccount *account;
 
-		if (((CamelService *)store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
+		if (camel_store_get_url_flags_remote((CamelService *)store) & CAMEL_URL_FRAGMENT_IS_PATH)
 			path = url->fragment;
 		else
 			path = url->path && url->path[0]=='/' ? url->path+1:url->path;

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 10:57:09 2008
@@ -1638,7 +1638,7 @@
 			char *expand_key, *end;
 			EAccount *account;
 
-			if (((CamelService *)u->store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
+			if (camel_store_get_url_flags_remote((CamelService *)u->store) & CAMEL_URL_FRAGMENT_IS_PATH)
 				path = url->fragment;
 			else
 				path = url->path && url->path[0]=='/' ? url->path+1:url->path;

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 10:57:09 2008
@@ -33,6 +33,8 @@
 #include <camel/camel-vee-store.h>
 #include <camel/camel-vtrash-folder.h>
 
+#include "camel-session-remote.h"
+
 #include "libedataserver/e-account-list.h"
 #include "e-util/e-error.h"
 #include "e-util/e-util-private.h"