projects
/
framework
/
uifw
/
elementary.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/upstream'
[framework/uifw/elementary.git]
/
src
/
bin
/
test_web.c
diff --git
a/src/bin/test_web.c
b/src/bin/test_web.c
index
223b844
..
86cf89c
100644
(file)
--- a/
src/bin/test_web.c
+++ b/
src/bin/test_web.c
@@
-69,8
+69,13
@@
_uri_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info)
elm_object_text_set(wt->url_entry, event_info);
elm_object_text_set(wt->url_entry, event_info);
+<<<<<<< HEAD
elm_object_disabled_set(wt->btn_back, !elm_web_back_possible(wt->web));
elm_object_disabled_set(wt->btn_fwd, !elm_web_forward_possible(wt->web));
elm_object_disabled_set(wt->btn_back, !elm_web_back_possible(wt->web));
elm_object_disabled_set(wt->btn_fwd, !elm_web_forward_possible(wt->web));
+=======
+ elm_object_disabled_set(wt->btn_back, !elm_web_back_possible_get(wt->web));
+ elm_object_disabled_set(wt->btn_fwd, !elm_web_forward_possible_get(wt->web));
+>>>>>>> remotes/origin/upstream
}
static void
}
static void
@@
-133,7
+138,11
@@
_alert_hook(void *data __UNUSED__, Evas_Object *obj, const char *message)
elm_notify_orient_set(popup, ELM_NOTIFY_ORIENT_CENTER);
// Using the timeout doesn't seem to go well with the second main loop
//elm_notify_timeout_set(popup, 2.0);
elm_notify_orient_set(popup, ELM_NOTIFY_ORIENT_CENTER);
// Using the timeout doesn't seem to go well with the second main loop
//elm_notify_timeout_set(popup, 2.0);
+<<<<<<< HEAD
elm_notify_repeat_events_set(popup, EINA_FALSE);
elm_notify_repeat_events_set(popup, EINA_FALSE);
+=======
+ elm_notify_allow_events_set(popup, EINA_FALSE);
+>>>>>>> remotes/origin/upstream
evas_object_show(popup);
evas_object_smart_callback_add(popup, "block,clicked", _alert_del, NULL);
evas_object_show(popup);
evas_object_smart_callback_add(popup, "block,clicked", _alert_del, NULL);
@@
-173,7
+182,11
@@
_confirm_hook(void *data __UNUSED__, Evas_Object *obj, const char *message, Eina
popup = elm_notify_add(obj);
elm_notify_orient_set(popup, ELM_NOTIFY_ORIENT_CENTER);
popup = elm_notify_add(obj);
elm_notify_orient_set(popup, ELM_NOTIFY_ORIENT_CENTER);
+<<<<<<< HEAD
elm_notify_repeat_events_set(popup, EINA_FALSE);
elm_notify_repeat_events_set(popup, EINA_FALSE);
+=======
+ elm_notify_allow_events_set(popup, EINA_FALSE);
+>>>>>>> remotes/origin/upstream
evas_object_show(popup);
box = elm_box_add(obj);
evas_object_show(popup);
box = elm_box_add(obj);