gnome-control-center r8918 - trunk/capplets/keyboard

[svu svn gnome org]

Author: svu
Date: Wed Sep  3 21:04:39 2008
New Revision: 8918
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8918&view=rev

Log:
chosing first variant by default, #550722

Modified:
   trunk/capplets/keyboard/ChangeLog
   trunk/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c	Wed Sep  3 21:04:39 2008
@@ -226,6 +226,7 @@
 
 	gtk_combo_box_set_model (GTK_COMBO_BOX (cbv),
 				 GTK_TREE_MODEL (list_store));
+	gtk_combo_box_set_active (GTK_COMBO_BOX (cbv), 0);
 }
 
 static void
@@ -235,8 +236,7 @@
 	GtkWidget *cbl = CWID ("xkb_countries_available");
 	GtkWidget *cbv = CWID ("xkb_country_variants_available");
 	GtkListStore *list_store;
-	GtkTreeIter liter, vdefault_iter;
-	gboolean set_default = FALSE;
+	GtkTreeIter liter;
 
 	list_store = gtk_list_store_new
 	    (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
@@ -267,12 +267,7 @@
 
 	gtk_combo_box_set_model (GTK_COMBO_BOX (cbv),
 				 GTK_TREE_MODEL (list_store));
-
-	/* Select the default variant */
-	if (set_default) {
-		gtk_combo_box_set_active_iter (GTK_COMBO_BOX
-					       (cbv), &vdefault_iter);
-	}
+	gtk_combo_box_set_active (GTK_COMBO_BOX (cbv), 0);
 }
 
 static void