evolution r36194 - branches/mail-dbus-remoting/mail

[sragavan svn gnome org]

Author: sragavan
Date: Fri Aug 29 08:20:32 2008
New Revision: 36194
URL: http://svn.gnome.org/viewvc/evolution?rev=36194&view=rev

Log:
Fix debug and a crash.


Modified:
   branches/mail-dbus-remoting/mail/camel-folder-remote-impl.c
   branches/mail-dbus-remoting/mail/camel-store-remote.c

Modified: branches/mail-dbus-remoting/mail/camel-folder-remote-impl.c
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-folder-remote-impl.c	(original)
+++ branches/mail-dbus-remoting/mail/camel-folder-remote-impl.c	Fri Aug 29 08:20:32 2008
@@ -8,6 +8,7 @@
 #define CAMEL_FOLDER_OBJECT_PATH "/org/gnome/evolution/camel/folder"
 #define CAMEL_FOLDER_INTERFACE "org.gnome.evolution.camel.folder"
 
+#define d(x)
 extern GHashTable *store_hash;
 extern GHashTable *folder_hash;
 
@@ -27,12 +28,12 @@
 	CamelStore *store;
 	CamelFolder *folder;	
 
-	printf
+	d(printf
 	    ("D-Bus message: obj_path = '%s' interface = '%s' method = '%s' destination = '%s'\n",
 	     dbus_message_get_path (message),
 	     dbus_message_get_interface (message),
 	     dbus_message_get_member (message),
-	     dbus_message_get_destination (message));
+	     dbus_message_get_destination (message)));
 
 	return_val = dbus_message_new_method_return (message);
 

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	Fri Aug 29 08:20:32 2008
@@ -9,6 +9,7 @@
 #include <camel/camel-folder.h>
 #include "camel-store-remote.h"
 #include "camel-object-remote.h"
+
 extern GHashTable *folder_hash;
 GHashTable *folder_rhash = NULL;
 
@@ -445,7 +446,7 @@
 	gboolean ret;
 	DBusError error;
 	gpointer info;
-	int ptr;
+	int ptr = NULL;
 	char *err;
 
 	dbus_error_init(&error);
@@ -455,7 +456,11 @@
 					CAMEL_STORE_OBJECT_PATH,
 					CAMEL_STORE_INTERFACE,
 					"camel_store_get_folder_info",
-					&error, "ssu=>is", store->object_id, top ? top : "", flags, &ptr, &err);
+					&error, "ssu=>is", store->object_id, top ? top : "", flags, &ptr, &error);
+	if (!ret) {
+		g_warning ("camel_store_get_folder_info_remote: failed : %s\n", error.message);
+		return NULL;
+	}
 
 	info = (gpointer)ptr;