Merged Jelmer's pluginable tree (mainly useful for the Win32 port).

17 files changed, 203 insertions, 148 deletions

diff --git a/account.c b/account.c
index d5bd24c4..ed6b98c0 100644
--- a/account.c
+++ b/account.c
@@ -27,7 +27,7 @@
 #include "bitlbee.h"
 #include "account.h"
 
-account_t *account_add( irc_t *irc, int protocol, char *user, char *pass )
+account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )
 {
 	account_t *a;
 	
@@ -41,7 +41,7 @@ account_t *account_add( irc_t *irc, int protocol, char *user, char *pass )
 		irc->accounts = a = g_new0 ( account_t, 1 );
 	}
 	
-	a->protocol = protocol;
+	a->prpl = prpl;
 	a->user = g_strdup( user );
 	a->pass = g_strdup( pass );
 	a->irc = irc;
@@ -65,7 +65,7 @@ account_t *account_get( irc_t *irc, char *id )
 	
 	for( a = irc->accounts; a; a = a->next )
 	{
-		if( g_strcasecmp( id, proto_name[a->protocol] ) == 0 )
+		if( g_strcasecmp( id, a->prpl->name ) == 0 )
 		{
 			if( !ret )
 				ret = a;
@@ -123,17 +123,11 @@ void account_on( irc_t *irc, account_t *a )
 		return;
 	}
 	
-	if( proto_prpl[a->protocol]->login == NULL )
-	{
-		irc_usermsg( irc, "Support for protocol %s is not included in this BitlBee", proto_name[a->protocol] );
-		return;
-	}
-	
 	cancel_auto_reconnect( a );
 	
 	u = g_new0 ( struct aim_user, 1 );
 	u->irc = irc;
-	u->protocol = a->protocol;
+	u->prpl = a->prpl;
 	strncpy( u->username, a->user, sizeof( u->username ) - 1 );
 	strncpy( u->password, a->pass, sizeof( u->password ) - 1 );
 	if( a->server) strncpy( u->proto_opt[0], a->server, sizeof( u->proto_opt[0] ) - 1 );
@@ -141,7 +135,7 @@ void account_on( irc_t *irc, account_t *a )
 	a->gc = (struct gaim_connection *) u; /* Bit hackish :-/ */
 	a->reconnect = 0;
 	
-	proto_prpl[a->protocol]->login( u );
+	a->prpl->login( u );
 }
 
 void account_off( irc_t *irc, account_t *a )
diff --git a/account.h b/account.h
index a8653411..37cd8814 100644
--- a/account.h
+++ b/account.h
@@ -28,7 +28,7 @@
 
 typedef struct account
 {
-	int protocol;
+	struct prpl *prpl;
 	char *user;
 	char *pass;
 	char *server;
@@ -40,7 +40,7 @@ typedef struct account
 	struct account *next;
 } account_t;
 
-account_t *account_add( irc_t *irc, int protocol, char *user, char *pass );
+account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass );
 account_t *account_get( irc_t *irc, char *id );
 void account_del( irc_t *irc, account_t *acc );
 void account_on( irc_t *irc, account_t *a );
diff --git a/commands.c b/commands.c
index 27a84ee1..fe1607c4 100644
--- a/commands.c
+++ b/commands.c
@@ -165,7 +165,7 @@ int cmd_account( irc_t *irc, char **cmd )
 	
 	if( g_strcasecmp( cmd[1], "add" ) == 0 )
 	{
-		int prot;
+		struct prpl *prpl;
 		
 		if( cmd[2] == NULL || cmd[3] == NULL || cmd[4] == NULL )
 		{
@@ -173,23 +173,15 @@ int cmd_account( irc_t *irc, char **cmd )
 			return( 0 );
 		}
 		
-		for( prot = 0; prot < PROTO_MAX; prot ++ )
-			if( proto_name[prot] && *proto_name[prot] && g_strcasecmp( proto_name[prot], cmd[2] ) == 0 )
-				break;
+		prpl = find_protocol(cmd[2]);
 		
-		if( ( prot == PROTO_MAX ) || ( proto_prpl[prot] == NULL ) )
+		if( prpl == NULL )
 		{
 			irc_usermsg( irc, "Unknown protocol" );
 			return( 0 );
 		}
 
-		if( prot == PROTO_OSCAR && cmd[5] == NULL )
-		{
-			irc_usermsg( irc, "Not enough parameters" );
-			return( 0 );
-		}
-		
-		a = account_add( irc, prot, cmd[3], cmd[4] );
+		a = account_add( irc, prpl, cmd[3], cmd[4] );
 		
 		if( cmd[5] )
 			a->server = g_strdup( cmd[5] );
@@ -233,10 +225,7 @@ int cmd_account( irc_t *irc, char **cmd )
 			else
 				con = "";
 			
-			if( a->protocol == PROTO_OSCAR || a->protocol == PROTO_ICQ || a->protocol == PROTO_TOC )
-				irc_usermsg( irc, "%2d. OSCAR, %s on %s%s", i, a->user, a->server, con );
-			else
-				irc_usermsg( irc, "%2d. %s, %s%s", i, proto_name[a->protocol], a->user, con );
+			irc_usermsg( irc, "%2d. %s, %s%s", i, a->prpl->name, a->user, con );
 			
 			i ++;
 		}
