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

[David Zeuthen <davidz src gnome org>]

commit b7fe72e74a657a9f60fbd860e4402666bcfa8a64
Merge: 7aa3aba be6e189
Author: David Zeuthen <davidz redhat com>
Date:   Fri Nov 19 07:22:28 2010 -0500

    Merge branch 'master' into datetime

 data/theme/gnome-shell.css             |   11 ++-
 js/Makefile.am                         |    1 +
 js/ui/dnd.js                           |   11 +-
 js/ui/main.js                          |   13 +--
 js/ui/panel.js                         |    1 +
 js/ui/panelMenu.js                     |   19 ++--
 js/ui/placeDisplay.js                  |    8 +-
 js/ui/popupMenu.js                     |    7 +-
 js/ui/status/power.js                  |  226 ++++++++++++++++++++++++++++++++
 js/ui/telepathyClient.js               |    6 +-
 js/ui/workspace.js                     |    2 +-
 src/Makefile.am                        |    4 +-
 src/shell-app-system.c                 |    2 +-
 src/shell-global.c                     |  157 ++--------------------
 src/shell-global.h                     |    2 -
 src/shell-tray-manager.c               |    2 +
 src/shell-uri-util.h                   |   15 --
 src/{shell-uri-util.c => shell-util.c} |   58 ++++++++-
 src/shell-util.h                       |   18 +++
 src/shell-window-tracker.c             |    2 +-
 src/st/st-icon.c                       |  121 +++++++++++++++---
 src/st/st-icon.h                       |    3 +
 src/st/st-texture-cache.c              |   14 ++-
 src/st/st-texture-cache.h              |    1 +
 src/st/st-tooltip.c                    |  168 ++++++------------------
 src/st/st-tooltip.h                    |    6 +-
 src/st/st-widget.c                     |    6 +-
 tools/build/gnome-shell-build-setup.sh |   10 +-
 tools/build/gnome-shell.modules        |   67 +++++++++-
 29 files changed, 593 insertions(+), 368 deletions(-)
---
diff --cc js/ui/panel.js
index 28bdaa1,690d992..2f31d26
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@@ -34,8 -33,14 +34,9 @@@ const STANDARD_TRAY_ICON_ORDER = ['a11y
  const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION = {
      'a11y': imports.ui.status.accessibility.ATIndicator,
      'volume': imports.ui.status.volume.Indicator,
+     'battery': imports.ui.status.power.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);
  }