sync
[gitlive] / StatusIcon.vala
index 137d750..efedeba 100644 (file)
@@ -225,7 +225,7 @@ public class StatusIconA : StatusIcon {
                        this.label = ("Merge [%s] #%s %s".printf(r.name, t.id , t.summary));
 
                                this.activate.connect(() => {
-                                       MergeBranch.singleton().show(this.ticket);
+                                       MergeBranch.singleton().show(this.ticket, null);
                                        // show merge dialog..
                                });
                
@@ -459,7 +459,9 @@ public class StatusIconA : StatusIcon {
                 this.accel_group = null;
                 
                 this.activate.connect( () => {
-                      Clones.singleton().show();
+                       GitRepo.updateAll("show_clones");
+                
+                     // Clones.singleton().show();
                 });
             }