[gnome-shell/datetime: 22/23] Merge branch 'master' into datetime

[David Zeuthen <davidz src gnome org>]

commit 1ca1a2712da1a5d98fe72f81889eda265291d93c
Merge: 85ec4d8 0547a58
Author: David Zeuthen <davidz redhat com>
Date:   Wed Oct 20 13:55:41 2010 -0400

    Merge branch 'master' into datetime

 configure.ac                           |    4 +-
 data/theme/gnome-shell.css             |   20 +-
 js/Makefile.am                         |    1 +
 js/ui/boxpointer.js                    |  164 ++
 js/ui/extensionSystem.js               |    6 +
 js/ui/iconGrid.js                      |   21 +-
 js/ui/messageTray.js                   |   95 +-
 js/ui/panel.js                         |    3 +-
 js/ui/popupMenu.js                     |   91 +-
 js/ui/status/volume.js                 |  206 +++
 js/ui/statusMenu.js                    |   20 +-
 po/POTFILES.in                         |    1 +
 po/es.po                               |   90 +-
 po/et.po                               |  269 +++-
 po/it.po                               |  268 +++-
 po/nb.po                               |   52 +-
 po/nl.po                               |  579 ++++++-
 src/Makefile-gdmuser.am                |    1 +
 src/Makefile-gvc.am                    |   69 +
 src/Makefile.am                        |    6 +-
 src/gdmuser/gdm-user-manager.c         | 2654 ++++++++++++++++++++++++--------
 src/gdmuser/gdm-user-manager.h         |   28 +-
 src/gdmuser/gdm-user-private.h         |   19 +-
 src/gdmuser/gdm-user.c                 | 1113 ++++++--------
 src/gdmuser/gdm-user.h                 |   18 +-
 src/gnome-shell-plugin.c               |   13 +
 src/gvc/gvc-channel-map-private.h      |   39 +
 src/gvc/gvc-channel-map.c              |  254 +++
 src/gvc/gvc-channel-map.h              |   73 +
 src/gvc/gvc-mixer-card-private.h       |   35 +
 src/gvc/gvc-mixer-card.c               |  506 ++++++
 src/gvc/gvc-mixer-card.h               |   83 +
 src/gvc/gvc-mixer-control-private.h    |   35 +
 src/gvc/gvc-mixer-control.c            | 2232 +++++++++++++++++++++++++++
 src/gvc/gvc-mixer-control.h            |   96 ++
 src/gvc/gvc-mixer-event-role.c         |  250 +++
 src/gvc/gvc-mixer-event-role.h         |   57 +
 src/gvc/gvc-mixer-sink-input.c         |  199 +++
 src/gvc/gvc-mixer-sink-input.h         |   57 +
 src/gvc/gvc-mixer-sink.c               |  231 +++
 src/gvc/gvc-mixer-sink.h               |   57 +
 src/gvc/gvc-mixer-source-output.c      |  137 ++
 src/gvc/gvc-mixer-source-output.h      |   57 +
 src/gvc/gvc-mixer-source.c             |  231 +++
 src/gvc/gvc-mixer-source.h             |   57 +
 src/gvc/gvc-mixer-stream-private.h     |   34 +
 src/gvc/gvc-mixer-stream.c             |  944 ++++++++++++
 src/gvc/gvc-mixer-stream.h             |  125 ++
 src/gvc/gvc-pulseaudio-fake.h          |   34 +
 src/shell-global.c                     |   23 +
 src/shell-global.h                     |    3 +
 src/st/st-drawing-area.c               |    1 +
 src/st/st-theme.c                      |    1 +
 tools/build/gnome-shell-build-setup.sh |   10 +-
 54 files changed, 10030 insertions(+), 1642 deletions(-)
---
diff --cc js/ui/panel.js
index 4abbcf2,d683a18..466d189
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@@ -32,9 -31,15 +32,10 @@@ const SPINNER_SPEED = 0.02
  
  const STANDARD_TRAY_ICON_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'bluetooth', 'network', 'battery'];
  const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION = {
-     'a11y': imports.ui.status.accessibility.ATIndicator
+     'a11y': imports.ui.status.accessibility.ATIndicator,
+     'volume': imports.ui.status.volume.Indicator,
  };
  
 -const CLOCK_FORMAT_KEY        = 'format';
 -const CLOCK_CUSTOM_FORMAT_KEY = 'custom-format';
 -const CLOCK_SHOW_DATE_KEY     = 'show-date';
 -const CLOCK_SHOW_SECONDS_KEY  = 'show-seconds';
 -
  function AnimatedIcon(name, size) {
      this._init(name, size);
  }