diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/evolution-activity-client.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 1df13d080f..9de312267e 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2001-07-31 Not Zed <NotZed@Ximian.com> + + * evolution-activity-client.c (evolution_activity_client_update): + Also update have_pending_update before calling corba, as below. + 2001-07-30 Ettore Perazzoli <ettore@ximian.com> [This should fix #5110, shell crash when switching folders.] diff --git a/shell/evolution-activity-client.c b/shell/evolution-activity-client.c index 696561f78d..d34f0effc3 100644 --- a/shell/evolution-activity-client.c +++ b/shell/evolution-activity-client.c @@ -439,6 +439,7 @@ evolution_activity_client_update (EvolutionActivityClient *activity_client, /* First of all, we set up a timeout so we can check against it at the next update request. */ + priv->have_pending_update = FALSE; priv->next_update_timeout_id = g_timeout_add (UPDATE_DELAY, update_timeout_callback, activity_client); @@ -447,8 +448,6 @@ evolution_activity_client_update (EvolutionActivityClient *activity_client, g_print ("*** ActivityClient: g_timeout_add %d %p [%ld]\n", priv->next_update_timeout_id, activity_client, (long) pthread_self ()); - - priv->have_pending_update = FALSE; } else { /* There is a pending timeout, so the last CORBA update happened less than UPDATE_DELAY msecs ago. So just queue an |