From 678a6fa08ee7cdc98a631b9b6a6fef87be63deab Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Thu, 28 May 2009 02:23:52 +0000 Subject: [PATCH] compiler fixes --- configure.ac | 2 +- src/data.c | 10 +++++++--- src/main.c | 8 ++++---- src/plugin-radar.c | 3 ++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index a40bc83..1bd02f5 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ PKG_PROG_PKG_CONFIG GTK_DOC_CHECK(1.9) # Check for required packages -PKG_CHECK_MODULES(GTK, gtk+-2.0 gtkglext-1.0 gmodule-export-2.0 gobject-2.0 gthread-2.0) +PKG_CHECK_MODULES(GTK, gtk+-2.0 gtkglext-1.0 gio-2.0 gmodule-export-2.0 gobject-2.0 gthread-2.0) # Define odd RSL install location #AC_SUBST(RSL_CFLAGS, "-I/usr/local/trmm/GVBOX/include/") diff --git a/src/data.c b/src/data.c index 7a881bd..d57a8c7 100644 --- a/src/data.c +++ b/src/data.c @@ -45,13 +45,14 @@ static goffset g_file_get_size(GFile *file) static void cache_file_cb(GObject *source_object, GAsyncResult *res, gpointer _info) { + g_debug("data: cache_file_cb"); cache_file_end_t *info = _info; char *url = g_file_get_path(info->src); char *local = g_file_get_path(info->dst); GError *error = NULL; g_file_copy_finish(G_FILE(source_object), res, &error); if (error) { - g_warning("error copying file ([%s]->[%s]): %s", + g_warning("data: error copying file ([%s]->[%s]): %s", url, local, error->message); g_error_free(error); } else { @@ -72,8 +73,11 @@ static void do_cache(GFile *src, GFile *dst, char *reason, g_free(name); GFile *parent = g_file_get_parent(dst); - if (!g_file_query_exists(parent, NULL)) - g_file_make_directory_with_parents(parent, NULL, NULL); + if (!g_file_query_exists(parent, NULL)) { + char *path = g_file_get_path(parent); + g_mkdir_with_parents(path, 0755); + g_free(path); + } g_object_unref(parent); cache_file_end_t *info = g_malloc0(sizeof(cache_file_end_t)); diff --git a/src/main.c b/src/main.c index cdd97e6..5466283 100644 --- a/src/main.c +++ b/src/main.c @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) gtk_gl_init(&argc, &argv); /* Finish arguments */ - log_levels = 1 << opt_debug; + log_levels = (1 << (opt_debug+1))-1; /* Logging */ g_log_set_handler(NULL, G_LOG_LEVEL_MASK, log_func, NULL); @@ -79,9 +79,9 @@ int main(int argc, char *argv[]) g_signal_connect(gui, "map-event", G_CALLBACK(on_map), opt_site); /* Load plugins */ - //aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_example_new(gui))); - //aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_ridge_new(gui))); - //aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_radar_new(gui))); + aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_example_new(gui))); + aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_ridge_new(gui))); + aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_radar_new(gui))); gtk_widget_show_all(GTK_WIDGET(gui)); gtk_main(); diff --git a/src/plugin-radar.c b/src/plugin-radar.c index 1d4706e..6284c4e 100644 --- a/src/plugin-radar.c +++ b/src/plugin-radar.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -154,7 +155,7 @@ static void load_radar_gui(AWeatherRadar *self, Radar *radar) gdouble elev; guint rows = 1, cols = 1, cur_cols; gchar row_label_str[64], col_label_str[64], button_str[64]; - GtkWidget *row_label, *col_label, *button = NULL, *elev_box; + GtkWidget *row_label, *col_label, *button = NULL, *elev_box = NULL; GtkWidget *table = gtk_table_new(rows, cols, FALSE); for (guint vi = 0; vi < radar->h.nvolumes; vi++) { -- 2.43.2