Tizen 2.4.0 rev3 SDK Public Release

[apps/home/message.git] / composer / src / ui-composer / msg-ui-composer-recipient.c

diff --git a/composer/src/ui-composer/msg-ui-composer-recipient.c b/composer/src/ui-composer/msg-ui-composer-recipient.c
index 02f29a8..5893840 100755 (executable)
--- a/composer/src/ui-composer/msg-ui-composer-recipient.c
+++ b/composer/src/ui-composer/msg-ui-composer-recipient.c
@@ -434,7 +434,6 @@ void msg_ui_composer_recipient_selected_edit(MSG_COMPOSER_VIEW_DATA_S *cd)
                return;
        }
 
-       elm_object_focus_set(rd->entry, true);
        r_item = msg_ui_composer_recipient_selected_item_data_get(cd);
        D_MSG_RETM_IF(r_item == NULL, "Selected Data is NULL");
 
@@ -520,13 +519,17 @@ void msg_ui_composer_recipient_select_popup_create(void *data)
                return;
        }
 
-       if (r_item->index > 0) {
-               if (r_item->display_name[0] != '\0')
-                       snprintf(title_str, sizeof(title_str), "%s <%s>", r_item->display_name, r_item->recipient);
-               else
-                       snprintf(title_str, sizeof(title_str), "%s", r_item->recipient);
-       } else {
+       if (cd->isAppControl && cd->isEmulator) {
                snprintf(title_str, sizeof(title_str), "%s", r_item->recipient);
+       } else {
+               if (r_item->index > 0) {
+                       if (r_item->display_name[0] != '\0')
+                               snprintf(title_str, sizeof(title_str), "%s <%s>", r_item->display_name, r_item->recipient);
+                       else
+                               snprintf(title_str, sizeof(title_str), "%s", r_item->recipient);
+               } else {
+                       snprintf(title_str, sizeof(title_str), "%s", r_item->recipient);
+               }
        }
 
        if (rd->selected_popup) {