[Rhythmbox-devel] fix for 140232: disallow drop into smart playlists

[William Jon McCann <mccannwj pha jhu edu>]

Hi,

This should fix #140232: disallow drop into smart playlists.

Look ok?

Jon
* looking for rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-150 to compare with
* comparing to rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-150
A  {arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-10
M  sources/rb-sourcelist-model.c
M  sources/rb-playlist-source.c

* modified files

--- orig/sources/rb-playlist-source.c
+++ mod/sources/rb-playlist-source.c
@@ -577,7 +577,6 @@
 	GList *list;
 	RBPlaylistSource *source = RB_PLAYLIST_SOURCE (asource);
 
-
         if (data->type == gdk_atom_intern ("text/uri-list", TRUE)) {
                 list = gnome_vfs_uri_list_parse (data->data);
 


--- orig/sources/rb-sourcelist-model.c
+++ mod/sources/rb-sourcelist-model.c
@@ -339,7 +339,7 @@
 		gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
 				    RB_SOURCELIST_MODEL_COLUMN_SOURCE, &source, -1);
 		
-		return rb_source_can_rename (source);
+		return rb_source_can_cut (source);
 
 	}
 	return FALSE;
@@ -356,6 +356,8 @@
 	if (g_list_find (targets, gdk_atom_intern ("text/uri-list", TRUE))) {
 		if (!dest_path)
 			return FALSE;
+		if (!path_is_droppable (RB_SOURCELIST_MODEL (model), dest_path))
+			return FALSE;
 		*pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
 		return TRUE;
 	}



* added files

--- /dev/null
+++ /home/mccannwj/cvs/foo/rhythmbox--main--0.9--patch-149/,,what-changed rhythmbox--main--0 9--patch-150--rhythmbox-devel gnome org--2004/new-files-archive/./{arch}/rhythmbox/rhythmbox--main/rhythmbox--main--0.9/mccann jhu edu--2004/patch-log/patch-10
@@ -0,0 +1,13 @@
+Revision: rhythmbox--main--0.9--patch-10
+Archive: mccann jhu edu--2004
+Creator: William Jon McCann <mccann jhu edu>
+Date: Tue Nov 23 15:19:03 EST 2004
+Standard-date: 2004-11-23 20:19:03 GMT
+Modified-files: sources/rb-playlist-source.c
+    sources/rb-sourcelist-model.c
+New-patches: mccann jhu edu--2004/rhythmbox--main--0.9--patch-10
+Summary: Disallow drop into smart playlists.  Fixes #140232.
+Keywords: 
+
+
+