pidgin.2.5.6: 136f484e: applied changes from 4b0e16d96a9ee255477...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: 136f484ebf0a288f12ae2591f0dce7f8d05a3f9a
Ancestor: eb7a3aead12f78c4e77a5956df58fb9b9cf68101
Author: elb at pidgin.im
Date: 2009-04-28T20:28:30
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/136f484ebf0a288f12ae2591f0dce7f8d05a3f9a

Modified files:
        ChangeLog libpurple/protocols/irc/msgs.c

ChangeLog: 

applied changes from 4b0e16d96a9ee2554770c4400445bee7ceb49d9a
             through e7b568313cd84adb8e24dcfd56c373fe3e331439

-------------- next part --------------
============================================================
--- ChangeLog	4e3e2aad4e543864b531f70e615e067896d659f5
+++ ChangeLog	cf20630d01cdf3419212776a21776ebb9c702cca
@@ -4,6 +4,9 @@ version 2.5.6 (??/??/2009):
 	IRC:
 	* Correctly handle WHOIS for users who are joined to a large number of
 	  channels.
+	* Notify the user if a /nick command fails, rather than trying
+	  fallback nicks.
+	
 
 version 2.5.5 (03/01/2009):
 	libpurple:
============================================================
--- libpurple/protocols/irc/msgs.c	af18a749d64f0c30b741c08a78d727913e144e55
+++ libpurple/protocols/irc/msgs.c	05bd5a7f45b8cd55cf913487824013fc11467667
@@ -993,10 +993,23 @@ void irc_msg_nickused(struct irc_conn *i
 void irc_msg_nickused(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	char *newnick, *buf, *end;
+	PurpleConnection *gc = purple_account_get_connection(irc->account);
 
 	if (!args || !args[1])
 		return;
 
+	if (gc && purple_connection_get_state(gc) == PURPLE_CONNECTED) {
+		/* We only want to do the following dance if the connection
+		   has not been successfully completed.  If it has, just
+		   notify the user that their /nick command didn't go. */
+		buf = g_strdup_printf(_("The nickname \"%s\" is already being used."),
+				      irc->reqnick);
+		purple_notify_error(gc, _("Nickname in use"),
+				    _("Nickname in use"), buf);
+		g_free(buf);
+		g_free(irc->reqnick);
+	}
+
 	if (strlen(args[1]) < strlen(irc->reqnick) || irc->nickused)
 		newnick = g_strdup(args[1]);
 	else