New, implementation for the cancel_discover_shared_folder virtual method.

* e-corba-storage.c (cancel_discover_shared_folder): New,
implementation for the cancel_discover_shared_folder virtual
method.
(class_init): Install.

* evolution-test-component.c
(storage_discover_shared_folder_callback): Instead of passing the
listener to the timeout function, just pass the storage.  Put the
listener and the timeout ID on the storage object by using
gtk_object_set_data().
(shared_folder_discovery_timeout_callback): Updated accordingly.
(storage_cancel_discover_shared_folder_callback): New, callback
for the cancel_discover_shared_folder signal.
(setup_custom_storage): Connect.

* e-shell-shared-folder-picker-dialog.c: New member storage in
struct DiscoveryData.  While I am at it, rename member user to
user_email_address.
(discover_folder): Set the storage member.
(cleanup_discovery): Unref storage member.
(progress_dialog_clicked_callback): New, callback for the
"clicked" signal on the dialog.
(discover_folder): Connect.

* evolution-storage.c (class_init): Install signal
"cancel_discover_shared_folder".
(impl_Storage_cancelDiscoverSharedFolder): New, implementation for
the cancelDiscoverSharedFolder CORBA method; emit
"cancel_discover_shared_folder".
(evolution_storage_get_epv): Install CORBA method implementation.

* evolution-storage.h: Add signal cancel_discover_shared_folder.

* e-storage.c (e_storage_cancel_discover_shared_folder): New.

* e-storage.h: New virtual method cancel_discover_shared_folder.

* Evolution-Storage.idl (cancelDiscoverSharedFolder): New.

svn path=/trunk/; revision=18386

1 files changed, 16 insertions, 3 deletions

diff --git a/shell/e-storage.c b/shell/e-storage.c
index 6be864ffa9..dcaeb5cf18 100644
--- a/shell/e-storage.c
+++ b/shell/e-storage.c
@@ -277,9 +277,9 @@ class_init (EStorageClass *class)
 	class->async_xfer_folder   = impl_async_xfer_folder;
 	class->async_open_folder   = impl_async_open_folder;
 
-	class->supports_shared_folders      = impl_supports_shared_folders;
-	class->async_discover_shared_folder = impl_async_discover_shared_folder;
-	class->async_remove_shared_folder   = impl_async_remove_shared_folder;
+	class->supports_shared_folders       = impl_supports_shared_folders;
+	class->async_discover_shared_folder  = impl_async_discover_shared_folder;
+	class->async_remove_shared_folder    = impl_async_remove_shared_folder;
 
 	signals[NEW_FOLDER] =
 		gtk_signal_new ("new_folder",
@@ -534,6 +534,19 @@ e_storage_async_discover_shared_folder (EStorage *storage,
 }
 
 void
+e_storage_cancel_discover_shared_folder (EStorage *storage,
+					 const char *owner,
+					 const char *folder_name)
+{
+	g_return_if_fail (E_IS_STORAGE (storage));
+	g_return_if_fail (owner != NULL);
+	g_return_if_fail (folder_name != NULL);
+	g_return_if_fail (ES_CLASS (storage)->cancel_discover_shared_folder != NULL);
+
+	(* ES_CLASS (storage)->cancel_discover_shared_folder) (storage, owner, folder_name);
+}
+
+void
 e_storage_async_remove_shared_folder (EStorage *storage,
 				      const char *path,
 				      EStorageResultCallback callback,