[Gaim-commits] CVS: gaim/src status.c,1.69,1.70 gtkblist.c,1.279,1.280

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11344/src

Modified Files:
	status.c gtkblist.c 
Log Message:
Two fixes:

1. Don't print 2 assertion failed warnings when showing the tooltip
   of an idle with no status message Yahoo! buddy.  This is the change
   in gtkblist.c

2. When an idle Yahoo! buddy signs offline, we continued to show
   the buddy as idle.  If a buddy is offline then they are NOT idle.
   This is the change in status.c


Index: status.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/status.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -p -r1.69 -r1.70
--- status.c	8 Oct 2005 16:08:51 -0000	1.69
+++ status.c	10 Oct 2005 04:55:42 -0000	1.70
@@ -1554,7 +1554,7 @@ gaim_presence_is_idle(const GaimPresence
 {
 	g_return_val_if_fail(presence != NULL, FALSE);
 
-	return presence->idle;
+	return gaim_presence_is_online(presence) && presence->idle;
 }
 
 time_t

Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -p -r1.279 -r1.280
--- gtkblist.c	8 Oct 2005 16:08:51 -0000	1.279
+++ gtkblist.c	10 Oct 2005 04:55:42 -0000	1.280
@@ -2909,7 +2909,8 @@ static char *gaim_get_tooltip_text(GaimB
 				tmp = new;
 			}
 
-			g_string_append(str, tmp);
+			if (tmp != NULL)
+				g_string_append(str, tmp);
 			g_free(tmp);
 		}