diff src/savedstatuses.c @ 11806:7584d802f0ac

[gaim-migrate @ 14097] 1. Improve "gaim -n" Using this now sets your current status to "Offline." This isn't shown in the gtkstatusbox yet. 2. Change gtkstatusbox to use gaim_savedstatus_activate() instead of having duplicate code. 3. Change gaim_savedstatus_activate() to only attempt to set the "message" attribute of a status when the status type supports the attribute. I think this'll get rid of some warnings CVS is getting good. Can you feel it? committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 25 Oct 2005 04:23:07 +0000
parents a25be0e70a67
children 351f4dd75718
line wrap: on
line diff
--- a/src/savedstatuses.c	Tue Oct 25 01:00:28 2005 +0000
+++ b/src/savedstatuses.c	Tue Oct 25 04:23:07 2005 +0000
@@ -531,12 +531,17 @@
 
 	if (status_type != NULL)
 	{
-		if (saved_status->message != NULL)
+		if ((saved_status->message != NULL) &&
+			(gaim_status_type_get_attr(status_type, "message")))
+		{
 			gaim_account_set_status(account, gaim_status_type_get_id(status_type),
 									TRUE, "message", saved_status->message, NULL);
+		}
 		else
+		{
 			gaim_account_set_status(account, gaim_status_type_get_id(status_type),
 									TRUE, NULL);
+		}
 	}
 }