diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-24 17:30:20 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-24 17:30:20 +0800 |
| commit | bd149b27954af20cf3f860164486191b0e879e89 (patch) | |
| tree | 323c26ba15a7e15242c2749b391b5ffa59762fed /mail/e-mail-backend.c | |
| parent | 3b32549c69267295a9a7b482e4a6ca2db9e6c73f (diff) | |
| parent | 8c67e84f9bf1803108f7a004513e37c6ef22d41f (diff) | |
| download | gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.gz gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.bz2 gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.lz gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.xz gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.zst gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'mail/e-mail-backend.c')
| -rw-r--r-- | mail/e-mail-backend.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index cb91339503..be2f94eeb9 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -544,7 +544,6 @@ mail_backend_folder_changed_cb (MailFolderCache *folder_cache, const gchar *msg_subject, EMailBackend *mail_backend) { - CamelFolder *folder = NULL; EMEvent *event = em_event_peek (); EMEventTargetFolder *target; EMFolderTreeModel *model; @@ -554,11 +553,15 @@ mail_backend_folder_changed_cb (MailFolderCache *folder_cache, folder_uri = e_mail_folder_uri_build (store, folder_name); - if (mail_folder_cache_get_folder_from_uri ( - folder_cache, folder_uri, &folder)) - if (folder && !mail_folder_cache_get_folder_info_flags ( - folder_cache, folder, &flags)) - g_return_if_reached (); + if (folder_uri) { + CamelFolder *folder = NULL; + + if (mail_folder_cache_get_folder_from_uri (folder_cache, folder_uri, &folder)) + if (folder && !mail_folder_cache_get_folder_info_flags (folder_cache, folder, &flags)) + g_return_if_reached (); + if (folder) + g_object_unref (folder); + } g_free (folder_uri); |