diff options
| author | Allan LeSage <allan.lesage@canonical.com> | 2013-11-21 10:37:31 -0600 |
|---|---|---|
| committer | Allan LeSage <allan.lesage@canonical.com> | 2013-11-21 10:37:31 -0600 |
| commit | bf2aab363e93263b1615f1811524fb22b14bf34b (patch) | |
| tree | 406500af69bd6555eb4e4dc63e3711bd341bb6b4 /data | |
| parent | f10353bc4208a48339cdc1e0656361b16636a3e2 (diff) | |
| parent | f90c7c21d0e82779356eaa8ae471703cda45d7cc (diff) | |
| download | ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.tar.gz ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.tar.bz2 ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.zip | |
Merge trunk, resolving Makefile conflict.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 9f9b46ff..29ad3e7a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -48,8 +48,15 @@ com.canonical.indicator.keyboard: $(AM_V_GEN) (echo '[Indicator Service]'; \ echo 'Name=indicator-keyboard'; \ echo 'ObjectPath=/com/canonical/indicator/keyboard'; \ + echo 'Position=80'; \ echo ''; \ echo '[desktop]'; \ + echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop'; \ + echo ''; \ + echo '[desktop_greeter]'; \ + echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop'; \ + echo ''; \ + echo '[ubiquity]'; \ echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop') > $@.tmp && \ mv $@.tmp $@ |