From: Ryan Lortie <desrt@desrt.ca>
Date: Wed, 7 Dec 2011 19:43:50 +0000 (-0500)
Subject: action exporter: cancel pending events on unexport
X-Git-Tag: 2.31.4~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64e3e10c9827ff53c8388ebfb672810a6c5fa658;p=platform%2Fupstream%2Fglib.git

action exporter: cancel pending events on unexport

If there are events pending when we unexport the action group, free them
and cancel the pending idle.
---

diff --git a/gio/gactiongroupexporter.c b/gio/gactiongroupexporter.c
index 9c78487..443a000 100644
--- a/gio/gactiongroupexporter.c
+++ b/gio/gactiongroupexporter.c
@@ -553,6 +553,11 @@ g_action_group_exporter_free (gpointer user_data)
 
   for (i = 0; i < G_N_ELEMENTS (exporter->signal_ids); i++)
     g_signal_handler_disconnect (exporter->action_group, exporter->signal_ids[i]);
+
+  g_hash_table_unref (exporter->pending_changes);
+  if (exporter->pending_id)
+    g_source_remove (exporter->pending_id);
+
   g_object_unref (exporter->connection);
   g_object_unref (exporter->action_group);
   g_free (exporter->object_path);