sync

diff --git a/Makefile.am b/Makefile.am
index 6cc2b4a..0137963 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,8 @@ Gitlive_SOURCES = \
           c/xorg_idletime.c \
           WindowLog.vala \
           Clones.vala \
-          NewBranch.vala 
+          NewBranch.vala \
+          MergeBranch.vala
 
           
 

diff --git a/MergeBranch.bjs b/MergeBranch.bjs
index a0c28a9..794270c 100644 (file)
--- a/MergeBranch.bjs
+++ b/MergeBranch.bjs
@@ -58,7 +58,7 @@
          "* pack" : "attach_defaults,1,2,0,1",
          "xtype" : "ComboBox",
          "# bool loading" : false,
-         "| string selectedAction" : "() {\n\tGtk.TreeIter iter;\n\tValue val1;\n \n\tthis.el.get_active_iter (out iter);\n\t_this.dbmodel.el.get_value (iter, 0, out val1);\n\n\treturn  (string) val1;\n}\n",
+         "| string selectedAction" : "() {\n\tGtk.TreeIter iter;\n\tValue val1;\n \n\tthis.el.get_active_iter (out iter);\n\t_this.actionmodel.el.get_value (iter, 0, out val1);\n\n\treturn  (string) val1;\n}\n",
          "$ xns" : "Gtk",
          "items" : [
           {

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 61ca916..7c7564c 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -253,7 +253,7 @@ public class MergeBranch : Object
                Value val1;
          
                this.el.get_active_iter (out iter);
-               _this.dbmodel.el.get_value (iter, 0, out val1);
+               _this.actionmodel.el.get_value (iter, 0, out val1);
         
                return  (string) val1;
         }

diff --git a/Monitor.vala b/Monitor.vala
index d86d99d..5fc98a3 100644 (file)
--- a/Monitor.vala
+++ b/Monitor.vala
@@ -67,8 +67,13 @@ public delegate void onEventHander (FileMonitor fm, File f_orig, File of_orig, F
  * 
  * 
  */
+public abstract class MonitorAbstract : Object
+{
+       public abstract void monitor(string path, int depth =0);
+}
+
  
-public class Monitor : Object
+public class Monitor : MonitorAbstract
 {
 
 
@@ -136,7 +141,7 @@ public class Monitor : Object
      * 
      * 
      */
-    public void monitor(string path, int depth = 0)
+    public override void monitor(string path, int depth = 0)
     {
          
         //GLib.debug("ADD: (%d): %s\n", depth, path);

diff --git a/RooTicket.vala b/RooTicket.vala
index 9cde822..7c0ba27 100644 (file)
--- a/RooTicket.vala
+++ b/RooTicket.vala
@@ -86,7 +86,7 @@ public class RooTicket : Object
                
                var session = new Soup.Session ();
                session.timeout = 0;
-               var message = new Soup.Message ("GET", baseurl);
+               var message = new Soup.Message ("GET", url);
                RooTicket.setAuth(message);
                session.send_message (message);
                
@@ -135,7 +135,7 @@ public class RooTicket : Object
                
                var session = new Soup.Session ();
                session.timeout = 0;
-               var message = new Soup.Message ("GET", baseurl);
+               var message = new Soup.Message ("GET", url);
                
                
                RooTicket.setAuth(message);

diff --git a/StatusIcon.vala b/StatusIcon.vala
index e430619..137d750 100644 (file)
--- a/StatusIcon.vala
+++ b/StatusIcon.vala
@@ -211,7 +211,7 @@ public class StatusIconA : StatusIcon {
                
         }
         
-        
+       
         class MergeMenuItem : Gtk.MenuItem {        
         
                GitRepo repo;
@@ -225,6 +225,7 @@ public class StatusIconA : StatusIcon {
                        this.label = ("Merge [%s] #%s %s".printf(r.name, t.id , t.summary));
 
                                this.activate.connect(() => {
+                                       MergeBranch.singleton().show(this.ticket);
                                        // show merge dialog..
                                });
                

diff --git a/config1.builder b/config1.builder
index c5e4bc9..55088b0 100644 (file)
--- a/config1.builder
+++ b/config1.builder
@@ -17,7 +17,8 @@
             "..//gitlive/GitBranch.vala",
             "..//gitlive/NewBranch.vala",
             "..//gitlive/GitMonitorQueue.vala",
-            "..//gitlive/RooTicket.vala"
+            "..//gitlive/RooTicket.vala",
+            "..//gitlive/MergeBranch.vala"
         ],
         "packages" : [
         ]