[gnome-initial-setup/shell/4765: 33/362] Track selected layouts

[Jasper St. Pierre <jstpierre src gnome org>]

commit a3ae4ca28ef886dde15f76580f3ff1e1eae6ff7c
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Mon May 5 19:40:20 2014 +0200

    Track selected layouts
    
    Track the layouts selected by the user, in order.
    
    If a layout is removed, the last selected one is the new default one.
    
    [endlessm/eos-shell#2044]

 .../pages/keyboard/gis-keyboard-page.c             |   46 ++++++--------------
 1 files changed, 14 insertions(+), 32 deletions(-)
---
diff --git a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c 
b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
index 19c41a2..5346b05 100644
--- a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+++ b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
@@ -69,6 +69,7 @@ struct _GisKeyboardPagePrivate {
         GtkWidget *show_config;
         GtkWidget *show_layout;
         GtkWidget *input_scrolledwindow;
+        GList *selected_input_sorted;
         guint n_input_rows;
         GPid gkbd_pid;
         GPermission *permission;
@@ -108,6 +109,7 @@ gis_keyboard_page_finalize (GObject *object)
                 g_cancellable_cancel (priv->ibus_cancellable);
         g_clear_object (&priv->ibus_cancellable);
         g_clear_pointer (&priv->ibus_engines, g_hash_table_destroy);
+        g_clear_pointer (&priv->selected_input_sorted, g_list_free);
 #endif
 
        G_OBJECT_CLASS (gis_keyboard_page_parent_class)->finalize (object);
@@ -387,6 +389,7 @@ add_input_row (GisKeyboardPage   *self,
 
         gtk_widget_show_all (row);
         gtk_container_add (GTK_CONTAINER (priv->input_list), row);
+        priv->selected_input_sorted = g_list_prepend (priv->selected_input_sorted, row);
 
         g_object_set_data (G_OBJECT (row), "label", label);
         g_object_set_data (G_OBJECT (row), "type", (gpointer)type);
@@ -477,6 +480,7 @@ clear_input_sources (GisKeyboardPage *self)
                 gtk_container_remove (GTK_CONTAINER (priv->input_list), GTK_WIDGET (l->data));
         }
         g_list_free (list);
+        g_clear_pointer (&priv->selected_input_sorted, g_list_free);
 
         priv->n_input_rows = 0;
         adjust_input_list_scrolling (self);
@@ -585,6 +589,10 @@ update_current_input (GisKeyboardPage *self)
                 g_settings_set_uint (priv->input_settings, KEY_CURRENT_INPUT_SOURCE, index);
                 g_settings_apply (priv->input_settings);
                 g_list_free (children);
+
+                /* Put the selected input in the head */
+                priv->selected_input_sorted = g_list_remove (priv->selected_input_sorted, selected);
+                priv->selected_input_sorted = g_list_prepend (priv->selected_input_sorted, selected);
         }
 }
 
@@ -768,36 +776,6 @@ add_input (GisKeyboardPage *self)
         show_input_chooser (self);
 }
 
-static GtkWidget *
-find_sibling (GtkContainer *container, GtkWidget *child)
-{
-        GList *list, *c;
-        GList *l;
-        GtkWidget *sibling;
-
-        list = gtk_container_get_children (container);
-        c = g_list_find (list, child);
-
-        for (l = c->next; l; l = l->next) {
-                sibling = l->data;
-                if (gtk_widget_get_visible (sibling) && gtk_widget_get_child_visible (sibling))
-                        goto out;
-        }
-
-        for (l = c->prev; l; l = l->prev) {
-                sibling = l->data;
-                if (gtk_widget_get_visible (sibling) && gtk_widget_get_child_visible (sibling))
-                        goto out;
-        }
-
-        sibling = NULL;
-
-out:
-        g_list_free (list);
-
-        return sibling;
-}
-
 static void
 do_remove_selected_input (GisKeyboardPage *self)
 {
@@ -809,9 +787,13 @@ do_remove_selected_input (GisKeyboardPage *self)
         if (selected == NULL)
                 return;
 
-        sibling = find_sibling (GTK_CONTAINER (priv->input_list), selected);
+        priv->selected_input_sorted = g_list_delete_link (priv->selected_input_sorted,
+                                                          priv->selected_input_sorted);
         gtk_container_remove (GTK_CONTAINER (priv->input_list), selected);
-        egg_list_box_select_child (EGG_LIST_BOX (priv->input_list), sibling);
+        if (priv->selected_input_sorted)
+                egg_list_box_select_child (EGG_LIST_BOX (priv->input_list), 
priv->selected_input_sorted->data);
+        else
+                egg_list_box_select_child (EGG_LIST_BOX (priv->input_list), NULL);
 
         priv->n_input_rows -= 1;
         adjust_input_list_scrolling (self);