X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fbrowser-switchboard-config.c;h=c28b7430e2eba3eb985864de41a8bd5c5b0c436b;hp=752725e1dc428e60a64b1d5992671be959c8db38;hb=refs%2Fheads%2Fdiablo-package;hpb=57b70bf816859abf1de95d4570bcc1b75983b7d9

diff --git a/config-ui/browser-switchboard-config.c b/config-ui/browser-switchboard-config.c
index 752725e..c28b743 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)
@@ -29,6 +29,7 @@
 #include <getopt.h>
 
 #include "config.h"
+#include "save-config.h"
 #include "browsers.h"
 
 extern struct swb_config_option swb_config_options[];
@@ -103,16 +104,18 @@ static int get_default_browser(void) {
 }
 
 static int set_config_value(char *name, char *value) {
-	struct swb_config cfg;
+	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;
@@ -120,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 */
@@ -157,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->name && optinfo->type == SWB_CONFIG_OPT_STRING)
+		free(*(char **)cfg.entries[i]);
 
 	return retval;
 }