changeset 21302:fb2310c914a2

merge of 'e3fd21e6dabb99e5604e8337380353fcbe1a7279' and 'fed31c7f5e2c39b8ff79e0d2f07bda3c249d1a49'
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 10 Nov 2007 16:39:18 +0000
parents 39231317310a (current diff) 283f8bf540b3 (diff)
children a9482e431e43 5cca0d7d9081
files libpurple/purple.h
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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"