Added PACK_HSPACER macro to prefs_gtk.h

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 5f1cc8fdd9a9a0b7b000561ec479ee96d5022b29..137ebbceecf9955ac4bce25156c0684f1b047da7 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1639,7 +1639,7 @@ static void receive_create_widget_func(PrefsPage * _page,
 
        SET_TOGGLE_SENSITIVITY (size_limit_checkbtn, size_limit_spinbtn);
 
-       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+       PACK_SPACER(vbox2, vbox3, VSPACING_NARROW_2);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -1973,7 +1973,7 @@ static void send_create_widget_func(PrefsPage * _page,
        COMBOBOX_ADD (menu, "DIGEST-MD5", SMTPAUTH_DIGEST_MD5);
        gtk_list_store_set(menu, &iter, COMBOBOX_SENS, FALSE, -1);
 
-       PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
+       PACK_SPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
 
        hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox);
@@ -1997,7 +1997,7 @@ static void send_create_widget_func(PrefsPage * _page,
                        GINT_TO_POINTER(ac_prefs->protocol));
 
 #ifdef GENERIC_UMPC
-       PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
+       PACK_SPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
        hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox);
        gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
@@ -2027,7 +2027,7 @@ static void send_create_widget_func(PrefsPage * _page,
        g_signal_connect(G_OBJECT(showpwd_checkbtn), "toggled",
                        G_CALLBACK(prefs_account_showpwd_checkbtn_toggled), smtp_pass_entry);
 
-       PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
+       PACK_SPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
 
        hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox);

diff --git a/src/prefs_gtk.h b/src/prefs_gtk.h
index 93ef428a27fc3841a80370a8b863b382776a8a4a..1bf3d557d10d498ed0235576fbd73f4e958b004f 100644 (file)
--- a/src/prefs_gtk.h
+++ b/src/prefs_gtk.h
@@ -108,7 +108,8 @@ struct _PrefsDialog
        gtk_frame_set_label_align(GTK_FRAME(frame), 0.01, 0.5); \
 }
 
-#define PACK_VSPACER(box, vbox, spacing) \
+/* This can be used in vboxes, as well as in hboxes. */
+#define PACK_SPACER(box, vbox, spacing) \
 { \
        vbox = gtk_vbox_new(FALSE, 0); \
        gtk_widget_show(vbox); \

diff --git a/src/prefs_template.c b/src/prefs_template.c
index 06e54ba51d2354010198b07e6b508cdfa8b55d22..df28235e923b6377e9a6d531fbeabba9c24ed996 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -368,7 +368,7 @@ static void prefs_template_window_create(void)
        CLAWS_SET_TIP(top_btn,
                        _("Move the selected template to the top"));
 
-       PACK_VSPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
+       PACK_SPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
 
        up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
        gtk_widget_show(up_btn);
@@ -386,7 +386,7 @@ static void prefs_template_window_create(void)
        CLAWS_SET_TIP(down_btn,
                        _("Move the selected template down"));
 
-       PACK_VSPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
+       PACK_SPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
 
        bottom_btn = gtk_button_new_from_stock(GTK_STOCK_GOTO_BOTTOM);
        gtk_widget_show(bottom_btn);