[gnome-shell-extensions] all: port to the new convienence module

[Giovanni Campagna <gcampagna src gnome org>]

commit 3630228cac0da842b52b4ae7297390f370e6e876
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Wed Feb 8 15:36:07 2012 +0100

    all: port to the new convienence module
    
    Retrieve Convenience from the extension helper object (Me), and
    pass no arguments to initTranslations and getSettings (since the
    metadata has all that is required)

 extensions/alternate-tab/extension.js           |   10 ++++++----
 extensions/alternative-status-menu/extension.js |   14 +++++---------
 extensions/auto-move-windows/extension.js       |   12 +++++++-----
 extensions/dock/extension.js                    |   14 +++++++-------
 extensions/drive-menu/extension.js              |   10 ++++++----
 extensions/example/extension.js                 |    7 +++++--
 extensions/native-window-placement/extension.js |   11 ++++++-----
 extensions/places-menu/extension.js             |    9 ++++++---
 extensions/user-theme/extension.js              |   14 ++++++++------
 extensions/xrandr-indicator/extension.js        |    7 +++++--
 10 files changed, 61 insertions(+), 47 deletions(-)
---
diff --git a/extensions/alternate-tab/extension.js b/extensions/alternate-tab/extension.js
index 5947b6a..68bcae2 100644
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -25,11 +25,14 @@ const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = function(e) { return e };
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
 let settings;
 
 const POPUP_DELAY_TIMEOUT = 150; // milliseconds
 
-const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.alternate-tab';
 const SETTINGS_BEHAVIOUR_KEY = 'behaviour';
 const SETTINGS_FIRST_TIME_KEY = 'first-time';
 
@@ -598,9 +601,8 @@ WindowList.prototype = {
 };
 
 function init(metadata) {
-    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
-    me.convenience.initTranslations(metadata);
-    settings = me.convenience.getSettings(metadata, 'alternate-tab');
+    Convenience.initTranslations();
+    settings = Convenience.getSettings();
 }
 
 function doAltTab(display, screen, window, binding) {
diff --git a/extensions/alternative-status-menu/extension.js b/extensions/alternative-status-menu/extension.js
index 9675196..fbc6585 100644
--- a/extensions/alternative-status-menu/extension.js
+++ b/extensions/alternative-status-menu/extension.js
@@ -7,6 +7,10 @@ const PopupMenu = imports.ui.popupMenu;
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
 let suspend_item = null;
 let hibernate_item = null;
 let poweroff_item = null;
@@ -36,17 +40,9 @@ function onHibernateActivate(item) {
     }));
 }
 
