style

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index 91816bf..f13cdf6 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -23,6 +23,7 @@
 #include "ui_pref.h"
 #include "ui_sensorpref.h"
 #include "ui_sensorlist.h"
+#include "ui_status.h"
 #include "ui_appindicator.h"
 
 static void save_window_pos(struct ui_psensor *ui)
@@ -67,17 +68,13 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 
        save_window_pos(ui);
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-       if (is_appindicator_supported()) {
-               log_printf(LOG_DEBUG, "hiding, WM is supporting appindicator");
+       log_printf(LOG_DEBUG,
+                  "is_status_supported: %d\n", is_status_supported());
+
+       if (is_appindicator_supported() || is_status_supported())
                gtk_widget_hide(ui->main_window);
-       } else {
-               log_printf(LOG_DEBUG, "quitting, WM not supporting appindicator");
+       else
                ui_psensor_quit(ui);
-       }
-#else
-       ui_psensor_quit(ui);
-#endif
 
        return TRUE;
 }
@@ -217,13 +214,14 @@ static unsigned int enable_alpha_channel(GtkWidget *w)
 
 void ui_window_create(struct ui_psensor *ui)
 {
-       GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       GtkWidget *window, *menubar;
        GdkScreen *screen;
        GdkPixbuf *icon;
        GtkIconTheme *icon_theme;
-       GtkWidget *menubar;
        struct config *cfg;
 
+       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
        cfg = ui->config;
        if (cfg->window_restore_enabled)
                gtk_window_move(GTK_WINDOW(window),
@@ -234,19 +232,17 @@ void ui_window_create(struct ui_psensor *ui)
                                    cfg->window_w,
                                    cfg->window_h);
 
-
        gtk_window_set_title(GTK_WINDOW(window),
                             _("Psensor - Temperature Monitor"));
        gtk_window_set_role(GTK_WINDOW(window), "psensor");
 
        screen = gtk_widget_get_screen(window);
 
-       if (ui->config->alpha_channel_enabled
-           && gdk_screen_is_composited(screen)) {
+       if (cfg->alpha_channel_enabled && gdk_screen_is_composited(screen)) {
                if (!enable_alpha_channel(window))
-                       ui->config->alpha_channel_enabled = 0;
+                       cfg->alpha_channel_enabled = 0;
        } else {
-               ui->config->alpha_channel_enabled = 0;
+               cfg->alpha_channel_enabled = 0;
        }
 
        icon_theme = gtk_icon_theme_get_default();
@@ -260,10 +256,10 @@ void ui_window_create(struct ui_psensor *ui)
                         "delete_event", G_CALLBACK(on_delete_event_cb), ui);
 
        gtk_window_set_decorated(GTK_WINDOW(window),
-                                ui->config->window_decoration_enabled);
+                                cfg->window_decoration_enabled);
 
        gtk_window_set_keep_below(GTK_WINDOW(window),
-                                 ui->config->window_keep_below_enabled);
+                                 cfg->window_keep_below_enabled);
 
        /* main box */
        menubar = get_menu(ui);
@@ -278,14 +274,14 @@ void ui_window_create(struct ui_psensor *ui)
        ui->main_window = window;
        ui->menu_bar = menubar;
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-       if (ui->config->hide_on_startup)
+       log_printf(LOG_DEBUG,
+                  "is_status_supported: %d\n", is_status_supported());
+
+       if (cfg->hide_on_startup
+           && (is_appindicator_supported() || is_status_supported()))
                gtk_widget_show_all(ui->main_box);
        else
                ui_window_show(ui);
-#else
-       ui_window_show(ui);
-#endif
 }
 
 static void menu_bar_show(unsigned int show, struct ui_psensor *ui)
@@ -342,7 +338,6 @@ void ui_window_update(struct ui_psensor *ui)
                gtk_paned_set_position(GTK_PANED(ui->sensor_box),
                                       ui->config->window_divider_pos);
 
-
        if (!init)
                g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget));
 
@@ -357,5 +352,4 @@ void ui_window_update(struct ui_psensor *ui)
 void ui_window_show(struct ui_psensor *ui)
 {
        gtk_widget_show_all(ui->main_window);
-
 }