From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Tue, 23 Nov 2010 01:42:31 +0000 (+0900)
Subject: bug fix : password
X-Git-Tag: 2.0_alpha~297
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93cc2618c20007df31b2330c3d81c3d43556422f;p=framework%2Fuifw%2Fedje.git

bug fix : password
---

diff --git a/debian/changelog b/debian/changelog
index 3016c5b..fcf8200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+edje (1.0.0.001+svn.51480slp2+build31) unstable; urgency=low
+
+  * Bug fix : password problem
+  * Git: 165.213.180.234:/git/slp/pkgs/edje
+  * Tag: edje_1.0.0.001+svn.51480slp2+build31
+
+ -- Jihoon Kim <jihoon48.kim@samsung.com>  Tue, 23 Nov 2010 10:40:17 +0900
+
 edje (1.0.0.001+svn.51480slp2+build30) unstable; urgency=low
 
   * Add preedit tag
diff --git a/src/lib/edje_entry.c b/src/lib/edje_entry.c
index 87024df..ea84512 100644
--- a/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@ -3476,7 +3476,7 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
    Edje_Real_Part *rp = ed->focused_part;
    Entry *en;
    Ecore_IMF_Event_Commit *ev = event;
-   Evas_Textblock_Cursor *tc;
+//   Evas_Textblock_Cursor *tc;
    Eina_Bool cursor_move = EINA_FALSE;
 
    if (!rp) return ECORE_CALLBACK_PASS_ON;
@@ -3499,20 +3499,24 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
           }
      }
 
-   tc = evas_object_textblock_cursor_new(rp->object);
+//   tc = evas_object_textblock_cursor_new(rp->object);
 
    /* calculate the cursor position to insert commit string */
+   /*
    if (en->preedit_start)
       evas_textblock_cursor_copy(en->preedit_start, tc);
    else
       evas_textblock_cursor_copy(en->cursor, tc);
+   */
 
    /* delete preedit characters */
    _preedit_del(en);
    _preedit_clear(en);
 
+   /*
    if (evas_textblock_cursor_compare(en->cursor, tc))
       cursor_move = EINA_TRUE;
+   */
 
    if (rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD_SHOW_LAST_CHARACTER)
      {			  			
@@ -3522,9 +3526,9 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
            if (en->func(en->data, (void *)ev->str))
               return ECORE_CALLBACK_PASS_ON;
 
-        evas_object_textblock_text_markup_prepend(tc, "<password=off>");
-        evas_object_textblock_text_markup_prepend(tc, ev->str);
-        evas_object_textblock_text_markup_prepend(tc, "</password>");
+        evas_object_textblock_text_markup_prepend(en->cursor, "<password=off>");
+        evas_object_textblock_text_markup_prepend(en->cursor, ev->str);
+        evas_object_textblock_text_markup_prepend(en->cursor, "</password>");
 
         if (en->pw_timer)
           {
@@ -3545,7 +3549,7 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
            if (en->func(en->data, ev->str))
               return ECORE_CALLBACK_PASS_ON;
 
-        _text_prepend(en, tc, ev->str);
+        _text_prepend(en, en->cursor, ev->str);
         //evas_textblock_cursor_text_prepend(en->cursor, ev->str);
 
         /*count characters*/
@@ -3558,13 +3562,15 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
      }
 
 
+#if 0
    if (!cursor_move)
      {
-        /* move cursor to the end of commit string */   	
+        /* move cursor to the end of commit string */
         evas_textblock_cursor_copy(tc, en->cursor);
      }
 
    evas_textblock_cursor_free(tc);
+#endif
    
    _curs_update_from_curs(en->cursor, rp->object, en);
    _anchors_get(en->cursor, rp->object, en);