Mercurial > pidgin.yaz
changeset 11243:a511b77a368b
[gaim-migrate @ 13408]
sf patch #1246384, from shiyee
"This patch globally defines
spacings and boreders according to the Gnome Human
Interfaces Guidelines, and uses those defines where
appropriate. No visual changes are made, but the the
intention is that the defines should help promote
uniformness."
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 12 Aug 2005 23:53:28 +0000 |
| parents | 01c06e7ae1f6 |
| children | 6ee53c79d630 |
| files | src/gtkaccount.c src/gtkblist.c src/gtkconn.c src/gtkconv.c src/gtkdebug.c src/gtkdialogs.c src/gtkft.c src/gtkgaim.h src/gtkimhtmltoolbar.c src/gtklog.c src/gtknotify.c src/gtkpluginpref.c src/gtkpounce.c src/gtkprefs.c src/gtkprivacy.c src/gtkrequest.c src/gtkroomlist.c src/gtksavedstatuses.c src/gtkutils.c |
| diffstat | 19 files changed, 202 insertions(+), 194 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkaccount.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkaccount.c Fri Aug 12 23:53:28 2005 +0000 @@ -178,7 +178,7 @@ GtkWidget *hbox; GtkWidget *label; - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -188,7 +188,7 @@ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 12); + gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, GAIM_HIG_BORDER); gtk_widget_show(widget); gaim_set_accessible_label (widget, label); @@ -422,7 +422,7 @@ current_folder); gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview), -1, 50); - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start( GTK_BOX(GTK_FILE_SELECTION(dialog->icon_filesel)->main_vbox), hbox, FALSE, FALSE, 0); @@ -671,7 +671,7 @@ gtk_widget_show(dialog->login_frame); /* Main vbox */ - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); @@ -818,7 +818,7 @@ gtk_widget_show(dialog->user_frame); /* Main vbox */ - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); @@ -829,7 +829,7 @@ gtk_widget_show(dialog->new_mail_check); /* Buddy icon */ - dialog->icon_hbox = hbox = gtk_hbox_new(FALSE, 6); + dialog->icon_hbox = hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -849,8 +849,8 @@ gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0); gtk_widget_show(vbox2); - hbox2 = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, 12); + hbox2 = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, GAIM_HIG_BORDER); gtk_widget_show(hbox2); button = gtk_button_new_from_stock(GTK_STOCK_OPEN); @@ -932,7 +932,7 @@ gtk_widget_show(dialog->protocol_frame); /* Main vbox */ - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); @@ -1208,7 +1208,7 @@ gtk_widget_show(dialog->proxy_frame); /* Main vbox */ - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); @@ -1222,8 +1222,8 @@ add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown); /* Setup the second vbox, which may be hidden at times. */ - dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 12); + dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, GAIM_HIG_BORDER); gtk_widget_show(vbox2); /* Host */ @@ -1628,13 +1628,13 @@ gtk_window_set_resizable(GTK_WINDOW(win), FALSE); - gtk_container_set_border_width(GTK_CONTAINER(win), 12); + gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(account_win_destroy_cb), dialog); /* Setup the vbox */ - main_vbox = gtk_vbox_new(FALSE, 12); + main_vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), main_vbox); gtk_widget_show(main_vbox); @@ -1642,8 +1642,8 @@ gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0); /* Setup the inner vbox */ - dialog->top_vbox = vbox = gtk_vbox_new(FALSE, 12); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); + dialog->top_vbox = vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BORDER); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new_with_mnemonic("_Basic")); gtk_widget_show(vbox); @@ -1653,8 +1653,8 @@ add_user_options(dialog, vbox); /* Setup the page with 'Advanced'. */ - dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, 12); - gtk_container_set_border_width(GTK_CONTAINER(dbox), 12); + dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(dbox), GAIM_HIG_BORDER); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox, gtk_label_new_with_mnemonic("_Advanced")); @@ -1665,7 +1665,7 @@ /* Setup the button box */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), 6); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(main_vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox); @@ -2325,7 +2325,7 @@ gtk_window_set_default_size(GTK_WINDOW(win), width, height); gtk_window_set_role(GTK_WINDOW(win), "accounts"); gtk_window_set_title(GTK_WINDOW(win), _("Accounts")); - gtk_container_set_border_width(GTK_CONTAINER(win), 12); + gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(accedit_win_destroy_cb), accounts_window); @@ -2333,7 +2333,7 @@ G_CALLBACK(configure_cb), accounts_window); /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), vbox); gtk_widget_show(vbox); @@ -2344,7 +2344,7 @@ /* Button box. */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), 6); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox);
--- a/src/gtkblist.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkblist.c Fri Aug 12 23:53:28 2005 +0000 @@ -784,7 +784,7 @@ pce = tmp->data; - rowbox = gtk_hbox_new(FALSE, 12); + rowbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_box_pack_start(GTK_BOX(data->entries_box), rowbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(pce->label); @@ -904,14 +904,14 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GAIM_STOCK_CHAT, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); - gtk_container_set_border_width(GTK_CONTAINER(data->window), 6); + gtk_container_set_border_width(GTK_CONTAINER(data->window), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), 12); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BORDER); gtk_container_set_border_width( - GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), 6); + GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE); gtk_window_set_role(GTK_WINDOW(data->window), "join_chat"); - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); @@ -926,7 +926,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - rowbox = gtk_hbox_new(FALSE, 12); + rowbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0); data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -4391,15 +4391,15 @@ NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); - gtk_container_set_border_width(GTK_CONTAINER(data->window), 6); + gtk_container_set_border_width(GTK_CONTAINER(data->window), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), 12); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), 6); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE); gtk_window_set_role(GTK_WINDOW(data->window), "add_buddy"); gtk_window_set_type_hint(GTK_WINDOW(data->window), GDK_WINDOW_TYPE_HINT_DIALOG); - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); @@ -4418,7 +4418,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(vbox), hbox); g_signal_connect(G_OBJECT(data->window), "destroy", @@ -4776,15 +4776,15 @@ NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); - gtk_container_set_border_width(GTK_CONTAINER(data->window), 6); + gtk_container_set_border_width(GTK_CONTAINER(data->window), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), 12); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), 6); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE); gtk_window_set_role(GTK_WINDOW(data->window), "add_chat"); gtk_window_set_type_hint(GTK_WINDOW(data->window), GDK_WINDOW_TYPE_HINT_DIALOG); - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
--- a/src/gtkconn.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkconn.c Fri Aug 12 23:53:28 2005 +0000 @@ -378,19 +378,19 @@ disconnect_window->window = gtk_dialog_new_with_buttons(_("Disconnected"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL); g_signal_connect(G_OBJECT(disconnect_window->window), "response", G_CALLBACK(disconnect_response_cb), disconnect_window); - gtk_container_set_border_width(GTK_CONTAINER(disconnect_window->window), 6); + gtk_container_set_border_width(GTK_CONTAINER(disconnect_window->window), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(disconnect_window->window), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(disconnect_window->window), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(disconnect_window->window)->vbox), 12); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), 6); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BOX_SPACE); - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), hbox); img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); disconnect_window->label = gtk_label_new(label_text);
--- a/src/gtkconv.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkconv.c Fri Aug 12 23:53:28 2005 +0000 @@ -874,7 +874,7 @@ gtk_dialog_set_default_response(GTK_DIALOG(invite_dialog), GTK_RESPONSE_OK); - gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), 6); + gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(invite_dialog), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(invite_dialog), FALSE); @@ -883,11 +883,11 @@ /* Setup the outside spacing. */ vbox = GTK_DIALOG(invite_dialog)->vbox; - gtk_box_set_spacing(GTK_BOX(vbox), 12); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); + gtk_box_set_spacing(GTK_BOX(vbox), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE); /* Setup the inner hbox and put the dialog's icon in it. */ - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(vbox), hbox); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); @@ -906,14 +906,14 @@ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); /* hbox for the table, and to give it some spacing on the left. */ - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(vbox), hbox); /* Setup the table we're going to use to lay stuff out. */ table = gtk_table_new(2, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 6); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - gtk_container_set_border_width(GTK_CONTAINER(table), 12); + gtk_table_set_row_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); + gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(table), GAIM_HIG_BORDER); gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); /* Now the Buddy label */ @@ -1135,14 +1135,14 @@ g_signal_connect(G_OBJECT(gtkconv->dialogs.search), "response", G_CALLBACK(do_search_cb), s); - gtk_container_set_border_width(GTK_CONTAINER(gtkconv->dialogs.search), 6); + gtk_container_set_border_width(GTK_CONTAINER(gtkconv->dialogs.search), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(gtkconv->dialogs.search), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(gtkconv->dialogs.search), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkconv->dialogs.search)->vbox), 12); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkconv->dialogs.search)->vbox), GAIM_HIG_BORDER); gtk_container_set_border_width( - GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), 6); - - hbox = gtk_hbox_new(FALSE, 12); + GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), GAIM_HIG_BOX_SPACE); + + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), hbox); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -3908,7 +3908,7 @@ gtk_widget_show(vpaned); /* Setup the top part of the pane. */ - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_paned_pack1(GTK_PANED(vpaned), vbox, TRUE, TRUE); gtk_widget_show(vbox); @@ -3917,7 +3917,7 @@ if (prpl_info->options & OPT_PROTO_CHAT_TOPIC) { - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -3964,7 +3964,7 @@ G_CALLBACK(refocus_entry_cb), gtkconv); /* Build the right pane. */ - lbox = gtk_vbox_new(FALSE, 6); + lbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_paned_pack2(GTK_PANED(hpaned), lbox, FALSE, TRUE); gtk_widget_show(lbox); @@ -4021,7 +4021,7 @@ gtk_container_add(GTK_CONTAINER(sw), list); /* Setup the user list toolbar. */ - bbox = gtk_hbox_new(TRUE, 6); + bbox = gtk_hbox_new(TRUE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(lbox), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox); @@ -4063,15 +4063,15 @@ gtk_widget_show(button); /* Setup the bottom half of the conversation window */ - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_paned_pack2(GTK_PANED(vpaned), vbox, FALSE, TRUE); gtk_widget_show(vbox); - gtkconv->lower_hbox = gtk_hbox_new(FALSE, 6); + gtkconv->lower_hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), gtkconv->lower_hbox, TRUE, TRUE, 0); gtk_widget_show(gtkconv->lower_hbox); - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_end(GTK_BOX(gtkconv->lower_hbox), vbox, TRUE, TRUE, 0); gtk_widget_show(vbox); @@ -4126,7 +4126,7 @@ gtk_widget_show(paned); /* Setup the top part of the pane */ - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_paned_pack1(GTK_PANED(paned), vbox, TRUE, TRUE); gtk_widget_show(vbox); @@ -4151,15 +4151,15 @@ G_CALLBACK(refocus_entry_cb), gtkconv); /* Setup the bottom half of the conversation window */ - vbox2 = gtk_vbox_new(FALSE, 6); + vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_paned_pack2(GTK_PANED(paned), vbox2, FALSE, TRUE); gtk_widget_show(vbox2); - gtkconv->lower_hbox = gtk_hbox_new(FALSE, 6); + gtkconv->lower_hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox2), gtkconv->lower_hbox, TRUE, TRUE, 0); gtk_widget_show(gtkconv->lower_hbox); - vbox2 = gtk_vbox_new(FALSE, 6); + vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_end(GTK_BOX(gtkconv->lower_hbox), vbox2, TRUE, TRUE, 0); gtk_widget_show(vbox2); @@ -4532,9 +4532,9 @@ G_CALLBACK(conv_dnd_recv), gtkconv); /* Setup the container for the tab. */ - gtkconv->tab_cont = tab_cont = gtk_vbox_new(FALSE, 6); + gtkconv->tab_cont = tab_cont = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); g_object_set_data(G_OBJECT(tab_cont), "GaimGtkConversation", gtkconv); - gtk_container_set_border_width(GTK_CONTAINER(tab_cont), 6); + gtk_container_set_border_width(GTK_CONTAINER(tab_cont), GAIM_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(tab_cont), pane); gtk_widget_show(pane); @@ -4555,8 +4555,8 @@ gtkconv->entry); } - gtkconv->tabby = tabby = gtk_hbox_new(FALSE, 6); - gtkconv->menu_tabby = menu_tabby = gtk_hbox_new(FALSE, 6); + gtkconv->tabby = tabby = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtkconv->menu_tabby = menu_tabby = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); /* Close button. */ gtkconv->close = gtk_button_new();
--- a/src/gtkdebug.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkdebug.c Fri Aug 12 23:53:28 2005 +0000 @@ -138,14 +138,14 @@ g_signal_connect(G_OBJECT(win->find), "response", G_CALLBACK(do_find_cb), f); - gtk_container_set_border_width(GTK_CONTAINER(win->find), 6); + gtk_container_set_border_width(GTK_CONTAINER(win->find), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(win->find), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(win->find), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(win->find)->vbox), 12); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(win->find)->vbox), GAIM_HIG_BORDER); gtk_container_set_border_width( - GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), 6); + GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), GAIM_HIG_BOX_SPACE); - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), hbox); img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
--- a/src/gtkdialogs.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkdialogs.c Fri Aug 12 23:53:28 2005 +0000 @@ -208,11 +208,11 @@ gtk_window_set_resizable(GTK_WINDOW(about), TRUE); gtk_window_set_default_size(GTK_WINDOW(about), 340, 550); /* Golden ratio in da hizzy */ - hbox = gtk_hbox_new(FALSE, 12); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(hbox), GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(about), hbox); - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(hbox), vbox); logo = gtk_image_new_from_stock(GAIM_STOCK_LOGO, gtk_icon_size_from_name(GAIM_ICON_SIZE_LOGO)); @@ -581,13 +581,13 @@ gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK); g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(gtk_widget_destroy), NULL); - gtk_container_set_border_width (GTK_CONTAINER(window), 6); + gtk_container_set_border_width (GTK_CONTAINER(window), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(window), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(window)->vbox), 12); - gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(window)->vbox), 6); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(window)->vbox), GAIM_HIG_BORDER); + gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(window)->vbox), GAIM_HIG_BOX_SPACE); - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox); img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, gtk_icon_size_from_name(GAIM_ICON_SIZE_DIALOG_COOL)); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -750,13 +750,13 @@ gtk_dialog_set_default_response (GTK_DIALOG(w->window), GTK_RESPONSE_OK); g_signal_connect(G_OBJECT(w->window), "response", G_CALLBACK(gaim_gtkdialogs_warn_cb), w); - gtk_container_set_border_width (GTK_CONTAINER(w->window), 6); + gtk_container_set_border_width (GTK_CONTAINER(w->window), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(w->window), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(w->window), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(w->window)->vbox), 12); - gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(w->window)->vbox), 6); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(w->window)->vbox), GAIM_HIG_BORDER); + gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(w->window)->vbox), GAIM_HIG_BOX_SPACE); - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w->window)->vbox), hbox); img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); @@ -777,7 +777,7 @@ w->anon = gtk_check_button_new_with_mnemonic(_("Warn _anonymously?")); gtk_box_pack_start(GTK_BOX(vbox), w->anon, FALSE, FALSE, 0); - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(vbox), hbox); img = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_MENU); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
--- a/src/gtkft.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkft.c Fri Aug 12 23:53:28 2005 +0000 @@ -634,8 +634,8 @@ /* Setup the initial table */ dialog->table = table = gtk_table_new(9, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 6); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); + gtk_table_set_row_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); + gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); /* Setup the labels */ for (i = 0; i < sizeof(labels) / sizeof(*labels); i++) { @@ -693,18 +693,18 @@ gtk_window_set_role(GTK_WINDOW(window), "file transfer"); gtk_window_set_title(GTK_WINDOW(window), _("File Transfers")); gtk_window_set_resizable(GTK_WINDOW(window), FALSE); - gtk_container_set_border_width(GTK_CONTAINER(window), 12); + gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog); /* Create the parent vbox for everything. */ - vbox1 = gtk_vbox_new(FALSE, 12); + vbox1 = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(window), vbox1); gtk_widget_show(vbox1); /* Create the main vbox for top half of the window. */ - vbox2 = gtk_vbox_new(FALSE, 6); + vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0); gtk_widget_show(vbox2); @@ -756,7 +756,7 @@ /* Now the button box for the buttons */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), 6); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox1), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox);
--- a/src/gtkgaim.h Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkgaim.h Fri Aug 12 23:53:28 2005 +0000 @@ -53,5 +53,13 @@ #endif /** @endcond */ +/* + * Spacings between components, as defined by the + * Gnome Human Interface Guidelines. + */ +#define GAIM_HIG_CAT_SPACE 18 +#define GAIM_HIG_BORDER 12 +#define GAIM_HIG_BOX_SPACE 6 + #endif /* _GAIM_GTKGAIM_H_ */
--- a/src/gtkimhtmltoolbar.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkimhtmltoolbar.c Fri Aug 12 23:53:28 2005 +0000 @@ -930,7 +930,7 @@ toolbar->tooltips = gtk_tooltips_new(); - gtk_box_set_spacing(GTK_BOX(toolbar), 6); + gtk_box_set_spacing(GTK_BOX(toolbar), GAIM_HIG_BOX_SPACE); sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); /* Bold */
--- a/src/gtklog.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtklog.c Fri Aug 12 23:53:28 2005 +0000 @@ -292,7 +292,7 @@ /* Window ***********/ lv->window = gtk_dialog_new_with_buttons(title, NULL, 0, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - gtk_container_set_border_width (GTK_CONTAINER(lv->window), 6); + gtk_container_set_border_width (GTK_CONTAINER(lv->window), GAIM_HIG_BOX_SPACE); gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE); gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(lv->window)->vbox), 0); g_signal_connect(G_OBJECT(lv->window), "response", @@ -304,8 +304,8 @@ GdkPixbuf *scale; GtkWidget *icon; - title_box = gtk_hbox_new(FALSE, 6); - gtk_container_set_border_width(GTK_CONTAINER(title_box), 6); + title_box = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(title_box), GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), title_box, FALSE, FALSE, 0); scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR); @@ -339,7 +339,7 @@ /* Pane *************/ pane = gtk_hpaned_new(); - gtk_container_set_border_width(GTK_CONTAINER(pane), 6); + gtk_container_set_border_width(GTK_CONTAINER(pane), GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), pane, TRUE, TRUE, 0); /* List *************/ @@ -367,7 +367,7 @@ gaim_set_accessible_label(lv->treeview, lv->label); /* A fancy little box ************/ - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_paned_add2(GTK_PANED(pane), vbox); /* Viewer ************/ @@ -378,7 +378,7 @@ gtk_widget_show(frame); /* Search box **********/ - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); lv->entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(hbox), lv->entry, TRUE, TRUE, 0);
--- a/src/gtknotify.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtknotify.c Fri Aug 12 23:53:28 2005 +0000 @@ -164,13 +164,13 @@ g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(message_response_cb), dialog); - gtk_container_set_border_width(GTK_CONTAINER(dialog), 12); + gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 12); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 6); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BOX_SPACE); - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); if (img != NULL) @@ -242,14 +242,14 @@ G_CALLBACK(email_response_cb), data); /* Setup the dialog */ - gtk_container_set_border_width(GTK_CONTAINER(dialog), 6); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 6); + gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 12); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon */ @@ -259,7 +259,7 @@ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); /* Vertical box */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); @@ -360,13 +360,13 @@ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(window), title); gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_container_set_border_width(GTK_CONTAINER(window), 12); + gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(formatted_close_cb), NULL); /* Setup the main vbox */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(window), vbox); gtk_widget_show(vbox); @@ -455,13 +455,13 @@ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(window), (title ? title :_("Search Results"))); gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_container_set_border_width(GTK_CONTAINER(window), 12); + gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); g_signal_connect_swapped(G_OBJECT(window), "delete_event", G_CALLBACK(searchresults_close_cb), data); /* Setup the main vbox */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(window), vbox); gtk_widget_show(vbox); @@ -523,7 +523,7 @@ button_area = gtk_hbutton_box_new(); gtk_box_pack_start(GTK_BOX(vbox), button_area, FALSE, FALSE, 0); gtk_button_box_set_layout(GTK_BUTTON_BOX(button_area), GTK_BUTTONBOX_END); - gtk_box_set_spacing(GTK_BOX(button_area), 12); + gtk_box_set_spacing(GTK_BOX(button_area), GAIM_HIG_BORDER); gtk_widget_show(button_area); /* Add the Add button */
--- a/src/gtkpluginpref.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkpluginpref.c Fri Aug 12 23:53:28 2005 +0000 @@ -65,7 +65,7 @@ break; case GAIM_PLUGIN_PREF_NONE: default: - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_widget_show(hbox); gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0); @@ -146,7 +146,7 @@ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); parent = ret = gtk_vbox_new(FALSE, 16); - gtk_container_set_border_width(GTK_CONTAINER(ret), 12); + gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); gtk_widget_show(ret); for(pp = gaim_plugin_pref_frame_get_prefs(frame);
--- a/src/gtkpounce.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkpounce.c Fri Aug 12 23:53:28 2005 +0000 @@ -390,25 +390,25 @@ (cur_pounce == NULL ? _("New Buddy Pounce") : _("Edit Buddy Pounce"))); - gtk_container_set_border_width(GTK_CONTAINER(window), 12); + gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog); /* Create the parent vbox for everything. */ - vbox1 = gtk_vbox_new(FALSE, 12); + vbox1 = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(window), vbox1); gtk_widget_show(vbox1); /* Create the vbox that will contain all the prefs stuff. */ - vbox2 = gtk_vbox_new(FALSE, 18); + vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0); /* Create the "Pounce Who" frame. */ frame = gaim_gtk_make_frame(vbox2, _("Pounce Who")); /* Account: */ - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -428,7 +428,7 @@ gaim_set_accessible_label (dialog->account_menu, label); /* Buddy: */ - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -460,7 +460,7 @@ table = gtk_table_new(2, 4, FALSE); gtk_container_add(GTK_CONTAINER(frame), table); - gtk_table_set_col_spacings(GTK_TABLE(table), 12); + gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BORDER); gtk_widget_show(table); dialog->signon = @@ -511,7 +511,7 @@ table = gtk_table_new(3, 5, FALSE); gtk_container_add(GTK_CONTAINER(frame), table); - gtk_table_set_col_spacings(GTK_TABLE(table), 12); + gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BORDER); gtk_widget_show(table); dialog->open_win @@ -619,7 +619,7 @@ /* Now the button box! */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), 6); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox1), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox);
--- a/src/gtkprefs.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkprefs.c Fri Aug 12 23:53:28 2005 +0000 @@ -673,8 +673,8 @@ GtkWidget *label; GtkTargetEntry te[3] = {{"text/plain", 0, 0},{"text/uri-list", 0, 1},{"STRING", 0, 2}}; - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (ret), 12); + ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); label = gtk_label_new(_("Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list.")); @@ -817,8 +817,8 @@ GtkWidget *option; GtkWidget *button; - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (ret), 12); + ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); vbox = gaim_gtk_make_frame (ret, _("Display")); #ifdef USE_GTKSPELL @@ -882,8 +882,8 @@ GtkWidget *vbox; GList *l= NULL; GSList *sl; - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (ret), 12); + ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); vbox = gaim_gtk_make_frame (ret, _("Buddy List Sorting")); @@ -930,8 +930,8 @@ GtkSizeGroup *sg; GList *names = NULL; - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width(GTK_CONTAINER(ret), 12); + ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); vbox = gaim_gtk_make_frame(ret, _("Conversations")); @@ -1027,8 +1027,8 @@ GtkSizeGroup *sg; GaimProxyInfo *proxy_info; - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (ret), 12); + ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); vbox = gaim_gtk_make_frame (ret, _("IP Address")); @@ -1273,8 +1273,8 @@ GtkSizeGroup *sg; GList *browsers = NULL; - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (ret), 12); + ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); vbox = gaim_gtk_make_frame (ret, _("Browser Selection")); @@ -1343,8 +1343,8 @@ GtkWidget *box; int syslog_enabled = gaim_prefs_get_bool("/core/logging/log_system"); - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (ret), 12); + ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); vbox = gaim_gtk_make_frame (ret, _("Message Logs")); names = gaim_log_logger_get_options(); @@ -1565,8 +1565,8 @@ const char *cmd; #endif - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (ret), 12); + ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -1696,7 +1696,7 @@ g_object_unref(G_OBJECT(event_store)); gtk_container_add(GTK_CONTAINER(sw), event_view); - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); sound_entry = gtk_entry_new(); pref = g_strdup_printf("/gaim/gtk/sound/file/%s", @@ -1765,8 +1765,8 @@ GtkWidget *dd; GtkSizeGroup *sg; - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (ret), 12); + ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -1989,8 +1989,8 @@ GtkTreePath *path; GtkWidget *nb; - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (ret), 12); + ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); sw = gtk_scrolled_window_new(NULL,NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); @@ -2052,7 +2052,7 @@ gtk_label_set_selectable(GTK_LABEL(plugin_description), TRUE); gtk_label_set_line_wrap(GTK_LABEL(plugin_description), TRUE); gtk_misc_set_alignment(GTK_MISC(plugin_description), 0, 0); - gtk_misc_set_padding(GTK_MISC(plugin_description), 6, 6); + gtk_misc_set_padding(GTK_MISC(plugin_description), GAIM_HIG_BOX_SPACE, GAIM_HIG_BOX_SPACE); gtk_notebook_append_page(GTK_NOTEBOOK(nb), sw, gtk_label_new(_("Description"))); /* Details */ @@ -2070,7 +2070,7 @@ gtk_label_set_selectable(GTK_LABEL(plugin_details), TRUE); gtk_label_set_line_wrap(GTK_LABEL(plugin_details), TRUE); gtk_misc_set_alignment(GTK_MISC(plugin_details), 0, 0); - gtk_misc_set_padding(GTK_MISC(plugin_details), 6, 6); + gtk_misc_set_padding(GTK_MISC(plugin_details), GAIM_HIG_BOX_SPACE, GAIM_HIG_BOX_SPACE); gtk_notebook_append_page(GTK_NOTEBOOK(nb), sw, gtk_label_new(_("Details"))); gtk_box_pack_start(GTK_BOX(ret), nb, TRUE, TRUE, 0); @@ -2160,11 +2160,11 @@ gtk_window_set_role(GTK_WINDOW(prefs), "preferences"); gtk_window_set_title(GTK_WINDOW(prefs), _("Preferences")); gtk_window_set_resizable (GTK_WINDOW(prefs), FALSE); - gtk_container_set_border_width(GTK_CONTAINER(prefs), 12); + gtk_container_set_border_width(GTK_CONTAINER(prefs), GAIM_HIG_BORDER); g_signal_connect(G_OBJECT(prefs), "destroy", G_CALLBACK(delete_prefs), NULL); - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(prefs), vbox); gtk_widget_show(vbox); @@ -2175,7 +2175,7 @@ /* The buttons to press! */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), 6); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox);
--- a/src/gtkprivacy.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkprivacy.c Fri Aug 12 23:53:28 2005 +0000 @@ -396,13 +396,13 @@ gtk_window_set_resizable(GTK_WINDOW(dialog->win), FALSE); gtk_window_set_role(GTK_WINDOW(dialog->win), "privacy"); gtk_window_set_title(GTK_WINDOW(dialog->win), _("Privacy")); - gtk_container_set_border_width(GTK_CONTAINER(dialog->win), 12); + gtk_container_set_border_width(GTK_CONTAINER(dialog->win), GAIM_HIG_BORDER); g_signal_connect(G_OBJECT(dialog->win), "delete_event", G_CALLBACK(destroy_cb), dialog); /* Main vbox */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(dialog->win), vbox); gtk_widget_show(vbox); @@ -415,7 +415,7 @@ gtk_widget_show(label); /* Hbox for the accounts drop-down and label. */ - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox);
--- a/src/gtkrequest.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkrequest.c Fri Aug 12 23:53:28 2005 +0000 @@ -311,15 +311,15 @@ G_CALLBACK(input_response_cb), data); /* Setup the dialog */ - gtk_container_set_border_width(GTK_CONTAINER(dialog), 6); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 6); + gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER/2); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER/2); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 12); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ @@ -329,7 +329,7 @@ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); /* Vertical box */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); @@ -469,14 +469,14 @@ G_CALLBACK(choice_response_cb), data); /* Setup the dialog */ - gtk_container_set_border_width(GTK_CONTAINER(dialog), 6); + gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER/2); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER/2); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 12); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 6); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ @@ -486,7 +486,7 @@ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); /* Vertical box */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); /* Descriptive label */ @@ -509,7 +509,7 @@ g_free(label_text); - vbox2 = gtk_vbox_new(FALSE, 6); + vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0); while ((radio_text = va_arg(args, char*))) { int resp = va_arg(args, int); @@ -578,14 +578,14 @@ G_CALLBACK(action_response_cb), data); /* Setup the dialog */ - gtk_container_set_border_width(GTK_CONTAINER(dialog), 6); + gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER/2); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER/2); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 12); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 6); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ @@ -595,7 +595,7 @@ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); /* Vertical box */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); /* Descriptive label */ @@ -1210,7 +1210,7 @@ gint i; if (g_list_length(labels) == 2) - box = gtk_hbox_new(FALSE, 6); + box = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); else box = gtk_vbox_new(FALSE, 0); @@ -1386,14 +1386,14 @@ gtk_window_set_title(GTK_WINDOW(win), title); gtk_window_set_role(GTK_WINDOW(win), "multifield"); - gtk_container_set_border_width(GTK_CONTAINER(win), 12); + gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); gtk_window_set_resizable(GTK_WINDOW(win), FALSE); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(destroy_multifield_cb), data); /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, 12); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), hbox); gtk_widget_show(hbox); @@ -1405,7 +1405,7 @@ gtk_widget_show(img); /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); gtk_widget_show(vbox); @@ -1440,7 +1440,7 @@ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); gtk_widget_show(sw); - vbox2 = gtk_vbox_new(FALSE, 12); + vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox2); gtk_widget_show(vbox2); } else { @@ -1526,8 +1526,8 @@ } table = gtk_table_new(rows, 2 * cols, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 6); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); + gtk_table_set_row_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); + gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(frame), table); gtk_widget_show(table); @@ -1658,7 +1658,7 @@ /* Button box. */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), 6); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox);
--- a/src/gtkroomlist.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkroomlist.c Fri Aug 12 23:53:28 2005 +0000 @@ -330,22 +330,22 @@ gtk_window_set_role(GTK_WINDOW(window), "room list"); gtk_window_set_title(GTK_WINDOW(window), _("Room List")); - gtk_container_set_border_width(GTK_CONTAINER(window), 12); + gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog); /* Create the parent vbox for everything. */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(window), vbox); gtk_widget_show(vbox); - vbox2 = gtk_vbox_new(FALSE, 12); + vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(vbox), vbox2); gtk_widget_show(vbox2); /* accounts dropdown list */ - account_hbox = gtk_hbox_new(FALSE, 6); + account_hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox2), account_hbox, FALSE, FALSE, 0); gtk_widget_show(account_hbox); @@ -385,7 +385,7 @@ /* button box */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), 6); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox);
--- a/src/gtksavedstatuses.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtksavedstatuses.c Fri Aug 12 23:53:28 2005 +0000 @@ -397,7 +397,7 @@ gtk_window_set_default_size(GTK_WINDOW(win), width, height); gtk_window_set_role(GTK_WINDOW(win), "statuses"); gtk_window_set_title(GTK_WINDOW(win), _("Saved Statuses")); - gtk_container_set_border_width(GTK_CONTAINER(win), 12); + gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(status_window_destroy_cb), dialog); @@ -405,7 +405,7 @@ G_CALLBACK(configure_cb), dialog); /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), vbox); gtk_widget_show(vbox); @@ -415,7 +415,7 @@ /* Button box. */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), 6); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox); @@ -713,20 +713,20 @@ gtk_window_set_role(GTK_WINDOW(win), "status"); gtk_window_set_title(GTK_WINDOW(win), _("Status")); gtk_window_set_resizable(GTK_WINDOW(win), FALSE); - gtk_container_set_border_width(GTK_CONTAINER(win), 12); + gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(status_editor_destroy_cb), dialog); /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, 12); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), vbox); gtk_widget_show(vbox); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* Title */ - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -748,7 +748,7 @@ G_CALLBACK(editor_title_changed_cb), dialog); /* Status type */ - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -767,7 +767,7 @@ gtk_widget_show(dropdown); /* Status message */ - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -793,7 +793,7 @@ gtk_widget_show(disclosure); /* Setup the box that the disclosure will cover */ - dbox = gtk_vbox_new(FALSE, 18); + dbox = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); gtk_box_pack_start(GTK_BOX(vbox), dbox, FALSE, FALSE, 0); gaim_disclosure_set_container(GAIM_DISCLOSURE(disclosure), dbox); @@ -826,7 +826,7 @@ /* Button box */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), 6); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox);
--- a/src/gtkutils.c Fri Aug 12 22:30:36 2005 +0000 +++ b/src/gtkutils.c Fri Aug 12 23:53:28 2005 +0000 @@ -380,7 +380,7 @@ GtkWidget *vbox, *label, *hbox; char labeltitle[256]; - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(parent), vbox, FALSE, FALSE, 0); gtk_widget_show(vbox); @@ -394,7 +394,7 @@ gtk_widget_show(label); gaim_set_accessible_label (vbox, label); - hbox = gtk_hbox_new(FALSE, 6); + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -402,7 +402,7 @@ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_widget_show(label); - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); gtk_widget_show(vbox);