Index: src/protocols/gg/gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.110
diff -u -p -r1.110 gg.c
--- src/protocols/gg/gg.c	7 Jul 2004 14:02:04 -0000	1.110
+++ src/protocols/gg/gg.c	7 Jul 2004 15:42:14 -0000
@@ -1613,61 +1613,61 @@ static GaimPluginProtocolInfo prpl_info 
 {
 	GAIM_PRPL_API_VERSION,
 	0,
-	NULL,
-	NULL,
-	NO_BUDDY_ICONS,
-	agg_list_icon,
-	agg_list_emblems,
-	NULL,
-	NULL,
-	agg_away_states,
-	agg_blist_node_menu,
-	NULL,
-	agg_login,
-	agg_close,
-	agg_send_im,
-	NULL,
-	NULL,
-	agg_get_info,
-	agg_set_away,
-	NULL,
-	agg_change_passwd,
-	agg_add_buddy,
-	agg_add_buddies,
-	agg_rem_buddy,
-	NULL,
-	agg_permit_deny_dummy,
-	agg_permit_deny_dummy,
-	agg_permit_deny_dummy,
-	agg_permit_deny_dummy,
-	agg_set_permit_deny_dummy,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	agg_keepalive,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	agg_group_buddy,
-	agg_rename_group,
-	agg_buddy_free,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,					/* can_receive_file */
-	NULL					/* send_file */
+	NULL,						/* user_splits */
+	NULL,						/* protocol_options */
+	NO_BUDDY_ICONS,				/* icon_spec */
+	agg_list_icon,				/* list_icon */
+	agg_list_emblems,			/* list_emblems */
+	NULL,						/* status_text */
+	NULL,						/* tooltip_text */
+	agg_away_states,			/* away_states */
+	agg_blist_node_menu,		/* blist_node_menu */
+	NULL,						/* chat_info */
+	agg_login,					/* login */
+	agg_close,					/* close */
+	agg_send_im,				/* send_im */
+	NULL,						/* set_info */
+	NULL,						/* send_typing */
+	agg_get_info,				/* get_info */
+	agg_set_away,				/* set_away */
+	NULL,						/* set_idle */
+	agg_change_passwd,			/* change_passwd */
+	agg_add_buddy,				/* add_buddy */
+	agg_add_buddies,			/* add_buddies */
+	agg_rem_buddy,				/* remove_buddy */
+	NULL,						/* remove_buddies */
+	agg_permit_deny_dummy,		/* add_permit */
+	agg_permit_deny_dummy,		/* add_deny */
+	agg_permit_deny_dummy,		/* rem_permit */
+	agg_permit_deny_dummy,		/* rem_deny */
+	agg_set_permit_deny_dummy,	/* set_permit_deny */
+	NULL,						/* warn */
+	NULL,						/* join_chat */
+	NULL,						/* reject_chat */
+	NULL,						/* chat_invite */
+	NULL,						/* chat_leave */
+	NULL,						/* chat_whisper */
+	NULL,						/* chat_send */
+	agg_keepalive,				/* keepalive */
+	NULL,						/* register_user */
+	NULL,						/* get_cb_info */
+	NULL,						/* get_cb_away */
+	NULL,						/* alias_buddy */
+	agg_group_buddy,			/* group_buddy */
+	agg_rename_group,			/* rename_group */
+	agg_buddy_free,				/* buddy_free */
+	NULL,						/* convo_closed */
+	NULL,						/* normalize */
+	NULL,						/* set_buddy_icon */
+	NULL,						/* remove_group */
+	NULL,						/* get_cb_real_name */
+	NULL,						/* set_chat_topic */
+	NULL,						/* find_blist_chat */
+	NULL,						/* roomlist_get_list */
+	NULL,						/* roomlist_cancel */
+	NULL,						/* roomlist_expand_category */
+	NULL,						/* can_receive_file */
+	NULL						/* send_file */
 };
 
 static GaimPluginInfo info =
