Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_entry.c
Log Message:
don't allow copying from password entry
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_entry.c 22 Apr 2007 05:33:35 -0000 1.40
+++ e_entry.c 22 Apr 2007 05:51:35 -0000 1.41
@@ -374,38 +374,41 @@
sd->popup = e_menu_new();
e_menu_post_deactivate_callback_set(sd->popup,
_e_entry_cb_menu_post, sd);
- if (selecting)
- {
- if (sd->enabled)
- {
- if (e_editable_text_length_get(sd->editable_object))
- {
- mi = e_menu_item_new(sd->popup);
- e_menu_item_label_set(mi, _("Delete"));
- e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/delete"),
- "e/fileman/button/delete");
- e_menu_item_callback_set(mi, _e_entry_cb_delete, sd);
-
- mi = e_menu_item_new(sd->popup);
- e_menu_item_separator_set(mi, 1);
- }
-
- mi = e_menu_item_new(sd->popup);
- e_menu_item_label_set(mi, _("Cut"));
- e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/cut"),
- "e/fileman/button/cut");
- e_menu_item_callback_set(mi, _e_entry_cb_cut, sd);
-
+ if (selecting && sd->enabled)
+ {
+ if (e_editable_text_length_get(sd->editable_object))
+ {
+ mi = e_menu_item_new(sd->popup);
+ e_menu_item_label_set(mi, _("Delete"));
+ e_menu_item_icon_edje_set(mi,
+ e_theme_edje_file_get("base/theme/fileman",
+ "e/fileman/button/delete"),
+ "e/fileman/button/delete");
+ e_menu_item_callback_set(mi, _e_entry_cb_delete, sd);
+
+ mi = e_menu_item_new(sd->popup);
+ e_menu_item_separator_set(mi, 1);
+ }
+
+ if (!e_editable_password_get(sd->editable_object))
+ {
+ mi = e_menu_item_new(sd->popup);
+ e_menu_item_label_set(mi, _("Cut"));
+ e_menu_item_icon_edje_set(mi,
+ e_theme_edje_file_get("base/theme/fileman",
+ "e/fileman/button/cut"),
+ "e/fileman/button/cut");
+ e_menu_item_callback_set(mi, _e_entry_cb_cut, sd);
+
mi = e_menu_item_new(sd->popup);
e_menu_item_label_set(mi, _("Copy"));
- e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/copy"),
- "e/fileman/button/copy");
+ e_menu_item_icon_edje_set(mi,
+ e_theme_edje_file_get("base/theme/fileman",
+ "e/fileman/button/copy"),
+ "e/fileman/button/copy");
e_menu_item_callback_set(mi, _e_entry_cb_copy, sd);
- }
- }
+ }
+ }
if (sd->enabled)
{
@@ -538,6 +541,8 @@
return;
editable = sd->editable_object;
+ if (e_editable_password_get(editable)) return;
+
cursor_pos = e_editable_cursor_pos_get(editable);
selection_pos = e_editable_selection_pos_get(editable);
start_pos = (cursor_pos <= selection_pos) ? cursor_pos : selection_pos;
@@ -548,6 +553,7 @@
(!(text = e_editable_text_range_get(editable, start_pos, end_pos))))
return;
+
ecore_x_selection_primary_set(win->evas_win, text, strlen(text) + 1);
free(text);
}
@@ -669,7 +675,7 @@
else if ((strcmp(event->keyname, "x") == 0) ||
(strcmp(event->keyname, "c") == 0))
{
- if (selecting)
+ if (!e_editable_password_get(editable) && selecting)
{
range = e_editable_text_range_get(editable, start_pos,
end_pos);
if (range)
@@ -811,7 +817,7 @@
evas_key_modifier_is_set(event->modifiers, "Shift")) &&
(strcmp(event->key, "w") == 0))
{
- if (selecting)
+ if (!e_editable_password_get(editable) && selecting)
{
range = e_editable_text_range_get(editable, start_pos, end_pos);
if (range)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
