Bug 632641 - Handle combo box text API going away

5 files changed, 40 insertions, 17 deletions

diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index 7ab2a13259..b554843d65 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -27,6 +27,9 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 gint e_plugin_lib_enable (EPlugin *ep, gint enable);
 
 gint
@@ -192,10 +195,10 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_misc_set_alignment (GTK_MISC (w1), 0.0, 0.5);
 	gtk_box_pack_start ((GtkBox *)box2, w1, FALSE, TRUE, 2);
 
-	w2 = gtk_combo_box_new_text ();
-	gtk_combo_box_append_text ((GtkComboBox *)w2, _("On open"));
-	gtk_combo_box_append_text ((GtkComboBox *)w2, _("On file change"));
-	gtk_combo_box_append_text ((GtkComboBox *)w2, _("Periodically"));
+	w2 = gtk_combo_box_text_new ();
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w2), _("On open"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w2), _("On file change"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w2), _("Periodically"));
 	gtk_label_set_mnemonic_widget (GTK_LABEL (w1), w2);
 	gtk_box_pack_start ((GtkBox *)box2, w2, FALSE, TRUE, 2);
 
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index 970bdf4f8b..3dda9ebd4a 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -37,6 +37,9 @@
 #include <libgweather/gweather-xml.h>
 #undef GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 GtkWidget *e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data);
 GtkWidget *e_calendar_weather_refresh (EPlugin *epl, EConfigHookItemFactoryData *data);
 GtkWidget *e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data);
@@ -450,10 +453,14 @@ e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
 
-	combobox = gtk_combo_box_new_text ();
+	combobox = gtk_combo_box_text_new ();
 	gtk_widget_show (combobox);
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Metric (Celsius, cm, etc)"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Imperial (Fahrenheit, inches, etc)"));
+	gtk_combo_box_text_append_text (
+		GTK_COMBO_BOX_TEXT (combobox),
+		_("Metric (Celsius, cm, etc)"));
+	gtk_combo_box_text_append_text (
+		GTK_COMBO_BOX_TEXT (combobox),
+		_("Imperial (Fahrenheit, inches, etc)"));
 	set_units (source, combobox);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), combobox);
 	g_signal_connect (G_OBJECT (combobox), "changed", G_CALLBACK (units_changed), t);
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index f202935c3e..b28d648522 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -35,6 +35,9 @@
 #include "e-util/e-util.h"
 #include "email-custom-header.h"
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 #define d(x)
 #define GCONF_KEY_CUSTOM_HEADER "/apps/evolution/eplugin/email_custom_header/customHeader"
 
@@ -347,7 +350,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 
 		gtk_misc_set_alignment (GTK_MISC (priv->header_type_name_label), 0, 0.5);
 		gtk_widget_show (priv->header_type_name_label);
-		sub_combo_box.header_value_combo_box = gtk_combo_box_new_text ();
+		sub_combo_box.header_value_combo_box = gtk_combo_box_text_new ();
 		g_array_append_val (priv->combo_box_header_value, sub_combo_box);
 	}
 
@@ -370,13 +373,17 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 					break;
 				}
 			}
-			gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box),
-				str);
+			gtk_combo_box_text_append_text (
+				GTK_COMBO_BOX_TEXT (
+				sub_combo_box_ptr->header_value_combo_box), str);
 		}
 
 		/* Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
 		   indicating the header will not be added to a mail message */
-		gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box), C_("email-custom-header", "None"));
+		gtk_combo_box_text_append_text (
+			GTK_COMBO_BOX_TEXT (
+			sub_combo_box_ptr->header_value_combo_box),
+			C_("email-custom-header", "None"));
 		gtk_widget_show (sub_combo_box_ptr->header_value_combo_box);
 	}
 }
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index e55333064a..5f4bf3fc57 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -37,6 +37,9 @@
 
 #include "google-contacts-source.h"
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 void
 ensure_google_contacts_source_group (void)
 {
@@ -330,11 +333,11 @@ plugin_google_contacts (EPlugin *epl,
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (interval_sb), time);
 	gtk_box_pack_start (GTK_BOX (hbox), interval_sb, FALSE, FALSE, 0);
 
-	interval_combo = gtk_combo_box_new_text ();
-	gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("minutes"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("hours"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("days"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("weeks"));
+	interval_combo = gtk_combo_box_text_new ();
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (interval_combo), _("minutes"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (interval_combo), _("hours"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (interval_combo), _("days"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (interval_combo), _("weeks"));
 	gtk_combo_box_set_active (GTK_COMBO_BOX (interval_combo), type);
 	gtk_box_pack_start (GTK_BOX (hbox), interval_combo, FALSE, FALSE, 0);
 
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index b6bc9422a7..89bec64276 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -29,6 +29,9 @@
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 static GtkDialogClass *parent_class = NULL;
 
 static void
@@ -572,7 +575,7 @@ url_editor_dialog_run (UrlEditorDialog *dialog)
 		for (p = l; p; p = g_slist_next (p))
 			dialog->uri->events = g_slist_append (dialog->uri->events, g_strdup (e_source_peek_uid (p->data)));
 	}
-	gtk_widget_hide_all (GTK_WIDGET (dialog));
+	gtk_widget_hide (GTK_WIDGET (dialog));
 
 	return response == GTK_RESPONSE_OK;
 }