From a5efc9cddddd1386c3adfa6cbaa358a7b7d6968f Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 19 Oct 2001 22:01:22 +0000 Subject: Pass the @folder_type to ::handleDrop. * e-storage-set-view.c (tree_drag_data_received): Pass the @folder_type to ::handleDrop. * evolution-shell-component-dnd.c (impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleMotion): New arg @folder_type. (impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleDrop): Likewise. * evolution-shell-component-dnd.h: Add @folder_type to `DndDestinationFolderHandleDropFn' and `DndDestinationFolderHandleMotionFn'. * e-storage-set-view.c (tree_drag_motion): Pass the folder type to `::handleMotion'. * Evolution-ShellComponentDnd.idl: Pass @folder_type in ::handleDrop and ::handleMotion. * component-factory.c (destination_folder_handle_motion): Get @folder_type here too [to match the changes in the EvolutionShellComponentDnd interface]. Also, remove a debugging message. (destination_folder_handle_drop): Likewise. * gui/component/addressbook-component.c (destination_folder_handle_motion): Get @folder_type here too [to match the changes in the EvolutionShellComponentDnd interface]. Also, remove a debugging message. (destination_folder_handle_drop): Likewise. svn path=/trunk/; revision=13807 --- mail/ChangeLog | 8 ++++++++ mail/component-factory.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 05ad589ca5..922402594c 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2001-10-19 Ettore Perazzoli + + * component-factory.c (destination_folder_handle_motion): Get + @folder_type here too [to match the changes in the + EvolutionShellComponentDnd interface]. Also, remove a debugging + message. + (destination_folder_handle_drop): Likewise. + 2001-10-19 Jeffrey Stedfast * mail-callbacks.c (mail_generate_reply): Update to reflect API diff --git a/mail/component-factory.c b/mail/component-factory.c index 64e92101a9..12dd05993d 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -404,6 +404,7 @@ get_dnd_selection (EvolutionShellComponent *shell_component, static CORBA_boolean destination_folder_handle_motion (EvolutionShellComponentDndDestinationFolder *folder, const char *physical_uri, + const char *folder_type, const GNOME_Evolution_ShellComponentDnd_DestinationFolder_Context *destination_context, GNOME_Evolution_ShellComponentDnd_Action *suggested_action_return, gpointer user_data) @@ -411,8 +412,6 @@ destination_folder_handle_motion (EvolutionShellComponentDndDestinationFolder *f const char *noselect; CamelURL *url; - g_print ("in destination_folder_handle_motion (%s)\n", physical_uri); - url = camel_url_new (physical_uri, NULL); noselect = camel_url_get_param (url, "noselect"); @@ -464,6 +463,7 @@ message_rfc822_dnd (CamelFolder *dest, CamelStream *stream, CamelException *ex) static CORBA_boolean destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *dest_folder, const char *physical_uri, + const char *folder_type, const GNOME_Evolution_ShellComponentDnd_DestinationFolder_Context *destination_context, const GNOME_Evolution_ShellComponentDnd_Action action, const GNOME_Evolution_ShellComponentDnd_Data *data, -- cgit