Integrate static packaing into the CVS HEAD; make it even default.

[captive.git] / src / libcaptive / client / init.c

diff --git a/src/libcaptive/client/init.c b/src/libcaptive/client/init.c
index d3fe353..9e9466c 100644 (file)
--- a/src/libcaptive/client/init.c
+++ b/src/libcaptive/client/init.c
@@ -54,6 +54,7 @@
 #include "captive/macros.h"
 #include "../storage/relastblock.h"    /* for captive_storage_relastblock() */
 #include "../cc/sharedcachemap.h"      /* for captive_shared_cache_map_flush_all() */
+#include "standalone.h"
 
 
 struct captive_options *captive_options;
@@ -327,13 +328,15 @@ gboolean errbool;
                        |G_LOG_LEVEL_DEBUG
                        ));
 
+       g_return_val_if_fail(captive_standalone_init_done==FALSE,FALSE);
        g_return_val_if_fail(active==FALSE,FALSE);
 
        g_return_val_if_fail(captive_options!=NULL,FALSE);
        g_return_val_if_fail(captive_options->image_iochannel!=NULL,FALSE);
 
-       /* Initialize GObject subsystem of GLib. */
-       g_type_init();
+       /* Do not: g_type_init();
+        * as it is done by: captive_standalone_init()
+        */
 
        captive_log_init(captive_options);