Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
entrance_config.c entrance_session.c entrance_session.h main.c
Log Message:
ran indent, and a temp fix on saving out remembered users
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_config.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- entrance_config.c 3 Mar 2004 19:31:37 -0000 1.17
+++ entrance_config.c 3 Mar 2004 20:08:47 -0000 1.18
@@ -278,12 +278,15 @@
snprintf(file, PATH_MAX, "%s/entrance_config.db", PACKAGE_CFG_DIR);
if (!e->users.remember)
return;
+/* FIXME: I guess we can't free up old strings like this. */
+#if 0
if ((db = e_db_open(file)))
{
if ((old_keys = e_db_match_keys(db, "/entrance/user/", &count)))
{
for (i = 0; i < count; i++)
{
+ fprintf(stderr, "Nuking %s\n", old_keys[i]);
e_db_data_del(db, old_keys[i]);
free(old_keys[i]);
}
@@ -292,6 +295,7 @@
e_db_flush();
}
}
+#endif
if ((db = e_db_open(file)))
{
for (i = 0, l = e->users.keys; l && i < e->users.remember_n;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- entrance_session.c 3 Mar 2004 18:16:15 -0000 1.35
+++ entrance_session.c 3 Mar 2004 20:08:47 -0000 1.36
@@ -288,12 +288,11 @@
snprintf(buf, PATH_MAX, "%s %s", ENTRANCE_XSESSION, session_key);
}
else
- snprintf(buf, PATH_MAX, "%s", ENTRANCE_XSESSION);
- /* 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
- */
+ instead of passing the session name to Xsession */
if (_entrance_test_en)
snprintf(buf, PATH_MAX, "/usr/X11R6/bin/xterm");
@@ -349,8 +348,7 @@
/* replace this rpcoess with a clean small one that just waits for its */
/* child to exit.. passed on the cmd-line */
/* atmos : Could we just free up all of our memory usage at this point
- * instead of exec'ing this other tiny program ?
- */
+ instead of exec'ing this other tiny program ? */
snprintf(buf, sizeof(buf), "%s/entrance_login %i", PACKAGE_BIN_DIR,
(int) pid);
execl("/bin/sh", "/bin/sh", "-c", buf, NULL);
@@ -439,6 +437,7 @@
e->edje = obj;
}
}
+
/**
* entrance_session_list_add : fine the "EntranceSessionList" part in the
* main edje, setup the container to hold the elements, and create session
@@ -615,7 +614,7 @@
return (NULL);
edje = edje_object_add(evas_object_evas_get(e->edje));
- if (e->config->theme && e->config->theme[0] == '/')
+ if (e->config->theme && e->config->theme[0] == '/')
snprintf(buf, PATH_MAX, "%s", e->config->theme);
else
snprintf(buf, PATH_MAX, "%s/themes/%s", PACKAGE_DATA_DIR,
@@ -700,8 +699,10 @@
}
}
snprintf(buf, PATH_MAX, "default.eet");
- eu = entrance_user_new(e->auth->user, buf, e->session);
- e->config->users.keys = evas_list_prepend(e->config->users.keys, eu);
- entrance_config_user_list_write(e->config);
+ if ((eu = entrance_user_new(e->auth->user, buf, e->session)))
+ {
+ e->config->users.keys = evas_list_prepend(e->config->users.keys, eu);
+ entrance_config_user_list_write(e->config);
+ }
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- entrance_session.h 3 Mar 2004 18:16:15 -0000 1.14
+++ entrance_session.h 3 Mar 2004 20:08:47 -0000 1.15
@@ -24,14 +24,14 @@
*/
struct _Entrance_Session
{
- char *session; /* the current session in context */
+ char *session; /* the current session in context */
Ecore_Evas *ee; /* the ecore_evas */
Evas_Object *edje; /* the main theme edje */
Entrance_Auth *auth; /* encapsulated auth info */
Entrance_Config *config; /* configuration options */
- int authed; /* whether or not the user has authenticated
- * or not */
+ int authed; /* whether or not the user has authenticated
+ * or not */
};
typedef struct _Entrance_Session Entrance_Session;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/main.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- main.c 3 Mar 2004 18:16:15 -0000 1.37
+++ main.c 3 Mar 2004 20:08:47 -0000 1.38
@@ -725,7 +725,7 @@
evas_object_name_set(edje, "ui");
evas_object_layer_set(edje, 0);
entrance_session_edje_object_set(session, edje);
-
+
/* Setup the entries */
for (i = 0; i < entries_count; i++)
{
@@ -763,8 +763,7 @@
}
}
/* See if we have an EntranceTime part, setup a timer to automatically
- * update the Time
- */
+ update the Time */
if (edje_object_part_exists(edje, "EntranceTime"))
{
edje_object_signal_callback_add(edje, "Go", "EntranceTime", set_time,
@@ -773,8 +772,7 @@
timer = ecore_timer_add(0.5, timer_cb, edje);
}
/* See if we have an EntranceDate part, setup a timer if one isn't
- * already running to automatically update the Date
- */
+ already running to automatically update the Date */
if (edje_object_part_exists(edje, "EntranceDate"))
{
edje_object_signal_callback_add(edje, "Go", "EntranceDate", set_date,
@@ -784,23 +782,21 @@
timer = ecore_timer_add(0.5, timer_cb, edje);
}
/* See if we have an EntranceSession part, set it to the first element
- * in the config's session list */
+ in the config's session list */
if (edje_object_part_exists(edje, "EntranceSession"))
{
entrance_session_xsession_set(session,
entrance_session_default_xsession_get
(session));
}
- /* See if we have an EntranceSessionList part, tell the session to
- * load the session list if it exists.
- */
+ /* See if we have an EntranceSessionList part, tell the session to load
+ the session list if it exists. */
if (edje_object_part_exists(edje, "EntranceSessionList"))
{
entrance_session_list_add(session);
}
- /* See if we have an EntranceUserList part, tell the session to
- * load the user list if it exists.
- */
+ /* See if we have an EntranceUserList part, tell the session to load
+ the user list if it exists. */
if (edje_object_part_exists(edje, "EntranceUserList"))
{
entrance_session_user_list_add(session);
-------------------------------------------------------
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
