[Graveman-cvs] Changes to graveman/current/src/charset.c

[sylvain cresto]

Index: graveman/current/src/charset.c
diff -u graveman/current/src/charset.c:1.2 graveman/current/src/charset.c:1.3
--- graveman/current/src/charset.c:1.2  Sun Feb 27 15:45:42 2005
+++ graveman/current/src/charset.c      Sun Feb 27 19:07:44 2005
@@ -336,7 +336,7 @@
 void remplirelistecharset(GtkListStore *Adata, gboolean Aadddef)
 {
   GtkTreeIter Liter;
-  gint i = 0;
+  gint i;
   GSList *Lcur;
   Tdata *Lptr;
 
@@ -346,11 +346,11 @@
     /* ajout premiere ligne "default" */
     gtk_list_store_append(Adata, &Liter);
 
-    gtk_list_store_set(Adata, &Liter, 0, i, 1, GcharsetpetiteIcone, 2,
+    gtk_list_store_set(Adata, &Liter, 0, -1, 1, GcharsetpetiteIcone, 2,
           "DEFAULT", 3, _("Use default character sets"), -1);
   }
 
-  for (Lcur = Gcharsetlist, i=1; Lcur; Lcur = g_slist_next(Lcur), i++) {
+  for (Lcur = Gcharsetlist, i=0; Lcur; Lcur = g_slist_next(Lcur), i++) {
     Lptr = (Tdata *)Lcur->data;
 
     gtk_list_store_append(Adata, &Liter);
@@ -367,16 +367,17 @@
   GtkTreeIter Liter;
   gboolean Lstatus;
   gchar *Lcode;
-  
-  for (Lstatus = gtk_tree_model_get_iter_first(Lmodel, &Liter); Lstatus == 
TRUE && Lselect == FALSE;
-      Lstatus = gtk_tree_model_iter_next(Lmodel, &Liter)) {
-    
-    gtk_tree_model_get(Lmodel, &Liter, 2, &Lcode, -1);
-    if (!strcmp(Lcode, Avalue)) {
-      gtk_combo_box_set_active_iter(Acombo, &Liter);
-      Lselect = TRUE;
+
+  if (Avalue) {
+    for (Lstatus = gtk_tree_model_get_iter_first(Lmodel, &Liter); Lstatus == 
TRUE && Lselect == FALSE;
+        Lstatus = gtk_tree_model_iter_next(Lmodel, &Liter)) {
+      gtk_tree_model_get(Lmodel, &Liter, 2, &Lcode, -1);
+      if (!strcmp(Lcode, Avalue)) {
+        gtk_combo_box_set_active_iter(Acombo, &Liter);
+        Lselect = TRUE;
+      }
+      g_free(Lcode);
     }
-    g_free(Lcode);
   }
 
   if (Lselect == FALSE) {