[gnome-shell-extensions/extension-live-disable: 5/8] Merge branch 'master' into extension-live-disable

[Giovanni Campagna <gcampagna src gnome org>]

commit 5d26fc2e713eec0e9780e2660954b20c70ba2d38
Merge: 1eb245c ab4436e
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Thu Aug 18 15:36:50 2011 +0200

    Merge branch 'master' into extension-live-disable
    
    Conflicts:
    	extensions/apps-menu/extension.js

 extensions/apps-menu/extension.js     |   96 +++++-----
 extensions/drive-menu/extension.js    |    4 +-
 extensions/gajim/extension.js         |    4 +-
 extensions/systemMonitor/extension.js |    2 +-
 po/LINGUAS                            |    1 +
 po/ca.po                              |  318 +++++++++++++++++++++++++++++++++
 po/gl.po                              |  224 ++++++++++++++++++++++-
 7 files changed, 591 insertions(+), 58 deletions(-)
---
diff --cc extensions/apps-menu/extension.js
index e62c5c6,8ea7a0d..a0d9904
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@@ -83,23 -95,9 +95,15 @@@ ApplicationsButton.prototype = 
      }
  };
  
- 
- function init(metadata) {
-     // nothing to do here
- }
- 
 -function main(metadata) {
 -    let  appsMenuButton = new ApplicationsButton();
 +let appsMenuButton;
 +
 +function enable() {
 +    appsMenuButton = new ApplicationsButton();
      Main.panel._leftBox.insert_actor(appsMenuButton.actor, 1);
      Main.panel._leftBox.child_set(appsMenuButton.actor, { y_fill : true } );
      Main.panel._menus.addMenu(appsMenuButton.menu);
 -}
 +}
 +
 +function disable() {
 +    appsMenuButton.destroy();
- }
++}