# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1149406813 0
# Node ID 3f23b55a2cc4bfb4829fbc61550e43d8f16604ef
# Parent  5651cf120744ea71ae45de4501be88a8e70b6a99
[gaim-migrate @ 16215]
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."'

committer: Tailor Script <tailor@pidgin.im>

diff -r 5651cf120744 -r 3f23b55a2cc4 src/gtkstatusbox.c
--- a/src/gtkstatusbox.c	Sun Jun 04 06:34:30 2006 +0000
+++ b/src/gtkstatusbox.c	Sun Jun 04 07:40:13 2006 +0000
@@ -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;