Merge lp:~victored/noise/fixes into lp:~elementary-apps/noise/trunk

[Victor Martinez]

Fixes lots of small bugs. Most notably, it introduces the following:
1) Smart column autosizer
2) Column-spacing fixes
3) Improved search
4) Small fixes on Last.fm plugin
5) Statusbar re-write

[Victor Martinez (victored)]

review: Approve

[lp:~victored/noise/fixes]

947. By Victor Martinez on 2012-08-20

Merge fixes branch

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-08-12 18:38:20 +0000
+++ CMakeLists.txt	2012-08-20 04:39:20 +0000
@@ -1,9 +1,9 @@
 # check http://elementaryos.org/docs/developer-guide/cmake/simple-project
 
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
 cmake_policy(VERSION 2.6)
 project(noise)
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 find_package(PkgConfig)
 pkg_check_modules(DEPS
@@ -19,7 +19,7 @@
     taglib_c #TODO: remove
     gio-2.0
     libxml-2.0
-    libnotify
+    libnotify # TODO: should be a soft dependency
     libsoup-2.4
     json-glib-1.0
     gio-unix-2.0
@@ -32,19 +32,19 @@
 if(${SQLHEAVY2_FOUND})
     set(ADD_PKG ${ADD_PKG} sqlheavy-0.2)
     message("-- Will use sqlheavy-0.2")
-    set (SQLHEAVY_CFLAGS ${SQLHEAVY2_CFLAGS})
-    set (SQLHEAVY_LIBRARY_DIRS ${SQLHEAVY2_LIBRARY_DIRS})
-    set (SQLHEAVY_LIBRARIES ${SQLHEAVY2_LIBRARIES})
+    set(SQLHEAVY_CFLAGS ${SQLHEAVY2_CFLAGS})
+    set(SQLHEAVY_LIBRARY_DIRS ${SQLHEAVY2_LIBRARY_DIRS})
+    set(SQLHEAVY_LIBRARIES ${SQLHEAVY2_LIBRARIES})
 else()
-    pkg_check_modules (SQLHEAVY REQUIRED sqlheavy-0.1)
+    pkg_check_modules(SQLHEAVY REQUIRED sqlheavy-0.1)
     set(ADD_PKG ${ADD_PKG} sqlheavy-0.1)
     message("-- Will use sqlheavy-0.1")
 endif()
 
 
-set (NORMAL_CFLAGS ${DEPS_CFLAGS} ${SQLHEAVY_CFLAGS})
-set (NORMAL_LIBRARIES ${DEPS_LIBRARIES} ${SQLHEAVY_LIBRARIES})
-set (NORMAL_LINK_DIRS ${DEPS_LIBRARY_DIRS} ${SQLHEAVY_LIBRARY_DIRS})
+set(NORMAL_CFLAGS ${DEPS_CFLAGS} ${SQLHEAVY_CFLAGS})
+set(NORMAL_LIBRARIES ${DEPS_LIBRARIES} ${SQLHEAVY_LIBRARIES})
+set(NORMAL_LINK_DIRS ${DEPS_LIBRARY_DIRS} ${SQLHEAVY_LIBRARY_DIRS})
 
 
 find_package(Vala REQUIRED)
@@ -55,7 +55,7 @@
 set(DATADIR "${CMAKE_INSTALL_PREFIX}/share")
 set(PKG_DATADIR "${CMAKE_INSTALL_PREFIX}/share/noise")
 set(GETTEXT_PACKAGE "noise")
-set(RELEASE_NAME "Luna")
+set(RELEASE_NAME "Luna-Beta-1")
 set(VERSION "1.0")
 set(VERSION_INFO "Pre-Release")
 set(PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/lib/noise/plugins")
@@ -63,19 +63,17 @@
 configure_file(${CMAKE_SOURCE_DIR}/src/config.vala.cmake ${CMAKE_SOURCE_DIR}/src/config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
 
-add_subdirectory(vapi)
 add_subdirectory(core)
 add_subdirectory(src)
 add_subdirectory(data)
 add_subdirectory(schemas)
+add_subdirectory(po)
+add_subdirectory(images)
 
-option (BUILD_PLUGINS "Whether to build plugins or not." ON)
-if (BUILD_PLUGINS)
+option(BUILD_PLUGINS "Whether to build plugins or not." ON)
+if(BUILD_PLUGINS)
     message("-- Plugins will be built")
     add_subdirectory(plugins)
 else()
     message("-- Plugins will NOT be built")
-endif ()
-
-add_subdirectory(po)
-add_subdirectory(images)
+endif()

=== modified file 'core/Player.vala'
--- core/Player.vala	2012-08-12 00:28:56 +0000
+++ core/Player.vala	2012-08-20 04:39:20 +0000
@@ -28,7 +28,7 @@
  * Authored by: Victor Eduardo <[e-mail]>
  */
 
-public interface Noise.Player {
+public interface Noise.Player : Object {
 
 	public enum Shuffle {
 		OFF,

=== modified file 'plugins/LastFM/AlbumInfo.vala'
--- plugins/LastFM/AlbumInfo.vala	2012-07-26 17:29:26 +0000
+++ plugins/LastFM/AlbumInfo.vala	2012-08-20 04:39:20 +0000
@@ -29,17 +29,15 @@
     
     private string url { get; set; default=""; }
     
-    private Gee.ArrayList<LastFM.Tag> _tags;
+    private Gee.ArrayList<LastFM.Tag> _tags = new Gee.ArrayList<LastFM.Tag>();
     
     private LastFM.Tag tagToAdd;
     
-    public LastFM.Image url_image;
+    public LastFM.Image url_image = new LastFM.Image();
     
     //public signal void album_info_retrieved(LastFM.AlbumInfo info);
     
     public AlbumInfo() {
-        _tags = new Gee.ArrayList<LastFM.Tag>();
-        url_image = new LastFM.Image();
     }
     
     public AlbumInfo.with_info(string artist, string album) {
@@ -131,7 +129,9 @@
                     if(iter->get_prop("size") == "large") {
                         url_image = new LastFM.Image.with_url(node_content, true);
                         url_image.set_size(500, 500);
-                        image_uri = this.get_image_uri_from_pixbuf(url_image.image);
+
+                        if (url_image.image != null)
+                            image_uri = this.get_image_uri_from_pixbuf(url_image.image);
                     }
                 }
             }

=== modified file 'plugins/LastFM/ArtistInfo.vala'
--- plugins/LastFM/ArtistInfo.vala	2012-07-26 17:29:26 +0000
+++ plugins/LastFM/ArtistInfo.vala	2012-08-20 04:39:20 +0000
@@ -30,10 +30,10 @@
     public string url;// last fm url
     public int streamable; // 1 = true
     
-    public LastFM.Image url_image;
+    public LastFM.Image url_image = new LastFM.Image();
     
-    public Gee.ArrayList<LastFM.Tag> tags;
-    public Gee.ArrayList<LastFM.ArtistInfo> similarArtists;
+    public Gee.ArrayList<LastFM.Tag> tags = new Gee.ArrayList<LastFM.Tag>();
+    public Gee.ArrayList<LastFM.ArtistInfo> similarArtists = new Gee.ArrayList<LastFM.ArtistInfo>();
     
     //public signal void artist_info_retrieved(LastFM.ArtistInfo info);
     
@@ -41,12 +41,10 @@
     ArtistInfo similarToAdd;
     Tag tagToAdd;
     
-    public ArtistInfo() {
-        tags = new Gee.ArrayList<LastFM.Tag>();
-        similarArtists = new Gee.ArrayList<LastFM.ArtistInfo>();
-        url_image = new LastFM.Image();
+    public ArtistInfo () {
+        // nothing to do
     }
-    
+
     public ArtistInfo.with_artist(string artist) {
         var artist_fixed = LastFM.Core.fix_for_url(artist);
         
@@ -125,7 +123,8 @@
                     if(iter->get_prop("size") == "extralarge") {
                         url_image = new LastFM.Image.with_url(node_content, true);
                         url_image.set_size(200, 300);
-                        image_uri = this.get_image_uri_from_pixbuf(url_image.image);
+                        if (url_image.image != null)
+                            image_uri = this.get_image_uri_from_pixbuf(url_image.image);
                     }
                 }
             }

=== modified file 'plugins/LastFM/CMakeLists.txt'
--- plugins/LastFM/CMakeLists.txt	2012-08-12 18:38:20 +0000
+++ plugins/LastFM/CMakeLists.txt	2012-08-20 04:39:20 +0000
@@ -1,6 +1,3 @@
-add_definitions(${NORMAL_CFLAGS})
-include_directories(${CMAKE_BINARY_DIR}/core ${CMAKE_BINARY_DIR}/src)
-link_directories(${NORMAL_LINK_DIRS})
 vala_precompile(VALA_C
         LastFM.vala
         Core.vala
@@ -41,8 +38,13 @@
         --vapidir=${CMAKE_BINARY_DIR}/core/
         --vapidir=${CMAKE_BINARY_DIR}/src/
     )
+
 add_library(lastfm MODULE ${VALA_C})
 
+add_definitions(${NORMAL_CFLAGS})
+include_directories(${CMAKE_BINARY_DIR}/core ${CMAKE_BINARY_DIR}/src)
+link_directories(${NORMAL_LINK_DIRS})
+
 target_link_libraries (lastfm ${NORMAL_LIBRARIES})
 install(TARGETS lastfm DESTINATION ${PLUGIN_DIR}/LastFM/)
 install(FILES lastfm.plugin DESTINATION ${PLUGIN_DIR}/LastFM/)

=== modified file 'plugins/LastFM/Core.vala'
--- plugins/LastFM/Core.vala	2012-08-12 14:25:41 +0000
+++ plugins/LastFM/Core.vala	2012-08-20 04:39:20 +0000
@@ -333,7 +333,8 @@
         
         void* track_thread_function () {
             var current_media = Noise.App.player.media_info.media;
-            return_val_if_fail (current_media != null, null);
+            if (current_media == null)
+                return null;
 
             string album_artist_s = current_media.album_artist;
             string track_s = current_media.title;
@@ -370,7 +371,8 @@
         void* album_thread_function () {
 
             var current_media = Noise.App.player.media_info.media;
-            return_val_if_fail (current_media != null, null);
+            if (current_media == null)
+                return null;
 
             string album_artist_s = current_media.album_artist;
             string album_s = current_media.album;
@@ -403,7 +405,7 @@
                 if (coverart_cache.has_image (current_media))
                     return null;
 
-                if (album.url_image.url != null) {
+                if (album.url_image != null && album.url_image.url != null) {
                     message ("Caching last.fm image from URL: %s", album.url_image.url);
 
                     fetch_info_guard.lock ();
@@ -431,7 +433,8 @@
         
         void* artist_thread_function () {
             var current_media = Noise.App.player.media_info.media;
-            return_val_if_fail (current_media != null, null);
+            if (current_media == null)
+                return null;
 
             string album_artist_s = current_media.album_artist;
             if (album_artist_s == "")

=== modified file 'plugins/LastFM/Icons.vala'
--- plugins/LastFM/Icons.vala	2012-08-12 18:38:20 +0000
+++ plugins/LastFM/Icons.vala	2012-08-20 04:39:20 +0000
@@ -29,7 +29,7 @@
  * A place to store icon information and pixbufs.
  */
 
-namespace Icons {
+namespace LastFM.Icons {
 
 	public Noise.Icon LASTFM_LOVE;
 	public Noise.Icon LASTFM_BAN;
@@ -37,7 +37,7 @@
 	/**
 	 * Loads icon information and renders [preloaded] pixbufs
 	 **/
-	public void init_lastfm () {
+	public void init () {
 		LASTFM_LOVE = new Noise.Icon ("lastfm-love", 16, Noise.Icon.Category.ACTION, null, true);
 		LASTFM_BAN = new Noise.Icon ("lastfm-ban", 16, Noise.Icon.Category.ACTION, null, true);
 	}

=== modified file 'plugins/LastFM/LastFM.vala'
--- plugins/LastFM/LastFM.vala	2012-08-12 21:18:02 +0000
+++ plugins/LastFM/LastFM.vala	2012-08-20 04:39:20 +0000
@@ -54,7 +54,7 @@
 
             plugins.register_function(Interface.Hook.WINDOW, () => {
                 lm = ((Noise.App)plugins.noise_app).library_manager;
-                Icons.init_lastfm ();
+                LastFM.Icons.init ();
                 
                 // Add Similar playlist.
                 core = new LastFM.Core (lm);

=== modified file 'plugins/LastFM/SimilarMediaWidget.vala'
--- plugins/LastFM/SimilarMediaWidget.vala	2012-08-12 14:25:41 +0000
+++ plugins/LastFM/SimilarMediaWidget.vala	2012-08-20 04:39:20 +0000
@@ -60,10 +60,10 @@
         });
         
         love_button = new Gtk.Button ();
-        love_button.set_image (Icons.LASTFM_LOVE.render_image (Gtk.IconSize.MENU));
+        love_button.set_image (LastFM.Icons.LASTFM_LOVE.render_image (Gtk.IconSize.MENU));
         love_button.halign = Gtk.Align.CENTER;
         ban_button = new Gtk.Button ();
-        ban_button.set_image (Icons.LASTFM_BAN.render_image (Gtk.IconSize.MENU));
+        ban_button.set_image (LastFM.Icons.LASTFM_BAN.render_image (Gtk.IconSize.MENU));
         ban_button.halign = Gtk.Align.CENTER;
         
         var buttons = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);

=== modified file 'plugins/LastFM/SimilarViewWrapper.vala'
--- plugins/LastFM/SimilarViewWrapper.vala	2012-08-12 14:25:41 +0000
+++ plugins/LastFM/SimilarViewWrapper.vala	2012-08-20 04:39:20 +0000
@@ -43,10 +43,11 @@
 
         list_view = new ListView (this, lw.library_manager.similar_setup);
         embedded_alert = new Granite.Widgets.EmbeddedAlert();
-        set_default_alert ();
 
         // Refresh view layout
         pack_views ();
+
+        set_default_alert ();
     }
 
     /**
@@ -124,8 +125,7 @@
 
         if (base_media != null) {
             /* say we could not find similar media */
-            embedded_alert.set_alert (_("No similar songs found"), _("%s could not find songs similar to %s by %s in your library. Make sure all song info is correct and you are connected to the Internet. Some songs may not have matches.").printf (String.escape (App.instance.get_name ()), "<b>" + String.escape (base_media.title) + "</b>", "<b>" + String.escape (base_media.artist) + "</b>"), null, true, Gtk.MessageType.INFO);
-            embedded_alert.working = false;
+            set_no_media_alert ();
         }
 
         /* Show the alert box */
@@ -134,12 +134,13 @@
         return false;
     }
 
-    private inline void set_default_alert () {
-        if (!has_embedded_alert)
-            return;
+    protected override void set_no_media_alert () {
+            embedded_alert.set_alert (_("No similar songs found"), _("%s could not find songs similar to %s by %s in your library. Make sure all song info is correct and you are connected to the Internet. Some songs may not have matches.").printf (String.escape (App.instance.get_name ()), "<b>" + String.escape (base_media.title) + "</b>", "<b>" + String.escape (base_media.artist) + "</b>"), null, true, Gtk.MessageType.INFO);
+            embedded_alert.working = false;
+    }
 
-        embedded_alert.set_alert (_("Similar Song View"), _("In this view, %s will automatically find songs similar to the one you're playing. You can then start playing those songs, or save them as a playlist for later.").printf (String.escape (App.instance.get_name ())), null, true, Gtk.MessageType.INFO);
+    private void set_default_alert () {
+embedded_alert.set_alert (_("Similar Song View"), _("In this view, %s will automatically find songs similar to the one you're playing. You can then start playing those songs, or save them as a playlist for later.").printf (String.escape (App.instance.get_name ())), null, true, Gtk.MessageType.INFO);
         embedded_alert.working = false;
     }
 }
-

=== modified file 'plugins/LastFM/TrackInfo.vala'
--- plugins/LastFM/TrackInfo.vala	2012-07-26 17:29:26 +0000
+++ plugins/LastFM/TrackInfo.vala	2012-08-20 04:39:20 +0000
@@ -31,13 +31,12 @@
 	public string url { get; set; default = ""; }
 	public int streamable { get; set; default = 0; }
 	
-	private Gee.ArrayList<LastFM.Tag> _tags;
+	private Gee.ArrayList<LastFM.Tag> _tags = new Gee.ArrayList<LastFM.Tag>();
 	private LastFM.Tag tagToAdd;
 	
 	//public signal void track_info_retrieved(LastFM.TrackInfo info);
 	
 	public TrackInfo.basic() {
-		_tags = new Gee.ArrayList<LastFM.Tag>();
 	}
 	
 	public TrackInfo.with_info(string artist, string track) {

=== modified file 'plugins/LastFM/schemas/CMakeLists.txt'
--- plugins/LastFM/schemas/CMakeLists.txt	2012-06-29 18:15:08 +0000
+++ plugins/LastFM/schemas/CMakeLists.txt	2012-08-20 04:39:20 +0000
@@ -1,2 +1,1 @@
-include(GSettings)
 add_schema("org.pantheon.noise.LastFM.gschema.xml")

=== modified file 'plugins/MPRIS/MPRIS.vala'
--- plugins/MPRIS/MPRIS.vala	2012-08-12 18:37:45 +0000
+++ plugins/MPRIS/MPRIS.vala	2012-08-20 04:39:20 +0000
@@ -309,20 +309,20 @@
     
     public bool Shuffle {
         get {
-            if(App.player.shuffle == Noise.Player.Shuffle.ALL)
+            if (App.player.shuffle == Noise.Player.Shuffle.ALL)
                 return true;
             return false;
         }
         set {
-            if(value) {
-                App.player.shuffle = Noise.Player.Shuffle.ALL;
+            if (value) {
+                App.player.setShuffleMode (Noise.Player.Shuffle.ALL, true);
             }
             else {
-                App.player.shuffle = Noise.Player.Shuffle.OFF;
+                App.player.setShuffleMode (Noise.Player.Shuffle.OFF, true);
             }
             
             Variant variant = value;
-            queue_property_for_notification("Shuffle", variant);
+            queue_property_for_notification ("Shuffle", variant);
         }
     }
     

=== removed directory 'plugins/internet-radio'
=== removed file 'plugins/internet-radio/RadioListView.vala'
--- plugins/internet-radio/RadioListView.vala	2012-08-12 00:01:08 +0000
+++ plugins/internet-radio/RadioListView.vala	1970-01-01 00:00:00 +0000
@@ -1,538 +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 Gee;
-using Gtk;
-
-public class Noise.RadioListView : GenericView {
-
-	//for header column chooser
-	Gtk.Menu columnChooserMenu;
-	CheckMenuItem columnRating;
-	CheckMenuItem columnStation;
-	CheckMenuItem columnGenre;
-
-	//for media list right click
-	Gtk.Menu mediaMenuActionMenu;
-	Gtk.MenuItem mediaEditMedia;
-	Gtk.MenuItem mediaRemove;
-	RatingWidgetMenu mediaRateMedia;
-
-	// for editing cells in-treeview
-	CellRendererPixbuf cellRating;
-	
-	public enum RadioColumn {
-		ROWID = 0,
-		ICON = 1,
-		STATION = 2,
-		GENRE = 3,
-		RATING = 4,
-		PULSER = 5
-	}
-
-	/**
-	 * for sort_id use 0+ for normal, -1 for auto, -2 for none
-	 */
-	// FIXME: Wrapper.Hint the_hint is no longer necessary
-	public RadioListView(LibraryManager lm, TreeViewSetup tvs, int rel_id) {
-		var types = new GLib.List<Type>();
-		types.append(typeof(int)); // id
-		types.append(typeof(GLib.Icon)); // icon
-		types.append(typeof(string)); // station
-		types.append(typeof(string)); // genre
-		types.append(typeof(int)); // rating
-		types.append(typeof(int)); // pulser
-		base(lm, types, tvs, rel_id);
-		
-		//last_search = "";
-		//timeout_search = new LinkedList<string>();
-		//showing_all = true;
-		//removing_medias = false;
-
-		buildUI();
-	}
-
-	public override void update_sensitivities() {
-		mediaRemove.set_sensitive(true);
-		mediaRemove.set_label(_("Remove Station"));
-	}
-
-	public void buildUI() {
-		cellRating = new CellRendererPixbuf();
-
-		cellRating.xalign = 0.0f;
-		
-		/* id is always first and is stored as an int. Then the rest are (1)
-		 * strings (for simplicity), and include:
-		 * #, track, title, artist, album, genre, comment, year, rating, (9)
-		 * bitrate, play count, last played, date added, file name, (5)
-		 * bpm, length, file size, (3) */
-		var to_use = new GLib.List<TreeViewColumn>();
-		var originalOrder = new GLib.List<TreeViewColumn>();
-		var correctStringOrder = new GLib.List<string>();
-		to_use = tvs.get_columns();
-
-		/* put them in the order for treemodel */
-		foreach(var tvc in to_use) {
-			originalOrder.append(tvc);
-			correctStringOrder.append(tvc.title);
-		}
-
-		int index = 0;
-		foreach(TreeViewColumn tvc in originalOrder) {
-			if(!(tvc.title == " " || tvc.title == "id")) {
-				if(tvc.title == "Rating")
-					insert_column_with_data_func(-1, tvc.title, cellRating, cellHelper.ratingTreeViewFiller);
-				else if(tvc.title == "Station")
-					insert_column_with_data_func(-1, tvc.title, new CellRendererText(), cellHelper.stringTreeViewFiller);
-				else if(tvc.title == "Genre")
-					insert_column_with_data_func(-1, tvc.title, new CellRendererText(), cellHelper.stringTreeViewFiller);
-				else {
-					insert_column(tvc, index);
-				}
-
-
-				get_column(index).resizable = true;
-				get_column(index).reorderable = false;
-				get_column(index).clickable = true;
-				get_column(index).sort_column_id = index;
-				get_column(index).set_sort_indicator(false);
-				get_column(index).visible = tvc.visible;
-				get_column(index).sizing = Gtk.TreeViewColumnSizing.FIXED;
-				get_column(index).fixed_width = tvc.fixed_width;
-			}
-			else if(tvc.title == " ") {
-				insert_column(tvc, index);
-
-				tvc.fixed_width = 24;
-				tvc.clickable = false;
-				tvc.sort_column_id = -1;
-				tvc.resizable = false;
-				tvc.reorderable = false;
-
-				tvc.clear_attributes (tvc.get_cells().nth_data(0));
-				tvc.clear_attributes (tvc.get_cells().nth_data(1));
-
-				tvc.set_cell_data_func(tvc.get_cells().nth_data(0), iconDataFunc);
-				tvc.set_cell_data_func(tvc.get_cells().nth_data(1), iconDataFunc);
-			}
-			else if(tvc.title == "id") {
-				insert_column(tvc, index);
-			}
-			else {
-				insert_column(tvc, index);
-			}
-
-			get_column(index).get_button().button_press_event.connect(viewHeaderClick);
-			get_column(index).notify["width"].connect(viewHeadersResized);
-
-			++index;
-		}
-		
-		set_compare_func(view_compare_func);
-        set_search_func(view_search_func);
-        set_value_func(view_value_func);
-
-		//rearrangeColumns(correctStringOrder);
-		//viewColumnsChanged();
-		
-		button_press_event.connect(viewClick);
-
-		//cursor_changed.connect_after(() => { update_rating_menu(); });
-		button_release_event.connect(viewClickRelease);
-		//columns_changed.connect(viewColumnsChanged);
-
-		// column chooser menu
-		columnChooserMenu = new Gtk.Menu();
-		columnStation = new CheckMenuItem.with_label("Station");
-		columnGenre = new CheckMenuItem.with_label("Genre");
-		columnRating = new CheckMenuItem.with_label("Rating");
-		updateColumnVisibilities();
-		columnChooserMenu.append(columnStation);
-		columnChooserMenu.append(columnGenre);
-		columnChooserMenu.append(columnRating);
-		columnStation.toggled.connect(columnMenuToggled);
-		columnGenre.toggled.connect(columnMenuToggled);
-		columnRating.toggled.connect(columnMenuToggled);
-		columnChooserMenu.show_all();
-
-
-		//media list right click menu
-		mediaMenuActionMenu = new Gtk.Menu();
-		mediaEditMedia = new Gtk.MenuItem.with_label("Edit Station");
-		mediaRemove = new Gtk.MenuItem.with_label("Remove Station");
-		mediaRateMedia = new RatingWidgetMenu();
-		mediaMenuActionMenu.append(mediaEditMedia);
-		mediaMenuActionMenu.append(mediaRateMedia);
-		mediaMenuActionMenu.append(new SeparatorMenuItem());
-		mediaMenuActionMenu.append(mediaRemove);
-		mediaEditMedia.activate.connect(mediaMenuEditClicked);
-		mediaRemove.activate.connect(mediaRemoveClicked);
-		mediaRateMedia.activate.connect(mediaRateMediaClicked);
-
-		update_sensitivities();
-		
-		// TODO: FIXME
-		//this.list_model.rows_reordered.connect(modelRowsReordered);
-		//this.list_model.sort_column_changed.connect(sortColumnChanged);
-	}
-	
-	public void rearrangeColumns(LinkedList<string> correctOrder) {
-		move_column_after(get_column(6), get_column(7));
-		//debug("correctOrder.length = %d, get_columns.length() = %d\n", correctOrder.size, (int)get_columns().length());
-		/* iterate through get_columns and if a column is not in the
-		 * same location as correctOrder, move it there.
-		*/
-		for(int index = 0; index < get_columns().length(); ++index) {
-			//debug("on index %d column %s originally moving to %d\n", index, get_column(index).title, correctOrder.index_of(get_column(index).title));
-			if(get_column(index).title != correctOrder.get(index)) {
-				move_column_after(get_column(index), get_column(correctOrder.index_of(get_column(index).title)));
-			}
-		}
-	}
-
-	public void cellTitleEdited(string path, string new_text) {
-		/*int rowid;
-		debug("done!\n");
-		if((rowid = list_model.getRowidFromPath(path)) != 0) {
-			lm.media_from_id(rowid).title = new_text;
-
-			lm.update_media(lm.media_from_id(rowid), true);
-		}
-		cellTitle.editable = false; */
-	}
-
-	public virtual void sortColumnChanged() {
-		updateTreeViewSetup();
-	}
-
-	public virtual void modelRowsReordered(TreePath path, TreeIter? iter, void* new_order) {
-		/*if(ViewWrapper.Hint == "queue") {
-			lm.clear_queue();
-
-			TreeIter item;
-			for(int i = 0; list_model.get_iter_from_string(out item, i.to_string()); ++i) {
-				int id;
-				list_model.get(item, 0, out id);
-
-				App.player.queue_media_by_id(id);
-			}
-		}*/
-		
-		// TODO: FIXME
-		//if(is_current_view) {
-		//	set_as_current_list(0, false);
-		//}
-
-		if(!scrolled_recently) {
-			scroll_to_current_media();
-		}
-	}
-
-	public virtual void viewColumnsChanged() {
-		updateTreeViewSetup();
-	}
-
-	public void updateColumnVisibilities() {
-		int index = 0;
-		foreach(TreeViewColumn tvc in get_columns()) {
-			if(tvc.title == "Station")
-				columnStation.active = get_column(index).visible;
-			else if(tvc.title == "Genre")
-				columnGenre.active = get_column(index).visible;
-			else if(tvc.title == "Rating")
-				columnRating.active = get_column(index).visible;
-
-			++index;
-		}
-	}
-	
-	/* button_press_event */
-	bool viewClick(Gdk.EventButton event) {
-		if(event.type == Gdk.EventType.BUTTON_PRESS && event.button == 3) { //right click
-			mediaMenuActionMenu.show_all();
-
-			int set_rating = -1;
-			TreeModel temp;
-			foreach(TreePath path in get_selection().get_selected_rows(out temp)) {
-				TreeIter item;
-				temp.get_iter(out item, path);
-
-				int id;
-				temp.get(item, 0, out id);
-
-				if(set_rating == -1)
-					set_rating = (int)lm.media_from_id(id).rating;
-				else if(set_rating != lm.media_from_id(id).rating) {
-					set_rating = 0;
-					break;
-				}
-			}
-
-			mediaRateMedia.rating_value = set_rating;
-			mediaMenuActionMenu.popup (null, null, null, 3, get_current_event_time());
-
-			TreeSelection selected = get_selection();
-			selected.set_mode(SelectionMode.MULTIPLE);
-			if(selected.count_selected_rows() > 1)
-				return true;
-			else
-				return false;
-		}
-		else if(event.type == Gdk.EventType.BUTTON_PRESS && event.button == 1) {
-			//TreeIter iter;
-			TreePath path;
-			TreeViewColumn column;
-			int cell_x;
-			int cell_y;
-
-			get_path_at_pos((int)event.x, (int)event.y, out path, out column, out cell_x, out cell_y);
-
-			//if(!list_model.get_iter(out iter, path))
-			//	return false;
-
-			/* don't unselect everything if multiple selected until button release
-			 * for drag and drop reasons */
-			if(get_selection().count_selected_rows() > 1) {
-				if(get_selection().path_is_selected(path)) {
-					if(((event.state & Gdk.ModifierType.SHIFT_MASK) == Gdk.ModifierType.SHIFT_MASK)|
-						((event.state & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK)) {
-							get_selection().unselect_path(path);
-					}
-					return true;
-				}
-				else if(!(((event.state & Gdk.ModifierType.SHIFT_MASK) == Gdk.ModifierType.SHIFT_MASK)|
-				((event.state & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK))) {
-					return true;
-				}
-
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/* button_release_event */
-	private bool viewClickRelease(Gtk.Widget sender, Gdk.EventButton event) {
-		/* if we were dragging, then set dragging to false */
-		if(dragging && event.button == 1) {
-			dragging = false;
-			return true;
-		}
-		else if(((event.state & Gdk.ModifierType.SHIFT_MASK) == Gdk.ModifierType.SHIFT_MASK) | ((event.state & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK)) {
-			return true;
-		}
-		else {
-			TreePath path;
-			TreeViewColumn tvc;
-			int cell_x;
-			int cell_y;
-			int x = (int)event.x;
-			int y = (int)event.y;
-
-			if(!(get_path_at_pos(x, y, out path, out tvc, out cell_x, out cell_y))) return false;
-			get_selection().unselect_all();
-			get_selection().select_path(path);
-			return false;
-		}
-	}
-
-	private bool viewHeaderClick(Gtk.Widget w, Gdk.EventButton e) {
-		if(e.button == 3) {
-			columnChooserMenu.popup (null, null, null, 3, get_current_event_time());
-			return true;
-		}
-		else if(e.button == 1) {
-			updateTreeViewSetup();
-
-			return false;
-		}
-
-		return false;
-	}
-
-	void viewHeadersResized() {
-		updateTreeViewSetup();
-	}
-
-	void updateTreeViewSetup() {
-		if(tvs == null || !visible || get_columns().length() != TreeViewSetup.RADIO_COLUMN_COUNT)
-			return;
-
-		int sort_id = RadioColumn.STATION;
-		SortType sort_dir = Gtk.SortType.ASCENDING;
-		get_sort_column_id(out sort_id, out sort_dir);
-
-		if(sort_id <= 0)
-			sort_id = RadioColumn.STATION;
-		
-		tvs.set_columns(get_columns());
-		tvs.sort_column_id = sort_id;
-		tvs.sort_direction = sort_dir;
-	}
-
-	/** When the column chooser popup menu has a change/toggle **/
-	public virtual void columnMenuToggled() {
-		int index = 0;
-		foreach(TreeViewColumn tvc in get_columns()) {
-			if(tvc.title == "Station")
-				get_column(index).visible = columnStation.active;
-			else if(tvc.title == "Genre")
-				get_column(index).visible = columnGenre.active;
-			else if(tvc.title == "Rating")
-				get_column(index).visible = columnRating.active;
-
-			++index;
-		}
-
-		lm.station_setup.set_columns(get_columns());
-	}
-
-	/** media menu popup clicks **/
-	public virtual void mediaMenuEditClicked() {
-		var to_edit = new LinkedList<int>();
-		
-		foreach(Media m in get_selected_medias()) {
-			to_edit.add(m.rowid);
-		}
-
-		/*if(!GLib.File.new_for_path(media_from_id(id).file).query_exists() && media_from_id(id).file.contains(settings.getMusicFolder())) {
-			media_from_id(id).unique_status_image = Icons.process_error_icon;
-			lw.media_not_found(id);
-		}
-		else {*/
-			var list = new LinkedList<int>();
-			for(int i = 0; i < get_visible_table().size(); ++i) {
-				list.add(get_media_from_index(i).rowid);
-			}
-			StationEditor se = new StationEditor(lm, list, to_edit);
-			se.stations_saved.connect(stationEditorSaved);
-		//}
-	}
-	
-	void mediaRateMediaClicked() {
-		var los = new LinkedList<Media>();
-		int new_rating = mediaRateMedia.rating_value;
-		
-		foreach(Media m in get_selected_medias()) {
-			m.rating = new_rating;
-			los.add(m);
-		}
-
-		lm.update_medias(los, false, true);
-	}
-
-	public virtual void stationEditorSaved(LinkedList<int> medias) {
-		LinkedList<Media> toUpdate = new LinkedList<Media>();
-		foreach(int i in medias)
-			toUpdate.add(lm.media_from_id(i));
-
-		// user could have edited rating, so record time
-		lm.update_medias(toUpdate, true, true);
-	}
-
-	public virtual void mediaRemoveClicked() {
-		LinkedList<Media> toRemove = new LinkedList<Media>();
-		LinkedList<int> toRemoveIDs = new LinkedList<int>();
-
-		foreach(Media m in get_selected_medias()) {
-			toRemoveIDs.add(m.rowid);
-
-			if(get_hint() == ViewWrapper.Hint.STATION) {
-				toRemove.add(m);
-			}
-		}
-
-		if(get_hint() == ViewWrapper.Hint.STATION) {
-			var dialog = new RemoveFilesDialog (lm.lw, toRemove, get_hint());
-			dialog.remove_media.connect ( (delete_files) => {
-				lm.remove_medias (toRemove, delete_files);
-			});
-		}
-	}
-	
-	int view_compare_func (int col, Gtk.SortType dir, Media a_media, Media b_media) {
-		int rv = 0;
-		
-		if(sort_column_id == RadioColumn.STATION) { // station
-			if(a_media.album_artist.down() == b_media.album_artist.down()) {
-				rv = advanced_string_compare(b_media.uri, a_media.uri);
-			}
-			else
-				rv = advanced_string_compare(a_media.album_artist.down(), b_media.album_artist.down());
-		}
-		else if(sort_column_id == RadioColumn.GENRE) { // genre
-			if(a_media.genre.down() == b_media.genre.down()) {
-				if(a_media.album_artist.down() == b_media.album_artist.down()) {
-					rv = advanced_string_compare(b_media.uri, a_media.uri);
-				}
-				else {
-					rv = advanced_string_compare(a_media.album_artist.down(), b_media.album_artist.down());
-				}
-			}
-			else
-				rv = advanced_string_compare(a_media.genre.down(), b_media.genre.down());
-		}
-		
-		else if(sort_column_id == RadioColumn.RATING) { // rating
-			rv = (int)(a_media.rating - b_media.rating);
-		}
-		else {
-			rv = 0;
-		}
-		
-		if(rv == 0 && col != RadioColumn.STATION && col != RadioColumn.GENRE)
-			rv = advanced_string_compare(a_media.uri, b_media.uri);
-		
-		if(sort_direction == SortType.DESCENDING)
-			rv = (rv > 0) ? -1 : 1;
-		
-		return rv;
-	}
-	
-	Value view_value_func (int row, int column, Media s) {
-		Value val;
-		
-		if(column == 0)
-			val = (int)s.rowid;
-		else if(column == 1) {
-			if(App.player.media_info.media != null && App.player.media_info.media.rowid == s.rowid)
-				val = playing_icon;
-			else if(s.unique_status_image != null)
-				val = s.unique_status_image;
-			else
-				val = Value(typeof(GLib.Icon));
-		}
-		else if(column == 2)
-			val = s.album_artist;
-		else if(column == 3)
-			val = s.genre;
-		else if(column == 4)
-			val = (int)s.rating;
-		else// if(column == 5)
-			val = (int)s.pulseProgress;
-		
-		return val;
-	}
-}
-

=== removed file 'plugins/internet-radio/StationEditor.vala'
--- plugins/internet-radio/StationEditor.vala	2012-07-26 17:29:26 +0000
+++ plugins/internet-radio/StationEditor.vala	1970-01-01 00:00:00 +0000
@@ -1,234 +0,0 @@
-/*-
- * Copyright (c) 2011-2012       Scott Ringwelski <[e-mail]>
- *
- * Originaly 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;
-using Gee;
-using Granite;
-
-public class Noise.StationEditor : Window {
-	LibraryManager _lm;
-	
-	LinkedList<int> _allstations;
-	LinkedList<int> _stations;
-	
-	//for padding around notebook mostly
-	private VBox content;
-	private HBox padding;
-	
-	private VBox vert; // separates editors with buttons and other stuff
-	private HBox horiz; // separates text with numerical editors
-	private VBox textVert; // separates text editors
-	private VBox numerVert; // separates numerical editors
-	
-	private HashMap<string, FieldEditor> fields;// a hashmap with each property and corresponding editor
-	
-	private Button _previous;
-	private Button _next;
-	private Button _save;
-	
-	public signal void stations_saved(LinkedList<int> stations);
-	
-	public StationEditor(LibraryManager lm, LinkedList<int> allstations, LinkedList<int> stations) {
-		this.window_position = WindowPosition.CENTER;
-		this.type_hint = Gdk.WindowTypeHint.DIALOG;
-		this.set_modal(true);
-		this.set_transient_for(lm.lw);
-		this.destroy_with_parent = true;
-		content = new VBox(false, 10);
-		
-		set_size_request (520, -1);
-		resizable = false;
-		
-		_lm = lm;
-		
-		_allstations = allstations;
-		_stations = stations;
-		
-		HButtonBox buttonSep = new HButtonBox();
-		buttonSep.set_layout(ButtonBoxStyle.END);
-		_previous = new Button.with_label(_("Previous"));
-		_next = new Button.with_label(_("Next"));
-		_save = new Button.with_label(_("Done"));
-		
-		buttonSep.pack_start(_previous, false, false, 0);
-		buttonSep.pack_start(_next, false, false, 0);
-		buttonSep.pack_end(_save, false, false, 0);
-		
-		content.pack_start(wrap_alignment(createBasicViewport(), 10, 0, 0, 0), true, true, 0);
-		content.pack_start(wrap_alignment(buttonSep, 0, 0, 10, 0), false, true, 0);
-		
-		(buttonSep as Gtk.ButtonBox).set_child_secondary(_next, true);
-		(buttonSep as Gtk.ButtonBox).set_child_secondary(_previous, true);
-		
-		padding.pack_start(content, true, true, 10);
-		add(padding);
-		
-		show_all();
-		
-		_next.sensitive = allstations.size > 1;
-		_previous.sensitive = allstations.size > 1;
-		
-		if(_stations.size == 1) {
-			foreach(FieldEditor fe in fields.values)
-				fe.set_check_visible(false);
-		}
-		
-		_previous.clicked.connect(previousClicked);
-		_next.clicked.connect(nextClicked);
-		_save.clicked.connect(saveClicked);
-	}
-	
-	public Viewport createBasicViewport() {
-		Viewport rv = new Viewport(null, null);
-		fields = new HashMap<string, FieldEditor>();
-		Media sum = _lm.media_from_id(_stations.get(0)).copy();
-		
-		/** find what these stations have what common, and keep those values **/
-		foreach(int i in _stations) {
-			Media s = _lm.media_from_id(i);
-			
-			if(s.album_artist != sum.album_artist) // station name
-				sum.album_artist = "";
-			if(s.genre != sum.genre) // category
-				sum.genre = "";
-			if(s.rating != sum.rating)
-				sum.rating = 0;
-		}
-		
-		if(_stations.size == 1) {
-			title = "Editing " + sum.title;
-		}
-		else {
-			title = "Editing " + _stations.size.to_string() + " stations";
-		}
-		
-		if(sum.year == -1)
-			sum.year = Time().year;
-		
-		fields.set("Station", new FieldEditor("Station", sum.album_artist, new Entry()));
-		fields.set("Genre", new FieldEditor("Genre", sum.genre, new Entry()));
-		fields.set("Rating", new FieldEditor("Rating", sum.rating.to_string(), new RatingWidget(null, false, IconSize.MENU)));
-		
-		padding = new HBox(false, 10);
-		vert = new VBox(false, 0);
-		horiz = new HBox(false, 0);
-		textVert = new VBox(false, 0);
-		numerVert = new VBox(false, 0);
-		
-		textVert.pack_start(fields.get("Station"), false, true, 0);
-		textVert.pack_start(fields.get("Genre"), false, true, 5);
-		numerVert.pack_start(fields.get("Rating"), false, true, 5);
-		
-		horiz.pack_start(wrap_alignment(textVert, 0, 30, 0, 0), false, true, 0);
-		horiz.pack_end(numerVert, false, true, 0);
-		vert.pack_start(horiz, true, true, 0);
-		
-		rv.add(vert);
-		
-		return rv;
-	}
-	
-	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;
-		alignment.right_padding = right;
-		alignment.bottom_padding = bottom;
-		alignment.left_padding = left;
-		
-		alignment.add(widget);
-		return alignment;
-	}
-	
-	public void previousClicked() {
-		save_stations();
-		
-		// now fetch the next media on current_view
-		int i = 0; // will hold next media to edit
-		int indexOfCurrentFirst = _allstations.index_of(_stations.get(0));
-		
-		if(indexOfCurrentFirst == 0)
-			i = _allstations.get(_allstations.size - 1);
-		else
-			i = _allstations.get(indexOfCurrentFirst - 1);
-		
-		// now fetch the previous media on current_view
-		var newstations = new LinkedList<int>();
-		newstations.add(i);
-		
-		change_media(newstations);
-	}
-	
-	public void nextClicked() {
-		save_stations();
-		
-		// now fetch the next media on current_view
-		int i = 0; // will hold next media to edit
-		int indexOfCurrentLast = _allstations.index_of(_stations.get(_stations.size - 1));
-		
-		if(indexOfCurrentLast == _allstations.size - 1)
-			i = _allstations.get(0);
-		else
-			i = _allstations.get(indexOfCurrentLast + 1);
-		
-		var newstations = new LinkedList<int>();
-		newstations.add(i);
-		
-		change_media(newstations);
-	}
-	
-	public void change_media(LinkedList<int> newstations) {
-		_stations = newstations;
-		
-		Media sum = _lm.media_from_id(newstations.get(0));
-		
-		title = "Editing " + sum.title;
-		
-		/* do not show check boxes for 1 media */
-		foreach(FieldEditor fe in fields.values)
-			fe.set_check_visible(false);
-		
-		fields.get("Station").set_value(sum.album_artist);
-		fields.get("Genre").set_value(sum.genre);
-		fields.get("Rating").set_value(sum.rating.to_string());
-	}
-	
-	public void save_stations() {
-		foreach(int i in _stations) {
-			Media s = _lm.media_from_id(i);
-			
-			if(fields.get("Station").checked())
-				s.album_artist = fields.get("Station").get_value();
-			if(fields.get("Genre").checked())
-				s.genre = fields.get("Genre").get_value();
-			if(fields.get("Rating").checked())
-				s.rating = int.parse(fields.get("Rating").get_value());
-		}
-		
-		stations_saved(_stations);
-	}
-	
-	public virtual void saveClicked() {
-		save_stations();
-		
-		this.destroy();
-	}
-}

=== removed file 'plugins/internet-radio/internet-radio.svg'
--- plugins/internet-radio/internet-radio.svg	2012-04-29 17:43:40 +0000
+++ plugins/internet-radio/internet-radio.svg	1970-01-01 00:00:00 +0000
@@ -1,531 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="16"
-   height="16"
-   id="svg3809">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3811">
-    <linearGradient
-       id="linearGradient4231">
-      <stop
-         id="stop4233"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4235"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.8466807" />
-      <stop
-         id="stop4237"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.95056331" />
-      <stop
-         id="stop4239"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4162">
-      <stop
-         id="stop4164"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4166"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.35269147" />
-      <stop
-         id="stop4168"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.70588225" />
-      <stop
-         id="stop4170"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3707-319-631-407-324-3">
-      <stop
-         id="stop3760-4"
-         style="stop-color:#185f9a;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop3762-0"
-         style="stop-color:#599ec9;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8">
-      <stop
-         id="stop3750-1"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3"
-         style="stop-color:#55c1ec;stop-opacity:0.80869567"
-         offset="0.26238" />
-      <stop
-         id="stop3754-1"
-         style="stop-color:#3689e6;stop-opacity:0"
-         offset="0.704952" />
-      <stop
-         id="stop3756-1"
-         style="stop-color:#2b63a0;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="23.999994"
-       y1="-40.750011"
-       x2="23.999994"
-       y2="-3.7500136"
-       id="linearGradient3089-3"
-       xlink:href="#linearGradient4162"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02027027,0,0,0.03603604,7.5135135,5.8018037)" />
-    <radialGradient
-       cx="9.7701225"
-       cy="-17.190559"
-       r="19.99999"
-       fx="9.7701225"
-       fy="-17.190559"
-       id="radialGradient4193"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,-1.123739,-0.89158642,0,-6.7805729,27.838353)" />
-    <linearGradient
-       x1="84.111214"
-       y1="22.033323"
-       x2="84.111214"
-       y2="13.740201"
-       id="linearGradient4195"
-       xlink:href="#linearGradient3707-319-631-407-324-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2500003,0,0,-1.666667,-98.525429,36.805091)" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-9">
-      <stop
-         id="stop3750-1-5"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-3"
-         style="stop-color:#55c1ec;stop-opacity:0.80869567"
-         offset="0.26238" />
-      <stop
-         id="stop3754-1-5"
-         style="stop-color:#3689e6;stop-opacity:0"
-         offset="0.704952" />
-      <stop
-         id="stop3756-1-1"
-         style="stop-color:#2b63a0;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3707-319-631-407-324-3-0">
-      <stop
-         id="stop3760-4-0"
-         style="stop-color:#185f9a;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop3762-0-7"
-         style="stop-color:#599ec9;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="9.7701225"
-       cy="-17.190559"
-       r="19.99999"
-       fx="9.7701225"
-       fy="-17.190559"
-       id="radialGradient4249"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,-0.82407529,-0.65383004,0,-2.8390868,22.014793)" />
-    <linearGradient
-       x1="84.111214"
-       y1="22.033323"
-       x2="84.111214"
-       y2="13.740201"
-       id="linearGradient4251"
-       xlink:href="#linearGradient3707-319-631-407-324-3-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91666688,0,0,-1.2222225,-70.118648,28.590401)" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-9-5">
-      <stop
-         id="stop3750-1-5-0"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-3-5"
-         style="stop-color:#55c1ec;stop-opacity:0.80869567"
-         offset="0.26238" />
-      <stop
-         id="stop3754-1-5-6"
-         style="stop-color:#3689e6;stop-opacity:0"
-         offset="0.704952" />
-      <stop
-         id="stop3756-1-1-6"
-         style="stop-color:#2b63a0;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3707-319-631-407-324-3-0-3">
-      <stop
-         id="stop3760-4-0-4"
-         style="stop-color:#185f9a;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop3762-0-7-0"
-         style="stop-color:#599ec9;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="9.7701225"
-       cy="-17.190559"
-       r="19.99999"
-       fx="9.7701225"
-       fy="-17.190559"
-       id="radialGradient4305"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-9-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,-0.52441155,-0.41607367,0,1.1023993,16.191232)" />
-    <linearGradient
-       x1="84.111214"
-       y1="22.033323"
-       x2="84.111214"
-       y2="13.740201"
-       id="linearGradient4307"
-       xlink:href="#linearGradient3707-319-631-407-324-3-0-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.58333347,0,0,-0.77777795,-41.711867,20.37571)" />
-    <linearGradient
-       id="linearGradient3931-6-3-15-683-629-8">
-      <stop
-         id="stop2888-1"
-         style="stop-color:#919191;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2890-0"
-         style="stop-color:#888888;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471"
-       id="linearGradient3081-4"
-       xlink:href="#linearGradient3931-6-3-15-683-629-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23082236,0,0,0.27045521,19.621987,-0.2579439)" />
-    <linearGradient
-       id="linearGradient3600-4-1-803-305-215-5">
-      <stop
-         id="stop2882-9"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2884-8"
-         style="stop-color:#b1b1b1;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="25.132275"
-       y1="6.7287393"
-       x2="25.132275"
-       y2="47.013336"
-       id="linearGradient3079-1"
-       xlink:href="#linearGradient3600-4-1-803-305-215-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28584924,0,0,0.28899394,2.6396177,0.0641343)" />
-    <linearGradient
-       id="linearGradient3977-3">
-      <stop
-         id="stop3979-0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3981-7"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.03626217" />
-      <stop
-         id="stop3983-8"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.95056331" />
-      <stop
-         id="stop3985-6"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="23.99999"
-       y1="5.5641499"
-       x2="23.99999"
-       y2="43"
-       id="linearGradient3988-4"
-       xlink:href="#linearGradient3977-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21621621,0,0,0.29729728,4.3108109,-0.1351315)" />
-    <linearGradient
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471"
-       id="linearGradient3808"
-       xlink:href="#linearGradient3104-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23071463,0,0,0.26435017,16.617263,1.4725544)" />
-    <linearGradient
-       x1="25.132275"
-       y1="0.98520643"
-       x2="25.132275"
-       y2="47.013336"
-       id="linearGradient3806"
-       xlink:href="#linearGradient3600-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28571584,0,0,0.28247035,-0.35718085,1.7873623)" />
-    <linearGradient
-       id="linearGradient3104-6">
-      <stop
-         id="stop3106-5"
-         style="stop-color:#8c8c8c;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108-4"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3600-1">
-      <stop
-         id="stop3602-7"
-         style="stop-color:#f4f4f4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3604-5"
-         style="stop-color:#dbdbdb;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3977-1">
-      <stop
-         id="stop3979-3"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3981-0"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.03626217" />
-      <stop
-         id="stop3983-3"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.95056331" />
-      <stop
-         id="stop3985-2"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="23.99999"
-       y1="5.5641499"
-       x2="23.99999"
-       y2="43"
-       id="linearGradient3988"
-       xlink:href="#linearGradient3977-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21621621,0,0,0.29729728,1.3108109,1.8648685)" />
-    <linearGradient
-       x1="23.99999"
-       y1="5.5641499"
-       x2="23.99999"
-       y2="43"
-       id="linearGradient4023"
-       xlink:href="#linearGradient3977-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21621621,0,0,0.20516506,2.1393985,5.830804)" />
-    <linearGradient
-       x1="25.132275"
-       y1="0.98520643"
-       x2="25.132275"
-       y2="47.013336"
-       id="linearGradient4026"
-       xlink:href="#linearGradient3600-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28571584,0,0,0.21755835,1.8414731,5.0379325)" />
-    <linearGradient
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471"
-       id="linearGradient4028"
-       xlink:href="#linearGradient3104-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23071463,0,0,0.2036022,18.815917,4.7954678)" />
-    <linearGradient
-       x1="23.99999"
-       y1="5.5641499"
-       x2="23.99999"
-       y2="43"
-       id="linearGradient4031"
-       xlink:href="#linearGradient3977-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21621621,0,0,0.29729728,-14.345113,1.7452225)" />
-    <linearGradient
-       x1="25.132275"
-       y1="6.7287393"
-       x2="25.132275"
-       y2="47.013336"
-       id="linearGradient4034"
-       xlink:href="#linearGradient3600-4-1-803-305-215-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28584924,0,0,0.28899394,-16.016306,1.9444883)" />
-    <linearGradient
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471"
-       id="linearGradient4036"
-       xlink:href="#linearGradient3931-6-3-15-683-629-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23082236,0,0,0.27045521,0.966063,1.6224101)" />
-    <linearGradient
-       x1="25.132275"
-       y1="0.98520643"
-       x2="25.132275"
-       y2="48.333687"
-       id="linearGradient4026-7"
-       xlink:href="#linearGradient3600-1-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28571584,0,0,0.21755835,1.8414731,5.0379325)" />
-    <linearGradient
-       id="linearGradient3600-1-3">
-      <stop
-         id="stop3602-7-6"
-         style="stop-color:#f4f4f4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3604-5-4"
-         style="stop-color:#dbdbdb;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-51.786404"
-       y1="53.043812"
-       x2="-51.786404"
-       y2="2.9062471"
-       id="linearGradient4028-7"
-       xlink:href="#linearGradient3104-6-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23071463,0,0,0.2036022,18.815917,4.7954678)" />
-    <linearGradient
-       id="linearGradient3104-6-9">
-      <stop
-         id="stop3106-5-7"
-         style="stop-color:#8c8c8c;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108-4-2"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3600-1-3-5">
-      <stop
-         id="stop3602-7-6-6"
-         style="stop-color:#f4f4f4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3604-5-4-8"
-         style="stop-color:#dbdbdb;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3104-6-9-8">
-      <stop
-         id="stop3106-5-7-8"
-         style="stop-color:#8c8c8c;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108-4-2-3"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="25.132275"
-       y1="0.98520643"
-       x2="25.132275"
-       y2="48.333687"
-       id="linearGradient4155"
-       xlink:href="#linearGradient3600-1-3-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28571584,0,0,0.21755835,1.8414731,5.0379324)" />
-    <linearGradient
-       x1="-51.786404"
-       y1="53.043812"
-       x2="-51.786404"
-       y2="2.9062471"
-       id="linearGradient4157"
-       xlink:href="#linearGradient3104-6-9-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23071463,0,0,0.2036022,18.815917,4.7954677)" />
-    <linearGradient
-       x1="23.99999"
-       y1="5.5641499"
-       x2="23.99999"
-       y2="45.273682"
-       id="linearGradient4023-1"
-       xlink:href="#linearGradient4231"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21621621,0,0,0.20516506,2.1393985,5.830804)" />
-  </defs>
-  <path
-     d="m 15.5,6.0000003 a 7.5,7.4999998 0 1 0 -15,0 7.5,7.4999998 0 0 0 15,0 z"
-     id="path3211-9"
-     style="opacity:0.8;color:#000000;fill:url(#radialGradient4193);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4195);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 13.5,6.0000008 a 5.5,5.4999999 0 1 0 -11,0 5.5,5.4999999 0 0 0 11,0 z"
-     id="path3211-9-0"
-     style="opacity:0.9;color:#000000;fill:url(#radialGradient4249);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4251);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7,6 -5,9.5 2.5,0 L 5.3276481,13.975707 11,14.625 c 0,0 0.423761,0.712993 0.5,0.875 L 14,15.5 9,6 z m 1,2 0.5236759,1.0524013 -1.428355,0.4798025 z m 1.40625,2.96875 0.617426,1.299877 -3.7266607,-0.426448 z"
-     id="path3141"
-     style="color:#000000;fill:url(#linearGradient4026-7);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4028-7);stroke-width:0.99992186;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 11.5,6.0000007 a 3.5,3.5 0 1 0 -7,0 3.5,3.5 0 0 0 7,0 z"
-     id="path3211-9-0-8"
-     style="color:#000000;fill:url(#radialGradient4305);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4307);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 7.53125,6.875 6.5625,8.75 7.25,7.5625 A 0.87055858,0.87055858 0 0 1 8.78125,7.625 L 9.3125,8.6875 a 0.87055858,0.87055858 0 0 1 -0.5,1.1875 L 7.375,10.34375 a 0.87055858,0.87055858 0 0 1 -1.125,-1 l -2.78125,5.28125 0.5,0 0.5625,-1.0625 a 0.87055858,0.87055858 0 0 1 0.875,-0.46875 L 11.09375,13.75 A 0.87055858,0.87055858 0 0 1 11.75,14.1875 c 0,0 0.100808,0.172252 0.21875,0.375 0.0128,0.022 0.01881,0.04131 0.03125,0.0625 l 0.53125,0 -4.0625,-7.75 -0.9375,0 z m 1.8125,3.21875 a 0.87055858,0.87055858 0 0 1 0.84375,0.5 l 0.625,1.3125 a 0.87055858,0.87055858 0 0 1 -0.875,1.25 L 6.21875,12.71875 A 0.87055858,0.87055858 0 0 1 6.0625,11 l 3.09375,-0.875 a 0.87055858,0.87055858 0 0 1 0.1875,-0.03125 z"
-     id="path4186"
-     style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4023-1);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 9.5,5.0000008 a 1.5,1.5 0 0 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-     id="path3211"
-     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.98431373;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 8.5,5.0000014 a 0.50000002,0.50000009 0 0 1 -1,0 0.50000002,0.50000009 0 1 1 1,0 z"
-     id="path3211-1"
-     style="opacity:0.1;color:#000000;fill:none;stroke:url(#linearGradient3089-3);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>

=== removed directory 'plugins/podcasts'
=== removed file 'plugins/podcasts/CMakeLists.txt'
--- plugins/podcasts/CMakeLists.txt	2012-04-30 18:07:40 +0000
+++ plugins/podcasts/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-add_definitions(${NORMAL_CFLAGS})
-include_directories(${CMAKE_BINARY_DIR}/core ${CMAKE_BINARY_DIR}/src)
-link_directories(${NORMAL_LINK_DIRS})
-vala_precompile(VALA_C
-        Podcasts.vala
-    PACKAGES
-        granite
-        noise
-        noise-core
-        libxml-2.0
-        gee-1.0
-        gstreamer-0.10
-        libnotify
-        libgpod-1.0
-        gstreamer-interfaces-0.10
-        gstreamer-pbutils-0.10
-        gstreamer-cdda-0.10
-        libpeas-1.0
-        libsoup-2.4
-    OPTIONS
-        --vapidir=${CMAKE_SOURCE_DIR}/vapi
-        --vapidir=${CMAKE_BINARY_DIR}/core/
-        --vapidir=${CMAKE_BINARY_DIR}/src/
-    )
-add_library(noise-podcasts MODULE ${VALA_C})
-
-target_link_libraries (noise-podcasts ${NORMAL_LIBRARIES})
-install(TARGETS noise-podcasts DESTINATION ${PLUGIN_DIR}/podcasts/)
-install(FILES podcasts.plugin DESTINATION ${PLUGIN_DIR}/podcasts/)
-add_dependencies(noise-podcasts noise)

=== removed directory 'plugins/podcasts/icons'
=== removed file 'plugins/podcasts/icons/library-podcast.svg'
--- plugins/podcasts/icons/library-podcast.svg	2012-04-29 17:43:40 +0000
+++ plugins/podcasts/icons/library-podcast.svg	1970-01-01 00:00:00 +0000
@@ -1,725 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="16"
-   height="16"
-   id="svg3809"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="library-podcast.svg">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     id="namedview21"
-     showgrid="false"
-     inkscape:zoom="26.125"
-     inkscape:cx="8.1722488"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3809">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3209" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3811">
-    <linearGradient
-       id="linearGradient4162">
-      <stop
-         id="stop4164"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0" />
-      <stop
-         offset="0.35269147"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         id="stop4166" />
-      <stop
-         id="stop4168"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         offset="0.70588225" />
-      <stop
-         id="stop4170"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744">
-      <stop
-         offset="0"
-         style="stop-color:#5f5f5f;stop-opacity:1;"
-         id="stop5430" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#4f4f4f;stop-opacity:1;"
-         id="stop5432" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#3b3b3b;stop-opacity:1;"
-         id="stop5434" />
-      <stop
-         offset="1"
-         style="stop-color:#2b2b2b;stop-opacity:1;"
-         id="stop5436" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400">
-      <stop
-         offset="0"
-         style="stop-color:#272727;stop-opacity:1;"
-         id="stop5440" />
-      <stop
-         offset="1"
-         style="stop-color:#454545;stop-opacity:1;"
-         id="stop5442" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3924-4-8">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         id="stop3926-0-4" />
-      <stop
-         id="stop3928-6-8"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         offset="0.06316455" />
-      <stop
-         offset="0.95056331"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         id="stop3930-2-1" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         id="stop3932-9-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3924-4-8"
-       id="linearGradient3089"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02702703,0,0,0.1081081,7.3513515,8.9054083)"
-       x1="23.999994"
-       y1="10.124992"
-       x2="23.999994"
-       y2="37.874996" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744"
-       id="radialGradient3101"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.35953691,-0.19017361,0,9.606931,5.8946478)"
-       cx="7.4956832"
-       cy="8.4497671"
-       fx="7.4956832"
-       fy="8.4497671"
-       r="19.99999" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400"
-       id="linearGradient3103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.07692308,0,0,0.15384616,6.1538462,7.8076942)"
-       x1="24"
-       y1="44"
-       x2="24"
-       y2="3.8990016" />
-    <linearGradient
-       id="linearGradient3707-319-631-407-324-3">
-      <stop
-         id="stop3760-4"
-         style="stop-color:#185f9a;stop-opacity:0;"
-         offset="0" />
-      <stop
-         id="stop3762-0"
-         style="stop-color:#599ec9;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8">
-      <stop
-         id="stop3750-1"
-         style="stop-color:#90dbec;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3752-3"
-         style="stop-color:#55c1ec;stop-opacity:0.80869567;"
-         offset="0.26238" />
-      <stop
-         id="stop3754-1"
-         style="stop-color:#3689e6;stop-opacity:0;"
-         offset="0.704952" />
-      <stop
-         id="stop3756-1"
-         style="stop-color:#2b63a0;stop-opacity:0;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3977-6">
-      <stop
-         id="stop3979-9"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0" />
-      <stop
-         offset="0.03626217"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         id="stop3981-3" />
-      <stop
-         id="stop3983-7"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         offset="0.95056331" />
-      <stop
-         id="stop3985-4"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         offset="0"
-         style="stop-color:#a0a0a0;stop-opacity:1"
-         id="stop3106" />
-      <stop
-         offset="1"
-         style="stop-color:#bebebe;stop-opacity:1"
-         id="stop3108" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3600">
-      <stop
-         offset="0"
-         style="stop-color:#f4f4f4;stop-opacity:1"
-         id="stop3602" />
-      <stop
-         offset="1"
-         style="stop-color:#dbdbdb;stop-opacity:1"
-         id="stop3604" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3977">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3979" />
-      <stop
-         offset="0.03626217"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop3981" />
-      <stop
-         offset="0.95056331"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop3983" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop3985" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3104-5">
-      <stop
-         offset="0"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         id="stop3106-2" />
-      <stop
-         offset="1"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         id="stop3108-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3977-6"
-       id="linearGradient3191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22297294,0,0,0.35135133,-33.455162,-2.9409035)"
-       x1="23.99999"
-       y1="5.5641499"
-       x2="23.99999"
-       y2="43" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8"
-       id="radialGradient3194"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-7.3617649e-8,2.251132,-3.6847783,-6.7572924e-8,11.422427,-22.664549)"
-       cx="7.8060555"
-       cy="9.9571075"
-       fx="7.2758255"
-       fy="9.9571075"
-       r="12.671875" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3707-319-631-407-324-3"
-       id="linearGradient3196"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.45534875,0,0,0.34098425,-36.19079,-2.180778)"
-       x1="25"
-       y1="47.935162"
-       x2="25"
-       y2="0.91790956" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104-5"
-       id="linearGradient3199"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.32160807,0,0,0.3333374,-33.90396,-2.8575516)"
-       x1="22.004084"
-       y1="47.813133"
-       x2="22.004084"
-       y2="3.3638515" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3977"
-       id="linearGradient3202"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.24324324,0,0,0.35135133,-33.566649,-2.9409025)"
-       x1="23.99999"
-       y1="5.5641499"
-       x2="23.99999"
-       y2="43" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600"
-       id="linearGradient3205"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.31428714,0,0,0.3259265,-35.271705,-2.8307125)"
-       x1="25.132275"
-       y1="0.98520643"
-       x2="25.132275"
-       y2="47.013336" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.25378586,0,0,0.30501865,-16.599834,-3.1939515)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-1"
-       id="radialGradient3101-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.22474781,-0.23775638,0,4.0585139,2.1323295)"
-       cx="10.714105"
-       cy="-16.205778"
-       fx="10.714105"
-       fy="-16.205778"
-       r="19.99999" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-1">
-      <stop
-         offset="0"
-         style="stop-color:#5f5f5f;stop-opacity:1;"
-         id="stop5430-3" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#4f4f4f;stop-opacity:1;"
-         id="stop5432-1" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#3b3b3b;stop-opacity:1;"
-         id="stop5434-1" />
-      <stop
-         offset="1"
-         style="stop-color:#2b2b2b;stop-opacity:1;"
-         id="stop5436-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-4"
-       id="linearGradient3103-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33333341,0,0,0.33333341,-20.406781,0.33898172)"
-       x1="80.880737"
-       y1="24.726936"
-       x2="80.880737"
-       y2="12.713165" />
-    <linearGradient
-       id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-4">
-      <stop
-         offset="0"
-         style="stop-color:#272727;stop-opacity:1;"
-         id="stop5440-0" />
-      <stop
-         offset="1"
-         style="stop-color:#454545;stop-opacity:1;"
-         id="stop5442-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4162"
-       id="linearGradient3089-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.08108109,0,0,0.1081081,6.0540543,8.9054063)"
-       x1="23.999994"
-       y1="-40.750011"
-       x2="23.999994"
-       y2="-3.7500136" />
-    <radialGradient
-       r="19.99999"
-       fy="-17.190559"
-       fx="9.7701225"
-       cy="-17.190559"
-       cx="9.7701225"
-       gradientTransform="matrix(0,0.22474781,-0.23775638,0,4.0585139,2.1323295)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4193"
-       xlink:href="#linearGradient3671-580"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="13.740201"
-       x2="84.111214"
-       y1="22.033323"
-       x1="84.111214"
-       gradientTransform="matrix(0.33333341,0,0,0.33333341,-20.406781,0.33898172)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4195"
-       xlink:href="#linearGradient3707-662"
-       inkscape:collect="always" />
-    <radialGradient
-       r="19.99999"
-       fy="-17.190559"
-       fx="9.7701225"
-       cy="-17.190559"
-       cx="9.7701225"
-       gradientTransform="matrix(0,0.22474781,-0.23775638,0,4.0585139,2.1323295)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4249"
-       xlink:href="#linearGradient3671-580"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="13.740201"
-       x2="84.111214"
-       y1="22.033323"
-       x1="84.111214"
-       gradientTransform="matrix(0.33333341,0,0,0.33333341,-20.406781,0.33898172)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4251"
-       xlink:href="#linearGradient3707-662"
-       inkscape:collect="always" />
-    <radialGradient
-       r="19.99999"
-       fy="-17.190559"
-       fx="9.7701225"
-       cy="-17.190559"
-       cx="9.7701225"
-       gradientTransform="matrix(0,0.22474781,-0.23775638,0,4.0585139,2.1323295)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4305"
-       xlink:href="#linearGradient3671-580"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="13.740201"
-       x2="84.111214"
-       y1="22.033323"
-       x1="84.111214"
-       gradientTransform="matrix(0.33333341,0,0,0.33333341,-20.406781,0.33898172)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4307"
-       xlink:href="#linearGradient3707-662"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3671-580">
-      <stop
-         offset="0"
-         style="stop-color:#fc93dc;stop-opacity:1"
-         id="stop4088" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#da72d3;stop-opacity:0.80784315;"
-         id="stop4090" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#a33fab;stop-opacity:0;"
-         id="stop4092" />
-      <stop
-         offset="1"
-         style="stop-color:#502b58;stop-opacity:0;"
-         id="stop4094" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3707-662">
-      <stop
-         offset="0"
-         style="stop-color:#542f57;stop-opacity:0;"
-         id="stop4098" />
-      <stop
-         offset="1"
-         style="stop-color:#bb5ca4;stop-opacity:1"
-         id="stop4100" />
-    </linearGradient>
-    <linearGradient
-       x1="23.999994"
-       y1="10.124992"
-       x2="23.999994"
-       y2="37.874996"
-       id="linearGradient3089-4"
-       xlink:href="#linearGradient3924-4-8-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.08108109,0,0,0.1081081,6.0540543,9.9054075)" />
-    <linearGradient
-       id="linearGradient3924-4-8-7">
-      <stop
-         id="stop3926-0-4-6"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3928-6-8-5"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.06316455" />
-      <stop
-         id="stop3930-2-1-6"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.95056331" />
-      <stop
-         id="stop3932-9-0-9"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-7">
-      <stop
-         id="stop5430-4"
-         style="stop-color:#5f5f5f;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5432-5"
-         style="stop-color:#4f4f4f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop5434-2"
-         style="stop-color:#3b3b3b;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop5436-5"
-         style="stop-color:#2b2b2b;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-7">
-      <stop
-         id="stop5440-4"
-         style="stop-color:#272727;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5442-4"
-         style="stop-color:#454545;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="10.714105"
-       cy="-16.205778"
-       r="19.99999"
-       fx="10.714105"
-       fy="-16.205778"
-       id="radialGradient3101-8-3"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-1-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.37457969,-0.29719548,0,3.0731424,-1.2794498)" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-1-0">
-      <stop
-         id="stop5430-3-7"
-         style="stop-color:#5f5f5f;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5432-1-8"
-         style="stop-color:#4f4f4f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop5434-1-6"
-         style="stop-color:#3b3b3b;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop5436-0-8"
-         style="stop-color:#2b2b2b;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="80.880737"
-       y1="24.726936"
-       x2="80.880737"
-       y2="12.713165"
-       id="linearGradient3103-3-8"
-       xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-4-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.41666676,0,0,0.55555569,-27.508476,-4.2683629)" />
-    <linearGradient
-       id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-4-4">
-      <stop
-         id="stop5440-0-3"
-         style="stop-color:#272727;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5442-3-1"
-         style="stop-color:#454545;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="23.999994"
-       y1="-40.750011"
-       x2="23.999994"
-       y2="-3.7500136"
-       id="linearGradient3089-3-4"
-       xlink:href="#linearGradient4162-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.06081082,0,0,0.10810811,6.5405407,8.405408)" />
-    <linearGradient
-       id="linearGradient4162-9">
-      <stop
-         id="stop4164-2"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4166-0"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.35269147" />
-      <stop
-         id="stop4168-6"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.70588225" />
-      <stop
-         id="stop4170-8"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       r="19.99999"
-       fy="8.4497671"
-       fx="7.4956832"
-       cy="8.4497671"
-       cx="7.4956832"
-       gradientTransform="matrix(0,0.35953692,-0.31695601,0,10.678218,6.8946472)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3174"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="3.8990016"
-       x2="24"
-       y1="44"
-       x1="24"
-       gradientTransform="matrix(0.12820514,0,0,0.15384617,4.923077,8.8076928)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3176"
-       xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-7"
-       inkscape:collect="always" />
-  </defs>
-  <path
-     sodipodi:type="arc"
-     style="color:#000000;fill:url(#radialGradient4193);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient4195);stroke-width:0.23094012000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3211-9"
-     sodipodi:cx="8"
-     sodipodi:cy="6.5"
-     sodipodi:rx="2"
-     sodipodi:ry="1.5"
-     d="m 10,6.5 a 2,1.5 0 1 1 -4,0 2,1.5 0 1 1 4,0 z"
-     transform="matrix(3.75,0,0,4.9999999,-22,-24.499999)" />
-  <path
-     sodipodi:type="arc"
-     style="color:#000000;fill:url(#radialGradient4249);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient4251);stroke-width:0.31491834000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3211-9-0"
-     sodipodi:cx="8"
-     sodipodi:cy="6.5"
-     sodipodi:rx="2"
-     sodipodi:ry="1.5"
-     d="m 10,6.5 a 2,1.5 0 1 1 -4,0 2,1.5 0 1 1 4,0 z"
-     transform="matrix(2.75,0,0,3.6666666,-14,-15.833333)" />
-  <path
-     sodipodi:type="arc"
-     style="color:#000000;fill:url(#radialGradient4305);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient4307);stroke-width:0.49487167999999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3211-9-0-8"
-     sodipodi:cx="8"
-     sodipodi:cy="6.5"
-     sodipodi:rx="2"
-     sodipodi:ry="1.5"
-     d="m 10,6.5 a 2,1.5 0 1 1 -4,0 2,1.5 0 1 1 4,0 z"
-     transform="matrix(1.75,0,0,2.3333333,-6,-7.1666665)" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:url(#linearGradient3205);fill-opacity:1;stroke:url(#linearGradient3207);stroke-width:0.99992192;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-     id="path4160"
-     d="m -33.228851,-2.0085005 c 2.520676,0 11.000063,9.54e-4 11.000063,9.54e-4 l 1.3e-5,14.9990985 c 0,0 -7.333384,0 -11.000076,0 0,-5.0000175 0,-10.0000355 0,-15.0000525 z" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:none;stroke:url(#linearGradient3202);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="rect6741-1"
-     d="m -23.228813,11.991526 -9,0 0,-13.0000005 9,0 z" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:none;stroke:url(#linearGradient3199);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     id="path3475"
-     d="m -29.728813,0.9915205 0.753769,0 z m 0.864322,0 0.703517,0 z m 0.81407,0 0.623115,0 z m 0.723618,0 0.271357,0 z m 0.38191,0 0.603015,0 z m 0.723618,0 1.58794,0 z m -3.507538,0.994817 0.994975,0 z m 1.095477,0 1.628141,0 z m 1.728644,0 0.79397,0 z m 0.894472,0 0.743719,0 z m 0.844222,0 0.633165,0 z m -4.562815,1.005188 0.512563,0 z m 0.673367,0 1.899498,0 z m -0.673367,1.9947954 0.994975,0 z m 1.095477,0 1.628141,0 z m 1.728644,0 0.79397,0 z m 0.894472,0 0.743719,0 z m 0.844222,0 0.633165,0 z m -4.562815,1.0052046 0.753769,0 z m 0.864322,0 0.693467,0 z m 0.81407,0 0.623115,0 z m 0.723618,0 0.271357,0 z m 0.38191,0 0.603015,0 z m 0.723618,0 1.577889,0 z m -3.507538,1 1.17588,0 z m 1.306533,0 0.562814,0 z m 0.663316,0 0.281407,0 z m 0.39196,0 0.512563,0 z m 0.623116,0 0.522613,0 z m 0.623115,0 0.834172,0 z m 0.944725,0 1.085426,0 z m -4.552765,1.994804 0.994975,0 z m 1.095477,0 1.628141,0 z m 1.728644,0 0.79397,0 z m 0.894472,0 0.743719,0 z m 0.844222,0 0.633165,0 z m -4.562815,1.005196 1.246231,0 z m 1.356784,0 0.39196,0 z m 0.492462,0 0.894472,0 z m 0.994976,0 1.316583,0 z m 1.427135,0 0.894473,0 z m 0.984925,0 0.190955,0 z m -5.256282,1.0000005 1.246231,0 z m 1.356784,0 0.562814,0 z m 0.663317,0 0.884421,0 z m 0.984924,0 0.954774,0 z m 1.065327,0 0.38191,0 z m 0.482413,0 0.211055,0 z m 0.321607,0 0.592966,0 z"
-     sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccczczccccccccccccccccccccc" />
-  <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;fill:url(#radialGradient3194);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3196);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path4530"
-     d="m -30.728813,12.991526 c -0.798846,0 -1.597694,0 -2.396544,0 -0.194166,-0.177608 -0.04652,-0.530232 -0.09265,-0.78167 0,-4.7107145 0,-9.4214282 0,-14.132141 l 0.02708,-0.061001 0.06557,-0.025189 0,0 c 0.831438,0 1.53252,0 2.363954,0" />
-  <path
-     style="opacity:0.5;fill:none;stroke:url(#linearGradient3191);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     d="m -31.228813,11.991526 -1,0 0,-13.0000005 1,0"
-     id="rect6741-1-5"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-  <rect
-     width="5"
-     height="6"
-     rx="1.4158726"
-     ry="1.4158726"
-     x="5.5"
-     y="9.5"
-     id="rect5505-21"
-     style="color:#000000;fill:url(#radialGradient3174);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3176);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="3"
-     height="4"
-     rx="0.43099841"
-     ry="0.43099841"
-     x="6.5"
-     y="10.500001"
-     id="rect6741-0-3"
-     style="opacity:0.1;fill:none;stroke:url(#linearGradient3089-4);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m 10.5,6.0000011 a 2.5,2.5000001 0 0 1 -5,0 2.5,2.5000001 0 1 1 5,0 z"
-     id="path3211"
-     style="color:#000000;fill:url(#radialGradient3101-8-3);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3103-3-8);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m 9.5000001,6.0000015 a 1.5000001,1.5000005 0 0 1 -3.0000001,0 1.5000001,1.5000005 0 1 1 3.0000001,0 z"
-     id="path3211-1"
-     style="opacity:0.3;color:#000000;fill:none;stroke:url(#linearGradient3089-3-4);stroke-width:0.99999994000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>

=== removed file 'plugins/podcasts/icons/podcast-new.svg'
--- plugins/podcasts/icons/podcast-new.svg	2012-04-29 17:43:40 +0000
+++ plugins/podcasts/icons/podcast-new.svg	1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg3035"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="mail-unread.svg">
-  <defs
-     id="defs3037">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4011"
-       id="linearGradient3071"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.24324325,0,0,0.24324325,-9.448695,1.8320232)"
-       x1="71.204407"
-       y1="6.2375584"
-       x2="71.204407"
-       y2="44.340794" />
-    <linearGradient
-       id="linearGradient4011">
-      <stop
-         id="stop4013"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0" />
-      <stop
-         offset="0.507761"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         id="stop4015" />
-      <stop
-         id="stop4017"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         offset="0.83456558" />
-      <stop
-         id="stop4019"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8">
-      <stop
-         id="stop3750-8-9"
-         style="stop-color:#90dbec;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3752-3-2"
-         style="stop-color:#55c1ec;stop-opacity:1;"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2"
-         style="stop-color:#3689e6;stop-opacity:1;"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3"
-         style="stop-color:#2b63a0;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3707-319-631-407-324-3-8">
-      <stop
-         id="stop3760-7-3"
-         style="stop-color:#185f9a;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3762-8-4"
-         style="stop-color:#599ec9;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       r="19.99999"
-       fy="8.4497671"
-       fx="5.7800279"
-       cy="8.4497671"
-       cx="5.7800279"
-       gradientTransform="matrix(0,0.65921222,-0.6973679,-1.2145204e-8,13.892627,-2.2774353)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3031"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="3.8990016"
-       x2="24"
-       y1="44"
-       x1="24"
-       gradientTransform="matrix(0.28207745,0,0,0.28207745,1.2301417,1.2301412)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3033"
-       xlink:href="#linearGradient3707-319-631-407-324-3-8"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="447"
-     inkscape:window-height="446"
-     inkscape:window-x="0"
-     inkscape:window-y="259"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3040">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:url(#radialGradient3031);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3033);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2555-7"
-       d="M 8.0000008,2.5 C 4.9652907,2.5 2.5,4.9652897 2.5,8 c 0,3.034711 2.4652907,5.500001 5.5000008,5.5 C 11.034709,13.5 13.500003,11.034711 13.5,8 13.5,4.9652897 11.034709,2.5 8.0000008,2.5 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient3071);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path8655-6"
-       d="M 12.5,7.9998401 C 12.5,10.485202 10.485133,12.5 8.0000569,12.5 c -2.4853037,0 -4.500057,-2.014821 -4.500057,-4.5001599 0,-2.4852456 2.0147533,-4.4998398 4.500057,-4.4998398 2.4850761,0 4.4999431,2.0145942 4.4999431,4.4998398 l 0,0 z" />
-  </g>
-</svg>

=== removed file 'plugins/podcasts/podcasts.plugin'
--- plugins/podcasts/podcasts.plugin	2012-04-06 19:09:26 +0000
+++ plugins/podcasts/podcasts.plugin	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Plugin]
-Module=noise-podcasts
-Loader=C
-IAge=2
-Name=Podcasts
-BuiltIn=true
-Description=Download Podcasts.
-Authors=BeatBox Developers
-Copyright=Copyright © 2012 BeatBox Developers
-Website=http://launchpad.net/beat-box

=== removed directory 'plugins/podcasts/src'
=== removed file 'plugins/podcasts/src/AddPodcastWindow.vala'
--- plugins/podcasts/src/AddPodcastWindow.vala	2012-07-26 17:29:26 +0000
+++ plugins/podcasts/src/AddPodcastWindow.vala	1970-01-01 00:00:00 +0000
@@ -1,209 +0,0 @@
-/*-
- * Copyright (c) 2011-2012       Scott Ringwelski <[e-mail]>
- *
- * Originaly 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 Noise.AddPodcastWindow : Window {
-	public LibraryWindow lw;
-	
-	VBox content;
-	HBox padding;
-	
-	Granite.Widgets.HintedEntry _source;
-	Gtk.Image _is_valid;
-	Gtk.Spinner _is_working;
-	Button _save;
-	Button _cancel;
-	
-	Gdk.Pixbuf not_valid;
-	Gdk.Pixbuf valid;
-	
-	Gee.HashSet<string> existing_rss;
-	bool already_validating;
-	string next;
-	
-	public signal void playlist_saved(Playlist p);
-	
-	public AddPodcastWindow(LibraryWindow lw) {
-		this.lw = lw;
-		already_validating = false;
-		next = "";
-		
-		title = (_("Add Podcast"));
-		
-		set_size_request(400, -1);
-		
-		this.resizable = false;
-		
-		this.window_position = WindowPosition.CENTER;
-		this.type_hint = Gdk.WindowTypeHint.DIALOG;
-		this.set_modal(true);
-		this.set_transient_for(lw);
-		this.destroy_with_parent = true;
-		
-		content = new VBox(false, 12);
-		padding = new HBox(false, 12);
-		
-		/* get pixbufs */
-		valid = Icons.PROCESS_COMPLETED.render (IconSize.MENU);
-		not_valid = Icons.PROCESS_ERROR.render (IconSize.MENU);
-		
-		if(valid == null)
-			valid = Icons.render_icon(Gtk.Stock.YES, IconSize.MENU);
-		if(not_valid == null)
-			not_valid = Icons.render_icon(Gtk.Stock.NO, IconSize.MENU);
-		
-		/* start out by creating all category labels */
-		Label sourceLabel = new Label(_("Podcast RSS Source"));
-		_source = new Granite.Widgets.HintedEntry(_("Podcast Source..."));
-		_is_valid = new Gtk.Image.from_pixbuf(not_valid);
-		_is_working = new Gtk.Spinner();
-		_save = new Button.with_label(_("Add"));
-		_cancel = new Button.with_label(_("Cancel"));
-		/* set up controls */
-		sourceLabel.xalign = 0.0f;
-		sourceLabel.set_markup("<b>%s</b>".printf(_("Podcast RSS Source")));
-		
-		_is_working.start();
-		
-		/* add controls to form */
-		HButtonBox bottomButtons = new HButtonBox();
-		bottomButtons.set_layout(ButtonBoxStyle.END);
-		bottomButtons.set_spacing (6);
-		bottomButtons.pack_start(_cancel, false, false, 0);
-		bottomButtons.pack_end(_save, false, false, 0);
-
-		/* source vbox */
-		HBox sourceBox = new HBox(false, 6);
-		sourceBox.pack_start(_source, true, true, 0);
-		sourceBox.pack_end(_is_valid, false, false, 0);
-		sourceBox.pack_end(_is_working, false, false, 0);
-		
-		content.pack_start(wrap_alignment(sourceLabel, 12, 0, 0, 0), false, true, 0);
-		content.pack_start(wrap_alignment(sourceBox, 0, 12, 0, 0), false, true, 0);
-		content.pack_start(bottomButtons, false, false, 12);
-		
-		padding.pack_start(content, true, true, 12);
-		
-		add(padding);
-		
-		existing_rss = new Gee.HashSet<string>();
-		foreach(int i in lw.library_manager.podcast_ids()) {
-			var pod = lw.library_manager.media_from_id(i);
-			existing_rss.add(pod.podcast_rss);
-		}
-		
-		show_all();
-		sourceChanged();
-		
-		_save.clicked.connect(saveClicked);
-		_cancel.clicked.connect(cancel_clicked);
-		_source.activate.connect(sourceActivate);
-		_source.changed.connect(sourceChanged);
-	}
-	
-	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;
-		alignment.right_padding = right;
-		alignment.bottom_padding = bottom;
-		alignment.left_padding = left;
-		
-		alignment.add(widget);
-		return alignment;
-	}
-
-	void cancel_clicked () {
-		destroy ();
-	}
-
-	void saveClicked() {
-		var success = lw.library_manager.pm.parse_new_rss(_source.get_text());
-		
-		if(success)
-			this.destroy();
-		else {
-			lw.doAlert(_("No Podcasts Found"), _("The provided source is invalid. Make sure you are entering an RSS feed in XML format."));
-		}
-	}
-	
-	void sourceActivate() {
-		saveClicked();
-	}
-	
-	void sourceChanged() {
-		string url = _source.get_text();
-		
-		// simple quick validation
-		if(!url.has_prefix("http://") || url.contains(" ") || existing_rss.contains(url)) {
-			_is_valid.set_from_pixbuf(not_valid);
-			_is_valid.show();
-			_is_working.hide();
-			_save.set_sensitive(false);
-			next = "";
-		}
-		else {
-			_is_working.show();
-			_is_valid.hide();
-			
-			if(already_validating) {
-				next = url;
-			}
-			else {
-				already_validating = true;
-				next = url;
-				
-				try {
-					Thread.create<void*>(test_url_validity, false);
-				}
-				catch(GLib.ThreadError err) {
-					stdout.printf("ERROR: Could not create thread to fetch new podcasts: %s \n", err.message);
-				}
-			}
-		}
-	}
-	
-	public void* test_url_validity () {
-		bool is_valid = false;
-		while(next != "") {
-			var previous_url = next;
-			next = "";
-			is_valid = lw.library_manager.pm.is_valid_rss(previous_url) && !existing_rss.contains(previous_url);
-		}
-		
-		Idle.add( () => {
-			_is_working.hide();
-			_is_valid.show();
-			if(is_valid)
-				_is_valid.set_from_pixbuf(valid);
-			else
-				_is_valid.set_from_pixbuf(not_valid);
-			
-			_save.set_sensitive(is_valid);
-			
-			already_validating = false;
-			return false;
-		});
-				
-		return null;
-	}
-}

