Mercurial > pidgin3 / changeset

--- 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);
 	}

--- 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);
 }