diff options
| author | Abderrahim Kitouni <a.kitouni@gmail.com> | 2018-12-19 16:23:19 +0000 |
|---|---|---|
| committer | Abderrahim Kitouni <a.kitouni@gmail.com> | 2018-12-19 16:23:19 +0000 |
| commit | e0237266e2f429beb59d22f30d1bf60cd7e62e16 (patch) | |
| tree | cdced1493f6cef01da6ebdd8f7298efdf8bac58c | |
| parent | 86e78a0f09d6fa149d9e33b9ce0772318fe28379 (diff) | |
| parent | 7e0b6f0a96477c5d12434231ea413d3a16658ed0 (diff) | |
| download | libgnomekbd-e0237266e2f429beb59d22f30d1bf60cd7e62e16.tar.gz | |
Merge branch 'abderrahim/strv_equal' into 'master'
rename g_strv_equal to gkbd_strv_equal
See merge request GNOME/libgnomekbd!3
| -rw-r--r-- | libgnomekbd/gkbd-keyboard-config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c index bbe6904..00dc429 100644 --- a/libgnomekbd/gkbd-keyboard-config.c +++ b/libgnomekbd/gkbd-keyboard-config.c @@ -52,7 +52,7 @@ const gchar *GKBD_KEYBOARD_CONFIG_ACTIVE[] = { */ static gboolean -g_strv_equal (gchar ** l1, gchar ** l2) +gkbd_strv_equal (gchar ** l1, gchar ** l2) { if (l1 == l2) return TRUE; @@ -555,7 +555,7 @@ gkbd_keyboard_config_equals (GkbdKeyboardConfig * kbd_config1, (kbd_config2->model != NULL) && g_ascii_strcasecmp (kbd_config1->model, kbd_config2->model)) return False; - if (!g_strv_equal (kbd_config1->layouts_variants, + if (!gkbd_strv_equal (kbd_config1->layouts_variants, kbd_config2->layouts_variants)) return False; |