changeset 11634:c7305c2d650b

[gaim-migrate @ 13910] 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 committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 10 Oct 2005 04:55:42 +0000
parents a32bf50ee5d1
children e95c37720766
files src/gtkblist.c src/status.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkblist.c	Mon Oct 10 04:18:58 2005 +0000
+++ b/src/gtkblist.c	Mon Oct 10 04:55:42 2005 +0000
@@ -2909,7 +2909,8 @@
 				tmp = new;
 			}
 
-			g_string_append(str, tmp);
+			if (tmp != NULL)
+				g_string_append(str, tmp);
 			g_free(tmp);
 		}
 
--- a/src/status.c	Mon Oct 10 04:18:58 2005 +0000
+++ b/src/status.c	Mon Oct 10 04:55:42 2005 +0000
@@ -1554,7 +1554,7 @@
 {
 	g_return_val_if_fail(presence != NULL, FALSE);
 
-	return presence->idle;
+	return gaim_presence_is_online(presence) && presence->idle;
 }
 
 time_t