changeset 13742:f3cd05396523

[gaim-migrate @ 16153] 1. We were calling gtk_window_present() twice in a row when presenting conversation windows. 2. A function called "gaim_gtk_conv_window_raise()" should actually raise the window. This fixes a bug report somewhere complaining about how the message notification plugin was presenting the window and stealing focus when the "raise on new IM" pref was enabled. It MIGHT be prudent to add a "steal focus?" preference to the message notification plugin, but I bet we'd be fine without it. I don't really care either way. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 08 May 2006 03:03:18 +0000
parents 889ad72bc16e
children 33294de08fe0
files src/gtkconv.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkconv.c	Mon May 08 02:26:40 2006 +0000
+++ b/src/gtkconv.c	Mon May 08 03:03:18 2006 +0000
@@ -2497,7 +2497,6 @@
 
 	gaim_gtkconv_switch_active_conversation(conv);
 	gaim_gtk_conv_window_switch_gtkconv(gtkconv->win, gtkconv);
-	gaim_gtk_conv_window_raise(gtkconv->win);
 	gtk_window_present(GTK_WINDOW(gtkconv->win->window));
 }
 
@@ -7443,7 +7442,7 @@
 void
 gaim_gtk_conv_window_raise(GaimGtkWindow *win)
 {
-	gtk_window_present(GTK_WINDOW(win->window));
+	gdk_window_raise(GDK_WINDOW(win->window));
 }
 
 void