im.pidgin.pidgin: f7291f1bd4e5b43f392db211f68193218e2aeba5

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: f7291f1bd4e5b43f392db211f68193218e2aeba5
Ancestor: dc8601b9969978380bddb7a1338085765b9108b6
Author: kstange at pidgin.im
Date: 2007-10-19T03:23:11
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/myspace/myspace.c

ChangeLog: 

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

-------------- next part --------------
============================================================
--- libpurple/protocols/myspace/myspace.c	ff576b5d39896ef47ac232d7e82b837f92865aa6
+++ libpurple/protocols/myspace/myspace.c	124dc2c45e7a0d5f4ec68d0208ace0b77b669f13
@@ -2542,14 +2542,14 @@ msim_status_text(PurpleBuddy *buddy)
 	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)) {
-		display_name = user->display_name;
-	} 
-
-	if (purple_account_get_bool(session->account, "show_headline", FALSE)) {
+	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;
+	} 
+
 	/* Return appropriate combination of display name and/or headline, or neither. */
 
 	if (display_name && headline) {