sync

diff --git a/GitMonitor.vala b/GitMonitor.vala
index 71857b6..420ab12 100644 (file)
--- a/GitMonitor.vala
+++ b/GitMonitor.vala
@@ -20,9 +20,8 @@ public class GitMonitor : Monitor
 
  
 
-       public GitMonitor () {
-       
-       
+       public GitMonitor ()
+       {
        
                this.queue = new Array<GitMonitorQueue>();
                GitMonitor.gitmonitor = this;

diff --git a/GitRepo.vala b/GitRepo.vala
index 99b0267..4487b67 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -22,6 +22,7 @@ public class GitRepo : Object
     public Gee.HashMap<string,bool> ignore_files;
     public GitBranch currentBranch;
 
+       public RooTicket? activeTicket;
 
        public static GitRepo singleton()
     {

diff --git a/NewBranch.bjs b/NewBranch.bjs
index a824742..1656fe7 100644 (file)
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -10,7 +10,7 @@
   {
    "listeners" : {
     "delete_event" : "(self, event) => {\n    this.el.hide();\n    return true; \n    //test  \n}\n ",
-    "response" : " (self, response_id) =>  { \n  \n\tGLib.debug(\"got %d\", (int) response_id);\n\tif (response_id == 0) {\n\t    _this.el.hide();\t\n\t    this.running = false; \n\t \treturn;\n\t}\n\t// have they selected a ticket..\n\t// make that the current active ticket?\n\t// we really need to store locally what ticket is being worked on..\n\t// in theory we could be working on multiple project and not merging..\n\t// -- each repo would have their active ticket (only one per repo)\n\t// -- so we could just store that in there\n\t// -- initial load can check the contents of the ticket files on first scan.\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n    if (this.repo != null) {\n    \tvar bn = _this.name.el.get_text();\n    \tif (ticket_id != \"\" ) {\n\t\t\tthis.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);\n\t\t} else {\n\t\t\tthis.repo.createBranchNamed(bn);\n\t\t}\n    }\n\n\t\t    this.running = false; \n\n\t \n\t \n\t \n\n\t \n}",
+    "response" : " (self, response_id) =>  { \n  \n\tGLib.debug(\"got %d\", (int) response_id);\n\tif (response_id == 0) {\n\t    _this.el.hide();\t\n\t    this.running = false; \n\t \treturn;\n\t}\n\t \n\t// have they selected a ticket..\n\t// make that the current active ticket?\n\t// we really need to store locally what ticket is being worked on..\n\t// in theory we could be working on multiple project and not merging..\n\t// -- each repo would have their active ticket (only one per repo)\n\t// -- so we could just store that in there\n\t// -- initial load can check the contents of the ticket files on first scan.\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n    if (this.repo != null) {\n    \tvar bn = _this.name.el.get_text();\n    \tif (ticket_id != \"\" ) {\n\t\t\tthis.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);\n\t\t} else {\n\t\t\tthis.repo.createBranchNamed(bn);\n\t\t}\n    }\n\n\t\t    this.running = false; \n\n\t \n\t \n\t \n\n\t \n}",
     "show" : "(self)  => {\n \n\n  //test\n}"
    },
    "default_width" : 500,
@@ -21,7 +21,7 @@
    "|   void show" : "( GitRepo repo ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    if (this.running) {\n    \treturn;\n\t}\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\n}",
    "default_height" : 200,
    "$ xns" : "Gtk",
-   "# bool running" : true,
+   "# bool running" : false,
    "bool modal" : true,
    "items" : [
     {

diff --git a/NewBranch.vala b/NewBranch.vala
index 640ae38..583cb0e 100644 (file)
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -29,7 +29,7 @@ public class NewBranch : Object
 
         // my vars (dec)
         this.repo = null;
-        this.running = true;
+        this.running = false;
 
         // set gobject values
         this.el.title = "Create a working branch ";
@@ -61,6 +61,7 @@ public class NewBranch : Object
                    this.running = false; 
                        return;
                }
+                
                // have they selected a ticket..
                // make that the current active ticket?
                // we really need to store locally what ticket is being worked on..

diff --git a/config1.builder b/config1.builder
index c90b926..c5e4bc9 100644 (file)
--- a/config1.builder
+++ b/config1.builder
@@ -38,7 +38,9 @@
             "libnotify",
             "glib-2.0",
             "gdk-3.0",
-            "gtk+-3.0"
+            "gtk+-3.0",
+            "json-glib-1.0",
+            "libsoup-2.4"
         ]
     }
 ]
\ No newline at end of file