Mercurial > pidgin
comparison pidgin/gtknotify.c @ 32808:b8cbd52e26b1
Remove _with_imgstore suffix on this function. There isn't a version
without it anyway.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Thu, 31 May 2012 00:36:55 +0000 |
parents | 763d65f3f758 |
children |
comparison
equal
deleted
inserted
replaced
32807:fb8263d936e5 | 32808:b8cbd52e26b1 |
---|---|
889 g_signal_connect(G_OBJECT(window), "key_press_event", | 889 g_signal_connect(G_OBJECT(window), "key_press_event", |
890 G_CALLBACK(formatted_input_cb), NULL); | 890 G_CALLBACK(formatted_input_cb), NULL); |
891 | 891 |
892 /* Make sure URLs are clickable */ | 892 /* Make sure URLs are clickable */ |
893 linked_text = purple_markup_linkify(text); | 893 linked_text = purple_markup_linkify(text); |
894 webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(web_view), linked_text, ""); | 894 gtk_webview_load_html_string(GTK_WEBVIEW(web_view), linked_text); |
895 g_free(linked_text); | 895 g_free(linked_text); |
896 | 896 |
897 g_object_set_data(G_OBJECT(window), "webview-widget", web_view); | 897 g_object_set_data(G_OBJECT(window), "webview-widget", web_view); |
898 | 898 |
899 /* Show the window */ | 899 /* Show the window */ |
1149 info = purple_notify_user_info_get_text_with_newline(user_info, "<br />"); | 1149 info = purple_notify_user_info_get_text_with_newline(user_info, "<br />"); |
1150 pinfo = g_hash_table_lookup(userinfo, key); | 1150 pinfo = g_hash_table_lookup(userinfo, key); |
1151 if (pinfo != NULL) { | 1151 if (pinfo != NULL) { |
1152 GtkWidget *webview = g_object_get_data(G_OBJECT(pinfo->window), "webview-widget"); | 1152 GtkWidget *webview = g_object_get_data(G_OBJECT(pinfo->window), "webview-widget"); |
1153 char *linked_text = purple_markup_linkify(info); | 1153 char *linked_text = purple_markup_linkify(info); |
1154 gtk_webview_load_html_string_with_imgstore(GTK_WEBVIEW(webview), linked_text); | 1154 gtk_webview_load_html_string(GTK_WEBVIEW(webview), linked_text); |
1155 g_free(linked_text); | 1155 g_free(linked_text); |
1156 g_free(key); | 1156 g_free(key); |
1157 ui_handle = pinfo->window; | 1157 ui_handle = pinfo->window; |
1158 pinfo->count++; | 1158 pinfo->count++; |
1159 } else { | 1159 } else { |