gtkbuilderdir = $(datadir)/aweather/
dist_gtkbuilder_DATA = main.ui
+configdir = $(datadir)/aweather/
+dist_config_DATA = defaults.ini
+
desktopdir = $(datadir)/applications
dist_desktop_DATA = aweather.desktop
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
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;
}