Merge with trunk

5 files changed, 75 insertions, 3 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index b5601b94..f7f73af9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,6 +12,9 @@ dist_pam_DATA = pam/lightdm \
                 pam/lightdm-autologin \
                 pam/lightdm-greeter
 
+completionsdir = $(datadir)/bash-completion/completions
+dist_completions_DATA = bash-completion/dm-tool bash-completion/lightdm
+
 lightdm-guest-session: $(srcdir)/apparmor/lightdm-guest-session.in
 	sed -e 's|@libexecdir[@]|$(libexecdir)|g' $< >$@
 
diff --git a/data/bash-completion/dm-tool b/data/bash-completion/dm-tool
new file mode 100644
index 00000000..15503959
--- /dev/null
+++ b/data/bash-completion/dm-tool
@@ -0,0 +1,51 @@
+#-*- mode: shell-script;-*-
+
+_dm_tool()
+{
+    local cur prev opts
+    _init_completion || return
+    opts='switch-to-greeter switch-to-user switch-to-guest lock list-seats add-nested-seat add-local-x-seat add-seat'
+
+    case "$prev" in
+    switch-to-greeter)
+        return 0
+        ;;
+    switch-to-user)
+        COMPREPLY=($(compgen -u -- "${cur}"))
+        return 0
+        ;;
+    switch-to-guest)
+        # FIXME: session name
+        return 0
+        ;;
+    lock)
+        return 0
+        ;;
+    list-seats)
+        return 0
+        ;;
+    add-nested-seat)
+        # FIXME ...
+        return 0
+        ;;
+    add-local-x-seat)
+        # FIXME ...
+        return 0
+        ;;
+    add-seat)
+        # FIXME ...
+        return 0
+        ;;
+    *)
+        ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
+        return 0
+    fi
+
+    COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
+    return 0
+}
+complete -F _dm_tool dm-tool
diff --git a/data/bash-completion/lightdm b/data/bash-completion/lightdm
new file mode 100644
index 00000000..759b0b8b
--- /dev/null
+++ b/data/bash-completion/lightdm
@@ -0,0 +1,13 @@
+#-*- mode: shell-script;-*-
+
+_lightdm()
+{
+    local cur prev opts
+    _init_completion || return
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
+        return 0
+    fi
+}
+complete -F _lightdm lightdm
diff --git a/data/dm-tool.1 b/data/dm-tool.1
index 1637f313..d8aa8bdf 100644
--- a/data/dm-tool.1
+++ b/data/dm-tool.1
@@ -44,7 +44,7 @@ If the session option is provided then this session type will be used, otherwise
 .TP
 .B lock
 Lock the current seat.
-This will swith to a greeter with a hint that the screen is locked.
+This will switch to a greeter with a hint that the screen is locked.
 You can return to this session by authenticating in the greeter.
 .TP
 .B list-seats
diff --git a/data/lightdm.conf b/data/lightdm.conf
index 4f010a5a..5c4b5988 100644
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -35,11 +35,15 @@
 #
 # Seat defaults
 #
+# PLEASE NOTE: [SeatDefaults] section is deprecated and won't be supported in the future.
+#              Users are encouraged to update their lightdm.conf files, using [Seat:*] instead.
+#
 # type = Seat type (xlocal, xremote)
 # pam-service = PAM service to use for login
 # pam-autologin-service = PAM service to use for autologin
 # pam-greeter-service = PAM service to use for greeters
 # xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
+# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
 # xserver-layout = Layout to pass to X server
 # xserver-config = Config file to pass to X server
 # xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
@@ -75,12 +79,13 @@
 # autologin-in-background = True if autologin session should not be immediately activated
 # exit-on-failure = True if the daemon should exit if this seat fails
 #
-[SeatDefaults]
+[Seat:*]
 #type=xlocal
 #pam-service=lightdm
 #pam-autologin-service=lightdm-autologin
 #pam-greeter-service=lightdm-greeter
 #xserver-command=X
+#xmir-command=Xmir
 #xserver-layout=
 #xserver-config=
 #xserver-allow-tcp=false
@@ -120,7 +125,7 @@
 # Seat configuration
 #
 # Each seat must start with "Seat:".
-# Uses settings from [SeatDefaults], any of these can be overriden by setting them in this section.
+# Uses settings from [Seat:*], any of these can be overriden by setting them in this section.
 #
 #[Seat:0]