Mercurial > pidgin3 / changeset

--- a/finch/gntblist.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/finch/gntblist.c	Sat Sep 14 15:46:27 2013 +0530
@@ -743,7 +743,7 @@
 
 	gc = purple_account_get_connection(account);
 	protocol = purple_connection_get_protocol(gc);
-	hash = purple_protocol_iface_chat_info_defaults(protocol, gc, name);
+	hash = purple_protocol_chat_iface_info_defaults(protocol, gc, name);
 
 	chat = purple_chat_new(account, name, hash);
 
@@ -1064,7 +1064,7 @@
 	if(!protocol || !PURPLE_PROTOCOL_IMPLEMENTS(protocol, blist_node_menu))
 		return;
 
-	for(list = purple_protocol_iface_blist_node_menu(protocol, node); list;
+	for(list = purple_protocol_client_iface_blist_node_menu(protocol, node); list;
 			list = g_list_delete_link(list, list))
 	{
 		PurpleMenuAction *act = (PurpleMenuAction *) list->data;
@@ -1123,7 +1123,7 @@
 	purple_request_fields_add_group(fields, group);
 
 	gc = purple_account_get_connection(purple_chat_get_account(chat));
-	parts = purple_protocol_iface_chat_info(purple_connection_get_protocol(gc), gc);
+	parts = purple_protocol_chat_iface_info(purple_connection_get_protocol(gc), gc);
 
 	for (iter = parts; iter; iter = iter->next) {
 		pce = iter->data;
@@ -1286,7 +1286,7 @@
 	if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, send_file))
 	{
 		if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, can_receive_file) ||
-			purple_protocol_iface_can_receive_file(protocol, gc, purple_buddy_get_name(buddy)))
+			purple_protocol_xfer_iface_can_receive(protocol, gc, purple_buddy_get_name(buddy)))
 			add_custom_action(menu, _("Send File"),
 					PURPLE_CALLBACK(finch_blist_menu_send_file_cb), buddy);
 	}
@@ -1412,7 +1412,7 @@
 		account = purple_chat_get_account(c);
 		protocol = purple_protocols_find(purple_account_get_protocol_id(account));
 		if (protocol) {
-			name = purple_protocol_iface_get_chat_name(protocol, purple_chat_get_components(c));
+			name = purple_protocol_chat_iface_get_name(protocol, purple_chat_get_components(c));
 		}
 	} else if (PURPLE_IS_CONTACT(node)) {
 		finch_log_show_contact((PurpleContact *)node);
@@ -1734,7 +1734,7 @@
 
 	protocol = purple_protocols_find(purple_account_get_protocol_id(account));
 	if (protocol) {
-		purple_protocol_iface_tooltip_text(protocol, buddy, user_info, full);
+		purple_protocol_client_iface_tooltip_text(protocol, buddy, user_info, full);
 	}
 
 	if (purple_prefs_get_bool("/finch/blist/idletime")) {
@@ -2489,7 +2489,7 @@
 	GntMenuItem *menuitem;
 
 	gnt_menuitem_set_submenu(item, GNT_MENU(sub));
-	for (actions = purple_protocol_iface_get_actions(protocol, gc); actions;
+	for (actions = purple_protocol_client_iface_get_actions(protocol, gc); actions;
 			actions = g_list_delete_link(actions, actions)) {
 		if (actions->data) {
 			PurpleProtocolAction *action = actions->data;
@@ -2810,7 +2810,7 @@
 	chat = purple_blist_find_chat(account, name);
 	if (chat == NULL) {
 		PurpleProtocol *protocol = purple_connection_get_protocol(gc);
-		hash = purple_protocol_iface_chat_info_defaults(protocol, gc, name);
+		hash = purple_protocol_chat_iface_info_defaults(protocol, gc, name);
 	} else {
 		hash = purple_chat_get_components(chat);
 	}

--- a/finch/gntconv.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/finch/gntconv.c	Sat Sep 14 15:46:27 2013 +0530
@@ -340,7 +340,7 @@
 			chat = find_chat_for_conversation(conv);
 			if (chat == NULL) {
 				PurpleProtocol *protocol = purple_connection_get_protocol(gc);
-				comps = purple_protocol_iface_chat_info_defaults(protocol, gc,
+				comps = purple_protocol_chat_iface_info_defaults(protocol, gc,
 						purple_conversation_get_name(conv));
 			} else {
 				comps = purple_chat_get_components(chat);
@@ -651,7 +651,7 @@
 
 		if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, send_file) &&
 				(!PURPLE_PROTOCOL_IMPLEMENTS(protocol, can_receive_file) ||
-					purple_protocol_iface_can_receive_file(protocol, gc,
+					purple_protocol_xfer_iface_can_receive(protocol, gc,
 					purple_conversation_get_name(ggc->active_conv)))) {
 			item = gnt_menuitem_new(_("Send File"));
 			gnt_menu_add_item(GNT_MENU(sub), item);
@@ -706,7 +706,7 @@
 
 	protocol = purple_connection_get_protocol(gc);
 	if (protocol)
-		realname = purple_protocol_iface_get_cuser_real_name(protocol, gc,
+		realname = purple_protocol_chat_iface_get_user_real_name(protocol, gc,
 				purple_chat_conversation_get_id(
 				PURPLE_CHAT_CONVERSATION(fc->active_conv)), name);
 

--- a/finch/gntroomlist.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/finch/gntroomlist.c	Sat Sep 14 15:46:27 2013 +0530
@@ -121,7 +121,7 @@
 	protocol = purple_connection_get_protocol(gc);
 
 	if(protocol != NULL && PURPLE_PROTOCOL_IMPLEMENTS(protocol, roomlist_room_serialize))
-		name = purple_protocol_iface_roomlist_room_serialize(protocol, room);
+		name = purple_protocol_roomlist_iface_room_serialize(protocol, room);
 	else
 		name = g_strdup(purple_roomlist_room_get_name(room));
 

--- a/libpurple/account.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/account.c	Sat Sep 14 15:46:27 2013 +0530
@@ -1013,7 +1013,7 @@
 	protocol = purple_connection_get_protocol(gc);
 
 	if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, set_public_alias))
-		purple_protocol_iface_set_public_alias(protocol, gc, alias, success_cb, failure_cb);
+		purple_protocol_server_iface_set_public_alias(protocol, gc, alias, success_cb, failure_cb);
 	else if (failure_cb) {
 		struct public_alias_closure *closure =
 				g_new0(struct public_alias_closure, 1);
@@ -1051,7 +1051,7 @@
 	protocol = purple_connection_get_protocol(gc);
 
 	if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, get_public_alias))
-		purple_protocol_iface_get_public_alias(protocol, gc, success_cb, failure_cb);
+		purple_protocol_server_iface_get_public_alias(protocol, gc, success_cb, failure_cb);
 	else if (failure_cb) {
 		struct public_alias_closure *closure =
 				g_new0(struct public_alias_closure, 1);
@@ -2210,7 +2210,7 @@
 		protocol = purple_connection_get_protocol(gc);
 
 	if (protocol != NULL)
-		purple_protocol_iface_add_buddy(protocol, gc, buddy,
+		purple_protocol_server_iface_add_buddy(protocol, gc, buddy,
 				purple_buddy_get_group(buddy), message);
 }
 
@@ -2233,12 +2233,12 @@
 		}
 
 		if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, add_buddies))
-			purple_protocol_iface_add_buddies(protocol, gc, buddies, groups, message);
+			purple_protocol_server_iface_add_buddies(protocol, gc, buddies, groups, message);
 		else if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, add_buddy)) {
 			GList *curb = buddies, *curg = groups;
 
 			while ((curb != NULL) && (curg != NULL)) {
-				purple_protocol_iface_add_buddy(protocol, gc, curb->data, curg->data, message);
+				purple_protocol_server_iface_add_buddy(protocol, gc, curb->data, curg->data, message);
 				curb = curb->next;
 				curg = curg->next;
 			}
@@ -2259,7 +2259,7 @@
 		protocol = purple_connection_get_protocol(gc);
 
 	if (protocol)
-		purple_protocol_iface_remove_buddy(protocol, gc, buddy, group);
+		purple_protocol_server_iface_remove_buddy(protocol, gc, buddy, group);
 }
 
 void
@@ -2273,7 +2273,7 @@
 
 	if (protocol) {
 		if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, remove_buddies))
