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 /plugins/email-custom-header | |
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 'plugins/email-custom-header')
-rw-r--r-- | plugins/email-custom-header/email-custom-header.c | 15 |
1 files changed, 11 insertions, 4 deletions
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); } } |