This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project wmaker-crm.git.
The branch, next has been updated discards dd5185c3a06ada1f7f662d0b273cc514868264f6 (commit) via d5de452547b9c3890142e60253757dd0b14e3fde (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (dd5185c3a06ada1f7f662d0b273cc514868264f6) N -- N -- N (d5de452547b9c3890142e60253757dd0b14e3fde) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/wmaker-crm.git/commit/d5de452547b9c3890142e60253757dd0b14e3fde commit d5de452547b9c3890142e60253757dd0b14e3fde Author: Carlos R. Mafra <crma...@gmail.com> Date: Sun Jan 22 18:04:47 2012 +0000 Info panel: Shorten memory line and simplify code a bit With the fonts I use here, the memory information line in the "Info panel" did not fit inside the window. So make that line a bit shorter by displaying Total memory allocated (used): 2600 kB (2182 kB) instead of Total allocated memory: 2600 kB. Total memory in use: 2182 kB. Furthermore, the surrounding code was a bit convoluted to display either "Additional support for: WMSPEC" or "Additional support for: WMSPEC and MW" As WMSPEC is always present and it doesn't seem we are adding more stuff to support, one can do the same with a shorter code which reads a little bit better. diff --git a/src/dialog.c b/src/dialog.c index 904eac3..acfb777 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1230,7 +1230,7 @@ void wShowInfoPanel(WScreen * scr) { struct mallinfo ma = mallinfo(); snprintf(buffer, sizeof(buffer), - _("Total allocated memory: %i kB. Total memory in use: %i kB.n"), + _("Total memory allocated: %i kB (in use: %i kB).n"), (ma.arena + ma.hblkhd) / 1024, (ma.uordblks + ma.hblkhd) / 1024); strbuf = wstrappend(strbuf, buffer); @@ -1244,30 +1244,11 @@ void wShowInfoPanel(WScreen * scr) strbuf = wstrappend(strbuf, " "); } - strbuf = wstrappend(strbuf, _("nAdditional support for: ")); - { - char *list[9]; - char buf[80]; - int j = 0; - - list[j++] = "WMSPEC"; + strbuf = wstrappend(strbuf, _("nAdditional support for: WMSPEC")); #ifdef MWM_HINTS - list[j++] = "MWM"; + strbuf = wstrappend(strbuf, " and MWM"); #endif - buf[0] = 0; - for (i = 0; i < j; i++) { - if (i > 0) { - if (i == j - 1) - strcat(buf, _(" and ")); - else - strcat(buf, ", "); - } - strcat(buf, list[i]); - } - strbuf = wstrappend(strbuf, buf); - } - #ifdef XINERAMA strbuf = wstrappend(strbuf, _("n")); #ifdef SOLARIS_XINERAMA ----------------------------------------------------------------------- Summary of changes: src/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin crma...@gmail.com if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive no reply. -- wmaker-crm.git ("The Window Maker window manager") -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.