2006-07-08 [colin] 2.3.1cvs74

	* src/main.c
		Prevent bug #981 (sc 2.3.1 segfaults with
		gtk+ 2.10) from being reported again:
		if Sylpheed-Claws has been compiled against
		GTK+ < 2.9.0 and we're running with GTK+ >= 2.9.0,
		of if Sylpheed-Claws has been compiled against
		GTK+ >= 2.9.0 and we're running with GTK+ < 2.9.0,
		error out.

diff --git a/ChangeLog b/ChangeLog
index ae034c9742d6bc6dc4a3a17a2b9cd86b2befb484..005946c4184d38dfd63bf82577171a9c43154c7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-08 [colin]     2.3.1cvs74
+
+       * src/main.c
+               Prevent bug #981 (sc 2.3.1 segfaults with 
+               gtk+ 2.10) from being reported again:
+               if Sylpheed-Claws has been compiled against
+               GTK+ < 2.9.0 and we're running with GTK+ >= 2.9.0, 
+               of if Sylpheed-Claws has been compiled against
+               GTK+ >= 2.9.0 and we're running with GTK+ < 2.9.0,
+               error out.
+
 2006-07-07 [colin]     2.3.1cvs73
 
        * src/prefs_actions.c

diff --git a/PATCHSETS b/PATCHSETS
index 3c30b9e3b19369eef46da8c5e293c3ce52f0b9c0..8df8cd0940f232f92bd5e6710dcf1d335ee887ff 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1674,3 +1674,4 @@
 ( 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
 ( cvs diff -u -r 1.60.2.37 -r 1.60.2.38 src/prefs_actions.c;  ) > 2.3.1cvs73.patchset
+( cvs diff -u -r 1.115.2.94 -r 1.115.2.95 src/main.c;  ) > 2.3.1cvs74.patchset

diff --git a/configure.ac b/configure.ac
index 1e62eb709cdba33b9f0a25504d0b2b255d14e02c..80e1df733579dc2f430e5112f449a3f72d047f1e 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=73
+EXTRA_VERSION=74
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index da0c178798c010de17d4bcd4e7e16b2cca0283a8..43b722ee847da05b31c18c5f06bf6c8b1601fd5c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -348,6 +348,26 @@ int main(int argc, char *argv[])
                g_error(_("g_thread is not supported by glib.\n"));
        }
 
+       /* check that we're not on a too recent/old gtk+ */
+#if GTK_CHECK_VERSION(2, 9, 0)
+       if (gtk_check_version(2, 9, 0) != NULL) {
+               alertpanel_error(_("Sylpheed-Claws has been compiled with "
+                                  "a more recent GTK+ library than is "
+                                  "currently available. This will cause "
+                                  "crashes. Please upgrade GTK+ or recompile "
+                                  "Sylpheed-Claws."));
+               exit(1);
+       }
+#else
+       if (gtk_check_version(2, 9, 0) == NULL) {
+               alertpanel_error(_("Sylpheed-Claws has been compiled with "
+                                  "an an older GTK+ library than is "
+                                  "currently available. This will cause "
+                                  "crashes. Please recompile "
+                                  "Sylpheed-Claws."));
+               exit(1);
+       }
+#endif 
        /* parse gtkrc files */
        userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
                             NULL);