comparison: libpurple/protocols/jabber/message.c
libpurple/protocols/jabber/message.c
- branch
- string-comparison-r2
- changeset 38256
- 035f00c4fd87
- parent 31512
- b1c0ce2787e6
- child 38258
- 9a6551eba09c
equal
deleted
inserted
replaced
| 38239:f76c1aa92c07 | 38256:035f00c4fd87 |
|---|---|
| 127 */ | 127 */ |
| 128 PurpleConversation *conv; | 128 PurpleConversation *conv; |
| 129 | 129 |
| 130 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, | 130 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, |
| 131 jm->from, account); | 131 jm->from, account); |
| 132 if (conv && !g_str_equal(jm->from, | 132 if (conv && !purple_strequal(jm->from, |
| 133 purple_conversation_get_name(conv))) { | 133 purple_conversation_get_name(conv))) { |
| 134 purple_debug_info("jabber", "Binding conversation to %s\n", | 134 purple_debug_info("jabber", "Binding conversation to %s\n", |
| 135 jm->from); | 135 jm->from); |
| 136 purple_conversation_set_name(conv, jm->from); | 136 purple_conversation_set_name(conv, jm->from); |
| 137 } | 137 } |
| 762 jm->type = JABBER_MESSAGE_GROUPCHAT_INVITE; | 762 jm->type = JABBER_MESSAGE_GROUPCHAT_INVITE; |
| 763 } | 763 } |
| 764 } else { | 764 } else { |
| 765 jm->etc = g_list_append(jm->etc, child); | 765 jm->etc = g_list_append(jm->etc, child); |
| 766 } | 766 } |
| 767 } else if (g_str_equal(child->name, "query")) { | 767 } else if (purple_strequal(child->name, "query")) { |
| 768 const char *node = xmlnode_get_attrib(child, "node"); | 768 const char *node = xmlnode_get_attrib(child, "node"); |
| 769 if (purple_strequal(xmlns, NS_DISCO_ITEMS) | 769 if (purple_strequal(xmlns, NS_DISCO_ITEMS) |
| 770 && purple_strequal(node, "http://jabber.org/protocol/commands")) { | 770 && purple_strequal(node, "http://jabber.org/protocol/commands")) { |
| 771 jabber_adhoc_got_list(js, jm->from, child); | 771 jabber_adhoc_got_list(js, jm->from, child); |
| 772 } | 772 } |