-function createSubMenu() {
-
-}
-
 // Put your extension initialization code here
 function init(metadata) {
-    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
-    me.convenience.initTranslations(metadata);
-}
-
-function resetMenu() {
+    Convenience.initTranslations();
 }
 
 function enable() {
diff --git a/extensions/auto-move-windows/extension.js b/extensions/auto-move-windows/extension.js
index 4058b5c..3a05a15 100644
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -11,7 +11,10 @@ const St = imports.gi.St;
 
 const Main = imports.ui.main;
 
-const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.auto-move-windows';
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
 const SETTINGS_KEY = 'application-list';
 
 let settings;
@@ -81,10 +84,9 @@ WindowMover.prototype = {
 let prevCheckWorkspaces;
 let winMover;
 
-function init(metadata) {
-    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
-    me.convenience.initTranslations(metadata);
-    settings = me.convenience.getSettings(metadata, 'auto-move-windows');
+function init() {
+    Convenience.initTranslations();
+    settings = Convenience.getSettings();
 }
 
 function enable() {
diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
index 442f0e7..d43a199 100644
--- a/extensions/dock/extension.js
+++ b/extensions/dock/extension.js
@@ -25,6 +25,10 @@ const AltTab = imports.ui.altTab;
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
 // Settings
 const DOCK_SETTINGS_SCHEMA = 'org.gnome.shell.extensions.dock';
 const DOCK_POSITION_KEY = 'position';
@@ -33,8 +37,6 @@ const DOCK_HIDE_KEY = 'autohide';
 const DOCK_EFFECTHIDE_KEY = 'hide-effect';
 const DOCK_AUTOHIDE_ANIMATION_TIME_KEY = 'hide-effect-duration';
 
-let _me, _metadata;
-
 //hide
 //const autohide_animation_time = 0.3;
 
@@ -341,7 +343,7 @@ Dock.prototype = {
         this._favorites = [];
 
         // Load Settings
-        this._settings = _me.convenience.getSettings(_metadata, 'dock');
+        this._settings = Convenience.getSettings();
         position = this._settings.get_enum(DOCK_POSITION_KEY);
         dockicon_size = this._settings.get_int(DOCK_SIZE_KEY);
         hideDock = hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
@@ -928,10 +930,8 @@ DockIconMenu.prototype = {
     }
 }
 
-function init(metadata) {
-    _metadata = metadata;
-    _me = imports.ui.extensionSystem.extensions[metadata.uuid];
-    _me.convenience.initTranslations(metadata);
+function init() {
+    Convenience.initTranslations();
 }
 
 let dock;
diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
index 5e832e2..a51fca6 100644
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -12,6 +12,10 @@ const Panel = imports.ui.panel;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
 function DriveMenuItem(place) {
     this._init(place);
 }
@@ -89,10 +93,8 @@ DriveMenu.prototype = {
     },
 }
 
-// Put your extension initialization code here
-function init(metadata) {
-    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
-    me.convenience.initTranslations(metadata);
+function init() {
+    Convenience.initTranslations();
 }
 
 let _indicator;
diff --git a/extensions/example/extension.js b/extensions/example/extension.js
index 398f4ea..b8b0ea9 100644
--- a/extensions/example/extension.js
+++ b/extensions/example/extension.js
@@ -7,6 +7,10 @@ const _ = Gettext.gettext;
 
 const Main = imports.ui.main;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
 function _showHello() {
     let text = new St.Label({ style_class: 'helloworld-label', text: _("Hello, world!") });
     let monitor = Main.layoutManager.primaryMonitor;
@@ -19,8 +23,7 @@ function _showHello() {
 function init(metadata) {
     log ('Example extension initalized');
 
-    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
-    me.convenience.initTranslations(metadata);
+    Convenience.initTranslations();
 }
 
 let signalId;
diff --git a/extensions/native-window-placement/extension.js b/extensions/native-window-placement/extension.js
index 105e728..dbaa677 100644
--- a/extensions/native-window-placement/extension.js
+++ b/extensions/native-window-placement/extension.js
@@ -20,7 +20,9 @@ const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;
 const WindowPositionFlags = Workspace.WindowPositionFlags;
 
-let _me, _metadata;
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
 
 // testing settings for natural window placement strategy:
 const WINDOW_PLACEMENT_NATURAL_FILLGAPS = true;                     // enlarge windows at the end to fill gaps         // not implemented yet
@@ -116,7 +118,7 @@ function resetState() {
 function enable() {
     resetState();
 
-    let settings = _me.convenience.getSettings(_metadata, 'native-window-placement');
+    let settings = Convenience.getSettings();
     let useMoreScreen = settings.get_boolean('use-more-screen');
     signalId = settings.connect('changed::use-more-screen', function() {
         useMoreScreen = settings.get_boolean('use-more-screen');
@@ -501,7 +503,6 @@ function disable() {
     resetState();
 }
 
-function init(metadata) {
-    _metadata = metadata;
-    _me = imports.ui.extensionSystem.extensions[metadata.uuid];
+function init() {
+    /* do nothing */
 }
diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js
index c68c16d..225c777 100644
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -14,6 +14,10 @@ const Panel = imports.ui.panel;
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
 const PLACE_ICON_SIZE = 22;
 
 function PlacesMenu() {
@@ -113,9 +117,8 @@ PlacesMenu.prototype = {
 };
 
 
-function init(metadata) {
-    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
-    me.convenience.initTranslations(metadata);
+function init() {
+    Convenience.initTranslations();
 }
 
 let _indicator;
diff --git a/extensions/user-theme/extension.js b/extensions/user-theme/extension.js
index 7fd03b6..f7ca72f 100644
--- a/extensions/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -6,17 +6,19 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Main = imports.ui.main;
 
-const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.user-theme';
 const SETTINGS_KEY = 'name';
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
 function ThemeManager() {
     this._init.apply(this, arguments);
 }
 
 ThemeManager.prototype = {
-    _init: function(metadata) {
-        let me = imports.ui.extensionSystem.extensions[metadata.uuid];
-        this._settings = me.convenience.getSettings(metadata, 'user-theme');
+    _init: function() {
+        this._settings = Convenience.getSettings();
     },
 
     enable: function() {
@@ -66,6 +68,6 @@ ThemeManager.prototype = {
 }
 
 
-function init(metadata) {
-    return new ThemeManager(metadata);
+function init() {
+    return new ThemeManager();
 }
diff --git a/extensions/xrandr-indicator/extension.js b/extensions/xrandr-indicator/extension.js
index 344f7bf..0a41ce7 100644
--- a/extensions/xrandr-indicator/extension.js
+++ b/extensions/xrandr-indicator/extension.js
@@ -17,6 +17,10 @@ const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = function(e) { return e };
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
 const possibleRotations = [ GnomeDesktop.RRRotation.ROTATION_0,
 			    GnomeDesktop.RRRotation.ROTATION_90,
 			    GnomeDesktop.RRRotation.ROTATION_180,
@@ -137,8 +141,7 @@ Indicator.prototype = {
 
 
 function init(metadata) {
-    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
-    me.convenience.initTranslations(metadata);
+    Convenience.initTranslations();
 }
 
 let _indicator;