diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.ja | 7 | ||||
| -rw-r--r-- | src/gtkutils.c | 1 | ||||
| -rw-r--r-- | src/trayicon.c | 14 |
4 files changed, 17 insertions, 11 deletions
@@ -1,3 +1,9 @@ +2006-10-05 + + * src/gtkutils.c: gtkut_window_popup(): unset skip_taskbar_hint (fixes + main window kept hidden on popup with another process). + * src/trayicon.c: use main_window_popup(). + 2006-10-04 * version 2.3.0beta2 diff --git a/ChangeLog.ja b/ChangeLog.ja index 2af395bd..97479b8c 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,10 @@ +2006-10-05 + + * src/gtkutils.c: gtkut_window_popup(): skip_taskbar_hint を解除する + ようにした(別プロセスによるポップアップでメインウィンドウが隠された + ままになるのを修正)。 + * src/trayicon.c: main_window_popup() を使用。 + 2006-10-04 * version 2.3.0beta2 diff --git a/src/gtkutils.c b/src/gtkutils.c index 8898f029..3aa20958 100644 --- a/src/gtkutils.c +++ b/src/gtkutils.c @@ -878,6 +878,7 @@ void gtkut_window_popup(GtkWidget *window) if (new_x != x || new_y != y) gdk_window_move(window->window, new_x, new_y); + gtk_window_set_skip_taskbar_hint(GTK_WINDOW(window), FALSE); gtk_window_present(GTK_WINDOW(window)); } 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) |