Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / src / lib / elc_fileselector_entry.c

diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index 8fbfce0..984c131 100644 (file)
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -346,6 +346,21 @@ elm_fileselector_entry_add(Evas_Object *parent)
 }
 
 EAPI void
+<<<<<<< HEAD
+elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label)
+{
+   _elm_fileselector_entry_button_label_set(obj, NULL, label);
+}
+
+EAPI const char *
+elm_fileselector_entry_button_label_get(const Evas_Object *obj)
+{
+   return _elm_fileselector_entry_button_label_get(obj, NULL);
+}
+
+EAPI void
+=======
+>>>>>>> remotes/origin/upstream
 elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
@@ -489,3 +504,24 @@ elm_fileselector_entry_inwin_mode_get(const Evas_Object *obj)
    if (!wd) return EINA_FALSE;
    return elm_fileselector_button_inwin_mode_get(wd->button);
 }
+<<<<<<< HEAD
+
+EAPI void
+elm_fileselector_entry_button_icon_set(Evas_Object *obj, Evas_Object *icon)
+{
+   _content_set_hook(obj, NULL, icon);
+}
+
+EAPI Evas_Object *
+elm_fileselector_entry_button_icon_get(const Evas_Object *obj)
+{
+   return _content_get_hook(obj, NULL);
+}
+
+EAPI Evas_Object *
+elm_fileselector_entry_button_icon_unset(Evas_Object *obj)
+{
+   return _content_unset_hook(obj, NULL);
+}
+=======
+>>>>>>> remotes/origin/upstream