fixing bug with changing sites on remap

[grits] / src / main.c

diff --git a/src/main.c b/src/main.c
index d1b13b38ec9eb4ba0e3f116e13d457874bb8fd37..4923b3732045b6e9a18922f625e056c85268738a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -33,10 +33,12 @@ static void log_func(const gchar *log_domain, GLogLevelFlags log_level,
                g_log_default_handler(log_domain, log_level, message, udata);
 }
 
+static gulong on_map_id = 0;
 static gboolean on_map(AWeatherGui *gui, GdkEvent *event, gchar *site)
 {
        AWeatherView *view = aweather_gui_get_view(gui);
        aweather_view_set_site(view, site);
+       g_signal_handler_disconnect(gui, on_map_id);
        return FALSE;
 }
 
@@ -46,14 +48,16 @@ static gboolean on_map(AWeatherGui *gui, GdkEvent *event, gchar *site)
 int main(int argc, char *argv[])
 {
        /* Arguments */
-       gint     opt_debug = 6;
-       gchar   *opt_site  = "IND";
-       gboolean opt_auto  = FALSE;
+       gint     opt_debug   = 6;
+       gchar   *opt_site    = "KIND";
+       gboolean opt_auto    = FALSE;
+       gboolean opt_offline = FALSE;
        GOptionEntry entries[] = {
-               //long    short flg type                 location    description                 arg desc
-               {"debug", 'd',  0,  G_OPTION_ARG_INT,    &opt_debug, "Change default log level", "[1-7]"},
-               {"site",  's',  0,  G_OPTION_ARG_STRING, &opt_site,  "Set initial site",         NULL},
-               {"auto",  'a',  0,  G_OPTION_ARG_NONE,   &opt_auto,  "Auto update radar (todo)", NULL},
+               //long      short flg type                 location      description                 arg desc
+               {"debug",   'd',  0,  G_OPTION_ARG_INT,    &opt_debug,   "Change default log level", "[1-7]"},
+               {"site",    's',  0,  G_OPTION_ARG_STRING, &opt_site,    "Set initial site",         NULL},
+               {"offline", 'o',  0,  G_OPTION_ARG_NONE,   &opt_offline, "Run in offline mode",      NULL},
+               {"auto",    'a',  0,  G_OPTION_ARG_NONE,   &opt_auto,    "Auto update radar (todo)", NULL},
                {NULL}
        };
 
@@ -68,7 +72,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);
@@ -76,7 +80,8 @@ int main(int argc, char *argv[])
        /* Set up AWeather */
        AWeatherGui  *gui  = aweather_gui_new();
        AWeatherView *view = aweather_gui_get_view(gui);
-       g_signal_connect(gui, "map-event", G_CALLBACK(on_map), opt_site);
+       aweather_view_set_offline(view, opt_offline);
+       on_map_id = 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)));