diff options
| author | Ted Gould <ted@gould.cx> | 2010-05-20 21:34:54 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-05-20 21:34:54 -0500 |
| commit | 9b028d987ece794583a67a332da437fc18cb0ce2 (patch) | |
| tree | 49d51e937b4c87861a26476813cf515efef2e38b /src | |
| parent | d005a22755a0dd3b9f752d66a0479272a09663ae (diff) | |
| parent | cd4c6e073fde9cdaa17e58bc1a54eca708d57ac7 (diff) | |
| download | ayatana-indicator-application-9b028d987ece794583a67a332da437fc18cb0ce2.tar.gz ayatana-indicator-application-9b028d987ece794583a67a332da437fc18cb0ce2.tar.bz2 ayatana-indicator-application-9b028d987ece794583a67a332da437fc18cb0ce2.zip | |
Import upstream version 0.0.20
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 15 | ||||
| -rw-r--r-- | src/Makefile.in | 9 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 6 |
3 files changed, 21 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index efae713..9f2771e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ -CLEANFILES = -DISTCLEANFILES = -BUILT_SOURCES = +CLEANFILES = +DISTCLEANFILES = +BUILT_SOURCES = EXTRA_DIST = libappindicator/appindicator-0.1.pc.in include $(top_srcdir)/Makefile.am.enum @@ -21,7 +21,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 @@ -48,7 +49,8 @@ indicator_application_service_SOURCES = \ notification-watcher-server.h indicator_application_service_CFLAGS = \ $(INDICATOR_CFLAGS) \ - -Wall -Werror + -Wall -Werror \ + -DG_LOG_DOMAIN=\"indicator-application-service\" indicator_application_service_LDADD = \ $(INDICATOR_LIBS) @@ -104,7 +106,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/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 |