Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
entrance_config.c entrance_config.h entrance_session.c
Log Message:
* Make Xsession path a configurable option.
* Fix compile warning.
===================================================================
RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_config.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- entrance_config.c 12 May 2006 22:21:35 -0000 1.32
+++ entrance_config.c 3 Jun 2006 07:24:49 -0000 1.33
@@ -58,6 +58,8 @@
ecore_config_string_default("/entrance/session/0/title", "Default");
ecore_config_string_default("/entrance/session/0/icon", "default.png");
+ ecore_config_string_default("/entrance/xsession", ENTRANCE_XSESSION);
+
ecore_config_int_default("/entrance/auth", 1);
}
@@ -104,6 +106,7 @@
e->reboot = ecore_config_int_get("/entrance/system/reboot");
e->halt = ecore_config_int_get("/entrance/system/halt");
+ e->xsession = ecore_config_string_get("/entrance/xsession");
num_user = ecore_config_int_get("/entrance/user/count");
for (i = 0; i < num_user; i++)
@@ -217,7 +220,8 @@
Evas_List *l = NULL;
char *strings[] = { "/entrance/theme",
"/entrance/pointer", "/entrance/date_format", "/entrance/time_format",
- "/entrance/greeting/before", "/entrance/greeting/after"
+ "/entrance/greeting/before", "/entrance/greeting/after",
+ "/entrance/xsession"
};
char *values[] = { e->theme, e->pointer, e->date.string,
e->time.string, e->before.string, e->after.string
@@ -286,7 +290,8 @@
Evas_List *l = NULL;
char *strings[] = { "/entrance/theme", "/entrance/background",
"/entrance/pointer", "/entrance/date_format", "/entrance/time_format",
- "/entrance/greeting/before", "/entrance/greeting/after"
+ "/entrance/greeting/before", "/entrance/greeting/after",
+ "/entrance/xsession"
};
char *values[] = { e->theme, e->background, e->pointer, e->date.string,
e->time.string, e->before.string, e->after.string
@@ -430,7 +435,7 @@
}
void
-entrance_config_prevuser_save(const char *user, const char *file)
+entrance_config_prevuser_save(char *user, const char *file)
{
char buf[PATH_MAX];
===================================================================
RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_config.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- entrance_config.h 12 May 2006 22:21:35 -0000 1.19
+++ entrance_config.h 3 Jun 2006 07:24:49 -0000 1.20
@@ -113,6 +113,8 @@
Evas_List *keys;
} sessions;
+ char *xsession;
+
struct
{
/**
@@ -141,7 +143,7 @@
void entrance_config_free(Entrance_Config * e);
void entrance_config_prepend_recent_user(Entrance_Config * e, char *str);
void entrance_config_user_list_save(Entrance_Config * e, const char *file);
-void entrance_config_prevuser_save(const char *user, const char *file);
+void entrance_config_prevuser_save(char *user, const char *file);
int entrance_config_save(Entrance_Config * e, const char *file);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- entrance_session.c 12 May 2006 22:21:35 -0000 1.83
+++ entrance_session.c 3 Jun 2006 07:24:49 -0000 1.84
@@ -388,23 +388,23 @@
if ((exs->session) && (exs->session[0] != 0))
{
if (!strcmp(exs->session, "default"))
- snprintf(buf, PATH_MAX, "%s", ENTRANCE_XSESSION);
+ snprintf(buf, PATH_MAX, "%s", e->config->xsession);
else if (exs->session[0] == '/')
snprintf(buf, PATH_MAX, "%s", exs->session);
else
- snprintf(buf, PATH_MAX, "%s %s", ENTRANCE_XSESSION, exs->session);
+ snprintf(buf, PATH_MAX, "%s %s", e->config->xsession, exs->session);
}
else
{
/* Default session */
- snprintf(buf, PATH_MAX, "%s", ENTRANCE_XSESSION);
+ snprintf(buf, PATH_MAX, "%s", e->config->xsession);
}
if (e->testing)
{
printf("Would have executed: %s\n", buf);
fflush(stdout);
- snprintf(buf, PATH_MAX, X_BINARIES"/xterm");
+ snprintf(buf, PATH_MAX, "xterm");
}
syslog(LOG_INFO, "Executing %s", buf);
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
