EFL migration revision 67547

Merge branch 'intefl/svn_merge'

Conflicts:
	src/lib/Elementary.h.in
	src/lib/elc_multibuttonentry.c
	src/lib/elm_cnp_helper.c
	src/lib/elm_entry.c
	src/lib/elm_genlist.c

diff --cc src/lib/elc_multibuttonentry.c
index 7b58f5d,2e70f4a..2258026
--- 1/src/lib/elc_multibuttonentry.c
--- 2/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@@ -1683,24 -1781,13 +1781,29 @@@ elm_multibuttonentry_view_mode(Evas_Obj
  {
     ELM_CHECK_WIDTYPE(obj, widtype);
     Widget_Data *wd = elm_widget_data_get(obj);
-    if (!wd) return;
+    wd->view_mode = view_mode;
  
-    wd->add_callback = func;
-    wd->add_callback_data = data;
+    if (view_mode)
+      {
+         elm_box_unpack(wd->box, wd->entry);
+         evas_object_hide(wd->entry);
+      }
+    else
+      _view_update(obj);
  }
 +
 +EAPI void
 +elm_multibuttonentry_view_mode(Evas_Object *obj, Eina_Bool view_mode)
 +{
 +   ELM_CHECK_WIDTYPE(obj, widtype);
 +   Widget_Data *wd = elm_widget_data_get(obj);
 +   wd->view_mode = view_mode;
 +
 +   if (view_mode)
 +     {
 +        elm_box_unpack(wd->box, wd->entry);
 +        evas_object_hide(wd->entry);
 +     }
 +   else
 +     _view_update(obj);
 +}

diff --cc src/lib/elm_cnp_helper.c
Simple merge

diff --cc src/lib/elm_entry.c
index a9f77e1,2eb7946..7002481
--- 1/src/lib/elm_entry.c
--- 2/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@@ -2248,12 -2420,8 +2420,13 @@@ _signal_entry_paste_request(void *data
          if ((top) && (elm_win_xwindow_get(top)))
            {
               wd->selection_asked = EINA_TRUE;
 -             elm_cnp_selection_get(type, ELM_SEL_FORMAT_MARKUP, data,
 +             Elm_Sel_Format formats = ELM_SEL_FORMAT_MARKUP;
 +             if (wd->cnp_mode == ELM_CNP_MODE_PLAINTEXT)
 +               formats = ELM_SEL_FORMAT_TEXT;
 +             else if (wd->cnp_mode != ELM_CNP_MODE_NO_IMAGE)
 +               formats |= ELM_SEL_FORMAT_IMAGE;
-              elm_selection_get(ELM_SEL_CLIPBOARD, formats ,data, NULL, NULL);
++             elm_cnp_selection_get(ELM_SEL_CLIPBOARD, formats, data,
+                                NULL, NULL);
            }
  #endif
       }