X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fbrowser-switchboard-config.c;h=948952f9222995650be726fe01ea82f6616e1d55;hp=01d301fe88a2f3932cf6a22f94d538ea853a6f24;hb=edc54287e04f78e16d546279ca5ed392f07151b4;hpb=717d5e7fb0b84458e74468f0507d6dcfc1ba071d

diff --git a/config-ui/browser-switchboard-config.c b/config-ui/browser-switchboard-config.c
index 01d301f..948952f 100644
--- a/config-ui/browser-switchboard-config.c
+++ b/config-ui/browser-switchboard-config.c
@@ -1,9 +1,9 @@
 /*
  * browser-switchboard-config.c -- command-line configuration utility for
  * Browser Switchboard
- * 
+ *
  * Copyright (C) 2009-2010 Steven Luo
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
@@ -25,9 +25,12 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <getopt.h>
 
 #include "config.h"
+#include "save-config.h"
+#include "browsers.h"
 
 extern struct swb_config_option swb_config_options[];
 
@@ -67,17 +70,52 @@ static int get_config_value(char *name) {
 	return retval;
 }
 
-static int set_config_value(char *name, char *value) {
+static int get_default_browser(void) {
 	struct swb_config cfg;
+	int i;
+
+	swb_config_init(&cfg);
+
+	if (!swb_config_load(&cfg))
+		return 1;
+
+	/* Check to see if the configured default browser is installed
+	   If not, report the default default browser */
+	for (i = 0; browsers[i].config; ++i) {
+		if (strcmp(browsers[i].config, cfg.default_browser))
+			continue;
+
+		if (browsers[i].binary && access(browsers[i].binary, X_OK))
+			printf("%s\n", browsers[0].config);
+		else
+			printf("%s\n", browsers[i].config);
+
+		break;
+	}
+
+	if (!browsers[i].config)
+		/* Unknown browser configured as default, report the default
+		   default browser */
+		printf("%s\n", browsers[0].config);
+
+	swb_config_free(&cfg);
+
+	return 0;
+}
+
+static int set_config_value(char *name, char *value) {
+	struct swb_config orig_cfg, cfg;
 	struct swb_config_option *optinfo;
 	ptrdiff_t i;
 	int retval = 1;
 
-	swb_config_init(&cfg);
+	swb_config_init(&orig_cfg);
 
-	if (!swb_config_load(&cfg))
+	if (!swb_config_load(&orig_cfg))
 		return 1;
 
+	swb_config_copy(&cfg, &orig_cfg);
+
 	for (optinfo = swb_config_options; optinfo->name; ++optinfo) {
 		if (strcmp(name, optinfo->name))
 			continue;
@@ -85,10 +123,6 @@ static int set_config_value(char *name, char *value) {
 		i = optinfo - swb_config_options;
 		switch (optinfo->type) {
 		  case SWB_CONFIG_OPT_STRING:
-			/* Free any existing string */
-			if (cfg.flags & optinfo->set_mask)
-				free(*(char **)cfg.entries[i]);
-
 			if (strlen(value) == 0) {
 				/* If the new value is empty, clear the config
 				   setting */
@@ -122,12 +156,15 @@ static int set_config_value(char *name, char *value) {
 		if (!swb_config_save(&cfg))
 			retval = 1;
 
-	swb_config_free(&cfg);
+	/* Reconfigure a running browser-switchboard, if present */
+	swb_reconfig(&orig_cfg, &cfg);
 
-	/* Try to send SIGHUP to any running browser-switchboard process
-	   This causes it to reread config files if in continuous_mode, or
-	   die so that the config will be reloaded on next start otherwise */
-	system("kill -HUP `pidof browser-switchboard` > /dev/null 2>&1");
+	swb_config_free(&orig_cfg);
+	/* XXX can't free all of cfg, it contains pointers to memory we just
+	   freed above
+	swb_config_free(&cfg); */
+	if (optinfo->type == SWB_CONFIG_OPT_STRING)
+		free(*(char **)cfg.entries[i]);
 
 	return retval;
 }
@@ -194,6 +231,9 @@ int main(int argc, char **argv) {
 			exit(1);
 		}
 		return set_config_value(selected_opt, argv[optind]);
-	} else
+	} else if (!strcmp(selected_opt, "default_browser"))
+		/* Default browser value needs special handling */
+		return get_default_browser();
+	else
 		return get_config_value(selected_opt);
 }