[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.192,1.193

[Ethan B. <ebl...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory sc8-pr-cvs1:/tmp/cvs-serv1443/src/protocols/irc

Modified Files:
	irc.c 
Log Message:
The username reported to the IRC server can now be set in the account
options for an IRC account.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -p -r1.192 -r1.193
--- irc.c	5 Oct 2003 05:04:55 -0000	1.192
+++ irc.c	24 Oct 2003 15:37:17 -0000	1.193
@@ -216,6 +216,7 @@ static void irc_login_cb(gpointer data, 
 	struct irc_conn *irc = gc->proto_data;
 	char hostname[256];
 	char *buf;
+	const char *username;
 	GList *connections = gaim_connections_get_all();
 
 	if (source < 0)
@@ -239,7 +240,8 @@ static void irc_login_cb(gpointer data, 
 
 	gethostname(hostname, sizeof(hostname));
 	hostname[sizeof(hostname) - 1] = '\0';
-	buf = irc_format(irc, "vvvv:", "USER", g_get_user_name(), hostname, irc->server,
+	username = gaim_account_get_string(irc->account, "username", "");
+	buf = irc_format(irc, "vvvv:", "USER", strlen(username) ? username : g_get_user_name(), hostname, irc->server,
 			      gc->account->alias && *gc->account->alias ? gc->account->alias : IRC_DEFAULT_ALIAS);
 	if (irc_send(irc, buf) < 0) {
 		gaim_connection_error(gc, "Error registering with server");
@@ -552,6 +554,9 @@ static void _init_plugin(GaimPlugin *plu
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	option = gaim_account_option_string_new(_("Encoding"), "encoding", IRC_DEFAULT_CHARSET);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = gaim_account_option_string_new(_("Username"), "username", "");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	_irc_plugin = plugin;