Index: src/protocols/irc/irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.226
diff -u -p -r1.226 irc.c
--- src/protocols/irc/irc.c	7 Jul 2004 01:49:37 -0000	1.226
+++ src/protocols/irc/irc.c	7 Jul 2004 15:42:14 -0000
@@ -555,61 +555,61 @@ static GaimPluginProtocolInfo prpl_info 
 {
 	GAIM_PRPL_API_VERSION,
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_PASSWORD_OPTIONAL,
-	NULL,
-	NULL,
-	NO_BUDDY_ICONS,
-	irc_blist_icon,
-	irc_blist_emblems,
-	NULL,
-	NULL,
-	irc_away_states,
-	NULL, /*irc_blist_node_menu, */
-	irc_chat_join_info,
-	irc_login,
-	irc_close,
-	irc_im_send,
-	NULL,
-	NULL,
-	irc_get_info,
-	irc_set_away,
-	NULL,
-	NULL,
-	irc_add_buddy,
-	NULL,
-	irc_remove_buddy,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	irc_chat_join,
-	NULL,  /* reject chat invite */
-	irc_chat_invite,
-	irc_chat_leave,
-	NULL,
-	irc_chat_send,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL, /*irc_convo_closed,*/
-	NULL, /* normalize */
-	NULL, /* set buddy icon */
-	NULL, /* remove group */
-	NULL, /* get_cb_real_name */
-	irc_chat_set_topic,
-	NULL,
-	irc_roomlist_get_list,
-	irc_roomlist_cancel,
-	NULL,
-	NULL,
-	irc_dccsend_send_file
+	NULL,					/* user_splits */
+	NULL,					/* protocol_options */
+	NO_BUDDY_ICONS,			/* icon_spec */
+	irc_blist_icon,			/* list_icon */
+	irc_blist_emblems,		/* list_emblems */
+	NULL,					/* status_text */
+	NULL,					/* tooltip_text */
+	irc_away_states,		/* away_states */
+	NULL,					/* blist_node_menu */
+	irc_chat_join_info,		/* chat_info */
+	irc_login,				/* login */
+	irc_close,				/* close */
+	irc_im_send,			/* send_im */
+	NULL,					/* set_info */
+	NULL,					/* send_typing */
+	irc_get_info,			/* get_info */
+	irc_set_away,			/* set_away */
+	NULL,					/* set_idle */
+	NULL,					/* change_passwd */
+	irc_add_buddy,			/* add_buddy */
+	NULL,					/* add_buddies */
+	irc_remove_buddy,		/* remove_buddy */
+	NULL,					/* remove_buddies */
+	NULL,					/* add_permit */
+	NULL,					/* add_deny */
+	NULL,					/* rem_permit */
+	NULL,					/* rem_deny */
+	NULL,					/* set_permit_deny */
+	NULL,					/* warn */
+	irc_chat_join,			/* join_chat */
+	NULL,					/* reject_chat */
+	irc_chat_invite,		/* chat_invite */
+	irc_chat_leave,			/* chat_leave */
+	NULL,					/* chat_whisper */
+	irc_chat_send,			/* chat_send */
+	NULL,					/* keepalive */
+	NULL,					/* register_user */
+	NULL,					/* get_cb_info */
+	NULL,					/* get_cb_away */
+	NULL,					/* alias_buddy */
+	NULL,					/* group_buddy */
+	NULL,					/* rename_group */
+	NULL,					/* buddy_free */
+	NULL,					/* convo_closed */
+	NULL,					/* normalize */
+	NULL,					/* set_buddy_icon */
+	NULL,					/* remove_group */
+	NULL,					/* get_cb_real_name */
+	irc_chat_set_topic,		/* set_chat_topic */
+	NULL,					/* find_blist_chat */
+	irc_roomlist_get_list,	/* roomlist_get_list */
+	irc_roomlist_cancel,	/* roomlist_cancel */
+	NULL,					/* roomlist_expand_category */
+	NULL,					/* can_receive_file */
+	irc_dccsend_send_file	/* send_file */
 };
 
 
