Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
entrance_auth.c entrance_edit.c entrance_session.c
entrance_user.c main.c
Log Message:
more namespace work, and indent, user unselection broke recently, more to come
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_auth.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- entrance_auth.c 8 Dec 2004 17:54:22 -0000 1.19
+++ entrance_auth.c 10 Dec 2004 23:33:31 -0000 1.20
@@ -324,7 +324,7 @@
#else
environ = NULL;
#endif
-
+
e->env = environ;
setenv("XAUTHORITY", buf, 1);
setenv("TERM", "vt100", 0); // TERM=linux?
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_edit.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- entrance_edit.c 8 Dec 2004 16:53:07 -0000 1.10
+++ entrance_edit.c 10 Dec 2004 23:33:31 -0000 1.11
@@ -2016,15 +2016,15 @@
#if 0
if (edje_object_part_exists(edje, "entrance.time"))
{
- edje_object_signal_callback_add(edje, "Go", "entrance.time", set_time,
- o);
+ edje_object_signal_callback_add(edje, "Go", "entrance.time",
+ set_time, o);
edje_object_signal_emit(edje, "Go", "entrance.time");
timer = ecore_timer_add(0.5, timer_cb, edje);
}
if (edje_object_part_exists(edje, "entrance.date"))
{
- edje_object_signal_callback_add(edje, "Go", "entrance.date", set_date,
- o);
+ edje_object_signal_callback_add(edje, "Go", "entrance.date",
+ set_date, o);
edje_object_signal_emit(edje, "Go", "entrance.date");
if (!timer)
timer = ecore_timer_add(0.5, timer_cb, edje);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- entrance_session.c 8 Dec 2004 16:53:07 -0000 1.64
+++ entrance_session.c 10 Dec 2004 23:33:31 -0000 1.65
@@ -194,8 +194,16 @@
{
if (e)
{
+ Evas_Object *obj = NULL;
+
entrance_auth_free(e->auth);
e->auth = entrance_auth_new();
+ if ((obj =
+ edje_object_part_swallow_get(e->edje, "entrance.user.avatar")))
+ {
+ edje_object_part_unswallow(e->edje, obj);
+ evas_object_del(obj);
+ }
edje_object_signal_emit(e->edje, "In", "entrance.entry.user");
}
}
@@ -203,7 +211,7 @@
/**
* entrance_session_user_set: forget what we know about the current user,
* load what info we can from the entrance user parameter, so we have a new
- * user in our "entrance.users.avatar" edje
+ * user in our "entrance.user.avatar" edje
* @param e - the entrance sesssion currently running
* @param eu - the new entrance user we're setting as "current"
*/
@@ -216,7 +224,8 @@
if (e && eu)
{
- if ((obj = edje_object_part_swallow_get(e->edje,
"entrance.users.avatar")))
+ if ((obj =
+ edje_object_part_swallow_get(e->edje, "entrance.user.avatar")))
{
edje_object_part_unswallow(e->edje, obj);
evas_object_del(obj);
@@ -244,12 +253,14 @@
result = entrance_session_auth_user(e);
if (result == 0)
{
- if (edje_object_part_exists(e->edje,
"entrance.users.avatar"))
+ if (edje_object_part_exists
+ (e->edje, "entrance.user.avatar"))
{
- edje_object_part_swallow(e->edje,
"entrance.users.avatar", obj);
+ edje_object_part_swallow(e->edje, "entrance.user.avatar",
+ obj);
}
- edje_object_signal_emit(e->edje,
"entrance,user,auth,success",
- "");
+ edje_object_signal_emit(e->edje,
+ "entrance,user,auth,success", "");
e->authed = 1;
}
else
@@ -263,13 +274,14 @@
{
#endif
evas_object_layer_set(obj, evas_object_layer_get(e->edje));
- if (edje_object_part_exists(e->edje, "entrance.users.avatar"))
+ if (edje_object_part_exists(e->edje, "entrance.user.avatar"))
{
- edje_object_part_swallow(e->edje, "entrance.users.avatar",
obj);
+ edje_object_part_swallow(e->edje, "entrance.user.avatar",
+ obj);
}
edje_object_signal_emit(e->edje, "In", "entrance.entry.pass");
edje_object_signal_emit(e->edje, "entrance,user,success", "");
- edje_object_signal_emit(e->edje, "entrance,users,selected", "");
+ edje_object_signal_emit(e->edje, "entrance,user,selected", "");
#if 0
}
#endif
@@ -277,7 +289,8 @@
else
{
evas_object_del(obj);
- /* edje_object_signal_emit(e->edje, "In", "entrance.entry.pass");
*/
+ /* edje_object_signal_emit(e->edje, "In", "entrance.entry.pass");
+ */
edje_object_signal_emit(e->edje, "entrance,user,fail", "");
}
}
@@ -449,7 +462,9 @@
free(e->session);
e->session = strdup(exs->session);
- old_o = edje_object_part_swallow_get(e->edje,
"entrance.xsessions.selected");
+ old_o =
+ edje_object_part_swallow_get(e->edje,
+ "entrance.xsessions.selected");
if (old_o)
{
edje_object_part_unswallow(e->edje, old_o);
@@ -457,7 +472,6 @@
}
edje_object_part_swallow(e->edje, "entrance.xsessions.selected", o);
evas_object_layer_set(o, evas_object_layer_get(e->edje));
- edje_object_signal_emit(e->edje, "SessionDefaultChanged", "");
edje_object_signal_emit(e->edje, "entrance,xsession,selected", "");
}
}
@@ -498,8 +512,8 @@
if (!e || !e->edje || !e->config)
return;
- edje_object_part_geometry_get(e->edje, "entrance.xsessions.list", NULL,
NULL,
- &w, &h);
+ edje_object_part_geometry_get(e->edje, "entrance.xsessions.list", NULL,
+ NULL, &w, &h);
if ((container = esmart_container_new(evas_object_evas_get(e->edje))))
{
esmart_container_padding_set(container, 0, 0, 0, 0);
@@ -568,8 +582,8 @@
if (!e || !e->edje)
return;
- edje_object_part_geometry_get(e->edje, "entrance.users.list", NULL, NULL,
&w,
- &h);
+ edje_object_part_geometry_get(e->edje, "entrance.users.list", NULL, NULL,
+ &w, &h);
if ((container = esmart_container_new(evas_object_evas_get(e->edje))))
{
esmart_container_padding_set(container, 0, 0, 0, 0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_user.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- entrance_user.c 8 Dec 2004 18:32:03 -0000 1.13
+++ entrance_user.c 10 Dec 2004 23:33:31 -0000 1.14
@@ -81,7 +81,7 @@
/**
* entrance_user_edje_get : get the Evas_Object(edje||image) that is
- * specified in config db. Their "entrance.users.avatar"
+ * specified in config db. Their "entrance.user.avatar"
* @param e - the Entrance_User to get the edje for
* @param edje - a pointer to the main edje in entrance
* @return NULL on failure, a valid Evas_Object on success
@@ -122,9 +122,9 @@
/**
* FIXME: perhaps go so far as to do Gecos type stuff
*/
- edje_object_signal_callback_add(o, "entrance,users,selected", "",
+ edje_object_signal_callback_add(o, "entrance,user,selected", "",
user_selected_cb, e);
- edje_object_signal_callback_add(o, "entrance,users,unselected", "",
+ edje_object_signal_callback_add(o, "entrance,user,unselected", "",
user_unselected_cb, e);
evas_object_show(result);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/main.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- main.c 10 Dec 2004 00:53:57 -0000 1.63
+++ main.c 10 Dec 2004 23:33:31 -0000 1.64
@@ -132,10 +132,12 @@
}
esmart_text_entry_text_set(o, "");
}
- else if (!strcmp(esmart_text_entry_edje_part_get(o), "entrance.entry.user"))
+ else
+ if (!strcmp(esmart_text_entry_edje_part_get(o), "entrance.entry.user"))
{
oo =
- evas_object_name_find(evas_object_evas_get(o), "entrance.entry.pass");
+ evas_object_name_find(evas_object_evas_get(o),
+ "entrance.entry.pass");
}
if (oo)
{
@@ -365,7 +367,8 @@
if (session && data)
{
entrance_session_user_reset(session);
-/* edje_object_signal_emit(o, "entrance,user,fail", "");*/
+ /*
+ edje_object_signal_emit(o, "entrance,user,auth,fail", ""); */
}
}
@@ -463,8 +466,8 @@
* default session to be executed when they log in.
*/
static void
-_session_set(void *data, Evas_Object * o, const char *emission,
- const char *source)
+_user_session_set(void *data, Evas_Object * o, const char *emission,
+ const char *source)
{
Entrance_Session *e = NULL;
@@ -732,23 +735,23 @@
}
#endif
if (!testing)
- {
- Ecore_X_Window *roots;
- int num, i;
-
- num = 0;
- roots = ecore_x_window_root_list(&num);
- if (roots)
- {
- for (i = 0; i < num; i++)
- {
- ecore_x_window_background_color_set(roots[i], 0);
- ecore_x_window_cursor_show(roots[i], 0);
- }
- free(roots);
- ecore_x_sync();
- }
- }
+ {
+ Ecore_X_Window *roots;
+ int num, i;
+
+ num = 0;
+ roots = ecore_x_window_root_list(&num);
+ if (roots)
+ {
+ for (i = 0; i < num; i++)
+ {
+ ecore_x_window_background_color_set(roots[i], 0);
+ ecore_x_window_cursor_show(roots[i], 0);
+ }
+ free(roots);
+ ecore_x_sync();
+ }
+ }
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_cb, NULL);
ecore_idle_enterer_add(idler_before_cb, NULL);
@@ -863,8 +866,8 @@
update the Time */
if (edje_object_part_exists(edje, "entrance.time"))
{
- edje_object_signal_callback_add(edje, "Go", "entrance.time", set_time,
- o);
+ edje_object_signal_callback_add(edje, "Go", "entrance.time",
+ set_time, o);
edje_object_signal_emit(edje, "Go", "entrance.time");
timer = ecore_timer_add(0.5, timer_cb, edje);
}
@@ -872,8 +875,8 @@
already running to automatically update the Date */
if (edje_object_part_exists(edje, "entrance.date"))
{
- edje_object_signal_callback_add(edje, "Go", "entrance.date", set_date,
- o);
+ edje_object_signal_callback_add(edje, "Go", "entrance.date",
+ set_date, o);
edje_object_signal_emit(edje, "Go", "entrance.date");
if (!timer)
timer = ecore_timer_add(0.5, timer_cb, edje);
@@ -928,14 +931,14 @@
* callbacks have been added, otherwise show might not trigger all
* the desired events
*/
- edje_object_signal_callback_add(edje, "entrance,user,auth,success,done",
"",
- done_cb, e);
+ edje_object_signal_callback_add(edje, "entrance,user,auth,success,done",
+ "", done_cb, e);
edje_object_signal_callback_add(edje, "entrance,system,reboot", "",
reboot_cb, e);
edje_object_signal_callback_add(edje, "entrance,system,halt", "",
shutdown_cb, e);
- edje_object_signal_callback_add(edje, "SessionDefaultSet", "",
- _session_set, session);
+ edje_object_signal_callback_add(edje, "entrance,user,xsession,set", "",
+ _user_session_set, session);
evas_object_show(edje);
/* set focus to user input by default */
edje_object_signal_emit(edje, "In", "entrance.entry.user");
@@ -950,23 +953,23 @@
entrance_ipc_session_set(session);
entrance_session_run(session);
- if (!testing)
- {
- Ecore_X_Window *roots;
- int num, i;
-
- num = 0;
- roots = ecore_x_window_root_list(&num);
- if (roots)
- {
- for (i = 0; i < num; i++)
- {
- ecore_x_window_cursor_show(roots[i], 1);
- }
- free(roots);
- ecore_x_sync();
- }
- }
+ if (!testing)
+ {
+ Ecore_X_Window *roots;
+ int num, i;
+
+ num = 0;
+ roots = ecore_x_window_root_list(&num);
+ if (roots)
+ {
+ for (i = 0; i < num; i++)
+ {
+ ecore_x_window_cursor_show(roots[i], 1);
+ }
+ free(roots);
+ ecore_x_sync();
+ }
+ }
if (session->authed)
{
entrance_session_start_user_session(session);
-------------------------------------------------------
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