-			purple_protocol_iface_remove_buddies(protocol, gc, buddies, groups);
+			purple_protocol_server_iface_remove_buddies(protocol, gc, buddies, groups);
 		else {
 			GList *curb = buddies;
 			GList *curg = groups;
@@ -2296,7 +2296,7 @@
 		protocol = purple_connection_get_protocol(gc);
 
 	if (protocol)
-		purple_protocol_iface_remove_group(protocol, gc, group);
+		purple_protocol_server_iface_remove_group(protocol, gc, group);
 }
 
 void
@@ -2312,7 +2312,7 @@
 		protocol = purple_connection_get_protocol(gc);
 
 	if (protocol)
-		purple_protocol_iface_change_passwd(protocol, gc, orig_pw, new_pw);
+		purple_protocol_server_iface_change_passwd(protocol, gc, orig_pw, new_pw);
 }
 
 gboolean purple_account_supports_offline_message(PurpleAccount *account, PurpleBuddy *buddy)
@@ -2331,7 +2331,7 @@
 
 	if (!protocol)
 		return FALSE;
-	return purple_protocol_iface_offline_message(protocol, buddy);
+	return purple_protocol_client_iface_offline_message(protocol, buddy);
 }
 
 void
@@ -2880,7 +2880,7 @@
 
 	if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, status_types))
 		purple_account_set_status_types(account,
-				purple_protocol_iface_status_types(protocol, account));
+				purple_protocol_class_status_types(protocol, account));
 
 	priv->presence = PURPLE_PRESENCE(purple_account_presence_new(account));
 

--- a/libpurple/blistnodetypes.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/blistnodetypes.c	Sat Sep 14 15:46:27 2013 +0530
@@ -633,7 +633,7 @@
 	 */
 	protocol = purple_protocols_find(purple_account_get_protocol_id(priv->account));
 	if (protocol)
-		purple_protocol_iface_buddy_free(protocol, buddy);
+		purple_protocol_client_iface_buddy_free(protocol, buddy);
 
 	/* Delete the node */
 	purple_buddy_icon_unref(priv->icon);
@@ -1121,7 +1121,7 @@
 
 	if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, chat_info)) {
 		PurpleProtocolChatEntry *pce;
-		GList *parts = purple_protocol_iface_chat_info(protocol, purple_account_get_connection(priv->account));
+		GList *parts = purple_protocol_chat_iface_info(protocol, purple_account_get_connection(priv->account));
 		pce = parts->data;
 		ret = g_hash_table_lookup(priv->components, pce->identifier);
 		g_list_foreach(parts, (GFunc)g_free, NULL);
@@ -1532,7 +1532,7 @@
 			}
 
 			if(PURPLE_PROTOCOL_IMPLEMENTS(protocol, rename_group)) {
-				purple_protocol_iface_rename_group(protocol, gc, old_name, source, buddies);
+				purple_protocol_server_iface_rename_group(protocol, gc, old_name, source, buddies);
 			} else {
 				GList *cur, *groups = NULL;
 

--- a/libpurple/buddyicon.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/buddyicon.c	Sat Sep 14 15:46:27 2013 +0530
@@ -751,7 +751,7 @@
 		protocol = purple_connection_get_protocol(gc);
 
 		if (protocol)
-			purple_protocol_iface_set_buddy_icon(protocol, gc, img);
+			purple_protocol_server_iface_set_buddy_icon(protocol, gc, img);
 	}
 
 	if (old_img)

--- a/libpurple/buddylist.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/buddylist.c	Sat Sep 14 15:46:27 2013 +0530
@@ -1637,7 +1637,7 @@
 	protocol = purple_protocols_find(purple_account_get_protocol_id(account));
 
 	if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, find_blist_chat))
-		return purple_protocol_iface_find_blist_chat(protocol, account, name);
+		return purple_protocol_client_iface_find_blist_chat(protocol, account, name);
 
 	normname = g_strdup(purple_normalize(account, name));
 	for (group = purplebuddylist->root; group != NULL; group = group->next) {
@@ -1649,7 +1649,7 @@
 				if (account != purple_chat_get_account(chat))
 					continue;
 
-				parts = purple_protocol_iface_chat_info(protocol, 
+				parts = purple_protocol_chat_iface_info(protocol, 
 					purple_account_get_connection(purple_chat_get_account(chat)));
 
 				pce = parts->data;

--- a/libpurple/connection.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/connection.c	Sat Sep 14 15:46:27 2013 +0530
@@ -120,7 +120,7 @@
 	if ((time(NULL) - priv->last_received) < KEEPALIVE_INTERVAL)
 		return TRUE;
 
-	purple_protocol_iface_keepalive(priv->protocol, gc);
+	purple_protocol_server_iface_keepalive(priv->protocol, gc);
 
 	return TRUE;
 }
@@ -732,7 +732,7 @@
 	purple_http_conn_cancel_all(gc);
 	purple_proxy_connect_cancel_with_handle(gc);
 
-	purple_protocol_iface_close(priv->protocol, gc);
+	purple_protocol_class_close_connection(priv->protocol, gc);
 
 	/* Clear out the proto data that was freed in the protocol's close method */
 	buddies = purple_blist_find_buddies(account, NULL);
@@ -916,14 +916,14 @@
 		/* set this so we don't auto-reconnect after registering */
 		PURPLE_CONNECTION_GET_PRIVATE(gc)->wants_to_die = TRUE;
 
-		purple_protocol_iface_register_user(protocol, account);
+		purple_protocol_server_iface_register_user(protocol, account);
 	}
 	else
 	{
 		purple_debug_info("connection", "Connecting. gc = %p\n", gc);
 
 		purple_signal_emit(purple_accounts_get_handle(), "account-connecting", account);
-		purple_protocol_iface_login(protocol, account);
+		purple_protocol_class_login(protocol, account);
 	}
 }
 
@@ -950,7 +950,7 @@
 	}
 
 	if (!purple_account_is_disconnected(account)) {
-		purple_protocol_iface_unregister_user(protocol, account, cb, user_data);
+		purple_protocol_server_iface_unregister_user(protocol, account, cb, user_data);
 		return;
 	}
 
@@ -971,7 +971,7 @@
 
 	purple_debug_info("connection", "Unregistering.  gc = %p\n", gc);
 
-	purple_protocol_iface_unregister_user(protocol, account, cb, user_data);
+	purple_protocol_server_iface_unregister_user(protocol, account, cb, user_data);
 }
 
 /**************************************************************************

--- a/libpurple/conversation.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/conversation.c	Sat Sep 14 15:46:27 2013 +0530
@@ -898,7 +898,7 @@
 
 	g_return_val_if_fail(protocol != NULL, 0);
 
-	return purple_protocol_iface_get_max_message_size(protocol, conv);
+	return purple_protocol_client_iface_get_max_message_size(protocol, conv);
 }
 
 /**************************************************************************

--- a/libpurple/conversationtypes.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/conversationtypes.c	Sat Sep 14 15:46:27 2013 +0530
@@ -466,7 +466,7 @@
 		if (purple_prefs_get_bool("/purple/conversations/im/send_typing"))
 			serv_send_typing(gc, name, PURPLE_IM_NOT_TYPING);
 
-		purple_protocol_iface_convo_closed(protocol, gc, name);
+		purple_protocol_client_iface_convo_closed(protocol, gc, name);
 	}
 
 	purple_im_conversation_stop_typing_timeout(im);

--- a/libpurple/log.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/log.c	Sat Sep 14 15:46:27 2013 +0530
@@ -346,7 +346,7 @@
 	if (!protocol)
 		return NULL;
 
-	protocol_name = purple_protocol_iface_list_icon(protocol, account, NULL);
+	protocol_name = purple_protocol_class_list_icon(protocol, account, NULL);
 
 	acct_name = g_strdup(purple_escape_filename(purple_normalize(account,
 				purple_account_get_username(account))));
@@ -1109,7 +1109,7 @@
 			if (!protocol)
 				continue;
 
-			if (purple_strequal(protocol_unescaped, purple_protocol_iface_list_icon(protocol, (PurpleAccount *)account_iter->data, NULL)))
+			if (purple_strequal(protocol_unescaped, purple_protocol_class_list_icon(protocol, (PurpleAccount *)account_iter->data, NULL)))
 				accounts = g_list_prepend(accounts, account_iter->data);
 		}
 		g_free(protocol_unescaped);
@@ -1409,7 +1409,7 @@
 	gsize written = 0;
 
 	if(!data) {
-		const char *proto = purple_protocol_iface_list_icon(protocol, log->account, NULL);
+		const char *proto = purple_protocol_class_list_icon(protocol, log->account, NULL);
 		const char *date;
 		purple_log_common_writer(log, ".html");
 
@@ -1570,7 +1570,7 @@
 		 * creating a new file there would result in empty files in the case
 		 * that you open a convo with someone, but don't say anything.
 		 */