Index: src/protocols/jabber/jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.268
diff -u -p -r1.268 jabber.c
--- src/protocols/jabber/jabber.c	7 Jul 2004 01:49:38 -0000	1.268
+++ src/protocols/jabber/jabber.c	7 Jul 2004 15:42:14 -0000
@@ -1464,61 +1464,61 @@ static GaimPluginProtocolInfo prpl_info 
 {
 	GAIM_PRPL_API_VERSION,
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME,
-	NULL,
-	NULL,
-	NO_BUDDY_ICONS,
-	jabber_list_icon,
-	jabber_list_emblems,
-	jabber_status_text,
-	jabber_tooltip_text,
-	jabber_away_states,
-	jabber_blist_node_menu,
-	jabber_chat_info,
-	jabber_login,
-	jabber_close,
-	jabber_message_send_im,
-	jabber_set_info,
-	jabber_send_typing,
-	jabber_buddy_get_info,
-	jabber_presence_send,
-	jabber_idle_set,
-	NULL,
-	jabber_roster_add_buddy,
-	NULL,
-	jabber_roster_remove_buddy,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	jabber_chat_join,
-	NULL,
-	jabber_chat_invite,
-	jabber_chat_leave,
-	NULL,
-	jabber_message_send_chat,
-	jabber_keepalive,
-	jabber_register_account,
-	jabber_buddy_get_info_chat,
-	NULL,
-	jabber_roster_alias_change,
-	jabber_roster_group_change,
-	jabber_roster_group_rename,
-	NULL,
-	jabber_convo_closed,
-	jabber_normalize,
-	NULL, /* set_buddy_icon */
-	NULL, /* remove_group */
-	jabber_chat_buddy_real_name,
-	jabber_chat_set_topic,
-	jabber_find_blist_chat,
-	jabber_roomlist_get_list,
-	jabber_roomlist_cancel,
-	NULL,
-	NULL,
-	jabber_si_xfer_send
+	NULL,							/* user_splits */
+	NULL,							/* protocol_options */
+	NO_BUDDY_ICONS,					/* icon_spec */
+	jabber_list_icon,				/* list_icon */
+	jabber_list_emblems,			/* list_emblems */
+	jabber_status_text,				/* status_text */
+	jabber_tooltip_text,			/* tooltip_text */
+	jabber_away_states,				/* away_states */
+	jabber_blist_node_menu,			/* blist_node_menu */
+	jabber_chat_info,				/* chat_info */
+	jabber_login,					/* login */
+	jabber_close,					/* close */
+	jabber_message_send_im,			/* send_im */
+	jabber_set_info,				/* set_info */
+	jabber_send_typing,				/* send_typing */
+	jabber_buddy_get_info,			/* get_info */
+	jabber_presence_send,			/* set_away */
+	jabber_idle_set,				/* set_idle */
+	NULL,							/* change_passwd */
+	jabber_roster_add_buddy,		/* add_buddy */
+	NULL,							/* add_buddies */
+	jabber_roster_remove_buddy,		/* remove_buddy */
+	NULL,							/* remove_buddies */
+	NULL,							/* add_permit */
+	NULL,							/* add_deny */
+	NULL,							/* rem_permit */
+	NULL,							/* rem_deny */
+	NULL,							/* set_permit_deny */
+	NULL,							/* warn */
+	jabber_chat_join,				/* join_chat */
+	NULL,							/* reject_chat */
+	jabber_chat_invite,				/* chat_invite */
+	jabber_chat_leave,				/* chat_leave */
+	NULL,							/* chat_whisper */
+	jabber_message_send_chat,		/* chat_send */
+	jabber_keepalive,				/* keepalive */
+	jabber_register_account,		/* register_user */
+	jabber_buddy_get_info_chat,		/* get_cb_info */
+	NULL,							/* get_cb_away */
+	jabber_roster_alias_change,		/* alias_buddy */
+	jabber_roster_group_change,		/* group_buddy */
+	jabber_roster_group_rename,		/* rename_group */
+	NULL,							/* buddy_free */
+	jabber_convo_closed,			/* convo_closed */
+	jabber_normalize,				/* normalize */
+	NULL,							/* set_buddy_icon */
+	NULL,							/* remove_group */
+	jabber_chat_buddy_real_name,	/* get_cb_real_name */
+	jabber_chat_set_topic,			/* set_chat_topic */
+	jabber_find_blist_chat,			/* find_blist_chat */
+	jabber_roomlist_get_list,		/* roomlist_get_list */
+	jabber_roomlist_cancel,			/* roomlist_cancel */
+	NULL,							/* roomlist_expand_category */
+	NULL,							/* can_receive_file */
+	jabber_si_xfer_send				/* send_file */
 };
 
 static GaimPluginInfo info =
