diff options
| author | Martyn Russell <martyn@lanedo.com> | 2012-02-22 18:33:28 +0000 |
|---|---|---|
| committer | Martyn Russell <martyn@lanedo.com> | 2012-02-22 18:33:28 +0000 |
| commit | 77743775907603152581b4cd8ba4f9847690fb1d (patch) | |
| tree | 6edd485502eee3a6aa4c4a6cf523efdb39b379bf | |
| parent | da96e3e4345a41ffb0a68bfaa1b4684ff8da8857 (diff) | |
| download | tracker-77743775907603152581b4cd8ba4f9847690fb1d.tar.gz | |
firefox: Don't restrict plugin to JUST 0.12
| -rw-r--r-- | src/plugins/firefox/chrome/content/bindings.js | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/plugins/firefox/chrome/content/bindings.js b/src/plugins/firefox/chrome/content/bindings.js index 1c5dff249..727087cc3 100644 --- a/src/plugins/firefox/chrome/content/bindings.js +++ b/src/plugins/firefox/chrome/content/bindings.js @@ -2,7 +2,8 @@ if (!org.bustany.TrackerFox.TrackerSparql || !org.bustany.TrackerFox.TrackerSpar org.bustany.TrackerFox.TrackerSparql = { __initialized: true, - _trackerSparqlPath: "libtracker-sparql-0.12.so.0", + _trackerSparqlPath1: "libtracker-sparql-0.12.so.0", + _trackerSparqlPath2: "libtracker-sparql-0.14.so.0", _lib: null, init: function () { @@ -16,10 +17,16 @@ org.bustany.TrackerFox.TrackerSparql = { Components.utils.import ("resource://gre/modules/ctypes.jsm"); try { - tracker._lib = ctypes.open (tracker._trackerSparqlPath); + tracker._lib = ctypes.open (tracker._trackerSparqlPath1); } catch (e) { - dump("Could not load libtracker-sparql 0.12\n"); - return false; + dump ("Could not load " + tracker._trackerSparqlPath1 + ": " + e + "\n"); + + try { + tracker._lib = ctypes.open (tracker._trackerSparqlPath2); + } catch (e) { + dump ("Could not load " + tracker._trackerSparqlPath2 + ": " + e + "\n"); + return false; + } } // GLib types |