diff options
| author | Tomas Popela <tpopela@redhat.com> | 2014-06-09 22:32:25 +0800 |
|---|---|---|
| committer | Tomas Popela <tpopela@redhat.com> | 2014-06-09 22:32:25 +0800 |
| commit | 8650fb139a9143f04615de74ff569bce3e0c4ce3 (patch) | |
| tree | 89a41d08f179a5359b8eaee0c9344b8a5bf07cb3 /modules/itip-formatter/itip-view.c | |
| parent | 04b7c97275ae420dca43f3e65c2ef54d02f01bdd (diff) | |
| download | gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.gz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.bz2 gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.lz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.xz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.zst gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.zip | |
Bug 540362: [webkit-composer] Use webkit for composer
Merge wip/webkit-composer branch into master.
Diffstat (limited to 'modules/itip-formatter/itip-view.c')
| -rw-r--r-- | modules/itip-formatter/itip-view.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c index f19c418923..64d075e4fa 100644 --- a/modules/itip-formatter/itip-view.c +++ b/modules/itip-formatter/itip-view.c @@ -791,13 +791,7 @@ alarm_check_toggled_cb (WebKitDOMHTMLInputElement *check1, WebKitDOMElement *check2; gchar *id; -#if WEBKIT_CHECK_VERSION(2,2,0) /* XXX should really be (2,1,something) */ - id = webkit_dom_element_get_id ( - WEBKIT_DOM_ELEMENT (check1)); -#else - id = webkit_dom_html_element_get_id ( - WEBKIT_DOM_HTML_ELEMENT (check1)); -#endif + id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (check1)); if (g_strcmp0 (id, CHECKBOX_INHERIT_ALARM)) { check2 = webkit_dom_document_get_element_by_id ( @@ -906,11 +900,7 @@ append_info_item_row (ItipView *view, WEBKIT_DOM_HTML_TABLE_ELEMENT (table), -1, NULL); id = g_strdup_printf ("%s_row_%d", table_id, item->id); -#if WEBKIT_CHECK_VERSION(2,2,0) /* XXX should really be (2,1,something) */ webkit_dom_element_set_id (WEBKIT_DOM_ELEMENT (row), id); -#else - webkit_dom_html_element_set_id (row, id); -#endif g_free (id); switch (item->type) { @@ -932,7 +922,7 @@ append_info_item_row (ItipView *view, } cell = webkit_dom_html_table_row_element_insert_cell ( - (WebKitDOMHTMLTableRowElement *) row, -1, NULL); + WEBKIT_DOM_HTML_TABLE_ROW_ELEMENT (row), -1, NULL); if (icon_name) { WebKitDOMElement *image; @@ -953,7 +943,7 @@ append_info_item_row (ItipView *view, } cell = webkit_dom_html_table_row_element_insert_cell ( - (WebKitDOMHTMLTableRowElement *) row, -1, NULL); + WEBKIT_DOM_HTML_TABLE_ROW_ELEMENT (row), -1, NULL); webkit_dom_html_element_set_inner_html (cell, item->message, NULL); |