[Gaim-commits] SF.net SVN: gaim: [16385] branches/v2_0_0/src/protocols/silc/silc.c

[<nos...@us...>]

Revision: 16385
Author:   nosnilmot
Date:     2006-07-01 08:33:43 -0700 (Sat, 01 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16385&view=rev

Log Message:
-----------
Backport SVN revision #16384 from HEAD to v2_0_0
Original commit message:

Workaround for silc toolkit "bug" that prevents empty unix account real
names from connecting.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16384&view=rev

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/silc/silc.c
Modified: branches/v2_0_0/src/protocols/silc/silc.c
===================================================================
--- branches/v2_0_0/src/protocols/silc/silc.c	2006-07-01 15:20:58 UTC (rev 16384)
+++ branches/v2_0_0/src/protocols/silc/silc.c	2006-07-01 15:33:43 UTC (rev 16385)
@@ -268,6 +268,7 @@
 	GaimConnection *gc;
 	char pkd[256], prd[256];
 	const char *cipher, *hmac;
+	char *realname;
 	int i;
 
 	gc = account->gc;
@@ -298,11 +299,16 @@
 		client->username = silc_get_username();
 		gaim_account_set_username(account, client->username);
 	}
+	realname = silc_get_real_name();
 	if (gaim_account_get_user_info(account)) {
 		client->realname = strdup(gaim_account_get_user_info(account));
+		free(realname);
+	} else if ((silc_get_real_name() != NULL) && (*realname != '\0')) {
+		client->realname = realname;
+		gaim_account_set_user_info(account, client->realname);
 	} else {
-		client->realname = silc_get_real_name();
-		gaim_account_set_user_info(account, client->realname);
+		free(realname);
+		client->realname = strdup(_("Gaim User"));
 	}
 	client->hostname = silc_net_localhost();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.