diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-07-22 09:40:25 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-07-22 09:40:25 +0800 |
| commit | 0fbe9a34fff10a2a1418f7fb8e7d36ce4a85c605 (patch) | |
| tree | 304db8a520c909597c4899cb3dd27d7992627b3a | |
| parent | f8e8ceae17a52a80b5d5af2d56704b5334e66b23 (diff) | |
| download | gsoc2013-evolution-0fbe9a34fff10a2a1418f7fb8e7d36ce4a85c605.tar.gz gsoc2013-evolution-0fbe9a34fff10a2a1418f7fb8e7d36ce4a85c605.tar.zst gsoc2013-evolution-0fbe9a34fff10a2a1418f7fb8e7d36ce4a85c605.zip | |
Use `g_source_remove()' instead of `gtk_timeout_remove()' here, as we are
* evolution-activity-client.c (impl_destroy): Use
`g_source_remove()' instead of `gtk_timeout_remove()' here, as we
are using `g_timeout_add()' and not `gtk_timeout_add()' to set up
the timeout callback.
(update_timeout_callback): Reset `have_pending_update' when
returning %TRUE. Set the timeout id to zero when returning
%FALSE.
svn path=/trunk/; revision=11295
| -rw-r--r-- | shell/ChangeLog | 10 | ||||
| -rw-r--r-- | shell/evolution-activity-client.c | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index c452918e3e..266a02140e 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,13 @@ +2001-07-21 Ettore Perazzoli <ettore@ximian.com> + + * evolution-activity-client.c (impl_destroy): Use + `g_source_remove()' instead of `gtk_timeout_remove()' here, as we + are using `g_timeout_add()' and not `gtk_timeout_add()' to set up + the timeout callback. + (update_timeout_callback): Reset `have_pending_update' when + returning %TRUE. Set the timeout id to zero when returning + %FALSE. + 2001-07-20 Jason Leach <jleach@ximian.com> [Fix a crash if you start evolution with a bad URI.] diff --git a/shell/evolution-activity-client.c b/shell/evolution-activity-client.c index 1bb74f6dda..60e9f949d9 100644 --- a/shell/evolution-activity-client.c +++ b/shell/evolution-activity-client.c @@ -190,8 +190,10 @@ update_timeout_callback (void *data) if (priv->have_pending_update) { corba_update_progress (activity_client, priv->new_information, priv->new_progress); + priv->have_pending_update = FALSE; return TRUE; } else { + priv->next_update_timeout_id = 0; return FALSE; } } @@ -247,7 +249,7 @@ impl_destroy (GtkObject *object) CORBA_exception_free (&ev); if (priv->next_update_timeout_id != 0) - gtk_timeout_remove (priv->next_update_timeout_id); + g_source_remove (priv->next_update_timeout_id); g_free (priv->new_information); |