Move 'captivemodid' library to libcaptive.

[captive.git] / src / install / acquire / main.c

diff --git a/src/install/acquire/main.c b/src/install/acquire/main.c
index abd4799..a8a2eba 100644 (file)
--- a/src/install/acquire/main.c
+++ b/src/install/acquire/main.c
@@ -42,6 +42,7 @@
 #include "ui-gnome.h"
 
 #include <captive/macros.h>
+#include <captive/client.h>
 
 
 int optarg_verbose;
@@ -116,6 +117,7 @@ static gboolean ui_progress_dummy(GnomeVFSURI *uri)
 }
 
 gboolean (*ui_progress)(GnomeVFSURI *uri)=ui_progress_dummy;
+void (*ui_progress_bar)(gint done,gint length);
 
 static GList *mod_uri_list_local;
 static void mod_uri_list_local_init(void)
@@ -148,12 +150,12 @@ void scan_disks(void)
 
 void microsoft_com(void)
 {
-       g_list_foreach(mod_uri_microsoftcom_list(),(GFunc)mod_uri_load,NULL);
+       g_list_foreach(mod_uri_microsoftcom_list(),(GFunc)mod_uri_load_base_reporting,NULL);
 }
 
 static void scan_batch(void)
 {
-       g_list_foreach(optarg_scan_path_list,(GFunc)mod_uri_load,NULL);
+       g_list_foreach(optarg_scan_path_list,(GFunc)mod_uri_load_base_reporting,NULL);
 
        if (optarg_scan_disks_quick)
                scan_disks_quick();
@@ -198,10 +200,7 @@ gboolean no_gnome;
                        ));
 #endif
 
-       /* Initialize the i18n stuff */
-       setlocale(LC_ALL,"");
-       bindtextdomain(PACKAGE,LOCALEDIR);
-       textdomain(PACKAGE);
+       captive_standalone_init();
 
        if (!gnome_vfs_init())
                g_error(_("GnomeVFS failed to initialize"));
@@ -241,6 +240,7 @@ gboolean no_gnome;
 GnomeProgram *gnome_program;
 guint handler_id;
 
+               captive_standalone_gnome_init();
                gnome_init_atexit_disable=FALSE;
                g_atexit(gnome_init_atexit_handler);
                gnome_init_g_log_handler_hit=FALSE;
@@ -275,15 +275,15 @@ guint handler_id;
                        && ! optarg_microsoft_com);
 
        /* Initialize UI here to catch all GLog errors below. */
-       if (1
+       if (is_interactive
                        && (no_gnome || !ui_gnome_init())
                        && !ui_line_init())
                g_error(_("No UI interface could be initialized"));
 
-       if (!captivemodid_load(optarg_modid_path) && !captivemodid_load("./w32-mod-id.captivemodid.xml"))
+       if (!captive_captivemodid_load(optarg_modid_path) && !captive_captivemodid_load("./w32-mod-id.captivemodid.xml"))
                g_error(_("Unable to load modid database: %s"),optarg_modid_path);
 
-       mod_uri_load(gnome_vfs_uri_new("file://" G_STRINGIFY(VARLIBCAPTIVEDIR)));
+       mod_uri_load_base_reporting(gnome_vfs_uri_new("file://" G_STRINGIFY(VARLIBCAPTIVEDIR)));
 
        if (!is_interactive)
                scan_batch();