diff options
| author | Ted Gould <ted@gould.cx> | 2010-05-20 21:38:31 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-05-20 21:38:31 -0500 |
| commit | 086d22cdcae4bc912276c234b10d366447c7e2dc (patch) | |
| tree | 59019c3847d73a8801f78982d927df0f566ea214 /src | |
| parent | bdec50530d6f2aeb3422fc2b6b155181e1712245 (diff) | |
| parent | 9b028d987ece794583a67a332da437fc18cb0ce2 (diff) | |
| download | libayatana-appindicator-086d22cdcae4bc912276c234b10d366447c7e2dc.tar.gz libayatana-appindicator-086d22cdcae4bc912276c234b10d366447c7e2dc.tar.bz2 libayatana-appindicator-086d22cdcae4bc912276c234b10d366447c7e2dc.zip | |
* New upstream release.
* Unref the child when created in libappindicator (LP: #569273)
* Merging patch to add assembly information to Mono
binding (LP: #547195)
* Remove child-leakage.patch as merged upstream
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 9 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index b8a80fc..e760360 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -368,7 +368,8 @@ libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \ -Wl,-Bsymbolic-functions \ -Wl,-z,defs \ -Wl,--as-needed \ - -Werror + -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Application\" libapplication_la_LIBADD = $(INDICATOR_LIBS) libapplication_la_LDFLAGS = -module -avoid-version @@ -390,7 +391,8 @@ indicator_application_service_SOURCES = \ indicator_application_service_CFLAGS = \ $(INDICATOR_CFLAGS) \ - -Wall -Werror + -Wall -Werror \ + -DG_LOG_DOMAIN=\"indicator-application-service\" indicator_application_service_LDADD = \ $(INDICATOR_LIBS) @@ -431,7 +433,8 @@ libappindicator_la_LDFLAGS = \ libappindicator_la_CFLAGS = \ $(INDICATOR_CFLAGS) \ - -Wall -Werror + -Wall -Werror \ + -DG_LOG_DOMAIN=\"libappindicator\" libappindicator_la_LIBADD = \ $(INDICATOR_LIBS) diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 132e279..f7e121b 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -1408,6 +1408,12 @@ container_iterate (GtkWidget *widget, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_menuitem), widget); dbusmenu_menuitem_child_append (root, child); + + /* Get rid of initial ref now that the root is + holding the object */ + g_object_unref(child); + + return; } static void |