# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1194712758 0
# Node ID fb2310c914a22d209ad5d644cee1e63cef5a33ea
# Parent  39231317310a07ddd642cc5da1b6e2ff5ee9a364# Parent  283f8bf540b368d90a226de89a2527e9e5806110
merge of 'e3fd21e6dabb99e5604e8337380353fcbe1a7279'
     and 'fed31c7f5e2c39b8ff79e0d2f07bda3c249d1a49'

diff -r 39231317310a -r fb2310c914a2 pidgin/gtkpounce.c
--- a/pidgin/gtkpounce.c	Sat Nov 10 15:59:05 2007 +0000
+++ b/pidgin/gtkpounce.c	Sat Nov 10 16:39:18 2007 +0000
@@ -531,6 +531,7 @@
 	gtk_window_set_title(GTK_WINDOW(window), (cur_pounce == NULL ? _("New Buddy Pounce") : _("Edit Buddy Pounce")));
 	gtk_window_set_role(GTK_WINDOW(window), "buddy_pounce");
 	gtk_container_set_border_width(GTK_CONTAINER(dialog->window), PIDGIN_HIG_BORDER);
+	gtk_window_set_transient_for(GTK_WINDOW(window), parent);
 
 	g_signal_connect(G_OBJECT(window), "delete_event",
 					 G_CALLBACK(delete_win_cb), dialog);
diff -r 39231317310a -r fb2310c914a2 pidgin/gtkrequest.c
--- a/pidgin/gtkrequest.c	Sat Nov 10 15:59:05 2007 +0000
+++ b/pidgin/gtkrequest.c	Sat Nov 10 16:39:18 2007 +0000
@@ -29,7 +29,6 @@
 #include "prefs.h"
 #include "util.h"
 
-#include "gtkblist.h"
 #include "gtkimhtml.h"
 #include "gtkimhtmltoolbar.h"
 #include "gtkrequest.h"