MergeBranch.bjs

MergeBranch.vala

diff --git a/MergeBranch.bjs b/MergeBranch.bjs
index 711b920..60640a2 100644 (file)
--- a/MergeBranch.bjs
+++ b/MergeBranch.bjs
@@ -15,6 +15,7 @@
    },
    "default_width" : 500,
    "$ deletable" : true,
+   "# GitRepo repo" : "",
    "title" : "Merge Branch",
    "xtype" : "Dialog",
    "|   void show" : "(  RooTicket ticket, GitRepo? repo ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    if (this.running) {\n    \treturn;\n\t}\n\tGitMonitor.gitmonitor.stop();\n\t\n    this.ticket = ticket;\n    this.repo = repo;\n    \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n       \tGLib.debug(\"Loading tickets\"); \n\n\n    this.el.show_all();\n \t_this.dbmodel.loadTickets();\n \t_this.actionmodel.loadActions();\n\n\n}",
@@ -22,7 +23,6 @@
    "# RooTicket? ticket" : "null",
    "$ xns" : "Gtk",
    "# bool running" : false,
-   "string XXXX" : "",
    "bool modal" : true,
    "items" : [
     {

diff --git a/MergeBranch.vala b/MergeBranch.vala
index c84b3c4..1ccc582 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -21,9 +21,9 @@ public class MergeBranch : Object
     public Xcls_name name;
 
         // my vars (def)
+    public GitRepo repo;
     public RooTicket? ticket;
     public bool running;
-    public string XXXX;
 
     // ctor
     public MergeBranch()