From b709c90f16a599e12ed745dff3ed371d82f11200 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Wed, 22 Nov 2006 09:02:24 +0000
Subject: win32: fixes window not brought in front with the tray icon click
 after DnD.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1339 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog      | 6 ++++++
 ChangeLog.ja   | 6 ++++++
 src/gtkutils.c | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b7dac89d..944517ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-22
+
+	* src/gtkutils.c: gtkut_window_popup(): win32: ensure that the window
+	  is displayed at the top (fixes window not brought in front with
+	  the tray icon click after DnD).
+
 2006-11-22
 
 	* src/printing.[ch]
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 08515a08..515137c7 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2006-11-22
+
+	* src/gtkutils.c: gtkut_window_popup(): win32: ウィンドウが確実に
+	  前面に表示されるようにした(DnD の後トレイアイコンのクリックで
+	  ウィンドウが前面に出ないことがあったのを修正)。
+
 2006-11-22
 
 	* src/printing.[ch]
diff --git a/src/gtkutils.c b/src/gtkutils.c
index bd3eba69..d7c620f7 100644
--- a/src/gtkutils.c
+++ b/src/gtkutils.c
@@ -880,6 +880,10 @@ void gtkut_window_popup(GtkWidget *window)
 
 	gtk_window_set_skip_taskbar_hint(GTK_WINDOW(window), FALSE);
 	gtk_window_present(GTK_WINDOW(window));
+#ifdef G_OS_WIN32
+	/* ensure that the window is displayed at the top */
+	gdk_window_show(window->window);
+#endif
 }
 
 gboolean gtkut_window_modal_exist(void)
-- 
cgit v1.2.3