[Gaim-commits] CVS: gaim/src account.c,1.99,1.100

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12952/src

Modified Files:
	account.c 
Log Message:
(16:41:30) grim elite:
www.reaperworld.com/code/gaim/gaim-2.0.0cvs-account.c_fixups.diff
(16:41:48) LSchiere2: merging 2 functions?
(16:42:00) grim elite: merges the 2 definitions of
gaim_account_get_protocol_name
(16:42:05) LSchiere2: ah


Index: account.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -p -r1.99 -r1.100
--- account.c	8 Sep 2004 19:36:04 -0000	1.99
+++ account.c	8 Sep 2004 20:43:41 -0000	1.100
@@ -789,17 +789,7 @@ gaim_account_get_protocol_name(const Gai
 
 	g_return_val_if_fail(account != NULL, NULL);
 
-	p = gaim_find_prpl(account->protocol_id);
-
-	return ((p && p->info->name) ? _(p->info->name) : _("Unknown"));
-}
-
-const char *
-gaim_account_get_protocol_name(const GaimAccount *account)
-{
-	g_return_val_if_fail(account != NULL, NULL);
-
-	GaimPlugin *p = gaim_find_prpl(gaim_account_get_protocol_id(account));
+	p = gaim_find_prpl(gaim_account_get_protocol_id(account));
 
 	return ((p && p->info->name) ? _(p->info->name) : _("Unknown"));
 }