2007-07-18 [paul] 2.10.0cvs38

	* src/gtk/gtkutils.c
		make sure we can still build with older GTK's

diff --git a/ChangeLog b/ChangeLog
index e94aad6b6af3c80dae5e1c2c0c60c7b0112a9f81..b5ba4fa8c3fbbcf485cf6fb2fa625437dc54f0a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-18 [paul]      2.10.0cvs38
+
+       * src/gtk/gtkutils.c
+               make sure we can still build with older GTK's
+
 2007-07-18 [colin]     2.10.0cvs37
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 362a374372f533c76b48770fad201ae5d6e474ee..841bc71fbfd5b32942c8be84ccb6f6341ee7827a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2691,3 +2691,4 @@
 ( cvs diff -u -r 1.204.2.140 -r 1.204.2.141 src/prefs_common.c;  cvs diff -u -r 1.103.2.86 -r 1.103.2.87 src/prefs_common.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_logging.c;  cvs diff -u -r 1.6.2.13 -r 1.6.2.14 src/common/log.c;  ) > 2.10.0cvs35.patchset
 ( cvs diff -u -r 1.14.2.27 -r 1.14.2.28 src/editaddress.c;  cvs diff -u -r 1.213.2.148 -r 1.213.2.149 src/folder.c;  cvs diff -u -r 1.16.2.30 -r 1.16.2.31 src/prefs_display_header.c;  ) > 2.10.0cvs36.patchset
 ( cvs diff -u -r 1.94.2.139 -r 1.94.2.140 src/messageview.c;  cvs diff -u -r 1.5.2.59 -r 1.5.2.60 src/gtk/gtkutils.c;  ) > 2.10.0cvs37.patchset
+( cvs diff -u -r 1.5.2.60 -r 1.5.2.61 src/gtk/gtkutils.c;  ) > 2.10.0cvs38.patchset

diff --git a/configure.ac b/configure.ac
index efd3e3f08bb3b2e0339105336628335e856699b5..f91f96ba879380c293889280c3b7f2acc250ea7f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=38
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 13b3e12b1164022cd52664d41d313a3c9d8f31c1..792667e407cc747bc629ddf10b6bdaba9d36332e 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -757,7 +757,11 @@ void gtkut_window_popup(GtkWidget *window)
                gdk_window_move(window->window, new_x, new_y);
 
        gtk_window_set_skip_taskbar_hint(GTK_WINDOW(window), FALSE);
+#if GTK_CHECK_VERSION(2,8,0)
        gtk_window_present_with_time(GTK_WINDOW(window), time(NULL));
+#else
+       gtk_window_present(GTK_WINDOW(window));
+#endif
 }
 
 void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)