From 13c9d214fa4b93a0c3ae08a533a8605b13a323b1 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 20 May 2002 19:06:03 +0000 Subject: Set the can_sync_offline property on the EFolder based on the * e-corba-storage.c (impl_StorageListener_notifyFolderCreated): Set the can_sync_offline property on the EFolder based on the canSyncOffline value on the CORBA folder. * evolution-test-component.c (setup_custom_storage): Pass FALSE for @sync_offline to evolution_storage_new_folder(). * e-local-storage.c (new_folder): Pass FALSE for @sync_offline to evolution_storage_new_folder(). * evolution-storage.h (evolution_storage_new_folder): New arg @can_sync_offline. * subscribe-dialog.c (recursive_add_folder): Pass TRUE for @sync_offline to evolution_storage_new_folder(). * mail-folder-cache.c (real_flush_updates): Pass TRUE for @sync_offline to evolution_storage_new_folder(). * gui/component/addressbook-storage.c (load_source_data): Pass FALSE for @sync_offline to evolution_storage_new_folder(). (addressbook_storage_add_source): Pass FALSE for @sync_offline to evolution_storage_new_folder(). svn path=/trunk/; revision=16947 --- shell/ChangeLog | 15 +++++++++++++++ shell/e-corba-storage.c | 1 + shell/e-local-storage.c | 3 ++- shell/evolution-storage.c | 12 +++++++----- shell/evolution-storage.h | 3 ++- shell/evolution-test-component.c | 6 ++++-- 6 files changed, 31 insertions(+), 9 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index ff0acc14de..d9c431e1ab 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,18 @@ +2002-05-20 Ettore Perazzoli + + * e-corba-storage.c (impl_StorageListener_notifyFolderCreated): + Set the can_sync_offline property on the EFolder based on the + canSyncOffline value on the CORBA folder. + + * evolution-test-component.c (setup_custom_storage): Pass FALSE + for @sync_offline to evolution_storage_new_folder(). + + * e-local-storage.c (new_folder): Pass FALSE for @sync_offline to + evolution_storage_new_folder(). + + * evolution-storage.h (evolution_storage_new_folder): New arg + @can_sync_offline. + 2002-05-20 Ettore Perazzoli * Evolution-Offline.idl (syncFolder): Remove exception. diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c index 96a981b859..8caaac7776 100644 --- a/shell/e-corba-storage.c +++ b/shell/e-corba-storage.c @@ -108,6 +108,7 @@ impl_StorageListener_notifyFolderCreated (PortableServer_Servant servant, e_folder_set_physical_uri (e_folder, folder->physicalUri); e_folder_set_unread_count (e_folder, folder->unreadCount); + e_folder_set_can_sync_offline (e_folder, folder->canSyncOffline); if (! e_storage_new_folder (storage, path, e_folder)) { g_warning ("Cannot register folder -- %s %s\n", path, folder->displayName); diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index 58d8a5b20a..46965f43a8 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -145,7 +145,8 @@ new_folder (ELocalStorage *local_storage, e_folder_get_type_string (folder), e_folder_get_physical_uri (folder), e_folder_get_description (folder), - e_folder_get_unread_count (folder)); + e_folder_get_unread_count (folder), + FALSE); } static gboolean diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index 28cbf89ce2..9e6b7883d5 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -943,7 +943,8 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage, const char *type, const char *physical_uri, const char *description, - int unread_count) + int unread_count, + gboolean can_sync_offline) { EvolutionStorageResult result; EvolutionStoragePrivate *priv; @@ -970,10 +971,11 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage, CORBA_exception_init (&ev); corba_folder = GNOME_Evolution_Folder__alloc (); - corba_folder->displayName = CORBA_string_dup (display_name); - corba_folder->description = CORBA_string_dup (description); - corba_folder->type = CORBA_string_dup (type); - corba_folder->physicalUri = CORBA_string_dup (physical_uri); + corba_folder->displayName = CORBA_string_dup (display_name); + corba_folder->description = CORBA_string_dup (description); + corba_folder->type = CORBA_string_dup (type); + corba_folder->physicalUri = CORBA_string_dup (physical_uri); + corba_folder->canSyncOffline = (CORBA_boolean) can_sync_offline; evolutionUri = make_full_uri (evolution_storage, path); corba_folder->evolutionUri = CORBA_string_dup (evolutionUri); diff --git a/shell/evolution-storage.h b/shell/evolution-storage.h index 59d46f7a44..10cec85ea3 100644 --- a/shell/evolution-storage.h +++ b/shell/evolution-storage.h @@ -138,7 +138,8 @@ EvolutionStorageResult evolution_storage_new_folder (EvolutionStorage const char *type, const char *physical_uri, const char *description, - int unread_count); + int unread_count, + gboolean can_sync_offline); EvolutionStorageResult evolution_storage_update_folder (EvolutionStorage *evolution_storage, const char *path, int unread_count); diff --git a/shell/evolution-test-component.c b/shell/evolution-test-component.c index 5c2d36b16e..98227d67b3 100644 --- a/shell/evolution-test-component.c +++ b/shell/evolution-test-component.c @@ -326,8 +326,10 @@ setup_custom_storage (EvolutionShellClient *shell_client) return; } - evolution_storage_new_folder (the_storage, "/FirstFolder", "FirstFolder", "mail", "file:///tmp/blah", "", 0); - evolution_storage_new_folder (the_storage, "/SecondFolder", "SecondFolder", "calendar", "file:///tmp/bleh", "", 0); + evolution_storage_new_folder (the_storage, "/FirstFolder", "FirstFolder", + "mail", "file:///tmp/blah", "", 0, TRUE); + evolution_storage_new_folder (the_storage, "/SecondFolder", "SecondFolder", + "calendar", "file:///tmp/bleh", "", 0, FALSE); } -- cgit v1.2.3