Mercurial > pidgin3 / file diff

--- a/pidgin/gtkblist.c	Sat Aug 31 23:18:55 2013 +0530
+++ b/pidgin/gtkblist.c	Sat Aug 31 23:22:35 2013 +0530
@@ -671,7 +671,7 @@
 	purple_request_fields_add_group(fields, group);
 
 	gc = purple_account_get_connection(purple_chat_get_account(chat));
-	parts = purple_connection_get_protocol_info(gc)->chat_info(gc);
+	parts = purple_connection_get_protocol(gc)->chat_info(gc);
 
 	for (iter = parts; iter; iter = iter->next) {
 		pce = iter->data;
@@ -912,7 +912,7 @@
 	gtk_dialog_set_response_sensitive(GTK_DIALOG(data->rq_data.window), GTK_RESPONSE_OK, sensitive);
 
 	gc = purple_account_get_connection(data->rq_data.account);
-	protocol = (gc != NULL) ? purple_connection_get_protocol_info(gc) : NULL;
+	protocol = (gc != NULL) ? purple_connection_get_protocol(gc) : NULL;
 	sensitive = (protocol != NULL && protocol->roomlist_get_list != NULL);
 
 	gtk_dialog_set_response_sensitive(GTK_DIALOG(data->rq_data.window), 1, sensitive);
@@ -951,7 +951,7 @@
 	if (gc == NULL)
 		return FALSE;
 
-	protocol = purple_connection_get_protocol_info(gc);
+	protocol = purple_connection_get_protocol(gc);
 
 	return (protocol->chat_info != NULL);
 }
@@ -1051,7 +1051,7 @@
 	g_return_if_fail(data->rq_data.account != NULL);
 
 	gc = purple_account_get_connection(data->rq_data.account);
-	protocol = purple_connection_get_protocol_info(gc);
+	protocol = purple_connection_get_protocol(gc);
 
 	gtk_container_foreach(GTK_CONTAINER(data->rq_data.vbox), (GtkCallback)gtk_widget_destroy, NULL);
 
@@ -1426,7 +1426,7 @@
                                       PurpleBlistNode *node)
 {
 	GList *l, *ll;
-	PurpleProtocol *protocol = purple_connection_get_protocol_info(gc);
+	PurpleProtocol *protocol = purple_connection_get_protocol(gc);
 
 	if(!protocol || !protocol->blist_node_menu)
 		return;
@@ -1492,7 +1492,7 @@
 
 	account = purple_buddy_get_account(buddy);
 	pc = purple_account_get_connection(account);
-	protocol = purple_connection_get_protocol_info(pc);
+	protocol = purple_connection_get_protocol(pc);
 
 	node = PURPLE_BLIST_NODE(buddy);
 
@@ -2315,7 +2315,7 @@
 		}
 
 		protocol =
-			purple_connection_get_protocol_info(gc)->list_icon(purple_buddy_get_account(buddy),
+			purple_connection_get_protocol(gc)->list_icon(purple_buddy_get_account(buddy),
 														   buddy);
 
 		str = g_string_new(NULL);
@@ -2692,7 +2692,7 @@
 	}
 
 	if(account && purple_account_get_connection(account)) {
-		protocol = purple_connection_get_protocol_info(purple_account_get_connection(account));
+		protocol = purple_connection_get_protocol(purple_account_get_connection(account));
 	}
 
 #if 0
@@ -3518,7 +3518,7 @@
 			PurpleConnection *gc = purple_account_get_connection(account);
 
 			if (purple_connection_get_flags(gc) & PURPLE_CONNECTION_FLAG_SUPPORT_MOODS) {
-				PurpleProtocol *protocol = purple_connection_get_protocol_info(gc);
+				PurpleProtocol *protocol = purple_connection_get_protocol(gc);
 				PurpleMood *mood = NULL;
 
 				/* PURPLE_CONNECTION_FLAG_SUPPORT_MOODS would not be set if the prpl doesn't
@@ -3611,8 +3611,8 @@
 		PurplePresence *presence = purple_account_get_presence(account);
 		PurpleStatus *status = purple_presence_get_status(presence, "mood");
 		gc = purple_account_get_connection(account);
-		g_return_if_fail(purple_connection_get_protocol_info(gc) != NULL);
-		protocol = purple_connection_get_protocol_info(gc);
+		g_return_if_fail(purple_connection_get_protocol(gc) != NULL);
+		protocol = purple_connection_get_protocol(gc);
 		current_mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
 	} else {
 		current_mood = get_global_mood_status();
@@ -7162,7 +7162,7 @@
 	if (account)
 		pc = purple_account_get_connection(account);
 	if (pc)
-		protocol = purple_connection_get_protocol_info(pc);
+		protocol = purple_connection_get_protocol(pc);
 	if (protocol && !(purple_protocol_get_options(protocol) & OPT_PROTO_INVITE_MESSAGE))
 		invite_enabled = FALSE;
 
@@ -7417,7 +7417,7 @@
 
 	if (account != NULL) {
 		gc = purple_account_get_connection(account);
-		protocol = purple_connection_get_protocol_info(gc);
+		protocol = purple_connection_get_protocol(gc);
 
 		if (protocol->join_chat == NULL) {
 			purple_notify_error(gc, NULL, _("This protocol does not support chat rooms."), NULL);
@@ -7427,7 +7427,7 @@
 		/* Find an account with chat capabilities */
 		for (l = purple_connections_get_all(); l != NULL; l = l->next) {
 			gc = (PurpleConnection *)l->data;
-			protocol = purple_connection_get_protocol_info(gc);
+			protocol = purple_connection_get_protocol(gc);
 
 			if (protocol->join_chat != NULL) {
 				account = purple_connection_get_account(gc);
@@ -8302,7 +8302,7 @@
 
 		gc = purple_account_get_connection(account);
 		protocol = gc && PURPLE_CONNECTION_IS_CONNECTED(gc) ?
-				purple_connection_get_protocol_info(gc) : NULL;
+				purple_connection_get_protocol(gc) : NULL;
 
 		if (protocol &&
 		    (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(protocol, get_moods) ||