=== removed file 'plugins/podcasts/src/PodcastEditor.vala'
--- plugins/podcasts/src/PodcastEditor.vala	2012-07-26 17:29:26 +0000
+++ plugins/podcasts/src/PodcastEditor.vala	1970-01-01 00:00:00 +0000
@@ -1,273 +0,0 @@
-/*-
- * Copyright (c) 2011-2012       Scott Ringwelski <[e-mail]>
- *
- * Originaly 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;
-using Gee;
-using Granite;
-
-public class Noise.PodcastEditor : Window {
-	LibraryManager _lm;
-	
-	LinkedList<int> _allPodcasts;
-	LinkedList<int> _podcasts;
-	
-	//for padding around notebook mostly
-	private VBox content;
-	private HBox padding;
-	
-	private VBox vert; // separates editors with buttons and other stuff
-	private HBox horiz; // separates text with numerical editors
-	private VBox textVert; // separates text editors
-	private VBox numerVert; // separates numerical editors
-	
-	private HashMap<string, FieldEditor> fields;// a hashmap with each property and corresponding editor
-	
-	private Button _previous;
-	private Button _next;
-	private Button _save;
-	
-	public signal void podcasts_saved(LinkedList<int> podcasts);
-	
-	public PodcastEditor(LibraryManager lm, LinkedList<int> allPodcasts, LinkedList<int> podcasts) {
-		this.window_position = WindowPosition.CENTER;
-		this.type_hint = Gdk.WindowTypeHint.DIALOG;
-		this.set_modal(true);
-		this.set_transient_for(lm.lw);
-		this.destroy_with_parent = true;
-		content = new VBox(false, 10);
-		
-		set_size_request (520, -1);
-		resizable = false;
-		
-		_lm = lm;
-		
-		_allPodcasts = allPodcasts;
-		_podcasts = podcasts;
-		
-		HButtonBox buttonSep = new HButtonBox();
-		buttonSep.set_layout(ButtonBoxStyle.END);
-		_previous = new Button.with_label("Previous");
-		_next = new Button.with_label("Next");
-		_save = new Button.with_label("Done");
-		
-		buttonSep.pack_start(_previous, false, false, 0);
-		buttonSep.pack_start(_next, false, false, 0);
-		buttonSep.pack_end(_save, false, false, 0);
-		
-		content.pack_start(wrap_alignment(createBasicViewport(), 10, 0, 0, 0), true, true, 0);
-		content.pack_start(wrap_alignment(buttonSep, 0, 0, 10, 0), false, true, 0);
-		
-		(buttonSep as Gtk.ButtonBox).set_child_secondary(_next, true);
-		(buttonSep as Gtk.ButtonBox).set_child_secondary(_previous, true);
-		
-		padding.pack_start(content, true, true, 10);
-		add(padding);
-		
-		show_all();
-		
-		_next.sensitive = allPodcasts.size > 1;
-		_previous.sensitive = allPodcasts.size > 1;
-		
-		if(_podcasts.size == 1) {
-			foreach(FieldEditor fe in fields.values)
-				fe.set_check_visible(false);
-		}
-		
-		_previous.clicked.connect(previousClicked);
-		_next.clicked.connect(nextClicked);
-		_save.clicked.connect(saveClicked);
-	}
-	
-	public Viewport createBasicViewport() {
-		Viewport rv = new Viewport(null, null);
-		fields = new HashMap<string, FieldEditor>();
-		Media sum = _lm.media_from_id(_podcasts.get(0)).copy();
-		
-		/** find what these podcasts have what common, and keep those values **/
-		foreach(int i in _podcasts) {
-			Media s = _lm.media_from_id(i);
-			
-			if(s.track != sum.track) // episode
-				sum.track = 0;
-			if(s.title != sum.title) // podcast title
-				sum.title = "";
-			if(s.artist != sum.artist) // podcast author. if this changes, so should album_artist for sorting.
-				sum.artist = "";
-			if(s.album != sum.album) // podcast name
-				sum.album = "";
-			if(s.genre != sum.genre) // category
-				sum.genre = "";
-			if(s.comment != sum.comment)
-				sum.comment = "";
-			if(s.rating != sum.rating)
-				sum.rating = 0;
-			if(s.mediatype != sum.mediatype)
-				sum.mediatype = 0;
-		}
-		
-		if(_podcasts.size == 1) {
-			title = "Editing " + sum.title;
-		}
-		else {
-			title = "Editing " + _podcasts.size.to_string() + " podcasts";
-		}
-		
-		if(sum.year == -1)
-			sum.year = Time().year;
-		
-		fields.set("Title", new FieldEditor("Title", sum.title, new Entry()));
-		fields.set("Author", new FieldEditor("Author", sum.artist, new Entry()));
-		fields.set("Podcast", new FieldEditor("Podcast", sum.album, new Entry()));
-		fields.set("Genre", new FieldEditor("Genre", sum.genre, new Entry()));
-		fields.set("Comment", new FieldEditor("Comment", sum.comment, new TextView()));
-		fields.set("Episode", new FieldEditor("Track", sum.track.to_string(), new SpinButton.with_range(0, 500, 1)));
-		fields.set("Rating", new FieldEditor("Rating", sum.rating.to_string(), new RatingWidget(null, false, IconSize.MENU)));
-		fields.set("Media Type", new FieldEditor("Media Type", sum.mediatype.to_string(), new ComboBoxText()));
-		
-		padding = new HBox(false, 10);
-		vert = new VBox(false, 0);
-		horiz = new HBox(false, 0);
-		textVert = new VBox(false, 0);
-		numerVert = new VBox(false, 0);
-		
-		textVert.pack_start(fields.get("Title"), false, true, 0);
-		textVert.pack_start(fields.get("Author"), false, true, 5);
-		textVert.pack_start(fields.get("Podcast"), false, true, 5);
-		textVert.pack_start(fields.get("Comment"), false, true, 5);
-		
-		numerVert.pack_start(fields.get("Episode"), false, true, 0);
-		numerVert.pack_start(fields.get("Genre"), false, true, 5);
-		numerVert.pack_start(fields.get("Rating"), false, true, 5);
-		numerVert.pack_end(fields.get("Media Type"), false, true, 5);
-		
-		horiz.pack_start(wrap_alignment(textVert, 0, 30, 0, 0), false, true, 0);
-		horiz.pack_end(numerVert, false, true, 0);
-		vert.pack_start(horiz, true, true, 0);
-		
-		rv.add(vert);
-		
-		return rv;
-	}
-	
-	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;
-		alignment.right_padding = right;
-		alignment.bottom_padding = bottom;
-		alignment.left_padding = left;
-		
-		alignment.add(widget);
-		return alignment;
-	}
-	
-	public void previousClicked() {
-		save_podcasts();
-		
-		// now fetch the next media on current_view
-		int i = 0; // will hold next media to edit
-		int indexOfCurrentFirst = _allPodcasts.index_of(_podcasts.get(0));
-		
-		if(indexOfCurrentFirst == 0)
-			i = _allPodcasts.get(_allPodcasts.size - 1);
-		else
-			i = _allPodcasts.get(indexOfCurrentFirst - 1);
-		
-		// now fetch the previous media on current_view
-		var newpodcasts = new LinkedList<int>();
-		newpodcasts.add(i);
-		
-		change_media(newpodcasts);
-	}
-	
-	public void nextClicked() {
-		save_podcasts();
-		
-		// now fetch the next media on current_view
-		int i = 0; // will hold next media to edit
-		int indexOfCurrentLast = _allPodcasts.index_of(_podcasts.get(_podcasts.size - 1));
-		
-		if(indexOfCurrentLast == _allPodcasts.size - 1)
-			i = _allPodcasts.get(0);
-		else
-			i = _allPodcasts.get(indexOfCurrentLast + 1);
-		
-		var newpodcasts = new LinkedList<int>();
-		newpodcasts.add(i);
-		
-		change_media(newpodcasts);
-	}
-	
-	public void change_media(LinkedList<int> newpodcasts) {
-		_podcasts = newpodcasts;
-		
-		Media sum = _lm.media_from_id(newpodcasts.get(0));
-		
-		title = "Editing " + sum.title;
-		
-		/* do not show check boxes for 1 media */
-		foreach(FieldEditor fe in fields.values)
-			fe.set_check_visible(false);
-		
-		fields.get("Title").set_value(sum.title);
-		fields.get("Author").set_value(sum.artist);
-		fields.get("Podcast").set_value(sum.album);
-		fields.get("Genre").set_value(sum.genre);
-		fields.get("Comment").set_value(sum.comment);
-		fields.get("Episode").set_value(sum.track.to_string());
-		fields.get("Rating").set_value(sum.rating.to_string());
-		fields.get("Media Type").set_value(sum.mediatype.to_string());
-	}
-	
-	public void save_podcasts() {
-		foreach(int i in _podcasts) {
-			Media s = _lm.media_from_id(i);
-			
-			if(fields.get("Title").checked())
-				s.title = fields.get("Title").get_value();
-			if(fields.get("Author").checked()) {
-				s.artist = fields.get("Author").get_value();
-				s.album_artist = s.artist;
-			}
-			if(fields.get("Podcast").checked())
-				s.album = fields.get("Podcast").get_value();
-			if(fields.get("Genre").checked())
-				s.genre = fields.get("Genre").get_value();
-			if(fields.get("Comment").checked())
-				s.comment = fields.get("Comment").get_value();
-				
-			if(fields.get("Episode").checked())
-				s.track = int.parse(fields.get("Episode").get_value());
-			if(fields.get("Rating").checked())
-				s.rating = int.parse(fields.get("Rating").get_value());
-			if(fields.get("Media Type").checked())
-				s.mediatype = int.parse(fields.get("Media Type").get_value());
-		}
-		
-		podcasts_saved(_podcasts);
-	}
-	
-	public virtual void saveClicked() {
-		save_podcasts();
-		
-		this.destroy();
-	}
-}

