From: Daniel Carl Date: Thu, 16 Jun 2016 22:00:46 +0000 (+0200) Subject: Don't use deprecated node list api. X-Git-Url: https://git.owens.tech/assets/me.png/assets/me.png/git?a=commitdiff_plain;h=f85e43d06957e517bbae0e62fd0e9486d6246b66;p=vimb.git Don't use deprecated node list api. --- diff --git a/src/webextension/ext-dom.c b/src/webextension/ext-dom.c index 911e4e3..7c0b7cd 100644 --- a/src/webextension/ext-dom.c +++ b/src/webextension/ext-dom.c @@ -83,19 +83,19 @@ gboolean ext_dom_is_editable(WebKitDOMElement *element) gboolean ext_dom_focus_input(WebKitDOMDocument *doc) { WebKitDOMNode *html, *node; - WebKitDOMNodeList *list; + WebKitDOMHTMLCollection *collection; WebKitDOMXPathNSResolver *resolver; WebKitDOMXPathResult* result; WebKitDOMDocument *frame_doc; guint i, len; - list = webkit_dom_document_get_elements_by_tag_name(doc, "html"); - if (!list) { + collection = webkit_dom_document_get_elements_by_tag_name_as_html_collection(doc, "html"); + if (!collection) { return FALSE; } - html = webkit_dom_node_list_item(list, 0); - g_object_unref(list); + html = webkit_dom_html_collection_item(collection, 0); + g_object_unref(collection); resolver = webkit_dom_document_create_ns_resolver(doc, html); if (!resolver) { @@ -134,19 +134,19 @@ gboolean ext_dom_focus_input(WebKitDOMDocument *doc) } /* Look for editable elements in frames too. */ - list = webkit_dom_document_get_elements_by_tag_name(doc, "iframe"); - len = webkit_dom_node_list_get_length(list); + collection = webkit_dom_document_get_elements_by_tag_name_as_html_collection(doc, "iframe"); + len = webkit_dom_html_collection_get_length(collection); for (i = 0; i < len; i++) { - node = webkit_dom_node_list_item(list, i); + node = webkit_dom_html_collection_item(collection, i); frame_doc = webkit_dom_html_iframe_element_get_content_document(WEBKIT_DOM_HTML_IFRAME_ELEMENT(node)); /* Stop on first frame with focused element. */ if (ext_dom_focus_input(frame_doc)) { - g_object_unref(list); + g_object_unref(collection); return TRUE; } } - g_object_unref(list); + g_object_unref(collection); return FALSE; }