[gnome-documents] all: don't pass Global.connection around

[Cosimo Cecchi <cosimoc src gnome org>]

commit a02fffd799a6a45a127f545e4a2cf86860d45218
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Aug 26 13:27:12 2011 -0400

    all: don't pass Global.connection around

 src/mainWindow.js   |    2 +-
 src/sources.js      |    2 +-
 src/trackerUtils.js |   16 +++++++++-------
 src/view.js         |    2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/src/mainWindow.js b/src/mainWindow.js
index ee160e8..cd9d98c 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -163,7 +163,7 @@ MainWindow.prototype = {
             this._loaderTimeout = 0;
         }
 
-        TrackerUtils.sourceIdFromResourceUrn(Global.connection, resource, Lang.bind(this,
+        TrackerUtils.sourceIdFromResourceUrn(resource, Lang.bind(this,
             function(sourceId) {
                 this._loaderCancellable = new Gio.Cancellable();
                 this._pdfLoader = new Gd.PdfLoader({ source_id: sourceId });
diff --git a/src/sources.js b/src/sources.js
index 45ec717..7cf868d 100644
--- a/src/sources.js
+++ b/src/sources.js
@@ -53,7 +53,7 @@ Source.prototype = {
                     return false;
                 }));
         } else {
-            TrackerUtils.resourceUrnFromSourceId(Global.connection, id, Lang.bind(this,
+            TrackerUtils.resourceUrnFromSourceId(id, Lang.bind(this,
                 function(resourceUrn) {
                     this.resourceUrn = resourceUrn;
                     this._initCallback();
diff --git a/src/trackerUtils.js b/src/trackerUtils.js
index d9066bb..aa12b73 100644
--- a/src/trackerUtils.js
+++ b/src/trackerUtils.js
@@ -21,12 +21,14 @@
 
 const GLib = imports.gi.GLib;
 
-function sourceIdFromResourceUrn(connection, resourceUrn, callback) {
+const Global = imports.global;
+
+function sourceIdFromResourceUrn(resourceUrn, callback) {
     //FIXME: is this right?
     if(resourceUrn[0] != '<')
         resourceUrn = '<' + resourceUrn + '>';
 
-    connection.query_async
+    Global.connection.query_async
         (('SELECT ?id WHERE { %s a nie:DataSource; nao:identifier ?id }').format(resourceUrn), null,
          function(object, res) {
              let cursor = null;
@@ -56,8 +58,8 @@ function sourceIdFromResourceUrn(connection, resourceUrn, callback) {
          });
 }
 
-function resourceUrnFromSourceId(connection, sourceId, callback) {
-    connection.query_async
+function resourceUrnFromSourceId(sourceId, callback) {
+    Global.connection.query_async
         (('SELECT ?urn WHERE { ?urn a nie:DataSource; nao:identifier \"goa:documents:%s\" }').format(sourceId), null,
          function(object, res) {
              let cursor = null;
@@ -93,13 +95,13 @@ function resourceUrnFromSourceId(connection, sourceId, callback) {
          });
 }
 
-function setFavorite(connection, urn, isFavorite, callback) {
-    connection.update_async(
+function setFavorite(urn, isFavorite, callback) {
+    Global.connection.update_async(
         ('%s { <%s> nao:hasTag nao:predefined-tag-favorite }').format((isFavorite ? 'INSERT OR REPLACE' : 'DELETE'), urn),
         GLib.PRIORITY_DEFAULT, null,
         function(object, res) {
             try {
-                connection.update_finish(res);
+                object.update_finish(res);
             } catch (e) {
                 log('Unable to set the favorite property on ' + urn + ' to ' + isFavorite + ': ' + e.toString());
             }
diff --git a/src/view.js b/src/view.js
index 0c361ef..8522971 100644
--- a/src/view.js
+++ b/src/view.js
@@ -49,7 +49,7 @@ ContextMenu.prototype = {
 
         favoriteItem.connect('activate', Lang.bind(this,
             function() {
-                TrackerUtils.setFavorite(Global.connection, this._urn, !this._isFavorite, null);
+                TrackerUtils.setFavorite(this._urn, !this._isFavorite, null);
             }));
 
         this.widget.show_all();