Mercurial > pidgin.yaz
changeset 21345:0ecc58c20d8b
merge of '2a243210bfd2514b2f7d77cba01c2cf78b8fe8a5'
and '6b30ad572097fd0d803ab1c98335ddb180e9ac31'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 16 Nov 2007 23:00:00 +0000 |
| parents | 80af064d311c (current diff) a0769bab5a3d (diff) |
| children | b00c94436918 |
| files | ChangeLog.API libpurple/protocols/qq/sys_msg.c libpurple/protocols/silc/chat.c pidgin/gtkblist.c |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);