Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
20995:87c9d114864b | 20996:ec3736fe2e4e |
---|---|
2540 g_return_val_if_fail(MSIM_SESSION_VALID(session), NULL); | 2540 g_return_val_if_fail(MSIM_SESSION_VALID(session), NULL); |
2541 | 2541 |
2542 display_name = headline = NULL; | 2542 display_name = headline = NULL; |
2543 | 2543 |
2544 /* Retrieve display name and/or headline, depending on user preference. */ | 2544 /* Retrieve display name and/or headline, depending on user preference. */ |
2545 if (purple_account_get_bool(session->account, "show_display_name", TRUE)) { | 2545 if (purple_account_get_bool(session->account, "show_headline", TRUE)) { |
2546 headline = user->headline; | |
2547 } | |
2548 | |
2549 if (purple_account_get_bool(session->account, "show_display_name", FALSE)) { | |
2546 display_name = user->display_name; | 2550 display_name = user->display_name; |
2547 } | 2551 } |
2548 | |
2549 if (purple_account_get_bool(session->account, "show_headline", FALSE)) { | |
2550 headline = user->headline; | |
2551 } | |
2552 | 2552 |
2553 /* Return appropriate combination of display name and/or headline, or neither. */ | 2553 /* Return appropriate combination of display name and/or headline, or neither. */ |
2554 | 2554 |
2555 if (display_name && headline) { | 2555 if (display_name && headline) { |
2556 return g_strconcat(display_name, " ", headline, NULL); | 2556 return g_strconcat(display_name, " ", headline, NULL); |