Improve shutdown code

[aweather] / src / aweather-gui.c

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 9c88987f8eff424d7bd7282de98809366fe983eb..b59aa0caf516bdf20ea2c1d55b09bb7658913c06 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -317,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)
 {
@@ -617,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",
@@ -653,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);
 }