2009-01-11 [paul] 3.7.0cvs28

	* src/gtk/about.c
		don't even mention printing support, assume its
		presence, unless building with GTK+ < 2.10.0

diff --git a/ChangeLog b/ChangeLog
index 953b3be6af84544d6569834c1a56814cba26a09b..d902b125970cbabe177b88e07a0fb62be70c9e8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-11 [paul]      3.7.0cvs28
+
+       * src/gtk/about.c
+               don't even mention printing support, assume its
+               presence, unless building with GTK+ < 2.10.0
+
 2009-01-10 [colin]     3.7.0cvs27
 
        * src/codeconv.c

diff --git a/PATCHSETS b/PATCHSETS
index 02d5f7181f714a69246b9f946e4a2df66a659c3f..9ef14ec8e40e7e41848bfe0f592a82613ee57e90 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3689,3 +3689,4 @@
 ( cvs diff -u -r 1.26.2.40 -r 1.26.2.41 src/foldersel.c;  ) > 3.7.0cvs25.patchset
 ( cvs diff -u -r 1.382.2.493 -r 1.382.2.494 src/compose.c;  cvs diff -u -r 1.274.2.294 -r 1.274.2.295 src/mainwindow.c;  cvs diff -u -r 1.36.2.162 -r 1.36.2.163 src/common/utils.c;  ) > 3.7.0cvs26.patchset
 ( cvs diff -u -r 1.65.2.65 -r 1.65.2.66 src/codeconv.c;  ) > 3.7.0cvs27.patchset
+( cvs diff -u -r 1.4.2.73 -r 1.4.2.74 src/gtk/about.c;  ) > 3.7.0cvs28.patchset

diff --git a/configure.ac b/configure.ac
index 4f1ebc76266766cce2c1cedfbca83bcda859b107..737371893ba40c57df0caf7fd16b5af51fb2ecfe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/about.c b/src/gtk/about.c
index ca72c02e6b1b2f314d0156a5fcf13b281a4634b3..2b3ee21e0a88cd7ce23322724a96d49f2c774bfb 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -425,16 +425,6 @@ static GtkWidget *about_create_child_page_features(void)
        gtk_text_buffer_insert(buffer, &iter, 
                (gchar *)Q_("GnuTLS|adds support for encrypted connections to servers\n"), -1);
 
-#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
-       gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
-#else
-       gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
-#endif
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GTK+ >= 2.10.0 "), -1,
-                                                "bold", NULL);
-       gtk_text_buffer_insert(buffer, &iter, 
-               (gchar *)Q_("GTK+ >= 2.10.0|adds support for a complete print dialog\n"), -1);
-
 #if INET6
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
 #else
@@ -486,6 +476,7 @@ static GtkWidget *about_create_child_page_features(void)
        gtk_text_buffer_insert(buffer, &iter, 
                (gchar *)Q_("libetpan|adds support for IMAP and NNTP servers\n"), -1);
 
+#if !GTK_CHECK_VERSION(2,10,0)
 #if USE_GNOMEPRINT
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
 #else
@@ -495,6 +486,7 @@ static GtkWidget *about_create_child_page_features(void)
                                                 "bold", NULL);
        gtk_text_buffer_insert(buffer, &iter, 
                (gchar *)Q_("libgnomeprint|adds support for a complete print dialog\n"), -1);
+#endif
 
 #if HAVE_LIBSM
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);