From 3800299d14b6021ead09c32d41af2476aa95e9a7 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@akbkhome.com>
Date: Wed, 23 May 2012 22:39:48 +0800
Subject: [PATCH] merge

---
 Clones.bjs   | 2 +-
 Clones.js    | 2 +-
 WindowLog.js | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Clones.bjs b/Clones.bjs
index 85acbe9b..e7e37094 100644
--- a/Clones.bjs
+++ b/Clones.bjs
@@ -90,7 +90,7 @@
                                     "id": "reposView",
                                     "pack": "add",
                                     "xtype": "TreeView",
-                                    "|init": "function() {\n    XObject.prototype.init.call(this);\n        var description = new Pango.FontDescription.c_new();\n   description.set_size(10000);\n     this.el.modify_font(description);\n\n     this.selection = this.el.get_selection();\n      this.selection.set_mode( Gtk.SelectionMode.MULTIPLE);\n    var _this = this;\n    \n    \n  this.selection.signal['changed'].connect(function() {\n     _this.listeners.cursor_changed.apply(\n          _this, [ _this, '']\n       );\n             });\n          \n          \n          //this.el.set_tooltip_column(8); \n             \n            \n  }\n",
+                                    "|init": "function() {\n    XObject.prototype.init.call(this);\n        var description = new Pango.FontDescription.c_new();\n   description.set_size(10000);\n     this.el.modify_font(description);\n\n     this.selection = this.el.get_selection();\n      this.selection.set_mode( Gtk.SelectionMode.MULTIPLE);\n    var _this = this;\n    \n    \n  this.selection.signal['changed'].connect(function() {\n     _this.listeners.cursor_changed.apply(\n          _this, [ _this, '']\n       );\n             });\n          \n          \n          this.el.set_tooltip_column(8); \n             \n            \n  }\n",
                                     "|xns": "Gtk",
                                     "items": [
                                         {
diff --git a/Clones.js b/Clones.js
index 8b30b652..6e48f5db 100644
--- a/Clones.js
+++ b/Clones.js
@@ -329,7 +329,7 @@ Clones=new XObject({
                                          });
                                       
                                       
-                                      //this.el.set_tooltip_column(8); 
+                                      this.el.set_tooltip_column(8); 
                                          
                                         
                               },
diff --git a/WindowLog.js b/WindowLog.js
index ddb1bc5f..4dce1ee0 100644
--- a/WindowLog.js
+++ b/WindowLog.js
@@ -31,6 +31,7 @@ WindowLog = {
  
     start  : function()
     {
+        
         this.outdir = GLib.get_home_dir() + "/.gitlog";
         this.screen = Wnck.Screen.get_default();
         GLib.timeout_add(GLib.PRIORITY_LOW, 500, function() { return WindowLog.getStatus() } );
@@ -39,6 +40,7 @@ WindowLog = {
         
     getStatus : function() {
         
+         
         var output =  xorg.screensaverinfo_get_idletime();
         //print(output);
          
@@ -50,7 +52,9 @@ WindowLog = {
             this.win = false;
             return true;
         }
+        
         this.screen.force_update();
+       
         var aw = this.screen.get_active_window();
         if (aw) { 
             var win = aw.get_name();
-- 
2.39.2