From 55d6d8dcf3964f16fe210479e94514dbe985f2b4 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Wed, 5 Dec 2007 17:58:22 +0000 Subject: [PATCH] * Removed some weird const pmo-trunk-r3881 --- src/modest-email-clipboard.c | 2 +- src/modest-email-clipboard.h | 2 +- src/modest-tny-folder.c | 9 ++++----- src/modest-tny-folder.h | 2 +- src/modest-ui-dimming-rules.c | 3 +-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/modest-email-clipboard.c b/src/modest-email-clipboard.c index 1617621..878718a 100644 --- a/src/modest-email-clipboard.c +++ b/src/modest-email-clipboard.c @@ -255,7 +255,7 @@ modest_email_clipboard_cleared (ModestEmailClipboard *self) gboolean modest_email_clipboard_check_source_folder (ModestEmailClipboard *self, - const TnyFolder *folder) + TnyFolder *folder) { TnyFolderType folder_type1; TnyFolderType folder_type2; diff --git a/src/modest-email-clipboard.h b/src/modest-email-clipboard.h index 9db2d92..bc82492 100644 --- a/src/modest-email-clipboard.h +++ b/src/modest-email-clipboard.h @@ -145,7 +145,7 @@ gboolean modest_email_clipboard_cleared (ModestEmailClipboard *self); */ gboolean modest_email_clipboard_check_source_folder (ModestEmailClipboard *self, - const TnyFolder *folder); + TnyFolder *folder); /** * modest_email_clipboard_set_data: diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c index e011a99..d89b868 100644 --- a/src/modest-tny-folder.c +++ b/src/modest-tny-folder.c @@ -58,14 +58,15 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* full_name) TnyFolderType -modest_tny_folder_guess_folder_type (const TnyFolder *folder) +modest_tny_folder_guess_folder_type (TnyFolder *folder) { TnyFolderType type; g_return_val_if_fail (TNY_IS_FOLDER(folder), TNY_FOLDER_TYPE_INVALID); - if (modest_tny_folder_is_local_folder ((TnyFolder*)folder)) - type = modest_tny_folder_get_local_or_mmc_folder_type ((TnyFolder*)folder); + if (modest_tny_folder_is_local_folder (folder) || + modest_tny_folder_is_memory_card_folder (folder)) + type = modest_tny_folder_get_local_or_mmc_folder_type (folder); else type = tny_folder_get_folder_type (TNY_FOLDER (folder)); @@ -231,8 +232,6 @@ gboolean modest_tny_folder_is_memory_card_folder (TnyFolder *folder) { g_return_val_if_fail (folder, FALSE); - g_return_val_if_fail (modest_tny_folder_guess_folder_type (folder) != - TNY_FOLDER_TYPE_INVALID, FALSE); /* The merge folder is a special case, * used to merge the per-account local outbox folders. diff --git a/src/modest-tny-folder.h b/src/modest-tny-folder.h index c271ccc..0372a06 100644 --- a/src/modest-tny-folder.h +++ b/src/modest-tny-folder.h @@ -70,7 +70,7 @@ typedef enum { * * Returns: the folder type, or TNY_FOLDER_TYPE_UNKNOWN */ -TnyFolderType modest_tny_folder_guess_folder_type (const TnyFolder *folder); +TnyFolderType modest_tny_folder_guess_folder_type (TnyFolder *folder); diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index e383913..2da7655 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -2170,8 +2170,7 @@ _selected_folder_is_same_as_source (ModestWindow *win) } /* Check source folder */ - result = modest_email_clipboard_check_source_folder (clipboard, - (const TnyFolder *) folder); + result = modest_email_clipboard_check_source_folder (clipboard, TNY_FOLDER (folder)); /* Free */ frees: -- 1.7.9.5