From 4a08257b83512cc32b73d732ccc53266a22b917c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 20 Oct 2010 16:10:15 -0400
Subject: Deal with GtkComboBoxEntry removal in gtk+-3.0.

---
 widgets/misc/e-dateedit.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'widgets/misc')

diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 01b70e4afc..da3c9dbad5 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -571,8 +571,17 @@ create_children			(EDateEdit	*dedit)
 		"widget \"*.e-dateedit-timecombo\" style \"e-dateedit-timecombo-style\"");
 
 	time_store = gtk_list_store_new (1, G_TYPE_STRING);
+#if GTK_CHECK_VERSION(2,23,0)
+	priv->time_combo = g_object_new (
+		GTK_TYPE_COMBO_BOX,
+		"model", time_store,
+		"has-entry", TRUE,
+		"entry-text-column", 0,
+		NULL);
+#else
 	priv->time_combo = gtk_combo_box_entry_new_with_model (
 		GTK_TREE_MODEL (time_store), 0);
+#endif
 	g_object_unref (time_store);
 
 	child = gtk_bin_get_child (GTK_BIN (priv->time_combo));
-- 
cgit v1.2.3