gnome-xkb-info: Don't rely on gsettings to return the full set

of xkb layouts and options.

Being able to only show the most common layouts in the Add Layout
dialog is useful, but Cinnamon's KeyboardManager and cinnamon-
settings should always be working with the full set.

Get rid of checking a setting and just add another constructor
that always returns the full list. The Add Layout dialog can still
use the setting to determine how many layouts it presents to the
user.

Author: mtwebster

debian/libcinnamon-desktop4.symbols

@@ -202,6 +202,7 @@ libcinnamon-desktop.so.4 libcinnamon-desktop4 #MINVER#
  gnome_xkb_info_get_options_for_group@Base 2.0.4
  gnome_xkb_info_get_type@Base 2.0.4
  gnome_xkb_info_new@Base 2.0.4
+ gnome_xkb_info_new_with_extras@Base 6.6.0
  make_display_name@Base 3.8.1
  meta_dbus_display_config_call_apply_configuration@Base 6.2.0
  meta_dbus_display_config_call_apply_configuration_finish@Base 6.2.0

libcinnamon-desktop/gnome-xkb-info.c

@@ -74,6 +74,8 @@ struct _GnomeXkbInfoPrivate
   GHashTable *layouts_by_language;
   GHashTable *layouts_table;
 
+  gboolean include_extras;
+
   /* Only used while parsing */
   XkbOptionGroup *current_parser_group;
   XkbOption *current_parser_option;
@@ -578,8 +580,6 @@ static void
 parse_rules (GnomeXkbInfo *self)
 {
   GnomeXkbInfoPrivate *priv = self->priv;
-  GSettings *settings;
-  gboolean show_all_sources;
   gchar *file_path;
   GError *error = NULL;
 
@@ -610,11 +610,7 @@ parse_rules (GnomeXkbInfo *self)
     goto cleanup;
   g_free (file_path);
 
-  settings = g_settings_new ("org.cinnamon.desktop.input-sources");
-  show_all_sources = g_settings_get_boolean (settings, "show-all-sources");
-  g_object_unref (settings);
-
-  if (!show_all_sources)
+  if (!priv->include_extras)
     return;
 
   file_path = get_xml_rules_file_path (".extras.xml");
@@ -650,6 +646,7 @@ static void
 gnome_xkb_info_init (GnomeXkbInfo *self)
 {
   self->priv = gnome_xkb_info_get_instance_private (self);
+  self->priv->include_extras = FALSE;
 }
 
 static void
@@ -688,6 +685,22 @@ gnome_xkb_info_new (void)
   return g_object_new (GNOME_TYPE_XKB_INFO, NULL);
 }
 
+/**
+ * gnome_xkb_info_new_with_extras:
+ *
+ * Returns: (transfer full): a new #GnomeXkbInfo instance that includes extra layouts and options.
+ */
+GnomeXkbInfo *
+gnome_xkb_info_new_with_extras (void)
+{
+  GnomeXkbInfo *info;
+
+  info = g_object_new (GNOME_TYPE_XKB_INFO, NULL);
+  info->priv->include_extras = TRUE;
+
+  return info;
+}
+
 /**
  * gnome_xkb_info_get_all_layouts:
  * @self: a #GnomeXkbInfo

libcinnamon-desktop/gnome-xkb-info.h

@@ -59,6 +59,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GnomeXkbInfo, g_object_unref)
 
 GType           gnome_xkb_info_get_type                         (void);
 GnomeXkbInfo   *gnome_xkb_info_new                              (void);
+GnomeXkbInfo   *gnome_xkb_info_new_with_extras                  (void);
 GList          *gnome_xkb_info_get_all_layouts                  (GnomeXkbInfo *self);
 gboolean        gnome_xkb_info_get_layout_info                  (GnomeXkbInfo *self,
                                                                  const gchar  *id,