@@ -353,7 +342,7 @@ int cmd_add( irc_t *irc, char **cmd )
 		}
 		else
 		{
-			nick_set( irc, cmd[2], a->gc->protocol, cmd[3] );
+			nick_set( irc, cmd[2], a->gc->prpl, cmd[3] );
 		}
 	}
 	a->gc->prpl->add_buddy( a->gc, cmd[2] );
@@ -434,7 +423,7 @@ int cmd_rename( irc_t *irc, char **cmd )
 	}
 	else if( u->send_handler == buddy_send_handler )
 	{
-		nick_set( irc, u->handle, u->gc->protocol, cmd[2] );
+		nick_set( irc, u->handle, u->gc->prpl, cmd[2] );
 	}
 	
 	irc_usermsg( irc, "Nick successfully changed" );
@@ -645,21 +634,21 @@ int cmd_blist( irc_t *irc, char **cmd )
 	
 	if( online == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && !u->away )
 	{
-		g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, proto_name[u->gc->user->protocol] );
+		g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
 		irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, "Online" );
 		n_online ++;
 	}
 
 	if( away == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && u->away )
 	{
-		g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, proto_name[u->gc->user->protocol] );
+		g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
 		irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, u->away );
 		n_away ++;
 	}
 	
 	if( offline == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && !u->online )
 	{
-		g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, proto_name[u->gc->user->protocol] );
+		g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
 		irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, "Offline" );
 		n_offline ++;
 	}
@@ -720,7 +709,7 @@ int cmd_qlist( irc_t *irc, char **cmd )
 	
 	for( num = 0; q; q = q->next, num ++ )
 		if( q->gc ) /* Not necessary yet, but it might come later */
-			irc_usermsg( irc, "%d, %s(%s): %s", num, proto_name[q->gc->protocol], q->gc->username, q->question );
+			irc_usermsg( irc, "%d, %s(%s): %s", num, q->gc->prpl->name, q->gc->username, q->question );
 		else
 			irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
 	
