diff options
| -rw-r--r-- | shell/ChangeLog | 13 | ||||
| -rw-r--r-- | shell/Evolution-ShellComponentDnd.idl | 2 | ||||
| -rw-r--r-- | shell/e-folder-dnd-bridge.c | 8 | ||||
| -rw-r--r-- | shell/e-storage-set-view.c | 7 |
4 files changed, 21 insertions, 9 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 51346e7798..f75bee9a96 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,16 @@ +2003-03-04 Ettore Perazzoli <ettore@ximian.com> + + * e-folder-dnd-bridge.c (find_matching_target_for_drag_context): + Handle p->data as a GdkAtom instead of a GdkAtom *. + (handle_data_received_non_path): Set the target member of the + corba_data struct to be the name of the atom. + + * e-storage-set-view.c (impl_tree_drag_data_get): Pass the name of + the atom instead of the atom itself. + + * Evolution-ShellComponentDnd.idl: Changed the type of Data.target + to string. + 2003-03-03 Ettore Perazzoli <ettore@ximian.com> * glade/e-shell-shared-folder-picker-dialog.glade: Swap Cancel/OK diff --git a/shell/Evolution-ShellComponentDnd.idl b/shell/Evolution-ShellComponentDnd.idl index 064f233417..baf715f0f7 100644 --- a/shell/Evolution-ShellComponentDnd.idl +++ b/shell/Evolution-ShellComponentDnd.idl @@ -26,7 +26,7 @@ module ShellComponentDnd { struct Data { short format; - short target; + string target; sequence <octet> bytes; }; diff --git a/shell/e-folder-dnd-bridge.c b/shell/e-folder-dnd-bridge.c index bc45a2e03e..726a53be83 100644 --- a/shell/e-folder-dnd-bridge.c +++ b/shell/e-folder-dnd-bridge.c @@ -159,12 +159,12 @@ find_matching_target_for_drag_context (EStorageSet *storage_set, for (p = drag_context->targets; p != NULL; p = p->next) { char *possible_type; - possible_type = gdk_atom_name (*((GdkAtom *) p->data)); + possible_type = gdk_atom_name (p->data); if (strcmp (possible_type, E_FOLDER_DND_PATH_TARGET_TYPE) == 0) { g_free (possible_type); if (atom_return != NULL) - *atom_return = *((GdkAtom *) p->data); + *atom_return = p->data; return E_FOLDER_DND_PATH_TARGET_TYPE; } @@ -177,7 +177,7 @@ find_matching_target_for_drag_context (EStorageSet *storage_set, g_free (possible_type); if (atom_return != NULL) - *atom_return = *((GdkAtom *) p->data); + *atom_return = p->data; return accepted_type; } @@ -425,7 +425,7 @@ handle_data_received_non_path (GdkDragContext *context, corba_context.suggestedAction = convert_gdk_drag_action_to_corba (context->suggested_action); corba_data.format = selection_data->format; - corba_data.target = 0; /* selection_data->target FIXME */ + corba_data.target = gdk_atom_name (selection_data->target); corba_data.bytes._release = FALSE; diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 82af6389cd..735da0ab21 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -1097,16 +1097,15 @@ impl_tree_drag_data_get (ETree *etree, & priv->drag_corba_data, &ev); -#if 0 if (ev._major != CORBA_NO_EXCEPTION) - gtk_selection_data_set (selection_data, selection_data->target, 8, "", -1); + gtk_selection_data_set (selection_data, + selection_data->target, 8, "", -1); else gtk_selection_data_set (selection_data, - priv->drag_corba_data->target, + gdk_atom_intern (priv->drag_corba_data->target, FALSE), priv->drag_corba_data->format, priv->drag_corba_data->bytes._buffer, priv->drag_corba_data->bytes._length); -#endif g_free (target_type); |