[gnome-shell-extensions] alternative-status-menu: update to shell master

[Giovanni Campagna <gcampagna src gnome org>]

commit c08f3736e011ecfda7d3ff28b0c95eedbd4e411c
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Mon Sep 5 13:50:41 2011 +0200

    alternative-status-menu: update to shell master
    
    The status menu (now called user-menu) was changed a lot recently,
    update code to reflect that and make it more similar to the core
    menu.

 extensions/alternative-status-menu/extension.js |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/extensions/alternative-status-menu/extension.js b/extensions/alternative-status-menu/extension.js
index 6ed0aa2..09d0c4a 100644
--- a/extensions/alternative-status-menu/extension.js
+++ b/extensions/alternative-status-menu/extension.js
@@ -5,6 +5,7 @@ const St = imports.gi.St;
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const GnomeSession = imports.misc.gnomeSession;
+const UserMenu = imports.ui.userMenu;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -36,21 +37,20 @@ function onHibernateActivate(item) {
 function createSubMenu() {
     let item;
 
-    item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available');
-    item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.AVAILABLE));
+    item = new UserMenu.IMStatusChooserItem();
+    item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
     this.menu.addMenuItem(item);
-    this._presenceItems[GnomeSession.PresenceStatus.AVAILABLE] = item;
 
-    item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy');
-    item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.BUSY));
+    item = new PopupMenu.PopupSwitchMenuItem(_("Do Not Disturb"));
+    item.connect('activate', Lang.bind(this, this._updatePresenceStatus));
     this.menu.addMenuItem(item);
-    this._presenceItems[GnomeSession.PresenceStatus.BUSY] = item;
+    this._dontDisturbSwitch = item;
 
     item = new PopupMenu.PopupSeparatorMenuItem();
     this.menu.addMenuItem(item);
 
-    item = new PopupMenu.PopupMenuItem(_("My Account"));
-    item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
+    item = new PopupMenu.PopupMenuItem(_("Online Accounts"));
+    item.connect('activate', Lang.bind(this, this._onOnlineAccountsActivate));
     this.menu.addMenuItem(item);
 
     item = new PopupMenu.PopupMenuItem(_("System Settings"));
@@ -77,7 +77,6 @@ function createSubMenu() {
 
     item = new PopupMenu.PopupSeparatorMenuItem();
     this.menu.addMenuItem(item);
-    this._sessionSeparator = item;
 
     item = new PopupMenu.PopupMenuItem(_("Suspend"));
     item.connect('activate', Lang.bind(this, onSuspendActivate));