Mercurial > pidgin.yaz
comparison pidgin/gtkblist.c @ 21345:0ecc58c20d8b
merge of '2a243210bfd2514b2f7d77cba01c2cf78b8fe8a5'
and '6b30ad572097fd0d803ab1c98335ddb180e9ac31'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 16 Nov 2007 23:00:00 +0000 |
parents | 80af064d311c b9680933c2c6 |
children | 200afe30b7af |
comparison
equal
deleted
inserted
replaced
21344:80af064d311c | 21345:0ecc58c20d8b |
---|---|
5785 gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); | 5785 gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); |
5786 | 5786 |
5787 gtkblist = PIDGIN_BLIST(purple_get_blist()); | 5787 gtkblist = PIDGIN_BLIST(purple_get_blist()); |
5788 | 5788 |
5789 data->window = gtk_dialog_new_with_buttons(_("Add Buddy"), | 5789 data->window = gtk_dialog_new_with_buttons(_("Add Buddy"), |
5790 NULL, GTK_DIALOG_NO_SEPARATOR, | 5790 gtkblist ? gtkblist->window : NULL, GTK_DIALOG_NO_SEPARATOR, |
5791 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, | 5791 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, |
5792 GTK_STOCK_ADD, GTK_RESPONSE_OK, | 5792 GTK_STOCK_ADD, GTK_RESPONSE_OK, |
5793 NULL); | 5793 NULL); |
5794 | 5794 |
5795 if (gtkblist) | |
5796 gtk_window_set_transient_for(GTK_WINDOW(data->window), GTK_WINDOW(gtkblist->window)); | |
5795 gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); | 5797 gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); |
5796 gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE); | 5798 gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE); |
5797 gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE); | 5799 gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE); |
5798 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BORDER); | 5800 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BORDER); |
5799 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BOX_SPACE); | 5801 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BOX_SPACE); |
6167 gtkblist = PIDGIN_BLIST(purple_get_blist()); | 6169 gtkblist = PIDGIN_BLIST(purple_get_blist()); |
6168 | 6170 |
6169 data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); | 6171 data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
6170 | 6172 |
6171 data->window = gtk_dialog_new_with_buttons(_("Add Chat"), | 6173 data->window = gtk_dialog_new_with_buttons(_("Add Chat"), |
6172 NULL, GTK_DIALOG_NO_SEPARATOR, | 6174 gtkblist ? gtkblist->window : NULL, GTK_DIALOG_NO_SEPARATOR, |
6173 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, | 6175 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, |
6174 GTK_STOCK_ADD, GTK_RESPONSE_OK, | 6176 GTK_STOCK_ADD, GTK_RESPONSE_OK, |
6175 NULL); | 6177 NULL); |
6176 | 6178 |
6179 if (gtkblist) | |
6180 gtk_window_set_transient_for(GTK_WINDOW(data->window), GTK_WINDOW(gtkblist->window)); | |
6177 gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); | 6181 gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); |
6178 gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE); | 6182 gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE); |
6179 gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE); | 6183 gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE); |
6180 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BORDER); | 6184 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BORDER); |
6181 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BOX_SPACE); | 6185 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BOX_SPACE); |