Mercurial > pidgin.yaz
diff pidgin/gtknotify.c @ 32594:8e1ec44ede75
Clean up this WebKit stuff. Fix up broken merging, mark unfinished
work with FIXME/TODO, and fix this ungodly formatting.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Thu, 08 Sep 2011 22:04:35 +0000 |
| parents | 472e70ea58ed |
| children | 3b4c865dc2ce |
line wrap: on
line diff
--- a/pidgin/gtknotify.c Thu Sep 08 05:13:53 2011 +0000 +++ b/pidgin/gtknotify.c Thu Sep 08 22:04:35 2011 +0000 @@ -856,11 +856,11 @@ /* Add the webview */ scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - web_view = gtk_webview_new (); - gtk_container_add (GTK_CONTAINER (scrolled_window), web_view); + web_view = gtk_webview_new(); + gtk_container_add(GTK_CONTAINER(scrolled_window), web_view); gtk_widget_set_name(web_view, "pidgin_notify_webview"); gtk_widget_set_size_request(web_view, 300, 250); @@ -878,7 +878,7 @@ /* Make sure URLs are clickable */ linked_text = purple_markup_linkify(text); - webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (web_view), linked_text, ""); + webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(web_view), linked_text, ""); g_free(linked_text); g_object_set_data(G_OBJECT(window), "webview-widget", web_view); @@ -1138,9 +1138,8 @@ if (pinfo != NULL) { GtkWidget *webview = g_object_get_data(G_OBJECT(pinfo->window), "webview-widget"); char *linked_text = purple_markup_linkify(info); - g_assert (webview); - printf ("%s\n", linked_text); - gtk_webview_load_html_string_with_imgstore (GTK_WEBVIEW (webview), linked_text); + g_assert(webview); + gtk_webview_load_html_string_with_imgstore(GTK_WEBVIEW(webview), linked_text); g_free(linked_text); g_free(key); ui_handle = pinfo->window; @@ -1640,7 +1639,7 @@ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), + gtk_box_pack_start(GTK_BOX(vbox), pidgin_make_scrollable(spec_dialog->treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1), TRUE, TRUE, 2);