Mercurial > pidgin

changeset 5103:bfcf72c5a930

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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>
author Nathan Walp <nwalp@pidgin.im>
date Thu, 10 Apr 2003 22:53:57 +0000
parents 4b4455c52f62
children a20a644e0da4
files src/conversation.c src/gtkconv.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }