X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fbrowser-switchboard-cp.c;h=1b1624298f2cc8a72b72321fe6e4096d2e87cb03;hp=13b0b485e018c359d8d8828429040ab713f44475;hb=81d2b2485ca2a490af7f4bb5d4e2995c35c12915;hpb=d8a6039b1040c422b24d082aa6375fae78016773

diff --git a/config-ui/browser-switchboard-cp.c b/config-ui/browser-switchboard-cp.c
index 13b0b48..1b16242 100644
--- a/config-ui/browser-switchboard-cp.c
+++ b/config-ui/browser-switchboard-cp.c
@@ -67,11 +67,14 @@ struct browser_entry browsers[] = {
 	{ "microb", "MicroB" },	/* First entry is the default! */
 	{ "tear", "Tear" },
 	{ "fennec", "Mobile Firefox (Fennec)" },
+	{ "opera", "Opera Mobile" },
 	{ "midori", "Midori" },
 	{ "other", "Other" },
 	{ NULL, NULL },
 };
 
+char *logger_name = NULL;
+
 struct config_widgets {
 #if defined(HILDON) && defined(FREMANTLE)
 	GtkWidget *continuous_mode_selector;
@@ -169,20 +172,25 @@ static void load_config(void) {
 					set_continuous_mode(atoi(line.value));
 					continuous_mode_seen = 1;
 				}
+				free(line.value);
 			} else if (!strcmp(line.key, "default_browser")) {
 				if (!default_browser_seen) {
 					set_default_browser(line.value);
 					default_browser_seen = 1;
 				}
+				free(line.value);
 			} else if (!strcmp(line.key, "other_browser_cmd")) {
 				if (!other_browser_cmd_seen) {
 					set_other_browser_cmd(line.value);
 					other_browser_cmd_seen = 1;
 				}
+				free(line.value);
+			} else if (!strcmp(line.key, "logging")) {
+				if (!logger_name)
+					logger_name = line.value;
 			}
 		}
 		free(line.key);
-		free(line.value);
 	}
 	parse_config_file_end();
 
@@ -261,6 +269,15 @@ static void save_config(void) {
 							get_other_browser_cmd());
 						other_browser_cmd_seen = 1;
 					}
+				} else if (!strcmp(line.key,
+							"logging")) {
+					if (logger_name) {
+						fprintf(tmpfp, "%s = \"%s\"\n",
+							line.key,
+							logger_name);
+						free(logger_name);
+						logger_name = NULL;
+					}
 				}
 			} else {
 				/* Just copy the old line over */
@@ -282,6 +299,9 @@ static void save_config(void) {
 	if (!other_browser_cmd_seen && strlen(get_other_browser_cmd()) > 0)
 		fprintf(tmpfp, "%s = \"%s\"\n",
 			"other_browser_cmd", get_other_browser_cmd());
+	if (logger_name)
+		fprintf(tmpfp, "%s = \"%s\"\n",
+			"logging", logger_name);
 
 	/* Replace the old config file with the new one */
 	fclose(tmpfp);