Author: grothoff
Date: 2006-05-21 09:43:42 -0700 (Sun, 21 May 2006)
New Revision: 2877
Modified:
GNUnet/src/conf/gconf.c
GNUnet/src/conf/wizard_gtk.c
Log:
fix
Modified: GNUnet/src/conf/gconf.c
===================================================================
--- GNUnet/src/conf/gconf.c 2006-05-20 18:04:09 UTC (rev 2876)
+++ GNUnet/src/conf/gconf.c 2006-05-21 16:43:42 UTC (rev 2877)
@@ -1610,27 +1610,9 @@
}
-/* Main */
-
-
-int gconf_main(int argc,
- char **argv,
- void * lib) {
- char * filename;
-
+int gconf_main_post_init(void * lib) {
setLibrary(lib);
- g_thread_init(NULL);
- gtk_init(&argc, &argv);
-#if ENABLE_NLS
- bind_textdomain_codeset(PACKAGE, "UTF-8"); /* for gtk */
-#endif
-#ifdef WINDOWS
- FreeConsole();
-#endif
- /* add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); */
- /* add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps"); */
-
/* Load the interface and connect signals */
init_main_window();
init_tree_model();
@@ -1659,5 +1641,26 @@
gdk_threads_leave();
destroyMainXML();
setLibrary(NULL);
+}
+
+
+/* Main */
+int gconf_main(int argc,
+ char **argv,
+ void * lib) {
+ char * filename;
+
+ g_thread_init(NULL);
+ gtk_init(&argc, &argv);
+#if ENABLE_NLS
+ bind_textdomain_codeset(PACKAGE, "UTF-8"); /* for gtk */
+#endif
+#ifdef WINDOWS
+ FreeConsole();
+#endif
+
+ /* add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); */
+ /* add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps"); */
+ gconf_main_post_init(lib);
return 0;
}
Modified: GNUnet/src/conf/wizard_gtk.c
===================================================================
--- GNUnet/src/conf/wizard_gtk.c 2006-05-20 18:04:09 UTC (rev 2876)
+++ GNUnet/src/conf/wizard_gtk.c 2006-05-21 16:43:42 UTC (rev 2877)
@@ -674,10 +674,10 @@
gtk_main();
gdk_threads_leave();
destroyMainXML();
- setLibrary(NULL);
if (doOpenEnhConfigurator)
- gconf_main(argc, argv, lib);
+ gconf_main_post_init(lib);
FREENONNULL(user_name);
FREENONNULL(group_name);
+ setLibrary(NULL);
return 0;
}
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
