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

Fix the camel-folder's thaw handler. Implement event forwarding into the main thread.

Browse Source 
svn path=/trunk/; revision=4744
This commit is contained in:
Peter Williams
2000-08-11 17:35:14 +00:00
parent 5d79af0da6
commit 1fa80ef1b7
8 changed files with 106 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
camel/ChangeLog
View File

@ -1,3 +1,8 @@
2000-08-11 Peter Williams <peterw@helixcode.com>
* camel-folder.c (thaw): Fix a bug where the message_changed
signal wasn't being emitted.
2000-08-11 Not Zed <NotZed@HelixCode.com>
* providers/mh/camel-mh-folder.c (mh_set_message_user_tag):

2
camel/camel-folder.c
View File

@ -1144,7 +1144,7 @@ static void thaw(CamelFolder * folder)
folder->folder_changed = FALSE;
camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", GINT_TO_POINTER(0));
} else if (folder->messages_changed) {
} else if (messages) {
/* FIXME: would be nice to not emit more than once for
* a given message
*/

21
mail/ChangeLog
View File

@ -1,3 +1,24 @@
2000-08-11 Peter Williams <peterw@helixcode.com>
* mail-threads.c (mail_op_forward_event): New function that
writes a FORWARD_EVENT signal to the compipe, to allow Camel
events to be handled in the main thread.
(read_msg): Handle a FORWARD_EVENT.
* mail-callbacks.c (select_first_unread): Forward the
event into the main thread to prevent the GTK calls in the
dispatcher thread.
(main_select_first_unread): New name of old select_first_unread.
* message-list.c (folder_changed): Same as above.
(main_folder_changed): Same as above.
(message_changed): Same as above.
(main_message_changed): Same as above.
* mail-format.c (free_byte_array): Note about using
mail_op_forward_event. (cmm_destroyed): Same.
2000-08-11 Dan Winship <danw@helixcode.com>
* message-list.c (message_list_select): If the caller passes "-1"

31
mail/mail-callbacks.c
View File

@ -69,7 +69,7 @@ check_configured (void)
}
static void
select_first_unread (CamelFolder *folder, gpointer event_data, gpointer data)
main_select_first_unread (CamelFolder *folder, gpointer event_data, gpointer data)
{
FolderBrowser *fb = FOLDER_BROWSER (data);
ETable *table = E_TABLE_SCROLLED (fb->message_list->etable)->table;
@ -78,11 +78,16 @@ select_first_unread (CamelFolder *folder, gpointer event_data, gpointer data)
0, CAMEL_MESSAGE_SEEN);
}
static void
select_first_unread (CamelFolder *folder, gpointer event_data, gpointer data)
{
mail_op_forward_event (main_select_first_unread, folder, event_data, data);
}
void
fetch_mail (GtkWidget *button, gpointer user_data)
{
MailConfigService *source;
char *url = NULL;
GSList *sources;
if (!check_configured ()) {
GtkWidget *win = gtk_widget_get_ancestor (GTK_WIDGET (user_data),
@ -93,10 +98,9 @@ fetch_mail (GtkWidget *button, gpointer user_data)
return;
}
source = mail_config_get_default_source ();
url = source->url;
sources = mail_config_get_sources ();
if (!url) {
if (!sources || !sources->data) {
GtkWidget *win = gtk_widget_get_ancestor (GTK_WIDGET (user_data),
GTK_TYPE_WINDOW);
@ -105,7 +109,20 @@ fetch_mail (GtkWidget *button, gpointer user_data)
return;
}
mail_do_fetch_mail (url, source->keep_on_server, NULL, select_first_unread, user_data);
while (sources) {
MailConfigService *source;
source = (MailConfigService *) sources->data;
sources = sources->next;
if (!source || !source->url) {
g_warning ("Bad source in fetch_mail??");
continue;
}
mail_do_fetch_mail (source->url, source->keep_on_server,
NULL, select_first_unread, user_data);
}
}
static gboolean

3
mail/mail-format.c
View File

@ -118,6 +118,8 @@ static void cmm_destroyed (CamelObject *cmm, gpointer event_data, gpointer user_
{
GHashTable *ht;
/* We don't have to do a forward_event here right now. */
g_return_if_fail (cmm);
ht = g_hash_table_lookup (cmm_to_urls, cmm);
@ -807,6 +809,7 @@ try_inline_binhex (char *start, struct mail_format_data *mfd)
static void
free_byte_array (CamelObject *obj, gpointer event_data, gpointer user_data)
{
/* We don't have to do a forward event here right now */
g_byte_array_free (user_data, TRUE);
}

34
mail/mail-threads.c
View File

@ -26,6 +26,7 @@
#include <string.h>
#include <glib.h>
#include "camel/camel-object.h"
#include "mail.h"
#include "mail-threads.h"
@ -68,6 +69,7 @@ typedef struct com_msg_s
MESSAGE,
PASSWORD,
ERROR,
FORWARD_EVENT,
FINISHED
} type;
gfloat percentage;
@ -79,6 +81,12 @@ typedef struct com_msg_s
gchar **reply;
gboolean secret;
gboolean *success;
/* Event stuff */
CamelObjectEventHookFunc event_hook;
CamelObject *event_obj;
gpointer event_event_data;
gpointer event_user_data;
}
com_msg_t;
@ -483,6 +491,25 @@ mail_op_error (gchar * fmt, ...)
G_UNLOCK (modal_lock);
}
/**
* mail_op_forward_event:
*
* Communicate a camel event over to the main thread.
**/
void
mail_op_forward_event (CamelObjectEventHookFunc func, CamelObject *o,
gpointer event_data, gpointer user_data)
{
com_msg_t msg;
msg.type = FORWARD_EVENT;
msg.event_hook = func;
msg.event_obj = o;
msg.event_event_data = event_data;
msg.event_user_data = user_data;
write (MAIN_WRITER, &msg, sizeof (msg));
}
/**
* mail_operation_wait_for_finish:
*
@ -887,6 +914,13 @@ read_msg (GIOChannel * source, GIOCondition condition, gpointer userdata)
* call for us
*/
case FORWARD_EVENT:
DEBUG (("*** Message -- FORWARD_EVENT %p", msg->event_hook));
g_assert (msg->event_hook);
(msg->event_hook) (msg->event_obj, msg->event_event_data, msg->event_user_data);
break;
case FINISHED:
DEBUG (
("*** Message -- FINISH %s\n",

7
mail/mail-threads.h
View File

@ -26,6 +26,7 @@
#define _MAIL_THREADS_H_
#include <camel/camel-exception.h>
#include <camel/camel-object.h>
#include <stdlib.h> /*size_t */
/* Returns a g_strdup'ed string that describes what's going to happen,
@ -54,12 +55,12 @@ gboolean mail_operation_queue (const mail_operation_spec * spec,
void mail_op_set_percentage (gfloat percentage);
void mail_op_hide_progressbar (void);
void mail_op_show_progressbar (void);
void
mail_op_set_message (gchar * fmt, ...) G_GNUC_PRINTF (1, 2);
void mail_op_set_message (gchar * fmt, ...) G_GNUC_PRINTF (1, 2);
void mail_op_error (gchar * fmt, ...) G_GNUC_PRINTF (1, 2);
gboolean mail_op_get_password (gchar * prompt, gboolean secret,
gchar ** dest);
void mail_op_forward_event (CamelObjectEventHookFunc func, CamelObject *o,
gpointer event_data, gpointer user_data);
/* Wait for the async operations to finish */
void mail_operation_wait_for_finish (void);
gboolean mail_operations_are_executing (void);

21
mail/message-list.c
View File

@ -836,28 +836,35 @@ build_flat (MessageList *ml, ETreePath *parent, GPtrArray *uids)
}
static void
folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
main_folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
{
MessageList *message_list = MESSAGE_LIST (user_data);
GDK_THREADS_ENTER(); /* Very important!!!! */
mail_do_regenerate_messagelist (message_list, message_list->search);
GDK_THREADS_LEAVE(); /* Very important!!!! */
}
static void
message_changed (CamelObject *o, gpointer uid, gpointer user_data)
folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
{
mail_op_forward_event (main_folder_changed, o, event_data, user_data);
}
static void
main_message_changed (CamelObject *o, gpointer uid, gpointer user_data)
{
MessageList *message_list = MESSAGE_LIST (user_data);
int row;
GDK_THREADS_ENTER(); /* Very important!!!! */
row = GPOINTER_TO_INT (g_hash_table_lookup (message_list->uid_rowmap,
uid));
if (row != -1)
e_table_model_row_changed (message_list->table_model, row);
}
GDK_THREADS_LEAVE(); /* Very important!!!! */
static void
message_changed (CamelObject *o, gpointer event_data, gpointer user_data)
{
mail_op_forward_event (main_message_changed, o, event_data, user_data);
}
void