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 fd4d6daaf23ae12c0b257c1975661edd4adc15a2 (commit)
via db9f5c9658b5b97939fdb01407c2388cb99cc416 (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 (fd4d6daaf23ae12c0b257c1975661edd4adc15a2)
N -- N -- N (db9f5c9658b5b97939fdb01407c2388cb99cc416)
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/db9f5c9658b5b97939fdb01407c2388cb99cc416
commit db9f5c9658b5b97939fdb01407c2388cb99cc416
Author: David Maciejak <david.macie...@gmail.com>
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);
}
-----------------------------------------------------------------------
Summary of changes:
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.
