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 fd4d6daaf23ae12c0b257c1975661edd4adc15a2 (commit)
via 5088b6755d1a296ad3899e01fe8095623f7ed660 (commit)
from 35a43c9430442264b62ba4806dc59ac33988db18 (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/fd4d6daaf23ae12c0b257c1975661edd4adc15a2
commit fd4d6daaf23ae12c0b257c1975661edd4adc15a2
Author: David Maciejak <[email protected]>
Date: Wed May 28 12:21:22 2014 +0700
WINGs: fix duplicate if/else branch in W_LookupString
cppcheck is reporting the msg below:
[../WINGs/winputmethod.c:215] -> [../WINGs/winputmethod.c:209]:
(style) Found duplicate branches for 'if' and 'else'.
The patch is fixing it by setting a default return call.
diff --git a/WINGs/winputmethod.c b/WINGs/winputmethod.c
index 7d3aae00..e0c53c62 100644
--- a/WINGs/winputmethod.c
+++ b/WINGs/winputmethod.c
@@ -199,20 +199,15 @@ void W_SetPreeditPositon(W_View * view, int x, int y)
}
}
-int
-W_LookupString(W_View * view, XKeyPressedEvent * event, char *buffer, int
buflen, KeySym * keysym, Status * status)
+int W_LookupString(W_View *view, XKeyPressedEvent *event, char *buffer, int
buflen, KeySym *keysym, Status *status)
{
WMScreen *scr = W_VIEW_SCREEN(view);
XSetInputFocus(scr->display, view->window, RevertToParent, CurrentTime);
- if (view->xic) {
#ifdef X_HAVE_UTF8_STRING
+ if (view->xic)
return Xutf8LookupString(view->xic, event, buffer, buflen,
keysym, status);
-#else
- return XLookupString(event, buffer, buflen, keysym,
(XComposeStatus *) status);
#endif
- } else {
- return XLookupString(event, buffer, buflen, keysym,
(XComposeStatus *) status);
- }
+ return XLookupString(event, buffer, buflen, keysym, (XComposeStatus *)
status);
}
http://repo.or.cz/w/wmaker-crm.git/commit/5088b6755d1a296ad3899e01fe8095623f7ed660
commit 5088b6755d1a296ad3899e01fe8095623f7ed660
Author: Carlos R. Mafra <[email protected]>
Date: Mon May 26 16:54:23 2014 +0100
wmgenmenu: Do not force command line options upon everybody
There are other ways to obtain the same result, e.g. setting the
options in ~/mrxvtrc.
diff --git a/util/wmgenmenu.h b/util/wmgenmenu.h
index 6091ebda..cd9c9cce 100644
--- a/util/wmgenmenu.h
+++ b/util/wmgenmenu.h
@@ -23,8 +23,8 @@
*/
char *Terminals[MAX_NR_APPS][2] = {
- { N_("xterm"), "xterm -bg black -fg white +sb +sm -fn 10x20 -sl 4000
-cr yellow" },
- { N_("mrxvt"), "mrxvt +bt +bc -shade 00 -vb +sb +sm -tr -sl 2000 -trt
-itabbg black -hb -tabfg yellow -fn 10x20 -cr yellow" },
+ { N_("xterm"), "xterm" },
+ { N_("mrxvt"), "mrxvt" },
{ N_("Konsole"), "konsole" },
{ N_("Urxvt"), "urxvt" },
{ NULL, NULL }
-----------------------------------------------------------------------
Summary of changes:
WINGs/winputmethod.c | 11 +++--------
util/wmgenmenu.h | 4 ++--
2 files changed, 5 insertions(+), 10 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].
