evolution r36163 - branches/mail-dbus-remoting/mail

[sragavan svn gnome org]

Author: sragavan
Date: Thu Aug 28 13:55:35 2008
New Revision: 36163
URL: http://svn.gnome.org/viewvc/evolution?rev=36163&view=rev

Log:
Make senseful things on the console from now on.


Modified:
   branches/mail-dbus-remoting/mail/camel-object-remote.c
   branches/mail-dbus-remoting/mail/dbind.c
   branches/mail-dbus-remoting/mail/em-folder-tree-model.c
   branches/mail-dbus-remoting/mail/mail-folder-cache.c
   branches/mail-dbus-remoting/mail/mail-session-remote-impl.c
   branches/mail-dbus-remoting/mail/mail-session-remote.c

Modified: branches/mail-dbus-remoting/mail/camel-object-remote.c
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-object-remote.c	(original)
+++ branches/mail-dbus-remoting/mail/camel-object-remote.c	Thu Aug 28 13:55:35 2008
@@ -104,7 +104,6 @@
 	
 	/* We purposefully append */
 	object->hooks = g_list_append (object->hooks, hook);
-	d(printf("Mail session initated remotely\n"));
 	if(!g_hash_table_lookup(objects, object->object_id))
 		g_hash_table_insert (objects, object->object_id, object);
 

Modified: branches/mail-dbus-remoting/mail/dbind.c
==============================================================================
--- branches/mail-dbus-remoting/mail/dbind.c	(original)
+++ branches/mail-dbus-remoting/mail/dbind.c	Thu Aug 28 13:55:35 2008
@@ -6,6 +6,8 @@
 #include <glib.h>
 #include <stdarg.h>
 
+#define d(x) 
+
 /*
  * FIXME: compare types - to ensure they match &
  *        do dynamic padding of structures etc.
@@ -31,7 +33,7 @@
 
     ctx = g_new0 (DBindContext, 1);
     ctx->cnx = cnx;
-    printf("DBIND DBUS %p\n", cnx);
+    d(printf("DBIND DBUS %p\n", cnx));
 
 out:
     if (err == &real_err)
@@ -183,7 +185,7 @@
     char *p;
     char *dest;
 
-    printf("DBIND: %s: %s: %s: %d\n", bus_name, path, method, dbus_connection_get_is_connected(cnx));
+    d(printf("DBIND: %s: %s: %s: %d\n", bus_name, path, method, dbus_connection_get_is_connected(cnx)));
     if (opt_error)
         err = opt_error;
     else {

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	Thu Aug 28 13:55:35 2008
@@ -880,7 +880,6 @@
 	struct _EMFolderTreeModelStoreInfo *si;
 
 	g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model));
-	g_return_if_fail (CAMEL_IS_STORE (store));
 
 	if (!(si = g_hash_table_lookup (model->store_hash, store)))
 		return;
@@ -936,7 +935,6 @@
 	GtkTreeIter iter;
 
 	g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model));
-	g_return_if_fail (CAMEL_IS_STORE (store));
 
 	if (!(si = g_hash_table_lookup (model->store_hash, store)))
 		return;
@@ -1228,7 +1226,6 @@
 	guint32 flags;
 
 	g_return_val_if_fail (EM_IS_FOLDER_TREE_MODEL (model), FALSE);
-	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
 	g_return_val_if_fail (full != NULL, FALSE);
 
 	u(printf("Checking if the folder is an INBOX type %p '%s' %d\n", store, full, unread));
@@ -1269,7 +1266,6 @@
 	char *name = NULL;
 
 	g_return_val_if_fail (EM_IS_FOLDER_TREE_MODEL (model), FALSE);
-	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
 	g_return_val_if_fail (full != NULL, FALSE);
 
 	if (!(si = g_hash_table_lookup (model->store_hash, store))) {
@@ -1304,7 +1300,6 @@
 	GtkTreeIter iter;
 
 	g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model));
-	g_return_if_fail (CAMEL_IS_STORE (store));
 	g_return_if_fail (full != NULL);
 
 	u(printf("set unread count %p '%s' %d\n", store, full, unread));

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	Thu Aug 28 13:55:35 2008
@@ -985,12 +985,12 @@
 
 	/* there is potential for race here, but it is safe as we check for the store anyway */
 	if (hook) {
-		camel_object_hook_event(store, "folder_opened", store_folder_opened, NULL);
-		camel_object_hook_event(store, "folder_created", store_folder_created, NULL);
-		camel_object_hook_event(store, "folder_deleted", store_folder_deleted, NULL);
-		camel_object_hook_event(store, "folder_renamed", store_folder_renamed, NULL);
-		camel_object_hook_event(store, "folder_subscribed", store_folder_subscribed, NULL);
-		camel_object_hook_event(store, "folder_unsubscribed", store_folder_unsubscribed, NULL);
+		camel_object_remote_hook_event(store, "folder_opened", store_folder_opened, NULL);
+		camel_object_remote_hook_event(store, "folder_created", store_folder_created, NULL);
+		camel_object_remote_hook_event(store, "folder_deleted", store_folder_deleted, NULL);
+		camel_object_remote_hook_event(store, "folder_renamed", store_folder_renamed, NULL);
+		camel_object_remote_hook_event(store, "folder_subscribed", store_folder_subscribed, NULL);
+		camel_object_remote_hook_event(store, "folder_unsubscribed", store_folder_unsubscribed, NULL);
 	}
 }
 

Modified: branches/mail-dbus-remoting/mail/mail-session-remote-impl.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-session-remote-impl.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-session-remote-impl.c	Thu Aug 28 13:55:35 2008
@@ -13,7 +13,7 @@
 #include "mail-session-remote-impl.h"
 #define MAIL_SESSION_OBJECT_PATH "/org/gnome/evolution/camel/session/mail"
 
-#define d(x) x
+#define d(x) 
 
 static gboolean ms_setup = FALSE;
 

Modified: branches/mail-dbus-remoting/mail/mail-session-remote.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-session-remote.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-session-remote.c	Thu Aug 28 13:55:35 2008
@@ -11,7 +11,7 @@
 #include "camel-object-remote.h"
 #include "mail-session-remote.h"
 
-#define d(x) x
+#define d(x) 
 extern CamelObjectRemote *rsession;
 
 void