From 4bd089ce9b2dbc5fe4a751f9d068a2356befed3e Mon Sep 17 00:00:00 2001 From: hiro Date: Thu, 5 Oct 2006 02:55:22 +0000 Subject: fixes main window kept hidden on popup with another process. git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1216 ee746299-78ed-0310-b773-934348b2243d --- src/trayicon.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/trayicon.c') diff --git a/src/trayicon.c b/src/trayicon.c index f87eec7d..1b8c7a2e 100644 --- a/src/trayicon.c +++ b/src/trayicon.c @@ -78,8 +78,6 @@ static void trayicon_destroy_cb (GtkWidget *widget, #endif -static void trayicon_window_present (GtkWindow *window); - static void trayicon_present (GtkWidget *widget, gpointer data); static void trayicon_inc (GtkWidget *widget, @@ -232,7 +230,7 @@ static void trayicon_activated(GtkStatusIcon *status_icon, gpointer data) { MainWindow *mainwin = (MainWindow *)data; - trayicon_window_present(GTK_WINDOW(mainwin->window)); + main_window_popup(mainwin); } static void trayicon_popup_menu_cb(GtkStatusIcon *status_icon, guint button, @@ -302,7 +300,7 @@ static void trayicon_button_pressed(GtkWidget *widget, GdkEventButton *event, return; if (event->button == 1) - trayicon_window_present(GTK_WINDOW(mainwin->window)); + main_window_popup(mainwin); else if (event->button == 3) { gtk_menu_popup(GTK_MENU(trayicon_menu), NULL, NULL, NULL, NULL, event->button, event->time); @@ -324,17 +322,11 @@ static void trayicon_destroy_cb(GtkWidget *widget, gpointer data) #endif -static void trayicon_window_present(GtkWindow *window) -{ - gtk_window_set_skip_taskbar_hint(window, FALSE); - gtk_window_present(window); -} - static void trayicon_present(GtkWidget *widget, gpointer data) { MainWindow *mainwin = (MainWindow *)data; - trayicon_window_present(GTK_WINDOW(mainwin->window)); + main_window_popup(mainwin); } static void trayicon_inc(GtkWidget *widget, gpointer data) -- cgit v1.2.3