X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=NewBranch.vala;fp=NewBranch.vala;h=6b2c345542c8978998cd2991045edff8eb7ef59f;hp=9183007d95db9aaf6b0aa7bc05aa389bfbee4d76;hb=7787e7058c952459a07f64edaa20d5e7778dc1fa;hpb=d06e3c696bfaee21c6e9201b4cebcd1ac5bcc32a diff --git a/NewBranch.vala b/NewBranch.vala index 9183007d..6b2c3455 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -123,7 +123,7 @@ public class NewBranch : Object this.el.set_keep_above(true); - var curproj = RooTicket.singleton().getProjectByRepo(this.repo); + var curproj = RooProject.getProjectByRepo(this.repo); _this.prmodel.loadProjects(curproj == null ? "" : curproj.id); _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid); @@ -394,8 +394,7 @@ public class NewBranch : Object // user defined functions public void loadProjects (string id) { - var rt = RooTicket.singleton(); - rt.loadProjects(); + _this.projectsel.loading = true; @@ -411,8 +410,8 @@ public class NewBranch : Object if (id == "") { _this.projectsel.el.set_active_iter(iter); } - var projects = rt.projects; - foreach(var project in projects) { + + foreach(var project in RooProject.projects()) { el.append(out iter); @@ -828,7 +827,8 @@ public class NewBranch : Object //listeners this.el.activate_link.connect( (uri) => { if (uri == "refresh") { - var curproj = RooTicket.singleton().getProjectByRepo(_this.repo); + RooProject.reload(); + var curproj = RooProject.getProjectByRepo(_this.repo); _this.prmodel.loadProjects(curproj == null ? "": curproj.id); _this.dbmodel.loadTickets(curproj == null ? "": curproj.id);