evolution r36095 - branches/mail-dbus-remoting/mail

[abharath svn gnome org]

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

Log:
Fix the double free and added a CamelException parameter


Modified:
   branches/mail-dbus-remoting/mail/camel-session-remote.c
   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/mail-component.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 04:10:50 2008
@@ -275,7 +275,7 @@
 			CAMEL_SESSION_INTERFACE,
 			"camel_session_set_online",
 			&error, 
-			"ss", session->object_id, online);
+			"si", session->object_id, online);
 
 	if (!ret) {
 		g_warning ("Error: Camel session set online: %s\n", error.message);

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 04:10:50 2008
@@ -66,7 +66,6 @@
 
 	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;
 }

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 04:10:50 2008
@@ -65,19 +65,19 @@
 	}
 }
 
-CamelFolder *camel_store_get_inbox_remote(CamelStoreRemote * store)
+CamelFolder *camel_store_get_inbox_remote(CamelStoreRemote * store, CamelException *ex)
 {
 	return (camel_store_get_specific_folder_remote
 		(store, "camel_store_get_inbox"));
 }
 
-CamelFolder *camel_store_get_trash_remote(CamelStoreRemote * store)
+CamelFolder *camel_store_get_trash_remote(CamelStoreRemote * store, CamelException *ex)
 {
 	return (camel_store_get_specific_folder_remote
 		(store, "camel_store_get_trash"));
 }
 
-CamelFolder *camel_store_get_junk_remote(CamelStoreRemote * store)
+CamelFolder *camel_store_get_junk_remote(CamelStoreRemote * store, CamelException *ex)
 {
 	return (camel_store_get_specific_folder_remote
 		(store, "camel_store_get_junk"));

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 04:10:50 2008
@@ -19,9 +19,9 @@
 CamelFolder *camel_store_get_folder_remote(CamelStoreRemote * store,
 					   const char *folder_name,
 					   guint32 flags);
-CamelFolder *camel_store_get_inbox_remote(CamelStoreRemote * store);
-CamelFolder *camel_store_get_trash_remote(CamelStoreRemote * store);
-CamelFolder *camel_store_get_junk_remote(CamelStoreRemote * store);
+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);
 
 void camel_store_delete_folder_remote(CamelStoreRemote * store,
 				      const char *folder_name);

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 04:10:50 2008
@@ -190,9 +190,9 @@
 	/* If these are vfolders then they need to be opened now,
 	 * otherwise they wont keep track of all folders */
 	if ((store_flags & CAMEL_STORE_VTRASH) != 0)
-		si->vtrash = camel_store_get_trash(store, NULL);
+		si->vtrash = camel_store_get_trash_remote (store, NULL);
 	if ((store_flags & CAMEL_STORE_VJUNK) != 0)
-		si->vjunk = camel_store_get_junk(store, NULL);
+		si->vjunk = camel_store_get_junk_remote (store, NULL);
 
 	return si;
 }