aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.in64
-rw-r--r--src/app-indicator-enum-types.c2
-rw-r--r--src/app-indicator-enum-types.c.in2
-rw-r--r--src/app-indicator-enum-types.h2
-rw-r--r--src/app-indicator-enum-types.h.in2
-rw-r--r--src/app-indicator.c13
7 files changed, 74 insertions, 13 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a4bd27a..a267f1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,12 +68,14 @@ libappindicator_la_SOURCES = \
gen-notification-watcher.xml.c
libappindicator_la_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
-version-info 1:0:0 \
-no-undefined \
-export-symbols-regex "^[^_d].*"
libappindicator_la_CFLAGS = \
$(LIBRARY_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
-Wall -Werror \
-DG_LOG_DOMAIN=\"libappindicator\"
diff --git a/src/Makefile.in b/src/Makefile.in
index 35d5c87..f73e071 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -51,6 +51,23 @@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -87,7 +104,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/gcov.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -190,6 +208,11 @@ am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(libappindicator_la_SOURCES) $(libappindicator3_la_SOURCES)
DIST_SOURCES = $(libappindicator_la_SOURCES) \
$(libappindicator3_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DATA = $(gir_DATA) $(pkgconfig_DATA) $(typelib_DATA)
HEADERS = $(libappindicator3include_HEADERS) \
$(libappindicatorinclude_HEADERS)
@@ -210,6 +233,9 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
+COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSC = @CSC@
@@ -231,7 +257,9 @@ GAPI_CODEGEN = @GAPI_CODEGEN@
GAPI_FIXUP = @GAPI_FIXUP@
GAPI_LIBS = @GAPI_LIBS@
GAPI_PARSER = @GAPI_PARSER@
+GCOVR = @GCOVR@
GENERATED_SOURCES = @GENERATED_SOURCES@
+GENHTML = @GENHTML@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
GLIB_MKENUMS = @GLIB_MKENUMS@
GREP = @GREP@
@@ -256,6 +284,7 @@ INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -308,6 +337,7 @@ RUNTIME = @RUNTIME@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHTOOL = @SHTOOL@
STRIP = @STRIP@
TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@
TESTDEPS_LIBS = @TESTDEPS_LIBS@
@@ -433,12 +463,14 @@ libappindicator_la_SOURCES = \
gen-notification-watcher.xml.c
libappindicator_la_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
-version-info 1:0:0 \
-no-undefined \
-export-symbols-regex "^[^_d].*"
libappindicator_la_CFLAGS = \
$(LIBRARY_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
-Wall -Werror \
-DG_LOG_DOMAIN=\"libappindicator\"
@@ -539,7 +571,6 @@ appindicator3-0.1.pc: $(top_builddir)/config.status $(srcdir)/appindicator3-0.1.
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -547,6 +578,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
}
@@ -704,8 +737,11 @@ clean-libtool:
-rm -rf .libs _libs
install-girDATA: $(gir_DATA)
@$(NORMAL_INSTALL)
- test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -722,8 +758,11 @@ uninstall-girDATA:
dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -740,8 +779,11 @@ uninstall-pkgconfigDATA:
dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
install-typelibDATA: $(typelib_DATA)
@$(NORMAL_INSTALL)
- test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)"
@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -758,8 +800,11 @@ uninstall-typelibDATA:
dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir)
install-libappindicator3includeHEADERS: $(libappindicator3include_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(libappindicator3includedir)" || $(MKDIR_P) "$(DESTDIR)$(libappindicator3includedir)"
@list='$(libappindicator3include_HEADERS)'; test -n "$(libappindicator3includedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libappindicator3includedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libappindicator3includedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -776,8 +821,11 @@ uninstall-libappindicator3includeHEADERS:
dir='$(DESTDIR)$(libappindicator3includedir)'; $(am__uninstall_files_from_dir)
install-libappindicatorincludeHEADERS: $(libappindicatorinclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(libappindicatorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libappindicatorincludedir)"
@list='$(libappindicatorinclude_HEADERS)'; test -n "$(libappindicatorincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libappindicatorincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libappindicatorincludedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff --git a/src/app-indicator-enum-types.c b/src/app-indicator-enum-types.c
index 82042b6..cdc3392 100644
--- a/src/app-indicator-enum-types.c
+++ b/src/app-indicator-enum-types.c
@@ -31,7 +31,7 @@ License version 3 and version 2.1 along with this program. If not, see
#include "app-indicator-enum-types.h"
-#include "./app-indicator.h"
+#include "app-indicator.h"
/**
app_indicator_category_get_type:
diff --git a/src/app-indicator-enum-types.c.in b/src/app-indicator-enum-types.c.in
index e200396..26276dc 100644
--- a/src/app-indicator-enum-types.c.in
+++ b/src/app-indicator-enum-types.c.in
@@ -32,7 +32,7 @@ License version 3 and version 2.1 along with this program. If not, see
/*** END file-header ***/
/*** BEGIN file-production ***/
-#include "@filename@"
+#include "@basename@"
/*** END file-production ***/
/*** BEGIN value-header ***/
diff --git a/src/app-indicator-enum-types.h b/src/app-indicator-enum-types.h
index 48b596b..06bb392 100644
--- a/src/app-indicator-enum-types.h
+++ b/src/app-indicator-enum-types.h
@@ -36,7 +36,7 @@ License version 3 and version 2.1 along with this program. If not, see
G_BEGIN_DECLS
-/* Enumerations from file: "./app-indicator.h" */
+/* Enumerations from file: "app-indicator.h" */
GType app_indicator_category_get_type (void) G_GNUC_CONST;
#define APP_INDICATOR_TYPE_INDICATOR_CATEGORY (app_indicator_category_get_type())
diff --git a/src/app-indicator-enum-types.h.in b/src/app-indicator-enum-types.h.in
index a055d71..33e501f 100644
--- a/src/app-indicator-enum-types.h.in
+++ b/src/app-indicator-enum-types.h.in
@@ -44,7 +44,7 @@ G_END_DECLS
/*** END file-tail ***/
/*** BEGIN file-production ***/
-/* Enumerations from file: "@filename@" */
+/* Enumerations from file: "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 0d6450c..2e98b48 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -1123,7 +1123,18 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar *
} else if (g_strcmp0(property, "AttentionIconName") == 0) {
return g_variant_new_string(priv->attention_icon_name ? priv->attention_icon_name : "");
} else if (g_strcmp0(property, "Title") == 0) {
- return g_variant_new_string(priv->title ? priv->title : "");
+ const gchar * output = NULL;
+ if (priv->title == NULL) {
+ const gchar * name = g_get_application_name();
+ if (name != NULL) {
+ output = name;
+ } else {
+ output = "";
+ }
+ } else {
+ output = priv->title;
+ }
+ return g_variant_new_string(output);
} else if (g_strcmp0(property, "IconThemePath") == 0) {
return g_variant_new_string(priv->icon_theme_path ? priv->icon_theme_path : "");
} else if (g_strcmp0(property, "Menu") == 0) {