Import Upstream version 0.4.2.2

1 files changed, 78 insertions, 77 deletions

diff --git a/hardinfo.c b/hardinfo.c
index ea075f5d..655bf896 100644
--- a/hardinfo.c
+++ b/hardinfo.c
@@ -28,110 +28,111 @@
 
 ProgramParameters params = { 0 };
 
-int
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
     GSList *modules;
-    
+
     DEBUG("HardInfo version " VERSION ". Debug version.");
 
+#ifdef HAS_LIBSOUP
     DEBUG("g_thread_init()");
     if (!g_thread_supported())
-        g_thread_init (NULL);
-    
+	g_thread_init(NULL);
+#endif				/* HAS_LIBSOUP */
+
     /* parse all command line parameters */
     parameters_init(&argc, &argv, &params);
-    
+
     /* show version information and quit */
     if (params.show_version) {
-        g_print("HardInfo version " VERSION "\n");
-        g_print("Copyright (C) 2003-2007 Leandro A. F. Pereira. See COPYING for details.\n\n");
-    
-        g_print("Compile-time options:\n"
-                "  Release version:   %s (%s)\n"
-                "  BinReloc enabled:  %s\n"
-                "  Data prefix:       %s\n"
-                "  Library prefix:    %s\n"
-                "  Compiled on:       %s %s (%s)\n",
-                RELEASE ? "Yes" : "No (" VERSION ")", ARCH,
-                ENABLE_BINRELOC ? "Yes" : "No",
-                PREFIX,
-                LIBPREFIX,
-                PLATFORM, KERNEL, HOSTNAME);
-
-        DEBUG("  Debugging is enabled.");
-       
-        /* show also available modules */      
-        params.list_modules = TRUE;
+	g_print("HardInfo version " VERSION "\n");
+	g_print
+	    ("Copyright (C) 2003-2007 Leandro A. F. Pereira. See COPYING for details.\n\n");
+
+	g_print("Compile-time options:\n"
+		"  Release version:   %s (%s)\n"
+		"  BinReloc enabled:  %s\n"
+		"  Data prefix:       %s\n"
+		"  Library prefix:    %s\n"
+		"  Compiled on:       %s %s (%s)\n",
+		RELEASE ? "Yes" : "No (" VERSION ")", ARCH,
+		ENABLE_BINRELOC ? "Yes" : "No",
+		PREFIX, LIBPREFIX, PLATFORM, KERNEL, HOSTNAME);
+
+	DEBUG("  Debugging is enabled.");
+
+	/* show also available modules */
+	params.list_modules = TRUE;
     }
 
     /* initialize the binreloc library, so we can load program data */
     if (!binreloc_init(FALSE))
-        g_error("Failed to find runtime data.\n\n"
-                "\342\200\242 Is HardInfo correctly installed?\n"
-                "\342\200\242 See if %s and %s exists and you have read permision.",
-                PREFIX, LIBPREFIX);
-    
+	g_error("Failed to find runtime data.\n\n"
+		"\342\200\242 Is HardInfo correctly installed?\n"
+		"\342\200\242 See if %s and %s exists and you have read permision.",
+		PREFIX, LIBPREFIX);
+
     /* list all module names */
     if (params.list_modules) {
-        g_print("Modules:\n"
-                 "%-20s%-15s%-12s\n", "File Name", "Name", "Version");
-        
-        for (modules = modules_load_all(); modules; modules = modules->next) {
-           ShellModule *module = (ShellModule *) modules->data;
-           ModuleAbout *ma = module_get_about(module);
-           gchar *name = g_path_get_basename(g_module_name(module->dll));
-            
-           g_print("%-20s%-15s%-12s\n",
-                   name, module->name, ma->version);
-            
-           g_free(name);
-        }
-        
-        return 0;
+	g_print("Modules:\n"
+		"%-20s%-15s%-12s\n", "File Name", "Name", "Version");
+
+	for (modules = modules_load_all(); modules;
+	     modules = modules->next) {
+	    ShellModule *module = (ShellModule *) modules->data;
+	    ModuleAbout *ma = module_get_about(module);
+	    gchar *name = g_path_get_basename(g_module_name(module->dll));
+
+	    g_print("%-20s%-15s%-12s\n", name, module->name, ma->version);
+
+	    g_free(name);
+	}
+
+	return 0;
     }
 
     if (!params.create_report) {
-        /* we only try to open the UI if the user didn't asked for a 
-           report. */
-        params.gui_running = ui_init(&argc, &argv);
-
-        /* as a fallback, if GTK+ initialization failed, run in report
-           generation mode. */
-        if (!params.gui_running)
-            params.create_report = TRUE;
+	/* we only try to open the UI if the user didn't asked for a 
+	   report. */
+	params.gui_running = ui_init(&argc, &argv);
+
+	/* as a fallback, if GTK+ initialization failed, run in report
+	   generation mode. */
+	if (!params.gui_running)
+	    params.create_report = TRUE;
     }
 
     if (params.use_modules) {
-        /* load only selected modules */
-        DEBUG("loading user-selected modules");
-        modules = modules_load_selected();
+	/* load only selected modules */
+	DEBUG("loading user-selected modules");
+	modules = modules_load_selected();
     } else {
-        /* load all modules */
-        DEBUG("loading all modules");
-        modules = modules_load_all();
+	/* load all modules */
+	DEBUG("loading all modules");
+	modules = modules_load_all();
     }
 
     if (params.gui_running) {
-        /* initialize gui and start gtk+ main loop */        
-        icon_cache_init();
-        stock_icons_init();
-    
-        shell_init(modules);
-        
-        DEBUG("entering gtk+ main loop");
-        gtk_main();
+	/* initialize gui and start gtk+ main loop */
+	icon_cache_init();
+	stock_icons_init();
+
+	shell_init(modules);
+
+	DEBUG("entering gtk+ main loop");
+	gtk_main();
     } else if (params.create_report) {
-        /* generate report */
-        gchar *report;
-        
-        DEBUG("generating report");
-        
-        report = report_create_from_module_list_format(modules,
-                                                       params.report_format);
-        g_print("%s", report);
-        
-        g_free(report);
+	/* generate report */
+	gchar *report;
+
+	DEBUG("generating report");
+
+	report = report_create_from_module_list_format(modules,
+						       params.
+						       report_format);
+	g_print("%s", report);
+
+	g_free(report);
     }
 
     DEBUG("finished");