Index: src/protocols/msn/msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.305
diff -u -p -r1.305 msn.c
--- src/protocols/msn/msn.c	7 Jul 2004 01:49:38 -0000	1.305
+++ src/protocols/msn/msn.c	7 Jul 2004 15:42:15 -0000
@@ -1642,61 +1642,61 @@ static GaimPluginProtocolInfo prpl_info 
 {
 	GAIM_PRPL_API_VERSION,
 	OPT_PROTO_MAIL_CHECK,
-	NULL,
-	NULL,
-	{"png", 0, 0, 0, 0, 0},
-	msn_list_icon,
-	msn_list_emblems,
-	msn_status_text,
-	msn_tooltip_text,
-	msn_away_states,
-	msn_blist_node_menu,
-	NULL,
-	msn_login,
-	msn_close,
-	msn_send_im,
-	NULL,
-	msn_send_typing,
-	msn_get_info,
-	msn_set_away,
-	msn_set_idle,
-	NULL,
-	msn_add_buddy,
-	NULL,
-	msn_rem_buddy,
-	NULL,
-	msn_add_permit,
-	msn_add_deny,
-	msn_rem_permit,
-	msn_rem_deny,
-	msn_set_permit_deny,
-	NULL,
-	NULL,
-	NULL, /* reject chat invite */
-	msn_chat_invite,
-	msn_chat_leave,
-	NULL,
-	msn_chat_send,
-	msn_keepalive,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	msn_group_buddy,
-	msn_rename_group,
-	NULL, /* msn_buddy_free */
-	msn_convo_closed,
-	msn_normalize,
-	msn_set_buddy_icon,
-	msn_remove_group,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	msn_send_file
+	NULL,					/* user_splits */
+	NULL,					/* protocol_options */
+	{"png", 0, 0, 0, 0, 0},	/* icon_spec */
+	msn_list_icon,			/* list_icon */
+	msn_list_emblems,		/* list_emblems */
+	msn_status_text,		/* status_text */
+	msn_tooltip_text,		/* tooltip_text */
+	msn_away_states,		/* away_states */
+	msn_blist_node_menu,	/* blist_node_menu */
+	NULL,					/* chat_info */
+	msn_login,				/* login */
+	msn_close,				/* close */
+	msn_send_im,			/* send_im */
+	NULL,					/* set_info */
+	msn_send_typing,		/* send_typing */
+	msn_get_info,			/* get_info */
+	msn_set_away,			/* set_away */
+	msn_set_idle,			/* set_idle */
+	NULL,					/* change_passwd */
+	msn_add_buddy,			/* add_buddy */
+	NULL,					/* add_buddies */
+	msn_rem_buddy,			/* remove_buddy */
+	NULL,					/* remove_buddies */
+	msn_add_permit,			/* add_permit */
+	msn_add_deny,			/* add_deny */
+	msn_rem_permit,			/* rem_permit */
+	msn_rem_deny,			/* rem_deny */
+	msn_set_permit_deny,	/* set_permit_deny */
+	NULL,					/* warn */
+	NULL,					/* join_chat */
+	NULL,					/* reject chat invite */
+	msn_chat_invite,		/* chat_invite */
+	msn_chat_leave,			/* chat_leave */
+	NULL,					/* chat_whisper */
+	msn_chat_send,			/* chat_send */
+	msn_keepalive,			/* keepalive */
+	NULL,					/* register_user */
+	NULL,					/* get_cb_info */
+	NULL,					/* get_cb_away */
+	NULL,					/* alias_buddy */
+	msn_group_buddy,		/* group_buddy */
+	msn_rename_group,		/* rename_group */
+	NULL,					/* buddy_free */
+	msn_convo_closed,		/* convo_closed */
+	msn_normalize,			/* normalize */
+	msn_set_buddy_icon,		/* set_buddy_icon */
+	msn_remove_group,		/* remove_group */
+	NULL,					/* get_cb_real_name */
+	NULL,					/* set_chat_topic */
+	NULL,					/* find_blist_chat */
+	NULL,					/* roomlist_get_list */
+	NULL,					/* roomlist_cancel */
+	NULL,					/* roomlist_expand_category */
+	NULL,					/* can_receive_file */
+	msn_send_file			/* send_file */
 };
 
 static GaimPluginInfo info =
Index: src/protocols/napster/napster.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/napster/napster.c,v
retrieving revision 1.88
diff -u -p -r1.88 napster.c
--- src/protocols/napster/napster.c	7 Jul 2004 14:02:04 -0000	1.88
+++ src/protocols/napster/napster.c	7 Jul 2004 15:42:15 -0000
@@ -551,61 +551,61 @@ static GaimPluginProtocolInfo prpl_info 
 {
 	GAIM_PRPL_API_VERSION,
 	OPT_PROTO_CHAT_TOPIC,
-	NULL,
-	NULL,
-	NO_BUDDY_ICONS,
-	nap_list_icon,
-	nap_list_emblems,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	nap_chat_info,
-	nap_login,
-	nap_close,
-	nap_send_im,
-	NULL,
-	NULL,
-	nap_get_info,
-	NULL,
-	NULL,
-	NULL,
-	nap_add_buddy,
-	nap_add_buddies,
-	nap_remove_buddy,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	nap_join_chat,
-	NULL, /* reject chat invite */
-	NULL,
-	nap_chat_leave,
-	NULL,
-	nap_chat_send,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,				/* can_receive_file */
-	NULL				/* send_file */
+	NULL,					/* user_splits */
+	NULL,					/* protocol_options */
+	NO_BUDDY_ICONS,			/* icon_spec */
+	nap_list_icon,			/* list_icon */
+	nap_list_emblems,		/* list_emblems */
+	NULL,					/* status_text */
+	NULL,					/* tooltip_text */
+	NULL,					/* away_states */
+	NULL,					/* blist_node_menu */
+	nap_chat_info,			/* chat_info */
+	nap_login,				/* login */
+	nap_close,				/* close */
+	nap_send_im,			/* send_im */
+	NULL,					/* set_info */
+	NULL,					/* send_typing */
+	nap_get_info,			/* get_info */
+	NULL,					/* set_away */
+	NULL,					/* set_idle */
+	NULL,					/* change_passwd */
+	nap_add_buddy,			/* add_buddy */
+	nap_add_buddies,		/* add_buddies */
+	nap_remove_buddy,		/* remove_buddy */
+	NULL,					/* remove_buddies */
+	NULL,					/* add_permit */
+	NULL,					/* add_deny */
+	NULL,					/* rem_permit */
+	NULL,					/* rem_deny */
+	NULL,					/* set_permit_deny */
+	NULL,					/* warn */
+	nap_join_chat,			/* join_chat */
+	NULL,					/* reject chat invite */
+	NULL,					/* chat_invite */
+	nap_chat_leave,			/* chat_leave */
+	NULL,					/* chat_whisper */
+	nap_chat_send,			/* chat_send */
+	NULL,					/* keepalive */
+	NULL,					/* register_user */
+	NULL,					/* get_cb_info */
+	NULL,					/* get_cb_away */
+	NULL,					/* alias_buddy */
+	NULL,					/* group_buddy */
+	NULL,					/* rename_group */
+	NULL,					/* buddy_free */
+	NULL,					/* convo_closed */
+	NULL,					/* normalize */
+	NULL,					/* set_buddy_icon */
+	NULL,					/* remove_group */
+	NULL,					/* get_cb_real_name */
+	NULL,					/* set_chat_topic */
+	NULL,					/* find_blist_chat */
+	NULL,					/* roomlist_get_list */
+	NULL,					/* roomlist_cancel */
+	NULL,					/* roomlist_expand_category */
+	NULL,					/* can_receive_file */
+	NULL					/* send_file */
 };
 
 static GaimPluginInfo info =
