changeset 30190:c9413547ee33

merged from im.pidgin.pidgin

--- a/ChangeLog	Thu Apr 22 14:45:57 2010 +0900
+++ b/ChangeLog	Fri Apr 23 14:44:01 2010 +0900
@@ -18,7 +18,7 @@
 	  GnuTLS manual for documentation on the format of the priority
 	  strings.
 	* Fix autoconf detection of Python.  (Brad Smith)
-	* Fix a crash when a Windows proxy (in IE) does not have a port.
+	* Fix a crash when a Windows proxy (from IE) does not have a port.
 	  (Marten Klencke)
 
 	Pidgin:
@@ -41,8 +41,8 @@
 	* Default binding of Ctrl+Shift+v to 'Paste as Plain Text' in
 	  conversation windows. This can be changed in .gtkrc-2.0. For example,
 	  Ctrl+v can be bound to 'Paste as Plain Text' by default.
-	* Plugins can now handle markup in buddy names by attaching to the signal
-	  "drawing-buddy". (Daniele Ricci, Andrea Piccinelli)
+	* Plugins can now handle markup in buddy names by attaching to the
+	  "drawing-buddy" signal. (Daniele Ricci, Andrea Piccinelli)
 	* Be more accommodating when scaling down large images for use as
 	  buddy icons.
 	* The 'Message Timestamp Formats' plugin allows changing the timestamp
@@ -60,9 +60,9 @@
 
 	AIM and ICQ:
 	* X-Status (Custom ICQ status icon) support.  Since most of the icons
-	  available reflect moods, this is labeled "Set Mood" on the Accounts->ICQ
-	  Account menu. (Andrew Ivanov, Tomáš Kebert, Yuriy Yevgrafov, and trac
-	  users bob007, salieff, and nops)
+	  available reflect moods, this is labeled "Set Mood" on the
+	  Accounts->ICQ Account menu. (Andrew Ivanov, Tomáš Kebert,
+	  Yuriy Yevgrafov, and trac users bob007, salieff, and nops)
 	* Allow setting and displaying icons between 1x1 and 100x100 pixels for
 	  ICQ.  Previously only icons between 48x48 and 52x64 were allowed.
 	* When using the clientLogin authentication method, prompt for a
@@ -79,26 +79,27 @@
 	* Direct messages to a specific resource only upon receipt of a message
 	  with content (as opposed to a typing notification, etc).  (Thanks to
 	  rjoly for testing)
-	* When sending data using in-band-bytestreams, interpret the block-size
-	  attribute as the size of the BASE64-encoded representation of the data.
-	* Validate the hash on incoming BoB data objects (for custom smileys etc.),
-	  cache based per JID when the CID is not a valid hash (as specified by the
-	  BoB XEP).
 	* Present a better error message when authentication fails while trying
 	  to connect to Facebook.  (David Reiss, Facebook)
+	* When sending data using in-band-bytestreams, interpret the block-size
+	  attribute as the size of the BASE64-encoded representation of the
+	  data.
+	* Validate the hash on incoming BoB data objects (for custom smileys
+	  etc.), cache based per JID when the CID is not a valid hash (as
+	  specified by the BoB XEP).
 	* Send whitespace keepalives if we haven't sent data in a while (2
 	  minutes).  This fixes an issue with Openfire disconnecting a
 	  libpurple-baesd client that has just been quiet for about 6
 	  minutes.
 
 	Yahoo/Yahoo JAPAN:
-	* Attempt to better handle transparent proxies interfering with HTTP-based
-	  login.
+	* Attempt to better handle transparent proxies interfering with
+	  HTTP-based login.
 	* Fix handling of P2P packets, thus fixing the loss of some messages.
 	* Retrieve the pager server address from Yahoo!'s servers directly.
 	* Removed the "Pager server" account option, as it is no longer needed.
-	* The authentication code is now less order-sensitive with the components
-	  of the server's response.
+	* The authentication code is now less order-sensitive with the
+	  components of the server's response.
 	* The authentication process now acts more like the official client.
 
 	Finch:

--- a/finch/gntblist.c	Thu Apr 22 14:45:57 2010 +0900
+++ b/finch/gntblist.c	Fri Apr 23 14:44:01 2010 +0900
@@ -1117,6 +1117,8 @@
 			list = g_list_delete_link(list, list))
 	{
 		PurpleMenuAction *act = (PurpleMenuAction *) list->data;
+		if (!act)
+			continue;
 		act->data = node;
 		gnt_append_menu_action(menu, act, NULL);
 		g_signal_connect_swapped(G_OBJECT(menu), "destroy",

--- a/libpurple/protocols/msn/session.c	Thu Apr 22 14:45:57 2010 +0900
+++ b/libpurple/protocols/msn/session.c	Fri Apr 23 14:44:01 2010 +0900
@@ -407,7 +407,7 @@
 
 	/* Prevent the connection progress going backwards, eg. if we get
 	 * transferred several times during login */
-	if (session->login_step > step)
+	if (session->login_step >= step)
 		return;
 
 	/* If we're already logged in, we're probably here because of a