* MainWindow.cs, Main.cs, CreateTorrentDialog.cs, TorrentController.cs,

  PeerTreeView.cs, RssManager/RssManagerDialog.cs,
  RssManager/TorrentRssWatcher.cs,
  RssManager/RssManagerController.cs, TorrentTreeView.cs: Ensure all
  events are synced on the main loop
* libs/MonoTorrent.dll: Update to head of the 0.50 branch

svn path=/trunk/monsoon/; revision=114328

Monsoon/ChangeLog

@@ -1,3 +1,12 @@
+2008-09-28  Alan McGovern <alan.mcgovern@gmail.com> 
+
+	* MainWindow.cs, Main.cs, CreateTorrentDialog.cs, TorrentController.cs,
+	  PeerTreeView.cs, RssManager/RssManagerDialog.cs,
+	  RssManager/TorrentRssWatcher.cs,
+	  RssManager/RssManagerController.cs, TorrentTreeView.cs: Ensure all
+	  events are synced on the main loop
+	* libs/MonoTorrent.dll: Update to head of the 0.50 branch
+
 2008-09-22  Alan McGovern <alan.mcgovern@gmail.com> 
 
 	* Settings/GconfTorrentSettingsController.cs,

Monsoon/CreateTorrentDialog.cs

@@ -201,10 +201,14 @@ private void createTorrent()
 			creator.Comment = Comment;
 			creator.CreatedBy = Defines.ApplicationName;
 
-			creator.Path = SavePath;
-
-			creator.Hashed += OnHashed;
-
+			creator.Path = SavePath;
+
+			creator.Hashed += delegate(object o, TorrentCreatorEventArgs e) {
+				GLib.Idle.Add(delegate {
+					OnHashed(o, e);
+					return false;
+				});
+			};
 			TorrentCreatorAsyncResult creatorResult = creator.BeginCreate(null, BeginCreateCb);
 
 			ResponseType cancelResult = (ResponseType) progressDialog.Run();
@@ -221,9 +225,7 @@ private void createTorrent()
 
 		private void OnHashed(object sender, TorrentCreatorEventArgs args)
 		{
-			Gtk.Application.Invoke (delegate {
-				progressDialog.Progress = args.OverallCompletion;
-			});
+			progressDialog.Progress = args.OverallCompletion;
 		}
 
 		private void BeginCreateCb(IAsyncResult result)

Monsoon/Main.cs

@@ -82,6 +82,7 @@ public MainClass(string [] args)
 
 			if (DBusInstance.AlreadyRunning)
 			{
+				Console.WriteLine("Already running");
 				DBusInstance.CommandParser.ParseCommands (args);
 				return;
 			}

Monsoon/MainWindow.cs

@@ -76,7 +76,7 @@ public partial class MainWindow: Gtk.Window
 
 		private PeerTreeView peerTreeView;
 		private ListStore peerListStore;
-		private Dictionary<PeerId, TreeIter> peers;
+		private Dictionary<PeerId, TreePath> peers;
 		private TreeModelFilter peerFilter;
 
 		private FileTreeView fileTreeView;
@@ -97,7 +97,7 @@ public partial class MainWindow: Gtk.Window
 
 		private RssManagerController rssManagerController;
 
-		internal Dictionary<PeerId, TreeIter> Peers
+		internal Dictionary<PeerId, TreePath> Peers
 		{
 			get { return peers; }
 		}
