pidgin: 3cf23371: I thought I did this already, but anyway...

qulogic at pidgin.im qulogic at pidgin.im
Wed Feb 18 21:35:28 EST 2009


-----------------------------------------------------------------
Revision: 3cf23371e3e019d9e8de26e38bab170c5ed4aca1
Ancestor: 7124b3df4cfb0213680521a3c885c689e339d1f2
Author: dimmuxx at yahoo.se
Date: 2009-02-19T02:32:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3cf23371e3e019d9e8de26e38bab170c5ed4aca1

Modified files:
        libpurple/protocols/msn/state.c

ChangeLog: 

I thought I did this already, but anyway, a patch from Dimmuxx to stop the
official client from showing an extra dash when you have an empty PSM.

Fixes #8461.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/state.c	20d101ad1027026e1c2339e6d591a5ece38399f0
+++ libpurple/protocols/msn/state.c	588674eec2a5082d3337b2358e44ffcf784ad824
@@ -189,12 +189,12 @@ msn_get_psm(char *xml_str, gsize len)
 
 	purple_debug_info("msn", "msn get PSM\n");
 	payloadNode = xmlnode_from_str(xml_str, len);
-	if (!payloadNode){
+	if (!payloadNode) {
 		purple_debug_error("msn", "PSM XML parse Error!\n");
 		return NULL;
 	}
 	psmNode = xmlnode_get_child(payloadNode, "PSM");
-	if (psmNode == NULL){
+	if (psmNode == NULL) {
 		purple_debug_info("msn", "No PSM status Node");
 		xmlnode_free(payloadNode);
 		return NULL;
@@ -213,7 +213,7 @@ create_media_string(PurplePresence *pres
 	char *ret;
 	PurpleStatus *status = purple_presence_get_status(presence, "tune");
 	if (!status || !purple_status_is_active(status))
-		return g_strdup_printf("\\0Music\\00\\0\\0");
+		return NULL;
 
 	title = purple_status_get_attr_string(status, PURPLE_TUNE_TITLE);
 	game = purple_status_get_attr_string(status, "game");
@@ -234,7 +234,7 @@ create_media_string(PurplePresence *pres
 	else if (office && *office)
 		ret = g_strdup_printf("\\0Office\\01\\0Editing {0}\\0%s\\0", office);
 	else
-		ret = g_strdup_printf("\\0Music\\00\\0\\0");
+		ret = NULL;
 
 	return ret;
 }


More information about the Commits mailing list