comparison: src/protocols/jabber/message.c
src/protocols/jabber/message.c
- changeset 10490
- 72932e32f29d
- parent 9762
- 125f77c00102
- child 10607
- d12a757bb2b4
equal
deleted
inserted
replaced
| 10489:99cc3e84b10b | 10490:72932e32f29d |
|---|---|
| 67 jbr = jabber_buddy_find_resource(jb, jid->resource); | 67 jbr = jabber_buddy_find_resource(jb, jid->resource); |
| 68 | 68 |
| 69 if(jabber_find_unnormalized_conv(jm->from, jm->js->gc->account)) { | 69 if(jabber_find_unnormalized_conv(jm->from, jm->js->gc->account)) { |
| 70 from = g_strdup(jm->from); | 70 from = g_strdup(jm->from); |
| 71 } else if(jid->node) { | 71 } else if(jid->node) { |
| 72 GaimConversation *conv; | 72 if(jid->resource) { |
| 73 | 73 GaimConversation *conv; |
| 74 from = g_strdup_printf("%s@%s", jid->node, jid->domain); | 74 |
| 75 conv = jabber_find_unnormalized_conv(from, jm->js->gc->account); | 75 from = g_strdup_printf("%s@%s", jid->node, jid->domain); |
| 76 if(conv) | 76 conv = jabber_find_unnormalized_conv(from, jm->js->gc->account); |
| 77 gaim_conversation_set_name(conv, jm->from); | 77 if(conv) { |
| 78 g_free(from); | 78 gaim_conversation_set_name(conv, jm->from); |
| 79 } | |
| 80 g_free(from); | |
| 81 } | |
| 79 from = g_strdup(jm->from); | 82 from = g_strdup(jm->from); |
| 80 } else { | 83 } else { |
| 81 from = g_strdup(jid->domain); | 84 from = g_strdup(jid->domain); |
| 82 } | 85 } |
| 83 | 86 |
