diff -r 431166bcb802 -r 8960ce807044 libpurple/protocols/silc/silc.c --- a/libpurple/protocols/silc/silc.c Wed Aug 28 15:07:38 2013 +0530 +++ b/libpurple/protocols/silc/silc.c Wed Aug 28 15:46:28 2013 +0530 @@ -1362,7 +1362,7 @@ PurpleConnection *gc = client->application; SilcPurple sg = purple_connection_get_protocol_data(gc); SilcPurpleIM im = context; - PurpleConversation *convo; + PurpleIMConversation *convo; char tmp[256]; SilcClientEntry client_entry; SilcDList list; @@ -1405,7 +1405,7 @@ buf->data, silc_buffer_len(buf)); silc_mime_partial_free(list); - purple_im_conversation_write_message(PURPLE_CONV_IM(convo), conn->local_entry->nickname, + purple_conversation_write_message(PURPLE_CONVERSATION(convo), conn->local_entry->nickname, im->message, 0, time(NULL)); goto out; } @@ -1414,14 +1414,14 @@ /* Send the message */ silc_client_send_private_message(client, conn, client_entry, im->flags, sg->sha1hash, (unsigned char *)im->message, im->message_len); - purple_im_conversation_write_message(PURPLE_CONV_IM(convo), conn->local_entry->nickname, + purple_conversation_write_message(PURPLE_CONVERSATION(convo), conn->local_entry->nickname, im->message, 0, time(NULL)); goto out; err: g_snprintf(tmp, sizeof(tmp), _("User %s is not present in the network"), im->nick); - purple_conversation_write(convo, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL)); + purple_conversation_write(PURPLE_CONVERSATION(convo), NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL)); out: if (free_list) { @@ -1548,7 +1548,7 @@ const char *cmd, char **args, char **error, void *data) { PurpleConnection *gc; - PurpleConversation *convo = conv; + PurpleChatConversation *chat = PURPLE_CHAT_CONVERSATION(conv); int id = 0; gc = purple_conversation_get_connection(conv); @@ -1557,11 +1557,11 @@ return PURPLE_CMD_RET_FAILED; if(args && args[0]) - convo = purple_conversations_find_chat_with_account(args[0], + chat = purple_conversations_find_chat_with_account(args[0], purple_connection_get_account(gc)); - if (convo != NULL) - id = purple_chat_conversation_get_id(PURPLE_CONV_CHAT(convo)); + if (chat != NULL) + id = purple_chat_conversation_get_id(chat); if (id == 0) return PURPLE_CMD_RET_FAILED; @@ -1581,13 +1581,13 @@ const char *topic; gc = purple_conversation_get_connection(conv); - id = purple_chat_conversation_get_id(PURPLE_CONV_CHAT(conv)); + id = purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(conv)); if (gc == NULL || id == 0) return PURPLE_CMD_RET_FAILED; if (!args || !args[0]) { - topic = purple_chat_conversation_get_topic (PURPLE_CONV_CHAT(conv)); + topic = purple_chat_conversation_get_topic(PURPLE_CHAT_CONVERSATION(conv)); if (topic) { tmp = g_markup_escape_text(topic, -1); tmp2 = purple_markup_linkify(tmp); @@ -1596,7 +1596,7 @@ g_free(tmp2); } else buf = g_strdup(_("No topic is set")); - purple_chat_conversation_write_message(PURPLE_CONV_CHAT(conv), purple_account_get_username(purple_connection_get_account(gc)), buf, + purple_conversation_write_message(conv, purple_account_get_username(purple_connection_get_account(gc)), buf, PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NO_LOG, time(NULL)); g_free(buf); @@ -1679,7 +1679,7 @@ const char *cmd, char **args, char **error, void *data) { int ret = 1; - PurpleConversation *convo; + PurpleIMConversation *im; PurpleConnection *gc; PurpleAccount *account; @@ -1695,11 +1695,11 @@ account = purple_connection_get_account(gc); - convo = purple_im_conversation_new(account, args[0]); + im = purple_im_conversation_new(account, args[0]); if (args[1]) { ret = silcpurple_send_im(gc, args[0], args[1], PURPLE_MESSAGE_SEND); - purple_im_conversation_write_message(PURPLE_CONV_IM(convo), purple_connection_get_display_name(gc), + purple_conversation_write_message(PURPLE_CONVERSATION(im), purple_connection_get_display_name(gc), args[1], PURPLE_MESSAGE_SEND, time(NULL)); } @@ -1795,7 +1795,7 @@ } else { msg = g_strdup_printf(_("no channel modes are set on %s"), chname); } - purple_chat_conversation_write_message(PURPLE_CONV_CHAT(conv), "", + purple_conversation_write_message(conv, "", msg, PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NO_LOG, time(NULL)); g_free(msg); return PURPLE_CMD_RET_OK;