[evolution-data-server/gnome-2-32] Bug 632687 - Doesn't build against gtk+ 2.91.1 (cherry picked from commit 89b384cfe452ce1e38b31066c3

[David Woodhouse <dwmw2 src gnome org>]

commit 3b146b852d2620aa8632afa539adad3c31870764
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Oct 20 10:50:46 2010 -0400

    Bug 632687 - Doesn't build against gtk+ 2.91.1
    (cherry picked from commit 89b384cfe452ce1e38b31066c3d9f9abd1bdd6e5)

 libedataserverui/e-name-selector-dialog.c |    4 ++--
 libedataserverui/gtk-compat.h             |    6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c
index 4fbb8a7..72a99ed 100644
--- a/libedataserverui/e-name-selector-dialog.c
+++ b/libedataserverui/e-name-selector-dialog.c
@@ -124,7 +124,7 @@ e_name_selector_dialog_populate_categories (ENameSelectorDialog *name_selector_d
 		if (!e_categories_is_searchable (iter->data))
 			continue;
 
-		gtk_combo_box_append_text (
+		gtk_combo_box_text_append_text (
 			GTK_COMBO_BOX (combo_box), iter->data);
 	}
 
@@ -891,7 +891,7 @@ search_changed (ENameSelectorDialog *name_selector_dialog)
 	if (gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box)) == -1)
 		gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
 
-	category = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_box));
+	category = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX (combo_box));
 	category_escaped = escape_sexp_string (category);
 
 	text = gtk_entry_get_text (name_selector_dialog->priv->search_entry);
diff --git a/libedataserverui/gtk-compat.h b/libedataserverui/gtk-compat.h
index 7e894e9..cbc8cdc 100644
--- a/libedataserverui/gtk-compat.h
+++ b/libedataserverui/gtk-compat.h
@@ -21,6 +21,12 @@
 #define gdk_drag_context_get_selected_action(context)  gdk_drag_context_get_action(context)
 #endif
 
+#if !GTK_CHECK_VERSION (2,23,0)
+#define gtk_combo_box_text_new			gtk_combo_box_new_text
+#define gtk_combo_box_text_append_text		gtk_combo_box_append_text
+#define gtk_combo_box_text_get_active_text	gtk_combo_box_get_active_text
+#endif
+
 #if GTK_CHECK_VERSION (2,90,5)
 
 /* Recreate GdkRegion until we drop GTK2 compatibility. */