[gnome-initial-setup: 3/3] Merge branch 'mcatanzaro/uselocale-take-2'

[Will Thompson <wjt src gnome org>]

commit de2a8bf47ec9f60a1f32288170c09efe3fb6ad8a
Merge: 35f6071 83696b5
Author: Will Thompson <wjt endlessm com>
Date:   Mon Apr 15 21:53:58 2019 +0100

    Merge branch 'mcatanzaro/uselocale-take-2'
    
    Closes #53
    
    See merge request GNOME/gnome-initial-setup!36

 .../{pages/language => }/cc-common-language.c      |  30 +-
 .../{pages/region => }/cc-common-language.h        |   3 +-
 gnome-initial-setup/gis-driver.c                   |  66 +++--
 gnome-initial-setup/gis-driver.h                   |   6 +-
 gnome-initial-setup/meson.build                    |   1 +
 .../pages/keyboard/cc-common-language.c            | 304 -------------------
 .../pages/keyboard/cc-common-language.h            |  36 ---
 .../pages/language/cc-common-language.h            |  36 ---
 .../pages/language/gis-language-page.c             |   6 +-
 .../pages/language/gis-welcome-widget.c            |  13 +-
 gnome-initial-setup/pages/language/meson.build     |   2 -
 .../pages/region/cc-common-language.c              | 325 ---------------------
 gnome-initial-setup/pages/region/gis-region-page.c |  12 +-
 13 files changed, 76 insertions(+), 764 deletions(-)
---
diff --cc gnome-initial-setup/gis-driver.c
index 18366b2,6c770d3..c1ccee2
--- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c
@@@ -25,8 -25,8 +25,9 @@@
  
  #include <stdlib.h>
  #include <locale.h>
 +#include <gdm/gdm-client.h>
  
+ #include "cc-common-language.h"
  #include "gis-assistant.h"
  
  #define GIS_TYPE_DRIVER_MODE (gis_driver_mode_get_type ())