# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1050015237 0
# Node ID bfcf72c5a9305723fb80fb11e6eba35be9a21ff3
# Parent  4b4455c52f620fe4159864120217458e43c9b085
[gaim-migrate @ 5466]
unminimize minimized windows when we raise them, and make sure to show
windows if we have hide-on-send set

committer: Tailor Script <tailor@pidgin.im>

diff -r 4b4455c52f62 -r bfcf72c5a930 src/conversation.c
--- a/src/conversation.c	Thu Apr 10 22:09:22 2003 +0000
+++ b/src/conversation.c	Thu Apr 10 22:53:57 2003 +0000
@@ -1475,7 +1475,7 @@
 		((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT &&
 		  (chat_options & OPT_CHAT_POPUP)) ||
 		 (gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
-		  (im_options & OPT_IM_POPUP)))) {
+		  ((im_options & OPT_IM_POPUP) || (im_options & OPT_IM_POPDOWN))))) {
 
 		gaim_window_show(win);
 	}
diff -r 4b4455c52f62 -r bfcf72c5a930 src/gtkconv.c
--- a/src/gtkconv.c	Thu Apr 10 22:09:22 2003 +0000
+++ b/src/gtkconv.c	Thu Apr 10 22:53:57 2003 +0000
@@ -3403,6 +3403,7 @@
 {
 	struct gaim_gtk_window *gtkwin = GAIM_GTK_WINDOW(win);
 
+	gtk_window_deiconify(GTK_WINDOW(gtkwin->window));
 	gdk_window_raise(gtkwin->window->window);
 }