Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/mxit/multimx.c	Mon Feb 10 00:16:53 2014 +0530
+++ b/libpurple/protocols/mxit/multimx.c	Mon Feb 10 01:09:47 2014 +0530
@@ -228,7 +228,7 @@
 
 	purple_conversation_write_message(PURPLE_CONVERSATION(chat), "MXit", _("You have been kicked from this MultiMX."), PURPLE_MESSAGE_SYSTEM, time(NULL));
 	purple_chat_conversation_clear_users(chat);
-	serv_got_chat_left(session->con, multimx->chatid);
+	purple_serv_got_chat_left(session->con, multimx->chatid);
 }
 
 
@@ -288,7 +288,7 @@
 	g_hash_table_insert(components, g_strdup("room"), g_strdup(contact->alias));
 
 	/* Call libpurple - will trigger either 'mxit_chat_join' or 'mxit_chat_reject' */
-	serv_got_chat_invite(session->con, contact->alias, creator, NULL, components);
+	purple_purple_serv_got_chat_invite(session->con, contact->alias, creator, NULL, components);
 }
 
 
@@ -316,7 +316,7 @@
 	}
 
 	/* Call libpurple - will trigger 'mxit_chat_join' */
-	serv_got_joined_chat(gc, multimx->chatid, multimx->roomname);
+	purple_serv_got_joined_chat(gc, multimx->chatid, multimx->roomname);
 
 	/* Send ".list" command to GroupChat server to retrieve current member-list */
 	mxit_send_message(session, multimx->roomid, ".list", FALSE, FALSE);
@@ -413,7 +413,7 @@
 		}
 		else {
 			/* Display server message in chat window */
-			serv_got_chat_in(mx->session->con, multimx->chatid, "MXit", PURPLE_MESSAGE_SYSTEM, msg, mx->timestamp);
+			purple_serv_got_chat_in(mx->session->con, multimx->chatid, "MXit", PURPLE_MESSAGE_SYSTEM, msg, mx->timestamp);
 			mx->processed = TRUE;
 		}
 	}
@@ -480,7 +480,7 @@
 			/* Join existing room */
 			purple_debug_info(MXIT_PLUGIN_ID, "Groupchat %i rejoined\n", multimx->chatid);
 
-			serv_got_joined_chat(gc, multimx->chatid, multimx->roomname);
+			purple_serv_got_joined_chat(gc, multimx->chatid, multimx->roomname);
 		}
 	}
 	else {
@@ -641,7 +641,7 @@
 		nickname = purple_account_get_private_alias(purple_connection_get_account(gc));		/* local alias */
 
 	/* Display message in chat window */
-	serv_got_chat_in(gc, id, nickname, flags, message, time(NULL));
+	purple_serv_got_chat_in(gc, id, nickname, flags, message, time(NULL));
 
 	return 0;
 }