diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-08-18 09:21:22 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-08-18 10:27:46 +0800 |
| commit | dd57574c0427b4571c1daac42b6ffa636a8c80c1 (patch) | |
| tree | cfd6429d8c551ac48405f304326320a99eef3dfa /mail/em-subscription-editor.c | |
| parent | f20ec31e2069d4278cc7d5d4a96a334c9bbccb40 (diff) | |
| download | gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.gz gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.bz2 gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.lz gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.xz gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.zst gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.zip | |
Use new CamelService:display-name property.
Simplify, simplify...
Diffstat (limited to 'mail/em-subscription-editor.c')
| -rw-r--r-- | mail/em-subscription-editor.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c index 6c24e841c3..e484b5a121 100644 --- a/mail/em-subscription-editor.c +++ b/mail/em-subscription-editor.c @@ -805,7 +805,7 @@ subscription_editor_add_store (EMSubscriptionEditor *editor, CamelStore *store) { StoreData *data; - EAccount *account; + CamelService *service; GtkListStore *list_store; GtkTreeStore *tree_store; GtkTreeViewColumn *column; @@ -814,17 +814,13 @@ subscription_editor_add_store (EMSubscriptionEditor *editor, GtkComboBoxText *combo_box; GtkWidget *container; GtkWidget *widget; - const gchar *uid; + const gchar *display_name; - /* Neither of the built-in stores ("local" or "vfolder") support - * folder subscriptions. Therefore there should be a corresponding - * EAccount for the store from which we can grab a display name. */ - uid = camel_service_get_uid (CAMEL_SERVICE (store)); - account = e_get_account_by_uid (uid); - g_return_if_fail (account != NULL); + service = CAMEL_SERVICE (store); + display_name = camel_service_get_display_name (service); combo_box = GTK_COMBO_BOX_TEXT (editor->priv->combo_box); - gtk_combo_box_text_append_text (combo_box, account->name); + gtk_combo_box_text_append_text (combo_box, display_name); tree_store = gtk_tree_store_new ( N_COLUMNS, |