From 0d0c8e3aa95be4c2c306dc8492f53a7ed733f776 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Fri, 11 Nov 2011 15:13:56 +0000 Subject: [PATCH] share same fct to present main window --- po/Makefile.in | 2 +- src/ui.c | 2 +- src/ui_appindicator.c | 4 +--- src/ui_status.c | 10 +++------- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/po/Makefile.in b/po/Makefile.in index 8b758af..f901ffc 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -21,7 +21,7 @@ srcdir = . top_srcdir = .. -prefix = /usr/local +prefix = /tmp/r exec_prefix = ${prefix} datarootdir = ${prefix}/share datadir = ${datarootdir} diff --git a/src/ui.c b/src/ui.c index 2ecc18c..aef453b 100644 --- a/src/ui.c +++ b/src/ui.c @@ -344,5 +344,5 @@ void ui_window_update(struct ui_psensor *ui) void ui_window_show(struct ui_psensor *ui) { - gtk_widget_show_all(ui->main_window); + gtk_window_present(GTK_WINDOW(ui->main_window)); } diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c index b884db4..e287e74 100644 --- a/src/ui_appindicator.c +++ b/src/ui_appindicator.c @@ -36,9 +36,7 @@ static int appindicator_supported = 1; static void cb_menu_show(GtkMenuItem *mi, gpointer data) { - struct ui_psensor *ui = (struct ui_psensor *)data; - - gtk_window_present(GTK_WINDOW(ui->main_window)); + ui_window_show((struct ui_psensor *)data); } static void cb_menu_quit(GtkMenuItem *mi, gpointer data) diff --git a/src/ui_status.c b/src/ui_status.c index 829d6ac..5677d58 100644 --- a/src/ui_status.c +++ b/src/ui_status.c @@ -22,19 +22,15 @@ #include "log.h" #include "ui_status.h" -GtkStatusIcon *status; - -unsigned status_attention; +static GtkStatusIcon *status; +static unsigned status_attention; static void cb_activate(GtkStatusIcon *icon, gpointer data) { - struct ui_psensor *ui; - log_printf(LOG_DEBUG, "cb_activate()"); - ui = (struct ui_psensor *)data; - gtk_window_present(GTK_WINDOW(ui->main_window)); + ui_window_show((struct ui_psensor *)data); } static void cb_popup_menu(GtkStatusIcon *icon, -- 2.7.4