Fix conflicts: Map, Hover, Hoversel, Menu, Web

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

diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index cef7303..1c84db9 100644 (file)
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -138,20 +138,6 @@ static const Evas_Smart_Cb_Description _elm_web_callback_names[] = {
    { NULL, NULL }
 };
 
-<<<<<<< HEAD
-static void
-_theme_hook(Evas_Object *obj)
-{
-#ifdef HAVE_ELEMENTARY_WEB
-   Elm_Theme *theme = elm_object_theme_get(obj);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   const Eina_List *themes, *l;
-   const char *th;
-   char *view_theme = NULL;
-
-   themes = elm_theme_list_get(theme);
-   EINA_LIST_FOREACH(themes, l, th)
-=======
 #ifdef HAVE_ELEMENTARY_WEB
 static char *
 _webkit_theme_find(const Eina_List *list)
@@ -160,20 +146,10 @@ _webkit_theme_find(const Eina_List *list)
    const char *th;
 
    EINA_LIST_FOREACH(list, l, th)
->>>>>>> remotes/origin/upstream
      {
         char *path = elm_theme_list_item_path_get(th, NULL);
         if (!path) continue;
         if (edje_file_group_exists(path, "webkit/base"))
-<<<<<<< HEAD
-          {
-             view_theme = path;
-             break;
-          }
-        free(path);
-     }
-
-=======
           return path;
         free(path);
      }
@@ -203,7 +179,6 @@ _theme_hook(Evas_Object *obj)
    view_theme = _webkit_theme_find(themes);
 
 set:
->>>>>>> remotes/origin/upstream
    if (view_theme)
      {
         ewk_view_theme_set(wd->ewk_view, view_theme);
@@ -943,19 +918,11 @@ _ewk_view_popup_create_cb(void *data, Evas_Object *obj, void *event_info)
      return;
 
    notify = elm_notify_add(obj);
-<<<<<<< HEAD
-   elm_notify_repeat_events_set(notify, EINA_FALSE);
-   elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM);
-
-   list = elm_list_add(obj);
-   elm_list_always_select_mode_set(list, EINA_TRUE);
-=======
    elm_notify_allow_events_set(notify, EINA_FALSE);
    elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM);
 
    list = elm_list_add(obj);
    elm_list_select_mode_set(data, ELM_OBJECT_SELECT_MODE_ALWAYS);
->>>>>>> remotes/origin/upstream
    elm_list_bounce_set(list, EINA_FALSE, EINA_FALSE);
    elm_list_mode_set(list, ELM_LIST_EXPAND);
    evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -1583,11 +1550,6 @@ elm_web_navigate(Evas_Object *obj, int steps)
 #endif
 }
 