-		const char *proto = purple_protocol_iface_list_icon(protocol, log->account, NULL);
+		const char *proto = purple_protocol_class_list_icon(protocol, log->account, NULL);
 		purple_log_common_writer(log, ".txt");
 
 		data = log->logger_data;

--- a/libpurple/plugins/log_reader.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/plugins/log_reader.c	Sat Sep 14 15:46:27 2013 +0530
@@ -90,7 +90,7 @@
 	if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, list_icon))
 		return NULL;
 
-	protocol_name = g_ascii_strup(purple_protocol_iface_list_icon(protocol, account, NULL), -1);
+	protocol_name = g_ascii_strup(purple_protocol_class_list_icon(protocol, account, NULL), -1);
 
 	temp = g_strdup_printf("%s.%s", protocol_name, purple_account_get_username(account));
 	path = g_build_filename(logdir, temp, sn, NULL);
@@ -1234,7 +1234,7 @@
 	if (!PURPLE_PROTOCOL_IMPLEMENTS(protocoL, list_icon))
 		return NULL;
 
-	protocol_name = g_ascii_strup(purple_protocol_iface_list_icon(protocol, account, NULL), -1);
+	protocol_name = g_ascii_strup(purple_protocol_class_list_icon(protocol, account, NULL), -1);
 
 	buddy_name = purple_normalize(account, sn);
 

--- a/libpurple/presence.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/presence.c	Sat Sep 14 15:46:27 2013 +0530
@@ -588,7 +588,7 @@
 		protocol = purple_connection_get_protocol(gc);
 
 	if (protocol)
-		purple_protocol_iface_set_idle(protocol, gc, (idle ? (current_time - idle_time) : 0));
+		purple_protocol_server_iface_set_idle(protocol, gc, (idle ? (current_time - idle_time) : 0));
 }
 
 PurpleAccount *

--- a/libpurple/protocol.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/protocol.c	Sat Sep 14 15:46:27 2013 +0530
@@ -256,33 +256,33 @@
 		return defaultreturn;
 
 GList *
-purple_protocol_iface_get_actions(PurpleProtocol *protocol,
+purple_protocol_client_iface_get_actions(PurpleProtocol *protocol,
                                   PurpleConnection *gc)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, get_actions, gc);
 }
 
 const char *
-purple_protocol_iface_list_icon(PurpleProtocol *protocol,
+purple_protocol_class_list_icon(PurpleProtocol *protocol,
                                 PurpleAccount *account, PurpleBuddy *buddy)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, list_icon, account, buddy);
 }
 
 const char *
-purple_protocol_iface_list_emblem(PurpleProtocol *protocol, PurpleBuddy *buddy)
+purple_protocol_client_iface_list_emblem(PurpleProtocol *protocol, PurpleBuddy *buddy)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, list_emblem, buddy);
 }
 
 char *
-purple_protocol_iface_status_text(PurpleProtocol *protocol, PurpleBuddy *buddy)
+purple_protocol_client_iface_status_text(PurpleProtocol *protocol, PurpleBuddy *buddy)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, status_text, buddy);
 }
 
 void
-purple_protocol_iface_tooltip_text(PurpleProtocol *protocol, PurpleBuddy *buddy,
+purple_protocol_client_iface_tooltip_text(PurpleProtocol *protocol, PurpleBuddy *buddy,
                                    PurpleNotifyUserInfo *user_info,
                                    gboolean full)
 {
@@ -290,27 +290,27 @@
 }
 
 GList *
-purple_protocol_iface_status_types(PurpleProtocol *protocol,
+purple_protocol_class_status_types(PurpleProtocol *protocol,
                                    PurpleAccount *account)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, status_types, account);
 }
 
 GList *
-purple_protocol_iface_blist_node_menu(PurpleProtocol *protocol,
+purple_protocol_client_iface_blist_node_menu(PurpleProtocol *protocol,
                                       PurpleBlistNode *node)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, blist_node_menu, node);
 }
 
 GList *
-purple_protocol_iface_chat_info(PurpleProtocol *protocol, PurpleConnection *gc)
+purple_protocol_chat_iface_info(PurpleProtocol *protocol, PurpleConnection *gc)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, chat_info, gc);
 }
 
 GHashTable *
-purple_protocol_iface_chat_info_defaults(PurpleProtocol *protocol,
+purple_protocol_chat_iface_info_defaults(PurpleProtocol *protocol,
                                          PurpleConnection *gc,
                                          const char *chat_name)
 {
@@ -319,19 +319,19 @@
 }
 
 void
-purple_protocol_iface_login(PurpleProtocol *protocol, PurpleAccount *account)
+purple_protocol_class_login(PurpleProtocol *protocol, PurpleAccount *account)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, login, account);
 }
 
 void
-purple_protocol_iface_close(PurpleProtocol *protocol, PurpleConnection *gc)
+purple_protocol_class_close_connection(PurpleProtocol *protocol, PurpleConnection *gc)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, close, gc);
 }
 
 int 
-purple_protocol_iface_send_im(PurpleProtocol *protocol, PurpleConnection *gc, 
+purple_protocol_im_iface_send(PurpleProtocol *protocol, PurpleConnection *gc, 
                               const char *who, const char *message,
                               PurpleMessageFlags flags)
 {
@@ -340,14 +340,14 @@
 }
 
 void
-purple_protocol_iface_set_info(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_server_iface_set_info(PurpleProtocol *protocol, PurpleConnection *gc,
                                const char *info)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, set_info, gc, info);
 }
 
 unsigned int
-purple_protocol_iface_send_typing(PurpleProtocol *protocol,
+purple_protocol_im_iface_send_typing(PurpleProtocol *protocol,
                                   PurpleConnection *gc, const char *name,
                                   PurpleIMTypingState state)
 {
@@ -355,28 +355,28 @@
 }
 
 void
-purple_protocol_iface_get_info(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_server_iface_get_info(PurpleProtocol *protocol, PurpleConnection *gc,
                                const char *who)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, get_info, gc, who);
 }
 
 void
-purple_protocol_iface_set_status(PurpleProtocol *protocol,
+purple_protocol_server_iface_set_status(PurpleProtocol *protocol,
                                  PurpleAccount *account, PurpleStatus *status)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, set_status, account, status);
 }
 
 void
-purple_protocol_iface_set_idle(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_server_iface_set_idle(PurpleProtocol *protocol, PurpleConnection *gc,
                                int idletime)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, set_idle, gc, idletime);
 }
 
 void
