pidgin.next.minor: b42eb063: warnings -= 3;

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: b42eb063d800b543371e015b7c38d7ba74bc79ef
Parent:   f07e2367652cc664834b1968911b2455b6b0640e
Author:   rekkanoryo at pidgin.im
Date:     01/07/11 22:49:38
Branch:   im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/b42eb063d800b543371e015b7c38d7ba74bc79ef

Changelog: 

warnings -= 3;

Changes against parent f07e2367652cc664834b1968911b2455b6b0640e

  patched  ChangeLog.API
  patched  pidgin/gtkcertmgr.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkrequest.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	d416d59a069728caac914125e25a0a933c3b8ca9
+++ pidgin/gtkconv.c	2624ff2ba737b2a1f46ee068423a63a067503092
@@ -4893,7 +4893,6 @@ setup_common_pane(PidginConversation *gt
 	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 */
============================================================
--- pidgin/gtkrequest.c	f46dc657d74c03f72a5b4ed2a8efa4f1f17984f9
+++ pidgin/gtkrequest.c	c13851355e046995c5e133960c40c9e4c2fe48cd
@@ -1185,7 +1185,6 @@ pidgin_request_fields(const char *title,
 	GtkWidget *table;
 	GtkWidget *button;
 	GtkWidget *img;
-	GtkWidget *sw;
 	GtkSizeGroup *sg;
 	GList *gl, *fl;
 	PurpleRequestFieldGroup *group;
============================================================
--- ChangeLog.API	0838255cdbc5be179928b9cbfdf70d2ffa864b06
+++ ChangeLog.API	1fd94d85e7bc259347e05c1c0a46481a311b5101
@@ -9,6 +9,10 @@ version 2.8.0 (??/??/????):
 		* 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
 
============================================================
--- pidgin/gtkcertmgr.c	0a08c137d05cd3780097071dd53a38089b7b5718
+++ pidgin/gtkcertmgr.c	ea9690460570023612e9de6678a46c3ca480820c
@@ -453,7 +453,7 @@ tls_peers_mgmt_build(void)
 			 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));