Mercurial > pidgin.yaz

changeset 11134:f78e7e982cf4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13195] I find it annoying to see a status message of "OnlineIdle". Separating those two items makes it look better. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Wed, 20 Jul 2005 22:46:41 +0000
parents 1081735edc10
children f2755f58a7da
files src/gtkblist.c
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkblist.c	Wed Jul 20 12:32:20 2005 +0000
+++ b/src/gtkblist.c	Wed Jul 20 22:46:41 2005 +0000
@@ -3206,7 +3206,7 @@
 			imin = ((t - idle_secs) / 60) % 60;
 
 			if (ihrs)
-				idletime = g_strdup_printf(_("Idle (%dh%02dm) "), ihrs, imin);
+				idletime = g_strdup_printf(_("Idle (%dh %02dm) "), ihrs, imin);
 			else
 				idletime = g_strdup_printf(_("Idle (%dm) "), imin);
 		}
@@ -3225,10 +3225,12 @@
 
 	if (gaim_presence_is_idle(presence) && !selected) {
 		text =  g_strdup_printf("<span color='%s'>%s</span>\n"
-					"<span color='%s' size='smaller'>%s%s%s</span>",
+					"<span color='%s' size='smaller'>%s%s%s%s%s</span>",
 					dim_grey(), esc, dim_grey(),
 					statustext != NULL ? statustext : "",
+					(idletime != NULL && statustext != NULL) ? " - " : "",
 					idletime != NULL ? idletime : "",
+					(warning != NULL && (statustext != NULL || idletime != NULL)) ? " - " : "",
 					warning != NULL ? warning : "");
 	} else if (statustext == NULL && idletime == NULL && warning == NULL &&
 			GAIM_BUDDY_IS_ONLINE(b)) {
@@ -3236,16 +3238,20 @@
 	} else {
 		if (selected)
 			text = g_strdup_printf("%s\n"
-					       "<span size='smaller'>%s%s%s</span>", esc,
+					       "<span size='smaller'>%s%s%s%s%s</span>", esc,
 					       statustext != NULL ? statustext :  "",
+					       (idletime != NULL && statustext != NULL) ? " - " : "",
 					       idletime != NULL ? idletime : "",
+					       (warning != NULL && (statustext != NULL || idletime != NULL)) ? " - " : "",
 					       warning != NULL ? warning : "");
 		else
 			text = g_strdup_printf("%s\n"
-					       "<span color='%s' size='smaller'>%s%s%s</span>", esc,
+					       "<span color='%s' size='smaller'>%s%s%s%s%s</span>", esc,
 					       dim_grey(),
 					       statustext != NULL ? statustext :  "",
+					       (idletime != NULL && statustext != NULL) ? " - " : "",
 					       idletime != NULL ? idletime : "",
+					       (warning != NULL && (statustext != NULL || idletime != NULL)) ? " - " : "",
 					       warning != NULL ? warning : "");
 	}
 	if (idletime)