-purple_protocol_iface_change_passwd(PurpleProtocol *protocol,
+purple_protocol_server_iface_change_passwd(PurpleProtocol *protocol,
                                     PurpleConnection *gc, const char *old_pass,
                                     const char *new_pass)
 {
@@ -384,7 +384,7 @@
 }
 
 void
-purple_protocol_iface_add_buddy(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_server_iface_add_buddy(PurpleProtocol *protocol, PurpleConnection *gc,
                                 PurpleBuddy *buddy, PurpleGroup *group,
                                 const char *message)
 {
@@ -392,7 +392,7 @@
 }
 
 void
-purple_protocol_iface_add_buddies(PurpleProtocol *protocol,
+purple_protocol_server_iface_add_buddies(PurpleProtocol *protocol,
                                   PurpleConnection *gc, GList *buddies,
                                   GList *groups, const char *message)
 {
@@ -400,7 +400,7 @@
 }
 
 void
-purple_protocol_iface_remove_buddy(PurpleProtocol *protocol,
+purple_protocol_server_iface_remove_buddy(PurpleProtocol *protocol,
                                    PurpleConnection *gc, PurpleBuddy *buddy,
                                    PurpleGroup *group)
 {
@@ -408,7 +408,7 @@
 }
 
 void
-purple_protocol_iface_remove_buddies(PurpleProtocol *protocol,
+purple_protocol_server_iface_remove_buddies(PurpleProtocol *protocol,
                                      PurpleConnection *gc, GList *buddies,
                                      GList *groups)
 {
@@ -416,63 +416,63 @@
 }
 
 void
-purple_protocol_iface_add_permit(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_privacy_iface_add_permit(PurpleProtocol *protocol, PurpleConnection *gc,
                                  const char *name)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, add_permit, gc, name);
 }
 
 void
-purple_protocol_iface_add_deny(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_privacy_iface_add_deny(PurpleProtocol *protocol, PurpleConnection *gc,
                                const char *name)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, add_deny, gc, name);
 }
 
 void
-purple_protocol_iface_rem_permit(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_privacy_iface_rem_permit(PurpleProtocol *protocol, PurpleConnection *gc,
                                  const char *name)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, rem_permit, gc, name);
 }
 
 void
-purple_protocol_iface_rem_deny(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_privacy_iface_rem_deny(PurpleProtocol *protocol, PurpleConnection *gc,
                                const char *name)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, rem_deny, gc, name);
 }
 
 void
-purple_protocol_iface_set_permit_deny(PurpleProtocol *protocol,
+purple_protocol_privacy_iface_set_permit_deny(PurpleProtocol *protocol,
                                       PurpleConnection *gc)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, set_permit_deny, gc);
 }
 
 void
-purple_protocol_iface_join_chat(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_chat_iface_join(PurpleProtocol *protocol, PurpleConnection *gc,
                                 GHashTable *components)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, join_chat, gc, components);
 }
 
 void
-purple_protocol_iface_reject_chat(PurpleProtocol *protocol,
+purple_protocol_chat_iface_reject(PurpleProtocol *protocol,
                                   PurpleConnection *gc, GHashTable *components)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, reject_chat, gc, components);
 }
 
 char *
-purple_protocol_iface_get_chat_name(PurpleProtocol *protocol,
+purple_protocol_chat_iface_get_name(PurpleProtocol *protocol,
                                     GHashTable *components)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, get_chat_name, components);
 }
 
 void
-purple_protocol_iface_chat_invite(PurpleProtocol *protocol,
+purple_protocol_chat_iface_invite(PurpleProtocol *protocol,
                                   PurpleConnection *gc, int id,
                                   const char *message, const char *who)
 {
@@ -480,14 +480,14 @@
 }
 
 void
-purple_protocol_iface_chat_leave(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_chat_iface_leave(PurpleProtocol *protocol, PurpleConnection *gc,
                                  int id)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, chat_leave, gc, id);
 }
 
 void
-purple_protocol_iface_chat_whisper(PurpleProtocol *protocol,
+purple_protocol_chat_iface_whisper(PurpleProtocol *protocol,
                                    PurpleConnection *gc, int id,
                                    const char *who, const char *message)
 {
@@ -495,7 +495,7 @@
 }
 
 int 
-purple_protocol_iface_chat_send(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_chat_iface_send(PurpleProtocol *protocol, PurpleConnection *gc,
                                 int id, const char *message,
                                 PurpleMessageFlags flags)
 {
@@ -504,20 +504,20 @@
 }
 
 void
-purple_protocol_iface_keepalive(PurpleProtocol *protocol, PurpleConnection *gc)
+purple_protocol_server_iface_keepalive(PurpleProtocol *protocol, PurpleConnection *gc)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, keepalive, gc);
 }
 
 void
-purple_protocol_iface_register_user(PurpleProtocol *protocol,
+purple_protocol_server_iface_register_user(PurpleProtocol *protocol,
                                     PurpleAccount *account)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, register_user, account);
 }
 
 void
-purple_protocol_iface_unregister_user(PurpleProtocol *protocol,
+purple_protocol_server_iface_unregister_user(PurpleProtocol *protocol,
                                       PurpleAccount *account,
                                       PurpleAccountUnregistrationCb cb,
                                       void *user_data)
@@ -526,7 +526,7 @@
 }
 
 void
-purple_protocol_iface_alias_buddy(PurpleProtocol *protocol,
+purple_protocol_server_iface_alias_buddy(PurpleProtocol *protocol,
                                   PurpleConnection *gc, const char *who,
                                   const char *alias)
 {
@@ -534,7 +534,7 @@
 }
 
 void
-purple_protocol_iface_group_buddy(PurpleProtocol *protocol,
+purple_protocol_server_iface_group_buddy(PurpleProtocol *protocol,
                                   PurpleConnection *gc, const char *who,
                                   const char *old_group, const char *new_group)
 {
@@ -542,7 +542,7 @@
 }
 
 void
-purple_protocol_iface_rename_group(PurpleProtocol *protocol,
+purple_protocol_server_iface_rename_group(PurpleProtocol *protocol,
                                    PurpleConnection *gc, const char *old_name,
                                    PurpleGroup *group, GList *moved_buddies)
 {
@@ -551,27 +551,27 @@
 }
 
 void
-purple_protocol_iface_buddy_free(PurpleProtocol *protocol, PurpleBuddy *buddy)
+purple_protocol_client_iface_buddy_free(PurpleProtocol *protocol, PurpleBuddy *buddy)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, buddy_free, buddy);
 }
 
 void
-purple_protocol_iface_convo_closed(PurpleProtocol *protocol,
+purple_protocol_client_iface_convo_closed(PurpleProtocol *protocol,
                                    PurpleConnection *gc, const char *who)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, convo_closed, gc, who);
 }
 
 const char *
-purple_protocol_iface_normalize(PurpleProtocol *protocol,
+purple_protocol_client_iface_normalize(PurpleProtocol *protocol,
                                 const PurpleAccount *account, const char *who)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, normalize, account, who);
 }
 
 void
-purple_protocol_iface_set_buddy_icon(PurpleProtocol *protocol,
+purple_protocol_server_iface_set_buddy_icon(PurpleProtocol *protocol,
                                      PurpleConnection *gc,
                                      PurpleStoredImage *img)
 {
@@ -579,14 +579,14 @@
 }
 
 void
-purple_protocol_iface_remove_group(PurpleProtocol *protocol,
+purple_protocol_server_iface_remove_group(PurpleProtocol *protocol,
                                    PurpleConnection *gc, PurpleGroup *group)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, remove_group, gc, group);
 }
 
 char *
-purple_protocol_iface_get_cuser_real_name(PurpleProtocol *protocol,
+purple_protocol_chat_iface_get_user_real_name(PurpleProtocol *protocol,
                                           PurpleConnection *gc, int id,
                                           const char *who)
 {
@@ -595,7 +595,7 @@
 }
 
 void
-purple_protocol_iface_set_chat_topic(PurpleProtocol *protocol,
+purple_protocol_chat_iface_set_topic(PurpleProtocol *protocol,
                                      PurpleConnection *gc, int id,
                                      const char *topic)
 {
@@ -603,7 +603,7 @@
 }
 
 PurpleChat *
-purple_protocol_iface_find_blist_chat(PurpleProtocol *protocol,
+purple_protocol_client_iface_find_blist_chat(PurpleProtocol *protocol,
                                       PurpleAccount *account, const char *name)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, find_blist_chat, account,
@@ -611,21 +611,21 @@
 }
 
 PurpleRoomlist *
-purple_protocol_iface_roomlist_get_list(PurpleProtocol *protocol,
+purple_protocol_roomlist_iface_get_list(PurpleProtocol *protocol,
                                         PurpleConnection *gc)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, roomlist_get_list, gc);
 }
 
 void
-purple_protocol_iface_roomlist_cancel(PurpleProtocol *protocol,
+purple_protocol_roomlist_iface_cancel(PurpleProtocol *protocol,
                                       PurpleRoomlist *list)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, roomlist_cancel, list);
 }
 
 void
