From: Christophe CURIS <[email protected]>
(merge to 5d09a25297e134f6aaf2cfa0a546cfe1cfba708e)
---
src/misc.c | 2 +-
src/xmodifier.c | 4 ++--
src/xmodifier.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/misc.c b/src/misc.c
index 8663ed8..f3ff543 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -738,7 +738,7 @@ char *GetShortcutString(const char *shortcut)
/* get modifiers */
while ((k = strchr(text, '+')) != NULL) {
int mod;
- char *lbl;
+ const char *lbl;
*k = 0;
mod = wXModifierFromKey(text);
diff --git a/src/xmodifier.c b/src/xmodifier.c
index 05ac657..641a8e3 100644
--- a/src/xmodifier.c
+++ b/src/xmodifier.c
@@ -262,7 +262,7 @@ static void x_reset_modifier_mapping(Display * display)
XFreeModifiermap(x_modifier_keymap);
}
-char *wXModifierToShortcutLabel(int mask)
+const char *wXModifierToShortcutLabel(int mask)
{
if (mask < 0)
return NULL;
@@ -286,7 +286,7 @@ char *wXModifierToShortcutLabel(int mask)
if (mask == MetaMask)
return "M+";
- wwarning("Can't convert keymask to shortcut label");
+ wwarning("Can't convert keymask %d to shortcut label", mask);
return NULL;
}
diff --git a/src/xmodifier.h b/src/xmodifier.h
index 757b190..915b113 100644
--- a/src/xmodifier.h
+++ b/src/xmodifier.h
@@ -22,6 +22,6 @@
void wXModifierInitialize(void);
int wXModifierFromKey(const char *key);
-char *wXModifierToShortcutLabel(int mask);
+const char *wXModifierToShortcutLabel(int mask);
#endif /* _XMODIFIER_H_INCLUDED */
--
2.1.1
--
To unsubscribe, send mail to [email protected].
