Merge branch 'master' of git+ssh://git.enlightenment.org/misc/entrance

.gitignore

@@ -1,5 +1,7 @@
 *.edj
 *.o
+*~
+compile
 INSTALL
 Makefile
 Makefile.in

configure.ac

@@ -49,10 +49,10 @@ AC_MSG_RESULT([${enable_pam}])
 AC_ARG_ENABLE([grub2],
    [AC_HELP_STRING([--disable-grub2], [disable grub2 support. @<:@default=enabled@:>@])],
    [
-    if test "x${disableval}" = "xyes" ; then
-       enable_grub2="no"
-    else
+    if test "x${enableval}" = "xyes" ; then
        enable_grub2="yes"
+    else
+       enable_grub2="no"
     fi
    ],
    [enable_grub2="yes"])
@@ -64,15 +64,15 @@ AC_MSG_RESULT([${enable_grub2}])
 AC_ARG_ENABLE([ekbd],
    [AC_HELP_STRING([--disable-ekbd], [disable virtual keyboard. @<:@default=enabled@:>@])],
    [
-    if test "x${disableval}" = "xyes" ; then
-       enable_ekbd="no"
-    else
+    if test "x${enableval}" = "xyes" ; then
        enable_ekbd="yes"
+    else
+       enable_ekbd="no"
     fi
    ],
    [enable_ekbd="yes"])
 AC_MSG_CHECKING([whether to support virtual keyboard features])
-AC_MSG_RESULT([${enable_grub2}])
+AC_MSG_RESULT([${enable_ekbd}])
 
 # consolekit
 AC_ARG_ENABLE([consolekit],
@@ -122,7 +122,7 @@ if test "x${enable_grub2}" = "xyes" ; then
 fi
 
 # Ekbd
-if test "x${enable_consolekit}" = "xyes" ; then
+if test "x${enable_ekbd}" = "xyes" ; then
    PKG_CHECK_MODULES([ENTRANCE_EKBD], [ekbd], [enable_ekbd="yes"], [enable_ekbd="no"])
 fi
 
@@ -189,7 +189,6 @@ data/Makefile
 data/themes/Makefile
 data/themes/beaumonts/Makefile
 data/themes/default/Makefile
-data/themes/fade/Makefile
 data/themes/old/Makefile
 ])
 

data/entrance

@@ -1,4 +1,7 @@
-auth	include		system-auth
-account	include		system-auth
-password	include		system-auth
-session	include		system-auth
+#%PAM-1.0
+
+auth        include     system-local-login
+-auth       optional    pam_gnome_keyring.so
+account     include     system-local-login
+session     include     system-local-login
+-session    optional    pam_gnome_keyring.so auto_start

data/entrance.conf

@@ -15,7 +15,7 @@ group "Entrance_Config" struct {
     /* Commands executed when starting a session */
     value "session_start" string: "/usr/bin/sessreg -a -l :0.0";
     /* Command executed when login. Warning xsession must be set to 0 */
-    value "session_login" string: "/bin/bash -login /etc/X11/xinit/xinitrc";
+    value "session_login" string: "/bin/bash -login $HOME/.xinitrc";
     /* Commands executed when exiting a session */
     value "session_stop" string: "/usr/bin/sessreg -d -l :0.0";
 

data/themes/default/default.edc

@@ -20,6 +20,7 @@ collections {
          part { name: "base";
             type: IMAGE;
             description { state: "default" 0.0;
+                 color: 50 80 140 255;
                image {
                   normal: "entrance_background.jpg";
                   scale_hint: STATIC;

src/daemon/Makefile.am

@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -DSYSTEM_CONFIG_DIR=\"$(sysconfdir)\" \
 -DPACKAGE_BIN_DIR=\"$(libdir)/$(PACKAGE)\" \
+-DPACKAGE_SBIN_DIR=\"$(sbindir)/\" \
 @ENTRANCE_CFLAGS@
 
 if HAVE_CONSOLEKIT

src/daemon/entrance.c

@@ -135,9 +135,10 @@ entrance_close_log()
 }
 
 static void
-_entrance_wait()
+_entrance_wait(void)
 {
-   execl(PACKAGE_BIN_DIR"/entrance_wait", "/usr/sbin/entrance", NULL);
+   // XXX: use eina_prefix! hardcoding paths . :(
+   execl(PACKAGE_BIN_DIR"/entrance_wait", PACKAGE_SBIN_DIR"/entrance", NULL);
    PT("HUM HUM HUM can't wait ...\n\n\n");
    _exit(1);
 }

src/daemon/entrance_history.c

@@ -128,7 +128,8 @@ entrance_history_push(const char *login, const char *session)
         if ((el = calloc(1, sizeof(Entrance_Login))))
           {
              el->login = eina_stringshare_add(login);
-             el->session = eina_stringshare_add(session);
+             if (session) el->session = eina_stringshare_add(session);
+             else el->session = NULL;
              _entrance_history->history =
                 eina_list_append(_entrance_history->history, el);
              _history_update = EINA_TRUE;

src/daemon/entrance_wait.c

@@ -63,7 +63,7 @@ main (int argc __UNUSED__, char **argv __UNUSED__)
      {
         if (WIFEXITED(status) && WEXITSTATUS(status))
           setenv("ENTRANCE_QUIT", "1", 1);
-        execlp("entrance", "entrance", "--nodaemon", NULL);
+        execlp(PACKAGE_SBIN_DIR"/entrance", PACKAGE_SBIN_DIR"/entrance", "--nodaemon", NULL);
      }
    return -1;
 }

src/event/entrance_event.c

@@ -140,7 +140,7 @@ _entrance_event_maxtries_dd()
    EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Entrance_Maxtries_Event);
    edd = eet_data_descriptor_stream_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Entrance_Maxtries_Event, "maxtries",
-                                 maxtries, EET_T_UCHAR);
+                                 maxtries, EET_T_INT);
    return edd;
 }
 
@@ -171,7 +171,7 @@ _entrance_event_status_dd()
    EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Entrance_Status_Event);
    edd = eet_data_descriptor_stream_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Entrance_Status_Event, "granted",
-                                 granted, EET_T_UCHAR);
+                                 granted, EET_T_INT);
    return edd;
 
 }

src/event/entrance_event.h

@@ -37,12 +37,12 @@ typedef struct Entrance_Auth_Event_
 
 typedef struct Entrance_Maxtries_Event_
 {
-   Eina_Bool maxtries;
+   int maxtries;
 } Entrance_Maxtries_Event;
 
 typedef struct Entrance_Status_Event_
 {
-   Eina_Bool granted;
+   int granted;
 } Entrance_Status_Event;
 
 typedef struct Entrance_Action_Event_