From: Andy Spencer <andy753421@gmail.com>
Date: Sat, 24 Oct 2009 19:00:32 +0000 (+0000)
Subject: adding default settings
X-Git-Tag: v0.2.3~2
X-Git-Url: http://pileus.org/git/?p=aweather;a=commitdiff_plain;h=d490a6f9ed274a81907c7dc20426ae9e97588df3

adding default settings

Conflicts:

	data/Makefile.am
	data/main.ui
---

diff --git a/data/Makefile.am b/data/Makefile.am
index dec4144..6aa6e4f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,9 @@
 gtkbuilderdir = $(datadir)/aweather/
 dist_gtkbuilder_DATA = main.ui
 
+configdir = $(datadir)/aweather/
+dist_config_DATA = defaults.ini
+
 desktopdir = $(datadir)/applications
 dist_desktop_DATA = aweather.desktop
 
diff --git a/data/defaults.ini b/data/defaults.ini
new file mode 100644
index 0000000..085cd4f
--- /dev/null
+++ b/data/defaults.ini
@@ -0,0 +1,16 @@
+[aweather]
+initial_site=KIND
+nexrad_url=http://mesonet.agron.iastate.edu/data/
+log_level=7
+
+[gis]
+offline=false
+
+[example]
+enabled=true
+
+[ridge]
+enabled=true
+
+[radar]
+enabled=true
diff --git a/src/gis/Makefile.am b/src/gis/Makefile.am
index 5dc04a5..fb12f5e 100644
--- a/src/gis/Makefile.am
+++ b/src/gis/Makefile.am
@@ -19,8 +19,11 @@ libgis_la_SOURCES = \
 	gis-plugin.c  gis-plugin.h \
 	gis-data.c    gis-data.h   \
 	gis-marshal.c gis-marshal.h
-libgis_la_CPPFLAGS = -DPLUGINDIR="\"$(libdir)/gis\"" $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
-libgis_la_LIBADD = $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+libgis_la_CPPFLAGS = \
+	-DDATADIR="\"$(datadir)\"" -DPLUGINDIR="\"$(libdir)/gis\"" \
+	$(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+libgis_la_LIBADD = \
+	$(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgis.pc
diff --git a/src/gis/gis-prefs.c b/src/gis/gis-prefs.c
index 2b3829a..ea3f05a 100644
--- a/src/gis/gis-prefs.c
+++ b/src/gis/gis-prefs.c
@@ -94,9 +94,27 @@ GisPrefs *gis_prefs_new(const gchar *prog)
 	GError *error = NULL;
 	g_key_file_load_from_file(self->key_file, self->key_path,
 			G_KEY_FILE_KEEP_COMMENTS, &error);
-	if (error)
-		g_warning("GisPrefs: init - Unable to load key file `%s': %s",
+	if (error) {
+		g_debug("GisPrefs: new - Trying %s defaults", prog);
+		g_clear_error(&error);
+		gchar *tmp = g_build_filename(DATADIR, prog, "defaults.ini", NULL);
+		g_key_file_load_from_file(self->key_file, tmp,
+				G_KEY_FILE_KEEP_COMMENTS, &error);
+		g_free(tmp);
+	}
+	if (error) {
+		g_debug("GisPrefs: new - Trying GIS defaults");
+		g_clear_error(&error);
+		gchar *tmp = g_build_filename(DATADIR, "gis", "defaults.ini", NULL);
+		g_key_file_load_from_file(self->key_file, tmp,
+				G_KEY_FILE_KEEP_COMMENTS, &error);
+		g_free(tmp);
+	}
+	if (error) {
+		g_clear_error(&error);
+		g_warning("GisPrefs: new - Unable to load key file `%s': %s",
 			self->key_path, error->message);
+	}
 	return self;
 }