removed useless ui_psensor#w_sensorlist field

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index 8701355..9a4195f 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -23,21 +23,27 @@
 #include "ui_pref.h"
 #include "ui_sensorlist.h"
 
-static void on_destroy(GtkWidget *widget, gpointer data)
+static gboolean
+on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
+
+#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+       gtk_widget_hide(((struct ui_psensor *)data)->main_window);
+#else
        ui_psensor_quit();
+#endif
+
+       return TRUE;
 }
 
-static void cb_menu_quit(gpointer data,
-                        guint cb_action,
-                        GtkWidget *item)
+static void
+cb_menu_quit(gpointer data, guint cb_action, GtkWidget *item)
 {
        ui_psensor_quit();
 }
 
-static void cb_menu_preferences(gpointer data,
-                               guint cb_action,
-                               GtkWidget *item)
+static void
+cb_menu_preferences(gpointer data, guint cb_action, GtkWidget *item)
 {
        ui_pref_dialog_run((struct ui_psensor *)data);
 }
@@ -106,7 +112,8 @@ void ui_window_create(struct ui_psensor *ui)
        else
                fprintf(stderr, _("ERROR: Failed to load psensor icon.\n"));
 
-       g_signal_connect(window, "destroy", G_CALLBACK(on_destroy), ui);
+       g_signal_connect(window,
+                        "delete_event", G_CALLBACK(on_delete_event_cb), ui);
 
        gtk_window_set_decorated(GTK_WINDOW(window),
                                 ui->config->window_decoration_enabled);
@@ -152,7 +159,6 @@ void ui_window_update(struct ui_psensor *ui)
                                     ui->sensor_box);
 
                ui->w_graph = ui_graph_create(ui);
-               ui->w_sensorlist = ui->ui_sensorlist->widget;
        }
 
        if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT