2006-07-07 [colin] 2.3.1cvs72

	* src/prefs_actions.c
		Fix compile on gtk < 2.8. argh :)

diff --git a/ChangeLog b/ChangeLog
index 6d026fbdc24c6d8b509eb9c24de28a68d7ed7dd0..8f5f789357c202cefffa38134fc23d24a17270ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-07 [colin]     2.3.1cvs72
+
+       * src/prefs_actions.c
+               Fix compile on gtk < 2.8. argh :)
+
 2006-07-07 [paul]      2.3.1cvs71
 
        * src/common/defs.h

diff --git a/PATCHSETS b/PATCHSETS
index c649488a4bc4238ae77beb0f3c2d54b90bd01ce8..6bbd94dc1d653d1903cc81e42d19208ad886e163 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1672,3 +1672,4 @@
 ( cvs diff -u -r 1.213.2.104 -r 1.213.2.105 src/folder.c;  ) > 2.3.1cvs69.patchset
 ( cvs diff -u -r 1.53.2.18 -r 1.53.2.19 po/POTFILES.in;  cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/quote_fmt.c;  cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/quote_fmt_lex.l;  cvs diff -u -r 1.22.2.21 -r 1.22.2.22 src/quote_fmt_parse.y;  ) > 2.3.1cvs70.patchset
 ( cvs diff -u -r 1.9.2.26 -r 1.9.2.27 src/common/defs.h;  ) > 2.3.1cvs71.patchset
+( cvs diff -u -r 1.60.2.36 -r 1.60.2.37 src/prefs_actions.c;  ) > 2.3.1cvs72.patchset

diff --git a/configure.ac b/configure.ac
index 7e5201abd006e438aba5bac241c13a160aec7c90..90a1976913a2420ab14ded183212cb516643dbcd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=71
+EXTRA_VERSION=72
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index b2cd2b32b5c70f997a6c6731e0ff4c23c1daf296..33f2e5d4712ac07ec3a88fe9e4cbb1d90540cb9e 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -277,7 +277,11 @@ static void prefs_actions_create(MainWindow *mainwin)
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_actions_delete_cb), NULL);
 
+#if GTK_CHECK_VERSION(2, 8, 0)
        info_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
+#else
+       info_btn = gtk_button_new_with_label(_("Information"));
+#endif
        gtk_widget_show(info_btn);
        gtk_box_pack_end(GTK_BOX(reg_hbox), info_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(info_btn), "clicked",