@@ -768,7 +757,7 @@ int cmd_import_buddies( irc_t *irc, char **cmd )
 	
 	for( n = gc->irc->nicks; n; n = n->next )
 	{
-		if( n->proto == gc->protocol && !user_findhandle( gc, n->handle ) )
+		if( n->proto == gc->prpl && !user_findhandle( gc, n->handle ) )
 		{
 	                gc->prpl->add_buddy( gc, n->handle );
 	                add_buddy( gc, NULL, n->handle, NULL );
diff --git a/configure b/configure
index 346cb2a8..e172d40d 100755
--- a/configure
+++ b/configure
@@ -13,6 +13,7 @@ etcdir='$prefix/etc/bitlbee/'
 mandir='$prefix/share/man/'
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
+plugindir='$prefix/lib/bitlbee'
 
 msn=1
 jabber=1
@@ -44,6 +45,7 @@ Option		Description				Default
 --etcdir=...						$etcdir
 --mandir=...						$mandir
 --datadir=...						$datadir
+--plugindir=...						$plugindir
 --config=...						$config
 
 --msn=0/1	Disable/enable MSN part			$msn
@@ -71,6 +73,7 @@ etcdir=`eval echo "$etcdir/" | sed 's/\/\{1,\}/\//g'`
 mandir=`eval echo "$mandir/" | sed 's/\/\{1,\}/\//g'`
 datadir=`eval echo "$datadir/" | sed 's/\/\{1,\}/\//g'`
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
+plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
 
 cat<<EOF>Makefile.settings
 ## BitlBee settings, generated by configure
@@ -79,6 +82,7 @@ BINDIR=$bindir
 ETCDIR=$etcdir
 MANDIR=$mandir
 DATADIR=$datadir
+PLUGINDIR=$plugindir
 CONFIG=$config
 
 ARCH=$arch
@@ -99,6 +103,7 @@ cat<<EOF>config.h
 #define CONFIG "$config"
 #define ETCDIR "$etcdir"
 #define VARDIR "$datadir"
+#define PLUGINDIR "$plugindir"
 #define ARCH "$arch"
 #define CPU "$cpu"
 EOF
@@ -141,8 +146,8 @@ fi
 
 if type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then
 	cat<<EOF>>Makefile.settings
-EFLAGS+=`pkg-config --libs glib-2.0`
-CFLAGS+=`pkg-config --cflags glib-2.0`
+EFLAGS+=`pkg-config --libs glib-2.0 gmodule-2.0`
+CFLAGS+=`pkg-config --cflags glib-2.0 gmodule-2.0`
 EOF
 	echo '#define GLIB2' >> config.h
 elif type glib-config > /dev/null 2> /dev/null; then
diff --git a/doc/example_plugin.c b/doc/example_plugin.c
new file mode 100644
index 00000000..38d02260
--- /dev/null
+++ b/doc/example_plugin.c
@@ -0,0 +1,13 @@
+/* 
+ * This is the most simple possible BitlBee plugin. To use, compile it as 
+ * a shared library and place it in the plugin directory: 
+ *
+ * gcc -o example.so -shared example.c
+ * cp example.so /usr/local/lib/bitlbee
+ */
+#include <stdio.h>
+
+void init_plugin(void)
+{
+	printf("I am a BitlBee plugin!\n");
+}
diff --git a/irc.c b/irc.c
index d976410e..29ac2a11 100644
--- a/irc.c
+++ b/irc.c
@@ -1185,7 +1185,7 @@ void irc_whois( irc_t *irc, char *nick )
 		
 		if( u->gc )
 			irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->gc->user->username,
-			           *u->gc->user->proto_opt[0] ? u->gc->user->proto_opt[0] : "", proto_name[u->gc->user->protocol] );
+			           *u->gc->user->proto_opt[0] ? u->gc->user->proto_opt[0] : "", u->gc->prpl->name );
 		else
 			irc_reply( irc, 312, "%s %s :%s", u->nick, irc->myhost, IRCD_INFO );
 		
diff --git a/nick.c b/nick.c
index 04dd374a..771d2288 100644
--- a/nick.c
+++ b/nick.c
@@ -26,7 +26,7 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
 
-void nick_set( irc_t *irc, const char *handle, int proto, const char *nick )
+void nick_set( irc_t *irc, const char *handle, struct prpl *proto, const char *nick )
 {
 	nick_t *m = NULL, *n = irc->nicks;
 	
@@ -55,7 +55,7 @@ void nick_set( irc_t *irc, const char *handle, int proto, const char *nick )
 	nick_strip( n->nick );
 }
 