Index: src/protocols/novell/novell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/novell/novell.c,v
retrieving revision 1.22
diff -u -p -r1.22 novell.c
--- src/protocols/novell/novell.c	7 Jul 2004 14:02:06 -0000	1.22
+++ src/protocols/novell/novell.c	7 Jul 2004 15:42:15 -0000
@@ -3318,59 +3318,59 @@ novell_keepalive(GaimConnection *gc)
 static GaimPluginProtocolInfo prpl_info = {
 	GAIM_PRPL_API_VERSION,
 	0,
-	NULL,
-	NULL,
-	NO_BUDDY_ICONS,
-	novell_list_icon,
-	novell_list_emblems,
-	novell_status_text,
-	novell_tooltip_text,
-	novell_away_states,
-	novell_blist_node_menu,
+	NULL,						/* user_splits */
+	NULL,						/* protocol_options */
+	NO_BUDDY_ICONS,				/* icon_spec */
+	novell_list_icon,			/* list_icon */
+	novell_list_emblems,		/* list_emblems */
+	novell_status_text,			/* status_text */
+	novell_tooltip_text,		/* tooltip_text */
+	novell_away_states,			/* away_states */
+	novell_blist_node_menu,		/* blist_node_menu */
 	NULL,						/* chat_info */
-	novell_login,
-	novell_close,
-	novell_send_im,
+	novell_login,				/* login */
+	novell_close,				/* close */
+	novell_send_im,				/* send_im */
 	NULL,						/* set_info */
-	novell_send_typing,
-	novell_get_info,
-	novell_set_away,
-	novell_set_idle,
-	NULL,						/* change pwd */
-	novell_add_buddy,
+	novell_send_typing,			/* send_typing */
+	novell_get_info,			/* get_info */
+	novell_set_away,			/* set_away */
+	novell_set_idle,			/* set_idle */
+	NULL,						/* change_passwd */
+	novell_add_buddy,			/* add_buddy */
 	NULL,						/* add_buddies */
-	novell_remove_buddy,
+	novell_remove_buddy,		/* remove_buddy */
 	NULL,						/* remove_buddies */
-	novell_add_permit,
-	novell_add_deny,
-	novell_rem_permit,
-	novell_rem_deny,
-	novell_set_permit_deny,
+	novell_add_permit,			/* add_permit */
+	novell_add_deny,			/* add_deny */
+	novell_rem_permit,			/* rem_permit */
+	novell_rem_deny,			/* rem_deny */
+	novell_set_permit_deny,		/* set_permit_deny */
 	NULL,						/* warn */
 	NULL,						/* join_chat */
 	NULL,						/* reject_chat */
 	novell_chat_invite,			/* chat_invite */
-	novell_chat_leave,
+	novell_chat_leave,			/* chat_leave */
 	NULL,						/* chat_whisper */
-	novell_chat_send,
-	novell_keepalive,
+	novell_chat_send,			/* chat_send */
+	novell_keepalive,			/* keepalive */
 	NULL,						/* register_user */
 	NULL,						/* get_cb_info */
-	NULL,						/* get_cb_away_msg */
-	novell_alias_buddy,
-	novell_group_buddy,
-	novell_rename_group,
+	NULL,						/* get_cb_away */
+	novell_alias_buddy,			/* alias_buddy */
+	novell_group_buddy,			/* group_buddy */
+	novell_rename_group,		/* rename_group */
 	NULL,						/* buddy_free */
-	novell_convo_closed,
+	novell_convo_closed,		/* convo_closed */
 	NULL,						/* normalize */
 	NULL,						/* set_buddy_icon */
-	novell_remove_group,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
+	novell_remove_group,		/* remove_group */
+	NULL,						/* get_cb_real_name */
+	NULL,						/* set_chat_topic */
+	NULL,						/* find_blist_chat */
+	NULL,						/* roomlist_get_list */
+	NULL,						/* roomlist_cancel */
+	NULL,						/* roomlist_expand_category */
 	NULL,						/* can_receive_file */
 	NULL						/* send_file */
 };
