X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.c;h=1ce84eae1a3dac5a5a0c6f9f96eb287e59f985ba;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hp=02c620609b4e3cd47624a3db69e6b2d3c3c3fc1c;hpb=b6eb43c323307f4e1c8e5ef818d3cfe816557ee6;p=psensor.git

diff --git a/src/ui.c b/src/ui.c
index 02c6206..1ce84ea 100644
--- 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;
 }
@@ -343,11 +343,8 @@ 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);
 
@@ -401,25 +398,21 @@ void ui_window_create(struct ui_psensor *ui)
 	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;
-	enum sensorlist_position sensorlist_pos;
 
-	log_debug("ui_window_update()");
+	log_debug("ui_window_show()");
 
 	cfg = ui->config;
-
-	if (cfg->window_restore_enabled)
+	if (cfg->window_restore_enabled) {
 		gtk_paned_set_position(GTK_PANED(w_sensor_box),
 				       cfg->window_divider_pos);
+		gtk_window_move(GTK_WINDOW(ui->main_window),
+				cfg->window_x,
+				cfg->window_y);
+	}
 
-}
-
-void ui_window_show(struct ui_psensor *ui)
-{
-	log_debug("ui_window_show()");
-	ui_window_update(ui);
 	gtk_window_present(GTK_WINDOW(ui->main_window));
 }