Mercurial > pidgin

changeset 9460:eae7e049d639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10285] " This patch completely eliminates the use of the old numeric prpl identifiers. I've noticed that some plugins (both in gaim's cvs and external) continue to use the constants even though they are essentially no longer valid - code that relies on them being unique will fail - the new built-in prpls (SILC and novell) ,and any recent external prpls don't have numeric values. The once side effect that the removal causes is that the code for importing of the old .gaimrc and *.blist files is a little more kludgy (using magic numbers instead of the old constants). IMHO this isn't a big deal as the code will go away eventually anyway. **This patch also fixes the raw plugin so that i compiles once again. **Someone should make sure that the gaim-remote and raw plugins still work. (If the raw doesn't work, it may be unrelated as it hasn't been updated since the latest significant MSN changes - i just made a minor change to make it compile)" --Daniel Atallah (13:44:44) Me: what think you of getting rid of prpl numbers? (13:45:05) Sean: what do you mean? (13:45:27) Me: right now they are listed as deprecated, but still used in a few of our own plugins as well as in some 3rd party stuff (13:45:32) Me: and the enum still exists in the core (13:45:44) Me: and the newwer prpls such as novell don't use them (13:45:59) Me: datallah has submitted a patch to get rid of them entirely (13:46:31) Me: the only thing it would break would be the old blist import, which he hacked into working with magic numbers, but which i tend to think we could remove entirely anyway (13:50:03) Sean: Let's get rid of them, then. (13:50:10) Sean: and take out old .blist code too (13:50:14) Me: cool (13:52:37) Sean: we should get rid of .gaimrc code too, sometime. (13:53:02) Sean: If anyone's seriously just now upgrading from 0.59.x, or whatever, they deserve to lose their preferences. (12:27:56) LSchiere: Paco-Paco: what do you think of getting rid of the deprecated prpl numbers? (12:28:14) Paco-Paco: LSchiere: I think it shouldh ave happened long ago committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 06 Jul 2004 18:06:43 +0000
parents dbeca8eca296
children 9e647eaaa349
files plugins/ChangeLog.API plugins/gaim-remote/remote.c plugins/raw.c src/account.c src/account.h src/blist.c src/blist.h src/gaimrc.c src/gtkblist.c src/prpl.c src/prpl.h
diffstat 11 files changed, 119 insertions(+), 274 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/ChangeLog.API	Tue Jul 06 12:58:29 2004 +0000
+++ b/plugins/ChangeLog.API	Tue Jul 06 18:06:43 2004 +0000
@@ -1,5 +1,9 @@
 Gaim: The Pimpin' Penguin IM Client that's good for the soul!
 
+version 0.80cvs:
+	Gaim API:
+	* Deprecated PRPL numbers removed
+
 version 0.79 (06/24/2004):
 	Gaim API:
 	* gaim_url_parse() now takes two additional parameters, which are used
--- a/plugins/gaim-remote/remote.c	Tue Jul 06 12:58:29 2004 +0000
+++ b/plugins/gaim-remote/remote.c	Tue Jul 06 18:06:43 2004 +0000
@@ -78,7 +78,7 @@
 		account = gaim_connection_get_account(gc);
 		username = gaim_account_get_username(account);
 