-purple_protocol_iface_roomlist_expand_category(PurpleProtocol *protocol,
+purple_protocol_roomlist_iface_expand_category(PurpleProtocol *protocol,
                                                PurpleRoomlist *list,
                                                PurpleRoomlistRoom *category)
 {
@@ -633,7 +633,7 @@
 }
 
 gboolean
-purple_protocol_iface_can_receive_file(PurpleProtocol *protocol,
+purple_protocol_xfer_iface_can_receive(PurpleProtocol *protocol,
                                        PurpleConnection *gc, const char *who)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, FALSE, can_receive_file, gc,
@@ -641,35 +641,35 @@
 }
 
 void
-purple_protocol_iface_send_file(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_xfer_iface_send(PurpleProtocol *protocol, PurpleConnection *gc,
                                 const char *who, const char *filename)
 {
 	DEFINE_PROTOCOL_FUNC(protocol, send_file, gc, who, filename);
 }
 
 PurpleXfer *
-purple_protocol_iface_new_xfer(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_xfer_iface_new_xfer(PurpleProtocol *protocol, PurpleConnection *gc,
                                const char *who)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, new_xfer, gc, who);
 }
 
 gboolean
-purple_protocol_iface_offline_message(PurpleProtocol *protocol,
+purple_protocol_client_iface_offline_message(PurpleProtocol *protocol,
                                       const PurpleBuddy *buddy)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, FALSE, offline_message, buddy);
 }
 
 int
-purple_protocol_iface_send_raw(PurpleProtocol *protocol, PurpleConnection *gc,
+purple_protocol_server_iface_send_raw(PurpleProtocol *protocol, PurpleConnection *gc,
                                const char *buf, int len)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, 0, send_raw, gc, buf, len);
 }
 
 char *
-purple_protocol_iface_roomlist_room_serialize(PurpleProtocol *protocol,
+purple_protocol_roomlist_iface_room_serialize(PurpleProtocol *protocol,
                                               PurpleRoomlistRoom *room)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, roomlist_room_serialize,
@@ -677,7 +677,7 @@
 }
 
 gboolean
-purple_protocol_iface_send_attention(PurpleProtocol *protocol,
+purple_protocol_attention_iface_send(PurpleProtocol *protocol,
                                      PurpleConnection *gc, const char *username,
                                      guint type)
 {
@@ -686,7 +686,7 @@
 }
 
 GList *
-purple_protocol_iface_get_attention_types(PurpleProtocol *protocol,
+purple_protocol_attention_iface_get_types(PurpleProtocol *protocol,
                                           PurpleAccount *account)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, get_attention_types,
@@ -694,7 +694,7 @@
 }
 
 GHashTable *
-purple_protocol_iface_get_account_text_table(PurpleProtocol *protocol,
+purple_protocol_client_iface_get_account_text_table(PurpleProtocol *protocol,
                                              PurpleAccount *account)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, get_account_text_table,
@@ -702,7 +702,7 @@
 }
 
 gboolean
-purple_protocol_iface_initiate_media(PurpleProtocol *protocol,
+purple_protocol_media_iface_initiate_session(PurpleProtocol *protocol,
                                      PurpleAccount *account, const char *who,
                                      PurpleMediaSessionType type)
 {
@@ -711,21 +711,21 @@
 }
 
 PurpleMediaCaps
-purple_protocol_iface_get_media_caps(PurpleProtocol *protocol,
+purple_protocol_media_iface_get_caps(PurpleProtocol *protocol,
                                      PurpleAccount *account, const char *who)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, 0, get_media_caps, account, who);
 }
 
 PurpleMood *
-purple_protocol_iface_get_moods(PurpleProtocol *protocol,
+purple_protocol_client_iface_get_moods(PurpleProtocol *protocol,
                                 PurpleAccount *account)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, get_moods, account);
 }
 
 void
-purple_protocol_iface_set_public_alias(PurpleProtocol *protocol,
+purple_protocol_server_iface_set_public_alias(PurpleProtocol *protocol,
                                 PurpleConnection *gc, const char *alias,
                                 PurpleSetPublicAliasSuccessCallback success_cb,
                                 PurpleSetPublicAliasFailureCallback failure_cb)
@@ -735,7 +735,7 @@
 }
 
 void
-purple_protocol_iface_get_public_alias(PurpleProtocol *protocol,
+purple_protocol_server_iface_get_public_alias(PurpleProtocol *protocol,
                                 PurpleConnection *gc,
                                 PurpleGetPublicAliasSuccessCallback success_cb,
                                 PurpleGetPublicAliasFailureCallback failure_cb)
@@ -745,7 +745,7 @@
 }
 
 gssize
-purple_protocol_iface_get_max_message_size(PurpleProtocol *protocol,
+purple_protocol_client_iface_get_max_message_size(PurpleProtocol *protocol,
                                            PurpleConversation *conv)
 {
 	DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, 0, get_max_message_size, conv);

--- a/libpurple/protocols.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/protocols.c	Sat Sep 14 15:46:27 2013 +0530
@@ -443,7 +443,7 @@
 		return;
 
 	if (!purple_account_is_disconnected(account))
-		purple_protocol_iface_set_status(protocol, account, new_status);
+		purple_protocol_server_iface_set_status(protocol, account, new_status);
 }
 
 void
@@ -529,7 +529,7 @@
 	purple_debug_info("server", "serv_send_attention: sending '%s' to %s\n",
 			description, who);
 
-	if (!purple_protocol_iface_send_attention(protocol, gc, who, type_code))
+	if (!purple_protocol_attention_iface_send(protocol, gc, who, type_code))
 		return;
 
 	im = purple_im_conversation_new(purple_connection_get_account(gc), who);
@@ -619,7 +619,7 @@
 
 	if (protocol) {
 		/* should check that the protocol supports this media type here? */
-		return purple_protocol_iface_initiate_media(protocol, account, who, type);
+		return purple_protocol_media_iface_initiate_session(protocol, account, who, type);
 	} else
 #endif
 	return FALSE;
@@ -638,7 +638,7 @@
 		protocol = purple_connection_get_protocol(gc);
 
 	if (protocol)
-		return purple_protocol_iface_get_media_caps(protocol, account, who);
+		return purple_protocol_media_iface_get_caps(protocol, account, who);
 #endif
 	return PURPLE_MEDIA_CAPS_NONE;
 }
@@ -681,7 +681,7 @@
 {
 	g_return_val_if_fail(protocol != NULL, 0);
 
-	return purple_protocol_iface_get_max_message_size(protocol, NULL);
+	return purple_protocol_client_iface_get_max_message_size(protocol, NULL);
 }
 
 /**************************************************************************/

--- a/libpurple/protocols/irc/msgs.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/protocols/irc/msgs.c	Sat Sep 14 15:46:27 2013 +0530
@@ -101,7 +101,7 @@
 	status = purple_account_get_active_status(irc->account);
 	if (purple_status_type_get_primitive(purple_status_get_status_type(status)) != PURPLE_STATUS_AVAILABLE) {
 		PurpleProtocol *protocol = purple_connection_get_protocol(gc);
-		purple_protocol_iface_set_status(protocol, irc->account, status);
+		purple_protocol_server_iface_set_status(protocol, irc->account, status);
 	}
 
 	/* this used to be in the core, but it's not now */

--- a/libpurple/roomlist.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/roomlist.c	Sat Sep 14 15:46:27 2013 +0530
@@ -163,7 +163,7 @@
 	protocol = purple_connection_get_protocol(gc);
 
 	if(protocol)
-		return purple_protocol_iface_roomlist_get_list(protocol, gc);
+		return purple_protocol_roomlist_iface_get_list(protocol, gc);
 
 	return NULL;
 }
