[gnome-shell/message-tray: 45/45] Merge branch 'master' into message-tray

[Dan Winship <danw src gnome org>]

commit 09653fbaf64f29b4836188ef60463375254b8618
Merge: b179195 a2cae50
Author: Dan Winship <danw gnome org>
Date:   Tue Jan 5 11:25:15 2010 -0500

    Merge branch 'master' into message-tray
    
    Conflicts:
    	js/ui/main.js

 data/gnome-shell.schemas               |   15 +
 data/theme/gnome-shell.css             |   84 ++++-
 js/misc/docInfo.js                     |  155 ++++----
 js/ui/Makefile.am                      |    2 +
 js/ui/altTab.js                        |   11 +-
 js/ui/appDisplay.js                    |  359 +++++++++--------
 js/ui/appIcon.js                       |    2 +-
 js/ui/chrome.js                        |   15 +-
 js/ui/dash.js                          |  545 ++++++++++++++-----------
 js/ui/docDisplay.js                    |  134 +++++--
 js/ui/extensionSystem.js               |  158 +++++++
 js/ui/genericDisplay.js                |    1 -
 js/ui/link.js                          |   67 +---
 js/ui/lookingGlass.js                  |  180 ++++++++-
 js/ui/main.js                          |  219 ++++++++--
 js/ui/overview.js                      |    6 +-
 js/ui/placeDisplay.js                  |  320 ++++++++-------
 js/ui/runDialog.js                     |  178 ++++++++
 js/ui/search.js                        |  272 ++++++++++++
 js/ui/sidebar.js                       |   10 +
 js/ui/widget.js                        |    3 +-
 js/ui/workspaces.js                    |   53 ++-
 po/LINGUAS                             |    2 +
 po/POTFILES.in                         |    1 -
 po/es.po                               |  181 ++++-----
 po/fr.po                               |  102 ++++--
 po/gl.po                               |  238 ++++++-----
 po/he.po                               |  215 ++++++++++
 po/it.po                               |  186 ++++-----
 po/sl.po                               |  163 ++++-----
 po/sv.po                               |  185 +++++----
 src/Makefile-st.am                     |    2 +
 src/Makefile.am                        |    2 +
 src/gnome-shell.in                     |   87 ++++
 src/shell-app-system.c                 |  447 +++++++++++++-------
 src/shell-app-system.h                 |   23 +-
 src/shell-doc-system.c                 |  367 +++++++++++++++++
 src/shell-doc-system.h                 |   46 ++
 src/shell-generic-container.c          |  107 +++++-
 src/shell-generic-container.h          |    4 +
 src/shell-global.c                     |  124 ++++++
 src/shell-global.h                     |    9 +
 src/st/st-button.c                     |   14 +-
 src/st/st-label.c                      |   20 +-
 src/st/st-overflow-box.c               |  706 ++++++++++++++++++++++++++++++++
 src/st/st-overflow-box.h               |   75 ++++
 src/st/st-private.c                    |   49 +++
 src/st/st-private.h                    |    3 +
 src/st/st-theme-node.c                 |    5 +-
 src/st/st-theme.c                      |  100 ++++-
 src/st/st-theme.h                      |    4 +
 tools/build/gnome-shell-build-setup.sh |    2 +-
 tools/build/jhbuildrc-gnome-shell      |    2 +-
 53 files changed, 4695 insertions(+), 1565 deletions(-)
---
diff --cc js/ui/main.js
index 10ea3a5,7361ac3..502511e
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@@ -14,8 -14,7 +14,9 @@@ const St = imports.gi.St
  
  const Chrome = imports.ui.chrome;
  const Environment = imports.ui.environment;
+ const ExtensionSystem = imports.ui.extensionSystem;
 +const MessageTray = imports.ui.messageTray;
 +const Messaging = imports.ui.messaging;
  const Overview = imports.ui.overview;
  const Panel = imports.ui.panel;
  const PlaceDisplay = imports.ui.placeDisplay;
@@@ -111,11 -113,9 +120,13 @@@ function start() 
      panel = new Panel.Panel();
      sidebar = new Sidebar.Sidebar();
      wm = new WindowManager.WindowManager();
 +    messaging = new Messaging.Messaging();
 +    notificationDaemon = new NotificationDaemon.NotificationDaemon();
 +    notificationPopup = new MessageTray.Notification();
 +    messageTray = new MessageTray.MessageTray();
  
+     _startDate = new Date();
+ 
      global.screen.connect('toggle-recording', function() {
          if (recorder == null) {
              recorder = new Shell.Recorder({ stage: global.stage });