nautilus r14634 - in trunk: . src/file-manager

[cneumair svn gnome org]

Author: cneumair
Date: Wed Sep 17 15:19:22 2008
New Revision: 14634
URL: http://svn.gnome.org/viewvc/nautilus?rev=14634&view=rev

Log:
2008-09-17  Christian Neumair  <cneumair gnome org>

	* src/file-manager/fm-list-model.c
	(fm_list_model_multi_drag_data_get),
	(fm_list_model_get_drag_target_list):
	* src/file-manager/fm-list-model.h:
	* src/file-manager/fm-list-view.c (motion_notify_callback):
	Enable text drag target for list view. Fixes #552474.


Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-list-model.c
   trunk/src/file-manager/fm-list-model.h
   trunk/src/file-manager/fm-list-view.c

Modified: trunk/src/file-manager/fm-list-model.c
==============================================================================
--- trunk/src/file-manager/fm-list-model.c	(original)
+++ trunk/src/file-manager/fm-list-model.c	Wed Sep 17 15:19:22 2008
@@ -855,10 +855,7 @@
 	context.path_list = path_list;
 
 	if (!drag_target_list) {
-		drag_target_list = gtk_target_list_new 
-			(drag_types, G_N_ELEMENTS (drag_types));
-		gtk_target_list_add_text_targets (
-			drag_target_list, NAUTILUS_ICON_DND_TEXT);
+		drag_target_list = fm_list_model_get_drag_target_list ();
 	}
 
 	if (gtk_target_list_find (drag_target_list,
@@ -1461,12 +1458,15 @@
 	model->details->drag_begin_y = drag_begin_y;
 }
 
-void
-fm_list_model_get_drag_types (const GtkTargetEntry **entries,
-			      int *num_entries)
+GtkTargetList *
+fm_list_model_get_drag_target_list ()
 {
-	*entries = drag_types;
-	*num_entries = G_N_ELEMENTS (drag_types);
+	GtkTargetList *target_list;
+
+	target_list = gtk_target_list_new (drag_types, G_N_ELEMENTS (drag_types));
+	gtk_target_list_add_text_targets (target_list, NAUTILUS_ICON_DND_TEXT);
+
+	return target_list;
 }
 
 int               

Modified: trunk/src/file-manager/fm-list-model.h
==============================================================================
--- trunk/src/file-manager/fm-list-model.h	(original)
+++ trunk/src/file-manager/fm-list-model.h	Wed Sep 17 15:19:22 2008
@@ -118,8 +118,8 @@
 					       int begin_x, 
 					       int begin_y);
 
-void              fm_list_model_get_drag_types (const GtkTargetEntry **entries,
-						int *num_entries);
+GtkTargetList *   fm_list_model_get_drag_target_list (void);
+
 int               fm_list_model_compare_func (FMListModel *model,
 					      NautilusFile *file1,
 					      NautilusFile *file2);

Modified: trunk/src/file-manager/fm-list-view.c
==============================================================================
--- trunk/src/file-manager/fm-list-view.c	(original)
+++ trunk/src/file-manager/fm-list-view.c	Wed Sep 17 15:19:22 2008
@@ -493,14 +493,7 @@
 
 	if (view->details->drag_button != 0) {
 		if (!source_target_list) {
-			const GtkTargetEntry *drag_types;
-			int n_drag_types;
-
-			fm_list_model_get_drag_types (&drag_types,
-						      &n_drag_types);
-
-			source_target_list = gtk_target_list_new (drag_types,
-								  n_drag_types);
+			source_target_list = fm_list_model_get_drag_target_list ();
 		}
 
 		if (gtk_drag_check_threshold (widget,