From 4b4588735086d6d1d02e352acea84a73b36b70c9 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Wed, 19 Dec 2018 13:37:05 +0800
Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala

---
 RepoStatusPopover.bjs  | 13 +++++++------
 RepoStatusPopover.vala |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index 89222f0c..2cda159c 100644
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -35,8 +35,8 @@
        "items" : [
         {
          "Gtk.ToolbarStyle toolbar_style" : "Gtk.ToolbarStyle.BOTH_HORIZ",
-         "* pack" : "add",
          "xtype" : "Toolbar",
+         "* pack" : "add",
          "$ xns" : "Gtk",
          "items" : [
           {
@@ -95,15 +95,15 @@
        "items" : [
         {
          "id" : "label_status",
-         "xtype" : "Label",
          "* pack" : false,
+         "xtype" : "Label",
          "$ xns" : "Gtk",
          "utf8 label" : "Status"
         },
         {
          "id" : "label_diff",
-         "* pack" : false,
          "xtype" : "Label",
+         "* pack" : false,
          "$ xns" : "Gtk",
          "utf8 label" : "Diff"
         },
@@ -139,8 +139,8 @@
          "items" : [
           {
            "int height_request" : 400,
-           "xtype" : "ScrolledWindow",
            "* pack" : "pack_start,true,true,0",
+           "xtype" : "ScrolledWindow",
            "$ xns" : "Gtk",
            "items" : [
             {
@@ -167,8 +167,8 @@
        "items" : [
         {
          "Gtk.ToolbarStyle toolbar_style" : "Gtk.ToolbarStyle.BOTH_HORIZ",
-         "xtype" : "Toolbar",
          "* pack" : "add",
+         "xtype" : "Toolbar",
          "$ xns" : "Gtk",
          "items" : [
           {
@@ -184,7 +184,8 @@
           },
           {
            "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}"
+            "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" : ""
            },
            "label" : "Merge branch/  ticket",
            "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-goto-top\", Gtk.IconSize.SMALL_TOOLBAR), null);",
diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index bba5b298..c521515d 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -679,6 +679,7 @@ public class RepoStatusPopover : Object
                }
                 return false;
             });
+            this.el.clicked.connect( );
         }
 
         // user defined functions
-- 
2.39.2