[gnome-system-tools] Fix showing profiles and groups in user settings

[Milan Bouchet-Valat <milanbv src gnome org>]

commit 8db458d8b6f816a0c572c3397897fd5e5ef9a7d9
Author: Milan Bouchet-Valat <nalimilan club fr>
Date:   Sun Aug 16 21:22:23 2009 +0200

    Fix showing profiles and groups in user settings
    
    CellRenderers were not created, thus lists were empty. Remove an unused duplicate function to set groups list from user-settings.c.

 src/users/table.c         |   17 +++++++++++++++--
 src/users/user-settings.c |    9 ---------
 2 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/src/users/table.c b/src/users/table.c
index 6174b45..d9650b9 100644
--- a/src/users/table.c
+++ b/src/users/table.c
@@ -80,9 +80,16 @@ setup_groups_combo (void)
 {
 	GtkWidget *combo = gst_dialog_get_widget (tool->main_dialog, "user_settings_group");
 	GtkWidget *table = gst_dialog_get_widget (tool->main_dialog, "groups_table");
-	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (table));
+	GtkCellRenderer *cell;
+	GtkTreeModel *model;
+
+	cell = gtk_cell_renderer_text_new();
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo), cell, TRUE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT (combo), cell, "text", 0, NULL);
 
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (table));
 	gtk_combo_box_set_model (GTK_COMBO_BOX (combo), model);
+	g_object_unref (model);
 }
 
 static void
@@ -115,8 +122,14 @@ static void
 setup_profiles_combo (void)
 {
 	GtkWidget *combo = gst_dialog_get_widget (tool->main_dialog, "user_settings_profile_menu");
-	GtkTreeModel *model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+	GtkTreeModel *model;
+	GtkCellRenderer *cell;
+
+	cell = gtk_cell_renderer_text_new();
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo), cell, TRUE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT (combo), cell, "text", 0, NULL);
 
+	model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
 	gtk_combo_box_set_model (GTK_COMBO_BOX (combo), model);
 	g_object_unref (model);
 }
diff --git a/src/users/user-settings.c b/src/users/user-settings.c
index fc9c4f7..77c7b91 100644
--- a/src/users/user-settings.c
+++ b/src/users/user-settings.c
@@ -147,15 +147,6 @@ user_delete (GtkTreeModel *model, GtkTreePath *path)
 }
 
 static void
-setup_groups_combo (GtkWidget *widget)
-{
-	GtkWidget *table = gst_dialog_get_widget (tool->main_dialog, "groups_table");
-	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (table));
-
-	gtk_combo_box_set_model (GTK_COMBO_BOX (widget), model);
-}
-
-static void
 set_entry_text (GtkWidget *entry, const gchar *text)
 {
 	gtk_entry_set_text (GTK_ENTRY (entry), (text) ? text : "");