diff libpurple/protocols/myspace/myspace.c @ 20996:ec3736fe2e4e

There's an #ifdef in MSIM which, if enabled, allows the user to specify which information should be show in the status line. By default it shows the buddy's server-side alias, which is contrary to Pidgin's default use of this line, and the code to allow configuration is also off by default. This makes the "Headline" which is effectively your status message display by default instead. Fixes #3064
author Kevin Stange <kevin@simguy.net>
date Fri, 19 Oct 2007 03:23:11 +0000
parents aee8d876fed1
children 89c7be36fd61
line wrap: on
line diff
--- a/libpurple/protocols/myspace/myspace.c	Fri Oct 19 03:05:58 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Fri Oct 19 03:23:11 2007 +0000
@@ -2542,14 +2542,14 @@
 	display_name = headline = NULL;
 
 	/* Retrieve display name and/or headline, depending on user preference. */
-	if (purple_account_get_bool(session->account, "show_display_name", TRUE)) {
+	if (purple_account_get_bool(session->account, "show_headline", TRUE)) {
+		headline = user->headline;
+	}
+
+	if (purple_account_get_bool(session->account, "show_display_name", FALSE)) {
 		display_name = user->display_name;
 	} 
 
-	if (purple_account_get_bool(session->account, "show_headline", FALSE)) {
-		headline = user->headline;
-	}
-
 	/* Return appropriate combination of display name and/or headline, or neither. */
 
 	if (display_name && headline) {