X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fbrowser-switchboard-config.c;h=685a0b048111a06263939bda9ec2a0b3eeeaeee0;hp=c28b7430e2eba3eb985864de41a8bd5c5b0c436b;hb=fd200ff52e139d2180003a8711cbde56dd7e8126;hpb=3cc94f16ef41a2784c4185d52536f0d2e7c6610b;ds=sidebyside

diff --git a/config-ui/browser-switchboard-config.c b/config-ui/browser-switchboard-config.c
index c28b743..685a0b0 100644
--- a/config-ui/browser-switchboard-config.c
+++ b/config-ui/browser-switchboard-config.c
@@ -22,7 +22,6 @@
 
 
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -37,7 +36,7 @@ extern struct swb_config_option swb_config_options[];
 static int get_config_value(char *name) {
 	struct swb_config cfg;
 	struct swb_config_option *optinfo;
-	ptrdiff_t i;
+	void *entry;
 	int retval = 1;
 
 	swb_config_init(&cfg);
@@ -49,14 +48,14 @@ static int get_config_value(char *name) {
 		if (strcmp(name, optinfo->name))
 			continue;
 
-		i = optinfo - swb_config_options;
+		entry = (char *)&cfg + optinfo->offset;
 		switch (optinfo->type) {
 		  case SWB_CONFIG_OPT_STRING:
-			if (*(char **)cfg.entries[i])
-				printf("%s\n", *(char **)cfg.entries[i]);
+			if (*(char **)entry)
+				printf("%s\n", *(char **)entry);
 			break;
 		  case SWB_CONFIG_OPT_INT:
-			printf("%d\n", *(int *)cfg.entries[i]);
+			printf("%d\n", *(int *)entry);
 			break;
 		  default:
 			break;
@@ -106,7 +105,7 @@ static int get_default_browser(void) {
 static int set_config_value(char *name, char *value) {
 	struct swb_config orig_cfg, cfg;
 	struct swb_config_option *optinfo;
-	ptrdiff_t i;
+	void *entry;
 	int retval = 1;
 
 	swb_config_init(&orig_cfg);
@@ -114,24 +113,24 @@ static int set_config_value(char *name, char *value) {
 	if (!swb_config_load(&orig_cfg))
 		return 1;
 
-	swb_config_copy(&cfg, &orig_cfg);
+	cfg = orig_cfg;
 
 	for (optinfo = swb_config_options; optinfo->name; ++optinfo) {
 		if (strcmp(name, optinfo->name))
 			continue;
 
-		i = optinfo - swb_config_options;
+		entry = (char *)&cfg + optinfo->offset;
 		switch (optinfo->type) {
 		  case SWB_CONFIG_OPT_STRING:
 			if (strlen(value) == 0) {
 				/* If the new value is empty, clear the config
 				   setting */
-				*(char **)cfg.entries[i] = NULL;
+				*(char **)entry = NULL;
 				cfg.flags &= ~optinfo->set_mask;
 			} else {
 				/* Make a copy of the string -- it's not safe
 				   to free value, which comes from argv */
-				if (!(*(char **)cfg.entries[i] =
+				if (!(*(char **)entry =
 				      strdup(value)))
 					exit(1);
 				cfg.flags |= optinfo->set_mask;
@@ -143,7 +142,7 @@ static int set_config_value(char *name, char *value) {
 				   setting */
 				cfg.flags &= ~optinfo->set_mask;
 			} else {
-				*(int *)cfg.entries[i] = atoi(value);
+				*(int *)entry = atoi(value);
 				cfg.flags |= optinfo->set_mask;
 			}
 			break;
@@ -164,7 +163,7 @@ static int set_config_value(char *name, char *value) {
 	   freed above
 	swb_config_free(&cfg); */
 	if (optinfo->name && optinfo->type == SWB_CONFIG_OPT_STRING)
-		free(*(char **)cfg.entries[i]);
+		free(*(char **)entry);
 
 	return retval;
 }