# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1273641707 0
# Node ID e63ea24aa2914feb056d266cf209716774876f21
# Parent  af5a46ecfb240e6152ad4c73205d2135c94e5433# Parent  097569720d68cc50920e6eb4142ec342456629d0
merge of '17fcb3e7ac74579122bb5259359cef56f5bbf713'
     and 'b721192f0b7c409b2f6d8829fc79087ee7587bfb'

diff -r af5a46ecfb24 -r e63ea24aa291 libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Wed May 12 05:15:44 2010 +0000
+++ b/libpurple/protocols/jabber/message.c	Wed May 12 05:21:47 2010 +0000
@@ -1250,7 +1250,14 @@
 
 	g_free(resource);
 
-	if (!jbr || (jbr->chat_states == JABBER_CHAT_STATES_UNSUPPORTED))
+	/* We know this entity doesn't support chat states */
+	if (jbr && jbr->chat_states == JABBER_CHAT_STATES_UNSUPPORTED)
+		return 0;
+
+	/* *If* we don't have presence /and/ the buddy can't see our
+	 * presence, don't send typing notifications.
+	 */
+	if (!jbr && !(jb->subscription & JABBER_SUB_FROM))
 		return 0;
 
 	/* TODO: figure out threading */