Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
entrance_auth.c entrance_session.c
Log Message:
o fix loading sessions other than default, this has been broken for quite
some time
o apply Sebastian Dransfeld's clearenv one-liner, ibukun it seems good to go
here, revert it if you have issues
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_auth.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- entrance_auth.c 24 Jun 2004 01:06:53 -0000 1.17
+++ entrance_auth.c 4 Dec 2004 03:13:55 -0000 1.18
@@ -317,6 +317,7 @@
if (!e || !e->pw)
return;
+ clearenv();
e->env = environ;
setenv("XAUTHORITY", buf, 1);
setenv("TERM", "vt100", 0); // TERM=linux?
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- entrance_session.c 2 Nov 2004 05:54:37 -0000 1.57
+++ entrance_session.c 4 Dec 2004 03:13:55 -0000 1.58
@@ -198,11 +198,6 @@
entrance_auth_free(e->auth);
e->auth = entrance_auth_new();
edje_object_signal_emit(e->edje, "In", "EntranceUserEntry");
- /* FIXME: we shouldn't emit UserAuthFail here, but it gets us back to
- the beginning */
- /* Any code that calls user_reset will also need to send the appropriate
signal
- to the edje - we're sending multiple signals and this can cause
mayhem. */
-/* edje_object_signal_emit(e->edje, "EntranceUserFail", ""); */
}
}
@@ -346,23 +341,21 @@
{
pid_t pid;
char buf[PATH_MAX];
- char *session_key = NULL;
char *shell = NULL;
- Entrance_X_Session *exs = NULL;
entrance_auth_setup_environment(e->auth);
-
- if ((exs = evas_hash_find(e->config->sessions.hash, e->session)))
+
+ if ((e->session) && (strlen(e->session) > 0))
{
- session_key = exs->session;
- if (!strcmp(session_key, "default"))
+ if (!strcmp(e->session, "default"))
snprintf(buf, PATH_MAX, "%s", ENTRANCE_XSESSION);
else
- snprintf(buf, PATH_MAX, "%s %s", ENTRANCE_XSESSION, session_key);
- }
- else
+ snprintf(buf, PATH_MAX, "%s %s", ENTRANCE_XSESSION, e->session);
+ }
+ else {
+ /* Default session */
snprintf(buf, PATH_MAX, "%s", ENTRANCE_XSESSION);
- /* Default session */
+ }
/* If an absolute path was specified for the session, use that path
instead of passing the session name to Xsession */
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
