pidgin/pidgin

Remove PIDGIN_HIG_* constants

2020-07-16, Gary Kramlich
fb6e46c4c63c
Parents a377443c1338
Children 96402addd5c1
Remove PIDGIN_HIG_* constants

Remove the PIDGIN_HIG_* constants. This is a precursor to making pidgin.h a single include file.

Reviewed at https://reviews.imfreedom.org/r/41/
19 files changed, 131 insertions(+), 144 deletions(-)
  • +19 -20
    pidgin/gtkaccount.c
  • +6 -6
    pidgin/gtkblist.c
  • +13 -13
    pidgin/gtkconv.c
  • +4 -4
    pidgin/gtkdialogs.c
  • +7 -9
    pidgin/gtkmedia.c
  • +8 -8
    pidgin/gtknotify.c
  • +2 -2
    pidgin/gtkpluginpref.c
  • +8 -8
    pidgin/gtkpounce.c
  • +1 -1
    pidgin/gtkprefs.c
  • +36 -38
    pidgin/gtkrequest.c
  • +10 -10
    pidgin/gtksavedstatuses.c
  • +3 -3
    pidgin/gtksmiley-manager.c
  • +5 -5
    pidgin/gtkutils.c
  • +2 -2
    pidgin/minidialog.c
  • +0 -8
    pidgin/pidgin.h
  • +1 -1
    pidgin/plugins/gevolution/add_buddy_dialog.c
  • +1 -1
    pidgin/plugins/gevolution/assoc-buddy.c
  • +1 -1
    pidgin/plugins/gevolution/new_person_dialog.c
  • +4 -4
    pidgin/plugins/spellchk.c
    • --- a/pidgin/gtkaccount.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtkaccount.c Thu Jul 16 21:33:23 2020 -0500
    @@ -461,7 +461,7 @@
    gtk_widget_show(dialog->login_frame);
    /* Main vbox */
    - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_container_add(GTK_CONTAINER(frame), vbox);
    gtk_widget_show(vbox);
    @@ -651,7 +651,7 @@
    gtk_widget_show(dialog->user_frame);
    /* Main vbox */
    - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_container_add(GTK_CONTAINER(frame), vbox);
    gtk_widget_show(vbox);
    @@ -671,7 +671,7 @@
    gtk_widget_show(dialog->icon_check);
    gtk_box_pack_start(GTK_BOX(vbox), dialog->icon_check, FALSE, FALSE, 0);
    - dialog->icon_hbox = hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + dialog->icon_hbox = hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_widget_set_sensitive(hbox, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)));
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    gtk_widget_show(hbox);
    @@ -700,8 +700,8 @@
    gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
    gtk_widget_show(vbox2);
    - hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, PIDGIN_HIG_BORDER);
    + hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    + gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, 12);
    gtk_widget_show(hbox2);
    button = gtk_button_new_with_mnemonic(_("_Remove"));
    @@ -804,8 +804,8 @@
    account = dialog->account;
    /* Main vbox */
    - dialog->protocol_frame = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    - gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER);
    + dialog->protocol_frame = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    + gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
    gtk_notebook_insert_page(GTK_NOTEBOOK(dialog->notebook), vbox,
    gtk_label_new_with_mnemonic(_("Ad_vanced")), 1);
    gtk_widget_show(vbox);
    @@ -1110,7 +1110,7 @@
    gtk_widget_destroy(dialog->proxy_frame);
    /* Main vbox */
    - dialog->proxy_frame = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + dialog->proxy_frame = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_container_add(GTK_CONTAINER(parent), vbox);
    gtk_widget_show(vbox);
    @@ -1120,8 +1120,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_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    - gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, PIDGIN_HIG_BORDER);
    + dialog->proxy_vbox = vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    + gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 12);
    gtk_widget_show(vbox2);
    /* Host */
    @@ -1207,9 +1207,8 @@
    }
    if (!dialog->voice_frame) {
    - dialog->voice_frame = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    - gtk_container_set_border_width(GTK_CONTAINER(dialog->voice_frame),
    - PIDGIN_HIG_BORDER);
    + dialog->voice_frame = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    + gtk_container_set_border_width(GTK_CONTAINER(dialog->voice_frame), 12);
    dialog->suppression_check =
    gtk_check_button_new_with_mnemonic(_("Use _silence suppression"));
    @@ -1627,21 +1626,21 @@
    dialog->protocol = purple_protocols_find(dialog->protocol_id);
    dialog->window = win = pidgin_create_dialog((type == PIDGIN_ADD_ACCOUNT_DIALOG) ? _("Add Account") : _("Modify Account"),
    - PIDGIN_HIG_BOX_SPACE, "account", FALSE);
    + 6, "account", FALSE);
    g_signal_connect(G_OBJECT(win), "delete_event",
    G_CALLBACK(account_win_destroy_cb), dialog);
    /* Setup the vbox */
    - main_vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BOX_SPACE);
    + main_vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, 6);
    dialog->notebook = notebook = gtk_notebook_new();
    gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0);
    gtk_widget_show(GTK_WIDGET(notebook));
    /* Setup the inner vbox */
    - dialog->top_vbox = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    - gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER);
    + dialog->top_vbox = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    + gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
    gtk_label_new_with_mnemonic(_("_Basic")));
    gtk_widget_show(vbox);
    @@ -1666,8 +1665,8 @@
    add_account_options(dialog);
    /* Setup the page with 'Proxy'. */
    - dbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    - gtk_container_set_border_width(GTK_CONTAINER(dbox), PIDGIN_HIG_BORDER);
    + dbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    + gtk_container_set_border_width(GTK_CONTAINER(dbox), 12);
    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox,
    gtk_label_new_with_mnemonic(_("P_roxy")));
    gtk_widget_show(dbox);
    @@ -2404,7 +2403,7 @@
    G_CALLBACK(accedit_win_destroy_cb), accounts_window);
    /* Setup the vbox */
    - vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
    + vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, 12);
    /* Setup the scrolled window that will contain the list of accounts. */
    sw = create_accounts_list(dialog);
    --- a/pidgin/gtkblist.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtkblist.c Thu Jul 16 21:33:23 2020 -0500
    @@ -959,15 +959,15 @@
    gtk_window_set_title(GTK_WINDOW(data->window), title);
    gtk_window_set_transient_for(GTK_WINDOW(data->window), blist_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_container_set_border_width(GTK_CONTAINER(data->window), 6);
    gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(data->window))),
    - PIDGIN_HIG_BORDER);
    + 12);
    gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(data->window))),
    - PIDGIN_HIG_BOX_SPACE);
    + 6);
    gtk_window_set_role(GTK_WINDOW(data->window), window_role);
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(data->window))),
    hbox);
    gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
    @@ -4929,7 +4929,7 @@
    static GtkWidget *
    kiosk_page()
    {
    - GtkWidget *ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + GtkWidget *ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    GtkWidget *label;
    GtkWidget *entry;
    GtkWidget *bbox;
    @@ -4965,7 +4965,7 @@
    label = gtk_label_new(NULL);
    gtk_box_pack_start(GTK_BOX(ret), label, TRUE, TRUE, 0);
    - gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
    + gtk_container_set_border_width(GTK_CONTAINER(ret), 12);
    gtk_widget_show_all(ret);
    return ret;
    --- a/pidgin/gtkconv.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtkconv.c Thu Jul 16 21:33:23 2020 -0500
    @@ -3937,7 +3937,7 @@
    GtkWidget *hbox, *label;
    PidginChatPane *gtkchat = gtkconv->u.chat;
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new(_("Topic:"));
    @@ -4002,7 +4002,7 @@
    PurpleConversation *conv = gtkconv->active_conv;
    /* Build the right pane. */
    - lbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + lbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_paned_pack2(GTK_PANED(hpaned), lbox, FALSE, TRUE);
    gtk_widget_show(lbox);
    @@ -4125,7 +4125,7 @@
    int buddyicon_size = 0;
    /* Setup the top part of the pane */
    - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_widget_show(vbox);
    /* Setup the info pane */
    @@ -4253,7 +4253,7 @@
    g_signal_connect(G_OBJECT(gtkconv->history), "key_release_event",
    G_CALLBACK(refocus_entry_cb), gtkconv);
    - gtkconv->lower_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + gtkconv->lower_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_start(GTK_BOX(vbox), gtkconv->lower_hbox, FALSE, FALSE, 0);
    gtk_widget_show(gtkconv->lower_hbox);
    @@ -4393,9 +4393,9 @@
    G_CALLBACK(ignore_middle_click), NULL);
    /* Setup the container for the tab. */
    - gtkconv->tab_cont = tab_cont = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + gtkconv->tab_cont = tab_cont = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    g_object_set_data(G_OBJECT(tab_cont), "PidginConversation", gtkconv);
    - gtk_container_set_border_width(GTK_CONTAINER(tab_cont), PIDGIN_HIG_BOX_SPACE);
    + gtk_container_set_border_width(GTK_CONTAINER(tab_cont), 6);
    gtk_box_pack_start(GTK_BOX(tab_cont), pane, TRUE, TRUE, 0);
    gtk_widget_show(pane);
    @@ -5770,8 +5770,8 @@
    continue;
    if (horiz) {
    - if (x_rel >= allocation.x - PIDGIN_HIG_BOX_SPACE &&
    - x_rel <= allocation.x + allocation.width + PIDGIN_HIG_BOX_SPACE) {
    + if (x_rel >= allocation.x - 6 &&
    + x_rel <= allocation.x + allocation.width + 6) {
    page_num = i;
    if (to_right && x_rel >= allocation.x + allocation.width/2)
    @@ -5780,8 +5780,8 @@
    break;
    }
    } else {
    - if (y_rel >= allocation.y - PIDGIN_HIG_BOX_SPACE &&
    - y_rel <= allocation.y + allocation.height + PIDGIN_HIG_BOX_SPACE) {
    + if (y_rel >= allocation.y - 6 &&
    + y_rel <= allocation.y + allocation.height + 6) {
    page_num = i;
    if (to_right && y_rel >= allocation.y + allocation.height/2)
    @@ -8144,7 +8144,7 @@
    set_default_tab_colors(gtkconv->tab_label);
    gtk_widget_set_name(gtkconv->tab_label, "tab-label");
    - gtkconv->menu_tabby = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + gtkconv->menu_tabby = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtkconv->menu_label = gtk_label_new(tmp_lab);
    gtk_box_pack_start(GTK_BOX(gtkconv->menu_tabby), gtkconv->menu_icon, FALSE, FALSE, 0);
    @@ -8215,9 +8215,9 @@
    gtk_label_set_angle(GTK_LABEL(gtkconv->tab_label), angle);
    if (angle)
    - gtkconv->tabby = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + gtkconv->tabby = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    else
    - gtkconv->tabby = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + gtkconv->tabby = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_widget_set_name(gtkconv->tabby, "tab-container");
    /* select the correct ordering for verticle tabs */
    --- a/pidgin/gtkdialogs.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtkdialogs.c Thu Jul 16 21:33:23 2020 -0500
    @@ -383,14 +383,14 @@
    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), PIDGIN_HIG_BOX_SPACE);
    + gtk_container_set_border_width (GTK_CONTAINER(window), 6);
    gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))),
    - PIDGIN_HIG_BORDER);
    + 12);
    gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(window))),
    - PIDGIN_HIG_BOX_SPACE);
    + 6);
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(window))), hbox);
    img = gtk_image_new_from_icon_name("dialog-cool", GTK_ICON_SIZE_DIALOG);
    gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
    --- a/pidgin/gtkmedia.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtkmedia.c Thu Jul 16 21:33:23 2020 -0500
    @@ -333,11 +333,9 @@
    gtk_box_pack_start(GTK_BOX(vbox), media->priv->menubar,
    FALSE, TRUE, 0);
    - media->priv->display = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    - gtk_container_set_border_width(GTK_CONTAINER(media->priv->display),
    - PIDGIN_HIG_BOX_SPACE);
    - gtk_box_pack_start(GTK_BOX(vbox), media->priv->display,
    - TRUE, TRUE, PIDGIN_HIG_BOX_SPACE);
    + media->priv->display = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    + gtk_container_set_border_width(GTK_CONTAINER(media->priv->display), 6);
    + gtk_box_pack_start(GTK_BOX(vbox), media->priv->display, TRUE, TRUE, 6);
    gtk_widget_show(vbox);
    g_signal_connect(G_OBJECT(media), "delete-event",
    @@ -711,7 +709,7 @@
    g_return_val_if_reached(NULL);
    /* Setup widget structure */
    - volume_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + volume_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    progress_parent = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
    gtk_box_pack_start(GTK_BOX(volume_widget),
    progress_parent, TRUE, TRUE, 0);
    @@ -894,7 +892,7 @@
    if (gtkmedia->priv->recv_widget == NULL
    && type & (PURPLE_MEDIA_RECV_VIDEO |
    PURPLE_MEDIA_RECV_AUDIO)) {
    - recv_widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + recv_widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
    recv_widget, TRUE, TRUE, 0);
    gtk_widget_show(recv_widget);
    @@ -904,10 +902,10 @@
    if (gtkmedia->priv->send_widget == NULL
    && type & (PURPLE_MEDIA_SEND_VIDEO |
    PURPLE_MEDIA_SEND_AUDIO)) {
    - send_widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + send_widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
    send_widget, FALSE, TRUE, 0);
    - button_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + button_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_end(GTK_BOX(recv_widget), button_widget,
    FALSE, TRUE, 0);
    gtk_widget_show(send_widget);
    --- a/pidgin/gtknotify.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtknotify.c Thu Jul 16 21:33:23 2020 -0500
    @@ -563,14 +563,14 @@
    g_signal_connect(G_OBJECT(dialog), "response",
    G_CALLBACK(message_response_cb), dialog);
    - gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER);
    + gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
    gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    - PIDGIN_HIG_BORDER);
    + 12);
    gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    - PIDGIN_HIG_BOX_SPACE);
    + 6);
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    hbox);
    @@ -1002,7 +1002,7 @@
    /* Create the window */
    window = gtk_dialog_new();
    gtk_window_set_title(GTK_WINDOW(window), title ? title :_("Search Results"));
    - gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER);
    + gtk_container_set_border_width(GTK_CONTAINER(window), 12);
    gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
    g_signal_connect_swapped(G_OBJECT(window), "delete_event",
    @@ -1583,9 +1583,9 @@
    vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
    /* Setup the dialog */
    - gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BOX_SPACE);
    - gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BOX_SPACE);
    - gtk_box_set_spacing(GTK_BOX(vbox), PIDGIN_HIG_BORDER);
    + gtk_container_set_border_width(GTK_CONTAINER(dialog), 6);
    + gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
    + gtk_box_set_spacing(GTK_BOX(vbox), 12);
    /* Golden ratio it up! */
    gtk_widget_set_size_request(dialog, 550, 400);
    --- a/pidgin/gtkpluginpref.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtkpluginpref.c Thu Jul 16 21:33:23 2020 -0500
    @@ -95,7 +95,7 @@
    GtkWidget *input;
    GtkTextBuffer *buffer;
    - box = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_widget_show(box);
    gtk_box_pack_start(GTK_BOX(parent), box, FALSE, FALSE, 0);
    @@ -108,7 +108,7 @@
    if(sg)
    gtk_size_group_add_widget(sg, gtk_label);
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
    gtk_widget_show(hbox);
    --- a/pidgin/gtkpounce.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtkpounce.c Thu Jul 16 21:33:23 2020 -0500
    @@ -569,14 +569,14 @@
    vbox1 = gtk_dialog_get_content_area(GTK_DIALOG(window));
    /* Create the vbox that will contain all the prefs stuff. */
    - vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
    /* Create the "Pounce on Whom" frame. */
    frame = pidgin_make_frame(vbox2, _("Pounce on Whom"));
    /* Account: */
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    gtk_widget_show(hbox);
    @@ -596,7 +596,7 @@
    pidgin_set_accessible_label(dialog->account_menu, GTK_LABEL(label));
    /* Buddy: */
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    gtk_widget_show(hbox);
    @@ -630,7 +630,7 @@
    grid = gtk_grid_new();
    gtk_container_add(GTK_CONTAINER(frame), grid);
    - gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BORDER);
    + gtk_grid_set_column_spacing(GTK_GRID(grid), 12);
    gtk_widget_show(grid);
    dialog->signon =
    @@ -692,7 +692,7 @@
    grid = gtk_grid_new();
    gtk_container_add(GTK_CONTAINER(frame), grid);
    - gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BORDER);
    + gtk_grid_set_column_spacing(GTK_GRID(grid), 12);
    gtk_widget_show(grid);
    dialog->open_win
    @@ -779,7 +779,7 @@
    gtk_grid_attach(GTK_GRID(grid), dialog->play_sound_test, 3, 5, 1, 1);
    gtk_grid_attach(GTK_GRID(grid), dialog->play_sound_reset, 4, 5, 1, 1);
    - gtk_grid_set_row_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE / 2);
    + gtk_grid_set_row_spacing(GTK_GRID(grid), 3);
    gtk_widget_show(dialog->open_win);
    gtk_widget_show(dialog->popup);
    @@ -857,7 +857,7 @@
    grid = gtk_grid_new();
    gtk_container_add(GTK_CONTAINER(frame), grid);
    - gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BORDER);
    + gtk_grid_set_column_spacing(GTK_GRID(grid), 12);
    gtk_widget_show(grid);
    dialog->on_away =
    @@ -1373,7 +1373,7 @@
    G_CALLBACK(pounces_manager_configure_cb), dialog);
    /* Setup the vbox */
    - vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
    + vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, 12);
    /* List of saved buddy pounces */
    list = create_pounces_list(dialog);
    --- a/pidgin/gtkprefs.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtkprefs.c Thu Jul 16 21:33:23 2020 -0500
    @@ -2367,7 +2367,7 @@
    GList *it, *groups;
    GtkSizeGroup *sg;
    - box = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_box_pack_start(GTK_BOX(win->keyring.vbox), box, FALSE, FALSE, 0);
    sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
    --- a/pidgin/gtkrequest.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtkrequest.c Thu Jul 16 21:33:23 2020 -0500
    @@ -510,17 +510,17 @@
    G_CALLBACK(input_response_cb), data);
    /* Setup the dialog */
    - gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
    + gtk_container_set_border_width(GTK_CONTAINER(dialog), 6);
    gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    - PIDGIN_HIG_BORDER / 2);
    + 6);
    if (!multiline)
    gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
    gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    - PIDGIN_HIG_BORDER);
    + 12);
    /* Setup the main horizontal box */
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    hbox);
    @@ -533,7 +533,7 @@
    pidgin_request_add_help(GTK_DIALOG(dialog), cpar);
    /* Vertical box */
    - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
    @@ -664,15 +664,15 @@
    G_CALLBACK(choice_response_cb), data);
    /* Setup the dialog */
    - gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
    + gtk_container_set_border_width(GTK_CONTAINER(dialog), 6);
    gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    - PIDGIN_HIG_BORDER / 2);
    + 6);
    gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    - PIDGIN_HIG_BORDER);
    + 12);
    /* Setup the main horizontal box */
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    hbox);
    @@ -687,7 +687,7 @@
    pidgin_request_add_help(GTK_DIALOG(dialog), cpar);
    /* Vertical box */
    - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
    /* Descriptive label */
    @@ -711,7 +711,7 @@
    g_free(label_text);
    - vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0);
    while ((radio_text = va_arg(args, char*))) {
    gpointer resp = va_arg(args, gpointer);
    @@ -788,15 +788,15 @@
    G_CALLBACK(action_response_cb), data);
    /* Setup the dialog */
    - gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
    + gtk_container_set_border_width(GTK_CONTAINER(dialog), 6);
    gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    - PIDGIN_HIG_BORDER / 2);
    + 6);
    gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    - PIDGIN_HIG_BORDER);
    + 12);
    /* Setup the main horizontal box */
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    hbox);
    @@ -806,7 +806,7 @@
    gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
    /* Vertical box */
    - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
    pidgin_widget_decorate_account(hbox,
    @@ -897,17 +897,15 @@
    gtk_window_set_title(GTK_WINDOW(dialog), _("Please wait"));
    /* Setup the dialog */
    - gtk_container_set_border_width(GTK_CONTAINER(dialog),
    - PIDGIN_HIG_BORDER / 2);
    + gtk_container_set_border_width(GTK_CONTAINER(dialog), 6);
    gtk_container_set_border_width(GTK_CONTAINER(
    - gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
    - PIDGIN_HIG_BORDER / 2);
    + gtk_dialog_get_content_area(GTK_DIALOG(dialog))), 6);
    gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(
    - GTK_DIALOG(dialog))), PIDGIN_HIG_BORDER);
    + GTK_DIALOG(dialog))), 12);
    /* Setup the main horizontal box */
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(
    GTK_DIALOG(dialog))), hbox);
    @@ -922,7 +920,7 @@
    gtk_widget_set_can_default(button, FALSE);
    /* Vertical box */
    - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
    pidgin_widget_decorate_account(hbox,
    @@ -1259,7 +1257,7 @@
    GtkWidget *radio;
    if (num_labels == 2)
    - box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    else
    box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
    @@ -1800,7 +1798,7 @@
    GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1);
    gtk_widget_show(GTK_WIDGET(view));
    - buttons_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    + buttons_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    gtk_size_group_add_widget(buttons_sg, buttons_box);
    gtk_box_pack_start(GTK_BOX(main_box), scrollable, TRUE, TRUE, 0);
    @@ -1890,16 +1888,16 @@
    data->cbs[1] = cancel_cb;
    #ifdef _WIN32
    - data->dialog = win = pidgin_create_dialog(PIDGIN_ALERT_TITLE, PIDGIN_HIG_BORDER, "multifield", TRUE) ;
    + data->dialog = win = pidgin_create_dialog(PIDGIN_ALERT_TITLE, 12, "multifield", TRUE) ;
    #else /* !_WIN32 */
    - data->dialog = win = pidgin_create_dialog(title, PIDGIN_HIG_BORDER, "multifield", TRUE) ;
    + data->dialog = win = pidgin_create_dialog(title, 12, "multifield", TRUE) ;
    #endif /* _WIN32 */
    g_signal_connect(G_OBJECT(win), "delete_event",
    G_CALLBACK(destroy_multifield_cb), data);
    /* Setup the main horizontal box */
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
    gtk_container_add(GTK_CONTAINER(pidgin_dialog_get_vbox(GTK_DIALOG(win))), hbox);
    gtk_widget_show(hbox);
    @@ -1940,7 +1938,7 @@
    purple_request_cpar_get_account(cpar));
    /* Setup the vbox */
    - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
    gtk_widget_show(vbox);
    @@ -1978,8 +1976,8 @@
    pages = g_new0(GtkWidget*, tab_count);
    for (i = 0; i < tab_count; i++) {
    - pages[i] = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    - gtk_container_set_border_width(GTK_CONTAINER(pages[i]), PIDGIN_HIG_BORDER);
    + pages[i] = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    + gtk_container_set_border_width(GTK_CONTAINER(pages[i]), 12);
    gtk_notebook_append_page(notebook, pages[i], NULL);
    gtk_notebook_set_tab_label_text(notebook, pages[i], tab_names[i]);
    gtk_widget_show(pages[i]);
    @@ -2006,7 +2004,7 @@
    GTK_CONTAINER(pages[i]), 0);
    hbox_for_spacing =
    - gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
    + gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
    gtk_box_pack_start(GTK_BOX(pages[i]),
    pidgin_make_scrollable(hbox_for_spacing,
    GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC,
    @@ -2015,15 +2013,15 @@
    gtk_widget_show(hbox_for_spacing);
    vbox_for_spacing =
    - gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    + gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    gtk_box_pack_start(GTK_BOX(hbox_for_spacing),
    vbox_for_spacing, TRUE, TRUE,
    - PIDGIN_HIG_BOX_SPACE);
    + 6);
    gtk_widget_show(vbox_for_spacing);
    - pages[i] = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
    + pages[i] = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
    gtk_box_pack_start(GTK_BOX(vbox_for_spacing),
    - pages[i], TRUE, TRUE, PIDGIN_HIG_BOX_SPACE);
    + pages[i], TRUE, TRUE, 6);
    gtk_widget_show(pages[i]);
    }
    @@ -2139,8 +2137,8 @@
    }
    grid = gtk_grid_new();
    - gtk_grid_set_row_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE);
    - gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE);
    + gtk_grid_set_row_spacing(GTK_GRID(grid), 6);
    + gtk_grid_set_column_spacing(GTK_GRID(grid), 6);
    frame_fill = (notebook == NULL || contains_resizable);
    gtk_box_pack_start(GTK_BOX(frame), grid, frame_fill, frame_fill, 0);
    --- a/pidgin/gtksavedstatuses.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtksavedstatuses.c Thu Jul 16 21:33:23 2020 -0500
    @@ -550,7 +550,7 @@
    width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/status/dialog/width");
    height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/status/dialog/height");
    - dialog->window = win = pidgin_create_dialog(_("Saved Statuses"), PIDGIN_HIG_BORDER, "statuses", TRUE);
    + dialog->window = win = pidgin_create_dialog(_("Saved Statuses"), 12, "statuses", TRUE);
    gtk_window_set_default_size(GTK_WINDOW(win), width, height);
    g_signal_connect(G_OBJECT(win), "delete_event",
    @@ -559,7 +559,7 @@
    G_CALLBACK(configure_cb), dialog);
    /* Setup the vbox */
    - vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
    + vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, 12);
    /* List of saved status states */
    list = create_saved_status_list(dialog);
    @@ -1103,13 +1103,13 @@
    if (edit)
    dialog->original_title = g_strdup(purple_savedstatus_get_title(saved_status));
    - dialog->window = win = pidgin_create_dialog(_("Status"), PIDGIN_HIG_BORDER, "status", TRUE);
    + dialog->window = win = pidgin_create_dialog(_("Status"), 12, "status", TRUE);
    g_signal_connect(G_OBJECT(win), "destroy",
    G_CALLBACK(status_editor_destroy_cb), dialog);
    /* Setup the vbox */
    - vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
    + vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, 12);
    sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
    @@ -1159,7 +1159,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), expander, FALSE, FALSE, 0);
    /* Setup the box that the expander will cover */
    - dbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
    + dbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 18);
    gtk_container_add(GTK_CONTAINER(expander), dbox);
    /* Create the list model */
    @@ -1193,7 +1193,7 @@
    /* Button box */
    bbox = pidgin_dialog_get_action_area(GTK_DIALOG(win));
    - gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
    + gtk_box_set_spacing(GTK_BOX(bbox), 6);
    gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
    /* Cancel button */
    @@ -1402,19 +1402,19 @@
    dialog->account = account;
    tmp = g_strdup_printf(_("Status for %s"), purple_account_get_username(account));
    - dialog->window = win = pidgin_create_dialog(tmp, PIDGIN_HIG_BORDER, "substatus", TRUE);
    + dialog->window = win = pidgin_create_dialog(tmp, 12, "substatus", TRUE);
    g_free(tmp);
    g_signal_connect(G_OBJECT(win), "destroy",
    G_CALLBACK(substatus_editor_destroy_cb), dialog);
    /* Setup the vbox */
    - vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
    + vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, 12);
    sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
    /* Status type */
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new_with_mnemonic(_("_Status:"));
    @@ -1448,7 +1448,7 @@
    gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
    /* Status mesage */
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
    label = gtk_label_new_with_mnemonic(_("_Message:"));
    --- a/pidgin/gtksmiley-manager.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtksmiley-manager.c Thu Jul 16 21:33:23 2020 -0500
    @@ -337,14 +337,14 @@
    /* The vbox */
    vbox = gtk_grid_new();
    - gtk_grid_set_row_spacing(GTK_GRID(vbox), PIDGIN_HIG_BORDER);
    + gtk_grid_set_row_spacing(GTK_GRID(vbox), 12);
    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(
    edit_dialog->window)), vbox);
    gtk_widget_show(vbox);
    /* The hbox */
    hbox = gtk_grid_new();
    - gtk_grid_set_column_spacing(GTK_GRID(hbox), PIDGIN_HIG_BORDER);
    + gtk_grid_set_column_spacing(GTK_GRID(hbox), 12);
    gtk_grid_attach(GTK_GRID(vbox), hbox, 0, 0, 1, 1);
    label = GTK_LABEL(gtk_label_new_with_mnemonic(_("_Image:")));
    @@ -364,7 +364,7 @@
    /* info */
    hbox = gtk_grid_new();
    - gtk_grid_set_column_spacing(GTK_GRID(hbox), PIDGIN_HIG_BORDER);
    + gtk_grid_set_column_spacing(GTK_GRID(hbox), 12);
    gtk_grid_attach_next_to(GTK_GRID(vbox), hbox, NULL,
    GTK_POS_BOTTOM, 1, 1);
    --- a/pidgin/gtkutils.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/gtkutils.c Thu Jul 16 21:33:23 2020 -0500
    @@ -360,7 +360,7 @@
    GtkWidget *box;
    GtkWidget *label;
    - box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    menuitem = gtk_menu_item_new();
    @@ -393,7 +393,7 @@
    GtkLabel *label;
    char *labeltitle;
    - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_box_pack_start(GTK_BOX(parent), vbox, FALSE, FALSE, 0);
    gtk_widget_show(vbox);
    @@ -409,7 +409,7 @@
    gtk_widget_show(GTK_WIDGET(label));
    pidgin_set_accessible_label(vbox, label);
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
    gtk_widget_show(hbox);
    @@ -417,7 +417,7 @@
    gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label), FALSE, FALSE, 0);
    gtk_widget_show(GTK_WIDGET(label));
    - vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, FALSE, 0);
    gtk_widget_show(vbox2);
    @@ -1850,7 +1850,7 @@
    dialog->icon_preview = gtk_image_new();
    dialog->icon_text = gtk_label_new(NULL);
    - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_widget_set_size_request(GTK_WIDGET(vbox), -1, 50);
    gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(dialog->icon_preview), TRUE, FALSE, 0);
    gtk_box_pack_end(GTK_BOX(vbox), GTK_WIDGET(dialog->icon_text), FALSE, FALSE, 0);
    --- a/pidgin/minidialog.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/minidialog.c Thu Jul 16 21:33:23 2020 -0500
    @@ -449,9 +449,9 @@
    gtk_orientable_set_orientation(GTK_ORIENTABLE(self), GTK_ORIENTATION_VERTICAL);
    - gtk_container_set_border_width(GTK_CONTAINER(self), PIDGIN_HIG_BOX_SPACE);
    + gtk_container_set_border_width(GTK_CONTAINER(self), 6);
    - priv->title_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE));
    + priv->title_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6));
    priv->icon = GTK_IMAGE(gtk_image_new());
    gtk_widget_set_halign(GTK_WIDGET(priv->icon), GTK_ALIGN_START);
    --- a/pidgin/pidgin.h Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/pidgin.h Thu Jul 16 21:33:23 2020 -0500
    @@ -58,14 +58,6 @@
    # define PIDGIN_ALERT_TITLE PIDGIN_NAME
    #endif
    -/*
    - * Spacings between components, as defined by the
    - * GNOME Human Interface Guidelines.
    - */
    -#define PIDGIN_HIG_CAT_SPACE 18
    -#define PIDGIN_HIG_BORDER 12
    -#define PIDGIN_HIG_BOX_SPACE 6
    -
    /**
    * pidgin_start:
    *
    --- a/pidgin/plugins/gevolution/add_buddy_dialog.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Thu Jul 16 21:33:23 2020 -0500
    @@ -429,7 +429,7 @@
    if (username != NULL)
    dialog->username = g_strdup(username);
    - dialog->win = pidgin_create_window(_("Add Buddy"), PIDGIN_HIG_BORDER, "add_buddy", TRUE);
    + dialog->win = pidgin_create_window(_("Add Buddy"), 12, "add_buddy", TRUE);
    gtk_widget_set_size_request(dialog->win, -1, 400);
    g_signal_connect(G_OBJECT(dialog->win), "delete_event",
    --- a/pidgin/plugins/gevolution/assoc-buddy.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/plugins/gevolution/assoc-buddy.c Thu Jul 16 21:33:23 2020 -0500
    @@ -320,7 +320,7 @@
    dialog->buddy = buddy;
    - dialog->win = pidgin_create_window(NULL, PIDGIN_HIG_BORDER, "assoc_buddy", TRUE);
    + dialog->win = pidgin_create_window(NULL, 12, "assoc_buddy", TRUE);
    g_signal_connect(G_OBJECT(dialog->win), "delete_event",
    G_CALLBACK(delete_win_cb), dialog);
    --- a/pidgin/plugins/gevolution/new_person_dialog.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/plugins/gevolution/new_person_dialog.c Thu Jul 16 21:33:23 2020 -0500
    @@ -238,7 +238,7 @@
    dialog->book = book;
    g_object_ref(book);
    - dialog->win = pidgin_create_window(_("New Person"), PIDGIN_HIG_BORDER, "new_person", FALSE);
    + dialog->win = pidgin_create_window(_("New Person"), 12, "new_person", FALSE);
    g_signal_connect(G_OBJECT(dialog->win), "delete_event",
    G_CALLBACK(delete_win_cb), dialog);
    --- a/pidgin/plugins/spellchk.c Mon Jul 13 03:38:46 2020 -0500
    +++ b/pidgin/plugins/spellchk.c Thu Jul 16 21:33:23 2020 -0500
    @@ -2120,8 +2120,8 @@
    GtkWidget *vbox2;
    GtkWidget *vbox3;
    - ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
    - gtk_container_set_border_width (GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
    + ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, 18);
    + gtk_container_set_border_width (GTK_CONTAINER(ret), 12);
    vbox = pidgin_make_frame(ret, _("Text Replacements"));
    gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
    @@ -2206,10 +2206,10 @@
    vbox = pidgin_make_frame(ret, _("Add a new text replacement"));
    - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
    + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
    gtk_widget_show(hbox);
    - vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
    + vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
    gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
    gtk_widget_show(vbox2);