X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=RepoStatusPopover.vala;h=dbe3bb1d0d1bac31c7e59785ddd1c11d1f1a8a14;hp=a99b5fc6e54af7fccc1372d396bbfbe3ab343645;hb=4a4852b09ec5d48748d204dd8b658146bd5eb3a5;hpb=0102e3c0c764580aa3fda52c39853d2668ff61d2

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index a99b5fc6..dbe3bb1d 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -16,6 +16,7 @@ public class RepoStatusPopover : Object
     public Xcls_label_diff label_diff;
     public Xcls_status_view status_view;
     public Xcls_diff_view diff_view;
+    public Xcls_btn_merge btn_merge;
 
         // my vars (def)
     public GitRepo repo;
@@ -605,7 +606,7 @@ public class RepoStatusPopover : Object
             var child_0 = new Xcls_ToolButton20( _this );
             child_0.ref();
             this.el.add (  child_0.el  );
-            var child_1 = new Xcls_ToolButton21( _this );
+            var child_1 = new Xcls_btn_merge( _this );
             child_1.ref();
             this.el.add (  child_1.el  );
             var child_2 = new Xcls_ToolButton22( _this );
@@ -649,7 +650,7 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-    public class Xcls_ToolButton21 : Object
+    public class Xcls_btn_merge : Object
     {
         public Gtk.ToolButton el;
         private RepoStatusPopover  _this;
@@ -658,9 +659,10 @@ public class RepoStatusPopover : Object
             // my vars (def)
 
         // ctor
-        public Xcls_ToolButton21(RepoStatusPopover _owner )
+        public Xcls_btn_merge(RepoStatusPopover _owner )
         {
             _this = _owner;
+            _this.btn_merge = this;
             this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-top", Gtk.IconSize.SMALL_TOOLBAR), null);;
 
             // my vars (dec)