patch request: https://bugs.launchpad.net/psensor/+bug/1642034

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index 041e8d8..7151409 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -188,14 +188,14 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
        struct ui_psensor *ui = data;
 
-       save_window_pos(ui);
-
        log_debug("is_status_supported: %d\n", is_status_supported());
 
-       if (is_appindicator_supported() || is_status_supported())
+       if (is_appindicator_supported() || is_status_supported()) {
+               save_window_pos(ui);
                gtk_widget_hide(ui->main_window);
-       else
+       } else {
                ui_psensor_quit(ui);
+       }
 
        return TRUE;
 }
@@ -344,10 +344,6 @@ void ui_window_create(struct ui_psensor *ui)
        window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
        gtk_builder_connect_signals(builder, ui);
        cfg = ui->config;
-       if (cfg->window_restore_enabled)
-               gtk_window_move(GTK_WINDOW(window),
-                               cfg->window_x,
-                               cfg->window_y);
 
        config_set_slog_enabled_changed_cbk(slog_enabled_cbk, ui);
 
@@ -396,29 +392,30 @@ void ui_window_create(struct ui_psensor *ui)
        gtk_widget_show_all(GTK_WIDGET(w_main_box));
        set_menu_bar_enabled(menu_bar);
 
+       if (cfg->window_restore_enabled) {
+               gtk_paned_set_position(GTK_PANED(w_sensor_box),
+                               cfg->window_divider_pos);
+               gtk_window_move(GTK_WINDOW(window),
+                               cfg->window_x,
+                               cfg->window_y);
+       }
+
        g_object_unref(G_OBJECT(builder));
 
        log_debug("ui_window_create() ends");
 }
 
-void ui_window_update(struct ui_psensor *ui)
+void ui_window_show(struct ui_psensor *ui)
 {
        struct config *cfg;
 
-       log_debug("ui_window_update()");
+       log_debug("ui_window_show()");
 
        cfg = ui->config;
-
        if (cfg->window_restore_enabled)
-               gtk_paned_set_position(GTK_PANED(w_sensor_box),
-                                      cfg->window_divider_pos);
-
-}
-
-void ui_window_show(struct ui_psensor *ui)
-{
-       log_debug("ui_window_show()");
-       ui_window_update(ui);
+               gtk_window_move(GTK_WINDOW(ui->main_window),
+                               cfg->window_x,
+                               cfg->window_y);
        gtk_window_present(GTK_WINDOW(ui->main_window));
 }