comparison: libpurple/protocols/jabber/chat.c
libpurple/protocols/jabber/chat.c
- branch
- soc.2013.gobjectification
- changeset 34634
- 90fa70aa7e28
- parent 34622
- 753f46dd000f
- child 34653
- 88ae47a7d595
equal
deleted
inserted
replaced
| 34633:70adf2e77c4f | 34634:90fa70aa7e28 |
|---|---|
| 136 chat = fbid->chat; | 136 chat = fbid->chat; |
| 137 g_free(fbid); | 137 g_free(fbid); |
| 138 return chat; | 138 return chat; |
| 139 } | 139 } |
| 140 | 140 |
| 141 JabberChat *jabber_chat_find_by_conv(PurpleConversation *conv) | 141 JabberChat *jabber_chat_find_by_conv(PurpleChatConversation *conv) |
| 142 { | 142 { |
| 143 PurpleAccount *account = purple_conversation_get_account(conv); | 143 PurpleAccount *account = purple_conversation_get_account(PURPLE_CONVERSATION(conv)); |
| 144 PurpleConnection *gc = purple_account_get_connection(account); | 144 PurpleConnection *gc = purple_account_get_connection(account); |
| 145 JabberStream *js; | 145 JabberStream *js; |
| 146 int id; | 146 int id; |
| 147 if (!gc) | 147 if (!gc) |
| 148 return NULL; | 148 return NULL; |
| 149 js = purple_connection_get_protocol_data(gc); | 149 js = purple_connection_get_protocol_data(gc); |
| 150 id = purple_chat_conversation_get_id(PURPLE_CONV_CHAT(conv)); | 150 id = purple_chat_conversation_get_id(conv); |
| 151 return jabber_chat_find_by_id(js, id); | 151 return jabber_chat_find_by_id(js, id); |
| 152 } | 152 } |
| 153 | 153 |
| 154 void jabber_chat_invite(PurpleConnection *gc, int id, const char *msg, | 154 void jabber_chat_invite(PurpleConnection *gc, int id, const char *msg, |
| 155 const char *name) | 155 const char *name) |
| 449 g_hash_table_destroy(chat->members); | 449 g_hash_table_destroy(chat->members); |
| 450 g_hash_table_destroy(chat->components); | 450 g_hash_table_destroy(chat->components); |
| 451 g_free(chat); | 451 g_free(chat); |
| 452 } | 452 } |
| 453 | 453 |
| 454 gboolean jabber_chat_find_buddy(PurpleConversation *conv, const char *name) | 454 gboolean jabber_chat_find_buddy(PurpleChatConversation *conv, const char *name) |
| 455 { | 455 { |
| 456 return purple_chat_conversation_find_user(PURPLE_CONV_CHAT(conv), name); | 456 return purple_chat_conversation_find_user(conv, name); |
| 457 } | 457 } |
| 458 | 458 |
| 459 char *jabber_chat_buddy_real_name(PurpleConnection *gc, int id, const char *who) | 459 char *jabber_chat_buddy_real_name(PurpleConnection *gc, int id, const char *who) |
| 460 { | 460 { |
| 461 JabberStream *js = purple_connection_get_protocol_data(gc); | 461 JabberStream *js = purple_connection_get_protocol_data(gc); |
| 751 JabberBuddyState state; | 751 JabberBuddyState state; |
| 752 char *msg; | 752 char *msg; |
| 753 int priority; | 753 int priority; |
| 754 | 754 |
| 755 if(!chat->muc) { | 755 if(!chat->muc) { |
| 756 purple_chat_conversation_write_message(PURPLE_CONV_CHAT(chat->conv), "", | 756 purple_conversation_write_message(PURPLE_CONVERSATION(chat->conv), "", |
| 757 _("Nick changing not supported in non-MUC chatrooms"), | 757 _("Nick changing not supported in non-MUC chatrooms"), |
| 758 PURPLE_MESSAGE_SYSTEM, time(NULL)); | 758 PURPLE_MESSAGE_SYSTEM, time(NULL)); |
| 759 return FALSE; | 759 return FALSE; |
| 760 } | 760 } |
| 761 | 761 |
| 1070 } else { | 1070 } else { |
| 1071 buf = g_string_append_c(buf, '\n'); | 1071 buf = g_string_append_c(buf, '\n'); |
| 1072 buf = g_string_append_len(buf, _("No users found"), -1); | 1072 buf = g_string_append_len(buf, _("No users found"), -1); |
| 1073 } | 1073 } |
| 1074 | 1074 |
| 1075 purple_chat_conversation_write_message(PURPLE_CONV_CHAT(chat->conv), "", buf->str, | 1075 purple_conversation_write_message(PURPLE_CONVERSATION(chat->conv), "", buf->str, |
| 1076 PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG, time(NULL)); | 1076 PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG, time(NULL)); |
| 1077 | 1077 |
| 1078 g_string_free(buf, TRUE); | 1078 g_string_free(buf, TRUE); |
| 1079 } | 1079 } |
| 1080 | 1080 |
| 1165 } else { | 1165 } else { |
| 1166 buf = g_string_append_c(buf, '\n'); | 1166 buf = g_string_append_c(buf, '\n'); |
| 1167 buf = g_string_append_len(buf, _("No users found"), -1); | 1167 buf = g_string_append_len(buf, _("No users found"), -1); |
| 1168 } | 1168 } |
| 1169 | 1169 |
| 1170 purple_chat_conversation_write_message(PURPLE_CONV_CHAT(chat->conv), "", buf->str, | 1170 purple_conversation_write_message(PURPLE_CONVERSATION(chat->conv), "", buf->str, |
| 1171 PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG, time(NULL)); | 1171 PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG, time(NULL)); |
| 1172 | 1172 |
| 1173 g_string_free(buf, TRUE); | 1173 g_string_free(buf, TRUE); |
| 1174 } | 1174 } |
| 1175 | 1175 |
