aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-04-11 12:21:52 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-04-11 12:21:52 -0500
commitcb8844b6eea5985ab1f04ed84568fb3cbbdb0c9a (patch)
treedae9956648b70bdb3e5df063c4dcc73bac05c8b2 /src
parent63e76db59850f64c5ef1f5e766258e4c7583e9bd (diff)
parentab3fc0e2f5b8c730e0694f1bf07a0709867a5683 (diff)
downloadayatana-indicator-application-cb8844b6eea5985ab1f04ed84568fb3cbbdb0c9a.tar.gz
ayatana-indicator-application-cb8844b6eea5985ab1f04ed84568fb3cbbdb0c9a.tar.bz2
ayatana-indicator-application-cb8844b6eea5985ab1f04ed84568fb3cbbdb0c9a.zip
Import upstream version 0.5.0
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in7
-rw-r--r--src/indicator-application.c1
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 310a47c..e2fcae6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,8 +56,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
libexec_PROGRAMS = indicator-application-service$(EXEEXT)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/m4/gcov.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(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)/m4/gcov.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff --git a/src/indicator-application.c b/src/indicator-application.c
index a1f547e..321d3d7 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -503,6 +503,7 @@ application_added (IndicatorApplication * application, const gchar * iconname, g
ApplicationEntry * app = g_new0(ApplicationEntry, 1);
+ app->entry.parent_object = INDICATOR_OBJECT(application);
app->old_service = FALSE;
app->icon_theme_path = NULL;
if (icon_theme_path != NULL && icon_theme_path[0] != '\0') {