@@ -187,8 +187,19 @@ public MainWindow (EngineSettings engineSettings, ListenPortController portContr
 		{
 			this.engineSettings = engineSettings;
 			this.portController = portController;
-			portController.PortMapped += delegate { natStatus.PortForwarded = true; };
-			portController.RouterFound += delegate { natStatus.RouterFound = true; };
+			portController.PortMapped += delegate {
+				GLib.Idle.Add(delegate {
+					natStatus.PortForwarded = true;
+					return false;
+				});
+			};
+
+			portController.RouterFound += delegate {
+				GLib.Idle.Add(delegate {
+					natStatus.RouterFound = true;
+					return false;
+				});
+			};
 
 			interfaceSettings = new GConfInterfaceSettingsController ();
 			defaultTorrentSettings = new GconfTorrentSettingsController ();
@@ -203,7 +214,9 @@ public MainWindow (EngineSettings engineSettings, ListenPortController portContr
 
 			Ticker.Tick ();
 			Ticker.Tick ();
+
 			Build ();
+
 			Ticker.Tock ("Build");
 			Ticker.Tick();
 			BuildStatusBar();
@@ -251,8 +264,13 @@ public MainWindow (EngineSettings engineSettings, ListenPortController portContr
 			RestoreLabels ();
 			Ticker.Tock ("Restored labels");
 
-			folderWatcher = new TorrentFolderWatcher (new DirectoryInfo (Preferences.ImportLocation));
-			folderWatcher.TorrentFound += torrentController.OnTorrentFound;
+			folderWatcher = new TorrentFolderWatcher (new DirectoryInfo (Preferences.ImportLocation));
+			folderWatcher.TorrentFound += delegate(object o, TorrentWatcherEventArgs e) {
+				GLib.Idle.Add(delegate {
+					torrentController.OnTorrentFound(o, e);
+					return false;
+				});
+			};
 
 			if (Preferences.ImportEnabled) {
 				logger.Info ("Starting import folder watcher");
@@ -654,8 +672,8 @@ private bool FilterTorrentTree (TreeModel model, TreeIter iter)
 		*/
 
 		private void BuildPeerTreeView ()
-		{
-			peers = new Dictionary<MonoTorrent.Client.PeerId,Gtk.TreeIter> ();
+		{
+            peers = new Dictionary<MonoTorrent.Client.PeerId, Gtk.TreePath>();
 			peerTreeView = new PeerTreeView ();
 			peerListStore = new ListStore (typeof(PeerId));
 
@@ -771,15 +789,18 @@ private void OnLabelSelectionChanged (object sender, System.EventArgs e)
 
 			//torrentTreeView.Selection.UnselectAll();
 			//torrentFilter.Refilter();
-		}
-
-		private void updatePeersPage()
-		{		
-			lock(peers)
-				foreach(TreeIter iter in peers.Values){
-					peerListStore.EmitRowChanged(peerListStore.GetPath(iter), iter);
-				}
-		}
+		}
+
+        private void updatePeersPage()
+        {
+            lock (peers)
+            {
+                peerListStore.Foreach(delegate(TreeModel model, TreePath path, TreeIter iter) {
+                    peerListStore.EmitRowChanged(path, iter);
+                    return true;
+                });
+            }
+        }
 
 		private void updateStatusBar()
 		{
@@ -1182,7 +1203,7 @@ private void updateGeneralPage ()
 				}
 			}
 
-			swarmSpeedLabel.Text = ByteConverter.ConvertSpeed (torrentController.GetTorrentSwarm(manager) * manager.Torrent.PieceLength);
+			swarmSpeedLabel.Text = ByteConverter.ConvertSpeed (torrentController.GetTorrentSwarm(manager));
 			savePathValueLabel.Text = manager.SavePath;
 			sizeValueLabel.Text = ByteConverter.ConvertSize (manager.Torrent.Size);
 			createdOnValueLabel.Text = manager.Torrent.CreationDate.ToLongDateString ();
@@ -1543,8 +1564,13 @@ public void LoadTorrent (string path, bool ask)
 
 			try
 			{
-				TorrentManager manager = torrentController.addTorrent (torrent, savePath);
-				manager.PeerConnected += PeerConnected;
+				TorrentManager manager = torrentController.addTorrent (torrent, savePath);
+				manager.PeerConnected += delegate(object o, PeerConnectionEventArgs e) {
+					GLib.Idle.Add(delegate {
+						PeerConnected(o, e);
+						return false;
+					});
+				};
 			}
 			catch (Exception ex)
 			{

Monsoon/PeerTreeView.cs

@@ -110,7 +110,7 @@ private void RenderAddress (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gt
 			PeerId peer = (PeerId) model.GetValue (iter, 0);
 
 			if(peer.IsConnected)
-				(cell as Gtk.CellRendererText).Text = peer.Uri.Host;
+				(cell as Gtk.CellRendererText).Text = peer.Uri.Host + ":" + peer.Uri.Port;
 		}
 
 

Monsoon/RssManager/RssManagerController.cs

@@ -83,8 +83,13 @@ public bool AddWatcher(string url)
 				return false;
 
 			TorrentRssWatcher watcher = new TorrentRssWatcher(url);
-			feeds.Add(url);
-			watcher.TorrentFound += OnTorrentMatched;
+			feeds.Add(url);
+			watcher.TorrentFound += delegate(object o, TorrentRssWatcherEventArgs e) {
+				GLib.Idle.Add(delegate {
+					OnTorrentMatched(o, e);
+					return false;
+				});
+			};
 			watchers.Add(url, watcher);
 			watcher.StartWatching();
 			return true;
@@ -104,13 +109,18 @@ public bool RemoveWatcher(string url)
 
 
 		public void RestoreWatchers()
-		{
-			foreach(string feed in feeds){
-				TorrentRssWatcher watcher = new TorrentRssWatcher(feed);
-            			watcher.TorrentFound += OnTorrentMatched;
-            			watchers.Add(feed, watcher);
-            		}
-
+		{
+			foreach (string feed in feeds)
+			{
+				TorrentRssWatcher watcher = new TorrentRssWatcher(feed);
+				watcher.TorrentFound += delegate(object o, TorrentRssWatcherEventArgs e) {
+					GLib.Idle.Add(delegate {
+						OnTorrentMatched(o, e);
+						return false;
+					});
+				};
+				watchers.Add(feed, watcher);
+			}
 		}
 
 		public void StartWatchers()

Monsoon/RssManager/RssManagerDialog.cs

@@ -98,12 +98,10 @@ private void FetchFeeds(object sender, DoWorkEventArgs args)
 
 		private void FetchFeedsCompleted(object sender, RunWorkerCompletedEventArgs args)
 		{
-			Gtk.Application.Invoke (delegate {
-				itemListStore.Clear();
-				foreach(RssItem item in controller.Items){
-					itemListStore.AppendValues(item);
-				}
-			});
+			itemListStore.Clear();
+			foreach(RssItem item in controller.Items){
+				itemListStore.AppendValues(item);
+			}
 		}
 
 

Monsoon/RssManager/TorrentRssWatcher.cs

@@ -82,8 +82,13 @@ public void StartWatching()
 				return;
 
 
-			timer = new Timer();
-			timer.Elapsed += OnTimedEvent;
+			timer = new Timer();
+			timer.Elapsed += delegate {
+				GLib.Idle.Add(delegate {
+					OnTimedEvent(null, null);
+					return false;
+				});
+			};
 
 			// Set the Interval to 30 seconds.
 			timer.Interval=30000;