← Back to branch summary

~ubuntu-branches/ubuntu/utopic/unity-settings-daemon/utopic-proposed

« back to all changes in this revision

Viewing changes to plugins/keyboard/gsd-keyboard-manager.c

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Dmitry Shachnev
  • Date: 2014-04-14 10:13:11 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20140414101311-q5kycpjjph43ta4u
Tags: 14.04.0+14.04.20140414-0ubuntu1
[ Dmitry Shachnev ]
Backport g-s-d patch to fix consecutive xkb grp: options not being
stripped, thanks Роман Донченко.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/keyboard/gsd-keyboard-manager.c
938
938
                        g_free (*p);
939
939
                        *p = options[last];
940
940
                        options[last] = NULL;
 
941
                } else {
 
942
                        p += 1;
941
943
                }
942
 
                p += 1;
943
944
        }
944
945
}
945
946