2011-10-07 [colin] 3.7.10cvs26

	* src/prefs_filtering_action.c
	* src/gtk/gtkutils.h
		Fix build with GTK+2.20

diff --git a/ChangeLog b/ChangeLog
index 42ed5d4fc75ff0c0d88e1537486ae52a197b502f..b5fefb46961bd635b8c830d7958766e763474e84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-07 [colin]     3.7.10cvs26
+
+       * src/prefs_filtering_action.c
+       * src/gtk/gtkutils.h
+               Fix build with GTK+2.20
+
 2011-10-07 [colin]     3.7.10cvs25
 
        * src/gtk/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 1db3d2d7a42be05d14c2d4ea9deed5a68d2cb4e1..983eedf8cb5ae64ee373c58c57b4f6c9f9b681ed 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4229,3 +4229,4 @@
 ( cvs diff -u -r 1.382.2.583 -r 1.382.2.584 src/compose.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/gtk/gtkshruler.c;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/gtkshruler.h;  ) > 3.7.10cvs23.patchset
 ( cvs diff -u -r 1.654.2.4304 -r 1.654.2.4305 configure.ac;  ) > 3.7.10cvs24.patchset
 ( cvs diff -u -r 1.20.2.26 -r 1.20.2.27 src/gtk/Makefile.am;  diff -u /dev/null src/gtk/gdkkeysyms-new.h;  cvs diff -u -r 1.4.2.58 -r 1.4.2.59 src/gtk/gtkutils.h;  ) > 3.7.10cvs25.patchset
+( cvs diff -u -r 1.1.4.72 -r 1.1.4.73 src/prefs_filtering_action.c;  cvs diff -u -r 1.4.2.59 -r 1.4.2.60 src/gtk/gtkutils.h;  ) > 3.7.10cvs26.patchset

diff --git a/configure.ac b/configure.ac
index 2a38c4ff709dac18a034069cf39b6d6a98fb12fa..ac0d675e4c9da99702a1840a73a4e95647287296 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=26
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index af6c51f9ba6d92c4eb1e9c84c0107cb9210b46bd..7ce1fdab8db0870e8a098cc05e1dca42783aaea6 100644 (file)
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -243,6 +243,12 @@ claws_input_add    (gint         source,
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), widget,        \
                            tip, NULL);                         \
 }
-
+#endif
+#if !GTK_CHECK_VERSION(2,22,0)
+#define gdk_drag_context_get_selected_action(x) ((x)->action)
+#define gdk_drag_context_get_actions(x) ((x)->actions)
+#define gtk_text_view_get_vadjustment(x) ((x)->vadjustment)
+#define gdk_drag_context_get_suggested_action(x) ((x)->suggested_action)
+#define gtk_button_get_event_window(x) ((x)->event_window)
 #endif
 #endif /* __GTKUTILS_H__ */

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 678cf596c4f2f80462d2a7060f9772ab1c10e7b3..4a45d47af261e561118aa4e6bd28ef5b8e12d11f 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -1282,7 +1282,11 @@ static void prefs_filtering_action_enable_widget(GtkWidget* widget, const gboole
 
        if(enable == TRUE)
        {
-               if(GTK_IS_COMBO_BOX(widget) && gtk_combo_box_get_has_entry(GTK_COMBO_BOX(widget)))
+#if !GTK_CHECK_VERSION(2,24,0)
+               if(GTK_IS_COMBO_BOX(widget) || GTK_IS_COMBO_BOX_ENTRY(widget))
+#else
+               if(GTK_IS_COMBO_BOX(widget))
+#endif
                        gtk_combo_box_set_active(GTK_COMBO_BOX(widget), 0);
                else if(GTK_IS_SPIN_BUTTON(widget))
                        gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), 0);