made the order of buttons comply with GNOME HIG.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@405 ee746299-78ed-0310-b773-934348b2243d

21 files changed, 161 insertions, 42 deletions

diff --git a/src/editaddress.c b/src/editaddress.c
index cda595bd..fbc91803 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -62,6 +62,7 @@ static struct _AddressEdit_dlg {
 static struct _PersonEdit_dlg {
 	GtkWidget *window;
 	GtkWidget *notebook;
+	GtkWidget *hbbox;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 	GtkWidget *statusbar;
@@ -691,6 +692,7 @@ static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
 
 	personeditdlg.window     = window;
 	personeditdlg.notebook   = notebook;
+	personeditdlg.hbbox      = hbbox;
 	personeditdlg.ok_btn     = ok_btn;
 	personeditdlg.cancel_btn = cancel_btn;
 	personeditdlg.statusbar  = statusbar;
@@ -1098,6 +1100,8 @@ ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent, I
 
 	if (!personeditdlg.window)
 		addressbook_edit_person_create(&cancelled);
+	gtkut_box_set_reverse_order(GTK_BOX(personeditdlg.hbbox),
+				    !prefs_common.comply_gnome_hig);
 	gtk_widget_grab_focus(personeditdlg.ok_btn);
 	gtk_widget_grab_focus(personeditdlg.entry_name);
 	gtk_widget_show(personeditdlg.window);
diff --git a/src/editbook.c b/src/editbook.c
index 67e6b3a6..65c757c6 100644
--- a/src/editbook.c
+++ b/src/editbook.c
@@ -57,6 +57,7 @@ static struct _AddrBookEdit_Dlg {
 	GtkWidget *window;
 	GtkWidget *name_entry;
 	GtkWidget *file_label;
+	GtkWidget *hbbox;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 	GtkWidget *check_btn;
@@ -248,6 +249,7 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
 	addrbookedit_dlg.window     = window;
 	addrbookedit_dlg.name_entry = name_entry;
 	addrbookedit_dlg.file_label = file_label;
+	addrbookedit_dlg.hbbox      = hbbox;
 	addrbookedit_dlg.ok_btn     = ok_btn;
 	addrbookedit_dlg.cancel_btn = cancel_btn;
 	addrbookedit_dlg.check_btn  = check_btn;
@@ -267,6 +269,8 @@ AdapterDSource *addressbook_edit_book( AddressIndex *addrIndex, AdapterDSource *
 
 	if (!addrbookedit_dlg.window)
 		addressbook_edit_book_create(&cancelled);
+	gtkut_box_set_reverse_order(GTK_BOX(addrbookedit_dlg.hbbox),
+				    !prefs_common.comply_gnome_hig);
 	gtk_widget_grab_focus(addrbookedit_dlg.ok_btn);
 	gtk_widget_grab_focus(addrbookedit_dlg.name_entry);
 	gtk_widget_show(addrbookedit_dlg.window);
diff --git a/src/editgroup.c b/src/editgroup.c
index 328d6c29..9ea307a7 100644
--- a/src/editgroup.c
+++ b/src/editgroup.c
@@ -66,6 +66,7 @@ typedef enum {
 
 static struct _GroupEdit_dlg {
 	GtkWidget *window;
+	GtkWidget *hbbox;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 	GtkWidget *statusbar;
@@ -401,6 +402,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
 			 G_CALLBACK(edit_group_list_group_button), NULL);
 
 	groupeditdlg.window     = window;
+	groupeditdlg.hbbox      = hbbox;
 	groupeditdlg.ok_btn     = ok_btn;
 	groupeditdlg.cancel_btn = cancel_btn;
 	groupeditdlg.statusbar  = statusbar;
@@ -445,6 +447,8 @@ ItemGroup *addressbook_edit_group( AddressBookFile *abf, ItemFolder *parent, Ite
 
 	if (!groupeditdlg.window)
 		addressbook_edit_group_create(&cancelled);
+	gtkut_box_set_reverse_order(GTK_BOX(groupeditdlg.hbbox),
+				    !prefs_common.comply_gnome_hig);
 	gtk_widget_grab_focus(groupeditdlg.ok_btn);
 	gtk_widget_grab_focus(groupeditdlg.entry_name);
 	gtk_widget_show(groupeditdlg.window);
diff --git a/src/editjpilot.c b/src/editjpilot.c
index d9ce8d56..eed03eef 100644
--- a/src/editjpilot.c
+++ b/src/editjpilot.c
@@ -64,6 +64,7 @@ static struct _JPilotEdit {
 	GtkWidget *file_entry;
 	GtkWidget *custom_check[JPILOT_NUM_CUSTOM_LABEL];
 	GtkWidget *custom_label[JPILOT_NUM_CUSTOM_LABEL];
+	GtkWidget *hbbox;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 	GtkWidget *statusbar;
@@ -373,6 +374,7 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) {
 	jpilotedit.window     = window;
 	jpilotedit.name_entry = name_entry;
 	jpilotedit.file_entry = file_entry;
+	jpilotedit.hbbox      = hbbox;
 	jpilotedit.ok_btn     = ok_btn;
 	jpilotedit.cancel_btn = cancel_btn;
 	jpilotedit.statusbar  = statusbar;
@@ -393,6 +395,8 @@ AdapterDSource *addressbook_edit_jpilot( AddressIndex *addrIndex, AdapterDSource
 
 	if( ! jpilotedit.window )
 		addressbook_edit_jpilot_create(&cancelled);
+	gtkut_box_set_reverse_order(GTK_BOX(jpilotedit.hbbox),
+				    !prefs_common.comply_gnome_hig);
 	gtk_widget_grab_focus(jpilotedit.ok_btn);
 	gtk_widget_grab_focus(jpilotedit.name_entry);
 	gtk_widget_show(jpilotedit.window);
diff --git a/src/editldap.c b/src/editldap.c
index 9ef42af7..1fabf748 100644
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -62,6 +62,7 @@
 static struct _LDAPEdit {
 	GtkWidget *window;
 	GtkWidget *notebook;
+	GtkWidget *hbbox;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 	GtkWidget *statusbar;
@@ -263,6 +264,7 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
 
 	ldapedit.window     = window;
 	ldapedit.notebook   = notebook;
+	ldapedit.hbbox      = hbbox;
 	ldapedit.ok_btn     = ok_btn;
 	ldapedit.cancel_btn = cancel_btn;
 	ldapedit.statusbar  = statusbar;
@@ -514,6 +516,8 @@ AdapterDSource *addressbook_edit_ldap( AddressIndex *addrIndex, AdapterDSource *
 
 	if (!ldapedit.window)
 		addressbook_edit_ldap_create(&cancelled);
+	gtkut_box_set_reverse_order(GTK_BOX(ldapedit.hbbox),
+				    !prefs_common.comply_gnome_hig);
 	gtk_notebook_set_current_page( GTK_NOTEBOOK(ldapedit.notebook), 0 );
 	gtk_widget_grab_focus(ldapedit.ok_btn);
 	gtk_widget_grab_focus(ldapedit.entry_name);
diff --git a/src/editldap_basedn.c b/src/editldap_basedn.c
index 7e3b3583..c9c61e58 100644
--- a/src/editldap_basedn.c
+++ b/src/editldap_basedn.c
@@ -56,6 +56,7 @@ static struct _LDAPEdit_basedn {
 	GtkWidget *port_label;
 	GtkWidget *basedn_entry;
 	GtkWidget *basedn_list;
+	GtkWidget *hbbox;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 	GtkWidget *statusbar;
@@ -241,6 +242,7 @@ static void edit_ldap_bdn_create(void) {
 	ldapedit_basedn.port_label = port_label;
 	ldapedit_basedn.basedn_entry = basedn_entry;
 	ldapedit_basedn.basedn_list  = basedn_list;
+	ldapedit_basedn.hbbox      = hbbox;
 	ldapedit_basedn.ok_btn     = ok_btn;
 	ldapedit_basedn.cancel_btn = cancel_btn;
 	ldapedit_basedn.statusbar  = statusbar;
@@ -305,6 +307,8 @@ gchar *edit_ldap_basedn_selection( const gchar *hostName, const gint port, gchar
 
 	ldapedit_basedn_cancelled = FALSE;
 	if( ! ldapedit_basedn.window ) edit_ldap_bdn_create();
+	gtkut_box_set_reverse_order(GTK_BOX(ldapedit_basedn.hbbox),
+				    !prefs_common.comply_gnome_hig);
 	gtk_widget_grab_focus(ldapedit_basedn.ok_btn);
 	gtk_widget_show(ldapedit_basedn.window);
 	manage_window_set_transient(GTK_WINDOW(ldapedit_basedn.window));
diff --git a/src/editvcard.c b/src/editvcard.c
index 0430fe56..851edac0 100644
--- a/src/editvcard.c
+++ b/src/editvcard.c
@@ -56,6 +56,7 @@ static struct _VCardEdit {
 	GtkWidget *window;
 	GtkWidget *name_entry;
 	GtkWidget *file_entry;
+	GtkWidget *hbbox;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 	GtkWidget *statusbar;
@@ -266,6 +267,7 @@ static void addressbook_edit_vcard_create( gboolean *cancelled ) {
 	vcardedit.window     = window;
 	vcardedit.name_entry = name_entry;
 	vcardedit.file_entry = file_entry;
+	vcardedit.hbbox      = hbbox;
 	vcardedit.ok_btn     = ok_btn;
 	vcardedit.cancel_btn = cancel_btn;
 	vcardedit.statusbar  = statusbar;
@@ -282,6 +284,8 @@ AdapterDSource *addressbook_edit_vcard( AddressIndex *addrIndex, AdapterDSource
 
 	if( ! vcardedit.window )
 		addressbook_edit_vcard_create(&cancelled);
+	gtkut_box_set_reverse_order(GTK_BOX(vcardedit.hbbox),
+				    !prefs_common.comply_gnome_hig);
 	gtk_widget_grab_focus(vcardedit.ok_btn);
 	gtk_widget_grab_focus(vcardedit.name_entry);
 	gtk_widget_show(vcardedit.window);
diff --git a/src/foldersel.c b/src/foldersel.c
index 0f93bb58..a039a5f5 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -54,6 +54,7 @@
 #include "folderview.h"
 #include "inputdialog.h"
 #include "folder.h"
+#include "prefs_common.h"
 
 enum {
 	FOLDERSEL_FOLDERNAME,
@@ -80,6 +81,7 @@ static GdkPixbuf *foldernoselect_pixbuf;
 static GtkWidget *window;
 static GtkWidget *treeview;
 static GtkWidget *entry;
+static GtkWidget *confirm_area;
 static GtkWidget *ok_button;
 static GtkWidget *cancel_button;
 static GtkWidget *new_button;
@@ -186,6 +188,8 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
 	} else
 		gtk_tree_view_scroll_to_point(GTK_TREE_VIEW(treeview), 0, 0);
 
+	gtkut_box_set_reverse_order(GTK_BOX(confirm_area),
+				    !prefs_common.comply_gnome_hig);
 	gtk_widget_grab_focus(ok_button);
 	gtk_widget_grab_focus(treeview);
 
@@ -217,7 +221,6 @@ static void foldersel_create(void)
 {
 	GtkWidget *vbox;
 	GtkWidget *scrolledwin;
-	GtkWidget *confirm_area;
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
 	GtkTreeSelection *selection;
diff --git a/src/gtkutils.c b/src/gtkutils.c
index dc1dac24..06b985e1 100644
--- a/src/gtkutils.c
+++ b/src/gtkutils.c
@@ -26,6 +26,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
+#include <gtk/gtkbox.h>
 #include <gtk/gtkhbbox.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkarrow.h>
@@ -110,6 +111,13 @@ void gtkut_convert_int_to_gdk_color(gint rgbvalue, GdkColor *color)
 	color->blue  = (int) (((gdouble) (rgbvalue & 0x0000ff)        / 255.0) * 65535.0);
 }
 
+static gboolean reverse_order = FALSE;
+
+void gtkut_stock_button_set_set_reverse(gboolean reverse)
+{
+	reverse_order = reverse;
+}
+
 void gtkut_stock_button_set_create(GtkWidget **bbox,
 				   GtkWidget **button1, const gchar *label1,
 				   GtkWidget **button2, const gchar *label2,
@@ -120,26 +128,58 @@ void gtkut_stock_button_set_create(GtkWidget **bbox,
 
 	*bbox = gtk_hbutton_box_new();
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(*bbox), GTK_BUTTONBOX_END);
-	gtk_box_set_spacing(GTK_BOX(*bbox), 5);
+	gtk_box_set_spacing(GTK_BOX(*bbox), 6);
 
-	*button1 = gtk_button_new_from_stock(label1);
-	GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
-	gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
-	gtk_widget_show(*button1);
+	if (button3) {
+		*button3 = gtk_button_new_from_stock(label3);
+		GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
+		gtk_box_pack_start(GTK_BOX(*bbox), *button3, FALSE, FALSE, 0);
+		gtk_widget_show(*button3);
+	}
 
 	if (button2) {
 		*button2 = gtk_button_new_from_stock(label2);
 		GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
-		gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
+		gtk_box_pack_start(GTK_BOX(*bbox), *button2, FALSE, FALSE, 0);
 		gtk_widget_show(*button2);
 	}
 
-	if (button3) {
-		*button3 = gtk_button_new_from_stock(label3);
-		GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
-		gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
-		gtk_widget_show(*button3);
+	*button1 = gtk_button_new_from_stock(label1);
+	GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
+	gtk_box_pack_start(GTK_BOX(*bbox), *button1, FALSE, FALSE, 0);
+	gtk_widget_show(*button1);
+
+	if (reverse_order)
+		gtkut_box_set_reverse_order(GTK_BOX(*bbox), TRUE);
+}
+
+void gtkut_box_set_reverse_order(GtkBox *box, gboolean reverse)
+{
+	GList *cur;
+	GList *new_order = NULL;
+	gint pos = 0;
+	gboolean is_reversed;
+
+	g_return_if_fail(box != NULL);
+
+	is_reversed = GPOINTER_TO_INT
+		(g_object_get_data(G_OBJECT(box), "reverse-order"));
+	if (is_reversed == reverse)
+		return;
+	g_object_set_data(G_OBJECT(box), "reverse-order",
+			  GINT_TO_POINTER(reverse));
+
+	for (cur = box->children; cur != NULL; cur = cur->next) {
+		GtkBoxChild *cinfo = cur->data;
+		new_order = g_list_prepend(new_order, cinfo->widget);
 	}
+
+	for (cur = new_order; cur != NULL; cur = cur->next) {
+		GtkWidget *child = cur->data;
+		gtk_box_reorder_child(box, child, pos++);
+	}
+
+	g_list_free(new_order);
 }
 
 static void combo_button_size_request(GtkWidget *widget,
diff --git a/src/gtkutils.h b/src/gtkutils.h
index 8f46b603..61008825 100644
--- a/src/gtkutils.h
+++ b/src/gtkutils.h
@@ -94,6 +94,7 @@ void gtkut_widget_set_small_font_size	(GtkWidget	*widget);
 void gtkut_convert_int_to_gdk_color	(gint		 rgbvalue,
 					 GdkColor	*color);
 
+void gtkut_stock_button_set_set_reverse	(gboolean	 reverse);
 void gtkut_stock_button_set_create	(GtkWidget	**bbox,
 					 GtkWidget	**button1,
 					 const gchar	 *label1,
@@ -102,6 +103,9 @@ void gtkut_stock_button_set_create	(GtkWidget	**bbox,
 					 GtkWidget	**button3,
 					 const gchar	 *label3);
 
+void gtkut_box_set_reverse_order	(GtkBox		*box,
+					 gboolean	 reverse);
+
 ComboButton *gtkut_combo_button_create	(GtkWidget		*button,
 					 GtkItemFactoryEntry	*entries,
 					 gint			 n_entries,
diff --git a/src/inputdialog.c b/src/inputdialog.c
index e0458b28..5ebdee85 100644
--- a/src/inputdialog.c
+++ b/src/inputdialog.c
@@ -41,6 +41,7 @@
 #include "inputdialog.h"
 #include "manage_window.h"
 #include "inc.h"
+#include "prefs_common.h"
 #include "gtkutils.h"
 #include "utils.h"
 
@@ -62,6 +63,7 @@ static GtkWidget *dialog;
 static GtkWidget *msg_label;
 static GtkWidget *entry;
 static GtkWidget *combo;
+static GtkWidget *confirm_area;
 static GtkWidget *ok_button;
 
 static void input_dialog_create	(void);
@@ -163,7 +165,6 @@ static void input_dialog_create(void)
 {
 	GtkWidget *vbox;
 	GtkWidget *hbox;
-	GtkWidget *confirm_area;
 	GtkWidget *cancel_button;
 
 	dialog = gtk_dialog_new();
@@ -214,7 +215,6 @@ static void input_dialog_create(void)
 	g_signal_connect(G_OBJECT(cancel_button), "clicked",
 			 G_CALLBACK(cancel_clicked), NULL);
 
-
 	gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
 }
 
@@ -228,6 +228,8 @@ static gchar *input_dialog_open(const gchar *title, const gchar *message,
 	if (!dialog)
 		input_dialog_create();
 
+	gtkut_box_set_reverse_order(GTK_BOX(confirm_area),
+				    !prefs_common.comply_gnome_hig);
 	input_dialog_set(title, message, default_string);
 	gtk_widget_show(dialog);
 	gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
diff --git a/src/prefs.c b/src/prefs.c
index 2b0630c9..973e7f1f 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -504,11 +504,12 @@ void prefs_dialog_create(PrefsDialog *dialog)
 	gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
 	gtk_widget_grab_default(ok_btn);
 
-	dialog->window     = window;
-	dialog->notebook   = notebook;
-	dialog->ok_btn     = ok_btn;
-	dialog->cancel_btn = cancel_btn;
-	dialog->apply_btn  = apply_btn;
+	dialog->window       = window;
+	dialog->notebook     = notebook;
+	dialog->confirm_area = confirm_area;
+	dialog->ok_btn       = ok_btn;
+	dialog->cancel_btn   = cancel_btn;
+	dialog->apply_btn    = apply_btn;
 }
 
 void prefs_dialog_destroy(PrefsDialog *dialog)
diff --git a/src/prefs.h b/src/prefs.h
index 831b39e9..015dd002 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -75,6 +75,7 @@ struct _PrefsDialog
 	GtkWidget *window;
 	GtkWidget *notebook;
 
+	GtkWidget *confirm_area;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 	GtkWidget *apply_btn;
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 1c243157..90aedd0e 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -38,6 +38,7 @@
 #include "prefs.h"
 #include "prefs_account.h"
 #include "prefs_customheader.h"
+#include "prefs_common.h"
 #include "account.h"
 #include "mainwindow.h"
 #include "manage_window.h"
@@ -632,6 +633,8 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
 		prefs_account_create();
 	}
 
+	gtkut_box_set_reverse_order(GTK_BOX(dialog.confirm_area),
+				    !prefs_common.comply_gnome_hig);
 	manage_window_set_transient(GTK_WINDOW(dialog.window));
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(dialog.notebook), 0);
 	gtk_widget_grab_focus(dialog.ok_btn);
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index f1d0b439..8d3ad758 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -47,6 +47,7 @@ static struct Actions
 {
 	GtkWidget *window;
 
+	GtkWidget *confirm_area;
 	GtkWidget *ok_btn;
 
 	GtkWidget *name_entry;
@@ -99,6 +100,8 @@ void prefs_actions_open(MainWindow *mainwin)
 	if (!actions.window)
 		prefs_actions_create(mainwin);
 
+	gtkut_box_set_reverse_order(GTK_BOX(actions.confirm_area),
+				    !prefs_common.comply_gnome_hig);
 	manage_window_set_transient(GTK_WINDOW(actions.window));
 	gtk_widget_grab_focus(actions.ok_btn);
 
@@ -318,6 +321,8 @@ static void prefs_actions_create(MainWindow *mainwin)
 	gtk_widget_show(window);
 
 	actions.window = window;
+
+	actions.confirm_area = confirm_area;
 	actions.ok_btn = ok_btn;
 
 	actions.name_entry = name_entry;
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 83b560c7..8d9f6630 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -182,6 +182,7 @@ static struct Interface {
 	GtkWidget *optmenu_recvdialog;
 	GtkWidget *checkbtn_no_recv_err_panel;
 	GtkWidget *checkbtn_close_recv_dialog;
+	GtkWidget *checkbtn_comply_gnome_hig;
 } interface;
 
 static struct Other {
@@ -637,8 +638,6 @@ static PrefParam param[] = {
 	{"separate_message", "FALSE", &prefs_common.sep_msg, P_BOOL,
 	 NULL, NULL, NULL},
 
-	{"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL,
-	 NULL, NULL, NULL},
 	{"always_show_message_when_selected", "FALSE",
 	 &prefs_common.always_show_msg,
 	 P_BOOL, &interface.checkbtn_always_show_msg,
@@ -667,6 +666,10 @@ static PrefParam param[] = {
 	 P_BOOL, &interface.checkbtn_close_recv_dialog,
 	 prefs_set_data_from_toggle, prefs_set_toggle},
 
+	{"comply_gnome_hig", "TRUE", &prefs_common.comply_gnome_hig, P_BOOL,
+	 &interface.checkbtn_comply_gnome_hig,
+	 prefs_set_data_from_toggle, prefs_set_toggle},
+
 	/* Other */
 	{"uri_open_command", DEFAULT_BROWSER_CMD,
 	 &prefs_common.uri_cmd, P_STRING,
@@ -814,6 +817,9 @@ void prefs_common_read_config(void)
 
 	prefs_common.online_mode = TRUE;
 
+	gtkut_stock_button_set_set_reverse(!prefs_common.comply_gnome_hig);
+	prefs_common_junk_filter_list_set();
+
 	path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMAND_HISTORY,
 			   NULL);
 	if ((fp = fopen(path, "rb")) == NULL) {
@@ -832,8 +838,6 @@ void prefs_common_read_config(void)
 
 	prefs_common.mime_open_cmd_history =
 		g_list_reverse(prefs_common.mime_open_cmd_history);
-
-	prefs_common_junk_filter_list_set();
 }
 
 void prefs_common_write_config(void)
@@ -870,6 +874,8 @@ void prefs_common_open(void)
 		prefs_common_create();
 	}
 
+	gtkut_box_set_reverse_order(GTK_BOX(dialog.confirm_area),
+				    !prefs_common.comply_gnome_hig);
 	manage_window_set_transient(GTK_WINDOW(dialog.window));
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(dialog.notebook), 0);
 	gtk_widget_grab_focus(dialog.ok_btn);
@@ -2182,6 +2188,7 @@ static void prefs_interface_create(void)
 	GtkWidget *menuitem;
 	GtkWidget *checkbtn_no_recv_err_panel;
 	GtkWidget *checkbtn_close_recv_dialog;
+	GtkWidget *checkbtn_comply_gnome_hig;
 
 	GtkWidget *button_keybind;
 
@@ -2264,6 +2271,9 @@ static void prefs_interface_create(void)
 	PACK_CHECK_BUTTON (vbox_recv, checkbtn_close_recv_dialog,
 			   _("Close receive dialog when finished"));
 
+	PACK_CHECK_BUTTON (vbox1, checkbtn_comply_gnome_hig,
+			   _("Make the order of buttons comply with GNOME HIG"));
+
 	hbox1 = gtk_hbox_new (FALSE, 8);
 	gtk_widget_show (hbox1);
 	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
@@ -2283,6 +2293,8 @@ static void prefs_interface_create(void)
 	interface.optmenu_recvdialog         = optmenu_recvdialog;
 	interface.checkbtn_no_recv_err_panel = checkbtn_no_recv_err_panel;
 	interface.checkbtn_close_recv_dialog = checkbtn_close_recv_dialog;
+
+	interface.checkbtn_comply_gnome_hig  = checkbtn_comply_gnome_hig;
 }
 
 static void prefs_other_create(void)
@@ -3783,6 +3795,7 @@ static void prefs_common_apply(void)
 {
 	prefs_set_data_from_dialog(param);
 	prefs_common_junk_filter_list_set();
+	gtkut_stock_button_set_set_reverse(!prefs_common.comply_gnome_hig);
 	main_window_reflect_prefs_all();
 	sock_set_io_timeout(prefs_common.io_timeout_secs);
 	prefs_common_write_config();
diff --git a/src/prefs_common.h b/src/prefs_common.h
index 7faf27ae..56889b3c 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -208,22 +208,23 @@ struct _PrefsCommon
 	/* Interface */
 	gboolean sep_folder;
 	gboolean sep_msg;
-	gboolean emulate_emacs;
 	gboolean always_show_msg;
 	gboolean open_unread_on_enter;
 	gboolean mark_as_read_on_new_window;
 	gboolean open_inbox_on_inc;
 	gboolean immediate_exec;
 	RecvDialogMode recv_dialog_mode;
-	gboolean close_recv_dialog;
 	gboolean no_recv_err_panel;
-	gboolean add_address_by_click;
+	gboolean close_recv_dialog;
+	gboolean comply_gnome_hig;
 
 	/* Other */
 	gchar *uri_cmd;
 	gchar *print_cmd;
 	gchar *ext_editor_cmd;
 
+	gboolean add_address_by_click;
+
 	gboolean confirm_on_exit;
 	gboolean clean_on_exit;
 	gboolean ask_on_clean;
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index ff508ae1..42c88306 100644
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -44,6 +44,7 @@
 static struct DisplayHeader {
 	GtkWidget *window;
 
+	GtkWidget *confirm_area;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 
@@ -132,6 +133,8 @@ void prefs_display_header_open(void)
 		prefs_display_header_create();
 	}
 
+	gtkut_box_set_reverse_order(GTK_BOX(dispheader.confirm_area),
+				    !prefs_common.comply_gnome_hig);
 	manage_window_set_transient(GTK_WINDOW(dispheader.window));
 	gtk_widget_grab_focus(dispheader.ok_btn);
 
@@ -145,9 +148,9 @@ static void prefs_display_header_create(void)
 	GtkWidget *window;
 	GtkWidget *vbox;
 	GtkWidget *btn_hbox;
+	GtkWidget *confirm_area;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
-	GtkWidget *confirm_area;
 
 	GtkWidget *vbox1;
 
@@ -341,6 +344,8 @@ static void prefs_display_header_create(void)
 	gtk_widget_show_all(window);
 
 	dispheader.window        = window;
+
+	dispheader.confirm_area  = confirm_area;
 	dispheader.ok_btn        = ok_btn;
 	dispheader.cancel_btn    = cancel_btn;
 
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index d5d78812..7197f8e6 100644
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -58,6 +58,7 @@ static struct _SummaryColumnDialog
 
 	GtkWidget *default_btn;
 
+	GtkWidget *confirm_area;
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 
@@ -117,6 +118,8 @@ void prefs_summary_column_open(void)
 	if (!summary_col.window)
 		prefs_summary_column_create();
 
+	gtkut_box_set_reverse_order(GTK_BOX(summary_col.confirm_area),
+				    !prefs_common.comply_gnome_hig);
 	manage_window_set_transient(GTK_WINDOW(summary_col.window));
 	gtk_widget_grab_focus(summary_col.ok_btn);
 
@@ -316,15 +319,16 @@ static void prefs_summary_column_create(void)
 	g_signal_connect(G_OBJECT(cancel_btn), "clicked",
 			 G_CALLBACK(prefs_summary_column_cancel), NULL);
 
-	summary_col.window      = window;
-	summary_col.stock_clist = stock_clist;
-	summary_col.shown_clist = shown_clist;
-	summary_col.add_btn     = add_btn;
-	summary_col.remove_btn  = remove_btn;
-	summary_col.up_btn      = up_btn;
-	summary_col.down_btn    = down_btn;
-	summary_col.ok_btn      = ok_btn;
-	summary_col.cancel_btn  = cancel_btn;
+	summary_col.window       = window;
+	summary_col.stock_clist  = stock_clist;
+	summary_col.shown_clist  = shown_clist;
+	summary_col.add_btn      = add_btn;
+	summary_col.remove_btn   = remove_btn;
+	summary_col.up_btn       = up_btn;
+	summary_col.down_btn     = down_btn;
+	summary_col.confirm_area = confirm_area;
+	summary_col.ok_btn       = ok_btn;
+	summary_col.cancel_btn   = cancel_btn;
 }
 
 SummaryColumnState *prefs_summary_column_get_config(void)
diff --git a/src/prefs_template.c b/src/prefs_template.c
index e9a345f6..e3eeb1fe 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -42,13 +42,15 @@
 
 static struct Templates {
 	GtkWidget *window;
-	GtkWidget *ok_btn;
 	GtkWidget *clist_tmpls;
 	GtkWidget *entry_name;
 	GtkWidget *entry_to;
 	GtkWidget *entry_cc;
 	GtkWidget *entry_subject;
 	GtkWidget *text_value;
+	GtkWidget *confirm_area;
+	GtkWidget *ok_btn;
+	GtkWidget *cancel_btn;
 } templates;
 
 /* widget creating functions */
@@ -181,8 +183,10 @@ static void prefs_template_window_create(void)
 	scroll2 = gtk_scrolled_window_new(NULL, NULL);
 	gtk_widget_show(scroll2);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll2),
-				       GTK_POLICY_NEVER,
-				       GTK_POLICY_ALWAYS);
+				       GTK_POLICY_AUTOMATIC,
+				       GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll2),
+					    GTK_SHADOW_IN);
 	gtk_box_pack_start(GTK_BOX(vbox1), scroll2, TRUE, TRUE, 0);
 
 	text_value = gtk_text_view_new();
@@ -259,7 +263,8 @@ static void prefs_template_window_create(void)
 
 	/* ok | cancel */
 	gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
-				&cancel_btn, GTK_STOCK_CANCEL, NULL, NULL);
+				      &cancel_btn, GTK_STOCK_CANCEL,
+				      NULL, NULL);
 	gtk_widget_show(confirm_area);
 	gtk_box_pack_end(GTK_BOX(vbox2), confirm_area, FALSE, FALSE, 0);
 	gtk_widget_grab_default(ok_btn);
@@ -279,13 +284,15 @@ static void prefs_template_window_create(void)
 	address_completion_start(window);
 
 	templates.window = window;
-	templates.ok_btn = ok_btn;
 	templates.clist_tmpls = clist_tmpls;
 	templates.entry_name = entry_name;
 	templates.entry_to = entry_to;
 	templates.entry_cc = entry_cc;
 	templates.entry_subject = entry_subject;
 	templates.text_value = text_value;
+	templates.confirm_area = confirm_area;
+	templates.ok_btn = ok_btn;
+	templates.cancel_btn = cancel_btn;
 }
 
 static void prefs_template_window_setup(void)
@@ -297,6 +304,8 @@ static void prefs_template_window_setup(void)
 	gint row;
 	Template *tmpl;
 
+	gtkut_box_set_reverse_order(GTK_BOX(templates.confirm_area),
+				    !prefs_common.comply_gnome_hig);
 	manage_window_set_transient(GTK_WINDOW(templates.window));
 	gtk_widget_grab_focus(templates.ok_btn);
 
diff --git a/src/summary_search.c b/src/summary_search.c
index 27cf7400..2fc54b84 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -253,7 +253,7 @@ static void summary_search_create(void)
 	gtk_widget_show (confirm_area);
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(confirm_area),
 				  GTK_BUTTONBOX_END);
-	gtk_box_set_spacing(GTK_BOX(confirm_area), 5);
+	gtk_box_set_spacing(GTK_BOX(confirm_area), 6);
 
 	all_btn = gtk_button_new_from_stock(_("Find all"));
 	GTK_WIDGET_SET_FLAGS(all_btn, GTK_CAN_DEFAULT);