--- a/pidgin/gtkwebview.c Sat Jun 02 19:08:43 2012 +0000
+++ b/pidgin/gtkwebview.c Sun Jun 03 07:40:47 2012 +0000
@@ -868,49 +868,61 @@
+do_formatting(GtkWebView *webview, const char *name, const char *value) + GtkWebViewPriv *priv = GTK_WEBVIEW_GET_PRIVATE(webview); + WebKitDOMDocument *dom; + WebKitDOMDOMWindow *win = NULL; + WebKitDOMDOMSelection *sel; + WebKitDOMRange *range = NULL; + dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview)); + win = webkit_dom_document_get_default_view(dom); + sel = webkit_dom_dom_window_get_selection(win); + range = webkit_dom_dom_selection_get_range_at(sel, 0, NULL); + webkit_web_view_select_all(WEBKIT_WEB_VIEW(webview)); + webkit_dom_document_exec_command(dom, name, FALSE, value); + sel = webkit_dom_dom_window_get_selection(win); + webkit_dom_dom_selection_remove_all_ranges(sel); + webkit_dom_dom_selection_add_range(sel, range); gtk_webview_toggle_bold(GtkWebView *webview)
- WebKitDOMDocument *dom;
- dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
- webkit_dom_document_exec_command(dom, "bold", FALSE, "");
+ do_formatting(webview, "bold", ""); gtk_webview_toggle_italic(GtkWebView *webview)
- WebKitDOMDocument *dom;
- dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
- webkit_dom_document_exec_command(dom, "italic", FALSE, "");
+ do_formatting(webview, "italic", ""); gtk_webview_toggle_underline(GtkWebView *webview)
- WebKitDOMDocument *dom;
- dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
- webkit_dom_document_exec_command(dom, "underline", FALSE, "");
+ do_formatting(webview, "underline", ""); gtk_webview_toggle_strike(GtkWebView *webview)
- WebKitDOMDocument *dom;
- dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
- webkit_dom_document_exec_command(dom, "strikethrough", FALSE, "");
+ do_formatting(webview, "strikethrough", ""); gtk_webview_toggle_forecolor(GtkWebView *webview, const char *color)
- WebKitDOMDocument *dom;
- dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
- webkit_dom_document_exec_command(dom, "foreColor", FALSE, color);
+ do_formatting(webview, "foreColor", color); @@ -918,10 +930,7 @@
gtk_webview_toggle_backcolor(GtkWebView *webview, const char *color)
- WebKitDOMDocument *dom;
- dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
- webkit_dom_document_exec_command(dom, "backColor", FALSE, color);
+ do_formatting(webview, "backColor", color); @@ -929,10 +938,7 @@
gtk_webview_toggle_fontface(GtkWebView *webview, const char *face)
- WebKitDOMDocument *dom;
- dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
- webkit_dom_document_exec_command(dom, "fontName", FALSE, face);
+ do_formatting(webview, "fontName", face); @@ -940,44 +946,36 @@
gtk_webview_font_set_size(GtkWebView *webview, gint size)
- WebKitDOMDocument *dom;
- dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
- tmp = g_strdup_printf("%d", size);
- webkit_dom_document_exec_command(dom, "fontSize", FALSE, tmp);
+ char *tmp = g_strdup_printf("%d", size); + do_formatting(webview, "fontSize", tmp); gtk_webview_font_shrink(GtkWebView *webview)
- WebKitDOMDocument *dom;
fontsize = gtk_webview_get_current_fontsize(webview);
fontsize = MAX(fontsize - 1, 1);
- dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
tmp = g_strdup_printf("%d", fontsize);
- webkit_dom_document_exec_command(dom, "fontSize", FALSE, tmp);
+ do_formatting(webview, "fontSize", tmp); gtk_webview_font_grow(GtkWebView *webview)
- WebKitDOMDocument *dom;
fontsize = gtk_webview_get_current_fontsize(webview);
fontsize = MIN(fontsize + 1, MAX_FONT_SIZE);
- dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
tmp = g_strdup_printf("%d", fontsize);
- webkit_dom_document_exec_command(dom, "fontSize", FALSE, tmp);
+ do_formatting(webview, "fontSize", tmp);