pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16033] trunk/src/protocols/silc/silc.c

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

Revision: 16033
Author:   nosnilmot
Date:     2006-04-15 07:14:50 -0700 (Sat, 15 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16033&view=rev

Log Message:
-----------
Fix Coverity CID 119

Modified Paths:
--------------
    trunk/src/protocols/silc/silc.c
Modified: trunk/src/protocols/silc/silc.c
===================================================================
--- trunk/src/protocols/silc/silc.c	2006-04-15 13:39:26 UTC (rev 16032)
+++ trunk/src/protocols/silc/silc.c	2006-04-15 14:14:50 UTC (rev 16033)
@@ -1247,7 +1247,7 @@
 		const char *cmd, char **args, char **error, void *data)
 {
 	GaimConnection *gc;
-	GaimConversation *convo;
+	GaimConversation *convo = conv;
 	int id = 0;
 
 	gc = gaim_conversation_get_gc(conv);
@@ -1255,13 +1255,12 @@
 	if (gc == NULL)
 		return GAIM_CMD_RET_FAILED;
 
-	if(args && args[0]) {
+	if(args && args[0])
 		convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, args[0],
 									gc->account);
-	} else
-		convo = conv;
 
-	id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo));
+	if (convo != NULL)
+		id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo));
 
 	if (id == 0)
 		return GAIM_CMD_RET_FAILED;


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

[Gaim-commits] SF.net SVN: gaim: [16384] trunk/src/protocols/silc/silc.c

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

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

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

Modified Paths:
--------------
    trunk/src/protocols/silc/silc.c
Modified: trunk/src/protocols/silc/silc.c
===================================================================
--- trunk/src/protocols/silc/silc.c	2006-07-01 06:18:11 UTC (rev 16383)
+++ trunk/src/protocols/silc/silc.c	2006-07-01 15:20:58 UTC (rev 16384)
@@ -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.