fix merge error

diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 2258026..2e70f4a 100644 (file)
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1791,19 +1791,3 @@ elm_multibuttonentry_view_mode(Evas_Object *obj, Eina_Bool view_mode)
    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 --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 7002481..8eb484b 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2425,7 +2425,7 @@ _signal_entry_paste_request(void *data, Evas_Object *obj __UNUSED__, const char
                formats = ELM_SEL_FORMAT_TEXT;
              else if (wd->cnp_mode != ELM_CNP_MODE_NO_IMAGE)
                formats |= ELM_SEL_FORMAT_IMAGE;
-             elm_cnp_selection_get(ELM_SEL_CLIPBOARD, formats, data,
+             elm_cnp_selection_get(ELM_SEL_TYPE_CLIPBOARD, formats, data,
                                NULL, NULL);
           }
 #endif