=== removed file 'plugins/podcasts/src/PodcastManager.vala'
--- plugins/podcasts/src/PodcastManager.vala	2012-07-26 17:29:26 +0000
+++ plugins/podcasts/src/PodcastManager.vala	1970-01-01 00:00:00 +0000
@@ -1,452 +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 Gee;
-
-public class Noise.PodcastManager : GLib.Object {
-	LibraryManager lm;
-	LibraryWindowInterface lw;
-	bool fetching;
-	bool user_cancelled;
-	bool saving_locally;
-	
-	int index;
-	int total;
-	GLib.File new_dest;
-	int64 online_size;
-	string current_operation;
-	
-	Collection<int> save_locally_ids;
-	
-	public PodcastManager(LibraryManager lm, LibraryWindowInterface lw) {
-		this.lm = lm;
-		this.lw = lw;
-		fetching = saving_locally = false;
-		user_cancelled = false;
-		index = total = 0;
-		
-		lm.progress_cancel_clicked.connect( () => { 
-			user_cancelled = true;
-			current_operation = "<b>Cancelling</b> remaining downloads...";
-		} );
-	}
-	
-	public void find_new_podcasts() {
-		if(fetching || lm.doing_file_operations()) {
-			stdout.printf("Not going to find new podcasts, already fetching\n");
-			return;
-		}
-		
-		lm.start_file_operations("Fetching new Podcast Episodes");
-		try {
-			Thread.create<void*>(find_new_podcasts_thread, false);
-		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to fetch new podcasts: %s \n", err.message);
-		}
-		
-		lm.have_fetched_new_podcasts = true;
-	}
-		
-	public 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>();
-		
-		foreach(int i in lm.podcast_ids()) {
-			var pod = lm.media_from_id(i);
-			
-			if(!pod.isTemporary) {
-				if(pod.podcast_rss != null)	rss_urls.add(pod.podcast_rss);
-				if(pod.podcast_url != null)	mp3_urls.add(pod.podcast_url);
-				if(pod.podcast_rss != null) rss_names.set(pod.podcast_rss, pod.artist);
-			}
-		}
-		
-		index = 0;
-		total = 10 * rss_urls.size;
-		current_operation = "Looking for new episodes";
-		fetching = true;
-		user_cancelled = false;
-		Timeout.add(500, doProgressNotificationWithTimeout);
-		
-		LinkedList<Media> new_podcasts = new LinkedList<Media>();
-		var rss_index = 0;
-		foreach(string rss in rss_urls) {
-			if(user_cancelled)
-				break;
-				
-			if(rss == null || rss == "")
-				continue;
-			
-			current_operation = "Searching for new <b>" + rss_names.get(rss).replace("&", "&amp;") + "</b> podcast episodes...";
-			
-			// create an HTTP session to twitter
-			var session = new Soup.SessionSync();
-			var message = new Soup.Message ("GET", rss);
-			session.timeout = 30;
-			
-			// send the HTTP request
-			session.send_message(message);
-			
-			Xml.Node* node = getRootNode(message);
-			if(node != null) {
-				findNewItems(rss, node, mp3_urls, ref new_podcasts);
-			}
-			
-			++rss_index;
-			index = rss_index * 10;
-		}
-		
-		index = total + 1;
-		fetching = false;
-		
-		Idle.add( () => {
-			lm.add_medias(new_podcasts, true);
-			lw.update_sensitivities();
-			lw.updateInfoLabel();
-			lm.finish_file_operations();
-			
-			if(lm.settings.getDownloadNewPodcasts()) {
-				var new_podcast_ids = new LinkedList<int>();
-				foreach(var s in new_podcasts)
-					new_podcast_ids.add(s.rowid);
-				
-				save_episodes_locally(new_podcast_ids);
-			}
-			
-			return false;
-		});
-		
-		return null;
-	}
-	
-	public bool is_valid_rss(string url) {
-		// create an HTTP session to twitter
-		var session = new Soup.SessionSync();
-		var message = new Soup.Message ("GET", url);
-		
-		// send the HTTP request
-		session.send_message(message);
-		
-		Xml.Node* node = getRootNode(message);
-		stdout.printf("got root node\n");
-		if(node == null)
-			return false;
-		
-		return node->name == "rss";
-	}
-	
-	public bool parse_new_rss(string rss) {
-		if(!lm.start_file_operations("Fetching podcast from <b>" + rss + "</b>"))
-			return false;
-		
-		fetching = true;
-		index = 0;
-		total = 10;
-		current_operation = "Fetching podcast from <b>" + rss + "</b>";
-		Timeout.add(500, doProgressNotificationWithTimeout);
-		
-		stdout.printf("podcast_rss: %s\n", rss);
-		
-		// create an HTTP session to twitter
-		var session = new Soup.SessionSync();
-		var message = new Soup.Message ("GET", rss);
-		session.timeout = 30;
-		
-		// send the HTTP request
-		session.send_message(message);
-		
-		Xml.Node* node = getRootNode(message);
-		stdout.printf("got root node\n");
-		if(node == null) {
-			fetching = false;
-			return false;
-		}
-			
-		HashSet<string> mp3_urls = new HashSet<string>();
-		LinkedList<Media> new_podcasts = new LinkedList<Media>();
-		foreach(int i in lm.podcast_ids()) {
-			var pod = lm.media_from_id(i);
-			
-			mp3_urls.add(pod.podcast_url);
-		}
-		
-		findNewItems(rss, node, mp3_urls, ref new_podcasts);
-		
-		index = 11;
-		fetching = false;
-		
-		lm.add_medias(new_podcasts, true);
-		lm.finish_file_operations();
-		
-		return new_podcasts.size > 0;
-	}
-	
-	public Xml.Node* getRootNode(Soup.Message message) {
-		Xml.Parser.init();
-		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);
-        Xml.Node* root = doc->get_root_element ();
-        if (root == null) {
-            delete doc;
-            return null;
-        }
-		
-		// we actually want one level down from root. top level is <response status="ok" ... >
-		return root;
-	}
-	
-	// parses a xml root node for new podcasts
-	public void findNewItems(string rss, Xml.Node* node, HashSet<string> existing, ref LinkedList<Media> found) {
-		string pod_title = ""; string pod_author = ""; string category = ""; string summary = ""; string image_url = "";
-		int image_width, image_height;
-		int visited_items = 0;
-		
-		node = node->children->next;
-		
-		for (Xml.Node* iter = node->children; iter != null; iter = iter->next) {
-			if (iter->type != Xml.ElementType.ELEMENT_NODE) {
-				continue; // should this be break?
-			}
-			
-			string name = iter->name;
-			string content = iter->get_content();
-			
-			if(name == "title")
-				pod_title = content.replace("\n","").replace("\t","").replace("\r","");
-			else if(name == "author")
-				pod_author = content.replace("\n","").replace("\t","").replace("\r","");
-			else if(name == "category") {
-				if(content != "")
-					category = content.replace("\n","").replace("\t","").replace("\r","");
-				
-				for (Xml.Attr* prop = iter->properties; prop != null; prop = prop->next) {
-					string attr_name = prop->name;
-					string attr_content = prop->children->content;
-					
-					if(attr_name == "text" && attr_content != "") {
-						category = attr_content;
-					}
-				}
-			}
-			else if(name == "image") {
-				for (Xml.Node* image_iter = iter->children; image_iter != null; image_iter = image_iter->next) {
-					if(image_iter->name == "url")
-						image_url = image_iter->get_content();
-					else if(image_iter->name == "width")
-						image_width = int.parse(image_iter->get_content());
-					else if(image_iter->name == "height")
-						image_height = int.parse(image_iter->get_content());
-				}
-			}
-			else if(name == "summary" || name == "description") {
-				summary = iter->get_content().replace("\n","").replace("\t","").replace("\r","");
-			}
-			else if(name == "item") {
-				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);
-					if(item_iter->name == "title")
-						new_p.title = item_iter->get_content();
-					else if(name == "author") {
-						pod_author = item_iter->get_content().replace("\n","").replace("\t","").replace("\r","");
-						new_p.artist = pod_author;
-						new_p.album_artist = pod_author;
-					}
-					else if(item_iter->name == "enclosure") {
-						for (Xml.Attr* prop = item_iter->properties; prop != null; prop = prop->next) {
-							string attr_name = prop->name;
-							string attr_content = prop->children->content;
-							
-							if(attr_name == "url") {
-								new_p.podcast_url = attr_content;
-								new_p.uri = attr_content;
-							}
-						}
-					}
-					else if(item_iter->name == "pubDate") {
-						GLib.Time tm = GLib.Time ();
-						tm.strptime (item_iter->get_content(),
-									"%a, %d %b %Y %H:%M:%S %Z");
-						new_p.podcast_date = int.parse(tm.format("%s"));
-					}
-					else if(item_iter->name == "duration") {
-						string[] dur_pieces = item_iter->get_content().split(":", 0);
-						
-						int seconds = 0; int minutes = 0; int hours = 0;
-						seconds = int.parse(dur_pieces[dur_pieces.length - 1]);
-						if(dur_pieces.length > 1)
-							minutes = int.parse(dur_pieces[dur_pieces.length - 2]);
-						if(dur_pieces.length > 2)
-							hours = int.parse(dur_pieces[dur_pieces.length - 3]);
-							
-						new_p.length = seconds + (minutes * 60) + (hours * 3600);
-					}
-					else if(item_iter->name == "subtitle" || item_iter->name == "description") {
-						new_p.comment = item_iter->get_content().replace("\n","").replace("\t","").replace("\r","");
-					}
-				}
-				
-				if(new_p.podcast_url != null && !existing.contains(new_p.podcast_url) && new_p.podcast_url != "") {
-					if(pod_author == null || pod_author == "")
-						pod_author = pod_title;
-					if(category == null || category == "")
-						category = "Podcast";
-					
-					new_p.mediatype = 1;
-					new_p.podcast_rss = rss;
-					new_p.genre = category;
-					new_p.artist = pod_author;
-					new_p.album_artist = pod_author;
-					new_p.album = pod_title;
-					//new_p.album = ??
-					if(new_p.comment == "")			new_p.comment = summary;
-					
-					found.add(new_p);
-				}
-				
-				++visited_items;
-				++index;
-				
-				//if(visited_items >= max_items - 1)
-				//	return;
-			}
-		}
-	}
-	
-	public void save_episodes_locally(Collection<int> ids) {
-		if(fetching) {
-			stdout.printf("Not going to download episodes. Must wait to finish fetching.\n");
-			return;
-		}
-		else if(lm.doing_file_operations()) {
-			stdout.printf("Can't download episodes. Already doing file operations.\n");
-			return;
-		}
-		else if(!File.new_for_path(lm.settings.getMusicFolder()).query_exists()) {
-			//lw.doAlert("Could not save locally", "The music folder could not be found. It may need to be mounted");
-			return;
-		}
-		
-		save_locally_ids = ids;
-		
-		try {
-			Thread.create<void*>(save_episodes_locally_thread, false);
-		}
-		catch(GLib.ThreadError err) {
-			stdout.printf("ERROR: Could not create thread to save episodes locally: %s \n", err.message);
-		}
-	}
-	
-	public void* save_episodes_locally_thread () {
-		if(save_locally_ids == null || save_locally_ids.size == 0)
-			return null;
-		
-		lm.start_file_operations(null);
-		saving_locally = true;
-		user_cancelled = false;
-		index = 0;
-		total = save_locally_ids.size;
-		Timeout.add(500, doProgressNotificationWithTimeoutSaveLocally);
-		
-		foreach(var i in save_locally_ids) {
-			if(user_cancelled)
-				break;
-			
-			Media s = lm.media_from_id(i);
-			var online_file = File.new_for_uri(s.podcast_url);
-			if(online_file.query_exists() && s.uri == s.uri) {
-				current_operation = "Downloading <b>" + s.title + "</b> (" + (index + 1).to_string() + " of " + save_locally_ids.size.to_string() + ")";
-				
-				try {
-					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);
-				}
-				
-				new_dest = lm.fo.get_new_destination(s);
-				lm.fo.update_file_hierarchy(s, false, true);
-				
-				int file_size = 5; // 5 is sane backup
-				try {
-					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);
-				}
-				
-				s.file_size = file_size;
-			}
-			else {
-				stdout.printf("Skipped downloading podcast %s. Either not connected to internet, or is already saved locally.\n", s.title);
-			}
-			++index;
-		}
-		
-		index = total + 1;
-		
-		Idle.add( () => {
-			lm.finish_file_operations();
-			saving_locally = false;
-			
-			return false;
-		});
-		
-		return null;
-	}
-	
-	public bool doProgressNotificationWithTimeout() {
-		if(fetching)
-			lw.progressNotification(current_operation.replace("&", "&amp;"), (double)((double)index/(double)total));
-		
-		if(index < total && fetching) {
-			return true;
-		}
-		
-		return false;
-	}
-	
-	public bool doProgressNotificationWithTimeoutSaveLocally() {
-		int64 current_local_size = 0;
-		if(new_dest != null && new_dest.query_exists()) {
-			try {
-				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);
-			}
-		}
-		
-		lw.progressNotification(current_operation.replace("&", "&amp;"), (double)(((double)index + (double)((double)current_local_size/(double)online_size))/((double)total)));
-		
-		if(index < total && lm.doing_file_operations()) {
-			return true;
-		}
-		
-		return false;
-	}
-}

