From aea3f7b9ab5b43ae7be8c182c5db2092b691d162 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 28 Dec 2018 14:55:40 +0800
Subject: [PATCH] MergeBranch.bjs MergeBranch.vala

---
 MergeBranch.bjs  | 14 +++++++-------
 MergeBranch.vala | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/MergeBranch.bjs b/MergeBranch.bjs
index 9282dcf8..7575206e 100644
--- a/MergeBranch.bjs
+++ b/MergeBranch.bjs
@@ -163,6 +163,13 @@
          "xtype" : "Box",
          "gboolean homogeneous" : false,
          "$ xns" : "Gtk",
+         "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL"
+        },
+        {
+         "* pack" : "append_page,_this.label_ticket.el",
+         "xtype" : "Box",
+         "gboolean homogeneous" : false,
+         "$ xns" : "Gtk",
          "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
          "items" : [
           {
@@ -184,13 +191,6 @@
            ]
           }
          ]
-        },
-        {
-         "* pack" : "append_page,_this.label_ticket.el",
-         "xtype" : "Box",
-         "gboolean homogeneous" : false,
-         "$ xns" : "Gtk",
-         "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL"
         }
        ]
       },
diff --git a/MergeBranch.vala b/MergeBranch.vala
index ed1618b9..a85153c1 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -674,7 +674,7 @@ public class MergeBranch : Object
             var child_2 = new Xcls_Box17( _this );
             child_2.ref();
             this.el.append_page (  child_2.el , _this.label_diff.el );
-            var child_3 = new Xcls_Box20( _this );
+            var child_3 = new Xcls_Box18( _this );
             child_3.ref();
             this.el.append_page (  child_3.el , _this.label_ticket.el );
         }
@@ -743,6 +743,29 @@ public class MergeBranch : Object
 
             // my vars (dec)
 
+            // set gobject values
+            this.el.homogeneous = false;
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_Box18 : Object
+    {
+        public Gtk.Box el;
+        private MergeBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Box18(MergeBranch _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
+
+            // my vars (dec)
+
             // set gobject values
             this.el.homogeneous = false;
             var child_0 = new Xcls_scrolled_window( _this );
@@ -830,29 +853,6 @@ public class MergeBranch : Object
 
 
 
-    public class Xcls_Box20 : Object
-    {
-        public Gtk.Box el;
-        private MergeBranch  _this;
-
-
-            // my vars (def)
-
-        // ctor
-        public Xcls_Box20(MergeBranch _owner )
-        {
-            _this = _owner;
-            this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
-
-            // my vars (dec)
-
-            // set gobject values
-            this.el.homogeneous = false;
-        }
-
-        // user defined functions
-    }
-
 
     public class Xcls_spinner : Object
     {
-- 
2.39.2