changeset 21308:2105177f2de4

merge of '535e513c571856e9e31d51a83dca552c8a8433dc' and 'c1bdec9375bee85ed8f1e7bcfcd60fac3ae61f62'
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 10 Nov 2007 22:32:26 +0000
parents a9482e431e43 (current diff) 5cca0d7d9081 (diff)
children a83481f006e5
files
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkconv.c	Sat Nov 10 17:39:31 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Nov 10 22:32:26 2007 +0000
@@ -3074,6 +3074,9 @@
 					chat, (GDestroyNotify)purple_blist_remove_chat);
 		}
 	} else {
+		if (!purple_account_is_connected(conv->account))
+			return FALSE;
+
 		buddy = purple_find_buddy(conv->account, conv->name);
 
 		/* gotta remain bug-compatible :( libpurple < 2.0.2 didn't handle