diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-10-21 03:06:38 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-21 03:08:16 +0800 |
| commit | 8da37ea812d5b784dade3dc0f05df54fdc60fc7a (patch) | |
| tree | 04bf6d75a584f2f8af8c4b061e38bf8220a0bf15 /widgets | |
| parent | 4142c97c7b59de8d859a217d7b76667b339e33c0 (diff) | |
| download | gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar.gz gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar.bz2 gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar.lz gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar.xz gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar.zst gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.zip | |
Bug 632641 - Handle combo box text API going away
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/misc/e-attachment-paned.c | 11 | ||||
| -rw-r--r-- | widgets/misc/e-dateedit.c | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index d1b61e0857..d632795f66 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -30,6 +30,9 @@ #include "e-attachment-icon-view.h" #include "e-attachment-tree-view.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + #define E_ATTACHMENT_PANED_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_ATTACHMENT_PANED, EAttachmentPanedPrivate)) @@ -612,10 +615,12 @@ e_attachment_paned_init (EAttachmentPaned *paned) gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_widget_show (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_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); paned->priv->combo_box = g_object_ref (widget); gtk_widget_show (widget); diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 4954ccff2e..01b70e4afc 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -1572,14 +1572,14 @@ static void rebuild_time_popup (EDateEdit *dedit) { EDateEditPrivate *priv; - GtkComboBox *combo; + GtkComboBoxText *combo; gchar buffer[40]; struct tm tmp_tm; gint hour, min; priv = dedit->priv; - combo = GTK_COMBO_BOX (priv->time_combo); + combo = GTK_COMBO_BOX_TEXT (priv->time_combo); gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (combo))); @@ -1624,7 +1624,7 @@ rebuild_time_popup (EDateEdit *dedit) if (!priv->use_24_hour_format && buffer[0] == '0') buffer[0] = ' '; - gtk_combo_box_append_text (combo, buffer); + gtk_combo_box_text_append_text (combo, buffer); } } } |