From 7210a540b4ad0936773a952bef297f9cf5af98bb Mon Sep 17 00:00:00 2001 From: Neil Jagdish Patel Date: Tue, 13 Apr 2010 12:59:51 +0100 Subject: Add G_LOG_DOMAIN support to the various targets for better messages modified: src/Makefile.am --- src/Makefile.am | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 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) -- cgit v1.2.3 From 6b3689e568db244bafd54961e907c0bc31543c8e Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Wed, 14 Apr 2010 11:07:23 -0500 Subject: Add AssemblyInfo.cs to the Mono bindings. --- bindings/mono/AssemblyInfo.cs | 30 ++++++++++++++++++++++++++++++ bindings/mono/Makefile.am | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 bindings/mono/AssemblyInfo.cs diff --git a/bindings/mono/AssemblyInfo.cs b/bindings/mono/AssemblyInfo.cs new file mode 100644 index 0000000..269981a --- /dev/null +++ b/bindings/mono/AssemblyInfo.cs @@ -0,0 +1,30 @@ +/* + * Copyright 2010 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * + * Authors: + * Cody Russell + */ + +using System.Reflection; + +[assembly: AssemblyTitle ("Application Indicators")] +[assembly: AssemblyDescription ("Ubuntu Application Indicators")] +[assembly: AssemblyConfiguration ("")] +[assembly: AssemblyCompany ("Canonical, Ltd.")] +[assembly: AssemblyProduct ("Ubuntu")] +[assembly: AssemblyCopyright ("© 2010 Canonical, Ltd.")] +[assembly: AssemblyTrademark ("")] +[assembly: AssemblyCulture ("")] +[assembly: AssemblyVersion ("0.1")] diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 455a23e..e573c9b 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -76,7 +76,7 @@ generated-stamp: $(API) $(build_customs) $(ASSEMBLY): generated-stamp @rm -f $(ASSEMBLY).mdb - $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) + $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs install-data-local: echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ -- cgit v1.2.3 From 8566afcd564d10cc11be09bba56e02b78df101e7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 May 2010 13:23:24 -0500 Subject: Changing it so the object gets unref'd --- src/libappindicator/app-indicator.c | 6 ++++++ 1 file changed, 6 insertions(+) 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 -- cgit v1.2.3 From cd4c6e073fde9cdaa17e58bc1a54eca708d57ac7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 21:16:58 -0500 Subject: 0.0.20 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c34bed2..dbb0b43 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.0.19, ted@canonical.com) +AC_INIT(indicator-application, 0.0.20, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.0.19) +AM_INIT_AUTOMAKE(indicator-application, 0.0.20) AM_MAINTAINER_MODE -- cgit v1.2.3