diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-06 11:56:03 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-06 11:56:03 +0100 |
| commit | 300b484cf6ac14c15e365c4062345d64a61c4b18 (patch) | |
| tree | f10b9abedc141192f5c35f9c0f40e94f1d52786d /gtk2_ardour/gtk_pianokeyboard.c | |
| parent | 7d78172abfd9b02bcb6809db3f7545e90dbe968d (diff) | |
| parent | 2d5e605bf124c82f77a5a893e540bc176164947d (diff) | |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
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 71bef141ca..60f1dc4a81 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 { |