@@ -184,7 +184,7 @@
 		protocol = purple_connection_get_protocol(gc);
 
 	if(protocol)
-		purple_protocol_iface_roomlist_cancel(protocol, list);
+		purple_protocol_roomlist_iface_cancel(protocol, list);
 }
 
 void purple_roomlist_expand_category(PurpleRoomlist *list, PurpleRoomlistRoom *category)
@@ -204,7 +204,7 @@
 		protocol = purple_connection_get_protocol(gc);
 
 	if(protocol)
-		purple_protocol_iface_roomlist_expand_category(protocol, list, category);
+		purple_protocol_roomlist_iface_expand_category(protocol, list, category);
 }
 
 GList * purple_roomlist_get_fields(PurpleRoomlist *list)

--- a/libpurple/server.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/server.c	Sat Sep 14 15:46:27 2013 +0530
@@ -47,7 +47,7 @@
 
 	if (gc) {
 		protocol = purple_connection_get_protocol(gc);
-		return purple_protocol_iface_send_typing(protocol, gc, name, state);
+		return purple_protocol_im_iface_send_typing(protocol, gc, name, state);
 	}
 
 	return 0;
@@ -134,7 +134,7 @@
 	im = purple_conversations_find_im_with_account(name, account);
 
 	if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, send_im))
-		val = purple_protocol_iface_send_im(protocol, gc, name, message, flags);
+		val = purple_protocol_im_iface_send(protocol, gc, name, message, flags);
 
 	/*
 	 * XXX - If "only auto-reply when away & idle" is set, then shouldn't
@@ -162,7 +162,7 @@
 
 	if (gc) {
 		protocol = purple_connection_get_protocol(gc);
-		purple_protocol_iface_get_info(protocol, gc, name);
+		purple_protocol_server_iface_get_info(protocol, gc, name);
 	}
 }
 
@@ -181,7 +181,7 @@
 					"account-setting-info", account, info))
 				return;
 
-			purple_protocol_iface_set_info(protocol, gc, info);
+			purple_protocol_server_iface_set_info(protocol, gc, info);
 
 			purple_signal_emit(purple_accounts_get_handle(),
 					"account-set-info", account, info);
@@ -206,7 +206,7 @@
 
 			if (gc) {
 				protocol = purple_connection_get_protocol(gc);
-				purple_protocol_iface_alias_buddy(protocol, gc,
+				purple_protocol_server_iface_alias_buddy(protocol, gc,
 						purple_buddy_get_name(b),
 						purple_buddy_get_local_alias(b));
 			}
@@ -296,7 +296,7 @@
 	if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, get_attention_types)) {
 		GList *attention_types;
 
-		attention_types = purple_protocol_iface_get_attention_types(protocol, account);
+		attention_types = purple_protocol_attention_iface_get_types(protocol, account);
 		attn = (PurpleAttentionType *)g_list_nth_data(attention_types, type_code);
 	} else {
 		attn = NULL;
@@ -328,7 +328,7 @@
 
 	if (gc) {
 		protocol = purple_connection_get_protocol(gc);
-		purple_protocol_iface_group_buddy(protocol, gc, purple_buddy_get_name(b),
+		purple_protocol_server_iface_group_buddy(protocol, gc, purple_buddy_get_name(b),
 				purple_group_get_name(og),
 				purple_group_get_name(ng));
 	}
@@ -340,7 +340,7 @@
 
 	if (gc) {
 		protocol = purple_connection_get_protocol(gc);
-		purple_protocol_iface_add_permit(protocol, gc, name);
+		purple_protocol_privacy_iface_add_permit(protocol, gc, name);
 	}
 }
 
@@ -350,7 +350,7 @@
 
 	if (gc) {
 		protocol = purple_connection_get_protocol(gc);
-		purple_protocol_iface_add_deny(protocol, gc, name);
+		purple_protocol_privacy_iface_add_deny(protocol, gc, name);
 	}
 }
 
@@ -360,7 +360,7 @@
 
 	if (gc) {
 		protocol = purple_connection_get_protocol(gc);
-		purple_protocol_iface_rem_permit(protocol, gc, name);
+		purple_protocol_privacy_iface_rem_permit(protocol, gc, name);
 	}
 }
 
@@ -370,7 +370,7 @@
 
 	if (gc) {
 		protocol = purple_connection_get_protocol(gc);
-		purple_protocol_iface_rem_deny(protocol, gc, name);
+		purple_protocol_privacy_iface_rem_deny(protocol, gc, name);
 	}
 }
 
@@ -387,7 +387,7 @@
 		 * in the prefs. In either case you should probably be resetting and
 		 * resending the permit/deny info when you get this.
 		 */
-		purple_protocol_iface_set_permit_deny(protocol, gc);
+		purple_protocol_privacy_iface_set_permit_deny(protocol, gc);
 	}
 }
 
@@ -397,7 +397,7 @@
 
 	if (gc) {
 		protocol = purple_connection_get_protocol(gc);
-		purple_protocol_iface_join_chat(protocol, gc, data);
+		purple_protocol_chat_iface_join(protocol, gc, data);
 	}
 }
 
@@ -408,7 +408,7 @@
 
 	if (gc) {
 		protocol = purple_connection_get_protocol(gc);
-		purple_protocol_iface_reject_chat(protocol, gc, data);
+		purple_protocol_chat_iface_reject(protocol, gc, data);
 	}
 }
 
@@ -430,7 +430,7 @@
 					 chat, name, &buffy);
 
 	if (protocol)
-		purple_protocol_iface_chat_invite(protocol, gc, id, buffy, name);
+		purple_protocol_chat_iface_invite(protocol, gc, id, buffy, name);
 
 	purple_signal_emit(purple_conversations_get_handle(), "chat-invited-user",
 					 chat, name, buffy);
@@ -448,7 +448,7 @@
 	PurpleProtocol *protocol;
 
 	protocol = purple_connection_get_protocol(gc);
-	purple_protocol_iface_chat_leave(protocol, gc, id);
+	purple_protocol_chat_iface_leave(protocol, gc, id);
 }
 
 void serv_chat_whisper(PurpleConnection *gc, int id, const char *who, const char *message)
@@ -457,7 +457,7 @@
 
 	if (gc) {
 		protocol = purple_connection_get_protocol(gc);
-		purple_protocol_iface_chat_whisper(protocol, gc, id, who, message);
+		purple_protocol_chat_iface_whisper(protocol, gc, id, who, message);
 	}
 }
 
@@ -468,7 +468,7 @@
 	protocol = purple_connection_get_protocol(gc);
 
 	if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, chat_send))
-		return purple_protocol_iface_chat_send(protocol, gc, id, message, flags);
+		return purple_protocol_chat_iface_send(protocol, gc, id, message, flags);
 
 	return -EINVAL;
 }
@@ -867,8 +867,8 @@
 		protocol = purple_connection_get_protocol(gc);
 
 		if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, can_receive_file) ||
-				purple_protocol_iface_can_receive_file(protocol, gc, who))
+				purple_protocol_xfer_iface_can_receive(protocol, gc, who))
 
-			purple_protocol_iface_send_file(protocol, gc, who, file);
+			purple_protocol_xfer_iface_send(protocol, gc, who, file);
 	}
 }

--- a/libpurple/util.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/libpurple/util.c	Sat Sep 14 15:46:27 2013 +0530
@@ -3393,7 +3393,7 @@
 				purple_protocols_find(purple_account_get_protocol_id(account));
 
 		if (protocol != NULL)
-			ret = purple_protocol_iface_normalize(protocol, account, str);
+			ret = purple_protocol_client_iface_normalize(protocol, account, str);
 	}
 
 	if (ret == NULL)
@@ -3446,7 +3446,7 @@
 	if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, normalize))
 		return TRUE;
 
-	normalized = purple_protocol_iface_normalize(PURPLE_PROTOCOL(protocol),
+	normalized = purple_protocol_client_iface_normalize(PURPLE_PROTOCOL(protocol),
 			NULL, str);
 
 	return (NULL != normalized);

--- a/pidgin/gtkaccount.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/pidgin/gtkaccount.c	Sat Sep 14 15:46:27 2013 +0530
@@ -311,7 +311,7 @@
 		return FALSE;
 	}
 
