diff -r 8ba9a23354ff -r 63a5361c11a1 pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Mon Feb 10 01:09:47 2014 +0530 +++ b/pidgin/gtkstatusbox.c Mon Feb 10 02:09:20 2014 +0530 @@ -60,8 +60,8 @@ /* Timeout for typing notifications in seconds */ #define TYPING_TIMEOUT 4 -static void webview_changed_cb(GtkWebView *webview, void *data); -static void webview_format_changed_cb(GtkWebView *webview, GtkWebViewButtons buttons, void *data); +static void webview_changed_cb(PidginWebView *webview, void *data); +static void webview_format_changed_cb(PidginWebView *webview, PidginWebViewButtons buttons, void *data); static void remove_typing_cb(PidginStatusBox *box); static void update_size (PidginStatusBox *box); static gint get_statusbox_index(PidginStatusBox *box, PurpleSavedStatus *saved_status); @@ -264,8 +264,8 @@ #if 0 /* TODO WebKit: Doesn't do this? */ - gtk_webview_set_populate_primary_clipboard( - GTK_WEBVIEW(status_box->webview), TRUE); + pidgin_webview_set_populate_primary_clipboard( + PIDGIN_WEBVIEW(status_box->webview), TRUE); #endif if (status_no != -1) { @@ -288,7 +288,7 @@ { gtk_widget_show_all(status_box->vbox); status_box->webview_visible = TRUE; - gtk_webview_load_html_string(GTK_WEBVIEW(status_box->webview), message); + pidgin_webview_load_html_string(PIDGIN_WEBVIEW(status_box->webview), message); } gtk_widget_set_sensitive(GTK_WIDGET(status_box), TRUE); pidgin_status_box_refresh(status_box); @@ -879,8 +879,8 @@ */ gtk_widget_set_sensitive(GTK_WIDGET(status_box->webview), FALSE); - gtk_webview_load_html_string(GTK_WEBVIEW(status_box->webview), ""); - gtk_webview_clear_formatting(GTK_WEBVIEW(status_box->webview)); + pidgin_webview_load_html_string(PIDGIN_WEBVIEW(status_box->webview), ""); + pidgin_webview_clear_formatting(PIDGIN_WEBVIEW(status_box->webview)); if (!purple_savedstatus_is_transient(saved_status) || !message || !*message) { @@ -892,7 +892,7 @@ status_box->webview_visible = TRUE; gtk_widget_show_all(status_box->vbox); - gtk_webview_load_html_string(GTK_WEBVIEW(status_box->webview), message); + pidgin_webview_load_html_string(PIDGIN_WEBVIEW(status_box->webview), message); } gtk_widget_set_sensitive(GTK_WIDGET(status_box->webview), TRUE); @@ -1073,19 +1073,19 @@ } static gboolean -combo_box_scroll_event_cb(GtkWidget *w, GdkEventScroll *event, GtkWebView *webview) +combo_box_scroll_event_cb(GtkWidget *w, GdkEventScroll *event, PidginWebView *webview) { pidgin_status_box_popup(PIDGIN_STATUS_BOX(w), (GdkEvent *)event); return TRUE; } static gboolean -webview_scroll_event_cb(GtkWidget *w, GdkEventScroll *event, GtkWebView *webview) +webview_scroll_event_cb(GtkWidget *w, GdkEventScroll *event, PidginWebView *webview) { if (event->direction == GDK_SCROLL_UP) - gtk_webview_page_up(webview); + pidgin_webview_page_up(webview); else if (event->direction == GDK_SCROLL_DOWN) - gtk_webview_page_down(webview); + pidgin_webview_page_down(webview); return TRUE; } @@ -1115,8 +1115,8 @@ status_box->typing = 0; #if 0 /* TODO WebKit: Doesn't do this? */ - gtk_webview_set_populate_primary_clipboard( - GTK_WEBVIEW(status_box->webview), TRUE); + pidgin_webview_set_populate_primary_clipboard( + PIDGIN_WEBVIEW(status_box->webview), TRUE); #endif if (status_box->account != NULL) update_to_reflect_account_status(status_box, status_box->account, @@ -1218,7 +1218,7 @@ { PidginStatusBox *status_box = (PidginStatusBox *)data; - pidgin_webview_set_spellcheck(GTK_WEBVIEW(status_box->webview), + pidgin_webview_set_spellcheck(PIDGIN_WEBVIEW(status_box->webview), (gboolean)GPOINTER_TO_INT(value)); } @@ -1678,7 +1678,7 @@ } static void -webview_cursor_moved_cb(gpointer data, GtkWebView *webview) +webview_cursor_moved_cb(gpointer data, PidginWebView *webview) { /* Restart the typing timeout if arrow keys are pressed while editing the message */ PidginStatusBox *status_box = data; @@ -1833,7 +1833,7 @@ status_box->vbox = gtk_vbox_new(0, FALSE); status_box->sw = pidgin_create_webview(TRUE, &status_box->webview, NULL); - gtk_webview_hide_toolbar(GTK_WEBVIEW(status_box->webview)); + pidgin_webview_hide_toolbar(PIDGIN_WEBVIEW(status_box->webview)); #if 0 g_signal_connect(G_OBJECT(status_box->toggle_button), "button-press-event", @@ -1855,7 +1855,7 @@ G_CALLBACK(webview_remove_focus), status_box); if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck")) - pidgin_webview_set_spellcheck(GTK_WEBVIEW(status_box->webview), TRUE); + pidgin_webview_set_spellcheck(PIDGIN_WEBVIEW(status_box->webview), TRUE); gtk_widget_set_parent(status_box->vbox, GTK_WIDGET(status_box)); gtk_widget_show_all(status_box->vbox); @@ -2635,8 +2635,8 @@ #if 0 /* TODO WebKit: Doesn't do this? */ - gtk_webview_set_populate_primary_clipboard( - GTK_WEBVIEW(status_box->webview), TRUE); + pidgin_webview_set_populate_primary_clipboard( + PIDGIN_WEBVIEW(status_box->webview), TRUE); #endif purple_timeout_remove(status_box->typing); @@ -2742,8 +2742,8 @@ gtk_widget_grab_focus(status_box->webview); #if 0 /* TODO WebKit: Doesn't do this? */ - gtk_webview_set_populate_primary_clipboard( - GTK_WEBVIEW(status_box->webview), FALSE); + pidgin_webview_set_populate_primary_clipboard( + PIDGIN_WEBVIEW(status_box->webview), FALSE); #endif webkit_web_view_select_all(WEBKIT_WEB_VIEW(status_box->webview)); @@ -2784,7 +2784,7 @@ } static void -webview_changed_cb(GtkWebView *webview, void *data) +webview_changed_cb(PidginWebView *webview, void *data) { PidginStatusBox *status_box = (PidginStatusBox*)data; if (gtk_widget_get_sensitive(GTK_WIDGET(status_box))) @@ -2799,7 +2799,7 @@ } static void -webview_format_changed_cb(GtkWebView *webview, GtkWebViewButtons buttons, void *data) +webview_format_changed_cb(PidginWebView *webview, PidginWebViewButtons buttons, void *data) { webview_changed_cb(NULL, data); } @@ -2807,7 +2807,7 @@ char *pidgin_status_box_get_message(PidginStatusBox *status_box) { if (status_box->webview_visible) - return g_strstrip(gtk_webview_get_body_text(GTK_WEBVIEW(status_box->webview))); + return g_strstrip(pidgin_webview_get_body_text(PIDGIN_WEBVIEW(status_box->webview))); else return NULL; }