diff src/gtkblist.c @ 7956:1b8261f374ea

[gaim-migrate @ 8631] This is the death of protocol numbers. There are probably now a few functions that should now go away, but i'll let our crack team of crazy patch writers figure out which ones they are. out-of-tree and unofficial prpl-writers, rejoice! committer: Tailor Script <[e-mail]>

--- a/src/gtkblist.c	Mon Dec 29 08:59:22 2003 +0000
+++ b/src/gtkblist.c	Mon Dec 29 09:03:47 2003 +0000
@@ -964,7 +964,7 @@
 			b = (GaimBuddy *)node;
 
 		/* Protocol specific options */
-		prpl = gaim_find_prpl(gaim_account_get_protocol(b->account));
+		prpl = gaim_find_prpl(gaim_account_get_protocol_id(b->account));
 
 		if (prpl != NULL)
 			prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
@@ -1022,7 +1022,7 @@
 						gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 						gtk_widget_show(submenu);
 
-						prpl = gaim_find_prpl(gaim_account_get_protocol(buddy->account));
+						prpl = gaim_find_prpl(gaim_account_get_protocol_id(buddy->account));
 						prpl_info = prpl ? GAIM_PLUGIN_PROTOCOL_INFO(prpl) : NULL;
 
 						make_buddy_menu(submenu, prpl_info, buddy);
@@ -1744,7 +1744,7 @@
 	GaimPlugin *prpl;
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	char *text = NULL;
-	
+
 	if(GAIM_BLIST_NODE_IS_CHAT(node)) {
 		GaimChat *chat = (GaimChat *)node;
 		char *name = NULL;
@@ -1752,7 +1752,7 @@
 		GList *parts, *tmp;
 		GString *parts_text = g_string_new("");
 
-		prpl = gaim_find_prpl(gaim_account_get_protocol(chat->account));
+		prpl = gaim_find_prpl(gaim_account_get_protocol_id(chat->account));
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
 
 		parts = prpl_info->chat_info(chat->account->gc);
@@ -1809,7 +1809,7 @@
 			b = (GaimBuddy *)node;
 		}
 
-		prpl = gaim_find_prpl(gaim_account_get_protocol(b->account));
+		prpl = gaim_find_prpl(gaim_account_get_protocol_id(b->account));
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
 
 		if (prpl_info && prpl_info->tooltip_text) {
@@ -1927,7 +1927,7 @@
 		else
 			account = chat->account;
 
-		prpl = gaim_find_prpl(gaim_account_get_protocol(account));
+		prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
 		if(!prpl)
 			return NULL;
 
@@ -2065,7 +2065,7 @@
 		name = gaim_get_buddy_alias(b);
 	esc = g_markup_escape_text(name, strlen(name));
 
-	prpl = gaim_find_prpl(gaim_account_get_protocol(b->account));
+	prpl = gaim_find_prpl(gaim_account_get_protocol_id(b->account));
 
 	if (prpl != NULL)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
@@ -3849,7 +3849,7 @@
 	const char *protoname = NULL;
 	char buf[256];
 
-	prpl = gaim_find_prpl(gaim_account_get_protocol(account));
+	prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
 
 	if (prpl != NULL) {
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);