diff -Nru sparkleshare-0.4.1/data/git-hooks/post-update sparkleshare-0.4.1/data/git-hooks/post-update
--- sparkleshare-0.4.1/data/git-hooks/post-update	2011-11-30 00:00:05.000000000 +0000
+++ sparkleshare-0.4.1/data/git-hooks/post-update	2011-11-30 13:11:41.000000000 +0000
@@ -25,16 +25,16 @@
 #
 
 #  Change these if you run your own service somewhere
-SERVER = "notifications.sparkleshare.org"
-PORT   = "1986"
+SERVER="notifications.sparkleshare.org"
+PORT="1986"
 
 #  Don't edit below this line
 exec > /dev/null 2>&1
 
-CHANNEL = $(git rev-list --reverse HEAD | head -n 1)
-MESSAGE = $(git rev-list HEAD | head -n 1)
+CHANNEL=$(git rev-list --reverse HEAD | head -n 1)
+MESSAGE=$(git rev-list HEAD | head -n 1)
 
-DATA = "announce ${CHANNEL} ${MESSAGE}"
+DATA="announce ${CHANNEL} ${MESSAGE}"
 echo "${DATA}\n" | socat - TCP-CONNECT:${SERVER}:${PORT} &
 
 exit 0
diff -Nru sparkleshare-0.4.1/debian/bzr-builder.manifest sparkleshare-0.4.1/debian/bzr-builder.manifest
--- sparkleshare-0.4.1/debian/bzr-builder.manifest	2011-11-30 00:00:06.000000000 +0000
+++ sparkleshare-0.4.1/debian/bzr-builder.manifest	2011-11-30 13:11:42.000000000 +0000
@@ -1,2 +1,2 @@
-# bzr-builder format 0.3 deb-version {debupstream}-0~5
-lp:~cmn/sparkleshare/trunk revid:git-v1:b827c674d3f4642aed3ce848685affd4196ae307
+# bzr-builder format 0.3 deb-version {debupstream}-0~7
+lp:~cmn/sparkleshare/trunk revid:git-v1:0757c91a586256752dbcb4c2a635e13bd867f884
diff -Nru sparkleshare-0.4.1/debian/changelog sparkleshare-0.4.1/debian/changelog
--- sparkleshare-0.4.1/debian/changelog	2011-11-30 00:00:06.000000000 +0000
+++ sparkleshare-0.4.1/debian/changelog	2011-11-30 13:11:42.000000000 +0000
@@ -1,8 +1,8 @@
-sparkleshare (0.4.1-0~5~precise1) experimental; urgency=low
+sparkleshare (0.4.1-0~7~precise1) experimental; urgency=low
 
   * Auto build.
 
- -- Carlos Martín Nieto <carlos@cmartin.tk>  Wed, 30 Nov 2011 00:00:06 +0000
+ -- Carlos Martín Nieto <carlos@cmartin.tk>  Wed, 30 Nov 2011 13:11:42 +0000
 
 sparkleshare (0.4.1) experimental; urgency=low
 
diff -Nru sparkleshare-0.4.1/SparkleShare/Mac/SparkleController.cs sparkleshare-0.4.1/SparkleShare/Mac/SparkleController.cs
--- sparkleshare-0.4.1/SparkleShare/Mac/SparkleController.cs	2011-11-30 00:00:05.000000000 +0000
+++ sparkleshare-0.4.1/SparkleShare/Mac/SparkleController.cs	2011-11-30 13:11:41.000000000 +0000
@@ -214,7 +214,6 @@
         new public void Quit ()
         {
             this.watcher.Dispose ();
-            NSApplication.SharedApplication.Terminate (new NSObject ());
             base.Quit ();
         }
 	}
diff -Nru sparkleshare-0.4.1/SparkleShare/SparkleSetup.cs sparkleshare-0.4.1/SparkleShare/SparkleSetup.cs
--- sparkleshare-0.4.1/SparkleShare/SparkleSetup.cs	2011-11-30 00:00:05.000000000 +0000
+++ sparkleshare-0.4.1/SparkleShare/SparkleSetup.cs	2011-11-30 13:11:41.000000000 +0000
@@ -52,13 +52,6 @@
             return Catalog.GetString (s);
         }
 
-        public static int GetSelected (TreeView tree)
-        {
-            TreeIter iter;
-            TreeModel model;
-            tree.Selection.GetSelected(out model, out iter);
-            return int.Parse (model.GetPath (iter).ToString ());
-        }
 
         public SparkleSetup () : base ()
         {
@@ -144,7 +137,7 @@
                         ListStore store = new ListStore (typeof (Gdk.Pixbuf),
                             typeof (string), typeof (SparklePlugin));
 
-                        TreeView tree = new TreeView (store) { HeadersVisible = false };
+                        SparkleTreeView tree = new SparkleTreeView (store) { HeadersVisible = false };
                         ScrolledWindow scrolled_window = new ScrolledWindow ();
                         scrolled_window.AddWithViewport (tree);
 
@@ -220,7 +213,7 @@
 
                         // Update the address field text when the selection changes
                         tree.CursorChanged += delegate (object sender, EventArgs e) {
-                            Controller.SelectedPluginChanged (GetSelected(sender as TreeView));
+                            Controller.SelectedPluginChanged (tree.SelectedRow);
 
                             // TODO: Scroll to selected row when using arrow keys
                         };
@@ -267,7 +260,7 @@
                         AddressEntry.Completion.TextColumn = 0;
 
                         AddressEntry.Changed += delegate {
-                            Controller.CheckAddPage (AddressEntry.Text, PathEntry.Text, GetSelected(tree));
+                            Controller.CheckAddPage (AddressEntry.Text, PathEntry.Text, tree.SelectedRow);
                         };
 
                                 layout_address.PackStart (new Label () {
@@ -288,7 +281,7 @@
                                     PathEntry.Completion.TextColumn = 0;
 
                                     PathEntry.Changed += delegate {
-                                        Controller.CheckAddPage (AddressEntry.Text, PathEntry.Text, GetSelected(tree));
+                                        Controller.CheckAddPage (AddressEntry.Text, PathEntry.Text, tree.SelectedRow);
                                     };
 
                                 layout_path.PackStart (new Label () { Markup = "<b>" + _("Remote Path") + "</b>", Xalign = 0 },
@@ -324,7 +317,7 @@
                         AddButton (cancel_button);
                         AddButton (SyncButton);
 
-                        Controller.CheckAddPage (AddressEntry.Text, PathEntry.Text, GetSelected(tree));
+                        Controller.CheckAddPage (AddressEntry.Text, PathEntry.Text, tree.SelectedRow);
 
                         break;
                     }
@@ -614,4 +607,25 @@
             );
         }
     }
+
+
+    public class SparkleTreeView : TreeView {
+
+        public int SelectedRow
+        {
+            get {
+                TreeIter iter;
+                TreeModel model;
+
+                Selection.GetSelected (out model, out iter);
+
+                return int.Parse (model.GetPath (iter).ToString ());
+            }
+        }
+
+
+        public SparkleTreeView (ListStore store) : base (store)
+        {
+        }
+    }
 }