aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-12-15 03:12:58 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-12-15 03:12:58 +0800
commit302ed285925f1e321def275329aa5283b02239ba (patch)
tree3d92c5a51c862444f199a042f79e5a1c4975c24c
parent37a6a1330714dc2b5dadb5661caf939b23416772 (diff)
downloadgsoc2013-evolution-302ed285925f1e321def275329aa5283b02239ba.tar.gz
gsoc2013-evolution-302ed285925f1e321def275329aa5283b02239ba.tar.zst
gsoc2013-evolution-302ed285925f1e321def275329aa5283b02239ba.zip
Fix a slight race condition that could cause the busy indicator not to
go off after switching folder views. svn path=/trunk/; revision=7021
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-threads.c15
2 files changed, 14 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3054a8dc57..df306cf3a5 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-14 Ettore Perazzoli <ettore@helixcode.com>
+
+ * mail-threads.c (read_msg): Call `ui_set_busy()' before
+ `ui_set_message()' so that we are sure that the
+ set_busy/unset_busy calls always happen in order.
+
2000-12-13 Christopher James Lahey <clahey@helixcode.com>
* folder-browser.c (my_folder_browser_init): Made the vertical
diff --git a/mail/mail-threads.c b/mail/mail-threads.c
index 4ded984dd4..1e33be693c 100644
--- a/mail/mail-threads.c
+++ b/mail/mail-threads.c
@@ -174,6 +174,7 @@ static gboolean busy = FALSE;
**/
static void ui_set_busy (void);
+
static void ui_unset_busy (void);
static void ui_set_message (const char *message);
static void ui_unset_message (void);
@@ -741,8 +742,8 @@ read_msg (GIOChannel * source, GIOCondition condition, gpointer userdata)
switch (msg->type) {
case STARTING:
DEBUG (("*** Message -- STARTING %s\n", msg->message));
- ui_set_message (msg->message);
ui_set_busy ();
+ ui_set_message (msg->message);
g_free (msg->message);
break;
#if 0
@@ -1105,14 +1106,14 @@ update_active_views (void)
} else {
if (current_message == NULL)
GNOME_Evolution_ShellView_setMessage (shell_view_interface,
- "",
- busy,
- &ev);
+ "",
+ busy,
+ &ev);
else
GNOME_Evolution_ShellView_setMessage (shell_view_interface,
- current_message,
- busy,
- &ev);
+ current_message,
+ busy,
+ &ev);
}
}