diff -r c4c5e0a670b1 -r ae6432ea326f pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Mon Feb 10 00:56:22 2014 +0530
+++ b/pidgin/gtkprefs.c	Mon Feb 10 01:40:39 2014 +0530
@@ -591,7 +591,7 @@
 		return;
 
 	while (themes) {
-		struct smiley_theme *theme = themes->data;
+		struct PidginSmileyTheme *theme = themes->data;
 		char *description = get_theme_markup(_(theme->name), FALSE,
 		                                     _(theme->author), _(theme->desc));
 		gtk_list_store_append(prefs_smiley_themes, &iter);
@@ -1533,30 +1533,30 @@
 }
 
 static void
-formatting_toggle_cb(GtkWebView *webview, GtkWebViewButtons buttons, void *data)
+formatting_toggle_cb(PidginWebView *webview, PidginWebViewButtons buttons, void *data)
 {
 	gboolean bold, italic, uline, strike;
 
-	gtk_webview_get_current_format(webview, &bold, &italic, &uline, &strike);
-
-	if (buttons & GTK_WEBVIEW_BOLD)
+	pidgin_webview_get_current_format(webview, &bold, &italic, &uline, &strike);
+
+	if (buttons & PIDGIN_WEBVIEW_BOLD)
 		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold",
 		                      bold);
-	if (buttons & GTK_WEBVIEW_ITALIC)
+	if (buttons & PIDGIN_WEBVIEW_ITALIC)
 		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_italic",
 		                      italic);
-	if (buttons & GTK_WEBVIEW_UNDERLINE)
+	if (buttons & PIDGIN_WEBVIEW_UNDERLINE)
 		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_underline",
 		                      uline);
-	if (buttons & GTK_WEBVIEW_STRIKE)
+	if (buttons & PIDGIN_WEBVIEW_STRIKE)
 		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_strike",
 		                      strike);
 
-	if (buttons & GTK_WEBVIEW_GROW || buttons & GTK_WEBVIEW_SHRINK)
+	if (buttons & PIDGIN_WEBVIEW_GROW || buttons & PIDGIN_WEBVIEW_SHRINK)
 		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/font_size",
-		                     gtk_webview_get_current_fontsize(webview));
-	if (buttons & GTK_WEBVIEW_FACE) {
-		char *face = gtk_webview_get_current_fontface(webview);
+		                     pidgin_webview_get_current_fontsize(webview));
+	if (buttons & PIDGIN_WEBVIEW_FACE) {
+		char *face = pidgin_webview_get_current_fontface(webview);
 
 		if (face)
 			purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/font_face", face);
@@ -1566,8 +1566,8 @@
 		g_free(face);
 	}
 
-	if (buttons & GTK_WEBVIEW_FORECOLOR) {
-		char *color = gtk_webview_get_current_forecolor(webview);
+	if (buttons & PIDGIN_WEBVIEW_FORECOLOR) {
+		char *color = pidgin_webview_get_current_forecolor(webview);
 
 		if (color)
 			purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor", color);
@@ -1577,8 +1577,8 @@
 		g_free(color);
 	}
 
-	if (buttons & GTK_WEBVIEW_BACKCOLOR) {
-		char *color = gtk_webview_get_current_backcolor(webview);
+	if (buttons & PIDGIN_WEBVIEW_BACKCOLOR) {
+		char *color = pidgin_webview_get_current_backcolor(webview);
 
 		if (color)
 			purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor", color);
@@ -1590,7 +1590,7 @@
 }
 
 static void
-formatting_clear_cb(GtkWebView *webview, void *data)
+formatting_clear_cb(PidginWebView *webview, void *data)
 {
 	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold", FALSE);
 	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_italic", FALSE);
@@ -1933,26 +1933,26 @@
 	gtk_widget_show(frame);
 	gtk_widget_set_name(webview, "pidgin_prefs_font_webview");
 	gtk_widget_set_size_request(frame, 450, -1);
-	gtk_webview_set_whole_buffer_formatting_only(GTK_WEBVIEW(webview), TRUE);
-	gtk_webview_set_format_functions(GTK_WEBVIEW(webview),
-	                                 GTK_WEBVIEW_BOLD |
-	                                 GTK_WEBVIEW_ITALIC |
-	                                 GTK_WEBVIEW_UNDERLINE |
-	                                 GTK_WEBVIEW_STRIKE |
-	                                 GTK_WEBVIEW_GROW |
-	                                 GTK_WEBVIEW_SHRINK |
-	                                 GTK_WEBVIEW_FACE |
-	                                 GTK_WEBVIEW_FORECOLOR |
-	                                 GTK_WEBVIEW_BACKCOLOR);
-
-	gtk_webview_append_html(GTK_WEBVIEW(webview),
+	pidgin_webview_set_whole_buffer_formatting_only(PIDGIN_WEBVIEW(webview), TRUE);
+	pidgin_webview_set_format_functions(PIDGIN_WEBVIEW(webview),
+	                                 PIDGIN_WEBVIEW_BOLD |
+	                                 PIDGIN_WEBVIEW_ITALIC |
+	                                 PIDGIN_WEBVIEW_UNDERLINE |
+	                                 PIDGIN_WEBVIEW_STRIKE |
+	                                 PIDGIN_WEBVIEW_GROW |
+	                                 PIDGIN_WEBVIEW_SHRINK |
+	                                 PIDGIN_WEBVIEW_FACE |
+	                                 PIDGIN_WEBVIEW_FORECOLOR |
+	                                 PIDGIN_WEBVIEW_BACKCOLOR);
+
+	pidgin_webview_append_html(PIDGIN_WEBVIEW(webview),
 	                        _("This is how your outgoing message text will "
 	                          "appear when you use protocols that support "
 	                          "formatting."));
 
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 
-	gtk_webview_setup_entry(GTK_WEBVIEW(webview),
+	pidgin_webview_setup_entry(PIDGIN_WEBVIEW(webview),
 	                        PURPLE_CONNECTION_FLAG_HTML |
 	                        PURPLE_CONNECTION_FLAG_FORMATTING_WBFO);
 
@@ -4205,7 +4205,7 @@
 	GSList *themes;
 
 	for (themes = smiley_themes; themes; themes = themes->next) {
-		struct smiley_theme *smile = themes->data;
+		struct PidginSmileyTheme *smile = themes->data;
 		if (smile->name && strcmp(themename, smile->name) == 0) {
 			pidgin_themes_load_smiley_theme(smile->path, TRUE);
 			break;