=== removed file 'plugins/podcasts/src/Podcasts.vala'
--- plugins/podcasts/src/Podcasts.vala	2012-07-26 17:29:26 +0000
+++ plugins/podcasts/src/Podcasts.vala	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-public class Noise.Plugins.Podcasts : Noise.Plugins.Activatable, Object
-{
-    public Iface object { set; owned get; }
-    public void activate () {
-        print ("Hello World!\n");
-    }
-    public void deactivate () {
-        print ("Bye World!\n");
-    }
-}
-
-[ModuleInit]
-public void peas_register_types (GLib.TypeModule module) {
-    var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (typeof (Noise.Plugins.Activatable),
-                                     typeof (Noise.Plugins.Podcasts));
-}

=== removed directory 'plugins/podcasts/src/View'
=== removed file 'plugins/podcasts/src/View/PodcastListView.vala'
--- plugins/podcasts/src/View/PodcastListView.vala	2012-08-12 00:01:08 +0000
+++ plugins/podcasts/src/View/PodcastListView.vala	1970-01-01 00:00:00 +0000
@@ -1,841 +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 Gee;
-using Gtk;
-
-public class Noise.PodcastListView : GenericView {
-    
-    
-	public TreeViewSetup podcast_setup { set; get; }
-
-	//for header column chooser
-	Gtk.Menu columnChooserMenu;
-	CheckMenuItem columnEpisode; // episode
-	CheckMenuItem columnName; // name
-	CheckMenuItem columnLength;
-	CheckMenuItem columnArtist;
-	CheckMenuItem columnPodcast;
-	CheckMenuItem columnDate;
-	CheckMenuItem columnRating;
-	CheckMenuItem columnComments;
-	CheckMenuItem columnCategory;
-
-	//for media list right click
-	Gtk.Menu mediaMenuActionMenu;
-	Gtk.MenuItem mediaEditMedia;
-	Gtk.MenuItem mediaFileBrowse;
-	Gtk.MenuItem mediaMenuQueue;
-	Gtk.MenuItem mediaMenuNewPlaylist;
-	Gtk.MenuItem mediaMenuAddToPlaylist; // make menu on fly
-	RatingWidgetMenu mediaRateMedia;
-	Gtk.MenuItem mediaRemove;
-	Gtk.MenuItem mediaSaveLocally;
-	Gtk.MenuItem importToLibrary;
-
-	// for editing cells in-treeview
-	CellRendererText cellTrack;
-	CellRendererText cellTitle;
-	CellRendererText cellLength;
-	CellRendererText cellArtist;
-	SmartAlbumRenderer cellAlbum;
-	CellRendererText cellGenre;
-	CellRendererText cellYear;
-	CellRendererPixbuf cellRating;
-	CellRendererText cellSkips;
-	CellRendererText cellPlays;
-	
-	public enum PodcastColumn {
-		ROWID,
-		ICON,
-		EPISODE,
-		NAME,
-		LENGTH,
-		ARTIST,
-		PODCAST,
-		DATE,
-		CATEGORY,
-		COMMENT,
-		RATING,
-		PULSER
-	}
-
-
-	public PodcastListView(LibraryManager lm, TreeViewSetup tvs, int rel_id) {
-		var types = new GLib.List<Type>();
-		types.append(typeof(int)); // id
-		types.append(typeof(GLib.Icon)); // icon
-		types.append(typeof(int)); // episode (track)
-		types.append(typeof(string)); // name (title)
-		types.append(typeof(int)); // length
-		types.append(typeof(string)); // artist
-		types.append(typeof(string)); // album
-		types.append(typeof(int)); // date
-		types.append(typeof(string)); // category (genre)
-		types.append(typeof(string)); // comment
-		types.append(typeof(int)); // rating
-		types.append(typeof(int)); // pulser
-		base(lm, types, tvs, rel_id);
-		
-		//last_search = "";
-		//timeout_search = new LinkedList<string>();
-		//showing_all = true;
-		//removing_medias = false;
-
-		buildUI();
-	}
-
-	public override void update_sensitivities() {
-		mediaMenuActionMenu.show_all();
-
-		if(get_hint() == ViewWrapper.Hint.PODCAST) {
-			mediaRemove.set_sensitive(true);
-			mediaRemove.set_label("Remove from Library");
-			importToLibrary.set_visible(false);
-		}
-		else if(get_hint() == ViewWrapper.Hint.DEVICE_PODCAST) {
-			mediaRemove.set_visible(false);
-			mediaRemove.set_label("TODO: Remove from device");
-			importToLibrary.set_visible(true);
-			mediaSaveLocally.set_visible(false);
-			mediaMenuAddToPlaylist.set_visible(false);
-			mediaMenuNewPlaylist.set_visible(false);
-		}
-		else {
-			mediaRemove.set_sensitive(false);
-		}
-	}
-
-    public void buildUI() {
-		cellTrack = new CellRendererText();
-		cellTitle = new CellRendererText();
-		cellLength = new CellRendererText();
-		cellArtist = new CellRendererText();
-		cellAlbum = new SmartAlbumRenderer();
-		cellGenre = new CellRendererText();
-		cellYear = new CellRendererText();
-		cellRating = new CellRendererPixbuf();
-		cellSkips = new CellRendererText();
-		cellPlays = new CellRendererText();
-
-		cellRating.xalign = 0.0f;
-
-		//cellTitle.editable = false;
-		//cellTitle.edited.connect(cellTitleEdited);
-
-		/* id is always first and is stored as an int. Then the rest are (1)
-		 * strings (for simplicity), and include:
-		 * #, track, title, artist, album, genre, comment, year, rating, (9)
-		 * bitrate, play count, last played, date added, file name, (5)
-		 * bpm, length, file size, (3) */
-		var to_use = new GLib.List<TreeViewColumn>();
-		var originalOrder = new GLib.List<TreeViewColumn>();
-		var correctStringOrder = new GLib.List<string>();
-		to_use = tvs.get_columns();
-
-		/* put them in the order for treemodel */
-		foreach(var tvc in to_use) {
-			originalOrder.append(tvc);
-			correctStringOrder.append(tvc.title);
-		}
-
-		int index = 0;
-		foreach(TreeViewColumn tvc in originalOrder) {
-			if(!(tvc.title == " " || tvc.title == "id")) {
-				if(tvc.title == "Length")
-					insert_column_with_data_func(-1, tvc.title, cellLength, cellHelper.lengthTreeViewFiller);
-				else if(tvc.title == "Rating")
-					insert_column_with_data_func(-1, tvc.title, cellRating, cellHelper.ratingTreeViewFiller);
-				else if(tvc.title == "Date")
-					insert_column_with_data_func(-1, tvc.title, cellYear, cellHelper.dateTreeViewFiller);
-				else if(tvc.title == "Episode")
-					insert_column_with_data_func(-1, tvc.title, cellTrack, cellHelper.intelligentTreeViewFiller);
-				else if(tvc.title == "Name")
-					insert_column_with_data_func(-1, tvc.title, cellTitle, cellHelper.stringTreeViewFiller);
-				else if(tvc.title == "Artist")
-					insert_column_with_data_func(-1, tvc.title, cellArtist, cellHelper.stringTreeViewFiller);
-				else if(tvc.title == "Comment")
-					insert_column_with_data_func(-1, tvc.title, new CellRendererText(), cellHelper.stringTreeViewFiller);
-				else if(tvc.title == "Category")
-					insert_column_with_data_func(-1, tvc.title, new CellRendererText(), cellHelper.stringTreeViewFiller);
-				else if(tvc.title == "Podcast")
-					insert_column_with_data_func(-1, tvc.title, cellAlbum, cellHelper.smartAlbumFiller);
-				else {
-					insert_column(tvc, index);
-				}
-
-
-				get_column(index).resizable = true;
-				get_column(index).reorderable = false;
-				get_column(index).clickable = true;
-				get_column(index).sort_column_id = index;
-				get_column(index).set_sort_indicator(false);
-				get_column(index).visible = tvc.visible;
-				get_column(index).sizing = Gtk.TreeViewColumnSizing.FIXED;
-				get_column(index).fixed_width = tvc.fixed_width;
-			}
-			else if(tvc.title == " ") {
-				insert_column(tvc, index);
-
-				tvc.fixed_width = 24;
-				tvc.clickable = false;
-				tvc.sort_column_id = -1;
-				tvc.resizable = false;
-				tvc.reorderable = false;
-
-				tvc.clear_attributes (tvc.get_cells().nth_data(0));
-				tvc.clear_attributes (tvc.get_cells().nth_data(1));
-
-				tvc.set_cell_data_func(tvc.get_cells().nth_data(0), iconDataFunc);
-				tvc.set_cell_data_func(tvc.get_cells().nth_data(1), iconDataFunc);
-			}
-			else if(tvc.title == "id") {
-				insert_column(tvc, index);
-			}
-			else {
-				insert_column(tvc, index);
-			}
-
-			get_column(index).get_button().button_press_event.connect(viewHeaderClick);
-			get_column(index).notify["width"].connect(viewHeadersResized);
-
-			++index;
-		}
-		
-		set_compare_func(view_compare_func);
-        set_search_func(view_search_func);
-        set_value_func(view_value_func);
-		
-		//rearrangeColumns(correctStringOrder);
-		//viewColumnsChanged();
-
-		button_press_event.connect(viewClick);
-
-		//cursor_changed.connect_after(() => { update_rating_menu(); });
-		button_release_event.connect(viewClickRelease);
-		//columns_changed.connect(viewColumnsChanged);
-
-		// column chooser menu
-		columnChooserMenu = new Gtk.Menu();
-		columnEpisode = new CheckMenuItem.with_label("Episode");
-		columnName = new CheckMenuItem.with_label("Name");
-		columnLength = new CheckMenuItem.with_label("Length");
-		columnArtist = new CheckMenuItem.with_label("Artist");
-		columnPodcast = new CheckMenuItem.with_label("Podcast");
-		columnDate = new CheckMenuItem.with_label("Date");
-		columnRating = new CheckMenuItem.with_label("Rating");
-		columnComments = new CheckMenuItem.with_label("Comment");
-		columnCategory = new CheckMenuItem.with_label("Category");
-		updateColumnVisibilities();
-		columnChooserMenu.append(columnEpisode);
-		columnChooserMenu.append(columnName);
-		columnChooserMenu.append(columnLength);
-		columnChooserMenu.append(columnArtist);
-		columnChooserMenu.append(columnPodcast);
-		columnChooserMenu.append(columnDate);
-		columnChooserMenu.append(columnCategory);
-		columnChooserMenu.append(columnComments);
-		columnChooserMenu.append(columnRating);
-		columnEpisode.toggled.connect(columnMenuToggled);
-		columnName.toggled.connect(columnMenuToggled);
-		columnLength.toggled.connect(columnMenuToggled);
-		columnArtist.toggled.connect(columnMenuToggled);
-		columnPodcast.toggled.connect(columnMenuToggled);
-		columnDate.toggled.connect(columnMenuToggled);
-		columnComments.toggled.connect(columnMenuToggled);
-		columnCategory.toggled.connect(columnMenuToggled);
-		columnRating.toggled.connect(columnMenuToggled);
-		columnChooserMenu.show_all();
-
-
-		//media list right click menu
-		mediaMenuActionMenu = new Gtk.Menu();
-		mediaEditMedia = new Gtk.MenuItem.with_label("Edit Podcast");
-		mediaFileBrowse = new Gtk.MenuItem.with_label("Show in File Browser");
-		mediaMenuQueue = new Gtk.MenuItem.with_label("Queue");
-		mediaMenuNewPlaylist = new Gtk.MenuItem.with_label("New Playlist");
-		mediaMenuAddToPlaylist = new Gtk.MenuItem.with_label("Add to Playlist");
-		mediaRemove = new Gtk.MenuItem.with_label("Remove Episode");
-		mediaSaveLocally = new Gtk.MenuItem.with_label("Download");
-		importToLibrary = new Gtk.MenuItem.with_label("Import to Library");
-		mediaRateMedia = new RatingWidgetMenu();
-		mediaMenuActionMenu.append(mediaEditMedia);
-		mediaMenuActionMenu.append(mediaFileBrowse);
-		mediaMenuActionMenu.append(mediaSaveLocally);
-
-		mediaMenuActionMenu.append(mediaRateMedia);
-
-		mediaMenuActionMenu.append(new SeparatorMenuItem());
-		mediaMenuActionMenu.append(mediaMenuQueue);
-		mediaMenuActionMenu.append(mediaMenuNewPlaylist);
-		mediaMenuActionMenu.append(mediaMenuAddToPlaylist);
-		mediaMenuActionMenu.append(new SeparatorMenuItem());
-		mediaMenuActionMenu.append(mediaRemove);
-		mediaMenuActionMenu.append(importToLibrary);
-		mediaEditMedia.activate.connect(mediaMenuEditClicked);
-		mediaFileBrowse.activate.connect(mediaFileBrowseClicked);
-		mediaSaveLocally.activate.connect(mediaSaveLocallyClicked);
-		mediaMenuQueue.activate.connect(mediaMenuQueueClicked);
-		mediaMenuNewPlaylist.activate.connect(mediaMenuNewPlaylistClicked);
-		mediaRemove.activate.connect(mediaRemoveClicked);
-		importToLibrary.activate.connect(importToLibraryClicked);
-		mediaRateMedia.activate.connect(mediaRateMediaClicked);
-		//mediaMenuActionMenu.show_all();
-
-		update_sensitivities();
-
-		//this.list_model.rows_reordered.connect(modelRowsReordered);
-		//this.list_model.sort_column_changed.connect(sortColumnChanged);
-	}
-	
-	public void rearrangeColumns(LinkedList<string> correctOrder) {
-		move_column_after(get_column(6), get_column(7));
-		//debug("correctOrder.length = %d, get_columns.length() = %d\n", correctOrder.size, (int)get_columns().length());
-		/* iterate through get_columns and if a column is not in the
-		 * same location as correctOrder, move it there.
-		*/
-		for(int index = 0; index < get_columns().length(); ++index) {
-			//debug("on index %d column %s originally moving to %d\n", index, get_column(index).title, correctOrder.index_of(get_column(index).title));
-			if(get_column(index).title != correctOrder.get(index)) {
-				move_column_after(get_column(index), get_column(correctOrder.index_of(get_column(index).title)));
-			}
-		}
-	}
-
-	public void cellTitleEdited(string path, string new_text) {
-		/*int rowid;
-		debug("done!\n");
-		if((rowid = list_model.getRowidFromPath(path)) != 0) {
-			lm.media_from_id(rowid).title = new_text;
-
-			lm.update_media(lm.media_from_id(rowid), true);
-		}
-		cellTitle.editable = false; */
-	}
-
-	public virtual void sortColumnChanged() {
-		updateTreeViewSetup();
-	}
-
-	public virtual void modelRowsReordered(TreePath path, TreeIter? iter, void* new_order) {
-		/*if(ViewWrapper.Hint == "queue") {
-			lm.clear_queue();
-
-			TreeIter item;
-			for(int i = 0; list_model.get_iter_from_string(out item, i.to_string()); ++i) {
-				int id;
-				list_model.get(item, 0, out id);
-
-				App.player.queue_media_by_id(id);
-			}
-		}*/
-
-		//if(is_current_view) {
-		//	set_as_current_list(0, false);
-		//}
-
-		if(!scrolled_recently) {
-			scroll_to_current_media();
-		}
-	}
-
-	public virtual void viewColumnsChanged() {
-		updateTreeViewSetup();
-	}
-
-	public void updateColumnVisibilities() {
-		int index = 0;
-		foreach(TreeViewColumn tvc in get_columns()) {
-			if(tvc.title == "Episode")
-				columnEpisode.active = get_column(index).visible;
-			else if(tvc.title == "Name")
-				columnName.active = get_column(index).visible;
-			else if(tvc.title == "Length")
-				columnLength.active = get_column(index).visible;
-			else if(tvc.title == "Artist")
-				columnArtist.active = get_column(index).visible;
-			else if(tvc.title == "Podcast")
-				columnPodcast.active = get_column(index).visible;
-			else if(tvc.title == "Date")
-				columnDate.active = get_column(index).visible;
-			else if(tvc.title == "Rating")
-				columnRating.active = get_column(index).visible;
-			else if(tvc.title == "Comment")
-				columnComments.active = get_column(index).visible;
-			else if(tvc.title == "Category")
-				columnCategory.active = get_column(index).visible;
-
-			++index;
-		}
-	}
-
-	/* button_press_event */
-	bool viewClick(Gdk.EventButton event) {
-		if(event.type == Gdk.EventType.BUTTON_PRESS && event.button == 3) { //right click
-			/* create add to playlist menu */
-			Gtk.Menu addToPlaylistMenu = new Gtk.Menu();
-			foreach(Playlist p in lm.playlists()) {
-				Gtk.MenuItem playlist = new Gtk.MenuItem.with_label(p.name);
-				addToPlaylistMenu.append(playlist);
-
-				playlist.activate.connect( () => {
-					var to_add = new LinkedList<int>();
-					
-					foreach(Media m in get_selected_medias()) {
-						to_add.add(m.rowid);
-					}
-					p.addMedias(to_add);
-				});
-			}
-
-			addToPlaylistMenu.show_all();
-			mediaMenuAddToPlaylist.submenu = addToPlaylistMenu;
-
-			if(lm.playlists().size == 0)
-				mediaMenuAddToPlaylist.set_sensitive(false);
-			else
-				mediaMenuAddToPlaylist.set_sensitive(true);
-
-			// if all medias are downloaded already, desensitize.
-			// if half and half, change text to 'Download %external of %total'
-			int external_count = 0;
-			int temporary_count = 0;
-			int total_count = 0;
-			string music_folder = lm.settings.getMusicFolder();
-			
-			foreach(Media m in get_selected_medias()) {
-				if(!File.new_for_uri(m.uri).get_path().has_prefix(music_folder))
-					++external_count;
-				if(m.isTemporary)
-					++temporary_count;
-
-				++total_count;
-			}
-
-			if(external_count == 0)
-				mediaSaveLocally.set_sensitive(false);
-			else {
-				mediaSaveLocally.set_sensitive(true);
-				if(external_count != total_count)
-					mediaSaveLocally.label = "Download " + external_count.to_string() + " of " + total_count.to_string() + " selected episodes";
-				else
-					mediaSaveLocally.label = "Download" + ((external_count > 1) ? (" " + external_count.to_string() + " episodes") : "");
-			}
-
-			if(temporary_count == 0)
-				importToLibrary.set_sensitive(false);
-			else {
-				importToLibrary.set_sensitive(true);
-				if(temporary_count != total_count)
-					importToLibrary.label = "Import " + temporary_count.to_string() + " of " + total_count.to_string() + " selected episodes";
-				else
-					importToLibrary.label = "Import" + ((temporary_count > 1) ? (" " + temporary_count.to_string() + " episodes") : "");
-			}
-
-			//mediaMenuActionMenu.show_all();
-
-			int set_rating = -1;
-			foreach(Media m in get_selected_medias()) {
-				if(set_rating == -1)
-					set_rating = (int)m.rating;
-				else if(set_rating != m.rating) {
-					set_rating = 0;
-					break;
-				}
-			}
-
-			mediaRateMedia.rating_value = set_rating;
-			mediaMenuActionMenu.popup (null, null, null, 3, get_current_event_time());
-
-			TreeSelection selected = get_selection();
-			selected.set_mode(SelectionMode.MULTIPLE);
-			if(selected.count_selected_rows() > 1)
-				return true;
-			else
-				return false;
-		}
-		else if(event.type == Gdk.EventType.BUTTON_PRESS && event.button == 1) {
-			//TreeIter iter;
-			TreePath path;
-			TreeViewColumn column;
-			int cell_x;
-			int cell_y;
-
-			get_path_at_pos((int)event.x, (int)event.y, out path, out column, out cell_x, out cell_y);
-
-			//if(!list_model.get_iter(out iter, path))
-			//	return false;
-
-			/* don't unselect everything if multiple selected until button release
-			 * for drag and drop reasons */
-			if(get_selection().count_selected_rows() > 1) {
-				if(get_selection().path_is_selected(path)) {
-					if(((event.state & Gdk.ModifierType.SHIFT_MASK) == Gdk.ModifierType.SHIFT_MASK)|
-						((event.state & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK)) {
-							get_selection().unselect_path(path);
-					}
-					return true;
-				}
-				else if(!(((event.state & Gdk.ModifierType.SHIFT_MASK) == Gdk.ModifierType.SHIFT_MASK)|
-				((event.state & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK))) {
-					return true;
-				}
-
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/* button_release_event */
-	private bool viewClickRelease(Gtk.Widget sender, Gdk.EventButton event) {
-		/* if we were dragging, then set dragging to false */
-		if(dragging && event.button == 1) {
-			dragging = false;
-			return true;
-		}
-		else if(((event.state & Gdk.ModifierType.SHIFT_MASK) == Gdk.ModifierType.SHIFT_MASK) | ((event.state & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK)) {
-			return true;
-		}
-		else {
-			TreePath path;
-			TreeViewColumn tvc;
-			int cell_x;
-			int cell_y;
-			int x = (int)event.x;
-			int y = (int)event.y;
-
-			if(!(get_path_at_pos(x, y, out path, out tvc, out cell_x, out cell_y))) return false;
-			get_selection().unselect_all();
-			get_selection().select_path(path);
-			return false;
-		}
-	}
-
-	private bool viewHeaderClick(Gtk.Widget w, Gdk.EventButton e) {
-		if(e.button == 3) {
-			columnChooserMenu.popup (null, null, null, 3, get_current_event_time());
-			return true;
-		}
-		else if(e.button == 1) {
-			updateTreeViewSetup();
-
-			return false;
-		}
-
-		return false;
-	}
-
-	void viewHeadersResized() {
-		updateTreeViewSetup();
-	}
-
-	void updateTreeViewSetup() {
-		if(tvs == null || !visible || get_columns().length() != TreeViewSetup.PODCAST_COLUMN_COUNT)
-			return;
-
-		int sort_id = PodcastColumn.ARTIST;
-		SortType sort_dir = Gtk.SortType.ASCENDING;
-		get_sort_column_id(out sort_id, out sort_dir);
-
-		if(sort_id <= 0)
-			sort_id = PodcastColumn.ARTIST;
-
-		tvs.set_columns(get_columns());
-		tvs.sort_column_id = sort_id;
-		tvs.sort_direction = sort_dir;
-	}
-
-	/** When the column chooser popup menu has a change/toggle **/
-	public virtual void columnMenuToggled() {
-		int index = 0;
-		foreach(TreeViewColumn tvc in get_columns()) {
-			if(tvc.title == "Episode")
-				get_column(index).visible = columnEpisode.active;
-			else if(tvc.title == "Name")
-				get_column(index).visible = columnName.active;
-			else if(tvc.title == "Length")
-				get_column(index).visible = columnLength.active;
-			else if(tvc.title == "Artist")
-				get_column(index).visible = columnArtist.active;
-			else if(tvc.title == "Podcast")
-				get_column(index).visible = columnPodcast.active;
-			else if(tvc.title == "Date")
-				get_column(index).visible = columnDate.active;
-			else if(tvc.title == "Rating")
-				get_column(index).visible = columnRating.active;
-			else if(tvc.title == "Comment")
-				get_column(index).visible = columnComments.active;
-			else if(tvc.title == "Category")
-				get_column(index).visible = columnCategory.active;
-
-			++index;
-		}
-
-		tvs.set_columns(get_columns());
-	}
-
-	/** media menu popup clicks **/
-	public virtual void mediaMenuEditClicked() {
-		var to_edit = new LinkedList<int>();
-		
-		foreach(Media m in get_selected_medias()) {
-			to_edit.add(m.rowid);
-		}
-		
-		/*if(!GLib.File.new_for_path(media_from_id(id).file).query_exists() && media_from_id(id).file.contains(settings.getMusicFolder())) {
-			media_from_id(id).unique_status_image = Icons.process_error_icon;
-			lw.media_not_found(id);
-		}
-		else {*/
-			var list = new LinkedList<int>();
-			for(int i = 0; i < get_visible_table().size(); ++i) {
-				list.add(get_media_from_index(i).rowid);
-			}
-			PodcastEditor pe = new PodcastEditor(lm, list, to_edit);
-			pe.podcasts_saved.connect(podcastEditorSaved);
-		//}
-	}
-
-	public virtual void podcastEditorSaved(LinkedList<int> medias) {
-		LinkedList<Media> toUpdate = new LinkedList<Media>();
-		foreach(int i in medias)
-			toUpdate.add(lm.media_from_id(i));
-
-		// user could have edited rating, so record time
-		lm.update_medias(toUpdate, true, true);
-	}
-
-	public virtual void mediaFileBrowseClicked() {
-		int count = 0;
-		foreach(Media m in get_selected_medias()) {
-			try {
-				var file = File.new_for_uri(m.uri);
-				Gtk.show_uri(null, file.get_parent().get_uri(), 0);
-			}
-			catch(GLib.Error err) {
-				debug("Could not browse media %s: %s\n", m.uri, err.message);
-			}
-
-			if(count > 10) {
-				lw.doAlert("Stopping File Browse", "Too many medias have already been opened in File Browser. Stopping any more openings.");
-				return;
-			}
-		}
-	}
-
-	void mediaSaveLocallyClicked() {
-		var toSave = new LinkedList<int>();
-		
-		foreach(Media m in get_selected_medias()) {
-			toSave.add(m.rowid);
-		}
-
-		lm.pm.save_episodes_locally(toSave);
-	}
-
-	public virtual void mediaMenuQueueClicked() {
-		foreach(Media m in get_selected_medias()) {
-			App.player.queue_media_by_id(m.rowid);
-		}
-	}
-	
-	void mediaRateMediaClicked() {
-		var los = new LinkedList<Media>();
-		int new_rating = mediaRateMedia.rating_value;
-		
-		foreach(Media m in get_selected_medias()) {
-			m.rating = new_rating;
-			los.add(m);
-		}
-
-		lm.update_medias(los, false, true);
-	}
-
-	public virtual void mediaMenuNewPlaylistClicked() {
-		Playlist p = new Playlist();
-		
-		var to_add = new LinkedList<int>();
-		foreach(Media m in get_selected_medias()) {
-			to_add.add(m.rowid);
-		}
-		p.addMedias(to_add);
-		
-		PlaylistNameWindow pnw = new PlaylistNameWindow(lw, p);
-		pnw.playlist_saved.connect( (newP) => {
-			lm.add_playlist(p);
-			lw.addSideListItem(p);
-		});
-	}
-
-	public virtual void mediaRemoveClicked() {
-		LinkedList<Media> toRemove = new LinkedList<Media>();
-		LinkedList<int> toRemoveIDs = new LinkedList<int>();
-
-		foreach(Media m in get_selected_medias()) {
-			toRemoveIDs.add(m.rowid);
-
-			if(get_hint() == ViewWrapper.Hint.PODCAST) {
-				toRemove.add(m);
-			}
-		}
-
-		if(get_hint() == ViewWrapper.Hint.PODCAST) {
-			var dialog = new RemoveFilesDialog (lm.lw, toRemove, get_hint());
-
-			dialog.remove_media.connect ( (delete_files) => {
-				lm.remove_medias (toRemove, delete_files);
-			});
-		}
-	}
-
-	void importToLibraryClicked() {
-		var to_import = new LinkedList<int>();
-		
-		foreach(Media m in get_selected_medias()) {
-			to_import.add(m.rowid);
-		}
-
-		import_requested(to_import);
-	}
-
-	public virtual void onDragDataGet(Gdk.DragContext context, Gtk.SelectionData selection_data, uint info, uint time_) {
-		string[] uris = null;
-
-		foreach(Media m in get_selected_medias()) {
-			debug("adding %s\n", m.uri);
-			uris += (m.uri);
-		}
-
-		if (uris != null)
-			selection_data.set_uris(uris);
-	}
-	
-	int view_compare_func (int col, Gtk.SortType dir, Media a_media, Media b_media) {
-		int rv = 0;
-		
-		if(col == PodcastColumn.EPISODE) {
-			rv = (int)(a_media.track - b_media.track);
-		}
-		else if(col == PodcastColumn.NAME) {
-			rv = advanced_string_compare(a_media.title.down(), b_media.title.down());
-		}
-		else if(col == PodcastColumn.LENGTH) {
-			rv = (int)(a_media.length - b_media.length);
-		}
-		else if(col == PodcastColumn.ARTIST) {
-			if(a_media.artist.down() == b_media.artist.down()) {
-				//if(a_media.album.down() == b_media.album.down()) {
-					if(a_media.podcast_date == b_media.podcast_date) {
-						rv = advanced_string_compare(a_media.album.down(), b_media.album.down());
-					}
-					else {
-						rv = (int)(b_media.podcast_date - a_media.podcast_date);
-					}
-				//}
-				//else
-				//	rv = advanced_string_compare(a_media.album.down(), b_media.album.down());
-			}
-			else
-				rv = advanced_string_compare(a_media.artist.down(), b_media.artist.down());
-		}
-		else if(col == PodcastColumn.PODCAST) {
-			if(a_media.album.down() == b_media.album.down()) {
-				if(a_media.artist.down() == b_media.artist.down()) {
-					if(a_media.podcast_date == b_media.podcast_date) {
-						rv = advanced_string_compare(a_media.uri, b_media.uri);
-					}
-					else {
-						rv = (int)(b_media.podcast_date - a_media.podcast_date);
-					}
-				}
-				else
-					rv = advanced_string_compare(a_media.artist.down(), b_media.artist.down());
-			}
-			else
-				rv = advanced_string_compare(a_media.album.down(), b_media.album.down());
-		}
-		else if(col == PodcastColumn.DATE) {
-			rv = (int)(a_media.podcast_date - b_media.podcast_date);
-		}
-		else if(col == PodcastColumn.CATEGORY) {
-			rv = advanced_string_compare(a_media.genre.down(), b_media.genre.down());
-		}
-		else if(col == PodcastColumn.RATING) {
-			rv = (int)(a_media.rating - b_media.rating);
-		}
-		else {
-			rv = 0;
-		}
-		
-		if(rv == 0 && col != PodcastColumn.ARTIST && col != PodcastColumn.PODCAST)
-			rv = advanced_string_compare(a_media.uri, b_media.uri);
-		
-		if(sort_direction == SortType.DESCENDING)
-			rv = (rv > 0) ? -1 : 1;
-		
-		return rv;
-	}
-	
-	Value view_value_func (int row, int column, Media s) {
-		Value val;
-		
-		if(column == PodcastColumn.ROWID)
-			val = (int)s.rowid;
-		else if(column == PodcastColumn.ICON) {
-			if(App.player.media_info.media != null && App.player.media_info.media.rowid == s.rowid)
-				val = playing_icon;
-			else if(s.unique_status_image != null)
-				val = s.unique_status_image;
-			else if(s.last_played == 0)
-				val = new_podcast_icon;
-			else if(!s.uri.has_prefix("http://"))
-				val = saved_locally_icon;
-			else
-				val = Value(typeof(GLib.Icon));
-		}
-		else if(column == PodcastColumn.EPISODE)
-			val = (int)s.track;
-		else if(column == PodcastColumn.NAME)
-			val = s.title;
-		else if(column == PodcastColumn.LENGTH)
-			val = (int)s.length;
-		else if(column == PodcastColumn.ARTIST)
-			val = s.artist;
-		else if(column == PodcastColumn.PODCAST)
-			val = s.album;
-		else if(column == PodcastColumn.DATE)
-			val = (int)s.podcast_date;
-		else if(column == PodcastColumn.CATEGORY)
-			val = s.genre; // category
-		else if(column == PodcastColumn.COMMENT)
-			val = s.comment;
-		else if(column == PodcastColumn.RATING)
-			val = (int)s.rating;
-		else
-			val = (int)s.pulseProgress;
-		
-		return val;
-	}
-}
-

=== removed directory 'plugins/store'
=== removed file 'plugins/store/Artist.vala'
--- plugins/store/Artist.vala	2012-04-26 06:03:25 +0000
+++ plugins/store/Artist.vala	1970-01-01 00:00:00 +0000
@@ -1,196 +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 Gee;
-using Xml;
-
-public class Store.Artist : Store.SearchResult {
-	public int artistID;
-	public string name;
-	public string sortName;
-	public string appearsAs;
-	public string imagePath;
-	public string url;
-	public double popularity;
-	public Gdk.Pixbuf image;
-	
-	public signal void artist_fetched();
-	
-	/* Gets all the details of the artist */
-	public Artist(int id) {
-		artistID = id;
-	}
-	
-	public LinkedList<Store.Release>? getReleases(string? type, int page) {
-		var rv = new LinkedList<Store.Release>();
-		
-		string url = Store.store.api + "artist/releases" + "?artistid=" + artistID.to_string() + 
-					"&oauth_consumer_key=" + Store.store.key + 
-					"&country=" + Store.store.country + 
-					"&page=" + page.to_string() + 
-					((type != null) ? ("&type=" + type) : "") + 
-					"&imagesize=100";
-		
-		stdout.printf("parsing %s\n", url);
-		
-		var session = new Soup.SessionSync();
-		var message = new Soup.Message ("GET", url);
-		session.send_message(message);
-		
-		Xml.Node* node = Store.XMLParser.getRootNode(message);
-		if(node == null)
-			return rv;
-        
-		for (Xml.Node* iter = node->children; iter != null; iter = iter->next) {
-			if (iter->type != ElementType.ELEMENT_NODE) {
-				continue;
-			}
-			
-			if(iter->name == "release") {
-				Store.Release toAdd = Store.XMLParser.parseRelease(iter);
-				
-				if(toAdd != null) {
-					stdout.printf("release result: %s %s %s\n", toAdd.title, toAdd.artist.name, toAdd.url);
-					rv.add(toAdd);
-				}
-			}
-		}
-		
-		return rv;
-	}
-	
-	public LinkedList<Store.Artist>? getSimilar(int page) {
-		var rv = new LinkedList<Store.Artist>();
-		
-		string url = Store.store.api + "artist/similar" + "?artistid=" + artistID.to_string() + 
-					"&oauth_consumer_key=" + Store.store.key + 
-					"&country=" + Store.store.country + 
-					"&page=" + page.to_string();
-		
-		stdout.printf("parsing %s\n", url);
-		
-		var session = new Soup.SessionSync();
-		var message = new Soup.Message ("GET", url);
-		session.send_message(message);
-		
-		Xml.Node* node = Store.XMLParser.getRootNode(message);
-		if(node == null)
-			return rv;
-        
-		for (Xml.Node* iter = node->children; iter != null; iter = iter->next) {
-			if (iter->type != ElementType.ELEMENT_NODE) {
-				continue;
-			}
-			
-			if(iter->name == "artist") {
-				Store.Artist toAdd = Store.XMLParser.parseArtist(iter);
-				
-				if(toAdd != null)
-					rv.add(toAdd);
-			}
-		}
-		
-		return rv;
-	}
-	
-	public LinkedList<Store.Track> getTopTracks(int page, int max) {
-		var rv = new LinkedList<Store.Track>();
-		
-		string url = Store.store.api + "track/search" + "?q=" + name + 
-					"&oauth_consumer_key=" + Store.store.key + 
-					"&country=" + Store.store.country + 
-					"&page=" + page.to_string() + 
-					"&pagesize=100";
-		
-		stdout.printf("parsing %s\n", url);
-		
-		var session = new Soup.SessionSync();
-		var message = new Soup.Message ("GET", url);
-		session.send_message(message);
-		
-		Xml.Node* node = Store.XMLParser.getRootNode(message);
-		if(node == null)
-			return rv;
-        
-		for (Xml.Node* iter = node->children; iter != null; iter = iter->next) {
-			if (iter->type != ElementType.ELEMENT_NODE) {
-				continue;
-			}
-			
-			if(iter->name == "searchResult") {
-				Store.Track toAdd = new Store.Track(0);
-				
-				for(Xml.Node* subIter = iter->children; subIter != null; subIter = subIter->next) {
-					if(subIter->name == "track")
-						toAdd = Store.XMLParser.parseTrack(subIter);
-				}
-				
-				if(toAdd != null && toAdd.artist.name == name) {
-					stdout.printf("track result: %s %s %s\n", toAdd.title, toAdd.artist.name, toAdd.url);
-					toAdd.searchType = "track";
-					rv.add(toAdd);
-					
-					if(rv.size >= max)
-						return rv;
-				}
-			}
-		}
-		
-		return rv;
-	}
-	
-	public LinkedList<Store.Tag> getTags(int page) {
-		var rv = new LinkedList<Store.Tag>();
-		
-		string url = Store.store.api + "artist/tags" + "?artistid=" + artistID.to_string() + 
-					"&oauth_consumer_key=" + Store.store.key + 
-					"&country=" + Store.store.country + 
-					"&page=" + page.to_string();
-		
-		stdout.printf("parsing %s\n", url);
-		
-		var session = new Soup.SessionSync();
-		var message = new Soup.Message ("GET", url);
-		session.send_message(message);
-		
-		Xml.Node* node = Store.XMLParser.getRootNode(message);
-		if(node == null)
-			return rv;
-        
-		for (Xml.Node* iter = node->children; iter != null; iter = iter->next) {
-			if (iter->type != ElementType.ELEMENT_NODE) {
-				continue;
-			}
-			
-			if(iter->name == "tag") {
-				Store.Tag toAdd = Store.XMLParser.parseTag(iter);
-				
-				if(toAdd != null)
-					rv.add(toAdd);
-			}
-		}
-		
-		return rv;
-	}
-	
-	
-}

=== removed file 'plugins/store/Basket.vala'
--- plugins/store/Basket.vala	2012-04-26 06:03:25 +0000
+++ plugins/store/Basket.vala	1970-01-01 00:00:00 +0000
@@ -1,36 +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 Gee;
-
-public class Store.Basket : GLib.Object {
-	public string basketID;
-	public int itemCount;
-	public Store.Price price;
-	public Store.Price amountDue;
-	public LinkedList<Store.BasketItem> basketItems;
-	
-	public Basket(string id) {
-		basketID = id;
-		basketItems = new LinkedList<Store.BasketItem>();
-	}
-}

=== removed file 'plugins/store/BasketItem.vala'
--- plugins/store/BasketItem.vala	2012-04-26 06:03:25 +0000
+++ plugins/store/BasketItem.vala	1970-01-01 00:00:00 +0000
@@ -1,37 +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.
- */
-
-public class Store.BasketItem : GLib.Object {
-	public int basketItemID;
-	public string type;
-	public string itemName;
-	public string artistName;
-	public int trackID;
-	public int releaseID;
-	public Store.Price price;
-	public Store.Price amountDue;
-	public string discount;
-	
-	public BasketItem(int id) {
-		basketItemID = id;
-	}
-}

=== removed file 'plugins/store/FormatTag.vala'
--- plugins/store/FormatTag.vala	2012-04-26 06:03:25 +0000
+++ plugins/store/FormatTag.vala	1970-01-01 00:00:00 +0000
@@ -1,35 +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.
- */
-
-public class Store.Format : GLib.Object {
-	public int formatID;
-	public string fileFormat;
-	public int bitrate;
-	public bool drmFree;
-	
-	public Format(int id) {
-		formatID = id;
-		fileFormat = "";
-		bitrate = 0;
-		drmFree = false;
-	}
-}

=== removed file 'plugins/store/Label.vala'
--- plugins/store/Label.vala	2012-04-26 06:03:25 +0000
+++ plugins/store/Label.vala	1970-01-01 00:00:00 +0000
@@ -1,47 +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.
- */
-
-public class Store.Label : GLib.Object {
-	public int labelID;
-	public string name;
-	
-	public Label(int id) {
-		labelID = id;
-		name = "";
-	}
-}
-
-public class Store.Tag : GLib.Object {
-	public string tagID;
-	public string text;
-	public string url;
-	
-	public Tag(string id) {
-		tagID = id;
-	}
-	
-	public Tag.with_values(string id, string text, string url) {
-		this.tagID = id;
-		this.text = text;
-		this.url = url;
-	}
-}

=== removed file 'plugins/store/Price.vala'
--- plugins/store/Price.vala	2012-04-26 06:03:25 +0000
+++ plugins/store/Price.vala	1970-01-01 00:00:00 +0000
@@ -1,39 +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.
- */
-
-public class Store.Price : GLib.Object {
-	public string currencyCode;
-	public double val;
-	public string formattedPrice;
-	public double rrp;
-	public string formattedRrp;
-	public bool onSale;
-	
-	public Price() {
-		currencyCode = "$";
-		val = 0;
-		formattedPrice = "$0.00";
-		rrp = 0f;
-		formattedRrp = "$0.00";
-		onSale = false;
-	}
-}

=== removed file 'plugins/store/Release.vala'
--- plugins/store/Release.vala	2012-04-26 06:03:25 +0000
+++ plugins/store/Release.vala	1970-01-01 00:00:00 +0000
@@ -1,156 +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 Gee;
-using Xml;
-
-public class Store.Release : Store.SearchResult {
-	public int releaseID;
-	public string title;
-	public string version;
-	public string type;
-	public int barcode;
-	public int year;
-	public bool explicitContent;
-	public Store.Artist artist;
-	public string imagePath;
-	public string url;
-	public string releaseDate;
-	public string addedDate;
-	public Store.Price price;
-	public bool availableDrmFree;
-	public LinkedList<Store.Format> formats;
-	public Store.Label label;
-	public Gdk.Pixbuf image;
-	
-	public Release(int id) {
-		releaseID = id;
-		
-		formats = new LinkedList<Store.Format>();
-		price = new Store.Price();
-	}
-	
-	public LinkedList<Store.Release> getSimilar(int page) {
-		var rv = new LinkedList<Store.Release>();
-		
-		string url = Store.store.api + "release/recommend" + "?releaseid=" + releaseID.to_string() + 
-					"&oauth_consumer_key=" + Store.store.key + 
-					"&country=" + Store.store.country + 
-					"&page=" + page.to_string() + 
-					"&imagesize=100";
-		
-		stdout.printf("parsing %s\n", url);
-		
-		var session = new Soup.SessionSync();
-		var message = new Soup.Message ("GET", url);
-		session.send_message(message);
-		
-		Xml.Node* node = Store.XMLParser.getRootNode(message);
-		if(node == null)
-			return rv;
-        
-		for (Xml.Node* iter = node->children; iter != null; iter = iter->next) {
-			if (iter->type != ElementType.ELEMENT_NODE) {
-				continue;
-			}
-			
-			if(iter->name == "recommendedItem") {
-				Store.Release toAdd = Store.XMLParser.parseRelease(iter->children);
-				
-				stdout.printf("recommended: %s %s %s\n", toAdd.title, toAdd.artist.name, toAdd.url);
-				if(toAdd != null)
-					rv.add(toAdd);
-			}
-		}
-		
-		return rv;
-	}
-	
-	public LinkedList<Store.Track> getTracks() {
-		var rv = new LinkedList<Store.Track>();
-		
-		string url = Store.store.api + "release/tracks" + "?releaseid=" + releaseID.to_string() + 
-					"&oauth_consumer_key=" + Store.store.key + 
-					"&country=" + Store.store.country +
-					"&pageSize=50";
-		
-		stdout.printf("parsing %s\n", url);
-		
-		var session = new Soup.SessionSync();
-		var message = new Soup.Message ("GET", url);
-		session.send_message(message);
-		
-		Xml.Node* node = Store.XMLParser.getRootNode(message);