[gnome-settings-daemon/gnome-3-12] keyboard: Fix consecutive xkb grp: options not being stripped

[Rui Matos <rtcm src gnome org>]

commit 564e4008d4206ac9fb421817e3b5e6e6b0dfd422
Author: Роман Донченко <dpb corrigendum ru>
Date:   Tue Mar 18 18:35:42 2014 +0100

    keyboard: Fix consecutive xkb grp: options not being stripped
    
    https://bugzilla.gnome.org/show_bug.cgi?id=726649

 plugins/keyboard/gsd-keyboard-manager.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index 7e876fe..d8ff930 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -875,8 +875,9 @@ strip_xkb_option (gchar       **options,
                         g_free (*p);
                         *p = options[last];
                         options[last] = NULL;
+                } else {
+                        p += 1;
                 }
-                p += 1;
         }
 }