# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1195254000 0
# Node ID 0ecc58c20d8b7b37a83bde7d02281d7d0cf38ace
# Parent  80af064d311cb04958036f6e5535a001a4f5ca21# Parent  a0769bab5a3d575f07ce35fb85e29ddc51faa403
merge of '2a243210bfd2514b2f7d77cba01c2cf78b8fe8a5'
     and '6b30ad572097fd0d803ab1c98335ddb180e9ac31'

diff -r 80af064d311c -r 0ecc58c20d8b ChangeLog.API
diff -r 80af064d311c -r 0ecc58c20d8b libpurple/protocols/qq/sys_msg.c
diff -r 80af064d311c -r 0ecc58c20d8b libpurple/protocols/silc/chat.c
diff -r 80af064d311c -r 0ecc58c20d8b pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Fri Nov 16 22:59:44 2007 +0000
+++ b/pidgin/gtkblist.c	Fri Nov 16 23:00:00 2007 +0000
@@ -5787,11 +5787,13 @@
 	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);
 
+	if (gtkblist)
+		gtk_window_set_transient_for(GTK_WINDOW(data->window), GTK_WINDOW(gtkblist->window));
 	gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
 	gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE);
 	gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
@@ -6169,11 +6171,13 @@
 	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);
 
+	if (gtkblist)
+		gtk_window_set_transient_for(GTK_WINDOW(data->window), GTK_WINDOW(gtkblist->window));
 	gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
 	gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE);
 	gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);