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

[<rlaager@us...>]

Revision: 16089
Author:   rlaager
Date:     2006-04-24 13:15:34 -0700 (Mon, 24 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16089&view=rev

Log Message:
-----------
SF Patch #1470203 from Sadrul

"If someone (using gaim, not sure about any other) on my
 buddy-list is away on yahoo, and goes idle, then
 there's a status-changed signal emitted saying that the
 buddy changed status to "available" -- which is not
 correct."

"Also, when you have a status-message, and become idle,
 the status-message for that gets lost. This apparently
 was caused by my last patch."

Modified Paths:
--------------
    trunk/src/protocols/yahoo/yahoo.c
Modified: trunk/src/protocols/yahoo/yahoo.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo.c	2006-04-24 20:05:48 UTC (rev 16088)
+++ trunk/src/protocols/yahoo/yahoo.c	2006-04-24 20:15:34 UTC (rev 16089)
@@ -153,14 +153,12 @@
 		status = YAHOO_STATUS_TYPE_INVISIBLE;
 		break;
 	case YAHOO_STATUS_CUSTOM:
+	case YAHOO_STATUS_IDLE:
 		if (!f->away)
 			status = YAHOO_STATUS_TYPE_AVAILABLE;
 		else
 			status = YAHOO_STATUS_TYPE_AWAY;
 		break;
-	case YAHOO_STATUS_IDLE:
-		status = YAHOO_STATUS_TYPE_AVAILABLE;
-		break;
 	default:
 		gaim_debug_warning("yahoo", "Warning, unknown status %d\n", f->status);
 		break;
@@ -3237,7 +3235,7 @@
 	char *msg = NULL, *msg2 = NULL;
 	GaimStatus *status = NULL;
 
-	if (idle && yd->current_status != YAHOO_STATUS_IDLE)
+	if (idle && yd->current_status != YAHOO_STATUS_CUSTOM)
 		yd->current_status = YAHOO_STATUS_IDLE;
 	else if (!idle && yd->current_status == YAHOO_STATUS_IDLE) {
 		status = gaim_presence_get_active_status(gaim_account_get_presence(gaim_connection_get_account(gc)));


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

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

[<thekingant@us...>]

Revision: 16356
Author:   thekingant
Date:     2006-06-26 23:50:52 -0700 (Mon, 26 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16356&view=rev

Log Message:
-----------
Fix coverity CID #200: Remove unused code

Modified Paths:
--------------
    trunk/src/protocols/yahoo/yahoo.c
Modified: trunk/src/protocols/yahoo/yahoo.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo.c	2006-06-27 02:33:55 UTC (rev 16355)
+++ trunk/src/protocols/yahoo/yahoo.c	2006-06-27 06:50:52 UTC (rev 16356)
@@ -2676,7 +2676,6 @@
 	struct yahoo_data *yd;
 	YahooFriend *f;
 	GaimPresence *presence;
-	GaimStatus *status;
 
 	if (!b || !(account = b->account) || !(gc = gaim_account_get_connection(account)) ||
 					     !(yd = gc->proto_data))
@@ -2689,7 +2688,6 @@
 	}
 
 	presence = gaim_buddy_get_presence(b);
-	status = gaim_presence_get_active_status(presence);
 
 	if (gaim_presence_is_online(presence) == FALSE) {
 		*se = "offline";


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

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

[<datallah@us...>]

Revision: 16658
Author:   datallah
Date:     2006-08-06 16:47:34 -0700 (Sun, 06 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16658&view=rev

Log Message:
-----------
It has been too long since I did something productive here. Fix logging into yahoo with a password containing non-ascii characters. This fixes bug #1534796.

Modified Paths:
--------------
    trunk/src/protocols/yahoo/yahoo.c
Modified: trunk/src/protocols/yahoo/yahoo.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo.c	2006-08-06 21:03:10 UTC (rev 16657)
+++ trunk/src/protocols/yahoo/yahoo.c	2006-08-06 23:47:34 UTC (rev 16658)
@@ -1241,6 +1241,7 @@
 	GaimAccount *account = gaim_connection_get_account(gc);
 	const char *name = gaim_normalize(account, gaim_account_get_username(account));
 	const char *pass = gaim_connection_get_password(gc);
+	char *enc_pass;
 	struct yahoo_data *yd = gc->proto_data;
 
 	GaimCipher			*md5_cipher;
@@ -1472,14 +1473,20 @@
 		magic_key_char[3] = (updated_key >> 24) & 0xff;
 	}
 
+	enc_pass = yahoo_string_encode(gc, pass, NULL);
+
 	/* Get password and crypt hashes as per usual. */
 	gaim_cipher_context_reset(md5_ctx, NULL);
-	gaim_cipher_context_append(md5_ctx, (const guchar *)pass, strlen(pass));
+	gaim_cipher_context_append(md5_ctx, (const guchar *)enc_pass, strlen(enc_pass));
 	gaim_cipher_context_digest(md5_ctx, sizeof(md5_digest),
 							   md5_digest, NULL);
 	to_y64(password_hash, md5_digest, 16);
 
-	crypt_result = yahoo_crypt(pass, "$1$_2S43d5f$");
+	crypt_result = yahoo_crypt(enc_pass, "$1$_2S43d5f$");
+
+	g_free(enc_pass);
+	enc_pass = NULL;
+
 	gaim_cipher_context_reset(md5_ctx, NULL);
 	gaim_cipher_context_append(md5_ctx, (const guchar *)crypt_result, strlen(crypt_result));
 	gaim_cipher_context_digest(md5_ctx, sizeof(md5_digest),


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

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

[<datallah@us...>]

Revision: 16692
Author:   datallah
Date:     2006-08-10 17:21:26 -0700 (Thu, 10 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16692&view=rev

Log Message:
-----------
Fix CID 127, 128

Modified Paths:
--------------
    trunk/src/protocols/yahoo/yahoo.c
Modified: trunk/src/protocols/yahoo/yahoo.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo.c	2006-08-10 23:58:24 UTC (rev 16691)
+++ trunk/src/protocols/yahoo/yahoo.c	2006-08-11 00:21:26 UTC (rev 16692)
@@ -350,7 +350,7 @@
 				break;
 
 			yahoo_friend_set_buddy_icon_need_request(f, FALSE);
-			if (cksum != gaim_blist_node_get_int((GaimBlistNode*)b, YAHOO_ICON_CHECKSUM_KEY))
+			if (b && cksum != gaim_blist_node_get_int((GaimBlistNode*)b, YAHOO_ICON_CHECKSUM_KEY))
 				yahoo_send_picture_request(gc, name);
 
 			break;
@@ -3396,7 +3396,7 @@
 	if (foo)
 		group = foo->name;
 	if (!group) {
-		g = gaim_buddy_get_group(gaim_find_buddy(gc->account, buddy->name));
+		g = gaim_buddy_get_group(buddy);
 		if (g)
 			group = g->name;
 		else


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