[nautilus] [src] GSEAL nautilus-places-sidebar.

[Cosimo Cecchi <cosimoc src gnome org>]

commit 06a2e40ccc45d82692997ee29e56314a45ea373f
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Jun 11 13:22:36 2010 +0200

    [src] GSEAL nautilus-places-sidebar.

 src/nautilus-places-sidebar.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index c70575e..49ff2ef 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -1171,9 +1171,9 @@ drag_data_received_callback (GtkWidget *widget,
 	tree_view = GTK_TREE_VIEW (widget);
 
 	if (!sidebar->drag_data_received) {
-		if (selection_data->target != GDK_NONE &&
+		if (gtk_selection_data_get_target (selection_data) != GDK_NONE &&
 		    info == TEXT_URI_LIST) {
-			sidebar->drag_list = build_selection_list (selection_data->data);
+			sidebar->drag_list = build_selection_list (gtk_selection_data_get_data (selection_data));
 		} else {
 			sidebar->drag_list = NULL;
 		}
@@ -1228,14 +1228,18 @@ drag_data_received_callback (GtkWidget *widget,
 			break;
 		}
 	} else {
+		GdkDragAction real_action;
+
 		/* file transfer requested */
-		if (context->action == GDK_ACTION_ASK) {
-			context->action =
+		real_action = gdk_drag_context_get_selected_action (context);
+
+		if (real_action == GDK_ACTION_ASK) {
+			real_action =
 				nautilus_drag_drop_action_ask (GTK_WIDGET (tree_view),
-							       context->actions);
+							       gdk_drag_context_get_actions (context));
 		}
 
-		if (context->action > 0) {
+		if (real_action > 0) {
 			model = gtk_tree_view_get_model (tree_view);
 
 			gtk_tree_model_get_iter (model, &iter, tree_path);
@@ -1245,10 +1249,10 @@ drag_data_received_callback (GtkWidget *widget,
 
 			switch (info) {
 			case TEXT_URI_LIST:
-				selection_list = build_selection_list (selection_data->data);
+				selection_list = build_selection_list (gtk_selection_data_get_data (selection_data));
 				uris = uri_list_from_selection (selection_list);
 				nautilus_file_operations_copy_move (uris, NULL, drop_uri,
-								    context->action, GTK_WIDGET (tree_view),
+								    real_action, GTK_WIDGET (tree_view),
 								    NULL, NULL);
 				nautilus_drag_destroy_selection_list (selection_list);
 				g_list_free (uris);