Index: src/protocols/oscar/oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.613
diff -u -p -r1.613 oscar.c
--- src/protocols/oscar/oscar.c	7 Jul 2004 01:49:38 -0000	1.613
+++ src/protocols/oscar/oscar.c	7 Jul 2004 15:42:17 -0000
@@ -7161,67 +7161,67 @@ static GaimPluginProtocolInfo prpl_info 
 {
 	GAIM_PRPL_API_VERSION,
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
-	NULL,
-	NULL,
-	{"jpeg,gif,bmp,ico", 48, 48, 50, 50, GAIM_ICON_SCALE_DISPLAY},
-	oscar_list_icon,
-	oscar_list_emblems,
-	oscar_status_text,
-	oscar_tooltip_text,
-	oscar_away_states,
-	oscar_blist_node_menu,
-	oscar_chat_info,
-	oscar_login,
-	oscar_close,
-	oscar_send_im,
-	oscar_set_info,
-	oscar_send_typing,
-	oscar_get_info,
-	oscar_set_away,
-	oscar_set_idle,
-	oscar_change_passwd,
-	oscar_add_buddy,
-	oscar_add_buddies,
-	oscar_remove_buddy,
-	oscar_remove_buddies,
-	oscar_add_permit,
-	oscar_add_deny,
-	oscar_rem_permit,
-	oscar_rem_deny,
-	oscar_set_permit_deny,
-	oscar_warn,
-	oscar_join_chat,
-	NULL, /* reject chat invite */
-	oscar_chat_invite,
-	oscar_chat_leave,
-	NULL,
-	oscar_send_chat,
-	oscar_keepalive,
-	NULL,
-	NULL,
-	NULL,
+	NULL,					/* user_splits */
+	NULL,					/* protocol_options */
+	{"jpeg,gif,bmp,ico", 48, 48, 50, 50, GAIM_ICON_SCALE_DISPLAY},	/* icon_spec */
+	oscar_list_icon,		/* list_icon */
+	oscar_list_emblems,		/* list_emblems */
+	oscar_status_text,		/* status_text */
+	oscar_tooltip_text,		/* tooltip_text */
+	oscar_away_states,		/* away_states */
+	oscar_blist_node_menu,	/* blist_node_menu */
+	oscar_chat_info,		/* chat_info */
+	oscar_login,			/* login */
+	oscar_close,			/* close */
+	oscar_send_im,			/* send_im */
+	oscar_set_info,			/* set_info */
+	oscar_send_typing,		/* send_typing */
+	oscar_get_info,			/* get_info */
+	oscar_set_away,			/* set_away */
+	oscar_set_idle,			/* set_idle */
+	oscar_change_passwd,	/* change_passwd */
+	oscar_add_buddy,		/* add_buddy */
+	oscar_add_buddies,		/* add_buddies */
+	oscar_remove_buddy,		/* remove_buddy */
+	oscar_remove_buddies,	/* remove_buddies */
+	oscar_add_permit,		/* add_permit */
+	oscar_add_deny,			/* add_deny */
+	oscar_rem_permit,		/* rem_permit */
+	oscar_rem_deny,			/* rem_deny */
+	oscar_set_permit_deny,	/* set_permit_deny */
+	oscar_warn,				/* warn */
+	oscar_join_chat,		/* join_chat */
+	NULL,					/* reject_chat */
+	oscar_chat_invite,		/* chat_invite */
+	oscar_chat_leave,		/* chat_leave */
+	NULL,					/* chat_whisper */
+	oscar_send_chat,		/* chat_send */
+	oscar_keepalive,		/* keepalive */
+	NULL,					/* register_user */
+	NULL,					/* get_cb_info */
+	NULL,					/* get_cb_away */
 #ifndef NOSSI
-	oscar_alias_buddy,
-	oscar_move_buddy,
-	oscar_rename_group,
+	oscar_alias_buddy,		/* alias_buddy */
+	oscar_move_buddy,		/* group_buddy */
+	oscar_rename_group,		/* rename_group */
 #else
-	NULL,
-	NULL,
-	NULL,
+	NULL,					/* alias_buddy */
+	NULL,					/* group_buddy */
+	NULL,					/* rename_group */
 #endif
-	NULL,
-	oscar_convo_closed,
-	NULL,
-	oscar_set_icon,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	oscar_can_receive_file,
-	oscar_send_file
+	NULL,					/* buddy_free */
+	oscar_convo_closed,		/* convo_closed */
+	NULL,					/* normalize */
+	oscar_set_icon,			/* set_buddy_icon */
+	NULL,					/* remove_group */
+	NULL,					/* get_cb_real_name */
+	NULL,					/* set_chat_topic */
+	NULL,					/* find_blist_chat */
+	NULL,					/* roomlist_get_list */
+	NULL,					/* roomlist_cancel */
+	NULL,					/* roomlist_expand_category */
+	oscar_can_receive_file,	/* can_receive_file */
+	oscar_send_file			/* send_file */
 };
 
 static GaimPluginInfo info =
