diff options
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/mouse.c | 4 | ||||
| -rw-r--r-- | openbox/translate.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/openbox/mouse.c b/openbox/mouse.c index 27172d52..522eba8c 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -311,13 +311,13 @@ gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, GSList *it; if (!translate_button(buttonstr, &state, &button)) { - g_message(_("Invalid button '%s' in pointer binding"), buttonstr); + g_message(_("Invalid button '%s' in mouse binding"), buttonstr); return FALSE; } context = frame_context_from_string(contextstr); if (!context) { - g_message(_("Invalid context '%s' in pointer binding"), contextstr); + g_message(_("Invalid context '%s' in mouse binding"), contextstr); return FALSE; } diff --git a/openbox/translate.c b/openbox/translate.c index 1ef8e7d5..a9ff3e26 100644 --- a/openbox/translate.c +++ b/openbox/translate.c @@ -55,7 +55,7 @@ static guint translate_modifier(gchar *str) !g_ascii_strcasecmp("H", str)) mask = modkeys_key_to_mask(OB_MODKEY_KEY_HYPER); else - g_message(_("Invalid modifier key '%s' in key/pointer binding"), str); + g_message(_("Invalid modifier key '%s' in key/mouse binding"), str); return mask; } @@ -91,10 +91,8 @@ gboolean translate_button(const gchar *str, guint *state, guint *button) else if (!g_ascii_strcasecmp("Up", l)) *button = 4; else if (!g_ascii_strcasecmp("Down", l)) *button = 5; else if (!g_ascii_strncasecmp("Button", l, 6)) *button = atoi(l+6); - if (!*button) { - g_message(_("Invalid button '%s' in pointer binding"), l); + if (!*button) goto translation_fail; - } ret = TRUE; |