diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2012-04-11 13:35:02 -0400 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2012-04-11 13:35:02 -0400 |
commit | 486e1b390867a5e022e008712bbb87031a4f627a (patch) | |
tree | 1d15a560a745bdec4b36291a6440059c3e22fee2 /src | |
parent | 5a7ebb976b8613886fa179c2f9d0230eb666e70f (diff) | |
parent | 7201938d0639b2984beec7b2e1a0b1f48011796c (diff) | |
download | ayatana-indicator-application-486e1b390867a5e022e008712bbb87031a4f627a.tar.gz ayatana-indicator-application-486e1b390867a5e022e008712bbb87031a4f627a.tar.bz2 ayatana-indicator-application-486e1b390867a5e022e008712bbb87031a4f627a.zip |
* New upstream release.
* Improved gcov rules in our Automake files.
* Fix parent pointer object for unity-panel-service.
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.in | 7 | ||||
-rw-r--r-- | src/indicator-application.c | 1 |
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') { |