[gnome-shell] extensionUtils: Remove version check for js-version



commit cdbe0bbf3816f34880a1750b20d1a0bc9c054e98
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed May 30 08:20:19 2012 -0400

    extensionUtils: Remove version check for js-version
    
    This is seldomly used, and isn't checked in SweetTooth. Just remove
    this inconsistency here rather than adding infrastructure to manage
    and check it elsewhere.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=677586

 configure.ac              |    4 ----
 js/Makefile.am            |    2 --
 js/misc/config.js.in      |    2 --
 js/misc/extensionUtils.js |    3 ---
 4 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 687f55c..29354da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,10 +105,6 @@ PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
 
 PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
 
-GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
-AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
-AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
-
 GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
 
 saved_CFLAGS=$CFLAGS
diff --git a/js/Makefile.am b/js/Makefile.am
index 82efd21..00a15b7 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -6,9 +6,7 @@ misc/config.js: misc/config.js.in Makefile
 	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
 	sed -e "s|[ ]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
 	    -e "s|[ ]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-	    -e "s|[ ]GJS_VERSION@|$(GJS_VERSION)|g" \
 	    -e "s|[ ]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
-	    -e "s|[ ]SHELL_SYSTEM_CA_FILE@|$(SHELL_SYSTEM_CA_FILE)|g" \
 	    -e "s|[ ]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
 	    -e "s|[ ]datadir@|$(datadir)|g" \
 	    -e "s|[ ]libexecdir@|$(libexecdir)|g" \
diff --git a/js/misc/config.js.in b/js/misc/config.js.in
index 4326686..9769104 100644
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -4,8 +4,6 @@
 const PACKAGE_NAME = '@PACKAGE_NAME@';
 /* The version of this package */
 const PACKAGE_VERSION = '@PACKAGE_VERSION@';
-/* The version of GJS we're linking to */
-const GJS_VERSION = '@GJS_VERSION@';
 /* 1 if gnome-bluetooth is available, 0 otherwise */
 const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
 /* gettext package */
diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index 24109d5..1065f36 100644
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -88,9 +88,6 @@ function isOutOfDate(extension) {
     if (!versionCheck(extension.metadata['shell-version'], Config.PACKAGE_VERSION))
         return true;
 
-    if (extension.metadata['js-version'] && !versionCheck(extension.metadata['js-version'], Config.GJS_VERSION))
-        return true;
-
     return false;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]