X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=main.c;h=30361c866563a6fbe3f14429d1611224abadc419;hp=545f9f2c25fd14d33379e3a78e53bac35a5dfb1f;hb=bf130a22e50fa0de2a13485016635a90a3b0861a;hpb=846e68b8ffa979d30ed331c43020212ffdee2bf2

diff --git a/main.c b/main.c
index 545f9f2..30361c8 100644
--- a/main.c
+++ b/main.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <dbus/dbus-glib.h>
@@ -30,87 +31,46 @@
 #include "browser-switchboard.h"
 #include "launcher.h"
 #include "dbus-server-bindings.h"
-#include "configfile.h"
+#include "config.h"
 #include "log.h"
 
 struct swb_context ctx;
 
-static void set_config_defaults(struct swb_context *ctx) {
-	if (!ctx)
-		return;
-	free(ctx->other_browser_cmd);
-	ctx->continuous_mode = 0;
-	ctx->default_browser_launcher = NULL;
-	ctx->other_browser_cmd = NULL;
-}
-
 static void waitforzombies(int signalnum) {
 	while (waitpid(-1, NULL, WNOHANG) > 0)
 		log_msg("Waited for a zombie\n");
 }
 
 static void read_config(int signalnum) {
-	FILE *fp;
-	int continuous_mode_seen = 0;
-	struct swb_config_line line;
-	char *default_browser = NULL, *logger_name = NULL;
-
-	set_config_defaults(&ctx);
-
-	if (!(fp = open_config_file()))
-		goto out_noopen;
-
-	/* Parse the config file
-	   TODO: should we handle errors differently than EOF? */
-	if (!parse_config_file_begin())
-		goto out;
-	while (!parse_config_file_line(fp, &line)) {
-		if (line.parsed) {
-			if (!strcmp(line.key, "continuous_mode")) {
-				if (!continuous_mode_seen) {
-					ctx.continuous_mode = atoi(line.value);
-					continuous_mode_seen = 1;
-				}
-				free(line.value);
-			} else if (!strcmp(line.key, "default_browser")) {
-				if (!default_browser)
-					default_browser = line.value;
-			} else if (!strcmp(line.key, "other_browser_cmd")) {
-				if (!ctx.other_browser_cmd)
-					ctx.other_browser_cmd = line.value;
-			} else if (!strcmp(line.key, "logging")) {
-				if (!logger_name)
-					logger_name = line.value;
-			} else {
-				/* Don't need this line's contents */
-				free(line.value);
-			}
-		}
-		free(line.key);
-	}
-	parse_config_file_end();
+	struct swb_config cfg;
 
-out:
-	fclose(fp);
-out_noopen:
-	log_config(logger_name);
-	update_default_browser(&ctx, default_browser);
+	swb_config_init(&cfg);
 
-	log_msg("continuous_mode: %d\n", ctx.continuous_mode);
-	log_msg("default_browser: '%s'\n",
-		default_browser?default_browser:"NULL");
+	swb_config_load(&cfg);
+
+	log_config(cfg.logging);
+	ctx.continuous_mode = cfg.continuous_mode;
+	if (cfg.other_browser_cmd) {
+		if (!(ctx.other_browser_cmd = strdup(cfg.other_browser_cmd))) {
+			log_perror(errno, "Failed to set other_browser_cmd");
+			exit(1);
+		}
+	} else
+		ctx.other_browser_cmd = NULL;
+	update_default_browser(&ctx, cfg.default_browser);
+
+	log_msg("continuous_mode: %d\n", cfg.continuous_mode);
+	log_msg("default_browser: '%s'\n", cfg.default_browser);
 	log_msg("other_browser_cmd: '%s'\n",
-		ctx.other_browser_cmd?ctx.other_browser_cmd:"NULL");
-	log_msg("logging: '%s'\n",
-		logger_name?logger_name:"NULL");
+		cfg.other_browser_cmd?cfg.other_browser_cmd:"NULL");
+	log_msg("logging: '%s'\n", cfg.logging);
 
-	free(logger_name);
-	free(default_browser);
+	swb_config_free(&cfg);
 	return;
 }
 
 int main() {
-	OssoBrowser *obj_osso_browser, *obj_osso_browser_req, *obj_switchboard;
+	OssoBrowser *obj_osso_browser, *obj_osso_browser_req;
 	GMainLoop *mainloop;
 	GError *error = NULL;
 	int reqname_result;
@@ -157,14 +117,14 @@ int main() {
 		return 1;
 	}
 
-	/* Get the org.maemo.garage.browser_switchboard name from D-Bus, as
+	/* Get the org.maemo.garage.browser-switchboard name from D-Bus, as
 	   a form of locking to ensure that not more than one
 	   browser-switchboard process is active at any time.  With
 	   DBUS_NAME_FLAG_DO_NOT_QUEUE set and DBUS_NAME_FLAG_REPLACE_EXISTING
 	   not set, getting the name succeeds if and only if no other
 	   process owns the name. */
 	if (!dbus_g_proxy_call(ctx.dbus_proxy, "RequestName", &error,
-			       G_TYPE_STRING, "org.maemo.garage.browser_switchboard",
+			       G_TYPE_STRING, "org.maemo.garage.browser-switchboard",
 			       G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE,
 			       G_TYPE_INVALID,
 			       G_TYPE_UINT, &reqname_result,
@@ -183,15 +143,11 @@ int main() {
 	/* Register ourselves to handle the osso_browser D-Bus methods */
 	obj_osso_browser = g_object_new(OSSO_BROWSER_TYPE, NULL);
 	obj_osso_browser_req = g_object_new(OSSO_BROWSER_TYPE, NULL);
-	obj_switchboard = g_object_new(OSSO_BROWSER_TYPE, NULL);
 	dbus_g_connection_register_g_object(ctx.session_bus,
 			"/com/nokia/osso_browser", G_OBJECT(obj_osso_browser));
 	dbus_g_connection_register_g_object(ctx.session_bus,
 			"/com/nokia/osso_browser/request",
 			G_OBJECT(obj_osso_browser_req));
-	dbus_g_connection_register_g_object(ctx.session_bus,
-			"/org/maemo/garage/browser_switchboard",
-			G_OBJECT(obj_switchboard));
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	log_msg("Starting main loop\n");