From: Alan Knowles <alan@roojs.com>
Date: Wed, 19 Dec 2018 05:37:47 +0000 (+0800)
Subject: RepoStatusPopover.bjs
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=b69954e932ce51ea01e6ab8bfcb623d06df78224

RepoStatusPopover.bjs
RepoStatusPopover.vala
---

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index a6d3547b..799c83fb 100644
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -184,10 +184,9 @@
           },
           {
            "listeners" : {
-            "button_press_event" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   if (_this.repo.activeTicket != null) {\n\t   MergeBranch.singleton().show(_this.repo.activeTicket, null);   \n   }\n    return false;\n}",
-            "clicked" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   if (_this.repo.activeTicket != null) {\n\t   MergeBranch.singleton().show(_this.repo.activeTicket, null);   \n   }\n    return false;\n}"
+            "clicked" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   if (_this.repo.activeTicket != null) {\n\t   MergeBranch.singleton().show(_this.repo.activeTicket, null);   \n   }\n    return ;\n}"
            },
-           "label" : "Merge branch/  ticket",
+           "label" : "Merge branch/  Completed ticket",
            "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-goto-top\", Gtk.IconSize.SMALL_TOOLBAR), null);",
            "xtype" : "ToolButton",
            "* pack" : "add",
diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index c101ae68..59a05e4e 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -666,19 +666,10 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Merge branch/  ticket";
+            this.el.label = "Merge branch/  Completed ticket";
             this.el.is_important = true;
 
             //listeners
-            this.el.button_press_event.connect( () => {
-            
-               _this.el.hide();
-               Clones.singleton().el.response(-1);
-               if (_this.repo.activeTicket != null) {
-            	   MergeBranch.singleton().show(_this.repo.activeTicket, null);   
-               }
-                return false;
-            });
             this.el.clicked.connect( () => {
             
                _this.el.hide();
@@ -686,7 +677,7 @@ public class RepoStatusPopover : Object
                if (_this.repo.activeTicket != null) {
             	   MergeBranch.singleton().show(_this.repo.activeTicket, null);   
                }
-                return false;
+                return ;
             });
         }