-	table = purple_protocol_iface_get_account_text_table(dialog->protocol, NULL);
+	table = purple_protocol_client_iface_get_account_text_table(dialog->protocol, NULL);
 	label = g_hash_table_lookup(table, "login_label");
 
 	if(!strcmp(gtk_entry_get_text(GTK_ENTRY(widget)), label)) {
@@ -335,7 +335,7 @@
 	const char *label = NULL;
 
 	if(PURPLE_PROTOCOL_IMPLEMENTS(dialog->protocol, get_account_text_table)) {
-		table = purple_protocol_iface_get_account_text_table(dialog->protocol, NULL);
+		table = purple_protocol_client_iface_get_account_text_table(dialog->protocol, NULL);
 		label = g_hash_table_lookup(table, "login_label");
 
 		if (*gtk_entry_get_text(GTK_ENTRY(widget)) == '\0') {
@@ -374,7 +374,7 @@
 #endif
 	gint xsize;
 
-	table = purple_protocol_iface_get_account_text_table(dialog->protocol, NULL);
+	table = purple_protocol_client_iface_get_account_text_table(dialog->protocol, NULL);
 	label = g_hash_table_lookup(table, "login_label");
 	text = gtk_entry_get_text(GTK_ENTRY(widget));
 
@@ -629,7 +629,7 @@
 			&& PURPLE_PROTOCOL_IMPLEMENTS(dialog->protocol, get_account_text_table)) {
 		GHashTable *table;
 		const char *label;
-		table = purple_protocol_iface_get_account_text_table(dialog->protocol, NULL);
+		table = purple_protocol_client_iface_get_account_text_table(dialog->protocol, NULL);
 		label = g_hash_table_lookup(table, "login_label");
 
 #if GTK_CHECK_VERSION(3,2,0)

--- a/pidgin/gtkblist.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/pidgin/gtkblist.c	Sat Sep 14 15:46:27 2013 +0530
@@ -395,7 +395,7 @@
 	components = purple_chat_get_components(chat);
 
 	if (protocol)
-		chat_name = purple_protocol_iface_get_chat_name(protocol, components);
+		chat_name = purple_protocol_chat_iface_get_name(protocol, components);
 
 	if (chat_name)
 		name = chat_name;
@@ -669,7 +669,7 @@
 	purple_request_fields_add_group(fields, group);
 
 	gc = purple_account_get_connection(purple_chat_get_account(chat));
-	parts = purple_protocol_iface_chat_info(purple_connection_get_protocol(gc), gc);
+	parts = purple_protocol_chat_iface_info(purple_connection_get_protocol(gc), gc);
 
 	for (iter = parts; iter; iter = iter->next) {
 		pce = iter->data;
@@ -750,7 +750,7 @@
 		account = purple_chat_get_account(c);
 		protocol = purple_protocols_find(purple_account_get_protocol_id(account));
 		if (protocol) {
-			name = purple_protocol_iface_get_chat_name(protocol, purple_chat_get_components(c));
+			name = purple_protocol_chat_iface_get_name(protocol, purple_chat_get_components(c));
 		}
 	} else if (PURPLE_IS_CONTACT(node)) {
 		pidgin_log_show_contact(PURPLE_CONTACT(node));
@@ -1055,8 +1055,8 @@
 	g_list_free(data->entries);
 	data->entries = NULL;
 
-	list = purple_protocol_iface_chat_info(protocol, gc);
-	defaults = purple_protocol_iface_chat_info_defaults(protocol, gc, default_chat_name);
+	list = purple_protocol_chat_iface_info(protocol, gc);
+	defaults = purple_protocol_chat_iface_info_defaults(protocol, gc, default_chat_name);
 
 	for (tmp = list; tmp; tmp = tmp->next)
 	{
@@ -1425,7 +1425,7 @@
 	if(!protocol || !PURPLE_PROTOCOL_IMPLEMENTS(protocol, blist_node_menu))
 		return;
 
-	for(l = ll = purple_protocol_iface_blist_node_menu(protocol, node); l; l = l->next) {
+	for(l = ll = purple_protocol_client_iface_blist_node_menu(protocol, node); l; l = l->next) {
 		PurpleMenuAction *act = (PurpleMenuAction *) l->data;
 		pidgin_append_menu_action(menu, act, node);
 	}
@@ -1528,7 +1528,7 @@
 
 	if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, send_file)) {
 		if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, can_receive_file) ||
-			purple_protocol_iface_can_receive_file(protocol,
+			purple_protocol_xfer_iface_can_receive(protocol,
 			purple_account_get_connection(purple_buddy_get_account(buddy)), purple_buddy_get_name(buddy)))
 		{
 			pidgin_new_item_from_stock(menu, _("_Send File..."),
@@ -2310,7 +2310,7 @@
 		}
 
 		protocol =
-			purple_protocol_iface_list_icon(purple_connection_get_protocol(gc),
+			purple_protocol_class_list_icon(purple_connection_get_protocol(gc),
 					purple_buddy_get_account(buddy), buddy);
 
 		str = g_string_new(NULL);
@@ -3520,7 +3520,7 @@
 				PurpleProtocol *protocol = purple_connection_get_protocol(gc);
 				PurpleMood *mood = NULL;
 
-				for (mood = purple_protocol_iface_get_moods(protocol, account) ;
+				for (mood = purple_protocol_client_iface_get_moods(protocol, account) ;
 				    mood->mood != NULL ; mood++) {
 					int mood_count =
 							GPOINTER_TO_INT(g_hash_table_lookup(mood_counts, mood->mood));
@@ -3625,7 +3625,7 @@
 	/* TODO: rlaager wants this sorted. */
 	/* TODO: darkrain wants it sorted post-translation */
 	if (account && PURPLE_PROTOCOL_IMPLEMENTS(protocol, get_moods))
-		mood = purple_protocol_iface_get_moods(protocol, account);
+		mood = purple_protocol_client_iface_get_moods(protocol, account);
 	else
 		mood = global_moods;
 	for ( ; mood->mood != NULL ; mood++) {
@@ -3824,7 +3824,7 @@
 		} else {
 			char *chat_name;
 			if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, get_chat_name))
-				chat_name = purple_protocol_iface_get_chat_name(protocol, purple_chat_get_components(chat));
+				chat_name = purple_protocol_chat_iface_get_name(protocol, purple_chat_get_components(chat));
 			else
 				chat_name = g_strdup(purple_chat_get_name(chat));
 
@@ -3846,7 +3846,7 @@
 		}
 
 		if (protocol)
-			cur = purple_protocol_iface_chat_info(protocol, purple_account_get_connection(purple_chat_get_account(chat)));
+			cur = purple_protocol_chat_iface_info(protocol, purple_account_get_connection(purple_chat_get_account(chat)));
 
 		while (cur != NULL)
 		{
@@ -4007,7 +4007,7 @@
 				protocol)
 		{
 			/* Additional text from the protocol */
-			purple_protocol_iface_tooltip_text(protocol, b, user_info, full);
+			purple_protocol_client_iface_tooltip_text(protocol, b, user_info, full);
 		}
 
 		/* These are Easter Eggs.  Patches to remove them will be rejected. */
@@ -4166,7 +4166,7 @@
 	if (!protocol)
 		return NULL;
 
-	name = purple_protocol_iface_list_emblem(protocol, buddy);
+	name = purple_protocol_client_iface_list_emblem(protocol, buddy);
 
 	if (name == NULL) {
 		PurpleStatus *status;
@@ -4365,7 +4365,7 @@
 
 		if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, status_text) &&
 				purple_account_get_connection(purple_buddy_get_account(b))) {
-			char *tmp = purple_protocol_iface_status_text(protocol, b);
+			char *tmp = purple_protocol_client_iface_status_text(protocol, b);
 			const char *end;
 
 			if(tmp && !g_utf8_validate(tmp, -1, &end)) {
@@ -8315,7 +8315,7 @@
 				PurpleProtocolAction *action = NULL;
 				GList *actions, *l;
 
-				actions = purple_protocol_iface_get_actions(protocol, gc);
+				actions = purple_protocol_client_iface_get_actions(protocol, gc);
 
 				for (l = actions; l != NULL; l = l->next)
 				{

--- a/pidgin/gtkconv.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/pidgin/gtkconv.c	Sat Sep 14 15:46:27 2013 +0530
@@ -1487,7 +1487,7 @@
 	protocol = purple_connection_get_protocol(gc);
 
 	if (protocol)
-		real_who = purple_protocol_iface_get_cuser_real_name(protocol, gc,
+		real_who = purple_protocol_chat_iface_get_user_real_name(protocol, gc,
 				purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(conv)), who);
 
 	if(!who && !real_who)
@@ -1541,7 +1541,7 @@
 	protocol = purple_connection_get_protocol(gc);
 
 	if (protocol)
-		real_who = purple_protocol_iface_get_cuser_real_name(protocol, gc,
+		real_who = purple_protocol_chat_iface_get_user_real_name(protocol, gc,
 				purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(conv)), who);
 
 	serv_send_file(gc, real_who ? real_who : who, NULL);
@@ -1673,10 +1673,10 @@
 				can_receive_file = FALSE;
 			else {
 				gchar *real_who = NULL;
-				real_who = purple_protocol_iface_get_cuser_real_name(protocol, gc,
+				real_who = purple_protocol_chat_iface_get_user_real_name(protocol, gc,
 					purple_chat_conversation_get_id(chat), who);
 				if (!(!PURPLE_PROTOCOL_IMPLEMENTS(protocol, can_receive_file) ||
-						purple_protocol_iface_can_receive_file(protocol, gc, real_who ? real_who : who)))
+						purple_protocol_xfer_iface_can_receive(protocol, gc, real_who ? real_who : who)))
 					can_receive_file = FALSE;
 				g_free(real_who);
 			}
@@ -2456,7 +2456,7 @@
 	GList *l = NULL;
 	PurpleProtocol *protocol =
 			purple_protocols_find(purple_account_get_protocol_id(account));
-	const char *protoname = purple_protocol_iface_list_icon(protocol, account, NULL);
+	const char *protoname = purple_protocol_class_list_icon(protocol, account, NULL);
 	l = g_hash_table_lookup(protocol_lists, protoname);
 	if (l)
 		return l;
@@ -3273,7 +3273,7 @@
 					purple_protocols_find(purple_account_get_protocol_id(account));
 			if (purple_account_get_connection(account) != NULL &&
 					PURPLE_PROTOCOL_IMPLEMENTS(protocol, chat_info_defaults)) {
-				components = purple_protocol_iface_chat_info_defaults(protocol, purple_account_get_connection(account),
+				components = purple_protocol_chat_iface_info_defaults(protocol, purple_account_get_connection(account),
 						purple_conversation_get_name(conv));
 			} else {
 				components = g_hash_table_new_full(g_str_hash, g_str_equal,
@@ -3409,7 +3409,7 @@
 		protocol = purple_connection_get_protocol(pc);
 
 	if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, get_attention_types)) {
-		list = purple_protocol_iface_get_attention_types(protocol, purple_connection_get_account(pc));
+		list = purple_protocol_attention_iface_get_types(protocol, purple_connection_get_account(pc));
 
 		/* Multiple attention types */
 		if (list && list->next) {
@@ -4482,7 +4482,7 @@
 	else
 		gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), "");
 
-	purple_protocol_iface_set_chat_topic(protocol, gc, purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(conv)),
+	purple_protocol_chat_iface_set_topic(protocol, gc, purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(conv)),
 			new_topic);
 
 	g_free(new_topic);
@@ -7264,7 +7264,7 @@
 			gtk_action_set_sensitive(win->menu.send_file,
 									 (PURPLE_PROTOCOL_IMPLEMENTS(protocol, send_file) &&
 									 (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, can_receive_file) ||
-									  purple_protocol_iface_can_receive_file(protocol, gc, purple_conversation_get_name(conv)))));
+									  purple_protocol_xfer_iface_can_receive(protocol, gc, purple_conversation_get_name(conv)))));
 			gtk_action_set_sensitive(win->menu.get_attention, (PURPLE_PROTOCOL_IMPLEMENTS(protocol, send_attention)));
 			gtk_action_set_sensitive(win->menu.alias,
 									 (account != NULL) &&
@@ -8185,7 +8185,7 @@
 			PurpleChat *chat = purple_blist_find_chat(purple_conversation_get_account(conv), purple_conversation_get_name(conv));
 			if (chat == NULL) {
 				PurpleProtocol *protocol = purple_connection_get_protocol(gc);
-				comps = purple_protocol_iface_chat_info_defaults(protocol, gc, purple_conversation_get_name(conv));
+				comps = purple_protocol_chat_iface_info_defaults(protocol, gc, purple_conversation_get_name(conv));
 			} else {
 				comps = purple_chat_get_components(chat);
 			}

--- a/pidgin/gtkroomlist.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/pidgin/gtkroomlist.c	Sat Sep 14 15:46:27 2013 +0530
@@ -236,7 +236,7 @@
 		protocol = purple_connection_get_protocol(gc);
 
 	if(protocol != NULL && PURPLE_PROTOCOL_IMPLEMENTS(protocol, roomlist_room_serialize))
-		name = purple_protocol_iface_roomlist_room_serialize(protocol, info->room);
+		name = purple_protocol_roomlist_iface_room_serialize(protocol, info->room);
 	else
 		name = g_strdup(purple_roomlist_room_get_name(info->room));
 

--- a/pidgin/gtkutils.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/pidgin/gtkutils.c	Sat Sep 14 15:46:27 2013 +0530
@@ -559,7 +559,7 @@
 	if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, list_icon))
 		return NULL;
 
-	protoname = purple_protocol_iface_list_icon(protocol, account, NULL);
+	protoname = purple_protocol_class_list_icon(protocol, account, NULL);
 	if (protoname == NULL)
 		return NULL;
 
@@ -921,7 +921,7 @@
 
 	protocol = purple_connection_get_protocol(conn);
 	if (protocol != NULL)
-		who = purple_protocol_iface_get_cuser_real_name(protocol, conn, chat, name);
+		who = purple_protocol_chat_iface_get_user_real_name(protocol, conn, chat, name);
 
 	pidgin_retrieve_user_info(conn, who ? who : name);
 	g_free(who);
@@ -1039,7 +1039,7 @@
 					protocol = purple_connection_get_protocol(gc);
 				}
 
-				protoname = purple_protocol_iface_list_icon(protocol, account, NULL);
+				protoname = purple_protocol_class_list_icon(protocol, account, NULL);
 
 				if (!strcmp(protoname, protocol_id))
 					break;
@@ -1078,7 +1078,7 @@
 						protocol = purple_connection_get_protocol(gc);
 					}
 
-					protoname = purple_protocol_iface_list_icon(protocol, account, NULL);
+					protoname = purple_protocol_class_list_icon(protocol, account, NULL);
 
 					if (!strcmp(protoname, "aim") || !strcmp(protoname, "icq"))
 						break;
@@ -1490,7 +1490,7 @@
 				im = TRUE;
 
 			if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, can_receive_file))
-				ft = purple_protocol_iface_can_receive_file(protocol, gc, who);
+				ft = purple_protocol_xfer_iface_can_receive(protocol, gc, who);
 			else if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, send_file))
 				ft = TRUE;
 

--- a/pidgin/plugins/xmppconsole.c	Sat Sep 14 15:18:23 2013 +0530
+++ b/pidgin/plugins/xmppconsole.c	Sat Sep 14 15:46:27 2013 +0530
@@ -209,7 +209,7 @@
 	text = gtk_webview_get_body_text(GTK_WEBVIEW(widget));
 
 	if (protocol)
-		purple_protocol_iface_send_raw(protocol, gc, text, strlen(text));
+		purple_protocol_server_iface_send_raw(protocol, gc, text, strlen(text));
 
 	g_free(text);
 	gtk_webview_load_html_string(GTK_WEBVIEW(console->entry), "");