[Gaim-commits] SF.net SVN: gaim: [16215] trunk/src/gtkstatusbox.c

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

Revision: 16215
Author:   rlaager
Date:     2006-06-04 00:40:13 -0700 (Sun, 04 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16215&view=rev

Log Message:
-----------
Part of SF Patch #1500267 from Sadrul

'Fix for a couple of showstopper bugs on status + RFE

 "Changing from a saved status based on "Available" with
 a couple accounts Offline to the primitive "Available"
 didn't do anything. It showed Available - Typing, I
 think, but then didn't change my status. deryni
 confirmed this."'

Modified Paths:
--------------
    trunk/src/gtkstatusbox.c
Modified: trunk/src/gtkstatusbox.c
===================================================================
--- trunk/src/gtkstatusbox.c	2006-06-04 06:37:25 UTC (rev 16214)
+++ trunk/src/gtkstatusbox.c	2006-06-04 07:40:13 UTC (rev 16215)
@@ -1267,7 +1267,8 @@
 
 		/* Has the status really been changed? */
 		saved_status = gaim_savedstatus_get_current();
-		if (gaim_savedstatus_get_type(saved_status) == GPOINTER_TO_INT(data))
+		if (gaim_savedstatus_get_type(saved_status) == GPOINTER_TO_INT(data) &&
+		    !gaim_savedstatus_has_substatuses(saved_status))
 		{
 			if (!message_changed(gaim_savedstatus_get_message(saved_status), message))
 				changed = FALSE;


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