evolution r36069 - branches/mail-dbus-remoting/mail

[abharath svn gnome org]

Author: abharath
Date: Tue Aug 26 05:28:29 2008
New Revision: 36069
URL: http://svn.gnome.org/viewvc/evolution?rev=36069&view=rev

Log:
Fix compiler warnings and some StoreRemote fixes


Modified:
   branches/mail-dbus-remoting/mail/camel-session-remote-impl.c
   branches/mail-dbus-remoting/mail/camel-session-remote.c
   branches/mail-dbus-remoting/mail/camel-session-remote.h

Modified: branches/mail-dbus-remoting/mail/camel-session-remote-impl.c
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-session-remote-impl.c	(original)
+++ branches/mail-dbus-remoting/mail/camel-session-remote-impl.c	Tue Aug 26 05:28:29 2008
@@ -3,7 +3,9 @@
  *
  * */
 
+#include <string.h>
 #include <glib.h>
+#include <glib/gi18n.h>
 #include "mail-dbus.h"
 #include <camel/camel-session.h>
 #include <camel/camel-store.h>
@@ -20,6 +22,9 @@
                                     DBusMessage    *message,
                                     void           *user_data);
 
+void 
+camel_session_remote_impl_init (void);
+
 static DBusHandlerResult
 dbus_listener_message_handler (DBusConnection *connection,
                                     DBusMessage    *message,
@@ -60,6 +65,8 @@
 		gboolean ret;
 		CamelException *ex;
 
+		ex = camel_exception_new ();
+
 		ret = dbus_message_get_args(message, NULL,
 				DBUS_TYPE_STRING, &session_str,
 				DBUS_TYPE_STRING, &store_hash_key,
@@ -77,7 +84,7 @@
 
 		camel_exception_init (ex);
 		
-		passwd = camel_session_get_password (session, store, domain, prompt, item, flags, ex);
+		passwd = camel_session_get_password (session, (CamelService *)store, domain, prompt, item, flags, ex);
 
 		if (ex)
 			err = g_strdup (camel_exception_get_description (ex));
@@ -92,6 +99,8 @@
 		gboolean ret;
 		CamelException *ex;
 
+		ex = camel_exception_new ();
+
 		ret = dbus_message_get_args(message, NULL,
 				DBUS_TYPE_STRING, &session_str,
 				DBUS_TYPE_STRING, &store_hash_key,
@@ -105,7 +114,7 @@
 
 		camel_exception_init (ex);
 		
-		storage_path = camel_session_get_storage_path (session, store, ex);
+		storage_path = camel_session_get_storage_path (session, (CamelService *)store, ex);
 
 		if (ex)
 			err = g_strdup (camel_exception_get_description (ex));
@@ -121,6 +130,8 @@
 		gboolean ret;
 		CamelException *ex;
 
+		ex = camel_exception_new ();
+
 		ret = dbus_message_get_args(message, NULL,
 				DBUS_TYPE_STRING, &session_str,
 				DBUS_TYPE_STRING, &store_hash_key,
@@ -136,7 +147,7 @@
 
 		camel_exception_init (ex);
 		
-		camel_session_forget_password (session, store, domain, item, ex);
+		camel_session_forget_password (session, (CamelService *)store, domain, item, ex);
 
 		if (ex)
 			err = g_strdup (camel_exception_get_description (ex));
@@ -154,6 +165,8 @@
 		gboolean ret;
 		CamelException *ex;
 
+		ex = camel_exception_new ();
+
 		ret = dbus_message_get_args(message, NULL,
 				DBUS_TYPE_STRING, &session_str,
 				DBUS_TYPE_STRING, &url_string,
@@ -175,7 +188,7 @@
 		dbus_message_append_args (return_val, DBUS_TYPE_STRING, "", DBUS_TYPE_STRING, err, DBUS_TYPE_INVALID);
 		g_free (err);
 	} else if (strcmp (method, "camel_session_alert_user") == 0) {
-		char *session_str, *prompt, *err;
+		char *session_str, *prompt, *err = NULL;
 		gboolean ret, cancel, response;
 		int alert;
 
@@ -192,7 +205,7 @@
 		g_free (err);
 	} else if (strcmp (method, "camel_session_build_password_prompt") == 0) {
 		gboolean ret;
-		char *type, *user, *host, *prompt, *err;
+		char *type, *user, *host, *prompt, *err = NULL;
 		
 		ret = dbus_message_get_args(message, NULL,
 				DBUS_TYPE_STRING, &type,
@@ -206,7 +219,7 @@
 		g_free (err);
 	} else if (strcmp (method, "camel_session_is_online") == 0) {
 		gboolean ret, is_online;
-		char *session_str, *err;
+		char *session_str, *err = NULL;
 		
 		ret = dbus_message_get_args(message, NULL,
 				DBUS_TYPE_STRING, &session_str,
@@ -218,7 +231,7 @@
 		g_free (err);
 	} else if (strcmp (method, "camel_session_set_online") == 0) {
 		gboolean ret, set;
-		char *session_str, *err;
+		char *session_str, *err = NULL;
 		
 		ret = dbus_message_get_args(message, NULL,
 				DBUS_TYPE_STRING, &session_str,
@@ -247,5 +260,3 @@
 	session_setup = TRUE;
 	e_dbus_register_handler (CAMEL_SESSION_OBJECT_PATH, dbus_listener_message_handler, NULL);
 }
-
-

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	Tue Aug 26 05:28:29 2008
@@ -4,13 +4,16 @@
  * */
 
 #include <mail-dbus.h>
+#include <dbind.h>
+#include <evo-dbus.h>
 #include "camel-session-remote.h"
-#include "camel-store-remote.h"
 
 #define CAMEL_SESSION_INTERFACE	"org.gnome.evolution.camel.session.mail"
 #define CAMEL_SESSION_OBJECT_PATH "/org/gnome/evolution/camel/session"
 #define CAMEL_DBUS_NAME "org.gnome.evolution.camel"
 
+#define d(x) x
+
 /*
 typedef enum {
 	CAMEL_PROVIDER_STORE,
@@ -146,6 +149,7 @@
 	gboolean ret;
 	DBusError error;
 	char *service, *ex;
+	CamelStoreRemote *rstore;
 
 	dbus_error_init (&error);
 	/* Invoke the appropriate dbind call to MailSessionRemoteImpl */
@@ -159,12 +163,14 @@
 
 	if (!ret) {
 		g_warning ("Error: Camel session get service: %s\n", error.message);
-		return;
+		return NULL;
 	}
 
+	rstore = g_new (CamelStoreRemote, 1);
+	rstore->object_id = service;
 	d(printf("Camel session get service remotely\n"));
 
-	return;
+	return rstore;
 }
 
 gboolean  

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	Tue Aug 26 05:28:29 2008
@@ -3,7 +3,46 @@
  *
  * */
 
+#include "camel-store-remote.h"
+
 typedef struct {
 	char *object_id;
 } CamelSessionRemote;
 
+void camel_session_remote_construct (CamelSessionRemote *session,
+					const char *storage_path);
+
+char *camel_session_remote_get_password (CamelSessionRemote *session,
+				CamelStoreRemote *service,
+				const char *domain,
+				const char *prompt,
+				const char *item,
+				guint32 flags);
+
+char *camel_session_remote_get_storage_path (CamelSessionRemote *session, 
+					CamelStoreRemote *service);
+
+void camel_session_remote_forget_password (CamelSessionRemote *session, 
+					CamelStoreRemote *service,
+					const char *domain,
+					const char *item);
+
+
+CamelStoreRemote *camel_session_remote_get_service (CamelSessionRemote *session, 
+						const char *url_string,
+			   			CamelProviderType type);
+
+gboolean camel_session_remote_alert_user (CamelSessionRemote *session, 
+					CamelSessionAlertType type,
+					const char *prompt,
+					gboolean cancel);
+
+char *camel_session_remote_build_password_prompt (const char *type,
+					     const char *user,
+					     const char *host);
+
+gboolean camel_session_remote_is_online (CamelSessionRemote *session);
+
+void camel_session_remote_set_online  (CamelSessionRemote *session,
+				gboolean online);
+