callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

** See bug #52878.

Browse Source 
2004-01-15  Not Zed  <NotZed@Ximian.com>

        ** See bug #52878.

        * em-folder-view.c (emfv_finalise): unhook message_changed too.
        (emfv_set_folder): hook/unhook message_changed too.
        (emfv_message_changed): implement, proxy to folder_changed.

svn path=/trunk/; revision=24235
This commit is contained in:
Not Zed
2004-01-15 07:21:14 +00:00
committed by Michael Zucci
parent 351cfd0065
commit 9479a616f6
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/ChangeLog
+8
View File
@@ -1,3 +1,11 @@
2004-01-15 Not Zed <NotZed@Ximian.com>
** See bug #52878.
* em-folder-view.c (emfv_finalise): unhook message_changed too.
(emfv_set_folder): hook/unhook message_changed too.
(emfv_message_changed): implement, proxy to folder_changed.
2004-01-15 Not Zed <NotZed@Ximian.com>
** See bugs #51609 and #43515.
mail/em-folder-view.c
+15 -3
View File
@@ -82,6 +82,7 @@
#include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */
static void emfv_folder_changed(CamelFolder *folder, CamelFolderChangeInfo *changes, EMFolderView *emfv);
static void emfv_message_changed(CamelFolder *folder, const char *uid, EMFolderView *emfv);
static void emfv_list_message_selected(MessageList *ml, const char *uid, EMFolderView *emfv);
static int emfv_list_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, EMFolderView *emfv);
@@ -115,7 +116,7 @@ struct _EMFolderViewPrivate {
char *displayed_uid; /* only used to stop re-loads, don't use it to represent any selection state */
CamelObjectHookID folder_changed_id;
CamelObjectHookID folder_changed_id, message_changed_id;
GtkWidget *invisible;
char *selection_uri;
@@ -188,6 +189,8 @@ emfv_finalise(GObject *o)
if (emfv->folder) {
if (p->folder_changed_id)
camel_object_remove_event(emfv->folder, p->folder_changed_id);
if (p->message_changed_id)
camel_object_remove_event(emfv->folder, p->message_changed_id);
camel_object_unref(emfv->folder);
g_free(emfv->folder_uri);
}
@@ -359,14 +362,16 @@ emfv_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri)
if (folder != emfv->folder) {
if (emfv->folder) {
mail_sync_folder (emfv->folder, NULL, NULL);
if (emfv->priv->folder_changed_id)
camel_object_remove_event(emfv->folder, emfv->priv->folder_changed_id);
camel_object_remove_event(emfv->folder, emfv->priv->folder_changed_id);
camel_object_remove_event(emfv->folder, emfv->priv->message_changed_id);
camel_object_unref(emfv->folder);
}
emfv->folder = folder;
if (folder) {
emfv->priv->folder_changed_id = camel_object_hook_event(folder, "folder_changed",
(CamelObjectEventHookFunc)emfv_folder_changed, emfv);
emfv->priv->message_changed_id = camel_object_hook_event(folder, "message_changed",
(CamelObjectEventHookFunc)emfv_message_changed, emfv);
camel_object_ref(folder);
}
}
@@ -1929,6 +1934,13 @@ emfv_folder_changed(CamelFolder *folder, CamelFolderChangeInfo *changes, EMFolde
mail_async_event_emit(emfv->async, MAIL_ASYNC_GUI, (MailAsyncFunc)emfv_gui_folder_changed, folder, NULL, emfv);
}
static void
emfv_message_changed(CamelFolder *folder, const char *uid, EMFolderView *emfv)
{
g_object_ref(emfv);
mail_async_event_emit(emfv->async, MAIL_ASYNC_GUI, (MailAsyncFunc)emfv_gui_folder_changed, folder, NULL, emfv);
}
/* keep these two tables in sync */
enum {
EMFV_ANIMATE_IMAGES = 1,