[GNUnet-SVN] r3607 - in GNUnet: . src/setup/gtk

[durner]

Author: durner
Date: 2006-11-01 13:01:47 -0800 (Wed, 01 Nov 2006)
New Revision: 3607

Modified:
   GNUnet/src/setup/gtk/wizard_gtk.c
   GNUnet/todo
Log:
don't choke on 8-bit characters in network connection names (Windows specific, 
fixes Mantis #0001126)

Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c   2006-11-01 20:27:19 UTC (rev 3606)
+++ GNUnet/src/setup/gtk/wizard_gtk.c   2006-11-01 21:01:47 UTC (rev 3607)
@@ -127,10 +127,17 @@
 static int insert_nic(const char *name,
                       int defaultNIC,
                       void * cls) {
+  gchar *utf8_name;
+  gsize unused;
   struct insert_nic_cls * inc = cls;
   GtkWidget * cmbNIC = inc->cmbNIC;
 
-  gtk_combo_box_append_text(GTK_COMBO_BOX(cmbNIC), name);
+  utf8_name = g_locale_to_utf8(name, -1, NULL, &unused, NULL);
+  if (!utf8_name)
+    utf8_name = strdup(_("(unknown connection)"));
+
+  gtk_combo_box_append_text(GTK_COMBO_BOX(cmbNIC), utf8_name);
+  free(utf8_name);
   defaultNIC = wiz_is_nic_default(editCfg, name, defaultNIC);
   if (defaultNIC)
     gtk_combo_box_set_active(GTK_COMBO_BOX(cmbNIC), inc->nic_item_count);

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-11-01 20:27:19 UTC (rev 3606)
+++ GNUnet/todo 2006-11-01 21:01:47 UTC (rev 3607)
@@ -46,8 +46,6 @@
       - DHT options
       - topology_f2f
       - kvstore
-    + gtk wizard
-       - Mantis #0001126
     + ncurses wizard
 - fix critical known bugs (see Mantis for updates):
   * disk quota violations (#1128) [CG, RCpre0]