From 2de2e7f12f3b4e5944732d1c2172a3d174d5a219 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 27 Oct 2010 21:43:25 +0200
Subject: Workaround GtkComboBoxText/GtkComboBoxEntry in .ui files

---
 e-util/e-util.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'e-util/e-util.c')

diff --git a/e-util/e-util.c b/e-util/e-util.c
index 22f792c3a7..f27b3f3660 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -57,6 +57,14 @@
 
 #include "e-util.h"
 #include "e-util-private.h"
+#include "gtk-compat.h"
+
+#if !GTK_CHECK_VERSION (2,23,0)
+	#undef GtkComboBoxText
+	ENSURE_GTK_COMBO_BOX_TEXT_TYPE
+#else
+	ENSURE_GTK_COMBO_BOX_ENTRY_TYPE
+#endif
 
 /**
  * e_get_gnome2_user_dir:
-- 
cgit v1.2.3