comparison: pidgin/gtkwebview.c
pidgin/gtkwebview.c
- changeset 35713
- 4423f463a782
- parent 35648
- 6283b3708b03
- child 35714
- bb2c91c3e2db
equal
deleted
inserted
replaced
| 35712:02bb71f502fc | 35713:4423f463a782 |
|---|---|
| 658 priv = PIDGIN_WEBVIEW_GET_PRIVATE(webview); | 658 priv = PIDGIN_WEBVIEW_GET_PRIVATE(webview); |
| 659 | 659 |
| 660 unescaped = purple_unescape_html(smiley); | 660 unescaped = purple_unescape_html(smiley); |
| 661 webview_smiley = pidgin_webview_smiley_find(webview, sml, unescaped); | 661 webview_smiley = pidgin_webview_smiley_find(webview, sml, unescaped); |
| 662 | 662 |
| 663 #if 0 | |
| 664 /* TODO */ | |
| 663 if (priv->format_functions & PIDGIN_WEBVIEW_SMILEY) { | 665 if (priv->format_functions & PIDGIN_WEBVIEW_SMILEY) { |
| 664 char *tmp; | 666 char *tmp; |
| 665 /* TODO Better smiley insertion... */ | 667 /* TODO Better smiley insertion... */ |
| 666 tmp = g_strdup_printf("<img isEmoticon src='purple-smiley:%p' alt='%s'>", | 668 tmp = g_strdup_printf("<img isEmoticon src='purple-smiley:%p' alt='%s'>", |
| 667 webview_smiley, smiley); | 669 webview_smiley, smiley); |
| 668 pidgin_webview_append_html(webview, tmp); | 670 pidgin_webview_append_html(webview, tmp); |
| 669 g_free(tmp); | 671 g_free(tmp); |
| 670 } else { | 672 } else |
| 673 #endif | |
| 674 { | |
| 671 pidgin_webview_append_html(webview, smiley); | 675 pidgin_webview_append_html(webview, smiley); |
| 672 } | 676 } |
| 673 | 677 |
| 674 g_free(unescaped); | 678 g_free(unescaped); |
| 675 } | 679 } |
| 2440 g_return_if_fail(priv->toolbar != NULL); | 2444 g_return_if_fail(priv->toolbar != NULL); |
| 2441 | 2445 |
| 2442 pidgin_webviewtoolbar_activate(priv->toolbar, action); | 2446 pidgin_webviewtoolbar_activate(priv->toolbar, action); |
| 2443 } | 2447 } |
| 2444 | 2448 |
| 2449 void | |
| 2450 pidgin_webview_switch_active_conversation(PidginWebView *webview, | |
| 2451 PurpleConversation *conv) | |
| 2452 { | |
| 2453 PidginWebViewPriv *priv = PIDGIN_WEBVIEW_GET_PRIVATE(webview); | |
| 2454 | |
| 2455 g_return_if_fail(priv != NULL); | |
| 2456 g_return_if_fail(priv->toolbar != NULL); | |
| 2457 | |
| 2458 pidgin_webviewtoolbar_switch_active_conversation(priv->toolbar, conv); | |
| 2459 } |
