[Gaim-commits] SF.net SVN: gaim: [16153] trunk/src/gtkconv.c

[<the...@us...>]

Revision: 16153
Author:   thekingant
Date:     2006-05-07 20:03:18 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16153&view=rev

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/src/gtkconv.c
Modified: trunk/src/gtkconv.c
===================================================================
--- trunk/src/gtkconv.c	2006-05-08 02:26:40 UTC (rev 16152)
+++ trunk/src/gtkconv.c	2006-05-08 03:03:18 UTC (rev 16153)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.