From 8da37ea812d5b784dade3dc0f05df54fdc60fc7a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 20 Oct 2010 15:06:38 -0400 Subject: Bug 632641 - Handle combo box text API going away --- calendar/gui/dialogs/event-page.c | 10 +++++----- calendar/gui/dialogs/memo-page.c | 7 +++++-- calendar/gui/dialogs/recurrence-page.c | 4 ++-- calendar/gui/dialogs/task-page.c | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index bcbaf7cc3a..753b9ca75f 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -1109,7 +1109,7 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) if (!priv->user_org) { gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->organizer)))); - gtk_combo_box_append_text (GTK_COMBO_BOX (priv->organizer), string); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->organizer), string); gtk_combo_box_set_active (GTK_COMBO_BOX (priv->organizer), 0); gtk_editable_set_editable (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (priv->organizer))), FALSE); } else { @@ -3012,16 +3012,16 @@ init_widgets (EventPage *epage) } if (combo_label) { - gtk_combo_box_append_text (GTK_COMBO_BOX (priv->alarm_time_combo), combo_label); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->alarm_time_combo), combo_label); g_free (combo_label); priv->alarm_map = alarm_map_with_user_time; } else { priv->alarm_map = alarm_map_without_user_time; } - gtk_combo_box_append_text (GTK_COMBO_BOX (priv->alarm_time_combo), _("Customize")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->alarm_time_combo), _("Customize")); /* Translators: "None" for "No alarm set" */ - gtk_combo_box_prepend_text (GTK_COMBO_BOX (priv->alarm_time_combo), C_("cal-alarms", "None")); + gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT (priv->alarm_time_combo), C_("cal-alarms", "None")); g_signal_connect_swapped ( priv->alarm_time_combo, "changed", @@ -3184,7 +3184,7 @@ event_page_construct (EventPage *epage, EMeetingStore *model) GList *l; for (l = priv->address_strings; l; l = l->next) - gtk_combo_box_append_text (GTK_COMBO_BOX (priv->organizer), l->data); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->organizer), l->data); gtk_combo_box_set_active (GTK_COMBO_BOX (priv->organizer), 0); diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index b7e3095e3f..454060c7ea 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -54,6 +54,9 @@ #include "e-send-options-utils.h" #include "memo-page.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + #define MEMO_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), TYPE_MEMO_PAGE, MemoPagePrivate)) @@ -271,7 +274,7 @@ memo_page_fill_widgets (CompEditorPage *page, gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->org_combo))), string); } else { gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->org_combo)))); - gtk_combo_box_append_text (GTK_COMBO_BOX (priv->org_combo), string); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->org_combo), string); gtk_combo_box_set_active (GTK_COMBO_BOX (priv->org_combo), 0); gtk_editable_set_editable (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (priv->org_combo))), FALSE); } @@ -1191,7 +1194,7 @@ memo_page_construct (MemoPage *mpage) GList *l; for (l = priv->address_strings; l; l = l->next) - gtk_combo_box_append_text (GTK_COMBO_BOX (priv->org_combo), l->data); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->org_combo), l->data); gtk_combo_box_set_active (GTK_COMBO_BOX (priv->org_combo), 0); } else diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index bf6092d340..b14d834a3f 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -1120,10 +1120,10 @@ make_recur_month_combobox (void) GtkWidget *combo; gint i; - combo = gtk_combo_box_new_text (); + combo = gtk_combo_box_text_new (); for (i = 0; i < G_N_ELEMENTS (options); i++) { - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _(options[i])); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _(options[i])); } return combo; diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 0596d0d12c..22cab43ff1 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -734,7 +734,7 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) if (!priv->user_org) { gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->organizer)))); - gtk_combo_box_append_text (GTK_COMBO_BOX (priv->organizer), string); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->organizer), string); gtk_combo_box_set_active (GTK_COMBO_BOX (priv->organizer), 0); gtk_editable_set_editable (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (priv->organizer))), FALSE); } else { @@ -2086,7 +2086,7 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client) GList *l; for (l = priv->address_strings; l; l = l->next) - gtk_combo_box_append_text (GTK_COMBO_BOX (priv->organizer), l->data); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->organizer), l->data); gtk_combo_box_set_active (GTK_COMBO_BOX (priv->organizer), 0); -- cgit v1.2.3