From 13e1544b396a5212e82b940e420a1cd44d8aa24b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 11 Nov 2015 05:58:50 +0100 Subject: Fork from Ubuntu's indicator-application code project. --- data/Makefile.am | 12 ++++++------ data/ayatana-indicator-application.conf.in | 22 ++++++++++++++++++++++ data/ayatana-indicator-application.desktop.in | 8 ++++++++ data/indicator-application.conf.in | 22 ---------------------- data/indicator-application.desktop.in | 8 -------- data/upstart/Makefile.am | 4 ++-- .../ayatana-indicator-application.desktop.in | 8 ++++++++ data/upstart/indicator-application.desktop.in | 8 -------- 8 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 data/ayatana-indicator-application.conf.in create mode 100644 data/ayatana-indicator-application.desktop.in delete mode 100644 data/indicator-application.conf.in delete mode 100644 data/indicator-application.desktop.in create mode 100644 data/upstart/ayatana-indicator-application.desktop.in delete mode 100644 data/upstart/indicator-application.desktop.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index b26a669..bc5260d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,13 +2,13 @@ SUBDIRS = upstart upstart_jobsdir = $(datadir)/upstart/sessions/ -upstart_jobs_DATA = indicator-application.conf +upstart_jobs_DATA = ayatana-indicator-application.conf %.conf: %.conf.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ xdg_autostartdir = /etc/xdg/autostart -xdg_autostart_DATA = indicator-application.desktop +xdg_autostart_DATA = ayatana-indicator-application.desktop %.desktop: %.desktop.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @@ -17,11 +17,11 @@ overridedir = $(pkgdatadir) override_DATA = ordering-override.keyfile EXTRA_DIST = \ - indicator-application.desktop.in \ - indicator-application.conf.in \ + ayatana-indicator-application.desktop.in \ + ayatana-indicator-application.conf.in \ ordering-override.keyfile CLEANFILES = \ - indicator-application.conf \ - indicator-application.desktop + ayatana-indicator-application.conf \ + ayatana-indicator-application.desktop diff --git a/data/ayatana-indicator-application.conf.in b/data/ayatana-indicator-application.conf.in new file mode 100644 index 0000000..07a7d05 --- /dev/null +++ b/data/ayatana-indicator-application.conf.in @@ -0,0 +1,22 @@ +description "Indicator Application Service" + +start on indicator-services-start +stop on desktop-end or indicator-services-end + +emits appindicators-start appindicators-end + +respawn +respawn limit 2 10 + +pre-start script + # NOTE: Limiting only to Unity 7 right now as it's still using + # dbusmenu. That can be lifted after it is ported to GMenu + + if [ "x$DESKTOP_SESSION" = "xubuntu-touch" ] ; then + stop; exit 0 + fi +end script + +exec @pkglibexecdir@/indicator-application-service + +pre-stop exec initctl emit appindicators-end diff --git a/data/ayatana-indicator-application.desktop.in b/data/ayatana-indicator-application.desktop.in new file mode 100644 index 0000000..4f5bf98 --- /dev/null +++ b/data/ayatana-indicator-application.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Indicator Application +Exec=@pkglibexecdir@/indicator-application-service +StartupNotify=false +Terminal=false +OnlyShowIn=Unity;GNOME; +AutostartCondition=GNOME3 unless-session gnome diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in deleted file mode 100644 index 07a7d05..0000000 --- a/data/indicator-application.conf.in +++ /dev/null @@ -1,22 +0,0 @@ -description "Indicator Application Service" - -start on indicator-services-start -stop on desktop-end or indicator-services-end - -emits appindicators-start appindicators-end - -respawn -respawn limit 2 10 - -pre-start script - # NOTE: Limiting only to Unity 7 right now as it's still using - # dbusmenu. That can be lifted after it is ported to GMenu - - if [ "x$DESKTOP_SESSION" = "xubuntu-touch" ] ; then - stop; exit 0 - fi -end script - -exec @pkglibexecdir@/indicator-application-service - -pre-stop exec initctl emit appindicators-end diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in deleted file mode 100644 index 4f5bf98..0000000 --- a/data/indicator-application.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Application -Exec=@pkglibexecdir@/indicator-application-service -StartupNotify=false -Terminal=false -OnlyShowIn=Unity;GNOME; -AutostartCondition=GNOME3 unless-session gnome diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am index f7bc09e..6866ed0 100644 --- a/data/upstart/Makefile.am +++ b/data/upstart/Makefile.am @@ -1,9 +1,9 @@ xdg_autostartdir = $(pkgdatadir)/upstart/xdg/autostart -xdg_autostart_DATA = indicator-application.desktop +xdg_autostart_DATA = ayatana-indicator-application.desktop %.desktop: %.desktop.in sed -e "s|\@libexecdir\@|$(pkglibexecdir)|" $< > $@ EXTRA_DIST = \ - indicator-application.desktop.in + ayatana-indicator-application.desktop.in diff --git a/data/upstart/ayatana-indicator-application.desktop.in b/data/upstart/ayatana-indicator-application.desktop.in new file mode 100644 index 0000000..f4c6c27 --- /dev/null +++ b/data/upstart/ayatana-indicator-application.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Indicator Application +Exec=@pkglibexecdir@/indicator-application-service +StartupNotify=false +Terminal=false +OnlyShowIn=Unity; +Hidden=true diff --git a/data/upstart/indicator-application.desktop.in b/data/upstart/indicator-application.desktop.in deleted file mode 100644 index f4c6c27..0000000 --- a/data/upstart/indicator-application.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Application -Exec=@pkglibexecdir@/indicator-application-service -StartupNotify=false -Terminal=false -OnlyShowIn=Unity; -Hidden=true -- cgit v1.2.3