From 20ad883375e4fb876ebebfb7c9faf611155e9437 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Thu, 26 Jan 2006 05:43:08 +0000 Subject: [PATCH] 2006-01-26 [paul] 1.9.100cvs188 * src/prefs_display_header.c * src/prefs_folder_column.c * src/prefs_msg_colors.c * src/prefs_summaries.c * src/prefs_summary_column.c HIGify --- ChangeLog | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_display_header.c | 4 ++-- src/prefs_folder_column.c | 3 ++- src/prefs_msg_colors.c | 4 ++-- src/prefs_summaries.c | 8 ++++---- src/prefs_summary_column.c | 3 ++- 8 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43919e312..dafd67ec8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-01-26 [paul] 1.9.100cvs188 + + * src/prefs_display_header.c + * src/prefs_folder_column.c + * src/prefs_msg_colors.c + * src/prefs_summaries.c + * src/prefs_summary_column.c + HIGify + 2006-01-25 [colin] 1.9.100cvs187 * src/imap.c diff --git a/PATCHSETS b/PATCHSETS index 30144cfab..228c85d07 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1171,3 +1171,4 @@ ( cvs diff -u -r 1.100.2.33 -r 1.100.2.34 AUTHORS; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 po/Makevars; cvs diff -u -r 1.58.2.18 -r 1.58.2.19 po/de.po; cvs diff -u -r 1.10.2.8 -r 1.10.2.9 po/pl.po; cvs diff -u -r 1.50.2.14 -r 1.50.2.15 po/pt_BR.po; cvs diff -u -r 1.17.2.16 -r 1.17.2.17 po/sr.po; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/authors.h; ) > 1.9.100cvs185.patchset ( cvs diff -u -r 1.213.2.77 -r 1.213.2.78 src/folder.c; cvs diff -u -r 1.274.2.92 -r 1.274.2.93 src/mainwindow.c; cvs diff -u -r 1.382.2.229 -r 1.382.2.230 src/compose.c; ) > 1.9.100cvs186.patchset ( cvs diff -u -r 1.179.2.89 -r 1.179.2.90 src/imap.c; ) > 1.9.100cvs187.patchset +( cvs diff -u -r 1.16.2.17 -r 1.16.2.18 src/prefs_display_header.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_folder_column.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_summaries.c; cvs diff -u -r 1.10.2.12 -r 1.10.2.13 src/prefs_summary_column.c; ) > 1.9.100cvs188.patchset diff --git a/configure.ac b/configure.ac index 4e81f99ba..6e173ef39 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=100 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=187 +EXTRA_VERSION=188 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c index 5d141fac6..a966815cf 100644 --- a/src/prefs_display_header.c +++ b/src/prefs_display_header.c @@ -216,8 +216,8 @@ static void prefs_display_header_create(void) gtk_widget_show (btn_hbox); gtk_box_pack_end (GTK_BOX (vbox), btn_hbox, FALSE, FALSE, 0); - gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK, - &cancel_btn, GTK_STOCK_CANCEL, + gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL, + &ok_btn, GTK_STOCK_OK, NULL, NULL); gtk_widget_show (confirm_area); gtk_box_pack_end (GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0); diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c index c15ae4106..9d5d6f444 100644 --- a/src/prefs_folder_column.c +++ b/src/prefs_folder_column.c @@ -320,8 +320,9 @@ static void prefs_folder_column_create(void) G_CALLBACK(prefs_folder_column_set_to_default), NULL); - gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK, + gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL, + &ok_btn, GTK_STOCK_OK, NULL, NULL); gtk_widget_show(confirm_area); gtk_box_pack_end(GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0); diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c index 48b8f7b83..e35954efb 100644 --- a/src/prefs_msg_colors.c +++ b/src/prefs_msg_colors.c @@ -307,10 +307,10 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data) gtk_window_set_resizable(GTK_WINDOW(color_dialog), FALSE); manage_window_set_transient(GTK_WINDOW(color_dialog)); - g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button), - "clicked", G_CALLBACK(quote_colors_set_dialog_ok), data); g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button), "clicked", G_CALLBACK(quote_colors_set_dialog_cancel), data); + g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button), + "clicked", G_CALLBACK(quote_colors_set_dialog_ok), data); g_signal_connect(G_OBJECT(color_dialog), "key_press_event", G_CALLBACK(quote_colors_set_dialog_key_pressed),data); diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c index 2fd8474e2..6203cb3e5 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -257,8 +257,8 @@ static GtkWidget *date_format_create(GtkButton *button, void *data) gtk_label_set_justify(GTK_LABEL(label3), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment(GTK_MISC(label3), 0, 0.5); - gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK, - &cancel_btn, GTK_STOCK_CANCEL, NULL, NULL); + gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL, + &ok_btn, GTK_STOCK_OK, NULL, NULL); gtk_box_pack_start(GTK_BOX(vbox1), confirm_area, FALSE, FALSE, 0); gtk_widget_show(confirm_area); @@ -367,8 +367,8 @@ static void prefs_keybind_select(void) hbox1 = gtk_hbox_new (FALSE, 8); gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0); - gtkut_stock_button_set_create (&confirm_area, &ok_btn, GTK_STOCK_OK, - &cancel_btn, GTK_STOCK_CANCEL, + gtkut_stock_button_set_create (&confirm_area, &cancel_btn, GTK_STOCK_CANCEL, + &ok_btn, GTK_STOCK_OK, NULL, NULL); gtk_box_pack_end (GTK_BOX (hbox1), confirm_area, FALSE, FALSE, 0); gtk_widget_grab_focus (ok_btn); diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c index 643017ca8..290c00130 100644 --- a/src/prefs_summary_column.c +++ b/src/prefs_summary_column.c @@ -334,8 +334,9 @@ static void prefs_summary_column_create(void) G_CALLBACK(prefs_summary_column_set_to_default), NULL); - gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK, + gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL, + &ok_btn, GTK_STOCK_OK, NULL, NULL); gtk_widget_show(confirm_area); gtk_box_pack_end(GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0); -- 2.25.1