# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1213038368 0
# Node ID 6933bd0415a1985d3f417d061e3689d258201345
# Parent  d4c299272a9530f1505242948aa56c3bdbe56d1b# Parent  c80746c7c96c1aaf4650f61d45fe11d7e034cf2f
merge of '288e82d5a18fb0bac91d9b4b737d4788af8388ed'
     and '2a1ff3497bb7597ba3712218a7142bb6b167b2b4'

diff -r d4c299272a95 -r 6933bd0415a1 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Mon Jun 09 18:58:45 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon Jun 09 19:06:08 2008 +0000
@@ -844,7 +844,7 @@
 		/* Away messges are HTML, but available messages were originally plain text.
 		 * We therefore need to strip away messages but not available messages if we're asked to remove HTML tags.
 		 */
-		if (is_away) {
+		if (is_away && message) {
 			gchar *tmp2;
 			tmp = purple_markup_strip_html(message);
 			g_free(message);
@@ -854,16 +854,16 @@
 		}
 
 	} else {
-	if (itmsurl) {
-		tmp = g_strdup_printf("<a href=\"%s\">%s</a>",
-							  itmsurl, message);
-		g_free(itmsurl);
-		g_free(message);
-		message = tmp;
-	}
-	}
-
-	if (is_away) {
+		if (itmsurl) {
+			tmp = g_strdup_printf("<a href=\"%s\">%s</a>",
+								  itmsurl, message);
+			g_free(itmsurl);
+			g_free(message);
+			message = tmp;
+		}
+	}
+
+	if (is_away && message) {
 		tmp = purple_str_sub_away_formatters(message, purple_account_get_username(account));
 		g_free(message);
 		message = tmp;
@@ -1963,7 +1963,11 @@
 			itmsurl = oscar_encoding_to_utf8(account, info->itmsurl_encoding,
 					info->itmsurl, info->itmsurl_len);
 
-		tmp = g_markup_escape_text(message, -1);
+		tmp = (message ? g_markup_escape_text(message, -1) : NULL);
+
+		if (message == NULL && itmsurl != NULL)
+			message = "";
+
 		purple_prpl_got_user_status(account, info->sn, status_id,
 				"message", tmp, "itmsurl", itmsurl, NULL);
 		g_free(tmp);
diff -r d4c299272a95 -r 6933bd0415a1 libpurple/win32/global.mak
--- a/libpurple/win32/global.mak	Mon Jun 09 18:58:45 2008 +0000
+++ b/libpurple/win32/global.mak	Mon Jun 09 19:06:08 2008 +0000
@@ -112,4 +112,4 @@
 MINGW_MAKEFILE := Makefile.mingw
 
 INSTALL_PIXMAPS ?= 1
-
+INSTALL_SSL_CERTIFICATES ?= 1
diff -r d4c299272a95 -r 6933bd0415a1 share/ca-certs/Makefile.mingw
--- a/share/ca-certs/Makefile.mingw	Mon Jun 09 18:58:45 2008 +0000
+++ b/share/ca-certs/Makefile.mingw	Mon Jun 09 19:06:08 2008 +0000
@@ -8,8 +8,8 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir := $(PIDGIN_INSTALL_DIR)
+-include ./Makefile.am.mingw
 cacertsdir := $(PIDGIN_INSTALL_DIR)/ca-certs
--include ./Makefile.am.mingw
 
 .PHONY: install
 
@@ -21,4 +21,4 @@
 
 ./Makefile.am.mingw: ./Makefile.am
 	sed -e 's/^if\ INSTALL_SSL_CERTIFICATES/ifeq (\$$(INSTALL_SSL_CERTIFICATES), 1)/' ./Makefile.am > $@
-	include $@
+