[gnome-initial-setup: 6/6] Merge branch '85-gnome-intial-setup-segfaults-possibly-due-to-locale-related-problems' into 'master'

[Will Thompson <wjt src gnome org>]

commit 34876df662f55507a3a5856b3090bee983dd157e
Merge: 44ff4f9 b21ac5f
Author: Will Thompson <will willthompson co uk>
Date:   Fri Nov 29 06:25:02 2019 +0000

    Merge branch '85-gnome-intial-setup-segfaults-possibly-due-to-locale-related-problems' into 'master'
    
    language: don't crash if sort_key is NULL
    
    Closes #85
    
    See merge request GNOME/gnome-initial-setup!62

 gnome-initial-setup/cc-common-language.c                   | 11 ++++++++++-
 gnome-initial-setup/pages/account/gis-account-page-local.c |  2 +-
 gnome-initial-setup/pages/keyboard/cc-input-chooser.c      |  8 +++++---
 gnome-initial-setup/pages/language/cc-language-chooser.c   | 14 ++++++++++++--
 gnome-initial-setup/pages/language/gis-welcome-widget.c    |  6 +++++-
 5 files changed, 33 insertions(+), 8 deletions(-)
---