Mercurial > pidgin.yaz
changeset 21089:c3c85233eb4a
merge of '703f60ba828ae34d2156cf34c7757fae6c08b04c'
and 'd88f6cf94294ab3a717408f42eb06d24527db660'
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Sat, 13 Oct 2007 09:09:05 +0000 |
| parents | 7ae2ce6f405e (diff) fc80a99f6f40 (current diff) |
| children | 8e9d40defbc0 28b11826cee4 |
| files | pidgin/gtkblist.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);