6 files changed, 28 insertions, 13 deletions
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index 0de674149b..8ba46cdccf 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -29,6 +29,9 @@
 #include "e-attachment-icon-view.h"
 #include "e-attachment-tree-view.h"
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 #define E_MAIL_ATTACHMENT_BAR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_ATTACHMENT_BAR, EMailAttachmentBarPrivate))
@@ -621,10 +624,12 @@ mail_attachment_bar_init (EMailAttachmentBar *bar)
 
 	container = widget;
 
-	widget = gtk_combo_box_new_text ();
+	widget = gtk_combo_box_text_new ();
 	gtk_size_group_add_widget (size_group, widget);
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Icon View"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("List View"));
+	gtk_combo_box_text_append_text (
+		GTK_COMBO_BOX_TEXT (widget), _("Icon View"));
+	gtk_combo_box_text_append_text (
+		GTK_COMBO_BOX_TEXT (widget), _("List View"));
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	bar->priv->combo_box = g_object_ref (widget);
 	gtk_widget_show (widget);
diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c
index ab7fdd22c4..c55ed05f7b 100644
--- a/mail/e-mail-tag-editor.c
+++ b/mail/e-mail-tag-editor.c
@@ -33,6 +33,9 @@
 #include "e-util/e-util.h"
 #include "widgets/misc/e-dateedit.h"
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 #define E_MAIL_TAG_EDITOR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_TAG_EDITOR, EMailTagEditorPrivate))
@@ -160,7 +163,8 @@ mail_tag_editor_get_tag_list (EMailTagEditor *editor)
 	time_t date;
 	gchar *text;
 
-	text = gtk_combo_box_get_active_text (editor->priv->combo_entry);
+	text = gtk_combo_box_text_get_active_text (
+		GTK_COMBO_BOX_TEXT (editor->priv->combo_entry));
 	camel_tag_set (&tag_list, "follow-up", text);
 	g_free (text);
 
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index 705d972b2f..ca351e8e4a 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -35,6 +35,9 @@
 #include "em-filter-editor.h"
 #include "em-filter-rule.h"
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 static gpointer parent_class;
 
 static EFilterRule *
@@ -175,7 +178,8 @@ em_filter_editor_construct (EMFilterEditor *fe,
 	gtk_list_store_clear (GTK_LIST_STORE (model));
 
 	for (i = 0; source_names[i].source; i++) {
-		gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), source_names[i].name);
+		gtk_combo_box_text_append_text (
+			GTK_COMBO_BOX_TEXT (combobox), source_names[i].name);
 		sources = g_slist_append (sources, g_strdup (source_names[i].source));
 	}
 
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 316f1ad201..b46ce0dadc 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -383,9 +383,10 @@ get_rule_part_widget (EMFilterContext *f, EFilterPart *newpart, EFilterRule *fr)
 	data->partwidget = p;
 	data->container = hbox;
 
-	combobox = gtk_combo_box_new_text ();
+	combobox = gtk_combo_box_text_new ();
 	while ((part = em_filter_context_next_action (f, part))) {
-		gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _(part->title));
+		gtk_combo_box_text_append_text (
+			GTK_COMBO_BOX_TEXT (combobox), _(part->title));
 
 		if (!strcmp (newpart->title, part->title))
 			current = index;
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index 1d56cc1fd2..ab4c049183 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -259,7 +259,7 @@ get_widget (EFilterElement *fe)
 	if (fs->priv->sources == NULL)
 		em_filter_source_element_get_sources (fs);
 
-	combobox = gtk_combo_box_new_text ();
+	combobox = gtk_combo_box_text_new ();
 
 	index = 0;
 	current_index = -1;
@@ -278,7 +278,8 @@ get_widget (EFilterElement *fe)
 			else
 				label = g_strdup_printf("%s <%s>", info->name, info->address);
 
-			gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), label);
+			gtk_combo_box_text_append_text (
+				GTK_COMBO_BOX_TEXT (combobox), label);
 			g_free (label);
 
 			if (fs->priv->current_url && !strcmp (info->url, fs->priv->current_url))
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 6a4112db42..0388e7e6b5 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -800,18 +800,18 @@ subscription_editor_add_account (EMSubscriptionEditor *editor,
 	StoreData *data;
 	CamelStore *store;
 	CamelSession *session;
-	GtkComboBox *combo_box;
 	GtkListStore *list_store;
 	GtkTreeStore *tree_store;
 	GtkTreeViewColumn *column;
 	GtkTreeSelection *selection;
 	GtkCellRenderer *renderer;
+	GtkComboBoxText *combo_box;
 	GtkWidget *container;
 	GtkWidget *widget;
 	const gchar *url;
 
-	combo_box = GTK_COMBO_BOX (editor->priv->combo_box);
-	gtk_combo_box_append_text (combo_box, account->name);
+	combo_box = GTK_COMBO_BOX_TEXT (editor->priv->combo_box);
+	gtk_combo_box_text_append_text (combo_box, account->name);
 
 	session = em_subscription_editor_get_session (editor);
 	url = e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
@@ -1153,7 +1153,7 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 
 	container = widget;
 
-	widget = gtk_combo_box_new_text ();
+	widget = gtk_combo_box_text_new ();
 	gtk_table_attach (
 		GTK_TABLE (container), widget,
 		1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);