diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-03 20:59:35 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:42:05 +0800 |
commit | 9cf4104e04ae93c5b1dcb7a5d41accb507cf0199 (patch) | |
tree | cea7d0d54b6c3044b1c050b15f9dc8e548cf94e8 /mail/em-utils.c | |
parent | 0341ec5c9eb1394b9de36d53150916c98340861a (diff) | |
download | gsoc2013-evolution-9cf4104e04ae93c5b1dcb7a5d41accb507cf0199.tar gsoc2013-evolution-9cf4104e04ae93c5b1dcb7a5d41accb507cf0199.tar.gz gsoc2013-evolution-9cf4104e04ae93c5b1dcb7a5d41accb507cf0199.tar.bz2 gsoc2013-evolution-9cf4104e04ae93c5b1dcb7a5d41accb507cf0199.tar.lz gsoc2013-evolution-9cf4104e04ae93c5b1dcb7a5d41accb507cf0199.tar.xz gsoc2013-evolution-9cf4104e04ae93c5b1dcb7a5d41accb507cf0199.tar.zst gsoc2013-evolution-9cf4104e04ae93c5b1dcb7a5d41accb507cf0199.zip |
Drop 'folder_uri' param from em_utils_folder_is_drafts().
Diffstat (limited to 'mail/em-utils.c')
-rw-r--r-- | mail/em-utils.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c index 676a0f69db..ba496dcae9 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1051,22 +1051,24 @@ em_utils_folder_is_templates (CamelFolder *folder, const gchar *uri) /** * em_utils_folder_is_drafts: - * @folder: folder - * @uri: uri for this folder, if known + * @folder: a #CamelFolder * * Decides if @folder is a Drafts folder. * * Returns %TRUE if this is a Drafts folder or %FALSE otherwise. **/ gboolean -em_utils_folder_is_drafts (CamelFolder *folder, const gchar *uri) +em_utils_folder_is_drafts (CamelFolder *folder) { CamelFolder *local_drafts_folder; CamelSession *session; CamelStore *store; EAccountList *account_list; EIterator *iterator; - gint is_drafts = FALSE; + gchar *folder_uri; + gboolean is_drafts = FALSE; + + g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE); local_drafts_folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_DRAFTS); @@ -1074,8 +1076,7 @@ em_utils_folder_is_drafts (CamelFolder *folder, const gchar *uri) if (folder == local_drafts_folder) return TRUE; - if (folder == NULL || uri == NULL) - return FALSE; + folder_uri = e_mail_folder_uri_from_folder (folder); store = camel_folder_get_parent_store (folder); session = camel_service_get_session (CAMEL_SERVICE (store)); @@ -1095,7 +1096,7 @@ em_utils_folder_is_drafts (CamelFolder *folder, const gchar *uri) drafts_uri = em_uri_to_camel ( account->drafts_folder_uri); is_drafts = e_mail_folder_uri_equal ( - session, drafts_uri, uri); + session, drafts_uri, folder_uri); g_free (drafts_uri); } @@ -1103,6 +1104,7 @@ em_utils_folder_is_drafts (CamelFolder *folder, const gchar *uri) } g_object_unref (iterator); + g_free (folder_uri); return is_drafts; } |