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

[sylvain cresto]

Index: graveman/current/src/mkisofs.c
diff -u graveman/current/src/mkisofs.c:1.13 graveman/current/src/mkisofs.c:1.14
--- graveman/current/src/mkisofs.c:1.13 Sat Feb 26 16:15:40 2005
+++ graveman/current/src/mkisofs.c      Sun Feb 27 03:34:11 2005
@@ -34,9 +34,6 @@
 #define MKISOFS_SUPPORT_ISOV2 "Set ISO9660 conformance level (1..3) or 4 for 
ISO9660 version 2"
 #define MKISOFS_CHARSET "Known charsets are:"
 
-GSList *Gcharsetlist = NULL;
-
-
 /* on verifie si le support iso9660 version 2 est disponnible ou non */
 gboolean check_mkisofs()
 {
@@ -255,10 +252,12 @@
   gboolean Lstatus = TRUE;
   gchar **Lcharsetl;
   gint Lexit = 0, i;
-  Tdata *Ldata;
   gboolean Lajout = FALSE;
+  gchar *Lmkisofs = conf_get_string("mkisofs");
 
-  Lcommandline = g_strdup_printf("%s -input-charset help", 
conf_get_string("mkisofs"));
+  if (!Lmkisofs || !*Lmkisofs) return FALSE;
+
+  Lcommandline = g_strdup_printf("%s -input-charset help", Lmkisofs);
 _DEB("command [%s]", Lcommandline);
   Lstatus = g_spawn_command_line_sync(Lcommandline, &Lout, &Lerr, &Lexit, 
Aerror);
   g_free(Lcommandline);
@@ -275,10 +274,7 @@
 
   for (i=0; Lcharsetl[i] && *Lcharsetl[i]; i++) {
     if (Lajout) {
-      Ldata = g_malloc(sizeof(Tdata));
-      Ldata->data = g_strdup(Lcharsetl[i]);
-      Ldata->label = g_strdup(Lcharsetl[i]);
-      Gcharsetlist = g_slist_append(Gcharsetlist, Ldata);
+      config_append_charset(Lcharsetl[i], (gchar 
*)charset_code_to_label(Lcharsetl[i]));
     } else if (!strncmp(Lcharsetl[i], MKISOFS_CHARSET, 
strlen(MKISOFS_CHARSET))) {
       Lajout = TRUE;
     }
@@ -289,26 +285,6 @@
   return TRUE;
 }
 
-void remplirelistecharset(GtkTreeView *Aliste)
-{
-  GtkListStore *Ldata = GTK_LIST_STORE(gtk_tree_view_get_model(Aliste));
-  GtkTreeIter Liter;
-  gint i;
-  gchar Llabeldevice[50];
-  GSList *Lcur;
-  Tdata *Lptr;
-
-  gtk_list_store_clear(Ldata);
-
-  for (Lcur = Gcharsetlist, i=0; Lcur; Lcur = g_slist_next(Lcur), i++) {
-    Lptr = (Tdata *)Lcur->data;
-
-    gtk_list_store_append(Ldata, &Liter);
-
-    gtk_list_store_set(Ldata, &Liter, 0, i, 1, GcharsetpetiteIcone, 2,
-          Lptr->data, 3, Lptr->label, -1);
-  }
-}
 
 /*
  * vim:et:ts=8:sts=2:sw=2