diff options
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/Evolution-ShellComponentDnd.idl | 14 | ||||
| -rw-r--r-- | shell/e-storage-set-view.c | 14 |
3 files changed, 20 insertions, 14 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index a0c2bbd4bf..68e3049f8a 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,11 @@ 2001-03-21 Ettore Perazzoli <ettore@ximian.com> + * Evolution-ShellComponentDnd.idl: StudlyCapsify struct members to + match the new IDL naming standards. + * e-storage-set-view.c: Updated accordingly. + +2001-03-21 Ettore Perazzoli <ettore@ximian.com> + * e-storage-set-view.c (tree_drag_data_get): Get the target type from the atom, and pass it through the `SourceFolder::getData' invocation. Also, signal an error by passing `-1' as the length diff --git a/shell/Evolution-ShellComponentDnd.idl b/shell/Evolution-ShellComponentDnd.idl index 7eaea434fc..0186215627 100644 --- a/shell/Evolution-ShellComponentDnd.idl +++ b/shell/Evolution-ShellComponentDnd.idl @@ -33,10 +33,10 @@ module ShellComponentDnd { interface SourceFolder : Bonobo::Unknown { struct Context { - string physical_uri; - string folder_type; - ActionSet possible_actions; - Action suggested_action; + string physicalUri; + string folderType; + ActionSet possibleActions; + Action suggestedAction; }; /* The user started a drag from this object. If the component @@ -68,9 +68,9 @@ module ShellComponentDnd { interface DestinationFolder : Bonobo::Unknown { struct Context { - string dnd_type; - ActionSet possible_actions; - Action suggested_action; + string dndType; + ActionSet possibleActions; + Action suggestedAction; }; /* The user is moving a dragged object over our folder. This diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index f99c27647b..1b31e018f0 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -860,10 +860,10 @@ tree_drag_begin (ETree *etree, CORBA_free (priv->drag_corba_source_context); priv->drag_corba_source_context = GNOME_Evolution_ShellComponentDnd_SourceFolder_Context__alloc (); - priv->drag_corba_source_context->physical_uri = CORBA_string_dup (e_folder_get_physical_uri (folder)); - priv->drag_corba_source_context->folder_type = CORBA_string_dup (e_folder_get_type_string (folder)); - priv->drag_corba_source_context->possible_actions = possible_actions; - priv->drag_corba_source_context->suggested_action = suggested_action; + priv->drag_corba_source_context->physicalUri = CORBA_string_dup (e_folder_get_physical_uri (folder)); + priv->drag_corba_source_context->folderType = CORBA_string_dup (e_folder_get_type_string (folder)); + priv->drag_corba_source_context->possibleActions = possible_actions; + priv->drag_corba_source_context->suggestedAction = suggested_action; } static void @@ -1016,9 +1016,9 @@ tree_drag_motion (ETree *tree, CORBA_exception_init (&ev); - corba_context.dnd_type = (char *) dnd_type; /* (Safe cast, as we don't actually free the corba_context.) */ - corba_context.possible_actions = convert_gdk_drag_action_to_corba (context->actions); - corba_context.suggested_action = convert_gdk_drag_action_to_corba (context->suggested_action); + corba_context.dndType = (char *) dnd_type; /* (Safe cast, as we don't actually free the corba_context.) */ + corba_context.possibleActions = convert_gdk_drag_action_to_corba (context->actions); + corba_context.suggestedAction = convert_gdk_drag_action_to_corba (context->suggested_action); can_handle = GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleMotion (destination_folder_interface, &corba_context, |