Mercurial > pidgin.yaz
comparison libpurple/protocols/irc/msgs.c @ 25851:82b3079d1f24
applied changes from 68cb5581c551eabb57bcdf437642ee9e6786bc64
through 76c6ab76464455ef2db1b4037f1e13745bb1d510
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Tue, 28 Apr 2009 20:31:09 +0000 |
| parents | 68a5090f44eb |
| children | b536e4977362 |
comparison
equal
deleted
inserted
replaced
| 25850:68a5090f44eb | 25851:82b3079d1f24 |
|---|---|
| 1006 irc->reqnick); | 1006 irc->reqnick); |
| 1007 purple_notify_error(gc, _("Nickname in use"), | 1007 purple_notify_error(gc, _("Nickname in use"), |
| 1008 _("Nickname in use"), buf); | 1008 _("Nickname in use"), buf); |
| 1009 g_free(buf); | 1009 g_free(buf); |
| 1010 g_free(irc->reqnick); | 1010 g_free(irc->reqnick); |
| 1011 irc->reqnick = NULL; | |
| 1011 } | 1012 } |
| 1012 | 1013 |
| 1013 if (strlen(args[1]) < strlen(irc->reqnick) || irc->nickused) | 1014 if (strlen(args[1]) < strlen(irc->reqnick) || irc->nickused) |
| 1014 newnick = g_strdup(args[1]); | 1015 newnick = g_strdup(args[1]); |
| 1015 else | 1016 else |