Clones.bjs

[gitlive] / StatusIcon.vala

diff --git a/StatusIcon.vala b/StatusIcon.vala
index 7118d69..efedeba 100644 (file)
--- a/StatusIcon.vala
+++ b/StatusIcon.vala
@@ -194,7 +194,7 @@ public class StatusIconA : StatusIcon {
                        this.remove(m);
                }
                foreach(var r in GitRepo.singleton().cache.values ) {
-                       GLib.debug("checking %s for branch = %s", r.name, r.activeBranch.name);
+                       GLib.debug("checking %s for branch = %s", r.name, r.currentBranch.name);
                        if (!r.is_wip_branch()) {
                                continue;
                                }
@@ -204,13 +204,14 @@ public class StatusIconA : StatusIcon {
                                        continue;
                                }
                                var mi = new MergeMenuItem(r,t);
-                               this.insert (mi,4); //backwards..                               
+                               this.insert (mi,4); //backwards.
+                               this.merge_items.add(mi);                       
                                 
                }
                
         }
         
-        
+       
         class MergeMenuItem : Gtk.MenuItem {        
         
                GitRepo repo;
@@ -224,6 +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, null);
                                        // show merge dialog..
                                });
                
@@ -457,7 +459,9 @@ public class StatusIconA : StatusIcon {
                 this.accel_group = null;
                 
                 this.activate.connect( () => {
-                      Clones.singleton().show();
+                       GitRepo.updateAll("show_clones");
+                
+                     // Clones.singleton().show();
                 });
             }