Merge lp:~bregma/indicator-appmenu/lp-1231218 into lp:indicator-appmenu/13.10

[Stephen M. Webb]

don't add a circular self-ref in IndicatorAppmenu objects (lp: #1231218)

Removes a circular self-reference that prevents IndicatorAppmenu objects from getting disposed. Fixes a memory leak in unity-panel-service.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/indicator-appmenu-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-saucy-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-saucy-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-appmenu-ci/5/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Completely right.

review: Approve

=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c	2012-11-20 23:40:35 +0000
+++ src/indicator-appmenu.c	2013-09-26 02:01:38 +0000
@@ -1,7 +1,7 @@
 /*
 An implementation of indicator object showing menus from applications.
 
-Copyright 2010 Canonical Ltd.
+Copyright 2010-2013 Canonical Ltd.
 
 Authors:
     Ted Gould <[e-mail]>
@@ -322,8 +322,8 @@
 	                                 iapp->dbus_registration == 0 ? on_bus_acquired : NULL,
 	                                 on_name_acquired,
 	                                 on_name_lost,
-	                                 g_object_ref(iapp),
-	                                 g_object_unref);
+	                                 iapp,
+	                                 NULL);
 
 	return TRUE;
 }