# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1247991465 0
# Node ID 93e6cf770ea8e29865d2c295bde27827e6b942af
# Parent  a2c0e8c54b426b03084eaeaac8055c3a4b92a76b# Parent  b7ce89597a89e375b6a4f631be527df8a42fa044
merge of '2ce8248c9604e667e6fbbc4200565415369417e0'
     and '826fe96cf74adec56a74a298023c17a9eece9c8b'

diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/finch.c
--- a/finch/finch.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/finch.c	Sun Jul 19 08:17:45 2009 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/finch.h
--- a/finch/finch.h	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/finch.h	Sun Jul 19 08:17:45 2009 +0000
@@ -24,8 +24,6 @@
  */
 #include <glib.h>
 
-#include "libpurple/internal.h"
-
 #define FINCH_UI "gnt-purple"
 
 #define FINCH_PREFS_ROOT "/finch"
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntaccount.c
--- a/finch/gntaccount.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntaccount.c	Sun Jul 19 08:17:45 2009 +0000
@@ -36,6 +36,7 @@
 #include <gntwindow.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include <account.h>
 #include <accountopt.h>
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntblist.c
--- a/finch/gntblist.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntblist.c	Sun Jul 19 08:17:45 2009 +0000
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include <account.h>
 #include <blist.h>
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntcertmgr.c
--- a/finch/gntcertmgr.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntcertmgr.c	Sun Jul 19 08:17:45 2009 +0000
@@ -26,6 +26,7 @@
  */
 
 #include "finch.h"
+#include <internal.h>
 
 #include "certificate.h"
 #include "debug.h"
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntconn.c
--- a/finch/gntconn.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntconn.c	Sun Jul 19 08:17:45 2009 +0000
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include "account.h"
 #include "core.h"
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntconv.c
--- a/finch/gntconv.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntconv.c	Sun Jul 19 08:17:45 2009 +0000
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include <cmds.h>
 #include <idle.h>
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntdebug.c
--- a/finch/gntdebug.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntdebug.c	Sun Jul 19 08:17:45 2009 +0000
@@ -35,6 +35,7 @@
 
 #include "gntdebug.h"
 #include "finch.h"
+#include <internal.h>
 #include "notify.h"
 #include "util.h"
 
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntft.c
--- a/finch/gntft.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntft.c	Sun Jul 19 08:17:45 2009 +0000
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include <gnt.h>
 #include <gntbox.h>
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntlog.c
--- a/finch/gntlog.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntlog.c	Sun Jul 19 08:17:45 2009 +0000
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include <gnt.h>
 #include <gntbox.h>
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntnotify.c
--- a/finch/gntnotify.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntnotify.c	Sun Jul 19 08:17:45 2009 +0000
@@ -32,6 +32,7 @@
 #include <gntwindow.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include <util.h>
 
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntplugin.c
--- a/finch/gntplugin.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntplugin.c	Sun Jul 19 08:17:45 2009 +0000
@@ -32,6 +32,7 @@
 #include <gntutils.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include "debug.h"
 #include "notify.h"
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntpounce.c
--- a/finch/gntpounce.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntpounce.c	Sun Jul 19 08:17:45 2009 +0000
@@ -36,6 +36,7 @@
 #include <gntutils.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntprefs.c
--- a/finch/gntprefs.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntprefs.c	Sun Jul 19 08:17:45 2009 +0000
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include <prefs.h>
 #include <savedstatuses.h>
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntrequest.c
--- a/finch/gntrequest.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntrequest.c	Sun Jul 19 08:17:45 2009 +0000
@@ -35,6 +35,7 @@
 #include <gnttree.h>
 
 #include "finch.h"
+#include <internal.h>
 #include "gntrequest.h"
 #include "debug.h"
 #include "util.h"
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntroomlist.c
--- a/finch/gntroomlist.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntroomlist.c	Sun Jul 19 08:17:45 2009 +0000
@@ -25,6 +25,7 @@
  */
 
 #include "finch.h"
+#include <internal.h>
 
 #include "gntrequest.h"
 #include "gntroomlist.h"
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntsound.c
--- a/finch/gntsound.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntsound.c	Sun Jul 19 08:17:45 2009 +0000
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #ifdef _WIN32
 #include <windows.h>
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntstatus.c
--- a/finch/gntstatus.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntstatus.c	Sun Jul 19 08:17:45 2009 +0000
@@ -34,6 +34,7 @@
 #include <gntutils.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include <notify.h>
 #include <request.h>
diff -r a2c0e8c54b42 -r 93e6cf770ea8 finch/gntui.c
--- a/finch/gntui.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/finch/gntui.c	Sun Jul 19 08:17:45 2009 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include "gntui.h"
 
diff -r a2c0e8c54b42 -r 93e6cf770ea8 libpurple/protocols/msn/msg.c
--- a/libpurple/protocols/msn/msg.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/libpurple/protocols/msn/msg.c	Sun Jul 19 08:17:45 2009 +0000
@@ -349,7 +349,8 @@
 			msg->body[msg->body_len] = '\0';
 		}
 		
-		if (msg->charset == NULL) {
+		if ((!content_type || !strcmp(content_type, "text/plain"))
+			&& msg->charset == NULL) {
 			char *body = g_convert(msg->body, msg->body_len, "UTF-8",
 			                       "ISO-8859-1", NULL, &msg->body_len, NULL);
 			g_free(msg->body);
diff -r a2c0e8c54b42 -r 93e6cf770ea8 libpurple/util.c
--- a/libpurple/util.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/libpurple/util.c	Sun Jul 19 08:17:45 2009 +0000
@@ -1572,8 +1572,9 @@
 				ALLOW_TAG("h5");
 				ALLOW_TAG("h6");
 				/* we only allow html to start the message */
-				if(c == html)
+				if(c == html) {
 					ALLOW_TAG("html");
+				}
 				ALLOW_TAG_ALT("i", "em");
 				ALLOW_TAG_ALT("italic", "em");
 				ALLOW_TAG("li");
diff -r a2c0e8c54b42 -r 93e6cf770ea8 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sun Jul 19 07:17:13 2009 +0000
+++ b/pidgin/gtkblist.c	Sun Jul 19 08:17:45 2009 +0000
@@ -7216,7 +7216,7 @@
 static void
 set_urgent(void)
 {
-	if (!GTK_WIDGET_HAS_FOCUS(gtkblist->window))
+	if (gtkblist->window && !GTK_WIDGET_HAS_FOCUS(gtkblist->window))
 		pidgin_set_urgent(GTK_WINDOW(gtkblist->window), TRUE);
 }