-<<<<<<< HEAD
-EAPI Eina_Bool
-elm_web_back_possible(Evas_Object *obj)
-{
-=======
 EINA_DEPRECATED EAPI Eina_Bool
 elm_web_back_possible(Evas_Object *obj)
 {
@@ -1597,7 +1559,6 @@ elm_web_back_possible(Evas_Object *obj)
 EAPI Eina_Bool
 elm_web_back_possible_get(Evas_Object *obj)
 {
->>>>>>> remotes/origin/upstream
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
 #ifdef HAVE_ELEMENTARY_WEB
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1608,11 +1569,6 @@ elm_web_back_possible_get(Evas_Object *obj)
 #endif
 }
 
-<<<<<<< HEAD
-EAPI Eina_Bool
-elm_web_forward_possible(Evas_Object *obj)
-{
-=======
 EINA_DEPRECATED EAPI Eina_Bool
 elm_web_forward_possible(Evas_Object *obj)
 {
@@ -1622,7 +1578,6 @@ elm_web_forward_possible(Evas_Object *obj)
 EAPI Eina_Bool
 elm_web_forward_possible_get(Evas_Object *obj)
 {
->>>>>>> remotes/origin/upstream
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
 #ifdef HAVE_ELEMENTARY_WEB
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1634,7 +1589,7 @@ elm_web_forward_possible_get(Evas_Object *obj)
 }
 
 EAPI Eina_Bool
-elm_web_navigate_possible(Evas_Object *obj, int steps)
+elm_web_navigate_possible_get(Evas_Object *obj, int steps)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
 #ifdef HAVE_ELEMENTARY_WEB
@@ -1647,11 +1602,6 @@ elm_web_navigate_possible(Evas_Object *obj, int steps)
 #endif
 }
 
-<<<<<<< HEAD
-EAPI Eina_Bool
-elm_web_history_enable_get(const Evas_Object *obj)
-{
-=======
 EINA_DEPRECATED EAPI Eina_Bool
 elm_web_history_enable_get(const Evas_Object *obj)
 {
@@ -1661,7 +1611,6 @@ elm_web_history_enable_get(const Evas_Object *obj)
 EAPI Eina_Bool
 elm_web_history_enabled_get(const Evas_Object *obj)
 {
->>>>>>> remotes/origin/upstream
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
 #ifdef HAVE_ELEMENTARY_WEB
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1672,11 +1621,6 @@ elm_web_history_enabled_get(const Evas_Object *obj)
 #endif
 }
 
-<<<<<<< HEAD
-EAPI void
-elm_web_history_enable_set(Evas_Object *obj, Eina_Bool enable)
-{
-=======
 EINA_DEPRECATED EAPI void
 elm_web_history_enable_set(Evas_Object *obj, Eina_Bool enable)
 {
@@ -1686,7 +1630,6 @@ elm_web_history_enable_set(Evas_Object *obj, Eina_Bool enable)
 EAPI void
 elm_web_history_enabled_set(Evas_Object *obj, Eina_Bool enable)
 {
->>>>>>> remotes/origin/upstream
    ELM_CHECK_WIDTYPE(obj, widtype);
 #ifdef HAVE_ELEMENTARY_WEB
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1928,17 +1871,6 @@ elm_web_window_features_unref(Elm_Web_Window_Features *wf)
 #endif
 }
 
-<<<<<<< HEAD
-EAPI void
-elm_web_window_features_bool_property_get(const Elm_Web_Window_Features *wf, Eina_Bool *toolbar_visible, Eina_Bool *statusbar_visible, Eina_Bool *scrollbars_visible, Eina_Bool *menubar_visible, Eina_Bool *locationbar_visible, Eina_Bool *fullscreen)
-{
-#ifdef HAVE_ELEMENTARY_WEB
-   ewk_window_features_bool_property_get((const Ewk_Window_Features *)wf,
-                                         toolbar_visible, statusbar_visible,
-                                         scrollbars_visible, menubar_visible,
-                                         locationbar_visible, fullscreen);
-#else
-=======
 EAPI Eina_Bool
 elm_web_window_features_property_get(const Elm_Web_Window_Features *wf, Elm_Web_Window_Feature_Flag flag)
 {
@@ -1986,7 +1918,6 @@ elm_web_window_features_property_get(const Elm_Web_Window_Features *wf, Elm_Web_
 
    /* What to do with these ?
     
->>>>>>> remotes/origin/upstream
    (void)wf;
    (void)toolbar_visible;
    (void)statusbar_visible;
@@ -1994,13 +1925,6 @@ elm_web_window_features_property_get(const Elm_Web_Window_Features *wf, Elm_Web_
    (void)menubar_visible;
    (void)locationbar_visible;
    (void)fullscreen;
-<<<<<<< HEAD
-#endif
-}
-
-EAPI void
-elm_web_window_features_int_property_get(const Elm_Web_Window_Features *wf, int *x, int *y, int *w, int *h)
-=======
 
    */
 
@@ -2010,30 +1934,23 @@ elm_web_window_features_int_property_get(const Elm_Web_Window_Features *wf, int
 
 EAPI void
 elm_web_window_features_region_get(const Elm_Web_Window_Features *wf, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
->>>>>>> remotes/origin/upstream
 {
 #ifdef HAVE_ELEMENTARY_WEB
    ewk_window_features_int_property_get((const Ewk_Window_Features *)wf,
                                         x, y, w, h);
 #else
-<<<<<<< HEAD
-=======
 
    if (!wf || !x || !y || !w || !h) return;
    /* What to do with these ?
     
->>>>>>> remotes/origin/upstream
    (void)wf;
    (void)x;
    (void)y;
    (void)w;
    (void)h;
-<<<<<<< HEAD
-=======
 
    */
 
->>>>>>> remotes/origin/upstream
 #endif
 }