merge of 'c2dc18e7ecc259247ac2e5d958056ce5d71d35e4'

Sun, 05 Jul 2009 22:59:43 +0000

author
Paul Aurich <darkrain42@pidgin.im>
date
Sun, 05 Jul 2009 22:59:43 +0000
changeset 27617
8c59c9e358f3
parent 27615
c2dc18e7ecc2 (current diff)
parent 27616
be54d9199531 (diff)
child 27618
3362f6ddafe6

merge of 'c2dc18e7ecc259247ac2e5d958056ce5d71d35e4'
and 'be54d91995314ebbb410d7cd39b410f089b8b658'

--- a/libpurple/protocols/jabber/presence.c	Sun Jul 05 22:22:03 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sun Jul 05 22:59:43 2009 +0000
@@ -594,7 +594,7 @@
 				muc = TRUE;
 				if((z = xmlnode_get_child(y, "status"))) {
 					const char *code = xmlnode_get_attrib(z, "code");
-					if(code && !strcmp(code, "201")) {
+					if (purple_strequal(code, "201")) {
 						if((chat = jabber_chat_find(js, jid->node, jid->domain))) {
 							chat->config_dialog_type = PURPLE_REQUEST_ACTION;
 							chat->config_dialog_handle =
@@ -610,7 +610,7 @@
 										_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
 										_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
 						}
-					} else if(code && !strcmp(code, "210")) {
+					} else if (purple_strequal(code, "210")) {
 						/*  server rewrote room-nick */
 						if((chat = jabber_chat_find(js, jid->node, jid->domain))) {
 							g_free(chat->handle);

mercurial