StatusIcon.vala

[gitlive] / StatusIcon.vala

diff --git a/StatusIcon.vala b/StatusIcon.vala
index a4f5cfd..74ef174 100644 (file)
--- a/StatusIcon.vala
+++ b/StatusIcon.vala
@@ -302,6 +302,7 @@ public class StatusIconA : StatusIcon {
                     
                 
                this.total = tr.length;
+                this.has_error = 0;
                 
                 for (var i= 0; i< tr.length;i++) {
                     statusicon.set_from_stock( 
@@ -312,7 +313,7 @@ public class StatusIconA : StatusIcon {
                     //this.ref();
                     
                     statusicon.set_tooltip_text("pull: " + repo.name);
- 
+                                       
                     repo.pull_async(this.pullAllCallback); 
                                 // do not care if it's already in sycn..
                         
@@ -325,28 +326,33 @@ public class StatusIconA : StatusIcon {
         
                }
                uint total = 0; 
- 
+                       unit has_error = 0;
                
-               void pullAllCallback(GitRepo repo, string res)
+               void pullAllCallback(GitRepo repo, int err, string res)
                {
                        this.total--;
+                       
+                       if (err > 0) {
+                       
+                       
+                       }
+                       
                        if (!Regex.match_simple ("Already up-to-date", res) ) {
-                     
-                       
-                       ret_str += ret_str.length > 0 ? "\n" : "";
-                       ret_str += "Updated: " +repo.name + "\n" + res +"\n";
-                       }
-                       if (this.total < 1) {
-                               var notification = new Notify.Notification( 
+                       var notification = new Notify.Notification( 
                          "Pull completed ",
-                         ret_str,
+                          "Updated: " +repo.name + "\n" + res +"\n",
                             "dialog-information"
                     );
                     notification.set_timeout(20);
                                notification.show();
+                       
+ 
+ 
+                       }
+                       if (this.total < 1) {
+                       
                                statusicon.set_tooltip_text("Gitlive");
-                 
-                
+                  
                                GitMonitor.gitmonitor.start();
                                //this.unref();
                                //repo.unref();