From 23e86d7dd5962f51563532f937f56e0718f6b60c Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 26 Jun 2012 20:46:37 -0400
Subject: [PATCH] extensionDownloader: Clean up names of methods

FromUUID is redundant.

https://bugzilla.gnome.org/show_bug.cgi?id=679099
---
 js/ui/extensionDownloader.js | 6 +++---
 js/ui/shellDBus.js           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index 3f2069b93..d7940852a 100644
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -22,7 +22,7 @@ const REPOSITORY_URL_INFO =     REPOSITORY_URL_BASE + '/extension-info/';
 
 let _httpSession;
 
-function installExtensionFromUUID(uuid, invocation) {
+function installExtension(uuid, invocation) {
     let params = { uuid: uuid,
                    shell_version: Config.PACKAGE_VERSION };
 
@@ -49,7 +49,7 @@ function installExtensionFromUUID(uuid, invocation) {
     });
 }
 
-function uninstallExtensionFromUUID(uuid) {
+function uninstallExtension(uuid) {
     let extension = ExtensionUtils.extensions[uuid];
     if (!extension)
         return false;
@@ -115,7 +115,7 @@ function gotExtensionZipFile(session, message, uuid, callback, errback) {
         try {
             ExtensionSystem.loadExtension(extension);
         } catch(e) {
-            uninstallExtensionFromUUID(uuid);
+            uninstallExtension(uuid);
             errback('LoadExtensionError', e);
             return;
         }
diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index e402cabbb..83074e4ba 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -287,11 +287,11 @@ const GnomeShellExtensions = new Lang.Class({
     },
 
     InstallRemoteExtensionAsync: function([uuid], invocation) {
-        return ExtensionDownloader.installExtensionFromUUID(uuid, invocation);
+        return ExtensionDownloader.installExtension(uuid, invocation);
     },
 
     UninstallExtension: function(uuid) {
-        return ExtensionDownloader.uninstallExtensionFromUUID(uuid);
+        return ExtensionDownloader.uninstallExtension(uuid);
     },
 
     LaunchExtensionPrefs: function(uuid) {