# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1294458578 0
# Node ID f56b66606fd21605cebbec41e01c963e2ed6f91a
# Parent  917c597beb97467d300115020f7100017e575fa9
warnings -= 3;

diff -r 917c597beb97 -r f56b66606fd2 ChangeLog.API
--- a/ChangeLog.API	Sat Jan 08 03:45:42 2011 +0000
+++ b/ChangeLog.API	Sat Jan 08 03:49:38 2011 +0000
@@ -9,6 +9,10 @@
 		* purple_media_manager_get_video_caps (Jakub Adam)
 		* purple_media_manager_set_video_caps (Jakub Adam)
 
+	Pidgin:
+		Added:
+		* pidgin_make_scrollable (Gabriel Schulhof)
+
 version 2.7.9 (??/??/????):
 	* No changes
 
diff -r 917c597beb97 -r f56b66606fd2 pidgin/gtkcertmgr.c
--- a/pidgin/gtkcertmgr.c	Sat Jan 08 03:45:42 2011 +0000
+++ b/pidgin/gtkcertmgr.c	Sat Jan 08 03:49:38 2011 +0000
@@ -453,7 +453,7 @@
 			 G_CALLBACK(tls_peers_mgmt_select_chg_cb), NULL);
 
 	gtk_box_pack_start(GTK_BOX(mgmt_widget), 
-			pidgin_make_scrollable(listview, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1),
+			pidgin_make_scrollable(GTK_WIDGET(listview), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1),
 			TRUE, TRUE, /* Take up lots of space */
 			0);
 	gtk_widget_show(GTK_WIDGET(listview));
diff -r 917c597beb97 -r f56b66606fd2 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat Jan 08 03:45:42 2011 +0000
+++ b/pidgin/gtkconv.c	Sat Jan 08 03:49:38 2011 +0000
@@ -4893,7 +4893,6 @@
 	PurpleConversation *conv = gtkconv->active_conv;
 	PurpleBuddy *buddy;
 	gboolean chat = (conv->type == PURPLE_CONV_TYPE_CHAT);
-	GtkPolicyType imhtml_sw_hscroll;
 	int buddyicon_size = 0;
 
 	/* Setup the top part of the pane */
diff -r 917c597beb97 -r f56b66606fd2 pidgin/gtkrequest.c
--- a/pidgin/gtkrequest.c	Sat Jan 08 03:45:42 2011 +0000
+++ b/pidgin/gtkrequest.c	Sat Jan 08 03:49:38 2011 +0000
@@ -1185,7 +1185,6 @@
 	GtkWidget *table;
 	GtkWidget *button;
 	GtkWidget *img;
-	GtkWidget *sw;
 	GtkSizeGroup *sg;
 	GList *gl, *fl;
 	PurpleRequestFieldGroup *group;