im.pidgin.pidgin: 59ab2b78429c94d5d0fc77b1b7892accb524e2a4

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 59ab2b78429c94d5d0fc77b1b7892accb524e2a4
Ancestor: cf4d95df46ab2c4bea54a9fee1015441f2770bf6
Author: evands at pidgin.im
Date: 2007-10-15T23:46:02
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/user.c
        libpurple/status.h

ChangeLog: 

Use a #define for the msn 'currentmedia' status attribute in line with the PURPLE_TUNE_ attributes used in the xmpp prpl

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.c	1f9100b53886abb18c13b62fa62d9d5980288979
+++ libpurple/protocols/msn/msn.c	4eb47d96022a72aabb05e62c7851161951017b9f
@@ -552,7 +552,7 @@ msn_status_text(PurpleBuddy *buddy)
 	status = purple_presence_get_active_status(presence);
 
 	msg = purple_status_get_attr_string(status, "message");
-	cmedia = purple_status_get_attr_string(status, "currentmedia");
+	cmedia = purple_status_get_attr_string(status, PURPLE_TUNE_FULL);
 
 	if (cmedia)
 		return g_markup_escape_text(cmedia, -1);
@@ -577,7 +577,7 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
 		char *tmp;
 
 		psm = purple_status_get_attr_string(status, "message");
-		currentmedia = purple_status_get_attr_string(status, "currentmedia");
+		currentmedia = purple_status_get_attr_string(status, PURPLE_TUNE_FULL);
 
 		if (!purple_presence_is_available(presence)) {
 			name = purple_status_get_name(status);
@@ -632,40 +632,40 @@ msn_status_types(PurpleAccount *account)
 	status = purple_status_type_new_with_attrs(
 				PURPLE_STATUS_AVAILABLE, NULL, NULL, TRUE, TRUE, FALSE,
 				"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
-				"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+				PURPLE_TUNE_FULL, _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
 				NULL);
 	types = g_list_append(types, status);
 
 	status = purple_status_type_new_with_attrs(
 			PURPLE_STATUS_AWAY, NULL, NULL, TRUE, TRUE, FALSE,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
-			"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_FULL, _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
 			NULL);
 	types = g_list_append(types, status);
 
 	status = purple_status_type_new_with_attrs(
 			PURPLE_STATUS_AWAY, "brb", _("Be Right Back"), TRUE, TRUE, FALSE,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
-			"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_FULL, _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
 			NULL);
 	types = g_list_append(types, status);
 
 	status = purple_status_type_new_with_attrs(
 			PURPLE_STATUS_UNAVAILABLE, "busy", _("Busy"), TRUE, TRUE, FALSE,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
-			"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_FULL, _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
 			NULL);
 	types = g_list_append(types, status);
 	status = purple_status_type_new_with_attrs(
 			PURPLE_STATUS_UNAVAILABLE, "phone", _("On the Phone"), TRUE, TRUE, FALSE,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
-			"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_FULL, _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
 			NULL);
 	types = g_list_append(types, status);
 	status = purple_status_type_new_with_attrs(
 			PURPLE_STATUS_AWAY, "lunch", _("Out to Lunch"), TRUE, TRUE, FALSE,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
-			"currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_FULL, _("Current media"), purple_value_new(PURPLE_TYPE_STRING),
 			NULL);
 	types = g_list_append(types, status);
 
============================================================
--- libpurple/protocols/msn/user.c	2f8ca93ef769c3444be90b1436a4d4f080a3c463
+++ libpurple/protocols/msn/user.c	ebd6b636e437584fcc8c1d8eeb08d9000f9e2210
@@ -94,9 +94,9 @@ msn_user_update(MsnUser *user)
 	if (user->statusline != NULL && user->currentmedia != NULL) {
 		purple_prpl_got_user_status(account, user->passport, user->status,
 		                          "message", user->statusline,
-		                          "currentmedia", user->currentmedia, NULL);
+		                          PURPLE_TUNE_FULL, user->currentmedia, NULL);
 	} else if (user->currentmedia != NULL) {
-		purple_prpl_got_user_status(account, user->passport, user->status, "currentmedia",
+		purple_prpl_got_user_status(account, user->passport, user->status, PURPLE_TUNE_FULL,
 		                          user->currentmedia, NULL);
 	} else if (user->statusline != NULL) {
 		//char *status = g_strdup_printf("%s - %s", user->status, user->statusline);
============================================================
--- libpurple/status.h	cc54b93bc18afdf1a596004732f3abccadabe29f
+++ libpurple/status.h	8b5afd54a79153420dff2e6e0844664bf2f80e83
@@ -121,7 +121,8 @@ typedef enum
 #define PURPLE_TUNE_TRACK	"tune_track"
 #define PURPLE_TUNE_TIME	"tune_time"
 #define PURPLE_TUNE_YEAR	"tune_year"
-#define PURPLE_TUNE_URL	"tune_url"
+#define PURPLE_TUNE_URL		"tune_url"
+#define PURPLE_TUNE_FULL	"tune_full"
 
 #ifdef __cplusplus
 extern "C" {