style

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index 2ecc18c..c62f326 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,22 +1,21 @@
 /*
-    Copyright (C) 2010-2011 jeanfi@gmail.com
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2011 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #include "cfg.h"
 #include "ui.h"
 #include "ui_graph.h"
@@ -33,7 +32,7 @@ static void save_window_pos(struct ui_psensor *ui)
        struct config *cfg;
 
        visible = gtk_widget_get_visible(ui->main_window);
-       log_printf(LOG_DEBUG, "Window visible: %d", visible);
+       log_debug("Window visible: %d", visible);
 
        if (visible == TRUE) {
                cfg = ui->config;
@@ -41,18 +40,14 @@ static void save_window_pos(struct ui_psensor *ui)
                win = GTK_WINDOW(ui->main_window);
 
                gtk_window_get_position(win, &cfg->window_x, &cfg->window_y);
-               log_printf(LOG_DEBUG,
-                          "Window position: %d %d",
-                          cfg->window_x,
-                          cfg->window_y);
+               log_debug("Window position: %d %d",
+                         cfg->window_x,
+                         cfg->window_y);
 
                gtk_window_get_size(win,
                                    &cfg->window_w,
                                    &cfg->window_h);
-               log_printf(LOG_DEBUG,
-                          "Window size: %d %d",
-                          cfg->window_w,
-                          cfg->window_h);
+               log_debug("Window size: %d %d", cfg->window_w, cfg->window_h);
 
                cfg->window_divider_pos
                        = gtk_paned_get_position(GTK_PANED(ui->sensor_box));
@@ -68,8 +63,7 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 
        save_window_pos(ui);
 
-       log_printf(LOG_DEBUG,
-                  "is_status_supported: %d\n", is_status_supported());
+       log_debug("is_status_supported: %d\n", is_status_supported());
 
        if (is_appindicator_supported() || is_status_supported())
                gtk_widget_hide(ui->main_window);
@@ -123,7 +117,7 @@ void ui_psensor_quit(struct ui_psensor *ui)
 {
        save_window_pos(ui);
 
-       log_printf(LOG_DEBUG, "Destroy main window");
+       log_debug("Destroy main window");
        gtk_widget_destroy(ui->main_window);
        gtk_main_quit();
 }
@@ -344,5 +338,6 @@ void ui_window_update(struct ui_psensor *ui)
 
 void ui_window_show(struct ui_psensor *ui)
 {
-       gtk_widget_show_all(ui->main_window);
+       log_debug("ui_window_show()");
+       gtk_window_present(GTK_WINDOW(ui->main_window));
 }