Fix misc bugs and bump version to 0.3

diff --git a/Makefile.am b/Makefile.am
index 06abab6b0a376b03fd8dcd83322260d6e3daf354..98042cdbe2d39b687f1c41d215b51fecb0dd4448 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ release: all dist
        git push --all
        echo $(VERSION) > LATEST
        scp LATEST $(PACKAGE)-$(VERSION).tar.* \
-               "lug@lug.rose-hulman.edu:/home/lug/htdocs/proj/$(PACKAGE)"; \
+               "spenceal@lug.rose-hulman.edu:/home/lug/htdocs/proj/$(PACKAGE)"; \
        rm -f LATEST
 
 depscan:

diff --git a/configure.ac b/configure.ac
index d8dfe209eada12f0096ef6e5defbc3b1503bb47f..4b8999cb0f80c6746f5b5640670411035ce113bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Init and options
-AC_INIT([aweather], [0.3-p1], [spenceal@rose-hulman.edu])
+AC_INIT([aweather], [0.3], [spenceal@rose-hulman.edu])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/data/defaults.ini b/data/defaults.ini
index 9c669b28c7686c87feaa72d13577cf3a2947fcf6..4a7701a67cbd9d80c7fd2a2d189f4b44a2398e0f 100644 (file)
--- a/data/defaults.ini
+++ b/data/defaults.ini
@@ -6,11 +6,11 @@ log_level=7
 [gis]
 offline=false
 
-[example]
+[radar]
 enabled=true
 
-[ridge]
-enabled=false
+[bmng]
+enabled=true
 
-[radar]
+[srtm]
 enabled=true

diff --git a/src/Makefile.am b/src/Makefile.am
index 84399d487b3b77ed18c58501a6591e5a6bbfcfee..c955106bbb16b09f19d10b6ac3e9c3e49c5e6187 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ CLEANFILES = gmon.out valgrind.out
 MAINTAINERCLEANFILES = Makefile.in
 
 test: all
-       .libs/aweather -o -d 7 -s KVNX
+       .libs/aweather -o -d 7
 
 gdb: all
        gdb .libs/aweather

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 8edd6938e120d56b6b14972c5051328c3629d8e8..47bc5f009cb4f285b29639b1b987353c35eb3928 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -43,7 +43,7 @@ gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *se
                gint cur_tab  = gtk_notebook_get_current_page(tabs);
                if (event->state & GDK_SHIFT_MASK)
                        gtk_notebook_set_current_page(tabs, (cur_tab-1)%num_tabs);
-               else 
+               else
                        gtk_notebook_set_current_page(tabs, (cur_tab+1)%num_tabs);
        };
        return FALSE;
@@ -337,7 +337,8 @@ static void update_times(AWeatherGui *self, GisView *view, char *site)
        g_debug("AWeatherGui: update_times - site=%s", site);
        if (gis_world_get_offline(self->world)) {
                GList *times = NULL;
-               gchar *path = g_build_filename(g_get_user_cache_dir(), PACKAGE, "nexrd2", "raw", site, NULL);
+               gchar *path = g_build_filename(g_get_user_cache_dir(),
+                               "libgis", "nexrd2", "raw", site, NULL);
                GDir *dir = g_dir_open(path, 0, NULL);
                if (dir) {
                        const gchar *name;
@@ -417,11 +418,13 @@ void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name)
 {
        GisPlugin *plugin = gis_plugins_load(self->plugins, name,
                        self->world, self->view, self->opengl, self->prefs);
-       GtkWidget *config = aweather_gui_get_widget(self, "main_tabs");
-       GtkWidget *tab    = gtk_label_new(name);
-       GtkWidget *body   = gis_plugin_get_config(plugin);
-       gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab);
-       gtk_widget_show_all(config);
+       GtkWidget *body = gis_plugin_get_config(plugin);
+       if (body) {
+               GtkWidget *config = aweather_gui_get_widget(self, "main_tabs");
+               GtkWidget *tab    = gtk_label_new(name);
+               gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab);
+               gtk_widget_show_all(config);
+       }
        gis_opengl_redraw(self->opengl);
 }
 void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name)
@@ -452,7 +455,7 @@ static void aweather_gui_init(AWeatherGui *self)
        g_debug("AWeatherGui: init");
 
        /* Simple things */
-       gchar *config   = g_build_filename(g_get_user_cache_dir(), "config.ini", NULL);
+       gchar *config   = g_build_filename(g_get_user_config_dir(), PACKAGE, "config.ini", NULL);
        gchar *defaults = g_build_filename(PKGDATADIR, "defaults.ini", NULL);
        self->prefs   = gis_prefs_new(config, defaults);
        self->plugins = gis_plugins_new(PLUGINSDIR);