diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-11-09 18:02:57 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-11-11 10:38:10 +0200 |
| commit | 077c8fb1475d8f9d435eb3f3f2d063feab8342c3 (patch) | |
| tree | 1e302895fbc4516fa27372c6228f54353794b69e /gdbus | |
| parent | 651522716f3ef317220fc55765b1f0e3c2695498 (diff) | |
| download | bluez-077c8fb1475d8f9d435eb3f3f2d063feab8342c3.tar.gz | |
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
Diffstat (limited to 'gdbus')
| -rw-r--r-- | gdbus/object.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index 268fed552..b248cbbc7 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); } |