From 3cd8eb4d868fc59217187a127a39f3063e1eb270 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sun, 31 Dec 2006 11:07:04 +0000 Subject: [PATCH] 2006-12-31 [paul] 2.6.1cvs92 * src/prefs_summaries.c use gtk_button_new_from_stock() --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_summaries.c | 12 +++++++----- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32ec8bd8d..a6d05de63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-31 [paul] 2.6.1cvs92 + + * src/prefs_summaries.c + use gtk_button_new_from_stock() + 2006-12-30 [colin] 2.6.1cvs91 * src/folder.c diff --git a/PATCHSETS b/PATCHSETS index d9cb43b67..87df942b7 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2199,3 +2199,4 @@ ( cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_summaries.c; ) > 2.6.1cvs89.patchset ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_quote.c; cvs diff -u -r 1.12.2.37 -r 1.12.2.38 src/prefs_template.c; ) > 2.6.1cvs90.patchset ( cvs diff -u -r 1.213.2.128 -r 1.213.2.129 src/folder.c; cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/imap_gtk.c; cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/mh_gtk.c; ) > 2.6.1cvs91.patchset +( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_summaries.c; ) > 2.6.1cvs92.patchset diff --git a/configure.ac b/configure.ac index 94439e315..3bbeca563 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=91 +EXTRA_VERSION=92 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c index c7bbb5f23..e62ff462f 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -797,8 +797,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, label = gtk_label_new(_("Displayed columns")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(hbox_dispitem), label, FALSE, FALSE, 0); - button_dispitem = gtk_button_new_with_label - (_(" Edit... ")); + button_dispitem = gtk_button_new_from_stock(GTK_STOCK_EDIT); gtk_widget_show (button_dispitem); gtk_box_pack_start (GTK_BOX (hbox_dispitem), button_dispitem, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (button_dispitem), "clicked", @@ -918,7 +917,11 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, gtk_widget_set_size_request(entry_datefmt, 200, -1); gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0); - button_datefmt = gtk_button_new_with_label (" ... "); +#if GTK_CHECK_VERSION(2, 8, 0) + button_datefmt = gtk_button_new_from_stock(GTK_STOCK_INFO); +#else + button_datefmt = gtk_button_new_with_label ("Info..."); +#endif gtk_widget_show (button_datefmt); gtk_box_pack_start (GTK_BOX (hbox2), button_datefmt, FALSE, FALSE, 0); @@ -940,8 +943,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, label = gtk_label_new(_("Displayed columns")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(hbox_dispitem), label, FALSE, FALSE, 0); - button_dispitem = gtk_button_new_with_label - (_(" Edit... ")); + button_dispitem = gtk_button_new_from_stock(GTK_STOCK_EDIT); gtk_widget_show (button_dispitem); gtk_box_pack_start (GTK_BOX (hbox_dispitem), button_dispitem, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (button_dispitem), "clicked", -- 2.25.1