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

diff --git a/src/ui.c b/src/ui.c
index 4ab4e5a..1ce84ea 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -51,27 +51,29 @@ static void update_layout(void)
 	if (sensorlist_pos == SENSORLIST_POSITION_RIGHT
 	    || sensorlist_pos == SENSORLIST_POSITION_LEFT)
 		w_sensor_box
-			= GTK_PANED(gtk_paned_new(GTK_ORIENTATION_HORIZONTAL));
+			= GTK_CONTAINER(gtk_paned_new
+					(GTK_ORIENTATION_HORIZONTAL));
 	else
 		w_sensor_box
-			= GTK_PANED(gtk_paned_new(GTK_ORIENTATION_VERTICAL));
+			= GTK_CONTAINER(gtk_paned_new
+					(GTK_ORIENTATION_VERTICAL));
 
 	gtk_box_pack_end(GTK_BOX(w_main_box),
 			 GTK_WIDGET(w_sensor_box), TRUE, TRUE, 2);
 
 	if (sensorlist_pos == SENSORLIST_POSITION_RIGHT
 	    || sensorlist_pos == SENSORLIST_POSITION_BOTTOM) {
-		gtk_paned_pack1(w_sensor_box, w_graph, TRUE, TRUE);
-		gtk_paned_pack2(w_sensor_box,
+		gtk_paned_pack1(GTK_PANED(w_sensor_box), w_graph, TRUE, TRUE);
+		gtk_paned_pack2(GTK_PANED(w_sensor_box),
 				w_sensors_scrolled_tree,
 				FALSE,
 				TRUE);
 	} else {
-		gtk_paned_pack1(w_sensor_box,
+		gtk_paned_pack1(GTK_PANED(w_sensor_box),
 				w_sensors_scrolled_tree,
 				FALSE,
 				TRUE);
-		gtk_paned_pack2(w_sensor_box, w_graph, TRUE, TRUE);
+		gtk_paned_pack2(GTK_PANED(w_sensor_box), w_graph, TRUE, TRUE);
 	}
 
 	g_object_unref(w_sensors_scrolled_tree);
@@ -186,19 +188,19 @@ 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;
 }
 
-void ui_show_about_dialog(GtkWidget *parent)
+void ui_show_about_dialog(GtkWindow *parent)
 {
 	static const char *const authors[] = { "jeanfi@gmail.com", NULL };
 
@@ -239,7 +241,7 @@ void ui_cb_about(GtkAction *a, gpointer data)
 	else
 		parent = NULL;
 
-	ui_show_about_dialog(parent);
+	ui_show_about_dialog(GTK_WINDOW(parent));
 }
 
 void ui_cb_menu_quit(GtkMenuItem *mi, gpointer data)
@@ -341,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);
 
@@ -375,15 +374,15 @@ void ui_window_create(struct ui_psensor *ui)
 	w_graph = GTK_WIDGET(gtk_builder_get_object(builder, "graph"));
 	ui_graph_create(ui);
 
-	w_sensor_box = GTK_PANED(gtk_builder_get_object(builder,
-							"sensor_box"));
+	w_sensor_box = GTK_CONTAINER(gtk_builder_get_object(builder,
+							    "sensor_box"));
 	ui->sensors_store = GTK_LIST_STORE(gtk_builder_get_object
 					   (builder, "sensors_store"));
 	ui->sensors_tree = GTK_TREE_VIEW(gtk_builder_get_object
 					 (builder, "sensors_tree"));
 	w_sensors_scrolled_tree
-		= GTK_SCROLLED_WINDOW(gtk_builder_get_object
-				      (builder, "sensors_scrolled_tree"));
+		= GTK_WIDGET(gtk_builder_get_object
+			     (builder, "sensors_scrolled_tree"));
 
 	ui_sensorlist_create(ui);
 
@@ -399,24 +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) {
+		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);
+	}
 
-	if (cfg->window_restore_enabled)
-		gtk_paned_set_position(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_present(GTK_WINDOW(ui->main_window));
 }