Fix not canceling pending calls on maemo6 telephony driver exit
This happens when the driver exit is called quickly after init due to
adapter power changes.
diff --git a/audio/telephony-maemo6.c b/audio/telephony-maemo6.c
index 7853bae..f671a42 100644
--- a/audio/telephony-maemo6.c
+++ b/audio/telephony-maemo6.c
@@ -150,6 +150,7 @@
static GSList *calls = NULL;
static GSList *watches = NULL;
+static GSList *pending = NULL;
/* Reference count for determining the call indicator status */
static GSList *active_calls = NULL;
@@ -592,7 +593,7 @@
}
dbus_pending_call_set_notify(call, cb, user_data, NULL);
- dbus_pending_call_unref(call);
+ pending = g_slist_prepend(pending, call);
dbus_message_unref(msg);
return 0;
@@ -1312,6 +1313,12 @@
return type == DBUS_TYPE_INVALID ? TRUE : FALSE;
}
+static void remove_pending(DBusPendingCall *call)
+{
+ pending = g_slist_remove(pending, call);
+ dbus_pending_call_unref(call);
+}
+
static void hal_battery_level_reply(DBusPendingCall *call, void *user_data)
{
DBusError err;
@@ -1360,8 +1367,10 @@
telephony_update_indicator(maemo_indicators, "battchg", new);
}
+
done:
dbus_message_unref(reply);
+ remove_pending(call);
}
static void hal_get_integer(const char *path, const char *key, void *user_data)
@@ -1556,6 +1565,7 @@
done:
g_free(prop);
dbus_message_unref(reply);
+ remove_pending(call);
}
static int get_property(const char *iface, const char *prop)
@@ -1615,6 +1625,7 @@
done:
dbus_message_unref(reply);
+ remove_pending(call);
}
@@ -1665,6 +1676,7 @@
done:
dbus_message_unref(reply);
+ remove_pending(call);
}
static void csd_init(void)
@@ -1843,6 +1855,7 @@
handle_modem_state(reply);
dbus_message_unref(reply);
+ remove_pending(call);
}
static gboolean signal_filter(DBusConnection *conn, DBusMessage *msg,
@@ -1940,6 +1953,7 @@
done:
dbus_message_unref(reply);
+ remove_pending(call);
}
int telephony_init(void)
@@ -2016,6 +2030,11 @@
g_slist_free(calls);
calls = NULL;
+ g_slist_foreach(pending, (GFunc) dbus_pending_call_cancel, NULL);
+ g_slist_foreach(pending, (GFunc) dbus_pending_call_unref, NULL);
+ g_slist_free(pending);
+ pending = NULL;
+
g_slist_foreach(watches, (GFunc) remove_watch, NULL);
g_slist_free(watches);
watches = NULL;
