diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 2 | ||||
| -rw-r--r-- | shell/ChangeLog | 11 | ||||
| -rw-r--r-- | shell/Evolution-Offline.idl | 4 | ||||
| -rw-r--r-- | shell/Evolution-Storage.idl | 10 | ||||
| -rw-r--r-- | shell/evolution-storage.c | 6 |
6 files changed, 29 insertions, 11 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d7ac3e60fa..61f163101b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2002-05-09 Ettore Perazzoli <ettore@ximian.com> + + * gui/e-itip-control.c (get_servers): use + GNOME_Evolution_Storage__get_folderList instead of + GNOME_Evolution_Storage_getFolderList since I have now changed + that to be an attribute instead of a method. + 2002-05-07 JP Rosevear <jpr@ximian.com> * gui/e-itip-control.c (start_calendar_server): start a server a diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 90be0c509c..f8cfe2fea3 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -278,7 +278,7 @@ get_servers (EvolutionShellClient *shell_client, const char *possible_types[], g GNOME_Evolution_FolderList *folder_list; storage = storage_list->_buffer[i]; - folder_list = GNOME_Evolution_Storage_getFolderList (storage, &ev); + folder_list = GNOME_Evolution_Storage__get_folderList (storage, &ev); for (j = 0; j < folder_list->_length; j++) { GNOME_Evolution_Folder folder; diff --git a/shell/ChangeLog b/shell/ChangeLog index 9c440a689e..ef329f89f5 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,14 @@ +2002-05-09 Ettore Perazzoli <ettore@ximian.com> + + * Evolution-Offline.idl: Rename NotPrepared to notPrepared and + NotSyncing to notSyncing. + + * evolution-storage.c (impl_Storage__get_folder_list): Renamed + from impl_Storage_get_folder_list(). + + * Evolution-Storage.idl: Don't typedef FolderList here. Replace + `getFolderList' method with a readonly attribute. + 2002-05-07 Ettore Perazzoli <ettore@ximian.com> * Evolution-Offline.idl: New interface SyncFolderProgressListener. diff --git a/shell/Evolution-Offline.idl b/shell/Evolution-Offline.idl index 282b9fdf17..24973df174 100644 --- a/shell/Evolution-Offline.idl +++ b/shell/Evolution-Offline.idl @@ -34,8 +34,8 @@ interface SyncFolderProgressListener { }; interface Offline : Bonobo::Unknown { - exception NotPrepared {}; - exception NotSyncing {}; + exception notPrepared {}; + exception notSyncing {}; /* Whether the component is currently off-line. */ attribute boolean isOffline; diff --git a/shell/Evolution-Storage.idl b/shell/Evolution-Storage.idl index 824d6e32e3..84d323c3bd 100644 --- a/shell/Evolution-Storage.idl +++ b/shell/Evolution-Storage.idl @@ -19,10 +19,6 @@ module Evolution { exception AlreadyListening {}; exception NotFound {}; - attribute string name; - - typedef sequence<Folder> FolderList; - enum Result { OK, UNSUPPORTED_OPERATION, @@ -41,7 +37,11 @@ module Evolution { string path; }; - FolderList getFolderList (); + /* Flat list of the folders in the storage. */ + readonly attribute FolderList folderList; + + /* The name of the storage. */ + attribute string name; void asyncCreateFolder (in string path, in string type, diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index fa62c5244c..4223c83e48 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -279,8 +279,8 @@ get_folder_list_foreach (EFolderTree *tree, } static GNOME_Evolution_FolderList * -impl_Storage_get_folder_list (PortableServer_Servant servant, - CORBA_Environment *ev) +impl_Storage__get_folder_list (PortableServer_Servant servant, + CORBA_Environment *ev) { BonoboObject *bonobo_object; EvolutionStorage *storage; @@ -655,7 +655,7 @@ evolution_storage_get_epv (void) epv = g_new0 (POA_GNOME_Evolution_Storage__epv, 1); epv->_get_name = impl_Storage__get_name; - epv->getFolderList = impl_Storage_get_folder_list; + epv->_get_folderList = impl_Storage__get_folder_list; epv->asyncCreateFolder = impl_Storage_async_create_folder; epv->asyncRemoveFolder = impl_Storage_async_remove_folder; epv->asyncXferFolder = impl_Storage_async_xfer_folder; |