diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-11-18 20:35:36 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-11-18 20:35:36 +0800 |
| commit | b09b3e9ccacea345fee998ff20ef01ae043eaeac (patch) | |
| tree | 2d11701190da5f57461d41236bab44d22884a0a0 /mail | |
| parent | 41117c2b8c8fafe581608cd91f84803cacb08f5d (diff) | |
| download | gsoc2013-evolution-b09b3e9ccacea345fee998ff20ef01ae043eaeac.tar.gz gsoc2013-evolution-b09b3e9ccacea345fee998ff20ef01ae043eaeac.tar.zst gsoc2013-evolution-b09b3e9ccacea345fee998ff20ef01ae043eaeac.zip | |
Bug #633779 - GtkComboBoxText issues
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-filter-editor.c | 16 | ||||
| -rw-r--r-- | mail/mail-config.ui | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c index ca351e8e4a..ca41486b1e 100644 --- a/mail/em-filter-editor.c +++ b/mail/em-filter-editor.c @@ -35,9 +35,6 @@ #include "em-filter-editor.h" #include "em-filter-rule.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - static gpointer parent_class; static EFilterRule * @@ -170,16 +167,19 @@ em_filter_editor_construct (EMFilterEditor *fe, GtkWidget *combobox; gint i; GtkTreeViewColumn *column; - GtkTreeModel *model; + GtkTreeIter iter; + GtkListStore *store; GSList *sources = NULL; combobox = e_builder_get_widget (builder, "filter_source_combobox"); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox)); - gtk_list_store_clear (GTK_LIST_STORE (model)); + store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combobox))); + gtk_list_store_clear (store); for (i = 0; source_names[i].source; i++) { - gtk_combo_box_text_append_text ( - GTK_COMBO_BOX_TEXT (combobox), source_names[i].name); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + 0, source_names[i].name, + -1); sources = g_slist_append (sources, g_strdup (source_names[i].source)); } diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 171205c94b..7252206a56 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -2704,7 +2704,7 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="comboboxEmptyTrashDays"> + <object class="GtkComboBox" id="comboboxEmptyTrashDays"> <property name="visible">True</property> <property name="model">model1</property> <child> @@ -3342,7 +3342,7 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="default_junk_plugin"> + <object class="GtkComboBox" id="default_junk_plugin"> <property name="visible">True</property> </object> <packing> @@ -3427,7 +3427,7 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="junk_empty_combobox"> + <object class="GtkComboBox" id="junk_empty_combobox"> <property name="visible">True</property> <property name="model">model2</property> <child> |