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 /filter/e-filter-rule.c | |
| 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 'filter/e-filter-rule.c')
| -rw-r--r-- | filter/e-filter-rule.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c index bfcff8c8b9..4dc2d8356f 100644 --- a/filter/e-filter-rule.c +++ b/filter/e-filter-rule.c @@ -35,6 +35,9 @@ #include "e-filter-rule.h" #include "e-rule-context.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + #define E_FILTER_RULE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_FILTER_RULE, EFilterRulePrivate)) @@ -149,11 +152,12 @@ get_rule_part_widget (ERuleContext *context, data->partwidget = p; data->container = hbox; - combobox = gtk_combo_box_new_text (); + combobox = gtk_combo_box_text_new (); /* sigh, this is a little ugly */ while ((part = e_rule_context_next_part (context, 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; @@ -720,10 +724,12 @@ filter_rule_get_widget (EFilterRule *rule, }; label = gtk_label_new_with_mnemonic (_("_Find items:")); - combobox = gtk_combo_box_new_text (); + combobox = gtk_combo_box_text_new (); for (i=0;i<2;i++) { - gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _(thread_types[i])); + gtk_combo_box_text_append_text ( + GTK_COMBO_BOX_TEXT (combobox), + _(thread_types[i])); } gtk_label_set_mnemonic_widget ((GtkLabel *)label, combobox); @@ -754,10 +760,12 @@ filter_rule_get_widget (EFilterRule *rule, }; label = gtk_label_new_with_mnemonic (_("I_nclude threads")); - combobox = gtk_combo_box_new_text (); + combobox = gtk_combo_box_text_new (); for (i=0;i<5;i++) { - gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _(thread_types[i])); + gtk_combo_box_text_append_text ( + GTK_COMBO_BOX_TEXT (combobox), + _(thread_types[i])); } gtk_label_set_mnemonic_widget ((GtkLabel *)label, combobox); |