ayatana-commits team mailing list archive

[Aurélien Gâteau <aurelien.gateau@xxxxxxxxxxxxx>]

Aurélien Gâteau has proposed merging lp:~agateau/libindicate/free-fixes into lp:libindicate.

    Requested reviews:
    Indicator Applet Developers (indicator-applet-developers)


Necessary to get more libindicate-qt tests to pass.
-- 
https://code.launchpad.net/~agateau/libindicate/free-fixes/+merge/18996
Your team ayatana-commits is subscribed to branch lp:libindicate.

=== modified file 'libindicate/listener.c'
--- libindicate/listener.c	2010-02-09 03:10:00 +0000
+++ libindicate/listener.c	2010-02-10 11:37:18 +0000
@@ -246,6 +246,8 @@
 	g_list_foreach(priv->proxies, (GFunc)proxy_struct_destroy, NULL);
 	g_list_free(priv->proxies);
 
+	dbus_connection_remove_filter(dbus_g_connection_get_connection(priv->session_bus), dbus_filter_show_server, listener);
+
 	G_OBJECT_CLASS (indicate_listener_parent_class)->finalize (obj);
 	return;
 }
@@ -333,6 +335,10 @@
 proxy_struct_destroy (gpointer data)
 {
 	proxy_t * proxy_data = data;
+	if (proxy_data->proxy == NULL) {
+		/* Already freed */
+		return;
+	}
 
 	if (proxy_data->indicators != NULL) {
 		g_hash_table_foreach(proxy_data->indicators,