changeset 27677:fd4415c0595f

Set xfer->status before emitting signals in purple_xfer_set_status. This was noticed by kenshin in #pidgin and doesn't interfere with the autoaccept plugin (that signal is emitted in purple_xfer_request).
author Paul Aurich <paul@darkrain42.org>
date Thu, 23 Jul 2009 02:31:52 +0000
parents 1736bc22cc06
children 3712ef8bf231
files ChangeLog.API libpurple/ft.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Wed Jul 22 21:17:50 2009 +0000
+++ b/ChangeLog.API	Thu Jul 23 02:31:52 2009 +0000
@@ -87,6 +87,7 @@
 		* purple_find_group is now more efficient for large numbers of groups.
 		* All DNS routines support internationalized domain names (IDNs) when
 		  libpurple is compiled with GNU libidn.
+		* status is set before emitting signals in purple_xfer_set_status.
 
 		Deprecated:
 		* buddy-added and buddy-removed blist signals
--- a/libpurple/ft.c	Wed Jul 22 21:17:50 2009 +0000
+++ b/libpurple/ft.c	Thu Jul 23 02:31:52 2009 +0000
@@ -132,6 +132,8 @@
 {
 	g_return_if_fail(xfer != NULL);
 
+	xfer->status = status;
+
 	if(xfer->type == PURPLE_XFER_SEND) {
 		switch(status) {
 			case PURPLE_XFER_STATUS_ACCEPTED:
@@ -169,8 +171,6 @@
 				break;
 		}
 	}
-
-	xfer->status = status;
 }
 
 void purple_xfer_conversation_write(PurpleXfer *xfer, char *message, gboolean is_error)