2006-06-29 [wwp] 2.3.1cvs37

	* src/prefs_actions.c
		forgot to commit that one (use of GTK_STOCK_INFO).

diff --git a/ChangeLog b/ChangeLog
index 0e0b81ef66a9ba871d874932beb292538dcbf4ef..d3c356e357cd895c803d961b5767d5fa63369f93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-29 [wwp]       2.3.1cvs37
+
+       * src/prefs_actions.c
+               forgot to commit that one (use of GTK_STOCK_INFO).
+

 2006-06-29 [colin]     2.3.1cvs36
 
        * src/imap.c
 2006-06-29 [colin]     2.3.1cvs36
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 316074cd77f7dde3a8db066bf2eb83c6af1d3862..db28517ce9371f7ba8547e89c85dc98d94bba362 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1637,3 +1637,4 @@
 ( cvs diff -u -r 1.105.2.58 -r 1.105.2.59 src/prefs_account.c;  ) > 2.3.1cvs34.patchset
 ( cvs diff -u -r 1.12.2.24 -r 1.12.2.25 src/prefs_template.c;  cvs diff -u -r 1.43.2.38 -r 1.43.2.39 src/prefs_matcher.c;  cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_quote.c;  ) > 2.3.1cvs35.patchset
 ( cvs diff -u -r 1.179.2.123 -r 1.179.2.124 src/imap.c;  ) > 2.3.1cvs36.patchset
 ( cvs diff -u -r 1.105.2.58 -r 1.105.2.59 src/prefs_account.c;  ) > 2.3.1cvs34.patchset
 ( cvs diff -u -r 1.12.2.24 -r 1.12.2.25 src/prefs_template.c;  cvs diff -u -r 1.43.2.38 -r 1.43.2.39 src/prefs_matcher.c;  cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_quote.c;  ) > 2.3.1cvs35.patchset
 ( cvs diff -u -r 1.179.2.123 -r 1.179.2.124 src/imap.c;  ) > 2.3.1cvs36.patchset

+( cvs diff -u -r 1.60.2.33 -r 1.60.2.34 src/prefs_actions.c;  ) > 2.3.1cvs37.patchset

diff --git a/configure.ac b/configure.ac
index 5be70c2df61f1254f507d5a07ef89d22974214d1..202a7504b655bff178a96d9aa7352a4603deff18 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=36
+EXTRA_VERSION=37

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index fc434d8dda546c45c3ca865abadfeead999ed969..89d7a16358560464c0bc8571e59e7109fc0f836c 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -271,7 +271,7 @@ static void prefs_actions_create(MainWindow *mainwin)
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_actions_delete_cb), NULL);
 
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_actions_delete_cb), NULL);
 

-       help_button = gtk_button_new_from_stock(GTK_STOCK_HELP);
+       help_button = gtk_button_new_from_stock(GTK_STOCK_INFO);

        gtk_widget_show(help_button);
        gtk_box_pack_end(GTK_BOX(reg_hbox), help_button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(help_button), "clicked",
        gtk_widget_show(help_button);
        gtk_box_pack_end(GTK_BOX(reg_hbox), help_button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(help_button), "clicked",