ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-application/bug640838 into lp:indicator-application.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)
Related bugs:
  #640838 indicator-application-service assert failure: *** glibc detected *** /usr/lib/indicator-application/indicator-application-service: double free or corruption (fasttop): 0x0930ce28 ***
  https://bugs.launchpad.net/bugs/640838

For more details, see:
https://code.launchpad.net/~ted/indicator-application/bug640838/+merge/46824

Removes the signal handler before unreffing the proxy.  Think that's the problem in bug 640838.
-- 
https://code.launchpad.net/~ted/indicator-application/bug640838/+merge/46824
Your team ayatana-commits is subscribed to branch lp:indicator-application.

=== modified file 'src/application-service-appstore.c'
--- src/application-service-appstore.c	2011-01-14 02:25:13 +0000
+++ src/application-service-appstore.c	2011-01-19 20:35:29 +0000
@@ -1204,7 +1204,14 @@
 	}
 
 	if (approver->proxy != NULL) {
+<<<<<<< TREE
 		g_object_unref(approver->proxy);
+=======
+		if (!approver->destroy_by_proxy) {
+			g_signal_handler_disconnect_by_func(G_OBJECT(approver->proxy), G_CALLBACK(approver_destroyed), appstore);
+			g_object_unref(approver->proxy);
+		}
+>>>>>>> MERGE-SOURCE
 		approver->proxy = NULL;
 	}