X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fbrowser-switchboard-cp.c;h=66c9bdbe8d0bcb26ec1800c0b120b92986223607;hp=5815d6bdf8688ff8926e409c52d08dc92c11e47e;hb=dac8a265b998707f7b87a53ea3046e62e310a479;hpb=e44bf6f59e50fc7ff2e2a46eb303f85b9fe61c5b diff --git a/config-ui/browser-switchboard-cp.c b/config-ui/browser-switchboard-cp.c index 5815d6b..66c9bdb 100644 --- a/config-ui/browser-switchboard-cp.c +++ b/config-ui/browser-switchboard-cp.c @@ -7,7 +7,6 @@ * Derived from services-cp.c from maemo-control-services * Copyright (c) 2008 Janne Kataja * Copyright (c) 2008 Nokia Corporation - * Contact: integration@maemo.org * * 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 @@ -26,8 +25,10 @@ */ -#include +#include #include +#include +#include #include #include #include @@ -39,6 +40,8 @@ #endif #endif +#include "configfile.h" + struct browser_entry { char *config; char *displayname; @@ -61,27 +64,179 @@ struct config_widgets { struct config_widgets cw; GtkWidget *dialog; + +/********************************************************************** + * Configuration routines + **********************************************************************/ + static inline int get_continuous_mode(void) { return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cw.continuous_mode_check)); } -static inline char * get_default_browser(void) { +static inline void set_continuous_mode(int state) { + return gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cw.continuous_mode_check), (gboolean)state); +} + +static inline char *get_default_browser(void) { return browsers[gtk_combo_box_get_active(GTK_COMBO_BOX(cw.default_browser_combo))].config; } -static inline char * get_other_browser_cmd(void) { +static void set_default_browser(char *browser) { + gint i; + + /* Loop through browsers looking for a match */ + for (i = 0; browsers[i].config && strcmp(browsers[i].config, browser); + ++i); + + if (!browsers[i].config) + /* No match found, set to the default browser */ + i = 0; + + gtk_combo_box_set_active(GTK_COMBO_BOX(cw.default_browser_combo), i); +} + +static inline char *get_other_browser_cmd(void) { return (char *)gtk_entry_get_text(GTK_ENTRY(cw.other_browser_cmd_entry)); } +static inline void set_other_browser_cmd(char *cmd) { + gtk_entry_set_text(GTK_ENTRY(cw.other_browser_cmd_entry), cmd); +} +static void load_config(void) { + FILE *fp; + int continuous_mode_seen = 0; + int default_browser_seen = 0; + int other_browser_cmd_seen = 0; + struct swb_config_line line; + + if (!(fp = open_config_file())) + return; + + /* Parse the config file + TODO: should we handle errors differently than EOF? */ + if (!parse_config_file_begin()) + goto out; + while (!parse_config_file_line(fp, &line)) { + if (line.parsed) { + if (!strcmp(line.key, "continuous_mode")) { + if (!continuous_mode_seen) { + set_continuous_mode(atoi(line.value)); + continuous_mode_seen = 1; + } + } else if (!strcmp(line.key, "default_browser")) { + if (!default_browser_seen) { + set_default_browser(line.value); + default_browser_seen = 1; + } + } 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.key); + free(line.value); + } + parse_config_file_end(); -static inline void close_dialog(void) { - gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_NONE); +out: + fclose(fp); + return; } -static void do_reconfig(void) { - printf("continuous_mode: %d\n", get_continuous_mode()); - printf("default_browser: %s\n", get_default_browser()); - printf("other_browser_cmd: '%s'\n", get_other_browser_cmd()); +static void save_config(void) { + FILE *fp = NULL, *tmpfp = NULL; + char *homedir, *tempfile, *newfile; + size_t len; + int continuous_mode_seen = 0; + int default_browser_seen = 0; + int other_browser_cmd_seen = 0; + struct swb_config_line line; + + /* Put together the path to the new config file and the tempfile */ + if (!(homedir = getenv("HOME"))) + homedir = DEFAULT_HOMEDIR; + len = strlen(homedir) + strlen(CONFIGFILE_LOC) + 1; + if (!(newfile = calloc(len, sizeof(char)))) + return; + /* 4 = strlen(".tmp") */ + if (!(tempfile = calloc(len+4, sizeof(char)))) { + free(newfile); + return; + } + snprintf(newfile, len, "%s%s", homedir, CONFIGFILE_LOC); + snprintf(tempfile, len+4, "%s%s", newfile, ".tmp"); + + /* Open the temporary file for writing */ + if (!(tmpfp = fopen(tempfile, "w"))) + /* TODO: report the error somehow? */ + goto out; + + /* Open the old config file, if it exists */ + if ((fp = open_config_file()) && parse_config_file_begin()) { + /* Copy the old config file over to the new one line by line, + replacing old config values with new ones + TODO: should we handle errors differently than EOF? */ + while (!parse_config_file_line(fp, &line)) { + if (line.parsed) { + /* Is a config line, print the new value here */ + if (!strcmp(line.key, "continuous_mode")) { + if (!continuous_mode_seen) { + fprintf(tmpfp, "%s = %d\n", + line.key, + get_continuous_mode()); + continuous_mode_seen = 1; + } + } else if (!strcmp(line.key, + "default_browser")) { + if (!default_browser_seen) { + fprintf(tmpfp, "%s = \"%s\"\n", + line.key, + get_default_browser()); + default_browser_seen = 1; + } + } else if (!strcmp(line.key, + "other_browser_cmd")) { + if (!other_browser_cmd_seen && + strlen(get_other_browser_cmd())>0) { + fprintf(tmpfp, "%s = \"%s\"\n", + line.key, + get_other_browser_cmd()); + other_browser_cmd_seen = 1; + } + } + } else { + /* Just copy the old line over */ + fprintf(tmpfp, "%s\n", line.key); + } + free(line.key); + free(line.value); + } + parse_config_file_end(); + } - /* TODO: actually implement configuration */ + /* If we haven't written them yet, write out the new config values */ + if (!continuous_mode_seen) + fprintf(tmpfp, "%s = %d\n", + "continuous_mode", get_continuous_mode()); + if (!default_browser_seen) + fprintf(tmpfp, "%s = \"%s\"\n", + "default_browser", get_default_browser()); + if (!other_browser_cmd_seen && strlen(get_other_browser_cmd()) > 0) + fprintf(tmpfp, "%s = \"%s\"\n", + "other_browser_cmd", get_other_browser_cmd()); + + /* Replace the old config file with the new one */ + fclose(tmpfp); + tmpfp = NULL; + rename(tempfile, newfile); + +out: + free(newfile); + free(tempfile); + if (tmpfp) + fclose(tmpfp); + if (fp) + fclose(fp); return; } @@ -99,8 +254,12 @@ static void default_browser_combo_callback(GtkWidget *widget, gpointer data) { } } +static inline void close_dialog(void) { + gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_NONE); +} + static void ok_callback(GtkWidget *widget, gpointer data) { - do_reconfig(); + save_config(); /* TODO: is there any cleanup necessary? */ close_dialog(); } @@ -115,7 +274,7 @@ static void cancel_callback(GtkWidget *widget, gpointer data) { * Interface **********************************************************************/ -static GtkDialog * swb_config_dialog(void) { +static GtkDialog *swb_config_dialog(void) { GtkWidget *dialog_vbox; GtkWidget *options_table; @@ -144,7 +303,7 @@ static GtkDialog * swb_config_dialog(void) { browsers[i].displayname); gtk_combo_box_set_active(GTK_COMBO_BOX(cw.default_browser_combo), 0); default_browser_combo_label = gtk_label_new("Default browser:"); - gtk_misc_set_alignment(GTK_MISC(default_browser_combo_label), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(default_browser_combo_label), 1, 0.5); g_signal_connect(G_OBJECT(cw.default_browser_combo), "changed", G_CALLBACK(default_browser_combo_callback), NULL); gtk_table_attach(GTK_TABLE(options_table), @@ -161,7 +320,7 @@ static GtkDialog * swb_config_dialog(void) { cw.other_browser_cmd_entry = gtk_entry_new(); cw.other_browser_cmd_entry_label = gtk_label_new("Command (%s for URI):"); - gtk_misc_set_alignment(GTK_MISC(cw.other_browser_cmd_entry_label), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(cw.other_browser_cmd_entry_label), 1, 0.5); gtk_widget_set_sensitive(cw.other_browser_cmd_entry, FALSE); gtk_widget_set_sensitive(cw.other_browser_cmd_entry_label, FALSE); gtk_table_attach(GTK_TABLE(options_table), @@ -208,19 +367,17 @@ static GtkDialog * swb_config_dialog(void) { /* * Application was started from control panel. */ -osso_return_t execute(osso_context_t * osso, - gpointer userdata, gboolean user_activated) -{ +osso_return_t execute(osso_context_t *osso, + gpointer userdata, gboolean user_activated) { HildonProgram *program; + GtkDialog *dialog; + program = HILDON_PROGRAM(hildon_program_get_instance()); - if (osso == NULL) return OSSO_ERROR; - data.osso_context = osso; - - /* enable help system on dialog */ - GtkDialog * dialog = GTK_DIALOG(swb_config_dialog()); + dialog = GTK_DIALOG(swb_config_dialog()); + load_config(); gtk_dialog_run(dialog); gtk_widget_destroy(GTK_WIDGET(dialog)); @@ -230,8 +387,7 @@ osso_return_t execute(osso_context_t * osso, /* * Application was started from command line. */ -int main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { GtkDialog *dialog; #ifdef HILDON HildonProgram *program = NULL; @@ -243,9 +399,10 @@ int main(int argc, char *argv[]) g_set_application_name("Browser Switchboard"); dialog = GTK_DIALOG(swb_config_dialog()); + load_config(); gtk_dialog_run(dialog); gtk_widget_destroy(GTK_WIDGET(dialog)); - return 0; + exit(0); } #endif