diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-01-14 12:22:29 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:25 +0800 |
| commit | cadcc080eeb998a52b2163604e07fa5a71089391 (patch) | |
| tree | 99773aaf880690e67f54f7a8e45f856fb35d5d00 /mail | |
| parent | dbbe7408c563f9a6e47f65d5d3db7ee541285b41 (diff) | |
| download | gsoc2013-evolution-cadcc080eeb998a52b2163604e07fa5a71089391.tar gsoc2013-evolution-cadcc080eeb998a52b2163604e07fa5a71089391.tar.gz gsoc2013-evolution-cadcc080eeb998a52b2163604e07fa5a71089391.tar.bz2 gsoc2013-evolution-cadcc080eeb998a52b2163604e07fa5a71089391.tar.lz gsoc2013-evolution-cadcc080eeb998a52b2163604e07fa5a71089391.tar.xz gsoc2013-evolution-cadcc080eeb998a52b2163604e07fa5a71089391.tar.zst gsoc2013-evolution-cadcc080eeb998a52b2163604e07fa5a71089391.zip | |
Adapt to GtkComboBox class reorg.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-tag-editor.c | 9 | ||||
| -rw-r--r-- | mail/mail-dialogs.ui | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c index a116b3f5e2..0b1e20cef0 100644 --- a/mail/e-mail-tag-editor.c +++ b/mail/e-mail-tag-editor.c @@ -158,10 +158,12 @@ mail_tag_editor_get_tag_list (EMailTagEditor *editor) { CamelTag *tag_list = NULL; time_t date; - gchar *text; + gchar *text = NULL; + GtkWidget *entry; - text = gtk_combo_box_text_get_active_text ( - GTK_COMBO_BOX_TEXT (editor->priv->combo_entry)); + entry = gtk_bin_get_child (GTK_BIN (editor->priv->combo_entry)); + if (entry) + text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry))); camel_tag_set (&tag_list, "follow-up", text); g_free (text); @@ -332,7 +334,6 @@ mail_tag_editor_init (EMailTagEditor *editor) renderer, "text", 1, NULL); widget = e_builder_get_widget (builder, "combo"); - gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX_ENTRY (widget), 0); editor->priv->combo_entry = GTK_COMBO_BOX (widget); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), DEFAULT_FLAG); diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui index 82e9928bef..3520a0d197 100644 --- a/mail/mail-dialogs.ui +++ b/mail/mail-dialogs.ui @@ -331,8 +331,10 @@ Please select a follow up action from the "Flag" menu.</property> </packing> </child> <child> - <object class="GtkComboBoxEntry" id="combo"> + <object class="GtkComboBox" id="combo"> <property name="visible">True</property> + <property name="has-entry">True</property> + <property name="entry-text-column">0</property> <property name="model">combo_model</property> </object> <packing> |