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

4 files changed, 15 insertions, 17 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index e306621303..9797b6a1fc 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,14 @@
 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
 	storage.
 
diff --git a/shell/Evolution-Storage.idl b/shell/Evolution-Storage.idl
index 3660e3d74d..dcc87ca6dd 100644
--- a/shell/Evolution-Storage.idl
+++ b/shell/Evolution-Storage.idl
@@ -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;
 
diff --git a/shell/e-shell-shared-folder-picker-dialog.c b/shell/e-shell-shared-folder-picker-dialog.c
index 02ce56f98e..2e2d971c5e 100644
--- a/shell/e-shell-shared-folder-picker-dialog.c
+++ b/shell/e-shell-shared-folder-picker-dialog.c
@@ -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
diff --git a/shell/evolution-test-component.c b/shell/evolution-test-component.c
index 58056de5d4..7dc991fcf3 100644
--- a/shell/evolution-test-component.c
+++ b/shell/evolution-test-component.c
@@ -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);