include camel-debug.h

2004-04-08  Not Zed  <NotZed@Ximian.com>

        * camel-folder.c: include camel-debug.h

        * providers/local/camel-mbox-folder.c
        (mbox_set_message_user_flag): message changed to folder_changed.
        (mbox_set_message_user_tag): ditto.

        * camel-vee-folder.c (camel_vee_folder_finalise): dont hook onto
        message_changed.
        (camel_vee_folder_add_folder): or unhook.
        (camel_vee_folder_remove_folder): "
        (message_changed): or proxy.

        * camel-folder.c (camel_folder_class_init): removed the
        message_changed event - its redundant, and covered by
        folder_changed, and just makes life difficult for everything using
        message_changed/folder_changed (and nothing uses it anyway).
        (message_changed): removed.
        (set_message_user_flag): emit a folder_changed event instead of
        message changed.
        (set_message_user_tag): "
        (set_message_flags): "

        * camel-object.h: revered the CAMEL_OBJECT_TYPE change, it should
        be a global variable access.

svn path=/trunk/; revision=25367

1 files changed, 0 insertions, 17 deletions

diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index b937951962..69e5b0dbcb 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -77,7 +77,6 @@ static void camel_vee_folder_finalise   (CamelObject *obj);
 static int vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex);
 static void vee_folder_remove_folder(CamelVeeFolder *vf, CamelFolder *source, int killun);
 
-static void message_changed(CamelFolder *f, const char *uid, CamelVeeFolder *vf);
 static void folder_changed(CamelFolder *sub, CamelFolderChangeInfo *changes, CamelVeeFolder *vf);
 static void subfolder_deleted(CamelFolder *f, void *event_data, CamelVeeFolder *vf);
 
@@ -181,7 +180,6 @@ camel_vee_folder_finalise (CamelObject *obj)
 
 		if (vf != folder_unmatched) {
 			camel_object_unhook_event((CamelObject *)f, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);
-			camel_object_unhook_event((CamelObject *)f, "message_changed", (CamelObjectEventHookFunc) message_changed, vf);
 			camel_object_unhook_event((CamelObject *)f, "deleted", (CamelObjectEventHookFunc) subfolder_deleted, vf);
 			/* this updates the vfolder */
 			if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0)
@@ -374,7 +372,6 @@ camel_vee_folder_add_folder(CamelVeeFolder *vf, CamelFolder *sub)
 	d(printf("camel_vee_folder_add_folde(%p, %p)\n", vf, sub));
 
 	camel_object_hook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc)folder_changed, vf);
-	camel_object_hook_event((CamelObject *)sub, "message_changed", (CamelObjectEventHookFunc)message_changed, vf);
 	camel_object_hook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc)subfolder_deleted, vf);
 
 	vee_folder_build_folder(vf, sub, NULL);
@@ -406,7 +403,6 @@ camel_vee_folder_remove_folder(CamelVeeFolder *vf, CamelFolder *sub)
 	}
 	
 	camel_object_unhook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);
-	camel_object_unhook_event((CamelObject *)sub, "message_changed", (CamelObjectEventHookFunc) message_changed, vf);
 	camel_object_unhook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc) subfolder_deleted, vf);
 
 	p->folders = g_list_remove(p->folders, sub);
@@ -1634,18 +1630,6 @@ folder_changed(CamelFolder *sub, CamelFolderChangeInfo *changes, CamelVeeFolder
 	camel_session_thread_queue(session, &m->msg, 0);
 }
 
-/* track flag changes in the summary, we just promote it to a folder_changed event */
-static void
-message_changed(CamelFolder *f, const char *uid, CamelVeeFolder *vf)
-{
-	CamelFolderChangeInfo *changes;
-
-	changes = camel_folder_change_info_new();
-	camel_folder_change_info_change_uid(changes, uid);
-	folder_changed(f, changes, vf);
-	camel_folder_change_info_free(changes);
-}
-
 /* track vanishing folders */
 static void
 subfolder_deleted(CamelFolder *f, void *event_data, CamelVeeFolder *vf)
@@ -1653,7 +1637,6 @@ subfolder_deleted(CamelFolder *f, void *event_data, CamelVeeFolder *vf)
 	camel_vee_folder_remove_folder(vf, f);
 }
 
-
 static void
 vee_freeze (CamelFolder *folder)
 {