Index: src/protocols/toc/toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.152
diff -u -p -r1.152 toc.c
--- src/protocols/toc/toc.c	7 Jul 2004 14:02:06 -0000	1.152
+++ src/protocols/toc/toc.c	7 Jul 2004 15:42:18 -0000
@@ -2096,61 +2096,61 @@ static GaimPluginProtocolInfo prpl_info 
 {
 	GAIM_PRPL_API_VERSION,
 	0,
-	NULL,
-	NULL,
-	NO_BUDDY_ICONS,
-	toc_list_icon,
-	toc_list_emblems,
-	NULL,
-	NULL,
-	toc_away_states,
-	toc_blist_node_menu,
-	toc_chat_info,
-	toc_login,
-	toc_close,
-	toc_send_im,
-	toc_set_info,
-	NULL,
-	toc_get_info,
-	toc_set_away,
-	toc_set_idle,
-	toc_change_passwd,
-	toc_add_buddy,
-	toc_add_buddies,
-	toc_remove_buddy,
-	toc_remove_buddies,
-	toc_add_permit,
-	toc_add_deny,
-	toc_rem_permit,
-	toc_rem_deny,
-	toc_set_permit_deny,
-	toc_warn,
-	toc_join_chat,
-	NULL, /* reject chat invite */
-	toc_chat_invite,
-	toc_chat_leave,
-	toc_chat_whisper,
-	toc_chat_send,
-	toc_keepalive,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL, /* can_receive_file */
-	NULL  /* send_file */
+	NULL,					/* user_splits */
+	NULL,					/* protocol_options */
+	NO_BUDDY_ICONS,			/* icon_spec */
+	toc_list_icon,			/* list_icon */
+	toc_list_emblems,		/* list_emblems */
+	NULL,					/* status_text */
+	NULL,					/* tooltip_text */
+	toc_away_states,		/* away_states */
+	toc_blist_node_menu,	/* blist_node_menu */
+	toc_chat_info,			/* chat_info */
+	toc_login,				/* login */
+	toc_close,				/* close */
+	toc_send_im,			/* send_im */
+	toc_set_info,			/* set_info */
+	NULL,					/* send_typing */
+	toc_get_info,			/* get_info */
+	toc_set_away,			/* set_away */
+	toc_set_idle,			/* set_idle */
+	toc_change_passwd,		/* change_passwd */
+	toc_add_buddy,			/* add_buddy */
+	toc_add_buddies,		/* add_buddies */
+	toc_remove_buddy,		/* remove_buddy */
+	toc_remove_buddies,		/* remove_buddies */
+	toc_add_permit,			/* add_permit */
+	toc_add_deny,			/* add_deny */
+	toc_rem_permit,			/* rem_permit */
+	toc_rem_deny,			/* rem_deny */
+	toc_set_permit_deny,	/* set_permit_deny */
+	toc_warn,				/* warn */
+	toc_join_chat,			/* join_chat */
+	NULL,					/* reject_chat */
+	toc_chat_invite,		/* chat_invite */
+	toc_chat_leave,			/* chat_leave */
+	toc_chat_whisper,		/* chat_whisper */
+	toc_chat_send,			/* chat_send */
+	toc_keepalive,			/* keepalive */
+	NULL,					/* register_user */
+	NULL,					/* get_cb_info */
+	NULL,					/* get_cb_away */
+	NULL,					/* alias_buddy */
+	NULL,					/* group_buddy */
+	NULL,					/* rename_group */
+	NULL,					/* buddy_free */
+	NULL,					/* convo_closed */
+	NULL,					/* normalize */
+	NULL,					/* set_buddy_icon */
+	NULL,					/* remove_group */
+	NULL,					/* get_cb_real_name */
+	NULL,					/* set_chat_topic */
+	NULL,					/* find_blist_chat */
+	NULL,					/* roomlist_get_list */
+	NULL,					/* roomlist_cancel */
+	NULL,					/* roomlist_expand_category */
+	NULL,					/* can_receive_file */
+	NULL					/* send_file */
 };
 
 static GaimPluginInfo info =
