im.pidgin.pidgin: 1add15394515c75824600c86f6df714bc7017374
khc at pidgin.im
khc at pidgin.im
Sun Nov 4 17:00:49 EST 2007
-----------------------------------------------------------------
Revision: 1add15394515c75824600c86f6df714bc7017374
Ancestor: 6df6c1c77de03ad4f66d5104b6262418260096f2
Author: khc at pidgin.im
Date: 2007-11-04T21:55:35
Branch: im.pidgin.pidgin
Modified files:
libpurple/protocols/msn/msn.c
ChangeLog:
show the idle status on tooltip as well, Fixes #3744
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.c cfe50328c12382d3f1aa93e43e34777760d3469f
+++ libpurple/protocols/msn/msn.c d8fe8bbf843d42762d53820cf618f14834b98021
@@ -580,15 +580,21 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
psm = purple_status_get_attr_string(status, "message");
currentmedia = purple_status_get_attr_string(status, PURPLE_TUNE_FULL);
- if (!purple_presence_is_available(presence)) {
+ if (!purple_status_is_available(status)) {
name = purple_status_get_name(status);
} else {
name = NULL;
}
if (name != NULL && *name) {
- char *tmp2 = g_markup_escape_text(name, -1);
+ char *tmp2;
+ if (purple_presence_is_idle(presence)) {
+ tmp2 = g_markup_printf_escaped("%s/%s", name, _("Idle"));
+ } else {
+ tmp2 = g_markup_escape_text(name, -1);
+ }
+
if (psm != NULL && *psm) {
tmp = g_markup_escape_text(psm, -1);
purple_notify_user_info_add_pair(user_info, tmp2, tmp);
@@ -601,8 +607,20 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
} else {
if (psm != NULL && *psm) {
tmp = g_markup_escape_text(psm, -1);
- purple_notify_user_info_add_pair(user_info, _("Status"), tmp);
+ if (purple_presence_is_idle(presence)) {
+ purple_notify_user_info_add_pair(user_info, _("Idle"), tmp);
+ } else {
+ purple_notify_user_info_add_pair(user_info, _("Status"), tmp);
+ }
g_free(tmp);
+ } else {
+ if (purple_presence_is_idle(presence)) {
+ purple_notify_user_info_add_pair(user_info, _("Status"),
+ _("Idle"));
+ } else {
+ purple_notify_user_info_add_pair(user_info, _("Status"),
+ purple_status_get_name(status));
+ }
}
}
More information about the Commits
mailing list