evolution r36197 - branches/mail-dbus-remoting/mail

[psankar svn gnome org]

Author: psankar
Date: Fri Aug 29 09:04:15 2008
New Revision: 36197
URL: http://svn.gnome.org/viewvc/evolution?rev=36197&view=rev

Log:
Migrate camel_vee_folder_set_expression and its callees.


Modified:
   branches/mail-dbus-remoting/mail/camel-folder-remote-impl.c
   branches/mail-dbus-remoting/mail/camel-folder-remote.c
   branches/mail-dbus-remoting/mail/camel-folder-remote.h
   branches/mail-dbus-remoting/mail/em-folder-browser.c
   branches/mail-dbus-remoting/mail/mail-vfolder.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 09:04:15 2008
@@ -237,6 +237,18 @@
 
 		camel_folder_set_message_user_tag (folder, uid, name, user_tag);
 		dbus_message_append_args (return_val, DBUS_TYPE_INVALID);
+	} else if (strcmp (method, "camel_vee_folder_set_expression") == 0) {
+			gboolean ret;
+			const char *query; 
+
+			ret = dbus_message_get_args (message, NULL,
+							DBUS_TYPE_STRING, &folder_hash_key,
+							DBUS_TYPE_STRING, &query,
+							DBUS_TYPE_INVALID);
+			folder = g_hash_table_lookup (folder_hash, folder_hash_key);
+
+			camel_vee_folder_set_expression ((CamelVeeFolder *) folder, query);
+			dbus_message_append_args (return_val, DBUS_TYPE_INVALID);
 	} else if (strncmp (method, "camel_object", 12) == 0) {
 		return camel_object_signal_handler (connection, message, user_data, CAMEL_ROT_FOLDER);
 	} else

Modified: branches/mail-dbus-remoting/mail/camel-folder-remote.c
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-folder-remote.c	(original)
+++ branches/mail-dbus-remoting/mail/camel-folder-remote.c	Fri Aug 29 09:04:15 2008
@@ -400,3 +400,27 @@
 }
 
 
+void
+camel_folder_remote_set_vee_folder_expression (CamelFolderRemote *folder, const char *query)
+{
+	gboolean ret;
+	DBusError error;
+	char *err;
+
+	dbus_error_init (&error);
+	/* Invoke the appropriate dbind call to MailSessionRemoteImpl */
+	ret = dbind_context_method_call (evolution_dbus_peek_context(), 
+			CAMEL_DBUS_NAME,
+			CAMEL_FOLDER_OBJECT_PATH,
+			CAMEL_FOLDER_INTERFACE,
+			"camel_vee_folder_set_expression",
+			&error, 
+			"ss", folder->object_id, &query); 
+
+	if (!ret) {
+		g_warning ("Error: camel_folder_remote_set_vee_folder_expression : %s\n", error.message);
+		return;
+	}
+
+	d(printf("camel_folder_remote_set_vee_folder_expression \n"));
+}

Modified: branches/mail-dbus-remoting/mail/camel-folder-remote.h
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-folder-remote.h	(original)
+++ branches/mail-dbus-remoting/mail/camel-folder-remote.h	Fri Aug 29 09:04:15 2008
@@ -39,4 +39,6 @@
 
 void camel_folder_remote_set_message_user_tag (CamelFolderRemote *folder, const char *uid, const char *name, const char *value);
 
+void camel_folder_remote_set_vee_folder_expression (CamelFolderRemote *folder, const char *query);
+
 #endif

Modified: branches/mail-dbus-remoting/mail/em-folder-browser.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-browser.c	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-browser.c	Fri Aug 29 09:04:15 2008
@@ -994,7 +994,7 @@
 
 	d(printf("Setting up Search Folder: %s\n", m->folder->full_name));
 
-	camel_vee_folder_set_expression((CamelVeeFolder *)m->folder, m->query);
+	camel_folder_remote_set_vee_folder_expression (m->folder, m->query);
 
 	l = m->sources_uri;
 	while (l) {
@@ -1183,7 +1183,7 @@
 			    g_free (storeuri);
 		    } else {
 			    /* Reuse the existing search folder */
-			    camel_vee_folder_set_expression((CamelVeeFolder *)efb->account_search_vf, search_word);
+				camel_folder_remote_set_vee_folder_expression (efb->account_search_vf, search_word);
 		    }
 
 		    break;
@@ -1266,7 +1266,7 @@
 			    g_free (storeuri);
 		    } else {
 			    /* Reuse the existing search folder */
-			    camel_vee_folder_set_expression((CamelVeeFolder *)efb->all_account_search_vf, search_word);
+				camel_folder_remote_set_vee_folder_expression (efb->all_account_search_vf, search_word);
 		    }
 
 		    break;

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	Fri Aug 29 09:04:15 2008
@@ -100,7 +100,7 @@
 
 	d(printf("Setting up Search Folder: %s\n", camel_folder_remote_get_name (m->folder)));
 
-	camel_vee_folder_set_expression((CamelVeeFolder *)m->folder, m->query);
+	camel_folder_remote_set_vee_folder_expression (m->folder, m->query);
 
 	l = m->sources_uri;
 	while (l && !vshutdown) {