# HG changeset patch
# User Florian Qu���ze <florian@instantbird.org>
# Date 1244169031 0
# Node ID 2ab648c328cc3e4228fcd5e41487176f42999098
# Parent  4c3b1bb3ba910889c6944176dcda19e10e680840
Consistently emit conversation-updated for typing state changes.

Also reformatted ChangeLog.API a bit (I noticed there's a Changed section)
and added a comment to the psychic plugin (since I had to look up why it
was doing that).

Patch from Florian Qu���ze. Closes #7605.

committer: Paul Aurich <paul@darkrain42.org>

diff -r 4c3b1bb3ba91 -r 2ab648c328cc ChangeLog.API
--- a/ChangeLog.API	Fri Jun 05 01:58:22 2009 +0000
+++ b/ChangeLog.API	Fri Jun 05 02:30:31 2009 +0000
@@ -16,9 +16,6 @@
 		* blist-node-added and blist-node-removed signals (see
 		  blist-signals.dox)
 		* Jabber plugin signals (see jabber-signals.dox)
-		* Plugins may now emit the jabber-sending-xmlnode signal in order
-		  to send stanzas; this method is preferred to the prpl send_raw
-		  function as other plugins listening to the signal see them.
 		* purple_buddy_destroy
 		* purple_buddy_get_protocol_data
 		* purple_buddy_set_protocol_data
@@ -61,6 +58,13 @@
 		  which was completely non-deterministic.  If you want to remove
 		  the attribute with no namespace, then use NULL with
 		  xmlnode_remove_with_namespace.
+		* Plugins may now emit the jabber-sending-xmlnode signal in order
+		  to send stanzas; this method is preferred to the prpl send_raw
+		  function as other plugins listening to the signal see them.
+		* The conversation-updated signal with a PURPLE_CONV_UPDATE_TYPING
+		  update type is emitted when receiving an IM.  Previously, the
+		  typing state was modified (and the buddy-typing-stopped signal
+		  emitted), but this signal was not emitted.
 
 		Deprecated:
 		* buddy-added and buddy-removed blist signals
diff -r 4c3b1bb3ba91 -r 2ab648c328cc libpurple/conversation.c
--- a/libpurple/conversation.c	Fri Jun 05 01:58:22 2009 +0000
+++ b/libpurple/conversation.c	Fri Jun 05 02:30:31 2009 +0000
@@ -55,7 +55,6 @@
 	im = PURPLE_CONV_IM(c);
 
 	purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING);
-	purple_conv_im_update_typing(im);
 	purple_conv_im_stop_typing_timeout(im);
 
 	return FALSE;
@@ -1050,6 +1049,8 @@
 								   "buddy-typing-stopped", im->conv->account, im->conv->name);
 				break;
 		}
+
+		purple_conv_im_update_typing(im);
 	}
 }
 
diff -r 4c3b1bb3ba91 -r 2ab648c328cc libpurple/plugins/psychic.c
--- a/libpurple/plugins/psychic.c	Fri Jun 05 01:58:22 2009 +0000
+++ b/libpurple/plugins/psychic.c	Fri Jun 05 02:30:31 2009 +0000
@@ -74,6 +74,7 @@
 			      time(NULL));
     }
 
+    /* Necessary because we may be creating a new conversation window. */
     purple_conv_im_set_typing_state(PURPLE_CONV_IM(gconv), PURPLE_TYPING);
   }
 }
diff -r 4c3b1bb3ba91 -r 2ab648c328cc libpurple/server.c
--- a/libpurple/server.c	Fri Jun 05 01:58:22 2009 +0000
+++ b/libpurple/server.c	Fri Jun 05 02:30:31 2009 +0000
@@ -728,7 +728,6 @@
 		im = PURPLE_CONV_IM(conv);
 
 		purple_conv_im_set_typing_state(im, state);
-		purple_conv_im_update_typing(im);
 	} else {
 		switch (state)
 		{
@@ -766,7 +765,6 @@
 
 		purple_conv_im_stop_typing_timeout(im);
 		purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING);
-		purple_conv_im_update_typing(im);
 	}
 	else
 	{