Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
entrance_session.c
Log Message:
fix session exec bug, thanks to tony murray for the heads up, ran indent, fix
incorrect pointer reassignment in entrance_session_free
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- entrance_session.c 25 Mar 2004 17:37:44 -0000 1.47
+++ entrance_session.c 5 Apr 2004 21:17:47 -0000 1.48
@@ -115,7 +115,7 @@
if (e->session)
{
free(e->session);
- e->config = NULL;
+ e->session = NULL;
}
closelog();
@@ -283,15 +283,15 @@
* @param e The current Entrance Session
*/
void
-entrance_session_setup_user_session(Entrance_Session *e)
+entrance_session_setup_user_session(Entrance_Session * e)
{
char *homedir;
-
+
entrance_auth_setup_environment(e->auth);
homedir = getenv("HOME");
if (entrance_ipc_connected_get())
- entrance_ipc_request_xauth(homedir, e->auth->pw->pw_uid,
- e->auth->pw->pw_gid);
+ entrance_ipc_request_xauth(homedir, e->auth->pw->pw_uid,
+ e->auth->pw->pw_gid);
else
/* No daemon available, assume no xauth */
ecore_main_loop_quit();
@@ -304,17 +304,18 @@
* @param e - the currently running session
*/
void
-entrance_session_start_user_session(Entrance_Session *e)
+entrance_session_start_user_session(Entrance_Session * e)
{
+ pid_t pid;
char buf[PATH_MAX];
char *session_key = NULL;
- pid_t pid;
+ Entrance_X_Session *exs = NULL;
entrance_auth_setup_environment(e->auth);
- if ((session_key =
- (char *) evas_hash_find(e->config->sessions.hash, e->session)))
+ if ((exs = evas_hash_find(e->config->sessions.hash, e->session)))
{
+ session_key = exs->session;
if (!strcmp(session_key, "default"))
snprintf(buf, PATH_MAX, "%s", ENTRANCE_XSESSION);
else
@@ -332,7 +333,7 @@
syslog(LOG_CRIT, "Executing %s", buf);
- if(e->ee)
+ if (e->ee)
{
ecore_evas_free(e->ee);
e->ee = NULL;
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
