evolution r36193 - branches/mail-dbus-remoting/mail

[sragavan svn gnome org]

Author: sragavan
Date: Fri Aug 29 07:58:55 2008
New Revision: 36193
URL: http://svn.gnome.org/viewvc/evolution?rev=36193&view=rev

Log:
All code to hook/unhook remote events.


Modified:
   branches/mail-dbus-remoting/mail/em-folder-browser.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/message-list.c

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 07:58:55 2008
@@ -2058,7 +2058,7 @@
 
 		mail_refresh_folder(folder, NULL, NULL);
 
-		emfb->priv->folder_changed_id = camel_object_hook_event(folder, "folder_changed",
+		emfb->priv->folder_changed_id = camel_object_remote_hook_event(folder, "folder_changed",
 									(CamelObjectEventHookFunc)emfb_folder_changed, emfb);
 
 		/* FIXME: this mostly copied from activate() */

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	Fri Aug 29 07:58:55 2008
@@ -854,11 +854,11 @@
 
 	/* listen to store events */
 #define CAMEL_CALLBACK(func) ((CamelObjectEventHookFunc) func)
-	si->created_id = camel_object_hook_event (store, "folder_created", CAMEL_CALLBACK (folder_created_cb), model);
-	si->deleted_id = camel_object_hook_event (store, "folder_deleted", CAMEL_CALLBACK (folder_deleted_cb), model);
-	si->renamed_id = camel_object_hook_event (store, "folder_renamed", CAMEL_CALLBACK (folder_renamed_cb), model);
-	si->subscribed_id = camel_object_hook_event (store, "folder_subscribed", CAMEL_CALLBACK (folder_subscribed_cb), model);
-	si->unsubscribed_id = camel_object_hook_event (store, "folder_unsubscribed", CAMEL_CALLBACK (folder_unsubscribed_cb), model);
+	si->created_id = camel_object_remote_hook_event (store, "folder_created", CAMEL_CALLBACK (folder_created_cb), model);
+	si->deleted_id = camel_object_remote_hook_event (store, "folder_deleted", CAMEL_CALLBACK (folder_deleted_cb), model);
+	si->renamed_id = camel_object_remote_hook_event (store, "folder_renamed", CAMEL_CALLBACK (folder_renamed_cb), model);
+	si->subscribed_id = camel_object_remote_hook_event (store, "folder_subscribed", CAMEL_CALLBACK (folder_subscribed_cb), model);
+	si->unsubscribed_id = camel_object_remote_hook_event (store, "folder_unsubscribed", CAMEL_CALLBACK (folder_unsubscribed_cb), model);
 
 	g_signal_emit (model, signals[LOADED_ROW], 0, path, &root);
 	gtk_tree_path_free (path);

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	Fri Aug 29 07:58:55 2008
@@ -231,9 +231,9 @@
 	if (mfi->folder) {
 		CamelFolder *folder = mfi->folder;
 
-		camel_object_unhook_event(folder, "folder_changed", folder_changed, NULL);
-		camel_object_unhook_event(folder, "renamed", folder_renamed, NULL);
-		camel_object_unhook_event(folder, "finalize", folder_finalised, NULL);
+		camel_object_remote_unhook_event(folder, "folder_changed", folder_changed, NULL);
+		camel_object_remote_unhook_event(folder, "renamed", folder_renamed, NULL);
+		camel_object_remote_unhook_event(folder, "finalize", folder_finalised, NULL);
 	}
 
 	if ((mfi->flags & CAMEL_FOLDER_NOSELECT) == 0) {
@@ -497,9 +497,9 @@
 
 	UNLOCK(info_lock);
 
-	camel_object_hook_event(folder, "folder_changed", folder_changed, NULL);
-	camel_object_hook_event(folder, "renamed", folder_renamed, NULL);
-	camel_object_hook_event(folder, "finalize", folder_finalised, NULL);
+	camel_object_remote_hook_event(folder, "folder_changed", folder_changed, NULL);
+	camel_object_remote_hook_event(folder, "renamed", folder_renamed, NULL);
+	camel_object_remote_hook_event(folder, "finalize", folder_finalised, NULL);
 }
 
 static void
@@ -762,12 +762,12 @@
 	if (si) {
 		g_hash_table_remove(stores, store);
 
-		camel_object_unhook_event(store, "folder_opened", store_folder_opened, NULL);
-		camel_object_unhook_event(store, "folder_created", store_folder_created, NULL);
-		camel_object_unhook_event(store, "folder_deleted", store_folder_deleted, NULL);
-		camel_object_unhook_event(store, "folder_renamed", store_folder_renamed, NULL);
-		camel_object_unhook_event(store, "folder_subscribed", store_folder_subscribed, NULL);
-		camel_object_unhook_event(store, "folder_unsubscribed", store_folder_unsubscribed, NULL);
+		camel_object_remote_unhook_event(store, "folder_opened", store_folder_opened, NULL);
+		camel_object_remote_unhook_event(store, "folder_created", store_folder_created, NULL);
+		camel_object_remote_unhook_event(store, "folder_deleted", store_folder_deleted, NULL);
+		camel_object_remote_unhook_event(store, "folder_renamed", store_folder_renamed, NULL);
+		camel_object_remote_unhook_event(store, "folder_subscribed", store_folder_subscribed, NULL);
+		camel_object_remote_unhook_event(store, "folder_unsubscribed", store_folder_unsubscribed, NULL);
 		g_hash_table_foreach(si->folders, (GHFunc)unset_folder_info_hash, NULL);
 
 		ud = (struct _update_data *)si->folderinfo_updates.head;

Modified: branches/mail-dbus-remoting/mail/message-list.c
==============================================================================
--- branches/mail-dbus-remoting/mail/message-list.c	(original)
+++ branches/mail-dbus-remoting/mail/message-list.c	Fri Aug 29 07:58:55 2008
@@ -2256,7 +2256,7 @@
 			message_list->uid_nodemap = NULL;
 		}
 
-		camel_object_unhook_event(message_list->folder, "folder_changed", folder_changed, message_list);
+		camel_object_remote_unhook_event(message_list->folder, "folder_changed", folder_changed, message_list);
 		camel_object_unref (message_list->folder);
 		message_list->folder = NULL;
 	}
@@ -3289,7 +3289,7 @@
 	e_tree_memory_thaw(E_TREE_MEMORY(etm));
 
 	if (message_list->folder) {
-		camel_object_unhook_event((CamelObject *)message_list->folder, "folder_changed",
+		camel_object_remote_unhook_event((CamelObject *)message_list->folder, "folder_changed",
 					  folder_changed, message_list);
 		camel_object_unref (message_list->folder);
 		message_list->folder = NULL;
@@ -3341,7 +3341,7 @@
 		/* Build the etree suitable for this folder */
 		message_list_setup_etree (message_list, outgoing);
 
-		camel_object_hook_event (folder, "folder_changed", folder_changed, message_list);
+		camel_object_remote_hook_event (folder, "folder_changed", folder_changed, message_list);
 
 		gconf = mail_config_get_gconf_client ();
 		hide_deleted = !gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_deleted", NULL);