Fix crash when setting the date

[aweather] / src / aweather-gui.c

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 558f43f12444f2138b87784ea7e4c1927afbb1ce..df5e84695aa9a9d265d3a7fa2e2fd9e133843301 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -143,6 +143,22 @@ G_MODULE_EXPORT void on_contents(GtkMenuItem *menu, AWeatherGui *self)
        g_free(path);
 }
 
+void on_radar_changed(GtkMenuItem *menu, AWeatherGui *self)
+{
+       city_t *city = g_object_get_data(G_OBJECT(menu), "city");
+       grits_viewer_set_location(self->viewer,
+                       city->pos.lat, city->pos.lon, EARTH_R/35);
+       /* Focus radar tab */
+       GtkWidget *config = aweather_gui_get_widget(self, "main_tabs");
+       gint       npages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(config));
+       for (int i = 0; i < npages; i++) {
+               GtkWidget   *child  = gtk_notebook_get_nth_page(GTK_NOTEBOOK(config), i);
+               const gchar *plugin = gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(config), child);
+               if (g_str_equal(plugin, "radar"))
+                       gtk_notebook_set_current_page(GTK_NOTEBOOK(config), i);
+       }
+}
+
 G_MODULE_EXPORT void on_quit(GtkMenuItem *menu, AWeatherGui *self)
 {
        gtk_widget_destroy(GTK_WIDGET(self));
@@ -242,13 +258,15 @@ G_MODULE_EXPORT void on_time_changed(AWeatherGui *self)
                        (guint*)&tm.tm_mon, (guint*)&tm.tm_mday);
        tm.tm_year -= 1900;
 
-       GtkTreeIter   iter;
-       GtkTreePath  *path  = NULL;
-       GtkWidget    *view  = aweather_gui_get_widget(self, "main_time");
-       GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+       GtkTreePath *path = NULL;
+       GtkWidget   *view = aweather_gui_get_widget(self, "main_time");
        gtk_tree_view_get_cursor(GTK_TREE_VIEW(view), &path, NULL);
-       gtk_tree_model_get_iter(model, &iter, path);
-       gtk_tree_model_get(model, &iter, 1, &tm.tm_hour, 2, &tm.tm_min, -1);
+       if (path) {
+               GtkTreeIter   iter;
+               GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+               gtk_tree_model_get_iter(model, &iter, path);
+               gtk_tree_model_get(model, &iter, 1, &tm.tm_hour, 2, &tm.tm_min, -1);
+       }
 
        grits_viewer_set_time(self->viewer, mktime(&tm));
 }
@@ -368,6 +386,29 @@ static void site_setup(AWeatherGui *self)
                        GTK_CELL_RENDERER(renderer), combo_sensitive, NULL, NULL);
 }
 
+static void menu_setup(AWeatherGui *self)
+{
+       GtkWidget *menu = aweather_gui_get_widget(self, "main_menu_radar");
+       GtkWidget *states, *state, *sites, *site;
+
+       states = gtk_menu_new();
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), states);
+
+       for (int i = 0; cities[i].type; i++) {
+               if (cities[i].type == LOCATION_STATE) {
+                       state = gtk_menu_item_new_with_label(cities[i].name);
+                       sites = gtk_menu_new();
+                       gtk_menu_shell_append(GTK_MENU_SHELL(states), state);
+                       gtk_menu_item_set_submenu(GTK_MENU_ITEM(state), sites);
+               } else if (cities[i].type == LOCATION_CITY) {
+                       site  = gtk_menu_item_new_with_label(cities[i].name);
+                       gtk_menu_shell_append(GTK_MENU_SHELL(sites), site);
+                       g_object_set_data(G_OBJECT(site), "city", &cities[i]);
+                       g_signal_connect(site, "activate", G_CALLBACK(on_radar_changed), self);
+               }
+       }
+}
+
 static void prefs_setup(AWeatherGui *self)
 {
        /* Set values */
@@ -562,6 +603,7 @@ static void aweather_gui_parser_finished(GtkBuildable *_self, GtkBuilder *builde
 
        /* Misc, helpers */
        site_setup(self);
+       menu_setup(self);
        time_setup(self);
        prefs_setup(self);
        icons_setup(self);