-char *nick_get( irc_t *irc, const char *handle, int proto, const char *realname )
+char *nick_get( irc_t *irc, const char *handle, struct prpl *proto, const char *realname )
 {
 	static char nick[MAX_NICK_LENGTH+1];
 	nick_t *n = irc->nicks;
diff --git a/nick.h b/nick.h
index 2cd01ef5..9ab1ef1e 100644
--- a/nick.h
+++ b/nick.h
@@ -26,13 +26,13 @@
 typedef struct __NICK
 {
 	char *handle;
-	int proto;
+	struct prpl *proto;
 	char *nick;
 	struct __NICK *next;
 } nick_t;
 
-void nick_set( irc_t *irc, const char *handle, int proto, const char *nick );
-char *nick_get( irc_t *irc, const char *handle, int proto, const char *realname );
+void nick_set( irc_t *irc, const char *handle, struct prpl *proto, const char *nick );
+char *nick_get( irc_t *irc, const char *handle, struct prpl *proto, const char *realname );
 void nick_del( irc_t *irc, const char *nick );
 void nick_strip( char *nick );
 
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index 535607e6..fc419124 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -155,11 +155,6 @@ struct jabber_chat {
 #define JCS_CLOSED  3	/* closed */
 
 
-static char *jabber_name()
-{
-	return "Jabber";
-}
-
 #define STATE_EVT(arg) if(gjc->on_state) { (gjc->on_state)(gjc, (arg) ); }
 
 static void jabber_remove_buddy(struct gaim_connection *gc, char *name, char *group);
@@ -2367,13 +2362,13 @@ static GList *jabber_actions()
 	return m;
 }
 
-static struct prpl *my_protocol = NULL;
 
-void jabber_init(struct prpl *ret)
+void jabber_init()
 {
+	struct prpl *ret = g_new0(struct prpl, 1);
+
 	/* the NULL's aren't required but they're nice to have */
-	ret->protocol = PROTO_JABBER;
-	ret->name = jabber_name;
+	ret->name = "jabber";
 	ret->away_states = jabber_away_states;
 	ret->actions = jabber_actions;
 	ret->login = jabber_login;
@@ -2397,5 +2392,5 @@ void jabber_init(struct prpl *ret)
 	ret->group_buddy = jabber_group_change;
 	ret->cmp_buddynames = g_strcasecmp;
 
-	my_protocol = ret;
+	register_protocol (ret);
 }
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
index bc2f1235..b828d31c 100644
--- a/protocols/msn/msn.c
+++ b/protocols/msn/msn.c
@@ -26,8 +26,6 @@
 #include "nogaim.h"
 #include "msn.h"
 
-static struct prpl *my_protocol = NULL;
-
 static void msn_login( struct aim_user *acct )
 {
 	struct gaim_connection *gc = new_gaim_conn( acct );
@@ -374,9 +372,10 @@ static int msn_send_typing( struct gaim_connection *gc, char *who, int typing )
 		return( 1 );
 }
 
-void msn_init(struct prpl *ret)
+void msn_init()
 {
-	ret->protocol = PROTO_MSN;
+	struct prpl *ret = g_new0(struct prpl, 1);
+	ret->name = "msn";
 	ret->login = msn_login;
 	ret->close = msn_close;
 	ret->send_im = msn_send_im;
@@ -399,5 +398,5 @@ void msn_init(struct prpl *ret)
 	ret->send_typing = msn_send_typing;
 	ret->cmp_buddynames = g_strcasecmp;
 
-	my_protocol = ret;
+	register_protocol(ret);
 }
diff --git a/protocols/nogaim.c b/protocols/nogaim.c
index 34dfb2c3..4966a76f 100644
--- a/protocols/nogaim.c
+++ b/protocols/nogaim.c
@@ -38,9 +38,6 @@
 #include <ctype.h>
 #include <iconv.h>
 
-struct prpl *proto_prpl[PROTO_MAX];
-char proto_name[PROTO_MAX][8] = { "TOC", "OSCAR", "YAHOO", "ICQ", "MSN", "", "", "", "JABBER", "", "", "", "", "", "", "" };
-
 static char *proto_away_alias[7][5] =
 {
 	{ "Away from computer", "Away", "Extended away", NULL },
@@ -57,29 +54,104 @@ static int remove_chat_buddy_silent( struct conversation *b, char *handle );
 
 GSList *connections;
 
+#ifdef WITH_PLUGINS
+gboolean load_plugin(char *path)
+{
+	void (*init_function) (void);
+	
+	GModule *mod = g_module_open(path, G_MODULE_BIND_LAZY);
+
+	if(!mod) {
+		log_message(LOGLVL_ERROR, "Can't find `%s', not loading", path);
+		return FALSE;
+	}
+
+	if(!g_module_symbol(mod,"init_plugin",(gpointer *) &init_function)) {
+		log_message(LOGLVL_WARNING, "Can't find function `init_plugin' in `%s'\n", path);
+		return FALSE;
+	}
+
+	init_function();
+
+	return TRUE;
+}
+
+void load_plugins(void)
+{
+	GDir *dir;
+	GError *error = NULL;
+
+	dir = g_dir_open(PLUGINDIR, 0, &error);
+
+	if (dir) {
+		const gchar *entry;
+		char *path;
+
+		while ((entry = g_dir_read_name(dir))) {
+			path = g_build_filename(PLUGINDIR, entry, NULL);
+			if(!path) {
+				log_message(LOGLVL_WARNING, "Can't build path for %s\n", entry);
+				continue;
+			}
+
+			load_plugin(path);
+
+			g_free(path);
+		}
+
+		g_dir_close(dir);
+	}
+}
+#endif
 
 /* nogaim.c */
 
+GList *protocols = NULL;
+  
+void register_protocol (struct prpl *p)
+{
+	protocols = g_list_append(protocols, p);
+}
+
+ 
+struct prpl *find_protocol(const char *name)
+{
+	GList *gl;
+	for (gl = protocols; gl; gl = gl->next) 
+ 	{
+ 		struct prpl *proto = gl->data;
+ 		if(!g_strcasecmp(proto->name, name)) 
+			return proto;
+ 	}
+ 	return NULL;
+}
+
+/* nogaim.c */
 void nogaim_init()
 {
-	proto_prpl[PROTO_MSN] = g_new0 ( struct prpl, 1 );
+	extern void msn_init();
+	extern void oscar_init();
+	extern void byahoo_init();
+	extern void jabber_init();
+
 #ifdef WITH_MSN
-	msn_init( proto_prpl[PROTO_MSN] );
+	msn_init();
 #endif
 
-	proto_prpl[PROTO_OSCAR] = g_new0( struct prpl, 1 );
 #ifdef WITH_OSCAR
-	oscar_init( proto_prpl[PROTO_OSCAR] );
+	oscar_init();
 #endif
 	
-	proto_prpl[PROTO_YAHOO] = g_new0( struct prpl, 1 );
 #ifdef WITH_YAHOO
-	byahoo_init( proto_prpl[PROTO_YAHOO] );
+	byahoo_init();
 #endif
 	
-	proto_prpl[PROTO_JABBER] = g_new0( struct prpl, 1 );
 #ifdef WITH_JABBER
-	jabber_init( proto_prpl[PROTO_JABBER] );
+	jabber_init();
+#endif
+
+#ifdef WITH_PLUGINS
+	load_plugins();
 #endif
 }
 
@@ -171,8 +243,7 @@ struct gaim_connection *new_gaim_conn( struct aim_user *user )
 	
 	gc = g_new0( struct gaim_connection, 1 );
 	
-	gc->protocol = user->protocol;
-	gc->prpl = proto_prpl[gc->protocol];
+	gc->prpl = user->prpl;
 	g_snprintf( gc->username, sizeof( gc->username ), "%s", user->username );
 	g_snprintf( gc->password, sizeof( gc->password ), "%s", user->password );
 	/* [MD]	BUGFIX: don't set gc->irc to the global IRC, but use the one from the struct aim_user.
@@ -253,14 +324,14 @@ void serv_got_crap( struct gaim_connection *gc, char *format, ... )
 	
 	/* Try to find a different connection on the same protocol. */
 	for( a = gc->irc->accounts; a; a = a->next )
-		if( proto_prpl[a->protocol] == gc->prpl && a->gc != gc )
+		if( a->prpl == gc->prpl && a->gc != gc )
 			break;
 	
 	/* If we found one, add the screenname to the acc_id. */
 	if( a )
-		g_snprintf( acc_id, 32, "%s(%s)", proto_name[gc->protocol], gc->username );
+		g_snprintf( acc_id, 32, "%s(%s)", gc->prpl->name, gc->username );
 	else
-		g_snprintf( acc_id, 32, "%s", proto_name[gc->protocol] );
+		g_snprintf( acc_id, 32, "%s", gc->prpl->name );
 	
 	irc_usermsg( gc->irc, "%s - %s", acc_id, msg );
 }
@@ -294,7 +365,7 @@ void account_online( struct gaim_connection *gc )
 	
 	if( u && u->away ) proto_away( gc, u->away );
 	
-	if( gc->protocol == PROTO_ICQ )
+ 	if( !strcmp(gc->prpl->name, "icq") )
 	{
 		for( u = gc->irc->users; u; u = u->next )
 			if( u->gc == gc )
@@ -429,7 +500,7 @@ void add_buddy( struct gaim_connection *gc, char *group, char *handle, char *rea
 	}
 	
 	memset( nick, 0, MAX_NICK_LENGTH + 1 );
-	strcpy( nick, nick_get( gc->irc, handle, gc->protocol, realname ) );
+	strcpy( nick, nick_get( gc->irc, handle, gc->prpl, realname ) );
 	
 	u = user_add( gc->irc, nick );
 	
@@ -453,7 +524,7 @@ void add_buddy( struct gaim_connection *gc, char *group, char *handle, char *rea
 	}
 	else
 	{
-		u->host = g_strdup( proto_name[gc->user->protocol] );
+		u->host = g_strdup( gc->user->prpl->name );
 		u->user = g_strdup( handle );
 	}
 	
@@ -582,11 +653,11 @@ void serv_got_update( struct gaim_connection *gc, char *handle, int loggedin, in
 			remove_chat_buddy_silent( c, handle );
 	}
 	
-	if( ( type & UC_UNAVAILABLE ) && ( gc->protocol == PROTO_OSCAR || gc->protocol == PROTO_TOC ) )
+	if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "oscar") || !strcmp(gc->prpl->name, "icq")) )
 	{
 		u->away = g_strdup( "Away" );
 	}