Index: src/protocols/yahoo/yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.260
diff -u -p -r1.260 yahoo.c
--- src/protocols/yahoo/yahoo.c	7 Jul 2004 01:49:39 -0000	1.260
+++ src/protocols/yahoo/yahoo.c	7 Jul 2004 15:42:19 -0000
@@ -3267,12 +3267,12 @@ static GaimPluginProtocolInfo prpl_info 
 	yahoo_set_buddy_icon,
 	NULL, /* void (*remove_group)(GaimConnection *gc, const char *group);*/
 	NULL, /* char *(*get_cb_real_name)(GaimConnection *gc, int id, const char *who); */
-	NULL,
-	NULL,
+	NULL, /* set_chat_topic */
+	NULL, /* find_blist_chat */
 	yahoo_roomlist_get_list,
 	yahoo_roomlist_cancel,
 	yahoo_roomlist_expand_category,
-	NULL,
+	NULL, /* can_receive_file */
 	yahoo_send_file
 };
 
Index: src/protocols/zephyr/zephyr.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v
retrieving revision 1.103
diff -u -p -r1.103 zephyr.c
--- src/protocols/zephyr/zephyr.c	7 Jul 2004 14:02:07 -0000	1.103
+++ src/protocols/zephyr/zephyr.c	7 Jul 2004 15:42:19 -0000
@@ -1563,61 +1563,61 @@ static GaimPlugin *my_protocol = NULL;
 static GaimPluginProtocolInfo prpl_info = {
 	GAIM_PRPL_API_VERSION,
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_NO_PASSWORD,
-	NULL,
-	NULL,
-        NO_BUDDY_ICONS,
-        zephyr_list_icon,
-	NULL,
-	NULL,
-	NULL,
-	zephyr_away_states,
-	NULL,
-	zephyr_chat_info,
-	zephyr_login,
-	zephyr_close,
-	zephyr_send_im,
-	NULL,
-	NULL,
-	zephyr_zloc,
-	zephyr_set_away,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	zephyr_join_chat,
-	NULL,						/* reject chat invite */
-	NULL,
-	zephyr_chat_leave,
-	NULL,
-	zephyr_chat_send,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	zephyr_normalize,
-	NULL,
-	NULL,
-	NULL,
-	zephyr_chat_set_topic,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,						/* can_receive_file */
-	NULL						/* send_file */
+	NULL,					/* user_splits */
+	NULL,					/* protocol_options */
+	NO_BUDDY_ICONS,			/* icon_spec */
+	zephyr_list_icon,		/* list_icon */
+	NULL,					/* list_emblems */
+	NULL,					/* status_text */
+	NULL,					/* tooltip_text */
+	zephyr_away_states,		/* away_states */
+	NULL,					/* blist_node_menu */
+	zephyr_chat_info,		/* chat_info */
+	zephyr_login,			/* login */
+	zephyr_close,			/* close */
+	zephyr_send_im,			/* send_im */
+	NULL,					/* set_info */
+	NULL,					/* send_typing */
+	zephyr_zloc,			/* get_info */
+	zephyr_set_away,		/* set_away */
+	NULL,					/* set_idle */
+	NULL,					/* change_passwd */
+	NULL,					/* add_buddy */
+	NULL,					/* add_buddies */
+	NULL,					/* remove_buddy */
+	NULL,					/* remove_buddies */
+	NULL,					/* add_permit */
+	NULL,					/* add_deny */
+	NULL,					/* rem_permit */
+	NULL,					/* rem_deny */
+	NULL,					/* set_permit_deny */
+	NULL,					/* warn */
+	zephyr_join_chat,		/* join_chat */
+	NULL,					/* reject_chat */
+	NULL,					/* chat_invite */
+	zephyr_chat_leave,		/* chat_leave */
+	NULL,					/* chat_whisper */
+	zephyr_chat_send,		/* chat_send */
+	NULL,					/* keepalive */
+	NULL,					/* register_user */
+	NULL,					/* get_cb_info */
+	NULL,					/* get_cb_away */
+	NULL,					/* alias_buddy */
+	NULL,					/* group_buddy */
+	NULL,					/* rename_group */
+	NULL,					/* buddy_free */
+	NULL,					/* convo_closed */
+	zephyr_normalize,		/* normalize */
+	NULL,					/* set_buddy_icon */
+	NULL,					/* remove_group */
+	NULL,					/* get_cb_real_name */
+	zephyr_chat_set_topic,	/* set_chat_topic */
+	NULL,					/* find_blist_chat */
+	NULL,					/* roomlist_get_list */
+	NULL,					/* roomlist_cancel */
+	NULL,					/* roomlist_expand_category */
+	NULL,					/* can_receive_file */
+	NULL					/* send_file */
 };
 
 static GaimPluginInfo info = {