aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-03-11 15:43:47 -0600
committerTed Gould <ted@gould.cx>2011-03-11 15:43:47 -0600
commitbc6a7d9b4fd1dd9edc477edfdba39a34069ec53d (patch)
tree750bdf602dc5839ad817a56ea7fb2d971945d775
parenta4e9c0bf6ee2b628dac8655cacd2841c87aae702 (diff)
downloadayatana-indicator-application-bc6a7d9b4fd1dd9edc477edfdba39a34069ec53d.tar.gz
ayatana-indicator-application-bc6a7d9b4fd1dd9edc477edfdba39a34069ec53d.tar.bz2
ayatana-indicator-application-bc6a7d9b4fd1dd9edc477edfdba39a34069ec53d.zip
Unrefing the object, it might not happen right away, so let's clear it ourselves.
-rw-r--r--src/indicator-application.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/indicator-application.c b/src/indicator-application.c
index 73e8341..c2dd16a 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -183,8 +183,8 @@ indicator_application_dispose (GObject *object)
if (priv->get_apps_cancel != NULL) {
g_cancellable_cancel(priv->get_apps_cancel);
- /* The callback should clear the cancelable */
- g_warn_if_fail(priv->get_apps_cancel == NULL);
+ g_object_unref(priv->get_apps_cancel);
+ priv->get_apps_cancel = NULL;
}
while (priv->applications != NULL) {
@@ -755,7 +755,7 @@ receive_signal (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name,
any of these our state is probably going to just be confused. Let's
cancel the call we had and try again to try and get a clear answer */
if (priv->get_apps_cancel != NULL) {
- g_cancelable_cancel(priv->get_apps_cancel);
+ g_cancellable_cancel(priv->get_apps_cancel);
g_object_unref(priv->get_apps_cancel);
priv->get_apps_cancel = g_cancellable_new();