Merge lp:~xapantu/lightdm-webkit-greeter/desktop-file into lp:~lightdm-team/lightdm-webkit-greeter/trunk

[xapantu]

Install a desktop file so the greeter can be used with lightdm. Without it, it seems that the greeter can't be launched.

(Made for elementaryos.)

=== modified file 'Makefile.am'
--- Makefile.am	2011-08-27 16:00:56 +0000
+++ Makefile.am	2012-01-11 17:54:26 +0000
@@ -21,3 +21,6 @@
 
 etcdir = /etc/lightdm/
 etc_DATA = lightdm-webkit-greeter.conf
+
+desktopdir = $(DESKTOP_DIR)
+desktop_DATA = lightdm-webkit-greeter.desktop

=== modified file 'configure.ac'
--- configure.ac	2011-09-11 12:19:49 +0000
+++ configure.ac	2012-01-11 17:54:26 +0000
@@ -47,6 +47,17 @@
 AC_SUBST(CONFIG_DIR)
 AC_DEFINE_UNQUOTED(CONFIG_DIR, "$CONFIG_DIR", Config Dir)
 
+DESKTOP_DIR="/usr/share/xgreeters/"
+AC_ARG_WITH(desktop-dir,
+            AS_HELP_STRING(--with-desktop-dir=<path>,
+                           Desktop directory of lightdm),
+    if test x$withval != x; then
+        DESKTOP_DIR="$withval"
+    fi
+)
+AC_SUBST(DESKTOP_DIR)
+AC_DEFINE_UNQUOTED(DESKTOP_DIR, "$DESKTOP_DIR", Desktop Dir)
+
 dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################

=== added file 'lightdm-webkit-greeter.desktop'
--- lightdm-webkit-greeter.desktop	1970-01-01 00:00:00 +0000
+++ lightdm-webkit-greeter.desktop	2012-01-11 17:54:26 +0000
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=WebKit Greeter
+Comment=WebKit Greeter
+Exec=lightdm-webkit-greeter
+Type=Application
+X-Ubuntu-Gettext-Domain=lightdm-webkit-greeter