Mercurial > pidgin
changeset 17356:043a1139d4e5
Fixes #464
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 28 May 2007 19:08:05 +0000 |
| parents | f7f4d11d4826 |
| children | f9e93d404efc 2284a8aad9ef 51f19b846fc9 |
| files | pidgin/gtkblist.c pidgin/pidginstock.c pidgin/pidginstock.h |
| diffstat | 3 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Mon May 28 18:25:43 2007 +0000 +++ b/pidgin/gtkblist.c Mon May 28 19:08:05 2007 +0000 @@ -3239,7 +3239,7 @@ ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_XA, icon_size, "GtkTreeView"); else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_OFFLINE)) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_OFFLINE, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_OFFLINE_I, icon_size, "GtkTreeView"); else if (purple_presence_is_idle(p) && size == PIDGIN_STATUS_ICON_SMALL) ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE_I, @@ -3413,8 +3413,16 @@ "<span color='%s' size='smaller'>%s</span>", dim_grey(), esc, dim_grey(), statustext != NULL ? statustext : ""); - } - + } else if (!PURPLE_BUDDY_IS_ONLINE(b)) { + if (!selected && !statustext) /* We handle selected text later */ + text = g_strdup_printf("<span color='%s'>%s</span>", dim_grey(), esc); + else if (!selected && !text) + text = g_strdup_printf("<span color='%s'>%s</span>\n" + "<span color='%s' size='smaller'>%s</span>", + dim_grey(), esc, dim_grey(), + statustext != NULL ? statustext : ""); + + } /* Not idle and not selected */ else if (!selected && !text) {
--- a/pidgin/pidginstock.c Mon May 28 18:25:43 2007 +0000 +++ b/pidgin/pidginstock.c Mon May 28 19:08:05 2007 +0000 @@ -109,7 +109,7 @@ { PIDGIN_STOCK_STATUS_XA, "status", "extended-away.png", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, PIDGIN_STOCK_STATUS_XA_I }, { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE , NULL }, - { PIDGIN_STOCK_STATUS_OFFLINE, "status", "offline.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, + { PIDGIN_STOCK_STATUS_OFFLINE, "status", "offline.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I }, { PIDGIN_STOCK_STATUS_PERSON, "status", "person.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_STATUS_MESSAGE, "status", "message-pending.png",TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
--- a/pidgin/pidginstock.h Mon May 28 18:25:43 2007 +0000 +++ b/pidgin/pidginstock.h Mon May 28 19:08:05 2007 +0000 @@ -70,6 +70,7 @@ #define PIDGIN_STOCK_STATUS_LOGIN "pidgin-status-login" #define PIDGIN_STOCK_STATUS_LOGOUT "pidgin-status-logout" #define PIDGIN_STOCK_STATUS_OFFLINE "pidgin-status-offline" +#define PIDGIN_STOCK_STATUS_OFFLINE_I "pidgin-status-offline" #define PIDGIN_STOCK_STATUS_PERSON "pidgin-status-person" #define PIDGIN_STOCK_STATUS_MESSAGE "pidgin-status-message"