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

[<rl...@us...>]

Revision: 16213
Author:   rlaager
Date:     2006-06-03 23:34:30 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16213&view=rev

Log Message:
-----------
SF Patch #1499284 from Ka-Hing Cheung

"Set available message was broken some while ago (didn't
 bother to check the exact checkin), I think because of
 a misplaced else block. Attached is a patch that fixes
 the problem."

Modified Paths:
--------------
    trunk/src/protocols/oscar/oscar.c
Modified: trunk/src/protocols/oscar/oscar.c
===================================================================
--- trunk/src/protocols/oscar/oscar.c	2006-06-03 16:47:58 UTC (rev 16212)
+++ trunk/src/protocols/oscar/oscar.c	2006-06-04 06:34:30 UTC (rev 16213)
@@ -4370,7 +4370,7 @@
 	else if (primitive == GAIM_STATUS_AVAILABLE)
 	{
 		const char *status_html;
-		char *status_text;
+		char *status_text = NULL;
 
 		status_html = gaim_status_get_attr_string(status, "message");
 		if (status_html != NULL)
@@ -4382,15 +4382,11 @@
 				char *tmp = g_utf8_find_prev_char(status_text, &status_text[58]);
 				strcpy(tmp, "...");
 			}
-			else
-			{
-				/* User did not specify an available message */
-				status_text = NULL;
-			}
-			aim_srv_setstatusmsg(od, status_text);
-			g_free(status_text);
 		}
 
+		aim_srv_setstatusmsg(od, status_text);
+		g_free(status_text);
+
 		/* This is needed for us to un-set any previous away message. */
 		away = g_strdup("");
 	}


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