-		if (gaim_account_get_protocol(account) == GAIM_PROTO_OSCAR &&
+		if (strcmp(gaim_account_get_protocol_id(account), "prpl-oscar") == 0 &&
 			username != NULL && isalpha(*username)) {
 
 			break;
--- a/plugins/raw.c	Tue Jul 06 12:58:29 2004 +0000
+++ b/plugins/raw.c	Tue Jul 06 18:06:43 2004 +0000
@@ -33,6 +33,7 @@
 {
 	const char *txt;
 	GaimConnection *gc;
+	const char *prpl_id;
 
 	if (account == NULL)
 		return;
@@ -41,45 +42,36 @@
 
 	txt = gtk_entry_get_text(entry);
 
-	gaim_debug_misc("raw", "prpl num = %d\n", gaim_account_get_protocol(account));
-	switch (gaim_account_get_protocol(account)) {
-		case GAIM_PROTO_TOC:
-			{
-				int *a = (int *)gc->proto_data;
-				unsigned short seqno = htons(a[1]++ & 0xffff);
-				unsigned short len = htons(strlen(txt) + 1);
-				write(*a, "*\002", 2);
-				write(*a, &seqno, 2);
-				write(*a, &len, 2);
-				write(*a, txt, ntohs(len));
-				gaim_debug(GAIM_DEBUG_MISC, "raw", "TOC C: %s\n", txt);
-			}
-			break;
-
-		case GAIM_PROTO_MSN:
-			{
-				MsnSession *session = gc->proto_data;
-				char buf[strlen(txt) + 3];
+	prpl_id = gaim_account_get_protocol_id(account);
+	
+	gaim_debug_misc("raw", "prpl_id = %s\n", prpl_id);
+	
+	if (strcmp(prpl_id, "prpl-toc") == 0) {
+		int *a = (int *)gc->proto_data;
+		unsigned short seqno = htons(a[1]++ & 0xffff);
+		unsigned short len = htons(strlen(txt) + 1);
+		write(*a, "*\002", 2);
+		write(*a, &seqno, 2);
+		write(*a, &len, 2);
+		write(*a, txt, ntohs(len));
+		gaim_debug(GAIM_DEBUG_MISC, "raw", "TOC C: %s\n", txt);
+		
+	} else if (strcmp(prpl_id, "prpl-msn") == 0) {
+		MsnSession *session = gc->proto_data;
+		char buf[strlen(txt) + 3];
 
-				g_snprintf(buf, sizeof(buf), "%s\r\n", txt);
-				msn_servconn_write(session->notification_conn, buf, strlen(buf));
-			}
-			break;
+		g_snprintf(buf, sizeof(buf), "%s\r\n", txt);
+		msn_servconn_write(session->notification->servconn, buf, strlen(buf));
+		
+	} else if (strcmp(prpl_id, "prpl-irc") == 0) {
+		write(*(int *)gc->proto_data, txt, strlen(txt));
+		write(*(int *)gc->proto_data, "\r\n", 2);
+		gaim_debug(GAIM_DEBUG_MISC, "raw", "IRC C: %s\n", txt);
 
-		case GAIM_PROTO_IRC:
-			write(*(int *)gc->proto_data, txt, strlen(txt));
-			write(*(int *)gc->proto_data, "\r\n", 2);
-			gaim_debug(GAIM_DEBUG_MISC, "raw", "IRC C: %s\n", txt);
-			break;
-
-		case GAIM_PROTO_JABBER:
-			jabber_send_raw((JabberStream *)gc->proto_data, txt, -1);
-			break;
-
-		default:
-			gaim_debug_error("raw", "Unknown protocol ID %d\n",
-							 gaim_account_get_protocol(account));
-			break;
+	} else if (strcmp(prpl_id, "prpl-jabber") == 0) {
+		jabber_send_raw((JabberStream *)gc->proto_data, txt, -1);
+	} else {
+		gaim_debug_error("raw", "Unknown protocol ID %s\n", prpl_id);
 	}
 
 	gtk_entry_set_text(entry, "");
--- a/src/account.c	Tue Jul 06 12:58:29 2004 +0000
+++ b/src/account.c	Tue Jul 06 18:06:43 2004 +0000
@@ -71,7 +71,6 @@
 	AccountParserTag tag;
 
 	GaimAccount *account;
-	GaimProtocol protocol;
 	GaimProxyInfo *proxy_info;
 	char *protocol_id;
 
@@ -450,14 +449,6 @@
 }
 
 void
-gaim_account_set_protocol(GaimAccount *account, GaimProtocol protocol)
-{
-	g_return_if_fail(account != NULL);
-
-	gaim_account_set_protocol_id(account, gaim_prpl_num_to_id(protocol));
-}
-
-void
 gaim_account_set_protocol_id(GaimAccount *account, const char *protocol_id)
 {
 	g_return_if_fail(account     != NULL);
@@ -728,14 +719,6 @@
 	return account->buddy_icon;
 }
 
-GaimProtocol
-gaim_account_get_protocol(const GaimAccount *account)
-{
-	g_return_val_if_fail(account != NULL, -1);
-
-	return gaim_prpl_id_to_num(gaim_account_get_protocol_id(account));
-}
-
 const char *
 gaim_account_get_protocol_id(const GaimAccount *account)
 {
@@ -1543,37 +1526,6 @@
 	return accounts;
 }
 
-static GaimAccount *
-gaim_accounts_find_with_prpl_num(const char *name, GaimProtocol protocol)
-{
-	GaimAccount *account = NULL;
-	GList *l;
-	char *who;
-
-	g_return_val_if_fail(name != NULL, NULL);
-
-	who = g_strdup(gaim_normalize(NULL, name));
-
-	for (l = gaim_accounts_get_all(); l != NULL; l = l->next) {
-		account = (GaimAccount *)l->data;
-
-		if (!strcmp(gaim_normalize(NULL, gaim_account_get_username(account)), who)) {
-			if (protocol != -1) {
-				if (gaim_account_get_protocol(account) == protocol)
-					break;
-			}
-			else
-				break;
-		}
-
-		account = NULL;
-	}
-
-	g_free(who);
-
-	return account;
-}
-
 GaimAccount *
 gaim_accounts_find(const char *name, const char *protocol_id)
 {
@@ -1597,9 +1549,6 @@
 		account = NULL;
 	}
 
-	if(!account && protocol_id)
-		account = gaim_accounts_find_with_prpl_num(name, atoi(protocol_id));
-
 	g_free(who);
 
 	return account;
--- a/src/account.h	Tue Jul 06 12:58:29 2004 +0000
+++ b/src/account.h	Tue Jul 06 18:06:43 2004 +0000
@@ -200,14 +200,6 @@
 void gaim_account_set_buddy_icon(GaimAccount *account, const char *icon);
 
 /**
- * Sets the account's protocol.
- *
- * @param account  The account.
- * @param protocol The protocol.
- */
-void gaim_account_set_protocol(GaimAccount *account, GaimProtocol protocol);
-
-/**
  * Sets the account's protocol ID.
  *
  * @param account     The account.
@@ -383,15 +375,6 @@
 const char *gaim_account_get_buddy_icon(const GaimAccount *account);
 
 /**
- * Returns the account's protocol.
- *
- * @param account The account.
- *
- * @return The protocol.
- */
-GaimProtocol gaim_account_get_protocol(const GaimAccount *account);
-
-/**
  * Returns the account's protocol ID.
  *
  * @param account The account.
--- a/src/blist.c	Tue Jul 06 12:58:29 2004 +0000
+++ b/src/blist.c	Tue Jul 06 18:06:43 2004 +0000
@@ -1822,19 +1822,48 @@
 		char *g_screenname = get_screenname_filename(account->username);
 		const char *username;
 		char *file = gaim_user_dir();
-		GaimProtocol prpl_num;
-		int protocol;
-
-		prpl_num = gaim_account_get_protocol(account);
-
-		protocol = prpl_num;
-
-		/* XXX - Somehow move this checking into the PRPLs */
-		if (prpl_num == GAIM_PROTO_OSCAR) {
+		const char *prpl_id;
+		int protocol = -1;
+
+		prpl_id = gaim_account_get_protocol_id(account);
+
+		/* XXX - Somehow move this checking into the PRPLs
+		 * Load old GaimProtocol numbers that have been eliminated */
+		if (strcmp(prpl_id, "prpl-toc") == 0) {
+			protocol = 0;
+		} else if (strcmp(prpl_id, "prpl-oscar") == 0) {
+			protocol = 1;
 			if ((username = gaim_account_get_username(account)) != NULL) {
-				protocol = (isalpha(*username)
-							? GAIM_PROTO_TOC : GAIM_PROTO_ICQ);
+				/*
+				 * Old values from when Protocols had to have an assigned ID:
+				 * 
+				 * GAIM_PROTO_TOC = 0
+				 * GAIM_PROTO_ICQ = 3
+				 */
+				protocol = (isalpha(*username) ? 0 : 3);
 			}
+		} else if (strcmp(prpl_id, "prpl-yahoo") == 0) {
+			protocol = 2;
+		} else if (strcmp(prpl_id, "prpl-icq") == 0) {
+			protocol = 3;
+		} else if (strcmp(prpl_id, "prpl-msn") == 0) {
+			protocol = 4;
+		} else if (strcmp(prpl_id, "prpl-irc") == 0) {
+			protocol = 5;
+		} else if (strcmp(prpl_id, "prpl-jabber") == 0) {
+			protocol = 8;
+		} else if (strcmp(prpl_id, "prpl-napster") == 0) {
+			protocol = 9;
+		} else if (strcmp(prpl_id, "prpl-zephyr") == 0) {
+			protocol = 10;
+		} else if (strcmp(prpl_id, "prpl-gg") == 0) {
+			protocol = 11;
+		} else if (strcmp(prpl_id, "prpl-moo") == 0) {
+			protocol = 16;
+		} else if (strcmp(prpl_id, "prpl-trepia") == 0) {
+			protocol = 18;
+		} else if (strcmp(prpl_id, "prpl-blogger") == 0) {
+			protocol = 21;
 		}
 
 		if (file != (char *)NULL) {
@@ -2323,14 +2352,10 @@
 	char *bud_name = g_markup_escape_text(buddy->name, -1);
 	char *bud_alias = NULL;
 	char *acct_name = g_markup_escape_text(buddy->account->username, -1);
-	int proto_num = gaim_account_get_protocol(buddy->account);
 	if (buddy->alias)
 		bud_alias= g_markup_escape_text(buddy->alias, -1);
-	fprintf(file, "\t\t\t\t<buddy account=\"%s\" proto=\"%s\"", acct_name,
+	fprintf(file, "\t\t\t\t<buddy account=\"%s\" proto=\"%s\">\n", acct_name,
 			gaim_account_get_protocol_id(buddy->account));
-	if (proto_num != -1)
-		fprintf(file, " protocol=\"%d\"", proto_num);
-	fprintf(file, ">\n");
 
 	fprintf(file, "\t\t\t\t\t<name>%s</name>\n", bud_name);
 	if (bud_alias) {
@@ -2392,13 +2417,9 @@
 					GaimChat *chat = (GaimChat *)cnode;
 					if (!exp_acct || chat->account == exp_acct) {
 						char *acct_name = g_markup_escape_text(chat->account->username, -1);
-						int proto_num = gaim_account_get_protocol(chat->account);
-						fprintf(file, "\t\t\t<chat proto=\"%s\" account=\"%s\"",
+						fprintf(file, "\t\t\t<chat proto=\"%s\" account=\"%s\">\n",
 								gaim_account_get_protocol_id(chat->account),
 								acct_name);
-						if (proto_num != -1)
-							fprintf(file, " protocol=\"%d\"", proto_num);
-						fprintf(file, ">\n");
 
 						if (chat->alias) {
 							char *chat_alias = g_markup_escape_text(chat->alias, -1);
@@ -2428,14 +2449,10 @@
 
 		GaimAccount *account = accounts->data;
 		char *acct_name = g_markup_escape_text(account->username, -1);
-		int proto_num = gaim_account_get_protocol(account);
 		if (!exp_acct || account == exp_acct) {
 			fprintf(file, "\t\t<account proto=\"%s\" name=\"%s\" "
-					"mode=\"%d\"", gaim_account_get_protocol_id(account),
+					"mode=\"%d\">\n", gaim_account_get_protocol_id(account),
 					acct_name, account->perm_deny);
-			if (proto_num != -1)
-				fprintf(file, " protocol=\"%d\"", proto_num);
-			fprintf(file, ">\n");
 
 			for (buds = account->permit; buds; buds = buds->next) {
 				char *bud_name = g_markup_escape_text(buds->data, -1);
--- a/src/blist.h	Tue Jul 06 12:58:29 2004 +0000
+++ b/src/blist.h	Tue Jul 06 18:06:43 2004 +0000
@@ -163,7 +163,7 @@
 /**
  * Buddy list UI operations.
  *
- * Any UI representing a buddy list must assign a filled-out gaim_blist_window_ops
+ * Any UI representing a buddy list must assign a filled-out GaimBlistUiOps
  * structure to the buddy list core.
  */
 struct _GaimBlistUiOps
--- a/src/gaimrc.c	Tue Jul 06 12:58:29 2004 +0000
+++ b/src/gaimrc.c	Tue Jul 06 18:06:43 2004 +0000
@@ -522,6 +522,7 @@
 	char user_info[2048];
 	int flags;
 	char *tmp;
+	const char *protocol_id;
 
 	if (!fgets(buf, sizeof(buf), f))
 		return NULL;
@@ -591,7 +592,28 @@
 	if (!(flags & OPT_ACCT_REM_PASS))
 		gaim_account_set_remember_password(account, FALSE);
 
-	gaim_account_set_protocol(account, atoi(p->value[1]));
+	/* convert the old GaimProtocol to the protocol_id */
+	switch(atoi(p->value[1])) {
+		case 0:	tmp = g_strdup("prpl-toc");	break;
+		case 1: tmp = g_strdup("prpl-oscar");	break;
+		case 2: tmp = g_strdup("prpl-yahoo");	break;
+		case 3: tmp = g_strdup("prpl-icq");	break;
+		case 4: tmp = g_strdup("prpl-msn");	break;
+		case 5: tmp = g_strdup("prpl-irc");	break;
+		case 8: tmp = g_strdup("prpl-jabber");	break;
+		case 9: tmp = g_strdup("prpl-napster");	break;
+		case 10:tmp = g_strdup("prpl-zephyr");	break;
+		case 11:tmp = g_strdup("prpl-gg");	break;
+		case 16:tmp = g_strdup("prpl-moo");	break;
+		case 18:tmp = g_strdup("prpl-trepia");	break;
+		case 21:tmp = g_strdup("prpl-blogger");	break;
+		default:
+			tmp = NULL;
+	}
+	if (tmp) {
+		gaim_account_set_protocol_id(account, tmp);
+		g_free(tmp);
+	}
 
 	if (!fgets(buf, sizeof(buf), f))
 		return account;
@@ -605,9 +627,11 @@
 		return account;
 
 	/* I hate this part. We must convert the protocol options. */
-	switch (gaim_account_get_protocol(account)) {
-		/* TOC */
-		case GAIM_PROTO_TOC:
+	protocol_id = gaim_account_get_protocol_id(account);
+
+	/* TOC */
+	if (protocol_id) {	
+		if (strcmp(protocol_id, "prpl-toc") == 0) {
 			if (*p->value[0] == '\0')
 				gaim_account_set_string(account, "server", "toc.oscar.aol.com");
 			else
@@ -618,13 +642,11 @@
 			else
 				gaim_account_set_int(account, "port", atoi(p->value[1]));
 
-			break;
-
 		/* OSCAR */
-		case GAIM_PROTO_OSCAR:
+		} else if (strcmp(protocol_id, "prpl-oscar") == 0) {
 			if (*p->value[0] == '\0')
 				gaim_account_set_string(account, "server",
-										"login.oscar.aol.com");
+				       	"login.oscar.aol.com");
 			else
 				gaim_account_set_string(account, "server", p->value[0]);
 
@@ -633,10 +655,8 @@
 			else
 				gaim_account_set_int(account, "port", atoi(p->value[1]));
 
-			break;
-
 		/* Jabber */
-		case GAIM_PROTO_JABBER:
+		} else if (strcmp(protocol_id, "prpl-jabber") == 0) {
 			if (*p->value[0] == '\0')
 				gaim_account_set_int(account, "port", 5222);
 			else
@@ -645,10 +665,8 @@
 			if (*p->value[1] != '\0')
 				gaim_account_set_string(account, "connect_server", p->value[1]);
 
-			break;
-
 		/* Napster */
-		case GAIM_PROTO_NAPSTER:
+		} else if (strcmp(protocol_id, "prpl-napster") == 0) {
 			if (*p->value[3] == '\0')
 				gaim_account_set_string(account, "server", "64.124.41.187");
 			else
@@ -659,10 +677,8 @@
 			else
 				gaim_account_set_int(account, "port", atoi(p->value[4]));
 
-			break;
-
 		/* Yahoo! */
-		case GAIM_PROTO_YAHOO:
+		} else if (strcmp(protocol_id, "prpl-yahoo") == 0) {
 			if (*p->value[3] == '\0')
 				gaim_account_set_string(account, "server", "scs.yahoo.com");
 			else
@@ -673,13 +689,11 @@
 			else
 				gaim_account_set_int(account, "port", atoi(p->value[4]));
 
-			break;
-
 		/* MSN */
-		case GAIM_PROTO_MSN:
+		} else if (strcmp(protocol_id, "prpl-msn") == 0) {
 			if (*p->value[3] == '\0')
 				gaim_account_set_string(account, "server",
-										"messenger.hotmail.com");
+				       "messenger.hotmail.com");
 			else
 				gaim_account_set_string(account, "server", p->value[3]);
 
@@ -688,10 +702,8 @@
 			else
 				gaim_account_set_int(account, "port", atoi(p->value[4]));
 
-			break;
-
 		/* IRC */
-		case GAIM_PROTO_IRC:
+		} else if (strcmp(protocol_id, "prpl-irc") == 0) {
 			if (*p->value[0] != '\0' &&
 				strchr(gaim_account_get_username(account), '@') == NULL) {
 
@@ -712,11 +724,7 @@
 				gaim_account_set_string(account, "charset", "ISO-8859-1");
 			else
 				gaim_account_set_string(account, "charset", p->value[2]);
-
-			break;
-
-		default:
-			break;
+		}
 	}
 
 	if (!fgets(buf, sizeof(buf), f))
--- a/src/gtkblist.c	Tue Jul 06 12:58:29 2004 +0000
+++ b/src/gtkblist.c	Tue Jul 06 18:06:43 2004 +0000
@@ -753,8 +753,8 @@
 joinchat_select_account_cb(GObject *w, GaimAccount *account,
 							GaimGtkJoinChatData *data)
 {
-	if (gaim_account_get_protocol(data->account) ==
-		gaim_account_get_protocol(account))
+	if (strcmp(gaim_account_get_protocol_id(data->account),
+				gaim_account_get_protocol_id(account)) == 0)
 	{
 		data->account = account;
 	}
@@ -4183,8 +4183,8 @@
 add_chat_select_account_cb(GObject *w, GaimAccount *account,
 						   GaimGtkAddChatData *data)
 {
-	if (gaim_account_get_protocol(data->account) ==
-		gaim_account_get_protocol(account))
+	if (strcmp(gaim_account_get_protocol_id(data->account),
+		gaim_account_get_protocol_id(account)) == 0)
 	{
 		data->account = account;
 	}
--- a/src/prpl.c	Tue Jul 06 12:58:29 2004 +0000
+++ b/src/prpl.c	Tue Jul 06 18:06:43 2004 +0000
@@ -28,56 +28,6 @@
 #include "request.h"
 #include "util.h"
 
-const char *
-gaim_prpl_num_to_id(GaimProtocol protocol)
-{
-	g_return_val_if_fail(protocol >= 0 && protocol < GAIM_PROTO_UNTAKEN, NULL);
-
-	switch (protocol)
-	{
-		case GAIM_PROTO_TOC:      return "prpl-toc";     break;
-		case GAIM_PROTO_OSCAR:    return "prpl-oscar";   break;
-		case GAIM_PROTO_YAHOO:    return "prpl-yahoo";   break;
-		case GAIM_PROTO_ICQ:      return "prpl-icq";     break;
-		case GAIM_PROTO_MSN:      return "prpl-msn";     break;
-		case GAIM_PROTO_IRC:      return "prpl-irc";     break;
-		case GAIM_PROTO_JABBER:   return "prpl-jabber";  break;
-		case GAIM_PROTO_NAPSTER:  return "prpl-napster"; break;
-		case GAIM_PROTO_ZEPHYR:   return "prpl-zephyr";  break;
-		case GAIM_PROTO_GADUGADU: return "prpl-gg";      break;
-		case GAIM_PROTO_MOO:      return "prpl-moo";     break;
-		case GAIM_PROTO_TREPIA:   return "prpl-trepia";  break;
-		case GAIM_PROTO_BLOGGER:  return "prpl-blogger"; break;
-
-		default:
-			break;
-	}
-
-	return NULL;
-}
-
-GaimProtocol
-gaim_prpl_id_to_num(const char *id)
-{
-	g_return_val_if_fail(id != NULL, -1);
-
-	if      (!strcmp(id, "prpl-toc"))     return GAIM_PROTO_TOC;
-	else if (!strcmp(id, "prpl-oscar"))   return GAIM_PROTO_OSCAR;
-	else if (!strcmp(id, "prpl-yahoo"))   return GAIM_PROTO_YAHOO;
-	else if (!strcmp(id, "prpl-icq"))     return GAIM_PROTO_ICQ;
-	else if (!strcmp(id, "prpl-msn"))     return GAIM_PROTO_MSN;
-	else if (!strcmp(id, "prpl-irc"))     return GAIM_PROTO_IRC;
-	else if (!strcmp(id, "prpl-jabber"))  return GAIM_PROTO_JABBER;
-	else if (!strcmp(id, "prpl-napster")) return GAIM_PROTO_NAPSTER;
-	else if (!strcmp(id, "prpl-zephyr"))  return GAIM_PROTO_ZEPHYR;
-	else if (!strcmp(id, "prpl-gg"))      return GAIM_PROTO_GADUGADU;
-	else if (!strcmp(id, "prpl-moo"))     return GAIM_PROTO_MOO;
-	else if (!strcmp(id, "prpl-trepia"))  return GAIM_PROTO_TREPIA;
-	else if (!strcmp(id, "prpl-blogger")) return GAIM_PROTO_BLOGGER;
-
-	return -1;
-}
-
 GaimPlugin *
 gaim_find_prpl(const char *id)
 {
--- a/src/prpl.h	Tue Jul 06 12:58:29 2004 +0000
+++ b/src/prpl.h	Tue Jul 06 18:06:43 2004 +0000
@@ -36,46 +36,6 @@
 /**************************************************************************/
 /*@{*/
 
-/**
- * Protocol types and numbers.
- *
- * Do not assume a new protocol number without talking to
- * Rob Flynn or Sean Egan first!
- */
-typedef enum
-{
-	GAIM_PROTO_TOC = 0,     /**< AIM TOC protocol          */
-	GAIM_PROTO_OSCAR,       /**< AIM OSCAR protocol        */
-	GAIM_PROTO_YAHOO,       /**< Yahoo Messenger protocol  */
-	GAIM_PROTO_ICQ,         /**< Outdated ICQ protocol     */
-	GAIM_PROTO_MSN,         /**< MSN Messenger protocol    */
-	GAIM_PROTO_IRC,         /**< IRC protocol              */
-	GAIM_PROTO_FTP,         /**< FTP protocol              */
-	GAIM_PROTO_VGATE,       /**< VGATE protocol            */
-	GAIM_PROTO_JABBER,      /**< Jabber protocol           */
-	GAIM_PROTO_NAPSTER,     /**< Napster/OpenNAP protocol  */
-	GAIM_PROTO_ZEPHYR,      /**< MIT Zephyr protocol       */
-	GAIM_PROTO_GADUGADU,    /**< Gadu-Gadu protocol        */
-	GAIM_PROTO_SAMETIME,    /**< SameTime protocol         */
-	GAIM_PROTO_TLEN,        /**< TLEN protocol             */
-	GAIM_PROTO_RVP,         /**< RVP protocol              */
-	GAIM_PROTO_BACKRUB,     /**< Instant Massager protocol */
-	GAIM_PROTO_MOO,         /**< MOO protocol              */
-	GAIM_PROTO_ELVIN,       /**< Elvin Protocol            */
-	GAIM_PROTO_TREPIA,      /**< Trepia IM protocol        */
-	GAIM_PROTO_BATTLENET,   /**< Battle.NET protocol       */
-	GAIM_PROTO_SSCP,	/**< SSCP (ConfMgr) protocol   */
-	GAIM_PROTO_BLOGGER,	/**< Blogger xml-rpc protocol  */
-	/* If you add any more prpl numbers,  then a curse will
-	 * be placed upon your keyboard the likes of which the
-	 * world has never known. prpl numbers are no longer
-	 * necessary.  --Nathan
-	 * */
-	GAIM_PROTO_UNTAKEN      /**< Untaken protocol number   */
-
-} GaimProtocol;
-
-
 /** Default protocol plugin description */
 #define GAIM_PRPL_DESC(x) \
 		"Allows gaim to use the " (x) " protocol.\n\n"      \
@@ -344,24 +304,6 @@
 #endif
 
 /**
- * Returns the plugin ID for a protocol number.
- *
- * @param protocol The protocol number.
- *
- * @return The plugin ID for those numbers that support it.
- */
-const char *gaim_prpl_num_to_id(GaimProtocol protocol);
-
-/**
- * Returns the plugin number for a protocol ID.
- *
- * @param id The protocol ID.
- *
- * @return The protocol ID for valid protocol plugin IDs.
- */
-GaimProtocol gaim_prpl_id_to_num(const char *id);
-
-/**
  * Finds a protocol plugin structure of the specified type.
  *
  * @param id The protocol plugin;