From e917d3a28a238208ecf786cfda93dcd2893e3df2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 26 Oct 2017 23:19:26 +0200 Subject: Fork from Ubuntu's Indicator Messages. --- data/Makefile.am | 14 +++++++------- data/ayatana-indicator-messages.conf.in | 9 +++++++++ data/ayatana-indicator-messages.desktop.in | 8 ++++++++ data/com.canonical.indicator.messages | 19 ------------------- data/com.canonical.indicator.messages.gschema.xml | 12 ------------ data/indicator-messages.conf.in | 10 ---------- data/indicator-messages.desktop.in | 8 -------- data/org.ayatana.indicator.messages | 18 ++++++++++++++++++ data/org.ayatana.indicator.messages.gschema.xml | 12 ++++++++++++ data/upstart/Makefile.am | 12 ------------ data/upstart/indicator-messages.desktop.in | 8 -------- 11 files changed, 54 insertions(+), 76 deletions(-) create mode 100644 data/ayatana-indicator-messages.conf.in create mode 100644 data/ayatana-indicator-messages.desktop.in delete mode 100644 data/com.canonical.indicator.messages delete mode 100644 data/com.canonical.indicator.messages.gschema.xml delete mode 100644 data/indicator-messages.conf.in delete mode 100644 data/indicator-messages.desktop.in create mode 100644 data/org.ayatana.indicator.messages create mode 100644 data/org.ayatana.indicator.messages.gschema.xml delete mode 100644 data/upstart/Makefile.am delete mode 100644 data/upstart/indicator-messages.desktop.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index b991686..60dd839 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,26 +1,26 @@ -SUBDIRS = icons upstart +SUBDIRS = icons xdg_autostartdir = /etc/xdg/autostart -xdg_autostart_DATA = indicator-messages.desktop +xdg_autostart_DATA = ayatana-indicator-messages.desktop %.desktop: %.desktop.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ upstart_jobsdir = $(datadir)/upstart/sessions/ -upstart_jobs_DATA = indicator-messages.conf +upstart_jobs_DATA = ayatana-indicator-messages.conf %.conf: %.conf.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ -gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml +gsettings_SCHEMAS = org.ayatana.indicator.messages.gschema.xml @GSETTINGS_RULES@ indicatordir = $(INDICATOR_DIR) -dist_indicator_DATA = com.canonical.indicator.messages +dist_indicator_DATA = org.ayatana.indicator.messages EXTRA_DIST = \ - indicator-messages.desktop.in \ - indicator-messages.conf.in \ + ayatana-indicator-messages.desktop.in \ + ayatana-indicator-messages.conf.in \ $(gsettings_SCHEMAS) CLEANFILES = \ diff --git a/data/ayatana-indicator-messages.conf.in b/data/ayatana-indicator-messages.conf.in new file mode 100644 index 0000000..109d383 --- /dev/null +++ b/data/ayatana-indicator-messages.conf.in @@ -0,0 +1,9 @@ +description "Ayatana Indicator Messages Service" + +start on ayatana-indicator-services-start +stop on desktop-end or ayatana-indicator-services-end + +respawn +respawn limit 2 10 + +exec @pkglibexecdir@/ayatana-indicator-messages-service diff --git a/data/ayatana-indicator-messages.desktop.in b/data/ayatana-indicator-messages.desktop.in new file mode 100644 index 0000000..4434769 --- /dev/null +++ b/data/ayatana-indicator-messages.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Indicator Messages +Exec=@pkglibexecdir@/ayatana-indicator-messages-service +NoDisplay=true +StartupNotify=false +Terminal=false +OnlyShowIn=Unity;MATE; diff --git a/data/com.canonical.indicator.messages b/data/com.canonical.indicator.messages deleted file mode 100644 index 572a4a7..0000000 --- a/data/com.canonical.indicator.messages +++ /dev/null @@ -1,19 +0,0 @@ -[Indicator Service] -Name=indicator-messages -ObjectPath=/com/canonical/indicator/messages -Position=50 - -[desktop] -ObjectPath=/com/canonical/indicator/messages/desktop - -[desktop_greeter] -ObjectPath=/com/canonical/indicator/messages/desktop_greeter - -[phone] -ObjectPath=/com/canonical/indicator/messages/phone -Position=100 - -[phone_greeter] -ObjectPath=/com/canonical/indicator/messages/phone_greeter -Position=100 - diff --git a/data/com.canonical.indicator.messages.gschema.xml b/data/com.canonical.indicator.messages.gschema.xml deleted file mode 100644 index d9165cd..0000000 --- a/data/com.canonical.indicator.messages.gschema.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - List of applications that are shown in the messaging menu - - Applications corresponding to the desktop file ids in this list are shown in the messaging menu. - - [] - - - - diff --git a/data/indicator-messages.conf.in b/data/indicator-messages.conf.in deleted file mode 100644 index b300a57..0000000 --- a/data/indicator-messages.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -description "Indicator Messages Service" - -start on indicator-services-start -stop on desktop-end or indicator-services-end - -respawn -respawn limit 2 10 - -exec @pkglibexecdir@/indicator-messages-service - diff --git a/data/indicator-messages.desktop.in b/data/indicator-messages.desktop.in deleted file mode 100644 index 79c6a43..0000000 --- a/data/indicator-messages.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Messages -Exec=@pkglibexecdir@/indicator-messages-service -StartupNotify=false -Terminal=false -OnlyShowIn=Unity;GNOME; -AutostartCondition=GNOME3 unless-session gnome diff --git a/data/org.ayatana.indicator.messages b/data/org.ayatana.indicator.messages new file mode 100644 index 0000000..23d6089 --- /dev/null +++ b/data/org.ayatana.indicator.messages @@ -0,0 +1,18 @@ +[Indicator Service] +Name=indicator-messages +ObjectPath=/org/ayatana/indicator/messages +Position=50 + +[desktop] +ObjectPath=/org/ayatana/indicator/messages/desktop + +[desktop_greeter] +ObjectPath=/org/ayatana/indicator/messages/desktop_greeter + +[phone] +ObjectPath=/org/ayatana/indicator/messages/phone +Position=100 + +[phone_greeter] +ObjectPath=/org/ayatana/indicator/messages/phone_greeter +Position=100 diff --git a/data/org.ayatana.indicator.messages.gschema.xml b/data/org.ayatana.indicator.messages.gschema.xml new file mode 100644 index 0000000..ea0f077 --- /dev/null +++ b/data/org.ayatana.indicator.messages.gschema.xml @@ -0,0 +1,12 @@ + + + + List of applications that are shown in the messaging menu + + Applications corresponding to the desktop file ids in this list are shown in the messaging menu. + + [] + + + + diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am deleted file mode 100644 index c182438..0000000 --- a/data/upstart/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -xdg_autostartdir = $(datadir)/upstart/xdg/autostart -xdg_autostart_DATA = indicator-messages.desktop - -%.desktop: %.desktop.in - $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ - -EXTRA_DIST = \ - indicator-messages.desktop.in - -CLEANFILES = \ - $(xdg_autostart_DATA) diff --git a/data/upstart/indicator-messages.desktop.in b/data/upstart/indicator-messages.desktop.in deleted file mode 100644 index dd0b1d6..0000000 --- a/data/upstart/indicator-messages.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Messages -Exec=@pkglibexecdir@/indicator-messages-service -StartupNotify=false -Terminal=false -OnlyShowIn=Unity; -Hidden=true -- cgit v1.2.3