commit c4418f781d0ecb1e62dc4c801b94de53144e0905
parent ddc2a04d185ee544de468a65f8aa88a732ebb246
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Tue, 9 Oct 2012 21:20:18 -0600
track new changes to webkit2 api
just change ewk_view_uri_* to ewk_view_url_*
Diffstat:
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/callbacks.c b/src/callbacks.c
@@ -171,7 +171,7 @@ webview_load_finished_cb(void *data, Evas_Object *obj, void *event_info)
Hist_Item *item;
App_Data *ad = wd->app;
const char *title = ewk_view_title_get(bd->view);
- const char *url = ewk_view_uri_get(bd->view);
+ const char *url = ewk_view_url_get(bd->view);
item = hist_items_get(ad->history, url);
if (item && hist_item_enabled_get(item)) {
@@ -1068,9 +1068,9 @@ setup_url_scheme_callbacks(Ewk_Context *ewk_context)
};
for (i = 0; i < LENGTH(uri_handlers); i++)
- ewk_context_uri_scheme_register(ewk_context, uri_handlers[i].handle,
+ ewk_context_url_scheme_register(ewk_context, uri_handlers[i].handle,
generic_url_scheme_request_cb, uri_handlers[i].handler);
- ewk_context_uri_scheme_register(ewk_context, "about:", about_url_scheme_request_cb, NULL);
+ ewk_context_url_scheme_register(ewk_context, "about:", about_url_scheme_request_cb, NULL);
}
diff --git a/src/commands.c b/src/commands.c
@@ -279,7 +279,7 @@ descend(const Arg *arg, void *data)
{
Window_Data *ad = data;
// char *source = (char*)webkit_web_view_get_uri(webview), *p = &source[0], *new;
- const char *source = ewk_view_uri_get(ad->cur_buf->view);
+ const char *source = ewk_view_url_get(ad->cur_buf->view);
const char *p = &source[0];
char *new;
@@ -311,7 +311,7 @@ descend(const Arg *arg, void *data)
memcpy(new, source, len);
new[len] = '\0';
// webkit_web_view_load_uri(webview, new);
- ewk_view_uri_set(ad->cur_buf->view, new);
+ ewk_view_url_set(ad->cur_buf->view, new);
free(new);
return TRUE;
}
@@ -354,7 +354,7 @@ input(const Arg *arg, void *data)
*/
elm_entry_entry_set(ad->url, arg->s);
- if (arg->i & InsertCurrentURL && (url = ewk_view_uri_get(ad->cur_buf->view)))
+ if (arg->i & InsertCurrentURL && (url = ewk_view_url_get(ad->cur_buf->view)))
elm_entry_entry_append(ad->url, url);
// evas_object_focus_set(ad->cur_buf->view, EINA_FALSE);
@@ -444,7 +444,7 @@ number(const Arg *arg, void *data)
{
Window_Data *ad = data;
// const char *source = webkit_web_view_get_uri(webview);
- const char *source = ewk_view_uri_get(ad->cur_buf->view);
+ const char *source = ewk_view_url_get(ad->cur_buf->view);
char *uri, *p, *new;
int number, diff = (ad->count ? ad->count : 1) * (arg->i == Increment ? 1 : -1);
@@ -465,7 +465,7 @@ number(const Arg *arg, void *data)
*p = '\0';
new = strdup_printf("%s%d", uri, number); /* create new uri */
// webkit_web_view_load_uri(webview, new);
- ewk_view_uri_set(ad->cur_buf->view, new);
+ ewk_view_url_set(ad->cur_buf->view, new);
free(new);
free(uri);
return TRUE;
@@ -550,7 +550,7 @@ open_arg(const Arg *arg, void *data)
}
}
// webkit_web_view_load_uri(webview, new);
- ewk_view_uri_set(ad->cur_buf->view, new);
+ ewk_view_url_set(ad->cur_buf->view, new);
free(new);
} else {
buffer_add(SwitchToBuffer, ad, NULL, NULL);
@@ -1099,10 +1099,10 @@ proxy(const Arg *arg, void *data)
// ewk_network_proxy_uri_set(NULL);
g_object_set(ad->app->soup_session, "proxy-uri", NULL, NULL);
bd->proxy_enabled = EINA_FALSE;
- update_url(ewk_view_uri_get(bd->view), data);
+ update_url(ewk_view_url_get(bd->view), data);
} else if (enable_proxy(ad->cur_buf)) {
bd->proxy_enabled = EINA_TRUE;
- update_url(ewk_view_uri_get(bd->view), data);
+ update_url(ewk_view_url_get(bd->view), data);
ewk_view_reload(bd->view);
}
@@ -1332,7 +1332,7 @@ list(const Arg *arg, void *data)
elm_object_text_set(label, status_buf);
/*
- icon = ewk_settings_icon_database_icon_object_get(ewk_view_uri_get(td->view), e);
+ icon = ewk_settings_icon_database_icon_object_get(ewk_view_url_get(td->view), e);
// evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(icon, 0.0, EVAS_HINT_FILL);
evas_object_size_hint_max_set(icon, 14, 14);
@@ -1347,7 +1347,7 @@ list(const Arg *arg, void *data)
elm_box_pack_end(row, label);
evas_object_show(label);
url = strdup_printf("<font=Monospace font_size=11 backing=on backing_color=#FFF>%s</font>",
- ewk_view_uri_get(td->view));
+ ewk_view_url_get(td->view));
elm_object_text_set(label, url);
free(url);
@@ -1428,13 +1428,13 @@ inspector(const Arg *arg, void *data)
ewk_view_setting_enable_developer_extras_set(bd->view, EINA_TRUE);
ewk_view_web_inspector_show(bd->view);
bd->inspector_enabled = EINA_TRUE;
- update_url(ewk_view_uri_get(bd->view), data);
+ update_url(ewk_view_url_get(bd->view), data);
}
else {
ewk_view_web_inspector_close(bd->view);
bd->inspector_enabled = EINA_FALSE;
ewk_view_setting_enable_developer_extras_set(bd->view, EINA_FALSE);
- update_url(ewk_view_uri_get(bd->view), data);
+ update_url(ewk_view_url_get(bd->view), data);
}
*/
@@ -1446,15 +1446,15 @@ toggle_history(const Arg *arg, void *data)
{
Window_Data *ad = data;
Buffer_Data *bd = ad->cur_buf;
- Hist_Item *item = hist_items_get(ad->app->history, ewk_view_uri_get(bd->view));
+ Hist_Item *item = hist_items_get(ad->app->history, ewk_view_url_get(bd->view));
Eina_Bool enab = hist_item_enabled_get(item);
if (enab) {
hist_item_enabled_set(item, EINA_FALSE);
- update_url(ewk_view_uri_get(bd->view), data);
+ update_url(ewk_view_url_get(bd->view), data);
} else {
hist_item_enabled_set(item, EINA_TRUE);
- update_url(ewk_view_uri_get(bd->view), data);
+ update_url(ewk_view_url_get(bd->view), data);
}
return EINA_TRUE;
@@ -1469,12 +1469,12 @@ toggle_cookies(const Arg *arg, void *data)
if (bd->cookies_enabled) {
bd->cookies_enabled = EINA_FALSE;
// ewk_cookies_policy_set(EWK_COOKIE_JAR_ACCEPT_NEVER);
- update_url(ewk_view_uri_get(bd->view), data);
+ update_url(ewk_view_url_get(bd->view), data);
}
else {
bd->cookies_enabled = EINA_TRUE;
// ewk_cookies_policy_set(EWK_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
- update_url(ewk_view_uri_get(bd->view), data);
+ update_url(ewk_view_url_get(bd->view), data);
}
return EINA_TRUE;
diff --git a/src/main.c b/src/main.c
@@ -53,7 +53,7 @@ session_save_cb(void *data)
}
url = session_item_url_get(si);
- wk_url = ewk_view_uri_get(view);
+ wk_url = ewk_view_url_get(view);
if ((url && wk_url && strcmp(url, wk_url)) || (wk_url && !url)) {
session_item_url_set(si, wk_url);
changed = EINA_TRUE;
diff --git a/src/utilities.c b/src/utilities.c
@@ -1192,15 +1192,15 @@ buffer_add(const unsigned char flags, Window_Data *wd, const char *url, Session_
setup_buffer_callbacks(td);
if (url)
- ewk_view_uri_set(td->view, url);
+ ewk_view_url_set(td->view, url);
else
- ewk_view_uri_set(td->view, config_home_page_get(wd->app->config));
+ ewk_view_url_set(td->view, config_home_page_get(wd->app->config));
if (flags & SwitchToBuffer)
buffer_current_set(td);
if (!session_item) {
- if (!(session_item = session_item_new(ewk_view_uri_get(td->view), EINA_FALSE, 0, 0)))
+ if (!(session_item = session_item_new(ewk_view_url_get(td->view), EINA_FALSE, 0, 0)))
CRITICAL("Could not create session object");
session_window_tabs_add(wd->session_window, session_item);
}
@@ -1249,7 +1249,7 @@ buffer_current_set(Buffer_Data *new_buf)
ewk_cookies_policy_set(EWK_COOKIE_JAR_ACCEPT_NEVER);
*/
evas_object_show(new_buf->view);
- update_url(ewk_view_uri_get(new_buf->view), wd);
+ update_url(ewk_view_url_get(new_buf->view), wd);
}
}
@@ -1498,7 +1498,7 @@ status_flags(void *data)
strcat(flags, bd->proxy_enabled ? "P" : " ");
strcat(flags, bd->inspector_enabled ? "I" : " ");
// strcat(flags, bd->history_enabled ? "H" : " ");
- Hist_Item *item = hist_items_get(bd->window->app->history, ewk_view_uri_get(bd->view));
+ Hist_Item *item = hist_items_get(bd->window->app->history, ewk_view_url_get(bd->view));
strcat(flags, (item && hist_item_enabled_get(item)) ? "H" : " ");
strcat(flags, bd->cookies_enabled ? "C" : " ");
*/
