aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am8
-rw-r--r--data/ayatana-indicator-keyboard.conf.in9
-rw-r--r--data/ayatana-indicator-keyboard.desktop.in8
-rw-r--r--data/icon-generator.vala (renamed from data/main.vala)0
-rw-r--r--data/indicator-keyboard.conf.in9
-rw-r--r--data/indicator-keyboard.desktop.in9
-rw-r--r--data/upstart/Makefile.am4
-rw-r--r--data/upstart/ayatana-indicator-keyboard.desktop.in (renamed from data/upstart/indicator-keyboard.desktop.in)4
8 files changed, 25 insertions, 26 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index bb9a1f82..6f33aeaf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,7 +13,7 @@ AM_VALAFLAGS = --enable-experimental-non-null \
--metadatadir $(top_srcdir)/deps \
--vapidir $(top_srcdir)/deps
-ayatana_indicator_keyboard_icon_generator_SOURCES = main.vala \
+ayatana_indicator_keyboard_icon_generator_SOURCES = icon-generator.vala \
$(top_srcdir)/lib/common.vala
ayatana_indicator_keyboard_icon_generator_VALAFLAGS = $(AM_VALAFLAGS) \
--pkg gee-1.0 \
@@ -68,7 +68,7 @@ indicatordir = $(INDICATOR_DIR)
org.ayatana.indicator.keyboard:
$(AM_V_GEN) (echo '[Indicator Service]'; \
- echo 'Name=indicator-keyboard'; \
+ echo 'Name=ayatana-indicator-keyboard'; \
echo 'ObjectPath=/org/ayatana/indicator/keyboard'; \
echo 'Position=80'; \
echo ''; \
@@ -101,6 +101,6 @@ gschemas.compiled: $(gsettings_SCHEMAS)
EXTRA_DIST = $(dist_service_DATA) \
$(dist_indicator_DATA) \
$(gsettings_SCHEMAS) \
- indicator-keyboard.conf.in \
- indicator-keyboard.desktop.in
+ ayatana-indicator-keyboard.conf.in \
+ ayatana-indicator-keyboard.desktop.in
diff --git a/data/ayatana-indicator-keyboard.conf.in b/data/ayatana-indicator-keyboard.conf.in
new file mode 100644
index 00000000..5083a485
--- /dev/null
+++ b/data/ayatana-indicator-keyboard.conf.in
@@ -0,0 +1,9 @@
+description "Ayatana Indicator Keyboard Backend"
+
+start on ayatana-indicator-services-start
+stop on desktop-end or ayatana-indicator-services-end
+
+respawn
+respawn limit 2 10
+
+exec @pkglibexecdir@/ayatana-indicator-keyboard-service --use-gtk
diff --git a/data/ayatana-indicator-keyboard.desktop.in b/data/ayatana-indicator-keyboard.desktop.in
new file mode 100644
index 00000000..b31bec51
--- /dev/null
+++ b/data/ayatana-indicator-keyboard.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Ayatana Indicator Keyboard
+Exec=@pkglibexecdir@/ayatana-indicator-keyboard-service
+OnlyShowIn=MATE;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
diff --git a/data/main.vala b/data/icon-generator.vala
index 8077f093..8077f093 100644
--- a/data/main.vala
+++ b/data/icon-generator.vala
diff --git a/data/indicator-keyboard.conf.in b/data/indicator-keyboard.conf.in
deleted file mode 100644
index 737a4830..00000000
--- a/data/indicator-keyboard.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-description "Indicator Keyboard Backend"
-
-start on indicator-services-start
-stop on desktop-end or indicator-services-end
-
-respawn
-respawn limit 2 10
-
-exec @pkglibexecdir@/indicator-keyboard-service --use-gtk
diff --git a/data/indicator-keyboard.desktop.in b/data/indicator-keyboard.desktop.in
deleted file mode 100644
index 3fca71fb..00000000
--- a/data/indicator-keyboard.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Keyboard
-Exec=@pkglibexecdir@/indicator-keyboard-service
-OnlyShowIn=Unity;GNOME;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
index c0b6a2eb..c762a603 100644
--- a/data/upstart/Makefile.am
+++ b/data/upstart/Makefile.am
@@ -3,10 +3,10 @@
###########################
xdg_autostartdir = $(datadir)/upstart/xdg/autostart
-xdg_autostart_DATA = indicator-keyboard.desktop
+xdg_autostart_DATA = ayatana-indicator-keyboard.desktop
%.desktop: %.desktop.in
$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-EXTRA_DIST = indicator-keyboard.desktop.in
+EXTRA_DIST = ayatana-indicator-keyboard.desktop.in
diff --git a/data/upstart/indicator-keyboard.desktop.in b/data/upstart/ayatana-indicator-keyboard.desktop.in
index ec7e565c..f20783be 100644
--- a/data/upstart/indicator-keyboard.desktop.in
+++ b/data/upstart/ayatana-indicator-keyboard.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
-Name=Indicator Keyboard
-Exec=@pkglibexecdir@/indicator-keyboard-service
+Name=Ayatana Indicator Keyboard
+Exec=@pkglibexecdir@/ayatana-indicator-keyboard-service
OnlyShowIn=Unity;
NoDisplay=true
StartupNotify=false