Updated for FolderResult instead of DiscoverSharedFolderResult.

* e-shell-shared-folder-picker-dialog.c
(shared_folder_discovery_listener_callback): Updated for
FolderResult instead of DiscoverSharedFolderResult.

* Evolution-Storage.idl: Remove struct DiscoverSharedFolderResult;
we want to just use FolderResult for asyncDiscoverSharedFolder.

svn path=/trunk/; revision=16751
This commit is contained in:
Ettore Perazzoli
2002-05-10 18:40:53 +00:00
parent 67bf5ca837
commit b1cecd2f33
4 changed files with 15 additions and 17 deletions

View File

@ -1,3 +1,12 @@
2002-05-10 Ettore Perazzoli <ettore@ximian.com>
* e-shell-shared-folder-picker-dialog.c
(shared_folder_discovery_listener_callback): Updated for
FolderResult instead of DiscoverSharedFolderResult.
* Evolution-Storage.idl: Remove struct DiscoverSharedFolderResult;
we want to just use FolderResult for asyncDiscoverSharedFolder.
2002-05-10 Ettore Perazzoli <ettore@ximian.com>
* evolution-test-component.c: Added some tests for the custom

View File

@ -37,13 +37,6 @@ module Evolution {
string path;
};
struct DiscoverSharedFolderResult {
Result result;
string storagePath;
string physicalURI;
string type;
};
/* The name of the storage. */
readonly attribute string name;

View File

@ -370,20 +370,18 @@ shared_folder_discovery_listener_callback (BonoboListener *listener,
CORBA_Environment *ev,
void *data)
{
GNOME_Evolution_Storage_DiscoverSharedFolderResult *result;
GNOME_Evolution_Storage_FolderResult *result;
DiscoveryData *discovery_data;
discovery_data = (DiscoveryData *) data;
result = (GNOME_Evolution_Storage_DiscoverSharedFolderResult *) value->_value;
result = (GNOME_Evolution_Storage_FolderResult *) value->_value;
cleanup_discovery (discovery_data);
/* FIXME: The folder has been discovered; do something here, i.e. show
the folder. */
e_notice (NULL, GNOME_MESSAGE_BOX_INFO,
"Found folder\n%s\n%s\n%s",
result->storagePath, result->physicalURI, result->type);
e_notice (NULL, GNOME_MESSAGE_BOX_INFO, "Found folder\n%s", result->path);
}
static void

View File

@ -267,16 +267,14 @@ shared_folder_discovery_timeout_callback (void *data)
CORBA_Environment ev;
Bonobo_Listener listener;
CORBA_any any;
GNOME_Evolution_Storage_DiscoverSharedFolderResult result;
GNOME_Evolution_Storage_FolderResult result;
listener = (Bonobo_Listener) data;
result.result = GNOME_Evolution_Storage_OK;
result.storagePath = "/Shared Folders/The Public Folder";
result.physicalURI = "blah://bleh.net:3764/bluh/bleh/blih";
result.type = "test";
result.path = "/Shared Folders/The Public Folder";
any._type = TC_GNOME_Evolution_Storage_DiscoverSharedFolderResult;
any._type = TC_GNOME_Evolution_Storage_FolderResult;
any._value = &result;
CORBA_exception_init (&ev);