summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-11-09 18:02:57 +0100
committerMarcel Holtmann <marcel@holtmann.org>2013-11-11 01:07:20 -0800
commit8586946aeb491d1b300869dc91b6ad851eed42b2 (patch)
tree6de96e82e8ff6731e44772269d206c56e6ad7208
parent50d496726bf043a7993d7160e35b9fa9e54ad5e9 (diff)
downloadneard-8586946aeb491d1b300869dc91b6ad851eed42b2.tar.gz
neard-8586946aeb491d1b300869dc91b6ad851eed42b2.tar.bz2
neard-8586946aeb491d1b300869dc91b6ad851eed42b2.zip
gdbus: Fix trying to remove already removed sources
When we return FALSE from idle handlers, the source is removed. This will be causing warnings in glib 2.40. See https://bugzilla.gnome.org/show_bug.cgi?id=710724
-rw-r--r--gdbus/object.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gdbus/object.c b/gdbus/object.c
index 268fed5..b248cbb 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -1006,6 +1006,8 @@ static gboolean process_changes(gpointer user_data)
if (data->removed != NULL)
emit_interfaces_removed(data);
+ data->process_id = 0;
+
return FALSE;
}
@@ -1019,6 +1021,7 @@ static void generic_unregister(DBusConnection *connection, void *user_data)
if (data->process_id > 0) {
g_source_remove(data->process_id);
+ data->process_id = 0;
process_changes(data);
}