[extensions-web: 39/75] Fix detection for real this time.

[Jasper St. Pierre <jstpierre src gnome org>]

commit 41f4635ceecfdc82871f1fbfb91a07fbd76c9bef
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Sep 16 23:55:49 2011 -0400

    Fix detection for real this time.

 sweettooth/static/js/dbus.js       |    2 +-
 sweettooth/static/js/extensions.js |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sweettooth/static/js/dbus.js b/sweettooth/static/js/dbus.js
index 909e67b..e8cc761 100644
--- a/sweettooth/static/js/dbus.js
+++ b/sweettooth/static/js/dbus.js
@@ -36,7 +36,7 @@ define({
 
             var apiVersion = window.SweetTooth.apiVersion;
             var scriptname = null;
-            if (apiVersion){
+            if (apiVersion) {
                 scriptname = './versions/' + apiVersion + '/main';
                 // requirejs caches response.
                 req([scriptname], function(module) {
diff --git a/sweettooth/static/js/extensions.js b/sweettooth/static/js/extensions.js
index 549b367..a7fa12e 100644
--- a/sweettooth/static/js/extensions.js
+++ b/sweettooth/static/js/extensions.js
@@ -17,8 +17,11 @@ function($, messages, dbusProxy) {
         UNINSTALLED: 99
     };
 
+    // While technically we shouldn't have mismatched API versions,
+    // the plugin doesn't check whether the Shell matches, so if someone
+    // is running with an old Shell version but a newer plugin, error out.
     if (dbusProxy === undefined ||
-        dbusProxy.apiVersion === undefined) {
+        dbusProxy.ShellVersion === undefined) {
         // We don't have a proper DBus proxy -- it's probably an old
         // version of GNOME3 or the Shell.
         messages.addError("You do not appear to have an up " +