X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fbrowser-switchboard-cp.c;h=b11fd2c9abe99a5172318485e31d5501dbfa4bf5;hp=d4fcc8df3f68d26f9aa005a90d6b42f663170405;hb=667d7d137083b1d65c167ee4b29f88361802247c;hpb=07411630f245c01cfa3cf7ad40e3fa98f9916fba

diff --git a/config-ui/browser-switchboard-cp.c b/config-ui/browser-switchboard-cp.c
index d4fcc8d..b11fd2c 100644
--- a/config-ui/browser-switchboard-cp.c
+++ b/config-ui/browser-switchboard-cp.c
@@ -67,7 +67,6 @@ struct browser_entry browsers[] = {
 	{ "microb", "MicroB (stock browser)" }, /* First entry is the default! */
 	{ "tear", "Tear" },
 	{ "fennec", "Mobile Firefox (Fennec)" },
-	{ "opera", "Opera Mobile" },
 	{ "midori", "Midori" },
 	{ "other", "Other" },
 	{ NULL, NULL },
@@ -175,10 +174,12 @@ static void save_config(void) {
 		new_cfg.default_browser = get_default_browser();
 		new_cfg.flags |= SWB_CONFIG_DEFAULT_BROWSER_SET;
 	}
-	if ((orig_cfg.other_browser_cmd &&
-	     strcmp(get_other_browser_cmd(), orig_cfg.other_browser_cmd)) ||
-	    (!orig_cfg.other_browser_cmd &&
-	     strlen(get_other_browser_cmd()) > 0)) {
+	if (strlen(get_other_browser_cmd()) == 0) {
+		new_cfg.other_browser_cmd = NULL;
+		new_cfg.flags &= ~SWB_CONFIG_OTHER_BROWSER_CMD_SET;
+	} else if (!(orig_cfg.other_browser_cmd &&
+		     !strcmp(get_other_browser_cmd(),
+			     orig_cfg.other_browser_cmd))) {
 		new_cfg.other_browser_cmd = get_other_browser_cmd();
 		new_cfg.flags |= SWB_CONFIG_OTHER_BROWSER_CMD_SET;
 	}