# HG changeset patch
# User Gabriel Schulhof <nix@go-nix.ca>
# Date 1192266545 0
# Node ID c3c85233eb4a8fb00ad112723946e868b87c5bed
# Parent  7ae2ce6f405eea4abb5629585b601d9b8076a445# Parent  fc80a99f6f40f19351df007890066b6359636544
merge of '703f60ba828ae34d2156cf34c7757fae6c08b04c'
     and 'd88f6cf94294ab3a717408f42eb06d24527db660'

diff -r fc80a99f6f40 -r c3c85233eb4a pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Wed Oct 10 23:19:58 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Oct 13 09:09:05 2007 +0000
@@ -5787,7 +5787,7 @@
 	gtkblist = PIDGIN_BLIST(purple_get_blist());
 
 	data->window = gtk_dialog_new_with_buttons(_("Add Buddy"),
-			NULL, GTK_DIALOG_NO_SEPARATOR,
+			gtkblist ? gtkblist->window : NULL, GTK_DIALOG_NO_SEPARATOR,
 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			GTK_STOCK_ADD, GTK_RESPONSE_OK,
 			NULL);
@@ -6169,7 +6169,7 @@
 	data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	data->window = gtk_dialog_new_with_buttons(_("Add Chat"),
-		NULL, GTK_DIALOG_NO_SEPARATOR,
+		gtkblist ? gtkblist->window : NULL, GTK_DIALOG_NO_SEPARATOR,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_ADD, GTK_RESPONSE_OK,
 		NULL);