diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
commit | e5888d398350b26ba2cdc634cc9791e90b4fc6b6 (patch) | |
tree | 54f485ea56d034ecba01938fbc680b12884fc136 /gtk2_ardour/gtk_pianokeyboard.c | |
parent | 18850253e9f0034fad132e0da07a2651ce041450 (diff) | |
parent | da5a49067839ec32a016bf1b66c3808ad7cbf699 (diff) |
merge with master and fix 2 conflicts
Diffstat (limited to 'gtk2_ardour/gtk_pianokeyboard.c')
-rw-r--r-- | gtk2_ardour/gtk_pianokeyboard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c index 5101bd8aff..a8561cc6bd 100644 --- a/gtk2_ardour/gtk_pianokeyboard.c +++ b/gtk2_ardour/gtk_pianokeyboard.c @@ -33,9 +33,9 @@ #include <assert.h> #include <string.h> -#include <strings.h> #include <stdint.h> #include <cairo/cairo.h> + #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> @@ -740,13 +740,13 @@ piano_keyboard_set_keyboard_layout(PianoKeyboard *pk, const char *layout) { assert(layout); - if (!strcasecmp(layout, "QWERTY")) { + if (!g_strcasecmp(layout, "QWERTY")) { bind_keys_qwerty(pk); - } else if (!strcasecmp(layout, "QWERTZ")) { + } else if (!g_strcasecmp(layout, "QWERTZ")) { bind_keys_qwertz(pk); - } else if (!strcasecmp(layout, "AZERTY")) { + } else if (!g_strcasecmp(layout, "AZERTY")) { bind_keys_azerty(pk); } else { |