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

[sylvain cresto]

Index: graveman/current/src/main.c
diff -u graveman/current/src/main.c:1.19 graveman/current/src/main.c:1.20
--- graveman/current/src/main.c:1.19    Wed Apr 20 01:00:31 2005
+++ graveman/current/src/main.c Fri Apr 29 18:27:54 2005
@@ -24,20 +24,7 @@
 
 #include "graveman.h"
 
-GladeXML *Gxml = NULL;
-
-
-gboolean graveman_glade_init(gchar *Afilename) {
-  if (!Gxml) {
-    if (!(Gxml = glade_xml_new(Afilename,NULL,NULL))) {
-      g_warning("Error init glade !\n");
-      return FALSE;
-    }
-
-    glade_xml_signal_autoconnect(Gxml);
-  }
-  return TRUE;
-}
+gchar *Glocale = NULL;
 
 /* programme principal ! */
 gint main (gint Aargc, gchar *Aargv[])
@@ -47,15 +34,20 @@
   guint64 Laudiomaxlen = 4800;  /* par defaut, cd audio de 80 minutes */
   guint64 Ldatamaxsize = 700 * 1024 * 1024; /* par defaut, cd de donnee de 700 
Mb */
   guint64 Ldvddatamaxsize = G_GINT64_CONSTANT(4700000000); /* pas default, dvd 
de donnee de 4.7 Gb */
+  gchar *Lcurdomain = NULL;
 
 #ifdef ENABLE_NLS
   bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  textdomain (GETTEXT_PACKAGE);
+  Lcurdomain = textdomain (GETTEXT_PACKAGE);
+  gtk_disable_setlocale();
 #endif
-  if (!graveman_init(Aargc, Aargv)) return EXIT_SUCCESS;
-
   gtk_init (&Aargc, &Aargv);
+#ifdef ENABLE_NLS
+  Glocale = gtk_set_locale();
+#endif
+
+  if (!graveman_init(Aargc, Aargv)) return EXIT_SUCCESS;
 
   /* on regarde si il y a un fichier de configuration present, si non on en
    * genere un nouveau */