-	else if( ( type & UC_UNAVAILABLE ) && ( gc->protocol == PROTO_JABBER ) )
+	else if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "jabber") ) )
 	{
 		if( type & UC_DND )
 			u->away = g_strdup( "Do Not Disturb" );
diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index 829a96c0..607a67de 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -71,7 +71,6 @@
 struct gaim_connection {
 	/* we need to do either oscar or TOC */
 	/* we make this as an int in case if we want to add more protocols later */
-	int protocol;
 	struct prpl *prpl;
 	guint32 flags;
 	
@@ -151,7 +150,7 @@ struct aim_user {
 	char password[32];
 	char user_info[2048];
 	int options;
-	int protocol;
+	struct prpl *prpl;
 	/* prpls can use this to save information about the user,
 	 * like which server to connect to, etc */
 	char proto_opt[7][256];
@@ -161,9 +160,8 @@ struct aim_user {
 };
 
 struct prpl {
-	int protocol;
 	int options;
-	char *(* name)();
+	const char *name;
 
 	/* for ICQ and Yahoo, who have off/on per-conversation options */
 	/* char *checkbox; this should be per-connection */
@@ -223,22 +221,6 @@ struct prpl {
 	int (* cmp_buddynames) (const char *who1, const char *who2);
 };
 
-#define PROTO_TOC	0
-#define PROTO_OSCAR	1
-#define PROTO_YAHOO	2
-#define PROTO_ICQ	3
-#define PROTO_MSN	4
-#define PROTO_IRC	5
-#define PROTO_FTP	6
-#define PROTO_VGATE	7
-#define PROTO_JABBER	8
-#define PROTO_NAPSTER	9
-#define PROTO_ZEPHYR	10
-#define PROTO_GADUGADU	11
-#define PROTO_MAX	16
-
-extern char proto_name[PROTO_MAX][8];
-
 #define UC_UNAVAILABLE  1
 
 /* JABBER */
@@ -248,7 +230,8 @@ extern char proto_name[PROTO_MAX][8];
 #define UC_DND  (0x10 | UC_UNAVAILABLE)
 
 G_MODULE_EXPORT GSList *get_connections();
-extern struct prpl *proto_prpl[16];
+G_MODULE_EXPORT struct prpl *find_protocol(const char *name);
+G_MODULE_EXPORT void register_protocol(struct prpl *);
 
 /* nogaim.c */
 int serv_send_im(irc_t *irc, user_t *u, char *msg, int flags);
@@ -318,26 +301,6 @@ G_MODULE_EXPORT void strip_html( char *msg );
 G_MODULE_EXPORT char * escape_html(const char *html);
 G_MODULE_EXPORT void info_string_append(GString *str, char *newline, char *name, char *value);
 
-#ifdef WITH_MSN
-/* msn.c */
-G_MODULE_EXPORT void msn_init( struct prpl *ret );
-#endif
-
-#ifdef WITH_OSCAR
-/* oscar.c */
-G_MODULE_EXPORT void oscar_init( struct prpl *ret );
-#endif
-
-#ifdef WITH_JABBER
-/* jabber.c */
-G_MODULE_EXPORT void jabber_init( struct prpl *ret );
-#endif
-
-#ifdef WITH_YAHOO
-/* yahoo.c */
-G_MODULE_EXPORT void byahoo_init( struct prpl *ret );
-#endif
-
 /* prefs.c */
 G_MODULE_EXPORT void build_block_list();
 G_MODULE_EXPORT void build_allow_list();
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index 488e80d1..5f19f12b 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -356,10 +356,8 @@ static void oscar_login(struct aim_user *user) {
 	if (isdigit(*user->username)) {
 		odata->icq = TRUE;
 		/* this is odd but it's necessary for a proper do_import and do_export */
-		gc->protocol = PROTO_ICQ;
 		gc->password[8] = 0;
 	} else {
-		gc->protocol = PROTO_TOC;
 		gc->flags |= OPT_CONN_HTML;
 	}
 
@@ -2632,10 +2630,10 @@ void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv)
 	g_free(inv);
 }
 
-static struct prpl *my_protocol = NULL;
-
-void oscar_init(struct prpl *ret) {
-	ret->protocol = PROTO_OSCAR;
+void oscar_init() 
+{
+	struct prpl *ret = g_new0(struct prpl, 1);
+	ret->name = "oscar";
 	ret->away_states = oscar_away_states;
 	ret->login = oscar_login;
 	ret->close = oscar_close;
@@ -2657,8 +2655,7 @@ void oscar_init(struct prpl *ret) {
 	ret->keepalive = oscar_keepalive;
 	ret->cmp_buddynames = aim_sncmp;
 	ret->get_status_string = oscar_get_status_string;
-
 	ret->send_typing = oscar_send_typing;
 
-	my_protocol = ret;
+	register_protocol(ret);
 }
diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c
index 74d468eb..832d1ab4 100644
--- a/protocols/yahoo/yahoo.c
+++ b/protocols/yahoo/yahoo.c
@@ -63,12 +63,6 @@ struct byahoo_conf_invitation
 	struct gaim_connection *gc;
 };
 
-static char *yahoo_name()
-{
-	return "Yahoo";
-}
-
-static struct prpl *my_protocol = NULL;
 static GSList *byahoo_inputs = NULL;
 static int byahoo_chat_id = 0;
 
@@ -395,15 +389,14 @@ static int byahoo_chat_open( struct gaim_connection *gc, char *who )
 	return( 1 );
 }
 
-void byahoo_init( struct prpl *ret )
+void byahoo_init( )
 {
-	ret->protocol = PROTO_YAHOO;
-	ret->name = yahoo_name;
+	struct prpl *ret = g_new0(struct prpl, 1);
+	ret->name = "yahoo";
 	
 	ret->login = byahoo_login;
 	ret->close = byahoo_close;
 	ret->send_im = byahoo_send_im;
-	ret->send_typing = byahoo_send_typing;
 	ret->get_info = byahoo_get_info;
 	ret->away_states = byahoo_away_states;
 	ret->set_away = byahoo_set_away;
@@ -411,6 +404,7 @@ void byahoo_init( struct prpl *ret )
 	ret->add_buddy = byahoo_add_buddy;
 	ret->remove_buddy = byahoo_remove_buddy;
 	ret->get_status_string = byahoo_get_status_string;
+	ret->send_typing = byahoo_send_typing;
 	
 	ret->chat_send = byahoo_chat_send;
 	ret->chat_invite = byahoo_chat_invite;
@@ -418,7 +412,7 @@ void byahoo_init( struct prpl *ret )
 	ret->chat_open = byahoo_chat_open;
 	ret->cmp_buddynames = g_strcasecmp;
 	
-	my_protocol = ret;
+	register_protocol(ret);
 }
 
 static struct gaim_connection *byahoo_get_gc_by_id( int id )
@@ -432,7 +426,7 @@ static struct gaim_connection *byahoo_get_gc_by_id( int id )
 		gc = l->data;
 		yd = gc->proto_data;
 		
-		if( gc->protocol == PROTO_YAHOO && yd->y2_id == id )
+		if( !strcmp(gc->prpl->name, "yahoo") && yd->y2_id == id )
 			return( gc );
 	}
 	
diff --git a/storage_text.c b/storage_text.c
index 5909ff63..ed32b73f 100644
--- a/storage_text.c
+++ b/storage_text.c
@@ -27,6 +27,32 @@
 #include "bitlbee.h"
 #include "crypting.h"
 
+/* DO NOT USE THIS FUNCTION IN NEW CODE. This 
+ * function is here merely because the save/load code still uses 
+ * ids rather than names */
+static struct prpl *find_protocol_by_id(int id)
+{
+	switch (id) {
+	case 1: return find_protocol("oscar");
+	case 4: return find_protocol("msn");
+	case 2: return find_protocol("yahoo");
+	case 8: return find_protocol("jabber");
+	default: break;
+	}
+	return NULL;
+}
+
+static int find_protocol_id(const char *name)
+{
+	if (!strcmp(name, "oscar")) return 1;
+	if (!strcmp(name, "msn")) return 4;
+	if (!strcmp(name, "yahoo")) return 2;
+	if (!strcmp(name, "jabber")) return 8;
+
+	return -1;
+}
+
+
 static void text_init (void)
 {
 	if( access( global.conf->configdir, F_OK ) != 0 )
@@ -78,8 +104,15 @@ static storage_status_t text_load ( const char *my_nick, const char* password, i
 	if( !fp ) return STORAGE_NO_SUCH_USER;
 	while( fscanf( fp, "%s %d %s", s, &proto, nick ) > 0 )
 	{
+		struct prpl *prpl;
+
+		prpl = find_protocol_by_id(proto);
+
+		if (!prpl)
+			continue;
+
 		http_decode( s );
-		nick_set( irc, s, proto, nick );
+		nick_set( irc, s, prpl, nick );
 	}
 	fclose( fp );
 	
@@ -144,7 +177,7 @@ static storage_status_t text_save( irc_t *irc, int overwrite )
 		strcpy( s, n->handle );
 		s[169] = 0; /* Prevent any overflow (169 ~ 512 / 3) */
 		http_encode( s );
-		g_snprintf( s + strlen( s ), 510 - strlen( s ), " %d %s", n->proto, n->nick );
+		g_snprintf( s + strlen( s ), 510 - strlen( s ), " %d %s", find_protocol_id(n->proto->name), n->nick );
 		if( fprintf( fp, "%s\n", s ) != strlen( s ) + 1 )
 		{
 			irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
@@ -186,11 +219,11 @@ static storage_status_t text_save( irc_t *irc, int overwrite )
 
 	for( a = irc->accounts; a; a = a->next )
 	{
-		if( a->protocol == PROTO_OSCAR || a->protocol == PROTO_ICQ || a->protocol == PROTO_TOC )
+		if( !strcmp(a->prpl->name, "oscar") )
 			g_snprintf( s, sizeof( s ), "account add oscar \"%s\" \"%s\" %s", a->user, a->pass, a->server );
 		else
 			g_snprintf( s, sizeof( s ), "account add %s \"%s\" \"%s\" \"%s\"",
-			            proto_name[a->protocol], a->user, a->pass, a->server ? a->server : "" );
+			            a->prpl->name, a->user, a->pass, a->server ? a->server : "" );
 		
 		line = obfucrypt( s, irc->password );
 		if( *line )
diff --git a/unix.c b/unix.c
index 75f0b11d..a1f39753 100644
--- a/unix.c
+++ b/unix.c
@@ -46,8 +46,9 @@ int main( int argc, char *argv[] )
 	global.loop = g_main_new( FALSE );
 	
 	log_init( );
-	nogaim_init( );
-	
+
+	nogaim_init();
+
 	CONF_FILE = g_strdup( CONF_FILE_DEF );
 	
 	global.helpfile = g_strdup( HELP_FILE );
diff --git a/url.h b/url.h
index 6555d15d..c8426876 100644
--- a/url.h
+++ b/url.h
@@ -25,7 +25,8 @@
 
 #include "bitlbee.h"
 
-#define PROTO_HTTP	2
+#define PROTO_FTP		1
+#define PROTO_HTTP		2
 #define PROTO_SOCKS4	3
 #define PROTO_SOCKS5	4
 #define PROTO_DEFAULT	PROTO_HTTP