diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-26 17:57:13 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-26 17:57:13 +0800 |
| commit | 6b104de6536863409d853f1822075ff1393618c4 (patch) | |
| tree | a4e2805f02189fcc7cc619d88778272f39d7808e /mail/mail-vfolder.c | |
| parent | bd149b27954af20cf3f860164486191b0e879e89 (diff) | |
| parent | 251b734a8573a1d6b04d2b82ce1f0be9fe9662ab (diff) | |
| download | gsoc2013-evolution-6b104de6536863409d853f1822075ff1393618c4.tar gsoc2013-evolution-6b104de6536863409d853f1822075ff1393618c4.tar.gz gsoc2013-evolution-6b104de6536863409d853f1822075ff1393618c4.tar.bz2 gsoc2013-evolution-6b104de6536863409d853f1822075ff1393618c4.tar.lz gsoc2013-evolution-6b104de6536863409d853f1822075ff1393618c4.tar.xz gsoc2013-evolution-6b104de6536863409d853f1822075ff1393618c4.tar.zst gsoc2013-evolution-6b104de6536863409d853f1822075ff1393618c4.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'mail/mail-vfolder.c')
| -rw-r--r-- | mail/mail-vfolder.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index f2f9219b89..2d491e1bae 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -1089,9 +1089,8 @@ vfolder_load_storage (EMailBackend *backend) CamelService *service; const gchar *key; - const gchar *data_dir; const gchar *config_dir; - gchar *user, *storeuri; + gchar *user; EFilterRule *rule; MailFolderCache *folder_cache; EMailSession *session; @@ -1112,15 +1111,13 @@ vfolder_load_storage (EMailBackend *backend) G_UNLOCK (vfolder_hash); - data_dir = mail_session_get_data_dir (); config_dir = mail_session_get_config_dir (); session = e_mail_backend_get_session (backend); /* first, create the vfolder store, and set it up */ - storeuri = g_strdup_printf("vfolder:%s/vfolder", data_dir); service = camel_session_add_service ( CAMEL_SESSION (session), "vfolder", - storeuri, CAMEL_PROVIDER_STORE, NULL); + "vfolder", CAMEL_PROVIDER_STORE, NULL); if (service != NULL) { camel_service_set_display_name (service, _("Search Folders")); em_utils_connect_service_sync (service, NULL, NULL); @@ -1174,8 +1171,6 @@ vfolder_load_storage (EMailBackend *backend) } } - g_free (storeuri); - /* reenable the feature if required */ settings = g_settings_new ("org.gnome.evolution.mail"); key = "enable-vfolders"; |