Improve shutdown code

[aweather] / src / aweather-gui.c

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 4c234e55949b7265e90fb7dcac7a08a9ecb88a33..b59aa0caf516bdf20ea2c1d55b09bb7658913c06 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -128,10 +128,17 @@ G_MODULE_EXPORT void on_cleancache(GtkMenuItem *menu, AWeatherGui *self)
        cleancache_r(cache);
 }
 
-G_MODULE_EXPORT void on_contents(GtkMenuItem *menu, AWeatherGui *self)
+G_MODULE_EXPORT void on_help(GtkMenuItem *menu, AWeatherGui *self)
 {
        GError *err = NULL;
-       gchar *path = g_strdup(HTMLDIR "/aweather.html");
+       const gchar *name = gtk_buildable_get_name(GTK_BUILDABLE(menu));
+       gchar *page = g_str_has_suffix(name, "userguide") ? "userguide" :
+                     g_str_has_suffix(name, "manpage")   ? "aweather"  : NULL;
+       if (page == NULL) {
+               g_warning("Unknown help page: %s", page);
+               return;
+       }
+       gchar *path = g_strdup_printf("%s/%s.html", HTMLDIR, page);
        g_strdelimit(path, "/", G_DIR_SEPARATOR);
        gchar *argv[] = {"xdg-open", path, NULL};
        g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err);
@@ -310,6 +317,14 @@ static void update_time_widget(GritsViewer *viewer, time_t time, AWeatherGui *se
        //}
 }
 
+G_MODULE_EXPORT gboolean on_configure(AWeatherGui *self, GdkEventConfigure *config)
+{
+       g_debug("AWeatherGui: on_configure - %dx%d", config->width, config->height);
+       grits_prefs_set_integer(self->prefs, "aweather/width",  config->width);
+       grits_prefs_set_integer(self->prefs, "aweather/height", config->height);
+       return FALSE;
+}
+
 /* Prefs callbacks */
 G_MODULE_EXPORT void on_offline(GtkToggleAction *action, AWeatherGui *self)
 {
@@ -391,7 +406,7 @@ static void site_setup(AWeatherGui *self)
 static void menu_setup(AWeatherGui *self)
 {
        GtkWidget *menu = aweather_gui_get_widget(self, "main_menu_radar");
-       GtkWidget *states, *state, *sites, *site;
+       GtkWidget *states=NULL, *state=NULL, *sites=NULL, *site=NULL;
 
        states = gtk_menu_new();
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), states);
@@ -610,6 +625,12 @@ static void aweather_gui_parser_finished(GtkBuildable *_self, GtkBuilder *builde
        prefs_setup(self);
        icons_setup(self);
 
+       /* Default size */
+       gint width  = grits_prefs_get_integer(self->prefs, "aweather/width",  NULL);
+       gint height = grits_prefs_get_integer(self->prefs, "aweather/height", NULL);
+       if (width && height)
+               gtk_window_set_default_size(GTK_WINDOW(self), width, height);
+
        /* Connect signals */
        gtk_builder_connect_signals(self->builder, self);
        g_signal_connect(self, "key-press-event",
@@ -646,16 +667,19 @@ static void aweather_gui_dispose(GObject *_self)
        g_debug("AWeatherGui: dispose");
        AWeatherGui *self = AWEATHER_GUI(_self);
        if (self->plugins) {
-               grits_plugins_free(self->plugins);
+               GritsPlugins *plugins = self->plugins;
                self->plugins = NULL;
+               grits_plugins_free(plugins);
        }
        if (self->builder) {
-               g_object_unref(self->builder);
+               GtkBuilder *builder = self->builder;
                self->builder = NULL;
+               g_object_unref(builder);
        }
        if (self->prefs) {
-               g_object_unref(self->prefs);
+               GritsPrefs *prefs = self->prefs;
                self->prefs = NULL;
+               g_object_unref(prefs);
        }
        G_OBJECT_CLASS(aweather_gui_parent_class)->dispose(_self);
 }