Enlightenment CVS committal
Author : mekius
Project : e17
Module : proto/empower
Dir : e17/proto/empower/src/bin/ewl
Modified Files:
empower_cb_ewl.c empower_gui_ewl.c
Log Message:
Update for recent ewl_password removal.
===================================================================
RCS file: /cvs/e/e17/proto/empower/src/bin/ewl/empower_cb_ewl.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- empower_cb_ewl.c 1 Jun 2007 06:22:58 -0000 1.9
+++ empower_cb_ewl.c 5 Apr 2008 21:55:48 -0000 1.10
@@ -23,7 +23,7 @@
if(ev->base.keyname[1] == '\0' &&
(isalpha(*(ev->base.keyname))
||
isdigit(*(ev->base.keyname))))
-
ewl_password_text_set(EWL_PASSWORD(entry),ev->base.keyname);
+
ewl_text_text_set(EWL_TEXT(entry),ev->base.keyname);
failure = 0;
}
else
@@ -43,17 +43,13 @@
void focus_cb(Ewl_Widget *w, void *event, void *data)
{
const char* text = (char*)data;
- if(EWL_PASSWORD_IS(w))
- {
- if(!ewl_password_text_get(EWL_PASSWORD(w)))
- ewl_password_clear(EWL_PASSWORD(w));
- }
- else if(EWL_ENTRY_IS(w))
- {
- if(ewl_text_text_get(EWL_TEXT(w)) &&
+
+ if(ewl_text_text_get(EWL_TEXT(w)) &&
!strcmp(ewl_text_text_get(EWL_TEXT(w)),text))
ewl_text_clear(EWL_TEXT(w));
- }
+
+ if(ewl_widget_name_get(w) && !strcmp(ewl_widget_name_get(w),"password"))
+ ewl_text_obscure_set(EWL_TEXT(w), "*");
}
void unfocus_cb(Ewl_Widget *w, void *event, void *data)
@@ -65,6 +61,9 @@
ewl_text_text_set(EWL_TEXT(w),text);
ewl_text_cursor_position_set(EWL_TEXT(w),0);
ewl_text_color_apply(EWL_TEXT(w),100,100,100,200,strlen(text));
+
+ if(ewl_widget_name_get(w) &&
!strcmp(ewl_widget_name_get(w),"password"))
+ ewl_text_obscure_set(EWL_TEXT(w), NULL);
}
}
@@ -85,7 +84,7 @@
{
char *pass;
- if(data && !auth_passed) pass =
ewl_password_text_get(EWL_PASSWORD(data));
+ if(data && !auth_passed) pass = ewl_text_text_get(EWL_TEXT(data));
if(pass && strlen(pass))
{
===================================================================
RCS file: /cvs/e/e17/proto/empower/src/bin/ewl/empower_gui_ewl.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- empower_gui_ewl.c 1 Apr 2008 02:35:40 -0000 1.20
+++ empower_gui_ewl.c 5 Apr 2008 21:55:48 -0000 1.21
@@ -46,6 +46,7 @@
{
exec = ewl_entry_new();
ewl_container_child_append(EWL_CONTAINER(vbox), exec);
+ ewl_widget_name_set(exec, "exec");
ewl_callback_append(exec, EWL_CALLBACK_VALUE_CHANGED,
check_pass_cb,
entry);
ewl_callback_append(exec, EWL_CALLBACK_FOCUS_IN, focus_cb,
@@ -60,8 +61,9 @@
ewl_widget_show(exec);
}
- entry = ewl_password_new();
+ entry = ewl_entry_new();
ewl_container_child_append(EWL_CONTAINER(vbox), entry);
+ ewl_widget_name_set(entry, "password");
ewl_callback_append(entry, EWL_CALLBACK_VALUE_CHANGED, check_pass_cb,
entry);
ewl_callback_append(entry, EWL_CALLBACK_FOCUS_IN, focus_cb,
@@ -87,10 +89,7 @@
{
ewl_widget_enable(win);
- ewl_password_clear(EWL_PASSWORD(entry));
- ewl_text_text_set(EWL_TEXT(entry),"Password");
- ewl_text_cursor_position_set(EWL_TEXT(entry),0);
-
ewl_text_color_apply(EWL_TEXT(entry),100,100,100,200,strlen("Password"));
+ ewl_text_clear(EWL_TEXT(entry));
failure = 1;
}
else
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
