X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fbrowser-switchboard-cp.c;h=a08a0634d96aca90fd3cf5bbfc70cfe5bb2145e5;hp=f0f4e4081b6dd9eb397f39abbf35fd8a293d907e;hb=717d5e7fb0b84458e74468f0507d6dcfc1ba071d;hpb=477b01a24f842c98e8abac56e3fe2ffb3d3a56db

diff --git a/config-ui/browser-switchboard-cp.c b/config-ui/browser-switchboard-cp.c
index f0f4e40..a08a063 100644
--- a/config-ui/browser-switchboard-cp.c
+++ b/config-ui/browser-switchboard-cp.c
@@ -64,7 +64,7 @@ struct browser_entry {
 	char *displayname;
 };
 struct browser_entry browsers[] = {
-	{ "microb", "MicroB" },	/* First entry is the default! */
+	{ "microb", "MicroB (stock browser)" }, /* First entry is the default! */
 	{ "tear", "Tear" },
 	{ "fennec", "Mobile Firefox (Fennec)" },
 	{ "opera", "Opera Mobile" },
@@ -77,7 +77,6 @@ struct swb_config orig_cfg;
 
 struct config_widgets {
 #if defined(HILDON) && defined(FREMANTLE)
-	GtkWidget *continuous_mode_selector;
 	GtkWidget *default_browser_selector;
 #else
 	GtkWidget *continuous_mode_off_radio;
@@ -97,13 +96,6 @@ GtkWidget *dialog;
 
 #if defined(HILDON) && defined(FREMANTLE)
 
-static inline int get_continuous_mode(void) {
-	return hildon_touch_selector_get_active(HILDON_TOUCH_SELECTOR(cw.continuous_mode_selector), 0);
-}
-static inline void set_continuous_mode(int state) {
-	hildon_touch_selector_set_active(HILDON_TOUCH_SELECTOR(cw.continuous_mode_selector), 0, state);
-}
-
 static inline char *get_default_browser(void) {
 	return browsers[hildon_touch_selector_get_active(HILDON_TOUCH_SELECTOR(cw.default_browser_selector), 0)].config;
 }
@@ -156,7 +148,9 @@ static void load_config(void) {
 	
 	swb_config_load(&orig_cfg);
 
+#ifndef FREMANTLE
 	set_continuous_mode(orig_cfg.continuous_mode);
+#endif
 	set_default_browser(orig_cfg.default_browser);
 	if (orig_cfg.other_browser_cmd)
 		set_other_browser_cmd(orig_cfg.other_browser_cmd);
@@ -167,18 +161,22 @@ static void save_config(void) {
 
 	swb_config_copy(&new_cfg, &orig_cfg);
 
+#ifndef FREMANTLE
 	if (get_continuous_mode() != orig_cfg.continuous_mode) {
 		new_cfg.continuous_mode = get_continuous_mode();
 		new_cfg.flags |= SWB_CONFIG_CONTINUOUS_MODE_SET;
 	}
+#endif
 	if (strcmp(get_default_browser(), orig_cfg.default_browser)) {
 		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;
 	}
@@ -230,7 +228,6 @@ static GtkDialog *swb_config_dialog(gpointer cp_window) {
 	GtkWidget *dialog_vbox;
 
 	GtkWidget *default_browser_selector_button;
-	GtkWidget *continuous_mode_selector_button;
 	int i;
 	HildonGtkInputMode input_mode;
 
@@ -279,20 +276,6 @@ static GtkDialog *swb_config_dialog(gpointer cp_window) {
 	gtk_box_pack_start(GTK_BOX(dialog_vbox),
 			   cw.other_browser_cmd_entry_label, FALSE, FALSE, 0);
 
-	cw.continuous_mode_selector = hildon_touch_selector_new_text();
-	hildon_touch_selector_append_text(HILDON_TOUCH_SELECTOR(cw.continuous_mode_selector), "Lower memory usage");
-	hildon_touch_selector_append_text(HILDON_TOUCH_SELECTOR(cw.continuous_mode_selector), "Faster browser startup time");
-
-	continuous_mode_selector_button = hildon_picker_button_new(_HILDON_SIZE_DEFAULT, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
-	hildon_button_set_title(HILDON_BUTTON(continuous_mode_selector_button),
-				"Optimize Browser Switchboard for:");
-	hildon_picker_button_set_selector(HILDON_PICKER_BUTTON(continuous_mode_selector_button), HILDON_TOUCH_SELECTOR(cw.continuous_mode_selector));
-	hildon_button_set_alignment(HILDON_BUTTON(continuous_mode_selector_button),
-				    0, 0, 0, 0);
-	set_continuous_mode(CONTINUOUS_MODE_DEFAULT);
-	gtk_box_pack_start(GTK_BOX(dialog_vbox),
-			   continuous_mode_selector_button, FALSE, FALSE, 0);
-
 	gtk_widget_show_all(dialog);
 	return GTK_DIALOG(dialog);
 }