Merge lp:~voluntatefaber/beat-box/bug934439 into lp:beat-box/1.x

[Andrea Basso]

Fixes bug #934439

[Victor Martinez (victored)]

review: Approve

=== modified file 'src/Widgets/SideTreeView.vala'
--- src/Widgets/SideTreeView.vala	2012-02-17 01:24:32 +0000
+++ src/Widgets/SideTreeView.vala	2012-02-17 19:48:17 +0000
@@ -114,7 +114,7 @@
 		radioMenu = new Gtk.Menu();
 		radioImportStations = new Gtk.MenuItem.with_label(_("Import Station"));
 		radioMenu.append(radioImportStations);
-		radioImportStations.activate.connect(playlistImportClicked);
+		radioImportStations.activate.connect(()=> {playlistImportClicked ("Station");});
 		radioMenu.show_all();
 		
 		//playlist right click menu
@@ -139,7 +139,7 @@
 		playlistRemove.activate.connect(playlistMenuRemoveClicked);
 		playlistSave.activate.connect(playlistSaveClicked);
 		playlistExport.activate.connect(playlistExportClicked);
-		playlistImport.activate.connect(playlistImportClicked);
+		playlistImport.activate.connect(()=>{playlistImportClicked ();});
 		playlistMenu.show_all();
 		
 		this.button_press_event.connect(sideListClick);
@@ -945,13 +945,13 @@
 		p.name = original_name;
 	}
 	
-	void playlistImportClicked() {
+	void playlistImportClicked(string title = "Playlist") {
 		if(lm.doing_file_operations())
 			return;
 		
 		string file = "";
 		string name = "";
-		var file_chooser = new FileChooserDialog ("Import Playlist", lw,
+		var file_chooser = new FileChooserDialog ("Import " + title, lw,
 								  FileChooserAction.OPEN,
 								  Gtk.Stock.CANCEL, ResponseType.CANCEL,
 								  Gtk.Stock.OPEN, ResponseType.ACCEPT);