Merge lp:~victored/beat-box/threads into lp:beat-box

[Victor Martinez]

Port to GLib 2.32 thread API

[Scott Ringwelski (sgringwe)]

I haven't actually tested it yet, but I went through the whole diff and looks great. I did find a few locks that were missing, but maybe they just didn't show up in the diff.

Agree with your comments for the most part.

There was one thing I disagreed with - in lyrics fetcher - but that is no showstopper. Will merge when I get home or you can if you are ok with me skipping testing.

Awesome work!

review: Approve

[lp:~victored/beat-box/threads]

642. By Victor Martinez on 2012-07-03

Don't use compact class for AZLyrics fetcher and make LibraryManager::recheck_files_not_found_async() actually async

=== modified file 'src/BeatBox.vala'
--- src/BeatBox.vala	2012-06-19 22:50:13 +0000
+++ src/BeatBox.vala	2012-07-03 06:49:24 +0000
@@ -46,13 +46,7 @@
             warning ("Error parsing arguments: %s\n", err.message);
         }
 
-        Gdk.threads_init();
-		Gdk.threads_enter();
 		Gtk.init(ref args);
-		Gdk.threads_leave();
-		
-		Notify.init("beatbox");
-		GLib.Environment.set_prgname("beatbox");
 
         try {
             Gst.init_check (ref args);
@@ -146,7 +140,7 @@
                 }
             }         
 
-			//library_manager.play_files (to_play);
+            //library_manager.play_files (to_play);
         }
 
         protected override void activate () {
@@ -171,10 +165,16 @@
                 //plugins.hook_new_window (library_window);
             }
 
+            // FIXME: mounting the music folder and accessing the files shold
+            // not be done on separate threads. recheck_files_not_found() should
+            // be called using an Idle.add (Priority.LOW, ...) instead. Same for
+            // podcast checking and album art download.
+
             // In 10 seconds, check for missing songs. This gives enought time
 		    // to automount the music folder
-		    Timeout.add(10000, () => {
-			    library_manager.recheck_files_not_found();
+		    // FIXME: This code is race-condition-prone
+            Timeout.add(10000, () => {
+			    library_manager.recheck_files_not_found_async ();
 			
 			    return false;
 		    });

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-07-02 01:40:25 +0000
+++ src/CMakeLists.txt	2012-07-03 06:49:24 +0000
@@ -52,7 +52,6 @@
     Playlists/SmartQuery.vala
     Playlists/SmartPlaylist.vala
     Widgets/TopDisplay.vala
-    Widgets/WarningLabel.vala
     Widgets/SimpleOptionChooser.vala
     Widgets/PresetList.vala
     Widgets/SideBar.vala
@@ -61,7 +60,7 @@
     Widgets/StatusBar.vala
     Widgets/SearchSuggester.vala
     Widgets/TaggingArea.vala
-    Widgets/InfoPanel.vala
+  #  Widgets/InfoPanel.vala
     Widgets/VolumeWidget.vala
     Widgets/NavigationArrows.vala
     Widgets/EmbeddedAlert.vala
@@ -177,6 +176,7 @@
 OPTIONS
     --vapidir=${CMAKE_SOURCE_DIR}/vapi
     --vapidir=${CMAKE_BINARY_DIR}/core/
+    --target-glib=2.32
     ${ADD_OPTIONS}
 GENERATE_VAPI
     beatbox

=== modified file 'src/Core/FileOperator.vala'
--- src/Core/FileOperator.vala	2012-06-13 23:54:06 +0000
+++ src/Core/FileOperator.vala	2012-07-03 06:49:24 +0000
@@ -86,7 +86,7 @@
 				album_art_folder.make_directory_with_parents(null);
 			}
 			catch(GLib.Error err) {
-				warning ("Could not create folder in cache directory: %s\n", err.message);
+				warning ("Could not create folder in cache directory: %s", err.message);
 			}
 		}	
 	}
@@ -133,14 +133,23 @@
 			}
 		}
 		catch(GLib.Error err) {
-			warning("Could not pre-scan music folder. Progress percentage may be off: %s\n", err.message);
+			warning("Could not pre-scan music folder. Progress percentage may be off: %s", err.message);
 		}
         
         return index;
 	}
-	
-	public void* queue_music_files_bootstrap_thread() {
-		queue_music_files(import_file);
+
+	public async void queue_music_files_bootstrap_async () {
+		try {
+			new Thread<void*>.try (null, queue_music_files_bootstrap_thread);
+		}
+		catch (Error err) {
+			warning ("Could not create thread for queue_music_files_bootstrap: %s", err.message);
+		}
+	}
+
+	private void* queue_music_files_bootstrap_thread () {
+		queue_music_files (import_file);
 		
 		return null;
 	}
@@ -163,7 +172,7 @@
 			}
 		}
 		catch(GLib.Error err) {
-			warning("Could not pre-scan music folder. Progress percentage may be off: %s\n", err.message);
+			warning("Could not pre-scan music folder. Progress percentage may be off: %s", err.message);
 		}
         
         // Let it be known that all files are queued and may now finish import
@@ -254,7 +263,7 @@
 		if(success) {
 			foreach(int i in lm.media_ids()) {
 				if(lm.media_from_id(i).album_artist == m.album_artist && lm.media_from_id(i).album == m.album) {
-					debug("setting album art for %s by %s\n", lm.media_from_id(i).title, lm.media_from_id(i).artist);
+					debug("setting album art for %s by %s", lm.media_from_id(i).title, lm.media_from_id(i).artist);
 					lm.media_from_id(i).setAlbumArtPath(uri);
 				}
 			}
@@ -294,10 +303,10 @@
 		if(!inThread && lm.lw.initializationFinished) {
 			try {
 				inThread = true;
-				Thread.create<void*>(save_media_thread, false);
+				new Thread<void*>.try (null, save_media_thread);
 			}
-			catch(GLib.Error err) {
-				warning ("Could not create thread to rescan music folder: %s\n", err.message);
+			catch (Error err) {
+				warning ("Could not create thread to rescan music folder: %s", err.message);
 			}
 		}
 	}
@@ -332,7 +341,7 @@
 					}
 				}
 				else {
-					debug ("Could not save %s.\n", s.uri);
+					debug ("Could not save %s.", s.uri);
 				}
 			}
 			
@@ -357,7 +366,7 @@
 			dest = GLib.File.new_for_path(Path.build_path("/", settings.getMusicFolder(), s.artist.replace("/", "_"), s.album.replace("/", "_"), s.track.to_string() + " " + s.title.replace("/", "_") + ext));
 			
 			if(original.get_path() == dest.get_path()) {
-				debug("File is already in correct location\n");
+				debug("File is already in correct location");
 				return null;
 			}
 			
@@ -371,7 +380,7 @@
 				dest.get_parent().make_directory_with_parents(null);
 		}
 		catch(GLib.Error err) {
-			debug("Could not find new destination!: %s\n", err.message);
+			debug("Could not find new destination!: %s", err.message);
 		}
 		
 		return dest;
@@ -389,17 +398,17 @@
 			
 			/* copy the file over */
 			if(!delete_old) {
-				debug("Copying %s to %s\n", s.uri, dest.get_uri());
+				debug("Copying %s to %s", s.uri, dest.get_uri());
 				success = original.copy(dest, FileCopyFlags.NONE, null, null);
 			}
 			else {
-				debug("Moving %s to %s\n", s.uri, dest.get_uri());
+				debug("Moving %s to %s", s.uri, dest.get_uri());
 				success = original.move(dest, FileCopyFlags.NONE, null, null);
 			}
 			
 			if(success || dest.query_exists()) {
 				success = true;
-				debug("success copying file\n");
+				debug("success copying file");
 				s.uri = dest.get_uri();
 				
 				// Save the uri change in the database
@@ -415,13 +424,13 @@
 					
 					if(!GLib.File.new_for_path(albumArtDest).query_exists() && mediaFile.query_exists() &&
 					mediaFile.copy(GLib.File.new_for_path(albumArtDest), FileCopyFlags.NONE, null, null)) {
-						debug("Copying album art to %s\n", albumArtDest);
+						debug("Copying album art to %s", albumArtDest);
 						s.setAlbumArtPath(albumArtDest);
 					}
 				}
 			}
 			else
-				warning("Failure: Could not copy imported media %s to media folder %s\n", s.uri, dest.get_path());
+				warning("Failure: Could not copy imported media %s to media folder %s", s.uri, dest.get_path());
 			
 			/* if we are supposed to delete the old, make sure there are no items left in folder if we do */
 			if(delete_old) {
@@ -430,13 +439,13 @@
 				// must check for .jpg's as well.
 				
 				if(old_folder_items == 0) {
-					debug("going to delete %s because no files are in it\n", original.get_parent().get_path());
+					debug("going to delete %s because no files are in it", original.get_parent().get_path());
 					original.get_parent().delete();
 				}
 			}
 		}
 		catch(GLib.Error err) {
-			warning("Could not copy imported media %s to media folder: %s\n", s.uri, err.message);
+			warning("Could not copy imported media %s to media folder: %s", s.uri, err.message);
 		}
 		
 		return success;
@@ -453,18 +462,18 @@
 					
 				//TODO: COPY ALBUM AND IMAGE ARTWORK
 				if(old_folder_items == 0) {
-					debug("going to delete %s because no files are in it\n", file.get_parent().get_path());
+					debug("going to delete %s because no files are in it", file.get_parent().get_path());
 					//original.get_parent().delete();
 					
 					var old_folder_parent_items = count_music_files(file.get_parent().get_parent(), ref dummy_list);
 					
 					if(old_folder_parent_items == 0) {
-						debug("going to delete %s because no files are in it\n", file.get_parent().get_parent().get_path());
+						debug("going to delete %s because no files are in it", file.get_parent().get_parent().get_path());
 					}
 				}
 			}
 			catch(GLib.Error err) {
-				warning("Could not move file %s to trash: %s (you could be using a file system which is not supported)\n", s, err.message);
+				warning("Could not move file %s to trash: %s (you could be using a file system which is not supported)", s, err.message);
 				
 				//tell the user the file could not be moved and ask if they'd like to delete permanently instead.
 				//Gtk.MessageDialog md = new Gtk.MessageDialog(lm.lw, Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION, Gtk.ButtonsType.YES_NO, "Could not trash file %s, would you like to permanently delete it? You cannot undo these changes.", s);
@@ -491,7 +500,7 @@
 			}
 		}
 		catch(GLib.Error err) {
-			message("Could not guess content types: %s\n", err.message);
+			message("Could not guess content types: %s", err.message);
 		}
 	}*/
 	
@@ -608,10 +617,10 @@
 			fo_progress(_("<b>Copying</b> files to <b>Music Folder</b>..."), 0.0);
 			
 			try {
-				Thread.create<void*>(copy_imports_thread, false);
+				new Thread<void*>.try (null, copy_imports_thread);
 			}
