From c6f151670c6e57cabc7aaa500d55cc10a051b139 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Tue, 10 Nov 2009 00:48:56 +0000 Subject: [PATCH] Enable unknown plugins by default --- src/aweather-gui.c | 13 ++++++++----- src/main.c | 6 +++--- src/plugins/radar.c | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/aweather-gui.c b/src/aweather-gui.c index 47bc5f0..18cc7c8 100644 --- a/src/aweather-gui.c +++ b/src/aweather-gui.c @@ -209,9 +209,9 @@ int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self) static void prefs_setup(AWeatherGui *self) { /* Set values */ - gchar *nu = gis_prefs_get_string (self->prefs, "aweather/nexrad_url"); - gint ll = gis_prefs_get_integer(self->prefs, "aweather/log_level"); - gchar *is = gis_prefs_get_string (self->prefs, "aweather/initial_site"); + gchar *nu = gis_prefs_get_string (self->prefs, "aweather/nexrad_url", NULL); + gint ll = gis_prefs_get_integer(self->prefs, "aweather/log_level", NULL); + gchar *is = gis_prefs_get_string (self->prefs, "aweather/initial_site", NULL); GtkWidget *nuw = aweather_gui_get_widget(self, "prefs_general_url"); GtkWidget *llw = aweather_gui_get_widget(self, "prefs_general_log"); GtkWidget *isw = aweather_gui_get_widget(self, "prefs_general_site"); @@ -351,7 +351,7 @@ static void update_times(AWeatherGui *self, GisView *view, char *site) update_times_gtk(self, times); } else { gchar *path = g_strdup_printf("nexrd2/raw/%s/dir.list", site); - char *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url"); + char *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL); cache_file(base, path, GIS_REFRESH, NULL, update_times_online_cb, self); /* update_times_gtk from update_times_online_cb */ } @@ -480,7 +480,10 @@ static void aweather_gui_init(AWeatherGui *self) self->gtk_plugins = GTK_LIST_STORE(aweather_gui_get_object(self, "plugins")); for (GList *cur = gis_plugins_available(self->plugins); cur; cur = cur->next) { gchar *name = cur->data; - gboolean enabled = gis_prefs_get_boolean_v(self->prefs, cur->data, "enabled"); + GError *error = NULL; + gboolean enabled = gis_prefs_get_boolean_v(self->prefs, cur->data, "enabled", &error); + if (error && error->code == G_KEY_FILE_ERROR_GROUP_NOT_FOUND) + enabled = TRUE; gtk_list_store_append(self->gtk_plugins, &iter); gtk_list_store_set(self->gtk_plugins, &iter, 0, name, 1, enabled, -1); if (enabled) diff --git a/src/main.c b/src/main.c index 09a3bfd..12d14d1 100644 --- a/src/main.c +++ b/src/main.c @@ -82,9 +82,9 @@ int main(int argc, char *argv[]) /* Set up AWeather */ AWeatherGui *gui = aweather_gui_new(); - gint prefs_debug = gis_prefs_get_integer(gui->prefs, "aweather/log_level"); - gchar *prefs_site = gis_prefs_get_string(gui->prefs, "aweather/initial_site"); - gboolean prefs_offline = gis_prefs_get_boolean(gui->prefs, "gis/offline"); + gint prefs_debug = gis_prefs_get_integer(gui->prefs, "aweather/log_level", NULL); + gchar *prefs_site = gis_prefs_get_string(gui->prefs, "aweather/initial_site", NULL); + gboolean prefs_offline = gis_prefs_get_boolean(gui->prefs, "gis/offline", NULL); debug = (opt_debug ?: prefs_debug ?: debug); site = (opt_site ?: prefs_site ?: site); diff --git a/src/plugins/radar.c b/src/plugins/radar.c index 9c76a57..4e65dc2 100644 --- a/src/plugins/radar.c +++ b/src/plugins/radar.c @@ -433,7 +433,7 @@ static void on_time_changed(GisView *view, const char *time, gpointer _self) soup_session_abort(self->soup); self->soup = NULL; } - gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url"); + gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL); if (gis_world_get_offline(self->world)) self->soup = cache_file(base, path, GIS_ONCE, cache_chunk_cb, cache_done_cb, self); -- 2.43.2