Enlightenment CVS committal
Author : atmosphere
Project : misc
Module : elogin
Dir : misc/elogin/src/client
Modified Files:
callbacks.c events.c
Log Message:
index is a naughty variable name
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/callbacks.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- callbacks.c 10 Jan 2003 15:36:02 -0000 1.8
+++ callbacks.c 10 Jan 2003 21:36:42 -0000 1.9
@@ -21,25 +21,25 @@
}
void
-elogin_select_session(E_Login_Session e, int index)
+elogin_select_session(E_Login_Session e, int session_index)
{
int ix, iy;
E_Login_Session_Type *st = NULL;
/* Force within list bounds/wraparound */
- if (index >= evas_list_count(e->listitems))
- index = 0;
- else if (index < 0)
- index = evas_list_count(e->listitems) - 1;
+ if (session_index >= evas_list_count(e->listitems))
+ session_index = 0;
+ else if (session_index < 0)
+ session_index = evas_list_count(e->listitems) - 1;
/* Update bullet position */
ix = 300;
- iy = 120 + (index * 30);
+ iy = 120 + (session_index * 30);
evas_object_move(e->bullet, ix, iy);
/* Update current session */
- e->session_index = index;
- st = evas_list_nth(e->config->sessions, index);
+ e->session_index = session_index;
+ st = evas_list_nth(e->config->sessions, session_index);
e->session = st->path;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/events.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- events.c 10 Jan 2003 14:32:54 -0000 1.6
+++ events.c 10 Jan 2003 21:36:42 -0000 1.7
@@ -7,7 +7,7 @@
static struct
{
char buf[USER_PASS_MAX];
- int index;
+ int buf_index;
}
typebuffer;
@@ -36,7 +36,7 @@
ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN, e_key_down);
ecore_event_filter_idle_handler_add(e_idle, NULL);
- typebuffer.index = 0;
+ typebuffer.buf_index = 0;
typebuffer.buf[0] = 0;
}
@@ -106,7 +106,7 @@
#if ELOGIN_DEBUG
- fprintf(stderr, "typebuffer.index is %d\n", typebuffer.index);
+ fprintf(stderr, "typebuffer.buf_index is %d\n", typebuffer.buf_index);
fprintf(stderr, "e->key is %s\n", e->key);
fprintf(stderr, "e->compose is %s\n", e->compose);
#endif
@@ -122,7 +122,7 @@
{
case 'u': /* clear the buffer */
memset(&typebuffer.buf, 0, USER_PASS_MAX);
- typebuffer.index = 0;
+ typebuffer.buf_index = 0;
break;
default:
break;
@@ -132,9 +132,9 @@
{
if (!(strcmp(e->key, "BackSpace")))
{
- if (typebuffer.index > 0)
+ if (typebuffer.buf_index > 0)
{
- typebuffer.buf[--typebuffer.index] = 0;
+ typebuffer.buf[--typebuffer.buf_index] = 0;
}
}
else if (!(strcmp(e->key, "Return")))
@@ -142,7 +142,7 @@
password_or_user =
elogin_return_key_cb(e_session, typebuffer.buf);
memset(&typebuffer.buf, 0, USER_PASS_MAX);
- typebuffer.index = 0;
+ typebuffer.buf_index = 0;
}
else if (!(strcmp(e->key, "Up")))
{
@@ -153,25 +153,25 @@
elogin_select_next_session(e_session);
}
- if (typebuffer.index >= USER_PASS_MAX)
+ if (typebuffer.buf_index >= USER_PASS_MAX)
return;
else if (!(strcmp(e->key, "space")))
{
- typebuffer.buf[typebuffer.index++] = ' ';
+ typebuffer.buf[typebuffer.buf_index++] = ' ';
}
}
else
{
- if (typebuffer.index >= USER_PASS_MAX)
+ if (typebuffer.buf_index >= USER_PASS_MAX)
return;
- typebuffer.buf[typebuffer.index++] = *e->compose;
+ typebuffer.buf[typebuffer.buf_index++] = *e->compose;
}
}
else
{
- if (typebuffer.index >= USER_PASS_MAX)
+ if (typebuffer.buf_index >= USER_PASS_MAX)
return;
- typebuffer.buf[typebuffer.index++] = *e->compose;
+ typebuffer.buf[typebuffer.buf_index++] = *e->compose;
}
set_text_entry_text(password_or_user, typebuffer.buf);
}
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