-			catch(GLib.Error err) {
-				warning("Could not create thread to rescan music folder: %s\n", err.message);
+			catch (Error err) {
+				warning ("Could not create thread to rescan music folder: %s", err.message);
 			}
 		}
 		else {

=== modified file 'src/Core/LibraryManager.vala'
--- src/Core/LibraryManager.vala	2012-07-02 23:17:27 +0000
+++ src/Core/LibraryManager.vala	2012-07-03 06:49:24 +0000
@@ -29,7 +29,15 @@
  */
 public class BeatBox.LibraryManager : /*BeatBox.LibraryModel,*/ GLib.Object {
 	public static const int PREVIEW_MEDIA_ID = -2;
-	public BeatBox.LibraryWindow lw;
+
+	// FIXME (BeatBox 0.7+)
+	//   At this point, a signal should be emmited
+	//   to let LibraryWindow know what's happening
+	//   under the hood.
+	//   UI code doesn't belong here.
+	public BeatBox.LibraryWindow lw; // Drop this reference
+
+
 	public BeatBox.Settings settings;
 	public BeatBox.DataBaseManager dbm;
 	public BeatBox.DataBaseUpdater dbu;
@@ -38,13 +46,6 @@
 	public BeatBox.DeviceManager device_manager;
 	public BeatBox.PodcastManager pm;
 	
-	Mutex _media_lock; // lock for _media. use this around _media, _songs
-	Mutex _songs_lock;
-	Mutex _podcasts_lock;
-	Mutex _audiobooks_lock;
-	Mutex _stations_lock;
-	Mutex _playlists_lock; // lock for _playlists
-	Mutex _smart_playlists_lock; // lock for _smart_playlists
 	HashMap<int, SmartPlaylist> _smart_playlists; // rowid, smart playlist
 	HashMap<int, Playlist> _playlists; // rowid, playlist of all playlists
 	HashMap<int, Media> _media; // rowid, media of all medias
@@ -126,9 +127,12 @@
 	public signal void media_queued(Media m);
 	public signal void media_played(Media id, Media? old_id);
 	public signal void playback_stopped(int was_playing);
-	
+
+	// FIXME (BeatBox 0.7+)
+	//   Drop reference to LibraryWindow
 	public LibraryManager(BeatBox.Settings sett, BeatBox.LibraryWindow lww) {
 		this.lw = lww;
+
 		this.settings = sett;
 		this.player = new Streamer(this, lw);
 		
@@ -139,14 +143,7 @@
 		
 		fo.fo_progress.connect(dbProgress);
 		dbm.db_progress.connect(dbProgress);
-		
-		_smart_playlists_lock = new Mutex();
-		_playlists_lock = new Mutex();
-		_media_lock = new Mutex();
-		_songs_lock = new Mutex();
-		_podcasts_lock = new Mutex();
-		_audiobooks_lock = new Mutex();
-		_stations_lock = new Mutex();
+	
 		
 		_smart_playlists = new HashMap<int, SmartPlaylist>();
 		_playlists = new HashMap<int, Playlist>();
@@ -195,51 +192,73 @@
 		album_list_setup = new TreeViewSetup(MusicList.MusicColumn.TRACK, Gtk.SortType.ASCENDING, ViewWrapper.Hint.ALBUM_LIST);
 		
 		//load all medias from db
-		_media_lock.lock ();
 		foreach(Media s in dbm.load_medias()) {
-			_media.set(s.rowid, s);
+			lock (_media) {
+				_media.set (s.rowid, s);
+			}
 			
-			if(s.mediatype == MediaType.SONG)
-				_songs.set(s.rowid, s);
-			else if(s.mediatype == MediaType.PODCAST)
-				_podcasts.set(s.rowid, s);
-			else if(s.mediatype == MediaType.AUDIOBOOK)
-				_audiobooks.set(s.rowid, s);
-			else if(s.mediatype == MediaType.STATION)
-				_stations.set(s.rowid, s);
-		}
-		_media_lock.unlock();
-		
-		_smart_playlists_lock.lock();
-		foreach(SmartPlaylist p in dbm.load_smart_playlists()) {
-			_smart_playlists.set(p.get_rowid(), p);
-		}
-		_smart_playlists_lock.unlock();
-		
+			if (s.mediatype == MediaType.SONG) {
+				lock (_songs) {
+					_songs.set(s.rowid, s);
+				}
+			}
+			else if (s.mediatype == MediaType.PODCAST) {
+				lock (_podcasts) {
+					_podcasts.set(s.rowid, s);
+				}
+			}
+			else if (s.mediatype == MediaType.AUDIOBOOK) {
+				lock (_audiobooks) {
+					_audiobooks.set(s.rowid, s);
+				}
+			}
+			else if(s.mediatype == MediaType.STATION) {
+				lock (_stations) {
+					_stations.set(s.rowid, s);
+				}
+			}
+		}
+
+		lock (_smart_playlists) {
+			foreach (SmartPlaylist p in dbm.load_smart_playlists()) {
+				_smart_playlists.set (p.get_rowid(), p);
+			}
+		}
+
 		//load all playlists from db
-		_playlists_lock.lock();
 		var playlists_added = new LinkedList<string>();
 		foreach(Playlist p in dbm.load_playlists()) {
 			if(!playlists_added.contains(p.get_name())) { // sometimes we get duplicates. don't add duplicates
-				_playlists.set(p.get_rowid(), p);
+				lock (_playlists) {
+					_playlists.set(p.get_rowid(), p);
+				}
 			
 				if(p.get_name() == "autosaved_music") {
 					music_setup = p.tvs;
 					music_setup.set_hint(ViewWrapper.Hint.MUSIC);
-					_playlists.unset(p.get_rowid());
+
+					lock (_playlists) {
+						_playlists.unset (p.get_rowid());
+					}
 				}
 				else if(p.get_name() == "autosaved_podcast") {
 					podcast_setup = p.tvs;
-					_playlists.unset(p.get_rowid());
+					lock (_playlists) {
+						_playlists.unset (p.get_rowid());
+					}
 				}
 				else if(p.get_name() == "autosaved_station") {
 					station_setup = p.tvs;
-					_playlists.unset(p.get_rowid());
+					lock (_playlists) {
+						_playlists.unset (p.get_rowid());
+					}
 				}
 				else if(p.get_name() == "autosaved_similar") {
 					similar_setup = p.tvs;
 					similar_setup.set_hint(ViewWrapper.Hint.SIMILAR);
-					_playlists.unset(p.get_rowid());				
+					lock (_playlists) {
+						_playlists.unset (p.get_rowid());
+					}
 				}
 				else if(p.get_name() == "autosaved_queue") {
 					foreach(var m in medias_from_playlist(p.get_rowid())) {
@@ -248,27 +267,26 @@
 					
 					queue_setup = p.tvs;
 					queue_setup.set_hint(ViewWrapper.Hint.QUEUE);
-					_playlists.unset(p.get_rowid());
+					lock (_playlists) {
+						_playlists.unset (p.get_rowid());
+					}
 				}
 				else if(p.get_name() == "autosaved_history") {
 					history_setup = p.tvs;
 					history_setup.set_hint(ViewWrapper.Hint.HISTORY);
-					_playlists.unset(p.get_rowid());
+					lock (_playlists) {
+						_playlists.unset (p.get_rowid());
+					}
 				}
 				
 				playlists_added.add(p.get_name());
 			}
 		}
-		_playlists_lock.unlock();
 		
 		device_manager = new DeviceManager(this);
 		
 		// start thread to load all the medias pixbuf's
-		try {
-			Thread.create<void*>(fetch_thread_function, false);
-		} catch(GLib.ThreadError err) {
-			warning("Could not create thread to load media pixbuf's: %s \n", err.message);
-		}
+		fetch_image_cache_async ();
 	}
 	
 	/*****************************************
@@ -289,6 +307,12 @@
 	
 	public bool doProgressNotificationWithTimeout() {
 		if(_doing_file_operations) {
+
+			// FIXME (BeatBox 0.7+)
+			//   At this point, a signal should be emmited
+			//   to let LibraryWindow know what's happening
+			//   under the hood.
+			//   UI code doesn't belong here.
 			Gdk.threads_enter();
 			progress_notification(null, (double)((double)fo.index)/((double)fo.item_count));
 			Gdk.threads_leave();
@@ -303,13 +327,24 @@
 	
 	public void set_music_folder(string folder) {
 		if(start_file_operations(_("Importing music from %s...").printf("<b>" + Markup.escape_text(folder) + "</b>"))) {
+
+			// FIXME (BeatBox 0.7+)
+			//   At this point, a signal should be emmited
+			//   to let LibraryWindow know what's happening
+			//   under the hood.
+			//   UI code doesn't belong here.
 			lw.resetSideTree(true);
 			lw.sideTree.removeAllStaticPlaylists();
 			
 			clear_medias();
 			_queue.clear();
 			_already_played.clear();
-			
+
+			// FIXME (BeatBox 0.7+)
+			//   At this point, a signal should be emmited
+			//   to let LibraryWindow know what's happening
+			//   under the hood.
+			//   UI code doesn't belong here.
 			lw.resetSideTree(false);
 			lw.update_sensitivities();
 			stopPlayback();
@@ -317,49 +352,58 @@
 			settings.setMusicMountName("");
 			settings.setMusicFolder(folder);
 			
-			try {
-				Thread.create<void*>(set_music_thread_function, false);
-			}
-			catch(GLib.Error err) {
-				warning("Could not create thread to set music folder: %s\n", err.message);
-			}
+			set_music_folder_async ();
+		}
+	}
+
+	public async void set_music_folder_async () {
+		try {
+			new Thread<void*>.try (null, set_music_thread_function);
+		}
+		catch(Error err) {
+			warning("Could not create thread to set music folder: %s", err.message);
 		}
 	}
 	
-	public void* set_music_thread_function () {
+	private void* set_music_thread_function () {
 		var music_folder = GLib.File.new_for_path(settings.getMusicFolder());
 		
 		fo.resetProgress(0);
 		fo.start_import(FileOperator.ImportType.SET);
 		fo.import_file = music_folder;
-		Thread.create<void*>(fo.queue_music_files_bootstrap_thread, false);
+
+		fo.queue_music_files_bootstrap_async ();
+
 		Timeout.add(100, doProgressNotificationWithTimeout);
 		
 		return null;
 	}
 	
-	public void add_files_to_library(LinkedList<string> files) {
+	public async void add_files_to_library_async (LinkedList<string> files) {
 		if(start_file_operations(_("Adding files to library...")) && files.size > 0) {
 			temp_add_files = files;
 			
 			try {
-				Thread.create<void*>(add_files_to_library_thread, false);
+				new Thread<void*>.try (null, add_files_to_library_thread);
 			}
-			catch(GLib.Error err) {
-				warning ("Could not create thread to add music files: %s\n", err.message);
+			catch (Error err) {
+				warning ("Could not create thread to add music files: %s", err.message);
 			}
 		}
 	}
-	
-	public void* add_files_to_library_thread () {
+
+	private void* add_files_to_library_thread () {
+		// FIXME: we need a better API for doing this kind of stuff.
+		//        FileOperator could emit some signals, and we could
+		//        track them here.
 		fo.resetProgress(temp_add_files.size - 1);
 		Timeout.add(100, doProgressNotificationWithTimeout);
 		fo.import_files(temp_add_files, FileOperator.ImportType.IMPORT);
-		
+
 		return null;
 	}
 	
-	public void add_folder_to_library(LinkedList<File> folders) {
+	public async void add_folder_to_library_async (LinkedList<File> folders) {
 		string oper = "";
 		if(folders.size == 1) {
 			oper = _("Adding music from %s to library...").printf("<b>" + Markup.escape_text(folders.get(0).get_path()) + "</b>");
@@ -372,15 +416,15 @@
 			temp_add_folders = folders;
 			
 			try {
-				Thread.create<void*>(add_folder_to_library_thread, false);
+				new Thread<void*>.try (null, add_folder_to_library_thread);
 			}
-			catch(GLib.Error err) {
-				warning ("Could not create thread to add music folder: %s\n", err.message);
+			catch (Error err) {
+				warning ("Could not create thread to add music folder: %s", err.message);
 			}
 		}
 	}
 	
-	public void* add_folder_to_library_thread () {
+	private void* add_folder_to_library_thread () {
 		var files = new LinkedList<string>();
 		int items = 0;
 		
@@ -395,18 +439,18 @@
 		return null;
 	}
     
-	public void rescan_music_folder() {
+	public async void rescan_music_folder_async () {
 		if(start_file_operations(_("Rescanning music folder for changes..."))) {
 			try {
-				Thread.create<void*>(rescan_music_thread_function, false);
+				new Thread<void*>.try (null, rescan_music_thread_function);
 			}
-			catch(GLib.Error err) {
-				warning ("Could not create thread to rescan music folder: %s\n", err.message);
+			catch (Error err) {
+				warning ("Could not create thread to rescan music folder: %s", err.message);
 			}
 		}
 	}
-        
-	public void* rescan_music_thread_function () {
+ 
+	private void* rescan_music_thread_function () {
 		HashMap<string, Media> paths = new HashMap<string, Media>();
 		LinkedList<Media> to_remove = new LinkedList<Media>();
 		LinkedList<string> to_import = new LinkedList<string>();
@@ -456,30 +500,35 @@
 		return null;
 	}
 	
-	public void recheck_files_not_found() {
+	public void recheck_files_not_found_async () {
 		try {
-			Thread.create<void*>(recheck_files_not_found_thread, false);
+			new Thread<void*>.try (null, recheck_files_not_found_thread);
 		}
-		catch(GLib.Error err) {
-			warning ("Could not create thread to check file locations: %s\n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to check file locations: %s", err.message);
 		}
 	}
-	
-	public void* recheck_files_not_found_thread () {
+
+	private void* recheck_files_not_found_thread () {
 		Media[] cache_media;
 		var not_found = new LinkedList<Media>();
 		var found = new LinkedList<Media>(); // files that location were unknown but now are found
+
+		// FIXME (BeatBox 0.7+)
+		//   At this point, a signal should be emmited
+		//   to let LibraryWindow know what's happening
+		//   under the hood.
+		//   UI code doesn't belong here.
 		var not_found_pix = Icons.PROCESS_ERROR.render(IconSize.MENU, ((ViewWrapper)lw.sideTree.getWidget(lw.sideTree.library_music_iter)).list_view.get_style_context());
-		
-		_media_lock.lock();
+
 		cache_media = _media.values.to_array();
-		_media_lock.unlock();
 		
 		for(int i = 0; i < cache_media.length; ++i) {
 			var m = cache_media[i];
 			if(m.mediatype == MediaType.STATION || 
 			(m.mediatype == MediaType.PODCAST && m.uri.has_prefix("http:/"))) {
 				// don't try to find this
+				warning ("Found station or podcast with uri prefix 'http:/'");
 			}
 			else {
 				if(File.new_for_uri(m.uri).query_exists() && m.location_unknown) {
@@ -499,6 +548,12 @@
 			if(not_found.size > 0) {
 				warning("Some media files could not be found and are being marked as such.\n");
 				update_medias(not_found, false, false, true);
+
+				// FIXME (BeatBox 0.7+)
+				//   At this point, a signal should be emmited
+				//   to let LibraryWindow know what's happening
+				//   under the hood.
+				//   UI code doesn't belong here.
 				foreach(var m in not_found) {
 					lw.media_not_found(m.rowid);
 				}
@@ -506,6 +561,12 @@
 			if(found.size > 0) {
 				warning("Some media files whose location were unknown were found.\n");
 				update_medias(found, false, false, true);
+
+				// FIXME (BeatBox 0.7+)
+				//   At this point, a signal should be emmited
+				//   to let LibraryWindow know what's happening
+				//   under the hood.
+				//   UI code doesn't belong here.
 				foreach(var m in found) {
 					lw.media_found(m.rowid);
 				}
@@ -536,15 +597,13 @@
 	
 	public Playlist? playlist_from_name(string name) {
 		Playlist? rv = null;
-		
-		_playlists_lock.lock();
+
 		foreach(var p in _playlists.values) {
 			if(p.get_name() == name) {
 				rv = p;
 				break;
 			}
 		}
-		_playlists_lock.unlock();
 		
 		return rv;
 	}
@@ -556,10 +615,10 @@
 				top_index = i;
 		}
 		
-		_playlists_lock.lock();
-		p.set_rowid(top_index + 1);
-		_playlists.set(p.get_rowid(), p);
-		_playlists_lock.unlock();
+		lock (_playlists) {
+			p.set_rowid(top_index + 1);
+			_playlists.set(p.get_rowid(), p);
+		}
 		
 		playlist_added(p);
 		dbm.add_playlist(p);
@@ -570,9 +629,9 @@
 	public void remove_playlist(int id) {
 		Playlist removed;
 		
-		_playlists_lock.lock();
-		_playlists.unset(id, out removed);
-		_playlists_lock.unlock();
+		lock (_playlists) {
+			_playlists.unset(id, out removed);
+		}
 		
 		playlist_removed(removed);
 		dbu.removeItem(removed);
@@ -598,29 +657,29 @@
 	public SmartPlaylist? smart_playlist_from_name(string name) {
 		SmartPlaylist? rv = null;
 		
-		_smart_playlists_lock.lock();
-		foreach(var p in _smart_playlists.values) {
-			if(p.get_name() == name) {
-				rv = p;
-				break;
-			} 
+		lock (_smart_playlists) {
+			foreach(var p in _smart_playlists.values) {
+				if(p.get_name() == name) {
+					rv = p;
+					break;
+				} 
+			}
 		}
-		_smart_playlists_lock.unlock();
-		
+
 		return rv;
 	}
 	
 	public void save_smart_playlists() {
 		try {
-			Thread.create<void*>( () => { 
-				_smart_playlists_lock.lock();
-				dbm.save_smart_playlists(_smart_playlists.values);
-				_smart_playlists_lock.unlock();
+			new Thread<void*>.try (null, () => { 
+				lock (_smart_playlists) {
+					dbm.save_smart_playlists(_smart_playlists.values);
+				}
 				
 				return null; 
-			}, false);
+			});
 		}
-		catch(GLib.Error err) {
+		catch(Error err) {
 			warning ("Could not create thread to save smart playlists: %s\n", err.message);
 		}
 	}
@@ -632,10 +691,10 @@
 				top_index = i;
 		}
 		
-		_smart_playlists_lock.lock();
-		p.set_rowid(top_index + 1);// + 1 for 1-based db
-		_smart_playlists.set(p.get_rowid(), p);
-		_smart_playlists_lock.unlock();
+		lock (_smart_playlists) {
+			p.set_rowid(top_index + 1);// + 1 for 1-based db
+			_smart_playlists.set(p.get_rowid(), p);
+		}
 		
 		playlist_added(p);
 		save_smart_playlists();
@@ -646,9 +705,9 @@
 	public void remove_smart_playlist(int id) {
 		SmartPlaylist removed;
 		
-		_smart_playlists_lock.lock();
-		_smart_playlists.unset(id, out removed);
-		_smart_playlists_lock.unlock();
+		lock (_smart_playlists) {
+			_smart_playlists.unset(id, out removed);
+		}
 		
 		playlist_removed(removed);
 		dbu.removeItem(removed);
@@ -660,7 +719,6 @@
 		
 		// We really only want to clear the songs that are permanent and on the file system
 		// Dont clear podcasts that link to a url, device media, temporary media, previews, songs
-		_media_lock.lock();
 		var unset = new LinkedList<Media>();//HashMap<int, Media>();
 		var unset_ids = new LinkedList<int>();
 		foreach(int i in _media.keys) {
@@ -676,26 +734,39 @@
 				}
 			}
 		}
-		
-		foreach(Media s in unset) {
-			_media.unset(s.rowid);
-			
-			if(s.mediatype == MediaType.SONG)
-				_songs.unset(s.rowid);
-			else if(s.mediatype == MediaType.PODCAST)
-				_podcasts.unset(s.rowid);
-			else if(s.mediatype == MediaType.AUDIOBOOK)
-				_audiobooks.unset(s.rowid);
-			else if(s.mediatype == MediaType.STATION)
-				_stations.unset(s.rowid);
-		}
-		_media_lock.unlock();
-		
-		_playlists_lock.lock();
-		foreach(var p in _playlists.values) {
-			p.removeMedias(unset_ids);
-		}
-		_playlists_lock.unlock();
+
+		lock (_media) {
+			foreach(Media s in unset) {
+				_media.unset(s.rowid);
+				
+				if(s.mediatype == MediaType.SONG) {
+					lock (_songs) {
+						_songs.unset (s.rowid);
+					}
+				}
+				else if(s.mediatype == MediaType.PODCAST) {
+					lock (_podcasts) {
+						_podcasts.unset (s.rowid);
+					}
+				}
+				else if(s.mediatype == MediaType.AUDIOBOOK) {
+					lock (_audiobooks) {
+						_audiobooks.unset(s.rowid);
+					}
+				}
+				else if(s.mediatype == MediaType.STATION) {
+					lock (_stations) {
+						_stations.unset(s.rowid);
+					}
+				}
+			}
+		}
+		
+		lock (_playlists) {
+			foreach(var p in _playlists.values) {
+				p.removeMedias(unset_ids);
+			}
+		}
 		
 		dbm.clear_medias();
 		dbm.add_medias(_media.values);
@@ -790,17 +861,17 @@
 		dbu.update_medias(updates);
 	}
 
-	public void save_media() {
+	public async void save_media_async () {
 		try {
-			Thread.create<void*>( () => { 
-				_media_lock.lock();
-				dbm.update_medias(_media.values);
-				_media_lock.unlock();
+			new Thread<void*>.try (null, () => { 
+				lock (_media) {
+					dbm.update_medias (_media.values);
+				}
 				
 				return null; 
-			}, false);
+			});
 		}
-		catch(GLib.Error err) {
+		catch(Error err) {
 			warning ("Could not create thread to save media: %s\n", err.message);
 		}
 	}
@@ -816,13 +887,13 @@
 	public Media? match_media_to_list(Media m, Collection<Media> to_match) {
 		Media? rv = null;
 		
-		_media_lock.lock();
-		foreach(var test in to_match) {
-			if(!test.isTemporary && test != m && test.title.down() == m.title.down() && test.artist.down() == m.artist.down()) {
-				rv = test;
+		lock (_media) {
+			foreach(var test in to_match) {
+				if(!test.isTemporary && test != m && test.title.down() == m.title.down() && test.artist.down() == m.artist.down()) {
+					rv = test;
+				}
 			}
 		}
-		_media_lock.unlock();
 		
 		return rv;
 	}
@@ -832,10 +903,8 @@
 		rv.title = title;
 		rv.artist = artist;
 		Media[] searchable;
-		
-		_media_lock.lock();
+
 		searchable = _media.values.to_array();
-		_media_lock.unlock();
 		
 		for(int i = 0; i < searchable.length; ++i) {
 			Media s = searchable[i];
@@ -848,10 +917,8 @@
 	
 	public void medias_from_name(Collection<Media> tests, ref LinkedList<int> found, ref LinkedList<Media> not_found) {
 		Media[] searchable;
-		
-		_media_lock.lock();
+
 		searchable = _media.values.to_array();
-		_media_lock.unlock();
 		
 		foreach(Media test in tests) {
 			bool found_match = false;
@@ -872,15 +939,13 @@
 	public Media? media_from_file(string uri) {
 		Media? rv = null;
 		
-		_media_lock.lock();
 		foreach(Media s in _media.values) {
 			if(s.uri == uri) {
 				rv = s;
 				break;
 			}
 		}
-		_media_lock.unlock();
-		
+
 		return rv;
 	}
 
@@ -997,31 +1062,44 @@
 			return;
 		
 		int top_index = 0;
-		_media_lock.lock();
+
 		foreach(int i in _media.keys) {
 			if(i > top_index)
 				top_index = i;
 		}
 		
 		var added = new LinkedList<int>();
-		foreach(var s in new_media) {
-			if(s.rowid == 0)
-				s.rowid = ++top_index;
-			
-			added.add(s.rowid);
-			
-			_media.set(s.rowid, s);
-			
-			if(s.mediatype == MediaType.SONG)
-				_songs.set(s.rowid, s);
-			else if(s.mediatype == MediaType.PODCAST)
-				_podcasts.set(s.rowid, s);
-			else if(s.mediatype == MediaType.AUDIOBOOK)
-				_audiobooks.set(s.rowid, s);
-			else if(s.mediatype == MediaType.STATION)
-				_stations.set(s.rowid, s);
+		lock (_media) {
+			foreach(var s in new_media) {
+				if(s.rowid == 0)
+					s.rowid = ++top_index;
+				
+				added.add(s.rowid);
+				
+				_media.set(s.rowid, s);
+				
+				if(s.mediatype == MediaType.SONG) {
+					lock (_songs) {
+						_audiobooks.set (s.rowid, s);
+					}
+				}
+				else if(s.mediatype == MediaType.PODCAST) {
+					lock (_podcasts) {
+						_podcasts.set (s.rowid, s);
+					}
+				}
+				else if(s.mediatype == MediaType.AUDIOBOOK) {
+					lock (_audiobooks) {
+						_audiobooks.set (s.rowid, s);
+					}
+				}
+				else if(s.mediatype == MediaType.STATION) {
+					lock (_stations) {
+						_stations.set (s.rowid, s);
+					}
+				}
+			}
 		}
-		_media_lock.unlock();
 		
 		if(new_media.size > 0) {
 			dbm.add_medias(new_media);
@@ -1055,30 +1133,45 @@
 		// call now so that lm.media_from_id() still works
 		medias_removed(removedIds);
 		
-		_media_lock.lock();
-		foreach(Media s in toRemove) {
-			_media.unset(s.rowid);
-			
-			if(s.mediatype == MediaType.SONG)
-				_songs.unset(s.rowid);
-			else if(s.mediatype == MediaType.PODCAST)
-				_podcasts.unset(s.rowid);
-			else if(s.mediatype == MediaType.AUDIOBOOK)
-				_audiobooks.unset(s.rowid);
-			else if(s.mediatype == MediaType.STATION)
-				_stations.unset(s.rowid);
+		lock (_media) {
+			foreach(Media s in toRemove) {
+				_media.unset(s.rowid);
+
+				if(s.mediatype == MediaType.SONG) {
+					lock (_songs) {
+						_songs.unset (s.rowid);
+					}
+				}
+				else if(s.mediatype == MediaType.PODCAST) {
+					lock (_podcasts) {
+						_podcasts.unset (s.rowid);
+					}
+				}
+				else if(s.mediatype == MediaType.AUDIOBOOK) {
+					lock (_audiobooks) {
+						_audiobooks.unset(s.rowid);
+					}
+				}
+				else if(s.mediatype == MediaType.STATION) {
+					lock (_stations) {
+						_stations.unset(s.rowid);
+					}
+				}
+			}
 		}
-		_media_lock.unlock();
-		
-		_playlists_lock.lock();
+
 		foreach(var p in _playlists.values) {
 			p.removeMedias(toRemove);
 		}
-		_playlists_lock.unlock();
 		
 		if(_media.size == 0)
 			settings.setMusicFolder(Environment.get_user_special_dir(UserDirectory.MUSIC));
-		
+
+		// FIXME (BeatBox 0.7+)
+		//   At this point, a signal should be emmited
+		//   to let LibraryWindow know what's happening
+		//   under the hood.
+		//   UI code doesn't belong here.
 		lw.update_sensitivities();
 	}
 	
@@ -1340,6 +1433,12 @@
 			if(File.new_for_uri(m.uri).query_exists()) { // we did not know location, but it has re-appearred
 				m.location_unknown = false;
 				m.unique_status_image = null;
+
+				// FIXME (BeatBox 0.7+)
+				//   At this point, a signal should be emmited
+				//   to let LibraryWindow know what's happening
+				//   under the hood.
+				//   UI code doesn't belong here.
 				lw.media_found(m.rowid);
 			}
 			else { // to avoid infinite loop with repeat on, don't try to play next again
@@ -1351,9 +1450,16 @@
 		// check that the file exists
 		var music_folder_uri = File.new_for_path(settings.getMusicFolder()).get_uri();
 		if((settings.getMusicFolder() != "" && m.uri.has_prefix(music_folder_uri) && !GLib.File.new_for_uri(m.uri).query_exists())) {
+
+			// FIXME (BeatBox 0.7+)
+			//   At this point, a signal should be emmited
+			//   to let LibraryWindow know what's happening
+			//   under the hood.
+			//   UI code doesn't belong here.
 			m.unique_status_image = Icons.PROCESS_ERROR.render(IconSize.MENU, ((ViewWrapper)lw.sideTree.getWidget(lw.sideTree.library_music_iter)).list_view.get_style_context());
 			m.location_unknown = true;
 			lw.media_not_found(id);
+
 			getNext(true);
 			return;
 		}
@@ -1392,10 +1498,11 @@
 		 */
 		Timeout.add(1000, () => {
 			if(media_info.media == m) {
+				// FIXME (BeatBox 0.7+) : Move to playback manager
 				try {
-					Thread.create<void*>(change_gains_thread, false);
+					new Thread<void*>.try (null, change_gains_thread);
 				}
-				catch(GLib.Error err) {
+				catch(Error err) {
 					warning("Could not create thread to change gains: %s\n", err.message);
 				}
 		
@@ -1417,6 +1524,9 @@
 	}
 	
 	// FIXME: Slow. Don't read eq. presets from settings.
+	// FIXME (BeatBox 0.7+)
+	//   Deprecate in favor of PlaybackManager. Currently, this is public
+	//   because EqualizerWindow needs it
 	public void* change_gains_thread () {
 		if(settings.getEqualizerEnabled()) {
 			bool automatic_enabled = settings.getAutoSwitchPreset();
@@ -1479,7 +1589,12 @@
 		temps.add(s);
 		
 		playMedia(s, false);
-		
+
+		// FIXME (BeatBox 0.7+)
+		//   At this point, a signal should be emmited
+		//   to let LibraryWindow know what's happening
+		//   under the hood.
+		//   UI code doesn't belong here.
 		if(!playing) {
 			lw.playClicked();
 		}
@@ -1526,19 +1641,26 @@
 			set_album_art(_media.get(id), pix, emit);
 		}
 	}
-	
+
+	public async void fetch_image_cache_async () {
+		try {
+			new Thread<void*>.try (null, fetch_image_thread_function);
+		} catch(Error err) {
+			warning ("Could not create thread to load media pixbuf's: %s \n", err.message);
+		}
+	}
+
 	/* at the start, load all the pixbufs */
-	public void* fetch_thread_function () {
+	private void* fetch_image_thread_function () {
 		if(in_fetch_thread)
 			return null;
-		
+
 		in_fetch_thread = true;
 		//GStreamerTagger tagger = new GStreamerTagger(this);
 		LinkedList<Media> medias = new LinkedList<Media>();
-		_media_lock.lock();
+
 		foreach(var m in _media.values)
 			medias.add(m);
-		_media_lock.unlock();
 		
 		// first get from file
 		foreach(var s in medias) {
@@ -1658,13 +1780,12 @@
 			if(emit) {
 				Gee.LinkedList<Media> updated_medias = new Gee.LinkedList<Media>();
 				
-				_media_lock.lock();
+
 				foreach(int i in media_ids()) {
 					if(media_from_id(i).album_artist == s.album_artist && media_from_id(i).album == s.album) {
 						updated_medias.add(media_from_id(i));
 					}
 				}
-				_media_lock.unlock();
 				
 				update_medias(updated_medias, false, false, true);
 			}
@@ -1677,7 +1798,14 @@
 		
 		progress_notification(message, 0.0);
 		_doing_file_operations = true;
+
+		// FIXME (BeatBox 0.7+)
+		//   At this point, a signal should be emmited
+		//   to let LibraryWindow know what's happening
+		//   under the hood.
+		//   UI code doesn't belong here.
 		lw.update_sensitivities();
+
 		file_operations_started();
 		return true;
 	}
@@ -1694,15 +1822,16 @@
 			pm.find_new_podcasts();
 		}
 		else {
-			try {
-				Thread.create<void*>(fetch_thread_function, false);
-			}
-			catch(GLib.ThreadError err) {
-				warning("Could not create thread to load media pixbuf's: %s \n", err.message);
-			}
-			
+			fetch_image_cache_async ();
+
+			// FIXME (BeatBox 0.7+)
+			//   At this point, a signal should be emmited
+			//   to let LibraryWindow know what's happening
+			//   under the hood.
+			//   UI code doesn't belong here.
 			lw.update_sensitivities();
 			lw.updateInfoLabel();
+
 			file_operations_done();
 		}
 	}

=== modified file 'src/Core/LibraryWindow.vala'
--- src/Core/LibraryWindow.vala	2012-06-30 20:55:57 +0000
+++ src/Core/LibraryWindow.vala	2012-07-03 06:49:24 +0000
@@ -219,8 +219,8 @@
         this.window_position = Gtk.WindowPosition.CENTER;
 
         // set the size based on saved settings
-        this.set_default_size (lm.settings.getWindowWidth(), lm.settings.getWindowHeight());
-		if(lm.settings.getWindowMaximized()) {
+        this.set_default_size (settings.getWindowWidth(), settings.getWindowHeight());
+		if(settings.getWindowMaximized()) {
 			window_maximized = true;
 			this.maximize();
 		}
@@ -282,7 +282,7 @@
 		viewSelector.append(Icons.VIEW_DETAILS.render_image (IconSize.MENU));
 		viewSelector.append(Icons.VIEW_ICONS.render_image (IconSize.MENU));
 		viewSelector.valign = showSongInfo.valign = Gtk.Align.CENTER;
-		viewSelector.selected = lm.settings.getViewMode();
+		viewSelector.selected = settings.getViewMode();
 		
 		viewSelectorBin.margin_left = 12;
 		viewSelectorBin.margin_right = 12;
@@ -363,12 +363,12 @@
 		repeatChooser.appendItem(_("Album"));
 		repeatChooser.appendItem(_("Artist"));
 		repeatChooser.appendItem(_("All"));
-		repeatChooser.setOption(lm.settings.getRepeatMode());
+		repeatChooser.setOption(settings.getRepeatMode());
         repeatChooser.setTooltip (_("Disable Repeat"), _("Enable Repeat"));
 
 		shuffleChooser.appendItem(_("Off"));
 		shuffleChooser.appendItem(_("All"));
-		shuffleChooser.setOption(lm.settings.getShuffleMode());
+		shuffleChooser.setOption(settings.getShuffleMode());
 		shuffleChooser.setTooltip (_("Turn off Shuffle"), _("Turn on Shuffle"));
 		
 		newPlaylistMenu = new Gtk.Menu();
@@ -445,7 +445,7 @@
 		
 		show_all();
 		infoBar.hide();
-		searchField.set_text(lm.settings.getSearchString());
+		searchField.set_text(settings.getSearchString());
 		update_sensitivities();
 		hide_video_mode();
 	}
@@ -713,7 +713,7 @@
 		if(!initializationFinished)
 			return;
 
-		bool folderSet = (lm.settings.getMusicFolder() != "");
+		bool folderSet = (settings.getMusicFolder() != "");
 		bool haveMedias = lm.media_count() > 0;
 		bool doingOps = lm.doing_file_operations();
 		bool mediaActive = lm.media_active;
@@ -811,7 +811,7 @@
 			
 			var label = "";
 			if(lm.fo.import_type == FileOperator.ImportType.SET)
-				label = _("Importing music from") + " <b>" + Markup.escape_text(lm.settings.getMusicFolder()) + "</b>...";
+				label = _("Importing music from") + " <b>" + Markup.escape_text(settings.getMusicFolder()) + "</b>...";
 			else if(lm.fo.import_type == FileOperator.ImportType.RESCAN)
 				label = _("Rescanning music folder for changes...");
 			else if(lm.fo.import_type == FileOperator.ImportType.IMPORT || 
@@ -1005,7 +1005,7 @@
 	void on_quit() {
 		// Stop listening to window state changes
 		this.window_state_event.disconnect(window_state_changed);
-		lm.settings.setLastMediaPosition((int)((double)lm.player.getPosition()/1000000000));
+		settings.setLastMediaPosition((int)((double)lm.player.getPosition()/1000000000));
 		if(lm.media_active) {
 			lm.media_info.media.resume_pos = (int)((double)lm.player.getPosition()/1000000000);
 			lm.update_media(lm.media_info.media, false, false, false);
@@ -1055,13 +1055,13 @@
 					}
 				}
 				
-				if(final_folders.size > 0 && GLib.File.new_for_path(lm.settings.getMusicFolder()).query_exists()) {
+				if(final_folders.size > 0 && GLib.File.new_for_path(settings.getMusicFolder()).query_exists()) {
 					topDisplay.show_progressbar();
 
-					lm.add_folder_to_library(final_folders);
+					lm.add_folder_to_library_async (final_folders);
 					update_sensitivities();
 				}
-				else if(!GLib.File.new_for_path(lm.settings.getMusicFolder()).query_exists()) {
+				else if(!GLib.File.new_for_path(settings.getMusicFolder()).query_exists()) {
 					doAlert(_("Import Failed"), _("Your library's music folder could not be found. Please make sure your music folder is mounted before importing."));
 				}
 			}
@@ -1080,7 +1080,7 @@
 				topDisplay.set_label_markup("<b>" + _("Rescanning music folder for changes") + "</b>");
 				topDisplay.show_progressbar();
 
-				lm.rescan_music_folder();
+				lm.rescan_music_folder_async ();
 				update_sensitivities();
 			}
 			else {
@@ -1136,7 +1136,7 @@
 		//searchField.set_text("up");
 
 		if(not_imported.size > 0) {
-			NotImportedDialog nim = new NotImportedDialog(this, not_imported, lm.settings.getMusicFolder());
+			NotImportedDialog nim = new NotImportedDialog(this, not_imported, settings.getMusicFolder());
 			nim.show();
 		}
 
@@ -1388,7 +1388,7 @@
 			files_dragged.add(File.new_for_uri(uri).get_path());
 		}
 
-		lm.add_files_to_library(files_dragged);
+		lm.add_files_to_library_async (files_dragged);
 	}
 
 	public void doAlert(string title, string message) {

=== modified file 'src/Core/PodcastManager.vala'
--- src/Core/PodcastManager.vala	2012-06-13 23:54:06 +0000
+++ src/Core/PodcastManager.vala	2012-07-03 06:49:24 +0000
@@ -66,16 +66,16 @@
 		
 		lm.start_file_operations(FETCHING_NEW);
 		try {
-			Thread.create<void*>(find_new_podcasts_thread, false);
+			new Thread<void*>.try (null, find_new_podcasts_thread);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to fetch new podcasts: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to fetch new podcasts: %s", err.message);
 		}
 		
 		lm.have_fetched_new_podcasts = true;
 	}
 		
-	public void* find_new_podcasts_thread () {
+	private void* find_new_podcasts_thread () {
 		HashSet<string> rss_urls = new HashSet<string>();
 		HashSet<string> mp3_urls = new HashSet<string>();
 		HashMap<string, string> rss_names = new HashMap<string, string>();
@@ -174,7 +174,7 @@
 		//current_operation = FETCHING_FROM_RSS.printf("<b>" + Markup.escape_text(rss) + "</b>");
 		Timeout.add(500, doProgressNotificationWithTimeout);
 		
-		debug("podcast_rss: %s\n", rss);
+		debug("podcast_rss: %s", rss);
 		
 		// create an HTTP session to twitter
 		var session = new Soup.SessionSync();
@@ -218,7 +218,7 @@
 		Xml.Doc* doc = Xml.Parser.parse_memory((string)message.response_body.data, (int)message.response_body.length);
 		if(doc == null)
 			return null;
-		//stdout.printf("%s\n", (string)message.response_body.data);
+		//stdout.printf("%s", (string)message.response_body.data);
         Xml.Node* root = doc->get_root_element ();
         if (root == null) {
             delete doc;
@@ -279,7 +279,7 @@
 				Media new_p = new Media("");
 			
 				for (Xml.Node* item_iter = iter->children; item_iter != null; item_iter = item_iter->next) {
-					//stdout.printf("name is %s\n", item_iter->name);
+					//stdout.printf("name is %s", item_iter->name);
 					if(item_iter->name == "title")
 						new_p.title = item_iter->get_content();
 					else if(name == "author") {
@@ -365,14 +365,14 @@
 		save_locally_ids = ids;
 		
 		try {
-			Thread.create<void*>(save_episodes_locally_thread, false);
+			new Thread<void*>.try (null, save_episodes_locally_thread);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to save episodes locally: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to save episodes locally: %s", err.message);
 		}
 	}
 	
-	public void* save_episodes_locally_thread () {
+	private void* save_episodes_locally_thread () {
 		if(save_locally_ids == null || save_locally_ids.size == 0)
 			return null;
 		
@@ -397,7 +397,7 @@
 					online_size = online_file.query_info("*", FileQueryInfoFlags.NONE).get_size();
 				}
 				catch(Error err) {
-					stdout.printf("Could not read online podcast file's size for progress notification: %s\n", err.message);
+					stdout.printf("Could not read online podcast file's size for progress notification: %s", err.message);
 				}
 				
 				new_dest = lm.fo.get_new_destination(s);
@@ -408,7 +408,7 @@
 					file_size = (int)(new_dest.query_info("*", FileQueryInfoFlags.NONE).get_size() / 1000000);
 				}
 				catch(Error err) {
-					stdout.printf("Could not calculate downloaded podcast's file size: %s\n", err.message);
+					stdout.printf("Could not calculate downloaded podcast's file size: %s", err.message);
 				}
 				
 				s.file_size = file_size;
@@ -442,7 +442,7 @@
 			GLib.File original = GLib.File.new_for_uri(s.uri);
 			
 			/* copy the file over */
-			debug("Copying %s to %s\n", s.uri, dest.get_uri());
+			debug("Copying %s to %s", s.uri, dest.get_uri());
 			success = original.copy(dest, FileCopyFlags.NONE, canceller, null);
 			
 			if(success || dest.query_exists()) {
@@ -456,10 +456,10 @@
 				});
 			}
 			else
-				warning("Failure: Could not copy imported media %s to media folder %s\n", s.uri, dest.get_path());
+				warning("Failure: Could not copy imported media %s to media folder %s", s.uri, dest.get_path());
 		}
 		catch(GLib.Error err) {
-			warning("Could not copy imported media %s to media folder: %s\n", s.uri, err.message);
+			warning("Could not copy imported media %s to media folder: %s", s.uri, err.message);
 		}
 		
 		return success;
@@ -483,7 +483,7 @@
 				current_local_size = new_dest.query_info("*", FileQueryInfoFlags.NONE).get_size();
 			}
 			catch(Error err) {
-				stdout.printf("Error reading current size of downloaded podcast: %s\n", err.message);
+				stdout.printf("Error reading current size of downloaded podcast: %s", err.message);
 			}
 		}
 		

=== modified file 'src/DataBase/DataBaseUpdater.vala'
--- src/DataBase/DataBaseUpdater.vala	2012-06-01 22:48:28 +0000
+++ src/DataBase/DataBaseUpdater.vala	2012-07-03 06:49:24 +0000
@@ -23,34 +23,27 @@
 /* Merely a place holder for multiple pieces of information regarding
  * the current media playing. Mostly here because of dependence. */
 
-using Gee;
 
-public class BeatBox.DataBaseUpdater : GLib.Object {
+public class BeatBox.DataBaseUpdater : Object {
 	private LibraryManager lm;
 	private BeatBox.DataBaseManager dbm;
 	
-	LinkedList<Media> media_updates;
-	
-	Mutex update_mutex;
-	Mutex remove_mutex;
-	
-	LinkedList<GLib.Object> toUpdate; // a queue of things to update
-	LinkedList<GLib.Object> toRemove;
+	Gee.LinkedList<Media> media_updates;
+
+	Gee.LinkedList<Object> toUpdate; // a queue of things to update
+	Gee.LinkedList<Object> toRemove;
 	bool inThread;
 	
 	public DataBaseUpdater(LibraryManager lm, BeatBox.DataBaseManager databm) {
 		this.lm = lm;
 		dbm = databm;
 		
-		update_mutex = new Mutex();
-		remove_mutex = new Mutex();
-		
-		media_updates = new LinkedList<Media>();
-		toUpdate = new LinkedList<GLib.Object>();
-		toRemove = new LinkedList<GLib.Object>();
+		media_updates = new Gee.LinkedList<Media>();
+		toUpdate = new Gee.LinkedList<Object>();
+		toRemove = new Gee.LinkedList<Object>();
 		inThread = false;
 		
-		tree_view_setups = new GLib.List<TreeViewSetup>();
+		tree_view_setups = new List<TreeViewSetup>();
 		
 		Timeout.add(10000, periodic_save);
 	}
@@ -61,76 +54,71 @@
 		return true;
 	}
 	
-	public void update_item(GLib.Object item) {
+	public void update_item(Object item) {
 		if(!(toUpdate.contains(item)))
 			toUpdate.offer(item);
 		
-		if(!inThread && lm.lw.initializationFinished) {
-			try {
-				inThread = true;
-				Thread.create<void*>(update_db_thread_function, false);
-			}
-			catch(GLib.ThreadError err) {
-				stdout.printf("Could not create thread to update database: %s \n", err.message);
-			}
-		}
-	}
-	
-	public void update_medias(Collection<Media> updates) {
-		update_mutex.lock();
-		foreach(var s in updates)
-			media_updates.offer(s);
-		update_mutex.unlock();
-		
-		if(!inThread && lm.lw.initializationFinished) {
-			try {
-				inThread = true;
-				Thread.create<void*>(update_db_thread_function, false);
-			}
-			catch(GLib.ThreadError err) {
-				stdout.printf("Could not create thread to update database: %s \n", err.message);
-			}
-		}
-	}
-	
-	public void removeItem(GLib.Object item) {
-		remove_mutex.lock();
-		if(!(toRemove.contains(item)))
-			toRemove.offer(item);
-		remove_mutex.unlock();
-		
-		if(!inThread && lm.lw.initializationFinished) {
-			try {
-				inThread = true;
-				Thread.create<void*>(update_db_thread_function, false);
-			}
-			catch(GLib.ThreadError err) {
-				stdout.printf("Could not create thread to update database: %s \n", err.message);
-			}
-		}
-	}
-	
-	public void* update_db_thread_function () {
-		while(true) {
-			GLib.Object next;
-			
-			update_mutex.lock();
-			remove_mutex.lock();
-			if(media_updates.size > 0) {
-				dbm.update_medias(media_updates);
-				media_updates.clear();
-			}
-			else if((next = toUpdate.poll()) != null) {
+		update_database_async ();
+	}
+	
+	public void update_medias(Gee.Collection<Media> updates) {
+		lock (media_updates) {
+			foreach (var s in updates)
+				media_updates.offer (s);
+		}
+		
+		update_database_async ();
+	}
+	
+	public void removeItem (Object item) {
+		lock (toRemove) {
+			if (!(toRemove.contains(item)))
+				toRemove.offer (item);
+		}
+		
+		update_database_async ();
+	}
+
+	private async void update_database_async () {
+		if(!inThread && lm.lw.initializationFinished) {
+			try {
+				inThread = true;
+				new Thread<void*>.try (null, update_db_thread_function);
+			}
+			catch (Error err) {
+				warning ("Could not create thread to update database: %s", err.message);
+				inThread = false;
+			}
+		}
+	}
+
+
+	Mutex update_db_lock;
+	
+	private void* update_db_thread_function () {
+		update_db_lock.lock ();
+
+		while (true) {
+			Object? next = null;
+
+			if (media_updates.size > 0) {
+				dbm.update_medias (media_updates);
+				media_updates.clear ();
+			}
+			else if ((next = toUpdate.poll()) != null) {
+				// FIXME: NOTHING TO DO
 				if(next is Playlist) {
+					warning ("update_db_thread_function: %next is Playlist. HANDLE IT!");
 					//dbm.update_playlist((Playlist)next);
 				}
 				else if(next is SmartPlaylist) {
+					warning ("update_db_thread_function: %next is SmartPlaylist. HANDLE IT!");
 					//dbm.update_smart_playlist((SmartPlaylist)next);
 				}
 			}
 			else if((next = toRemove.poll()) != null) {
-				if(next is LinkedList) {
-					dbm.remove_medias((LinkedList<string>)next);
+				if(next is Gee.LinkedList) {
+					dbm.remove_medias((Gee.LinkedList<string>)next);
 				}
 				else if(next is Playlist) {
 					dbm.remove_playlist((Playlist)next);
@@ -141,18 +129,15 @@
 			}
 			else {
 				inThread = false;
-				update_mutex.unlock();
-				remove_mutex.unlock();
-				return null;
+				break;
 			}
-			
-			update_mutex.unlock();
-			remove_mutex.unlock();
 		}
 
+		update_db_lock.unlock ();
+		return null;
 	}
 	
-	GLib.List<TreeViewSetup> tree_view_setups;
+	List<TreeViewSetup> tree_view_setups;
 	
     public void register_autosaved_column (string name, TreeViewSetup setup) {
         setup.set_data<string>("name", name);
@@ -160,7 +145,7 @@
     }
 	
 	void save_others() {
-		var playlists_and_queue = new LinkedList<Playlist>();
+		var playlists_and_queue = new Gee.LinkedList<Playlist>();
 		playlists_and_queue.add_all(lm.playlists());
 		
 		Playlist p_queue = new Playlist();
@@ -195,7 +180,7 @@
 		playlists_and_queue.add(p_podcast);
 		playlists_and_queue.add(p_station);
 		
-		debug("Doing periodic save\n");
+		debug("Doing periodic save");
 		
 		dbm.save_playlists(playlists_and_queue);
 		dbm.save_smart_playlists(lm.smart_playlists());

=== modified file 'src/Devices/CDRomDevice.vala'
--- src/Devices/CDRomDevice.vala	2012-06-01 22:48:28 +0000
+++ src/Devices/CDRomDevice.vala	2012-07-03 06:49:24 +0000
@@ -69,10 +69,10 @@
 		lm.progress_cancel_clicked.connect(cancel_transfer);
 		
 		try {
-			Thread.create<void*>(finish_initialization_thread, false);
+			new Thread<void*>.try (null, finish_initialization_thread);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to finish ipod initialization: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to finish ipod initialization: %s", err.message);
 		}
 	}
 	

=== modified file 'src/Devices/DeviceManager.vala'
--- src/Devices/DeviceManager.vala	2012-07-02 23:17:27 +0000
+++ src/Devices/DeviceManager.vala	2012-07-03 06:49:24 +0000
@@ -27,7 +27,6 @@
 	VolumeMonitor vm;
 	LinkedList<Device> devices;
 	
-	Mutex _pref_lock;
 	HashTable<string, DevicePreferences> _device_preferences;
 	
 	public signal void device_added(Device d);
@@ -38,15 +37,14 @@
 		vm = VolumeMonitor.get();
 		devices = new LinkedList<Device>();
 		
-		_pref_lock = new Mutex();
 		_device_preferences = new HashTable<string, DevicePreferences>(null, null);
 		
 		// pre-load devices and their preferences
-		_pref_lock.lock();
-		foreach(DevicePreferences dp in lm.dbm.load_devices()) {
-			_device_preferences.set(dp.id, dp);
+		lock (_device_preferences) {
+			foreach(DevicePreferences dp in lm.dbm.load_devices()) {
+				_device_preferences.set(dp.id, dp);
+			}
 		}
-		_pref_lock.unlock();
 		
 		vm.mount_added.connect(mount_added);
 		vm.mount_changed.connect(mount_changed);
@@ -59,10 +57,15 @@
 		
 		// this can take time if we have to rev up the cd drive
 		try {
-			Thread.create<void*>(get_pre_existing_mounts, false);
+			new Thread<void*>.try (null, get_pre_existing_mounts);
 		}
+<<<<<<< TREE
 		catch(GLib.ThreadError err) {
 			warning("ERROR: could not create mount getter thread: %s \n", err.message);
+=======
+		catch (Error err) {
+			warning ("Could not create mount getter thread: %s", err.message);
+>>>>>>> MERGE-SOURCE
 		}
 	}
 	
@@ -126,6 +129,7 @@
 		else if(lm.settings.getMusicFolder().contains(mount.get_default_location().get_path())) {
 			// user mounted music folder, rescan for images
 			lm.settings.setMusicMountName(mount.get_volume().get_name());
+<<<<<<< TREE
 			lm.recheck_files_not_found();
 			
 			try {
@@ -134,6 +138,10 @@
 			catch(GLib.ThreadError err) {
 				message("Could not create thread to load media pixbuf's: %s \n", err.message);
 			}
+=======
+			lm.recheck_files_not_found_async ();
+			lm.fetch_image_cache_async ();
+>>>>>>> MERGE-SOURCE
 			
 			return;
 		}
@@ -190,11 +198,9 @@
 	public GLib.List<DevicePreferences> device_preferences() {
 		var rv = new GLib.List<DevicePreferences>();
 		
-		_pref_lock.lock();
-		foreach(var pref in _device_preferences.get_values()) {
-			rv.append(pref);
+		foreach (var pref in _device_preferences.get_values()) {
+			rv.append (pref);
 		}
-		_pref_lock.unlock();
 		
 		return rv;
 	}
@@ -204,8 +210,8 @@
 	}
 	
 	public void add_device_preferences(DevicePreferences dp) {
-		_pref_lock.lock();
-		_device_preferences.set(dp.id, dp);
-		_pref_lock.unlock();
+		lock (_device_preferences) {
+			_device_preferences.set(dp.id, dp);
+		}
 	}
 }

=== modified file 'src/Devices/iPodDevice.vala'
--- src/Devices/iPodDevice.vala	2012-07-02 22:57:45 +0000
+++ src/Devices/iPodDevice.vala	2012-07-03 06:49:24 +0000
@@ -98,10 +98,10 @@
 		});
 		
 		try {
-			Thread.create<void*>(finish_initialization_thread, false);
+			new Thread<void*>.try (null, finish_initialization_thread);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to finish ipod initialization: %s \n", err.message);
+		catch(Error err) {
+			warning ("Could not create thread to finish ipod initialization: %s", err.message);
 		}
 	}
 	
@@ -325,10 +325,10 @@
 		this.list = list;
 		
 		try {
-			Thread.create<void*>(sync_medias_thread, false);
+			new Thread<void*>.try (null, sync_medias_thread);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to sync medias: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to sync medias: %s", err.message);
 			return false;
 		}
 		
@@ -542,10 +542,10 @@
 		this.list = list;
 		
 		try {
-			Thread.create<void*>(add_medias_thread, false);
+			new Thread<void*>.try (null, add_medias_thread);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to add medias: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to add medias: %s", err.message);
 			return false;
 		}
 		
@@ -698,10 +698,10 @@
 		this.list = list;
 		
 		try {
-			Thread.create<void*>(remove_medias_thread, false);
+			new Thread<void*>.try (null, remove_medias_thread);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to remove medias: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to remove medias: %s", err.message);
 			return false;
 		}
 		
@@ -931,10 +931,10 @@
 		current_operation = _("Importing") + " <b>" + ((list.size > 1) ? list.size.to_string() : (list.get(0)).title) + "</b> " + _("items to library...");
 		
 		try {
-			Thread.create<void*>(transfer_medias_thread, false);
+			new Thread<void*>.try (null, transfer_medias_thread);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to transfer medias: %s \n", err.message);
+		catch(Error err) {
+			warning ("Could not create thread to transfer media: %s", err.message);
 			return false;
 		}
 		

=== modified file 'src/Lastfm/LastFM.vala'
--- src/Lastfm/LastFM.vala	2012-06-06 02:59:17 +0000
+++ src/Lastfm/LastFM.vala	2012-07-03 06:49:24 +0000
@@ -20,10 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using Xml;
-using Soup;
-using Gee;
-
 public class LastFM.Core : Object {
 	BeatBox.LibraryManager lm;
 	
@@ -36,7 +32,7 @@
 	public string session_key;
 	
 	public signal void logged_in();
-	public signal void similar_retrieved(LinkedList<int> similarIDs, LinkedList<BeatBox.Media> similarDont);
+	public signal void similar_retrieved(Gee.LinkedList<int> similarIDs, Gee.LinkedList<BeatBox.Media> similarDont);
 	public signal void top_artist_songs_retrieved(HashTable<int, BeatBox.Media> songs);
 	public signal void top_artist_albums_retrieved(HashTable<int, BeatBox.ExternalAlbum> albums);
 	public signal void track_fetched();
@@ -46,13 +42,10 @@
 	LastFM.SimilarMedias similarMedias;
 	LastFM.TopArtistSongs topArtistSongs;
 	LastFM.TopArtistAlbums topArtistAlbums;
-	
-	Mutex _artists_lock;
-	Mutex _albums_lock;
-	Mutex _tracks_lock;
-	HashMap<string, LastFM.ArtistInfo> _artists;//key:artist
-	HashMap<string, LastFM.AlbumInfo> _albums;//key:artist<sep>album
-	HashMap<string, LastFM.TrackInfo> _tracks;//key:artist<sep>album<sep>track
+
+	Gee.HashMap<string, LastFM.ArtistInfo> _artists;//key:artist
+	Gee.HashMap<string, LastFM.AlbumInfo> _albums;//key:artist<sep>album
+	Gee.HashMap<string, LastFM.TrackInfo> _tracks;//key:artist<sep>album<sep>track
 	
 	public Core(BeatBox.LibraryManager lmm) {
 		lm = lmm;
@@ -61,32 +54,28 @@
 		similarMedias = new LastFM.SimilarMedias(lm);
 		topArtistSongs = new LastFM.TopArtistSongs(lm);
 		topArtistAlbums = new LastFM.TopArtistAlbums(lm);
-		
-		_artists_lock = new Mutex();
-		_albums_lock = new Mutex();
-		_tracks_lock = new Mutex();
-		
-		_artists = new HashMap<string, LastFM.ArtistInfo>();
-		_albums = new HashMap<string, LastFM.AlbumInfo>();
-		_tracks = new HashMap<string, LastFM.TrackInfo>();
-		
-		_artists_lock.lock();
-		foreach(LastFM.ArtistInfo a in lm.dbm.load_artists()) {
-			_artists.set(a.name.down(), a);
-		}
-		_artists_lock.unlock();
-		
-		_albums_lock.lock();
-		foreach(LastFM.AlbumInfo a in lm.dbm.load_albums()) {
-			_albums.set(a.name.down() + " by " + a.artist.down(), a);
-		}
-		_albums_lock.unlock();
-		
-		_tracks_lock.lock();
-		foreach(LastFM.TrackInfo t in lm.dbm.load_tracks()) {
-			_tracks.set(t.name.down() + " by " + t.artist.down(), t);
-		}
-		_tracks_lock.unlock();
+
+		_artists = new Gee.HashMap<string, LastFM.ArtistInfo>();
+		_albums = new Gee.HashMap<string, LastFM.AlbumInfo>();
+		_tracks = new Gee.HashMap<string, LastFM.TrackInfo>();
+		
+		lock (_artists) {
+			foreach (LastFM.ArtistInfo a in lm.dbm.load_artists()) {
+				_artists.set (a.name.down(), a);
+			}
+		}
+		
+		lock (_albums) {
+			foreach (LastFM.AlbumInfo a in lm.dbm.load_albums()) {
+				_albums.set (a.name.down() + " by " + a.artist.down(), a);
+			}
+		}
+		
+		lock (_tracks) {
+			foreach (LastFM.TrackInfo t in lm.dbm.load_tracks()) {
+				_tracks.set (t.name.down() + " by " + t.artist.down(), t);
+			}
+		}
 		
 		similarMedias.similar_retrieved.connect(similar_retrieved_signal);
 		topArtistSongs.top_artist_songs_retrieved.connect(top_artist_songs_retrieved_signal);
@@ -94,42 +83,40 @@
 	}
 	
 	/************* Last FM Artist Stuff ************/
-	public GLib.List<LastFM.ArtistInfo> artists() {
-		var rv = new GLib.List<LastFM.ArtistInfo>();
+	public List<LastFM.ArtistInfo> artists () {
+		var rv = new List<LastFM.ArtistInfo>();
 		foreach(var artist in _artists.values)
 			rv.append(artist);
 		
 		return rv;
 	}
 	
-	public void save_artist(LastFM.ArtistInfo artist) {
-		_artists_lock.lock();
-		_artists.set(artist.name.down(), artist);
-		_artists_lock.unlock();
-	}
-	
-	public bool artist_info_exists(string artist_key) {
-		return _artists.get(artist_key.down()) != null;
-	}
-	
-	public LastFM.ArtistInfo? get_artist_from_media(BeatBox.Media m) {
-		return get_artist(m.album_artist.down());
-	}
-	
-	public LastFM.ArtistInfo? get_artist(string artist_key) {
+	public void save_artist (LastFM.ArtistInfo artist) {
+		lock (_artists) {
+			_artists.set (artist.name.down(), artist);
+		}
+	}
+	
+	public bool artist_info_exists (string artist_key) {
+		return _artists.has_key (artist_key.down());
+	}
+	
+	public LastFM.ArtistInfo? get_artist_from_media (BeatBox.Media m) {
+		return get_artist (m.album_artist);
+	}
+	
+	public LastFM.ArtistInfo? get_artist (string artist_key) {
 		LastFM.ArtistInfo? rv = null;
 		
-		_artists_lock.lock();
-		if(artist_info_exists(artist_key.down()))	
-			rv = _artists.get(artist_key.down());
-		_artists_lock.unlock();
-			
+		if (artist_info_exists (artist_key))	
+			rv = _artists.get (artist_key.down());
+
 		return rv;
 	}
 	
 	/************** LastFM Album stuff **************/
-	public GLib.List<LastFM.AlbumInfo> albums() {
-		var rv = new GLib.List<LastFM.AlbumInfo>();
+	public List<LastFM.AlbumInfo> albums() {
+		var rv = new List<LastFM.AlbumInfo>();
 		foreach(var album in _albums.values)
 			rv.append(album);
 		
@@ -137,33 +124,31 @@
 	}
 	
 	public void save_album(LastFM.AlbumInfo album) {
-		_albums_lock.lock();
-		_albums.set(album.name.down() + " by " + album.artist.down(), album);
-		_albums_lock.unlock();
+		lock (_albums) {
+			_albums.set(album.name.down() + " by " + album.artist.down(), album);
+		}
 	}
 	
 	public bool album_info_exists(string album_key) {
-		return _albums.get(album_key) != null;
+		return _albums.has_key (album_key.down());
 	}
 	
-	public LastFM.AlbumInfo? get_album_from_media(BeatBox.Media m) {
-		return get_album(m.album.down() + " by " + m.album_artist.down());
+	public LastFM.AlbumInfo? get_album_from_media (BeatBox.Media m) {
+		return get_album (m.album.down() + " by " + m.album_artist.down());
 	}
 	
 	public LastFM.AlbumInfo? get_album(string album_key) {
 		LastFM.AlbumInfo? rv = null;
 		
-		_albums_lock.lock();
-		if(album_info_exists(album_key.down()))	
-			rv = _albums.get(album_key.down());
-		_albums_lock.unlock();
-			
+		if(album_info_exists (album_key))
+			rv = _albums.get (album_key.down());
+
 		return rv;
 	}
 	
 	/************** Last FM Track Stuff ***************/
-	public GLib.List<LastFM.TrackInfo> tracks() {
-		var rv = new GLib.List<LastFM.TrackInfo>();
+	public List<LastFM.TrackInfo> tracks() {
+		var rv = new List<LastFM.TrackInfo>();
 		foreach(var track in _tracks.values)
 			rv.append(track);
 		
@@ -171,37 +156,35 @@
 	}
 	
 	public void save_track(LastFM.TrackInfo track) {
-		_tracks_lock.lock();
-		_tracks.set(track.name.down() + " by " + track.artist.down(), track);
-		_tracks_lock.unlock();
+		lock (_tracks) {
+			_tracks.set (track.name.down() + " by " + track.artist.down(), track);
+		}
 	}
 	
 	public bool track_info_exists(string track_key) {
-		return _tracks.get(track_key.down()) != null;
-	}
-	
-	public LastFM.TrackInfo? get_track_from_media(BeatBox.Media m) {
-		return get_track(m.title.down() + " by " + m.album_artist.down());
-	}
-	
-	public LastFM.TrackInfo? get_track(string track_key) {
+		return _tracks.has_key (track_key.down());
+	}
+	
+	public LastFM.TrackInfo? get_track_from_media (BeatBox.Media m) {
+		return get_track (m.title.down() + " by " + m.album_artist.down());
+	}
+	
+	public LastFM.TrackInfo? get_track (string track_key) {
 		LastFM.TrackInfo? rv = null;
 		
-		_tracks_lock.lock();
-		if(track_info_exists(track_key.down()))
-			rv = _tracks.get(track_key.down());
-		_tracks_lock.unlock();
+		if (track_info_exists (track_key.down()))
+			rv = _tracks.get (track_key.down());
 			
 		return rv;
 	}
 	
 	/** Last.FM Api functions **/
-	public static string fix_for_url(string fix) {
-		return GLib.Uri.escape_string(fix, null, false);
+	public static string fix_for_url (string fix) {
+		return Uri.escape_string (fix, "", false);
 	}
 	
 	public string generate_md5(string text) {
-		return GLib.Checksum.compute_for_string(ChecksumType.MD5, text, text.length);
+		return Checksum.compute_for_string(ChecksumType.MD5, text, text.length);
 	}
 	
 	public string generate_getsession_signature(string token) {
@@ -227,9 +210,9 @@
 	public string? getToken() {
 		var url = "http://ws.audioscrobbler.com/2.0/?method=auth.gettoken&api_key=" + api;
 		
-		Xml.Doc* doc = Parser.parse_file (url);
+		Xml.Doc* doc = Xml.Parser.parse_file (url);
 		if(doc == null) return null;
-		
+
 		Xml.Node* root = doc->get_root_element();
 		if(root == null) return null;
 		
@@ -246,9 +229,9 @@
 		var sig = generate_getsession_signature(token);
 		var url = "http://ws.audioscrobbler.com/2.0/?method=auth.getSession&api_key=" + api + "&api_sig=" + sig + "&token=" + token;
 		
-		message("url: %s\n", url);
+		message ("url: %s", url);
 		
-		Xml.Doc* doc = Parser.parse_file (url);
+		Xml.Doc* doc = Xml.Parser.parse_file (url);
 		if(doc == null) return null;
 		
 		Xml.Node* root = doc->get_root_element();
@@ -268,7 +251,7 @@
 	
 	public bool loveTrack(string title, string artist) {
 		if(session_key == null || session_key == "") {
-			debug("User tried to ban a track, but is not logged into Last FM\n");
+			debug("User tried to ban a track, but is not logged into Last FM");
 			return false;
 		}
 		
@@ -277,7 +260,7 @@
 		Soup.SessionSync session = new Soup.SessionSync();
 		Soup.Message message = new Soup.Message ("POST", uri);
 		
-		var headers = new Soup.MessageHeaders(MessageHeadersType.REQUEST);
+		var headers = new Soup.MessageHeaders(Soup.MessageHeadersType.REQUEST);
 		headers.append("api_key", api);
 		headers.append("api_sig", generate_tracklove_signature(artist, title));
 		headers.append("artist", artist);
@@ -298,7 +281,7 @@
 	
 	public bool banTrack(string title, string artist) {
 		if(session_key == null || session_key == "") {
-			debug("User tried to ban a track, but is not logged into Last FM\n");
+			debug("User tried to ban a track, but is not logged into Last FM");
 			return false;
 		}
 		
@@ -307,7 +290,7 @@
 		Soup.SessionSync session = new Soup.SessionSync();
 		Soup.Message message = new Soup.Message ("POST", uri);
 		
-		var headers = new Soup.MessageHeaders(MessageHeadersType.REQUEST);
+		var headers = new Soup.MessageHeaders(Soup.MessageHeadersType.REQUEST);
 		headers.append("api_key", api);
 		headers.append("api_sig", generate_trackban_signature(artist, title));
 		headers.append("artist", artist);
@@ -330,13 +313,13 @@
 	 */
 	public void fetchCurrentTrackInfo() {
 		try {
-			Thread.create<void*>(track_thread_function, false);
-		} catch(GLib.ThreadError err) {
-			warning ("ERROR: Could not create last fm thread: %s \n", err.message);
+			new Thread<void*>.try (null, track_thread_function);
+		} catch (Error err) {
+			warning ("Could not create last fm thread: %s", err.message);
 		}
 	}
 	
-	void* track_thread_function () {
+	private void* track_thread_function () {
 		LastFM.TrackInfo track = new LastFM.TrackInfo.basic();
 
 		string album_artist_s = lm.media_info.media.album_artist;
@@ -364,13 +347,13 @@
 	
 	public void fetchCurrentAlbumInfo() {
 		try {
-			Thread.create<void*>(album_thread_function, false);
-		} catch(GLib.ThreadError err) {
-			warning ("ERROR: Could not create last fm thread: %s \n", err.message);
+			new Thread<void*>.try (null, album_thread_function);
+		} catch (Error err) {
+			warning ("Could not create last fm thread: %s", err.message);
 		}
 	}
 	
-	void* album_thread_function () {
+	private void* album_thread_function () {
 		LastFM.AlbumInfo album = new LastFM.AlbumInfo.basic();
 		
 		string album_artist_s = lm.media_info.media.album_artist;
@@ -391,12 +374,12 @@
 		
 		/* If we found an album art, and we don't have one yet, save it to file **/
 		if(album.url_image.url != null && lm.get_cover_album_art_from_key(album_artist_s, album_s) == null) {
-			debug("Saving album image locally for %s by %s\n", album_s, album_artist_s);
+			debug("Saving album image locally for %s by %s", album_s, album_artist_s);
 			lm.save_album_locally(lm.media_info.media.rowid, album.url_image.url, false);
 		}
 		
 		// Fix up the track # on any songs in our library
-		var updates = new LinkedList<BeatBox.Media>();
+		var updates = new Gee.LinkedList<BeatBox.Media>();
 		foreach(var m in album.tracks()) {
 			var in_lib = lm.media_from_name(m.title, m.artist);
 			if(in_lib != null && in_lib.track != m.track) {
@@ -418,13 +401,13 @@
 	 */
 	public void fetchCurrentArtistInfo() {
 		try {
-			Thread.create<void*>(artist_thread_function, false);
-		} catch(GLib.ThreadError err) {
-			warning ("ERROR: Could not create last fm thread: %s \n", err.message);
+			new Thread<void*>.try (null, artist_thread_function);
+		} catch (Error err) {
+			warning ("Could not create last fm thread: %s", err.message);
 		}
 	}
 	
-	void* artist_thread_function () {
+	private void* artist_thread_function () {
 		LastFM.ArtistInfo artist = new LastFM.ArtistInfo.basic();
 
 		string album_artist_s = lm.media_info.media.album_artist;
@@ -456,15 +439,15 @@
 	 */
 	public void postNowPlaying() {
 		try {
-			Thread.create<void*>(update_nowplaying_thread_function, false);
-		} catch(GLib.ThreadError err) {
-			warning ("ERROR: Could not create last fm thread: %s \n", err.message);
+			new Thread<void*>.try (null, update_nowplaying_thread_function);
+		} catch (Error err) {
+			warning ("Could not create last fm thread: %s", err.message);
 		}
 	}
 	
 	void* update_nowplaying_thread_function() {
 		if(session_key == null || session_key == "") {
-			debug("Last.FM user not logged in\n");
+			debug("Last.FM user not logged in");
 			return null;
 		}
 		if(!lm.media_active)
@@ -477,7 +460,7 @@
 		Soup.SessionSync session = new Soup.SessionSync();
 		Soup.Message message = new Soup.Message ("POST", uri);
 		
-		var headers = new Soup.MessageHeaders(MessageHeadersType.REQUEST);
+		var headers = new Soup.MessageHeaders(Soup.MessageHeadersType.REQUEST);
 		headers.append("api_key", api);
 		headers.append("api_sig", generate_trackupdatenowplaying_signature(artist, title));
 		headers.append("artist", artist);
@@ -501,15 +484,15 @@
 	 */
 	public void postScrobbleTrack() {
 		try {
-			Thread.create<void*>(scrobble_thread_function, false);
-		} catch(GLib.ThreadError err) {
-			warning ("ERROR: Could not create last fm thread: %s \n", err.message);
+			new Thread<void*>.try (null, scrobble_thread_function);
+		} catch (Error err) {
+			warning ("Could not create last fm thread: %s", err.message);
 		}
 	}
 	
 	void* scrobble_thread_function () {
 		if(session_key == null || session_key == "") {
-			debug("Last.FM user not logged in\n");
+			debug("Last.FM user not logged in");
 			return null;
 		}
 		if(!lm.media_active)
@@ -523,7 +506,7 @@
 		Soup.SessionSync session = new Soup.SessionSync();
 		Soup.Message message = new Soup.Message ("POST", uri);
 		
-		var headers = new Soup.MessageHeaders(MessageHeadersType.REQUEST);
+		var headers = new Soup.MessageHeaders(Soup.MessageHeadersType.REQUEST);
 		headers.append("api_key", api);
 		headers.append("api_sig", generate_trackscrobble_signature(artist, title, timestamp));
 		headers.append("artist", artist);
@@ -547,7 +530,7 @@
 		similarMedias.queryForSimilar(lm.media_info.media);
 	}
 	
-	void similar_retrieved_signal(LinkedList<int> similarIDs, LinkedList<BeatBox.Media> similarDont) {
+	void similar_retrieved_signal(Gee.LinkedList<int> similarIDs, Gee.LinkedList<BeatBox.Media> similarDont) {
 		similar_retrieved(similarIDs, similarDont);
 	}
 	
@@ -569,19 +552,19 @@
 	
 	public void fetch_remaining_album_art() {
 		try {
-			Thread.create<void*>(fetch_remaining_album_art_thread, false);
-		} catch(GLib.ThreadError err) {
-			warning ("ERROR: Could not create last fm thread: %s \n", err.message);
+			new Thread<void*>.try (null, fetch_remaining_album_art_thread);
+		} catch (Error err) {
+			warning ("Could not create last fm thread: %s", err.message);
 		}
 	}
 	
 	public void* fetch_remaining_album_art_thread() {
 		var all_media = lm.medias();
-		var remaining = new HashMap<string, BeatBox.Album>(); // hashmap of albums with no art
+		var remaining = new Gee.HashMap<string, BeatBox.Album>(); // hashmap of albums with no art
 		foreach(var m in all_media) {
 			string key = lm.album_key(m);
 			
-			if(remaining.get(key) != null) // already known
+			if (remaining.has_key (key)) // already known
 				continue;
 				
 			if(lm.get_cover_album_art(m.rowid) == null) {
@@ -603,12 +586,12 @@
 			
 			/* If we found an album art, save it to file **/
 			if(album_info != null && album_info.url_image.url != null && album_info.url_image.url != "") {
-				debug("Saving album image locally for %s by %s\n", album_s, album_artist_s);
+				debug("Saving album image locally for %s by %s", album_s, album_artist_s);
 				lm.save_album_locally(m.rowid, album_info.url_image.url, false);
 			}
 		}
 		
-		message("All remaining art fetched\n");
+		message("All remaining art fetched");
 		
 		return null;
 	}

=== modified file 'src/Lastfm/SimilarMedia.vala'
--- src/Lastfm/SimilarMedia.vala	2012-06-02 19:34:06 +0000
+++ src/Lastfm/SimilarMedia.vala	2012-07-03 06:49:24 +0000
@@ -20,8 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using Xml;
-
 public class LastFM.SimilarMedias : Object {
 	BeatBox.LibraryManager _lm;
 	BeatBox.Media _base;
@@ -29,7 +27,7 @@
 	
 	Gee.LinkedList<BeatBox.Media> similar;
 	
-	public signal void similar_retrieved( Gee.LinkedList<int> similarIDs, Gee.LinkedList<BeatBox.Media> similarDont);
+	public signal void similar_retrieved (Gee.LinkedList<int> similarIDs, Gee.LinkedList<BeatBox.Media> similarDont);
 	
 	public class SimilarMedias(BeatBox.LibraryManager lm) {
 		_lm = lm;
@@ -43,10 +41,10 @@
 			working = true;
 			
 			try {
-				Thread.create<void*>(similar_thread_function, false);
+				new Thread<void*>.try (null, similar_thread_function);
 			}
-			catch(GLib.ThreadError err) {
-				warning("ERROR: Could not create similar thread: %s \n", err.message);
+			catch (Error err) {
+				warning ("Could not create similar thread: %s", err.message);
 			}
 		}
 	}
@@ -107,7 +105,7 @@
 		Xml.Node* iter;
 		for (iter = node->children; iter != null; iter = iter->next) {
 			
-            if (iter->type != ElementType.ELEMENT_NODE) {
+            if (iter->type != Xml.ElementType.ELEMENT_NODE) {
                 continue;
             }
 

=== modified file 'src/Lastfm/TopArtistAlbums.vala'
--- src/Lastfm/TopArtistAlbums.vala	2012-07-02 23:17:27 +0000
+++ src/Lastfm/TopArtistAlbums.vala	2012-07-03 06:49:24 +0000
@@ -20,8 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using Xml;
-
 public class LastFM.TopArtistAlbums : Object {
 	static const int MAX_RESULTS = 5;
 	BeatBox.LibraryManager _lm;
@@ -46,10 +44,10 @@
 			working = true;
 			
 			try {
-				Thread.create<void*>(top_artist_albums_thread_function, false);
+				new Thread<void*>.try (null, top_artist_albums_thread_function);
 			}
-			catch(GLib.ThreadError err) {
-				warning("ERROR: Could not create top artist albums thread: %s \n", err.message);
+			catch (Error err) {
+				warning ("ERROR: Could not create top artist albums thread: %s", err.message);
 			}
 		}
 	}
@@ -79,7 +77,7 @@
 	async void uri_to_pixbuf(BeatBox.ExternalAlbum album) {
 		GLib.File file = GLib.File.new_for_uri(album.pixbuf_url);
 		if(file == null) {
-			stdout.printf("Could not read image_uri as file\n");
+			message ("Could not read image_uri as file");
 			return;
 		}
 		
@@ -90,7 +88,11 @@
 			filestream = yield file.read_async();
 			pix = yield Gdk.Pixbuf.new_from_stream_at_scale_async(filestream, -1, Icons.ALBUM_VIEW_IMAGE_SIZE, true);
 		} catch(GLib.Error err) {
+<<<<<<< TREE
 			debug("Failed to save load art locally from %s: %s\n", album.pixbuf_url, err.message);
+=======
+			warning("Failed to save album art locally from %s: %s", album.pixbuf_url, err.message);
+>>>>>>> MERGE-SOURCE
 		}
 		
 		if(pix != null) {
@@ -113,11 +115,11 @@
 		Xml.Doc* doc = Xml.Parser.parse_memory((string)message.response_body.data, (int)message.response_body.length);
 		
 		if(doc == null)
-			GLib.message("Could not load top artist albums information for %s\n", artist);
+			GLib.message("Could not load top artist albums information for %s", artist);
 		else if(doc->get_root_element() == null)
-			GLib.message("Oddly, top artist albums information was invalid\n");
+			GLib.message("Oddly, top artist albums information was invalid");
 		else {
-			//GLib.message("Getting top artist albums with %s... \n", url);
+			//GLib.message("Getting top artist albums with %s...", url);
 			toAdd = null;
 			
 			parse_top_artist_albums_nodes(doc->get_root_element(), "");
@@ -132,7 +134,7 @@
 							
 		Xml.Node* iter;
 		for (iter = node->children; iter != null; iter = iter->next) {
-            if (iter->type != ElementType.ELEMENT_NODE) {
+            if (iter->type != Xml.ElementType.ELEMENT_NODE) {
                 continue;
             }
 

=== modified file 'src/Lastfm/TopArtistSongs.vala'
--- src/Lastfm/TopArtistSongs.vala	2012-06-02 19:34:06 +0000
+++ src/Lastfm/TopArtistSongs.vala	2012-07-03 06:49:24 +0000
@@ -20,8 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using Xml;
-
 public class LastFM.TopArtistSongs : Object {
 	static const int MAX_RESULTS = 15;
 	BeatBox.LibraryManager _lm;
@@ -46,15 +44,15 @@
 			working = true;
 			
 			try {
-				Thread.create<void*>(top_artist_songs_thread_function, false);
+				new Thread<void*>.try (null, top_artist_songs_thread_function);
 			}
-			catch(GLib.ThreadError err) {
-				warning("ERROR: Could not create similar thread: %s \n", err.message);
+			catch (Error err) {
+				warning("ERROR: Could not create similar thread: %s", err.message);
 			}
 		}
 	}
 	
-	void* top_artist_songs_thread_function () {	
+	private void* top_artist_songs_thread_function () {	
 		songs = new HashTable<int, BeatBox.Media>(null, null);
 		
 		getTopArtistTracks(_base.artist);
@@ -96,11 +94,11 @@
 		Xml.Doc* doc = Xml.Parser.parse_memory((string)message.response_body.data, (int)message.response_body.length);
 		
 		if(doc == null)
-			GLib.message("Could not load top artist songs information for %s\n", artist);
+			GLib.message("Could not load top artist songs information for %s", artist);
 		else if(doc->get_root_element() == null)
-			GLib.message("Oddly, similar artist information was invalid\n");
+			GLib.message("Oddly, similar artist information was invalid");
 		else {
-			//message("Getting similar tracks with %s... \n", url);
+			//message("Getting similar tracks with %s...", url);
 			toAdd = null;
 			
 			parse_top_artist_tracks_nodes(doc->get_root_element(), "");
@@ -115,7 +113,7 @@
 							
 		Xml.Node* iter;
 		for (iter = node->children; iter != null; iter = iter->next) {
-            if (iter->type != ElementType.ELEMENT_NODE) {
+            if (iter->type != Xml.ElementType.ELEMENT_NODE) {
                 continue;
             }
 

=== modified file 'src/Lists/GenericList.vala'
--- src/Lists/GenericList.vala	2012-06-28 02:26:50 +0000
+++ src/Lists/GenericList.vala	2012-07-03 06:49:24 +0000
@@ -278,10 +278,10 @@
 		// For songs with no attached uri, try opening its lastfm url
 		if(m.uri == "") {
 			try {
-				Thread.create<void*>(take_action, false);
+				new Thread<void*>.try (null, take_action);
 			}
-			catch(GLib.ThreadError err) {
-				stdout.printf("ERROR: Could not create thread to have fun: %s \n", err.message);
+			catch (Error err) {
+				warning ("Could not create thread to have fun: %s", err.message);
 			}
 		}
 		else {

=== modified file 'src/Media/LyricFetcher.vala'
--- src/Media/LyricFetcher.vala	2012-06-01 22:48:28 +0000
+++ src/Media/LyricFetcher.vala	2012-07-03 06:49:24 +0000
@@ -42,10 +42,10 @@
 		this.title = title;
 		
 		try {
-			Thread.create<void*> (fetch_lyrics_thread, false);
+			new Thread<void*>.try (null, fetch_lyrics_thread);
 		}
-		catch(GLib.ThreadError err) {
-			stderr.printf ("ERROR: Could not create lyrics thread: %s \n", err.message);
+		catch(GLib.Error err) {
+			warning ("ERROR: Could not create lyrics thread: %s \n", err.message);
 		}
 	}
 	
@@ -87,7 +87,7 @@
 
 /** LYRIC SOURCES **/
 
-private class AZLyricsFetcher : Object {
+private class AZLyricsFetcher {
 
 	private const string URL_FORMAT = "http://www.azlyrics.com/lyrics/%s/%s.html";
 
@@ -108,7 +108,7 @@
 			rv.artist = artist;
 		}
 		catch (Error err) {
-			//stderr.printf("Could not load contents of %s : %s\n", url, err.message);
+			//warning("Could not load contents of %s : %s\n", url, err.message);
 			load_successful = false;
 		}
 
@@ -122,13 +122,13 @@
 				load_successful = true;
 			}
 			catch (Error err) {
-				//stderr.printf ("Could not load contents of %s : %s\n", url, err.message);
+				//warning ("Could not load contents of %s : %s\n", url, err.message);
 				load_successful = false;
 			}
 		}
 		
 		if (load_successful)
-			rv.content = parse_lyrics (uintcontent) + "\n";
+			rv.content = "\n" + rv.title + "\n" + rv.artist + "\n\n\n" + parse_lyrics (uintcontent) + "\n";
 		else
 			throw new FetchingError.LYRICS_NOT_FOUND (@"Lyrics not found for $title");		
 

=== modified file 'src/Store/Widgets/AlbumView.vala'
--- src/Store/Widgets/AlbumView.vala	2012-06-01 22:48:28 +0000
+++ src/Store/Widgets/AlbumView.vala	2012-07-03 06:49:24 +0000
@@ -174,20 +174,21 @@
 	
 	public void populate() {
 		try {
-			Thread.create<void*>(setalbum_thread_function, false);
-			Thread.create<void*>(gettracks_thread_function, false);
-			Thread.create<void*>(getsimilarreleases_thread_function, false);
-			Thread.create<void*>(getalbuminfo_thread_function, false);
+			new Thread<void*>.try (null, setalbum_thread_function);
+			new Thread<void*>.try (null, gettracks_thread_function);
+			new Thread<void*>.try (null, getsimilarreleases_thread_function);
+			new Thread<void*>.try (null, getalbuminfo_thread_function);
+
 			storeView.max = 5;
 			storeView.index = 0;
 			storeView.progressNotification();
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to get populate ArtistView: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to get populate ArtistView: %s", err.message);
 		}
 	}
 	
-	public void* setalbum_thread_function () {
+	private void* setalbum_thread_function () {
 		Store.Release r = store.getRelease(release.releaseID, 200);
 		r.image = Store.store.getPixbuf(r.imagePath, 200, 200);
 		
@@ -198,7 +199,7 @@
 			++storeView.index;
 			
             try {
-			    Thread.create<void*>(gettaglabels_thread_function, false);
+			    new Thread<void*>.try (null, gettaglabels_thread_function);
             }
             catch (Error e) {
                 critical ("Couldn't get tags: %s", e.message);
@@ -227,7 +228,7 @@
 		return null;
 	}
 	
-	public void* getsimilarreleases_thread_function () {
+	private void* getsimilarreleases_thread_function () {
 		foreach(var rel in release.getSimilar(1)) {
 			rel.image = Store.store.getPixbuf(rel.imagePath, 100, 100);
 			similarReleasesList.add(rel);
@@ -246,7 +247,7 @@
 		return null;
 	}
 	
-	public void* gettaglabels_thread_function () {
+	private void* gettaglabels_thread_function () {
 		var labels = new LinkedList<Store.TagLabel>();
 		
 		foreach(var format in release.formats) {
@@ -289,7 +290,7 @@
 		return null;
 	}
 	
-	public void* getalbuminfo_thread_function () {
+	private void* getalbuminfo_thread_function () {
 		/* first get album description */
 		LastFM.AlbumInfo album = new LastFM.AlbumInfo.basic();
 		

=== modified file 'src/Store/Widgets/ArtistView.vala'
--- src/Store/Widgets/ArtistView.vala	2012-02-04 00:01:35 +0000
+++ src/Store/Widgets/ArtistView.vala	2012-07-03 06:49:24 +0000
@@ -58,7 +58,7 @@
 		setArtist(artist);
 	}
 	
-	public void buildUI() {
+	private void buildUI() {
 		VBox allDetails = new VBox(false, 0);
 		HBox topRow = new HBox(false, 0);
 		VBox topInfo = new VBox(false, 0);
@@ -110,19 +110,19 @@
 	
 	public void populate() {
 		try {
-			Thread.create<void*>(setartist_thread_function, false);
-			Thread.create<void*>(gettracks_thread_function, false);
-			Thread.create<void*>(getreleases_thread_function, false);
+			new Thread<void*>.try (null, setartist_thread_function);
+			new Thread<void*>.try (null, gettracks_thread_function);
+			new Thread<void*>.try (null, getreleases_thread_function);
 			storeView.index = 0;
 			storeView.max = 5; // must get to 6 for progress bar to turn off
 			storeView.progressNotification();
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to get populate ArtistView: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to get populate ArtistView: %s", err.message);
 		}
 	}
 	
-	public void* setartist_thread_function () {
+	private void* setartist_thread_function () {
 		Store.Artist a = store.getArtist(artist.artistID);
 		++storeView.index;
 		Idle.add( () => { 
@@ -134,7 +134,7 @@
 		return null;
 	}
 	
-	public void* gettracks_thread_function () {
+	private void* gettracks_thread_function () {
 		foreach(var track in artist.getTopTracks(1, 25))
 			topTracksList.add(track);
 		++storeView.index;
@@ -149,7 +149,7 @@
 		return null;
 	}
 	
-	public void* getreleases_thread_function () {
+	private void* getreleases_thread_function () {
 		foreach(var rel in artist.getReleases("album", 1)) {
 			rel.image = Store.store.getPixbuf(rel.imagePath, 100, 100);
 			releasesList.add(rel);

=== modified file 'src/Store/Widgets/HomeView.vala'
--- src/Store/Widgets/HomeView.vala	2012-02-04 00:01:35 +0000
+++ src/Store/Widgets/HomeView.vala	2012-07-03 06:49:24 +0000
@@ -41,7 +41,7 @@
 		buildUI();
 	}
 	
-	public void buildUI() {
+	private void buildUI() {
 		allItems = new HBox(false, 0);
 		VBox leftItems = new VBox(false, 0);
 		VBox centerItems = new VBox(false, 0);
@@ -98,6 +98,7 @@
 		
 	}
 	
+	// TODO: Move to utils namespace!!
 	public static Gtk.Alignment wrap_alignment (Gtk.Widget widget, int top, int right, int bottom, int left) {
 		var alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f);
 		alignment.top_padding = top;
@@ -111,21 +112,22 @@
 	
 	public void populate() {
 		try {
-			Thread.create<void*>(getartists_thread_function, false);
-			Thread.create<void*>(getreleases_thread_function, false);
-			Thread.create<void*>(gettracks_thread_function, false);
-			Thread.create<void*>(gettoprock_thread_function, false);
-			Thread.create<void*>(getgenres_thread_function, false);
+			new Thread<void*>.try (null, getartists_thread_function);
+			new Thread<void*>.try (null, getreleases_thread_function);
+			new Thread<void*>.try (null, gettracks_thread_function);
+			new Thread<void*>.try (null, gettoprock_thread_function);
+			new Thread<void*>.try (null, getgenres_thread_function);
+
 			storeView.max = 6;
 			storeView.index = 0;
 			storeView.progressNotification();
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to get populate ArtistView: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to get populate ArtistView: %s", err.message);
 		}
 	}
 	
-	public void* getartists_thread_function () {
+	private void* getartists_thread_function () {
 		var tops = new LinkedList<Artist>();
 		
 		foreach(var art in store.topArtists("week", null, null, 1))
@@ -144,7 +146,7 @@
 		return null;
 	}
 	
-	public void* getreleases_thread_function () {
+	private void* getreleases_thread_function () {
 		var tops = new LinkedList<Release>();
 		
 		foreach(var rel in store.topReleases("week", null, null, 1)) {
@@ -163,7 +165,7 @@
 		return null;
 	}
 	
-	public void* gettracks_thread_function () {
+	private void* gettracks_thread_function () {
 		var tops = new LinkedList<Track>();
 		
 		foreach(var track in store.topTracks("week", null, 1))
@@ -182,7 +184,7 @@
 		return null;
 	}
 	
-	public void* gettoprock_thread_function () {
+	private void* gettoprock_thread_function () {
 		var rock = new LinkedList<Release>();
 		
 		foreach(var rel in store.topReleases("week", null, "rock", 1)) {
@@ -203,7 +205,7 @@
 		return null;
 	}
 	
-	public void* getgenres_thread_function () {
+	private void* getgenres_thread_function () {
 		var gens = new LinkedList<Tag>();
 		
 		gens.add( new Tag.with_values("pop", "Pop", "") );

=== modified file 'src/Store/Widgets/StoreView.vala'
--- src/Store/Widgets/StoreView.vala	2012-03-16 05:21:31 +0000
+++ src/Store/Widgets/StoreView.vala	2012-07-03 06:49:24 +0000
@@ -94,16 +94,16 @@
 		setView(searchPage);
 		
 		try {
-			Thread.create<void*>(searchtracks_thread_function, false);
-			Thread.create<void*>(searchartists_thread_function, false);
-			Thread.create<void*>(searchreleases_thread_function, false);
+			new Thread<void*>.try (null, searchtracks_thread_function);
+			new Thread<void*>.try (null, searchartists_thread_function);
+			new Thread<void*>.try (null, searchreleases_thread_function);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to get populate ArtistView: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to get populate ArtistView: %s", err.message);
 		}
 	}
 	
-	public void* searchtracks_thread_function () {
+	private void* searchtracks_thread_function () {
 		var search = new LinkedList<Store.Track>();
 		
 		foreach(var track in store.searchTracks(lw.searchField.get_text(), 1))
@@ -119,7 +119,7 @@
 		return null;
 	}
 	
-	public void* searchartists_thread_function () {
+	private void* searchartists_thread_function () {
 		var search = new LinkedList<Store.Artist>();
 		
 		foreach(var artist in store.searchArtists(lw.searchField.get_text(), null, 1))
@@ -135,7 +135,7 @@
 		return null;
 	}
 	
-	public void* searchreleases_thread_function () {
+	private void* searchreleases_thread_function () {
 		var search = new LinkedList<Store.Release>();
 		
 		foreach(var rel in store.searchReleases(lw.searchField.get_text(), 1))

=== modified file 'src/Views/SimilarMediaView.vala'
--- src/Views/SimilarMediaView.vala	2012-06-19 22:50:13 +0000
+++ src/Views/SimilarMediaView.vala	2012-07-03 06:49:24 +0000
@@ -83,10 +83,10 @@
 	
 	public virtual void viewDoubleClick(TreePath path, TreeViewColumn column) {
 		try {
-			Thread.create<void*>(take_action, false);
+			new Thread<void*>.try (null, take_action);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to have fun: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to have fun: %s", err.message);
 		}
 	}
 	
@@ -117,8 +117,8 @@
 			try {
 				GLib.AppInfo.launch_default_for_uri (s.lastfm_url, null);
 			}
-			catch(Error err) {
-				stdout.printf("Couldn't open the similar media's last fm page: %s\n", err.message);
+			catch (Error err) {
+				warning ("Couldn't open the similar media's last fm page: %s", err.message);
 			}
 		}
 		

=== modified file 'src/Widgets/EmbeddedAlert.vala'
--- src/Widgets/EmbeddedAlert.vala	2012-06-25 23:39:54 +0000
+++ src/Widgets/EmbeddedAlert.vala	2012-07-03 06:49:24 +0000
@@ -20,12 +20,6 @@
  * Authored by: Victor Eduardo <[e-mail]>
  */
 
-/**
- * An alert compliant with elementary's HIG
- *
- * TODO: Add description and examples
- */
-
 public class BeatBox.EmbeddedAlert : Gtk.EventBox {
 
     const string ERROR_ICON = "dialog-error";
@@ -43,11 +37,11 @@
     protected Gtk.ButtonBox action_button_box;
 
     const int MIN_HORIZONTAL_MARGIN = 84;
-    const int MIN_VERTICAL_MARGIN = 48;
+    const int MIN_VERTICAL_MARGIN = 6;
 
     public EmbeddedAlert () {
         get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
-        //get_style_context ().add_class (Granite.STYLE_CLASS_CONTENT_VIEW); // This variable is not in granite version in universe
+        get_style_context ().add_class (Granite.STYLE_CLASS_CONTENT_VIEW);
 
         action_button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
         action_button_box.valign = Gtk.Align.START;
@@ -125,7 +119,7 @@
                             bool show_icon = true, Gtk.MessageType type = Gtk.MessageType.WARNING)
     {
         // Reset size request
-        set_size_request (1, 1);
+        set_size_request (0, 0);
 
         if (primary_text == null)
             primary_text = "";

=== modified file 'src/Widgets/SearchSuggester.vala'
--- src/Widgets/SearchSuggester.vala	2012-06-01 22:48:28 +0000
+++ src/Widgets/SearchSuggester.vala	2012-07-03 06:49:24 +0000
@@ -71,9 +71,9 @@
 			//Timeout.add(750, () => {
 				if(new_search == last_search && new_search.length > 2) {
 					try {
-						Thread.create<void*>(update_contents, false);
-					} catch(GLib.ThreadError err) {
-						warning ("ERROR: Could not create search suggester thread: %s \n", err.message);
+						new Thread<void*>.try (null, update_contents);
+					} catch (Error err) {
+						warning ("Could not create search suggester thread: %s", err.message);
 					}
 				}
 				else if(new_search.length <= 2) {

=== modified file 'src/Widgets/StatusBar.vala'
--- src/Widgets/StatusBar.vala	2012-03-04 00:33:20 +0000
+++ src/Widgets/StatusBar.vala	2012-07-03 06:49:24 +0000
@@ -22,81 +22,16 @@
 
 using Gtk;
 
-public class BeatBox.StatusBar : Gtk.Toolbar {
+public class BeatBox.StatusBar : Granite.Widgets.StatusBar {
 
     public uint total_items {get; private set; default = 0;}
     public uint total_mbs {get; private set; default = 0;}
     public uint total_secs {get; private set; default = 0;}
     public ViewWrapper.Hint media_type {get; private set;}
 
-    private Label status_label;
-    private Box left_box;
-    private Box right_box;
-
-    private CssProvider style_provider;
-    private StyleContext context;
-
     private string STATUS_TEXT_FORMAT = _("%s, %s, %s");
 
-    private const string STATUSBAR_STYLESHEET = """
-        BeatBoxStatusBar {
-            border-bottom-width: 0;
-            border-right-width: 0;
-            border-left-width: 0;
-
-            -GtkWidget-window-dragging: false;
-        }
-
-        /* This prevents the huge vertical padding */
-        BeatBoxStatusBar .button {
-            padding: 0px;
-        }
-    """;
-
     public StatusBar () {
-
-        style_provider = new CssProvider ();
-
-        try {
-            style_provider.load_from_data (STATUSBAR_STYLESHEET, -1);
-        }
-        catch (Error err) {
-            warning (err.message);
-        }
-
-        /* Get rid of the "toolbar" class to avoid inheriting its style,
-           since we want the widget to look more like a normal statusbar. */
-        get_style_context ().remove_class (STYLE_CLASS_TOOLBAR);
-
-        context = new StyleContext ();
-        context.add_provider_for_screen (get_screen (), style_provider, STYLE_PROVIDER_PRIORITY_THEME);
-
-        status_label = new Label ("");
-        status_label.set_justify (Justification.CENTER);
-
-        left_box = new Box (Orientation.HORIZONTAL, 0);
-        right_box = new Box (Orientation.HORIZONTAL, 0);
-
-        var left_item = new ToolItem ();
-        var status_label_item = new ToolItem ();
-        var right_item = new ToolItem ();
-
-        left_item.add (left_box);
-        status_label_item.add (status_label);
-        right_item.add (right_box);
-
-        status_label_item.set_expand (true);
-
-        this.insert (left_item, 0);
-        this.insert (status_label_item, 1);
-        this.insert (right_item, 2);
-    }
-
-    public void insert_widget (Gtk.Widget widget, bool? use_left_side = false) {
-        if (use_left_side)
-            left_box.pack_start (widget, false, false, 3);
-        else
-            right_box.pack_start (widget, false, false, 3);
     }
 
     public void set_files_size (uint total_mbs) {

=== modified file 'src/Widgets/StyledWidgets/StyledArtistImages.vala'
--- src/Widgets/StyledWidgets/StyledArtistImages.vala	2012-07-02 23:17:27 +0000
+++ src/Widgets/StyledWidgets/StyledArtistImages.vala	2012-07-03 06:49:24 +0000
@@ -22,7 +22,6 @@
 
 using Gee;
 using Gtk;
-using Xml;
 
 public class BeatBox.StyledArtistImages : EventBox {
 	const string api = "YOFT4SZFVZLZZ1SVT";
@@ -118,13 +117,13 @@
 		images = new LinkedList<Gdk.Pixbuf>();
 		
 		try {
-			Thread.create<void*>(fetch_thread_function, false);
-		} catch(GLib.ThreadError err) {
-			warning("Could not create thread to load artist pixbuf's: %s \n", err.message);
+			new Thread<void*>.try (null, fetch_thread_function);
+		} catch(Error err) {
+			warning ("Could not create thread to load artist pixbuf's: %s", err.message);
 		}
 	}
 	
-	public void* fetch_thread_function () {
+	private void* fetch_thread_function () {
 		var url = "http://developer.echonest.com/api/v4/artist/images?api_key=" + api + "&name=" + 
 				  LastFM.Core.fix_for_url(current_artist) + "&format=xml&start=0&results=15";
 		
@@ -197,7 +196,7 @@
         // Loop over the passed node's children
         for (Xml.Node* iter = node->children; iter != null; iter = iter->next) {
             // Spaces between tags are also nodes, discard them
-            if (iter->type != ElementType.ELEMENT_NODE) {
+            if (iter->type != Xml.ElementType.ELEMENT_NODE) {
                 continue;
             }
 			

=== removed file 'src/Widgets/WarningLabel.vala'
--- src/Widgets/WarningLabel.vala	2012-03-29 08:46:09 +0000
+++ src/Widgets/WarningLabel.vala	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/*-
- * Copyright (c) 2011-2012       Scott Ringwelski <[e-mail]>
- *
- * Originally Written by Scott Ringwelski for BeatBox Music Player
- * BeatBox Music Player: http://www.launchpad.net/beat-box
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-using Gtk;
-
-public class BeatBox.WarningLabel : EventBox {
-
-	private Label errorLabel; // FIXME: Use Granite.Widgets.WrapLabel
-	private Image warningIcon;
-
-	public bool show_icon {
-		get {
-			return warningIcon.visible;
-		}
-		set {
-			warningIcon.set_no_show_all (!value);
-			warningIcon.set_visible (value);
-		}
-	}
-
-	public WarningLabel(string icon_name = "dialog-warning") {
-		errorLabel = new Label("");
-		warningIcon = Icons.render_image (icon_name, Gtk.IconSize.DIALOG);
-
-		//FIXME: use margins
-		var content = new Box (Orientation.HORIZONTAL, 10);
-		var content_wrapper = new Box (Orientation.HORIZONTAL, 0);
-		var outer_box = new Box (Orientation.VERTICAL, 0);
-		var top_padding = new Box (Orientation.VERTICAL, 0);
-		var bottom_padding = new Box (Orientation.VERTICAL, 0);
-		var left_padding = new Box (Orientation.HORIZONTAL, 0);
-		var right_padding = new Box (Orientation.HORIZONTAL, 0);
-
-		content.pack_start (wrap_alignment(warningIcon, 0, 10, 10, 10), false, false, 0);
-		content.pack_start (errorLabel, false, true, 0);
-
-		content_wrapper.pack_start (left_padding, true, true, 0);
-		content_wrapper.pack_start (content, false, true, 0);
-		content_wrapper.pack_start (right_padding, true, true, 0);
-
-		outer_box.pack_start (top_padding, true, true, 0);
-		outer_box.pack_start (content_wrapper, false, true, 10);
-		outer_box.pack_start (bottom_padding, true, true, 0);
-
-		add(outer_box);
-
-		// Add view-like theming
-		get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
-
-		errorLabel.xalign = 0.5f;
-		errorLabel.set_justify(Justification.CENTER);
-		errorLabel.ellipsize = Pango.EllipsizeMode.END;
-	}
-
-	static Gtk.Alignment wrap_alignment (Gtk.Widget widget, int top, int right, int bottom, int left) {
-
-		var alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f);
-		alignment.top_padding = top;
-		alignment.right_padding = right;
-		alignment.bottom_padding = bottom;
-		alignment.left_padding = left;
-
-		alignment.add(widget);
-		return alignment;
-	}
-
-	
-	// We force our HIG here. Whenever show_icon is true, the title has to be left-aligned.
-
-	// FIXME: this should be: set_warning (string primary_text, string secondary_text, bool show_icon = true, ...)
-	public void setWarning(string warning, Gtk.Justification? justification = Gtk.Justification.LEFT) {
-		if (!show_icon)
-			errorLabel.set_justify(Gtk.Justification.CENTER);
-		else
-			errorLabel.set_justify(justification);
-
-		errorLabel.set_markup(warning);
-	}
-}
-

=== modified file 'src/Windows/AddPodcastWindow.vala'
--- src/Windows/AddPodcastWindow.vala	2012-05-03 04:19:07 +0000
+++ src/Windows/AddPodcastWindow.vala	2012-07-03 06:49:24 +0000
@@ -173,10 +173,10 @@
 				next = url;
 				
 				try {
-					Thread.create<void*>(test_url_validity, false);
+					new Thread<void*>.try (null, test_url_validity);
 				}
-				catch(GLib.ThreadError err) {
-					stdout.printf("ERROR: Could not create thread to fetch new podcasts: %s \n", err.message);
+				catch (Error err) {
+					warning ("Could not create thread to fetch new podcasts: %s", err.message);
 				}
 			}
 		}

=== modified file 'src/Windows/RemoveDuplicatesDialog.vala'
--- src/Windows/RemoveDuplicatesDialog.vala	2012-06-14 23:08:24 +0000
+++ src/Windows/RemoveDuplicatesDialog.vala	2012-07-03 06:49:24 +0000
@@ -141,10 +141,10 @@
 		is_working.start();
 		
 		try {
-			Thread.create<void*>(find_duplicates_thread, false);
+			new Thread<void*>.try (null, find_duplicates_thread);
 		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to analyze duplicates: %s \n", err.message);
+		catch (Error err) {
+			warning ("Could not create thread to analyze duplicates: %s", err.message);
 		}
 	}
 	

=== modified file 'src/Wrappers/PodcastViewWrapper.vala'
--- src/Wrappers/PodcastViewWrapper.vala	2012-06-30 20:55:57 +0000
+++ src/Wrappers/PodcastViewWrapper.vala	2012-07-03 06:49:24 +0000
@@ -61,15 +61,15 @@
 	void welcome_screen_activated(int index) {
 		if(index == 0) {
 			try {
-				Thread.create<void*>(take_action, false);
+				new Thread<void*>.try (null, take_action);
 			}
-			catch(GLib.ThreadError err) {
-				stdout.printf("ERROR: Could not create thread to have fun: %s \n", err.message);
+			catch (Error err) {
+				warning ("Could not create thread to have fun: %s", err.message);
 			}
 		}
 	}
 	
-	public void* take_action () {
+	private void* take_action () {
 		try {
 			GLib.AppInfo.launch_default_for_uri ("https://www.miroguide.com/toprated/", null);
 		}

=== modified file 'src/Wrappers/StationViewWrapper.vala'
--- src/Wrappers/StationViewWrapper.vala	2012-06-30 20:55:57 +0000
+++ src/Wrappers/StationViewWrapper.vala	2012-07-03 06:49:24 +0000
@@ -61,10 +61,10 @@
 	void welcome_screen_activated(int index) {
 		if(index == 0) {
 			try {
-				Thread.create<void*>(take_action, false);
+				new Thread<void*>.try (null, take_action);
 			}
-			catch(GLib.ThreadError err) {
-				stdout.printf("ERROR: Could not create thread to have fun: %s \n", err.message);
+			catch(Error err) {
+				warning ("Could not create thread to have fun: %s", err.message);
 			}
 		}
 	}

=== modified file 'src/Wrappers/ViewWrapper.vala'
--- src/Wrappers/ViewWrapper.vala	2012-06-30 20:55:57 +0000
+++ src/Wrappers/ViewWrapper.vala	2012-07-03 06:49:24 +0000
@@ -177,8 +177,6 @@
 		_artist_filter = "";
 		_genre_filter = "";
 		
-		in_update = new Mutex();
-		
 		set_orientation(Orientation.VERTICAL);
 		
 		// Setup container