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
via f29fba2c8392ccd88f83c1cf6482d144a2651d23 (commit)
via c253c5a7c78f6ca35aebc87682e2f7a7d78b8d71 (commit)
via 441145cfc0cbd7dd62208f7cff1378adb343bd81 (commit)
via aa5be46e94b104a1182fbe41c2e6beb01cd41cb9 (commit)
from 1a8316d4c9b7ec60fcb41443f680ffe46d586a9a (commit)
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/f29fba2c8392ccd88f83c1cf6482d144a2651d23
commit f29fba2c8392ccd88f83c1cf6482d144a2651d23
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 12:56:31 2013 +0200
InfoPanel: Added display of memory fragmentation information
This information is displayed only when debug mode was enabled to
avoid confusing users.
diff --git a/src/dialog.c b/src/dialog.c
index 6f1950f..2c2e5d3 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1244,8 +1244,22 @@ void wShowInfoPanel(WScreen * scr)
{
struct mallinfo ma = mallinfo();
snprintf(buffer, sizeof(buffer),
- _("Total memory allocated: %i kB (in use: %i kB).n"),
- (ma.arena + ma.hblkhd) / 1024, (ma.uordblks +
ma.hblkhd) / 1024);
+#ifdef DEBUG
+ _("Total memory allocated: %i kB (in
use: %i kB, %d free chunks).n"),
+#else
+ _("Total memory allocated: %i kB (in
use: %i kB).n"),
+#endif
+ (ma.arena + ma.hblkhd) / 1024,
+ (ma.uordblks + ma.hblkhd) / 1024
+#ifdef DEBUG
+ /*
+ * This information is representative
of the memory
+ * fragmentation. In ideal case it
should be 1, but
+ * that is never possible
+ */
+ , ma.ordblks
+#endif
+ );
strbuf = wstrappend(strbuf, buffer);
}
http://repo.or.cz/w/wmaker-crm.git/commit/c253c5a7c78f6ca35aebc87682e2f7a7d78b8d71
commit c253c5a7c78f6ca35aebc87682e2f7a7d78b8d71
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 12:56:30 2013 +0200
InfoPanel: Use a more user-friendly separator to display supported image
formats
diff --git a/src/dialog.c b/src/dialog.c
index c761f15..6f1950f 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1118,6 +1118,7 @@ void wShowInfoPanel(WScreen * scr)
WMPixmap *logo;
WMFont *font;
char *strbuf = NULL;
+ const char *separator;
char buffer[256];
char *name;
Window parent;
@@ -1252,9 +1253,12 @@ void wShowInfoPanel(WScreen * scr)
strbuf = wstrappend(strbuf, _("Supported image formats: "));
strl = RSupportedFileFormats();
+ separator = NULL;
for (i = 0; strl[i] != NULL; i++) {
+ if (separator != NULL)
+ strbuf = wstrappend(strbuf, separator);
strbuf = wstrappend(strbuf, strl[i]);
- strbuf = wstrappend(strbuf, " ");
+ separator = ", ";
}
strbuf = wstrappend(strbuf, _("nAdditional support for: "));
http://repo.or.cz/w/wmaker-crm.git/commit/441145cfc0cbd7dd62208f7cff1378adb343bd81
commit 441145cfc0cbd7dd62208f7cff1378adb343bd81
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 12:56:29 2013 +0200
InfoPanel: Minor fixes for what must be translated and what does not need to
diff --git a/src/dialog.c b/src/dialog.c
index 3ff0214..c761f15 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1257,7 +1257,8 @@ void wShowInfoPanel(WScreen * scr)
strbuf = wstrappend(strbuf, " ");
}
- strbuf = wstrappend(strbuf, _("nAdditional support for: WMSPEC"));
+ strbuf = wstrappend(strbuf, _("nAdditional support for: "));
+ strbuf = wstrappend(strbuf, "WMSPEC");
#ifdef HAVE_XRANDR
strbuf = wstrappend(strbuf, ", XRandR ");
@@ -1279,7 +1280,7 @@ void wShowInfoPanel(WScreen * scr)
strbuf = wstrappend(strbuf, _("Xinerama: "));
{
char tmp[128];
- snprintf(tmp, sizeof(tmp) - 1, "%d heads found.",
scr->xine_info.count);
+ snprintf(tmp, sizeof(tmp) - 1, _("%d heads found."),
scr->xine_info.count);
strbuf = wstrappend(strbuf, tmp);
}
#endif
http://repo.or.cz/w/wmaker-crm.git/commit/aa5be46e94b104a1182fbe41c2e6beb01cd41cb9
commit aa5be46e94b104a1182fbe41c2e6beb01cd41cb9
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Fri May 10 13:00:23 2013 +0200
InfoPanel: Added info about XRandR in the info dialog
This patch includes info about XRandR extension in the info panel
dialog. If wmaker was compiled with xrandr support, then the dialog
show the XRandR info. The info includes if the X-Server supports or not
XRandR (wmaker could be compiled with XRandR support, but the X Server
may not include XRandR extension).
The string was separated in two by Christophe Curis to allow translation,
as suggested by Alexey I. Froloff.
diff --git a/src/dialog.c b/src/dialog.c
index 7b0b4f2..3ff0214 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1258,8 +1258,17 @@ void wShowInfoPanel(WScreen * scr)
}
strbuf = wstrappend(strbuf, _("nAdditional support for: WMSPEC"));
+
+#ifdef HAVE_XRANDR
+ strbuf = wstrappend(strbuf, ", XRandR ");
+ if (has_randr)
+ strbuf = wstrappend(strbuf, _("(Supported)"));
+ else
+ strbuf = wstrappend(strbuf, _("(Unsupported)"));
+#endif
+
#ifdef MWM_HINTS
- strbuf = wstrappend(strbuf, " and MWM");
+ strbuf = wstrappend(strbuf, ", MWM");
#endif
#ifdef XINERAMA
-----------------------------------------------------------------------
Summary of changes:
src/dialog.c | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
