[Commits] prefs_filtering_action.c 1.1.4.72 1.1.4.73

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv14117/src

Modified Files:
      Tag: gtk2
	prefs_filtering_action.c 
Log Message:
2011-10-07 [colin]	3.7.10cvs26

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

Index: prefs_filtering_action.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering_action.c,v
retrieving revision 1.1.4.72
retrieving revision 1.1.4.73
diff -u -d -r1.1.4.72 -r1.1.4.73
--- prefs_filtering_action.c	7 Oct 2011 09:40:15 -0000	1.1.4.72
+++ prefs_filtering_action.c	7 Oct 2011 16:06:53 -0000	1.1.4.73
@@ -1282,7 +1282,11 @@
 
 	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);