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

[Dan Winship <danw src gnome org>]

commit b0a0ee297c026b8baa86cf3d708ff56cfb7d23f8
Merge: b48b21e... 2c91437...
Author: Dan Winship <danw gnome org>
Date:   Wed Nov 18 13:43:54 2009 -0500

    Merge branch 'master' into message-tray
    
    Conflicts:
    	data/theme/gnome-shell.css

 data/Makefile.am                          |    7 +-
 data/{ => theme}/close.svg                |    0
 data/theme/gnome-shell.css                |  164 +++++++-
 data/{back.svg => theme/section-back.svg} |    0
 data/theme/section-more.svg               |   87 ++++
 js/misc/docInfo.js                        |    4 +-
 js/ui/Makefile.am                         |    3 +-
 js/ui/altTab.js                           |   25 +-
 js/ui/appDisplay.js                       |  199 +--------
 js/ui/appIcon.js                          |    9 +-
 js/ui/dash.js                             |  353 ++++++--------
 js/ui/docDisplay.js                       |   17 +-
 js/ui/environment.js                      |    6 +
 js/ui/genericDisplay.js                   |  250 ++++-------
 js/ui/lookingGlass.js                     |   22 +
 js/ui/main.js                             |    3 +
 js/ui/overview.js                         |   23 +-
 js/ui/panel.js                            |   12 +-
 js/ui/placeDisplay.js                     |  540 +++++++++++++++++++++
 js/ui/places.js                           |  321 -------------
 js/ui/shellDBus.js                        |    3 +
 js/ui/statusMenu.js                       |  297 ++++++++++++
 js/ui/workspaces.js                       |    3 +
 po/POTFILES.in                            |    2 +-
 po/ar.po                                  |   54 ++-
 po/cs.po                                  |   52 ++-
 po/fi.po                                  |  226 +++++++++
 po/it.po                                  |   61 +--
 po/sl.po                                  |   63 ++--
 src/Makefile.am                           |   23 +-
 src/gdmuser/gdm-user-manager.c            |    2 +-
 src/gdmuser/gdm-user-manager.h            |    2 +-
 src/gdmuser/gdm-user.c                    |    2 +-
 src/gdmuser/gdm-user.h                    |    2 +-
 src/gnome-shell.in                        |   20 +-
 src/shell-app-system.c                    |    2 +
 src/shell-global.c                        |   33 ++
 src/shell-global.h                        |    4 +
 src/shell-status-menu.c                   |  732 -----------------------------
 src/shell-status-menu.h                   |   45 --
 src/st/st-bin.c                           |    2 +-
 src/st/st-box-layout.c                    |  183 +++++++-
 src/st/st-box-layout.h                    |    6 +
 src/st/st-table.c                         |   77 +++-
 src/st/st-theme-node.c                    |   35 +-
 src/st/st-tooltip.c                       |   10 +-
 src/st/st-widget.c                        |  216 +++++++--
 src/st/st-widget.h                        |   11 +
 tools/build/gnome-shell-build-setup.sh    |   16 +-
 49 files changed, 2310 insertions(+), 1919 deletions(-)
---
diff --cc js/ui/Makefile.am
index c5824a4,a74fb86..f303aa6
--- a/js/ui/Makefile.am
+++ b/js/ui/Makefile.am
@@@ -17,10 -17,9 +17,10 @@@ dist_jsui_DATA =		
  	link.js			\
  	lookingGlass.js		\
  	main.js			\
 +	messageTray.js          \
  	overview.js		\
  	panel.js		\
- 	places.js		\
+ 	placeDisplay.js		\
  	runDialog.js		\
  	shellDBus.js		\
  	sidebar.js		\
diff --cc js/ui/main.js
index f0dae68,5a0ad4c..0bea5d5
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@@ -14,13 -14,11 +14,14 @@@ const St = imports.gi.St
  
  const Chrome = imports.ui.chrome;
  const Environment = imports.ui.environment;
 +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;
  const RunDialog = imports.ui.runDialog;
  const LookingGlass = imports.ui.lookingGlass;
 +const NotificationDaemon = imports.ui.notificationDaemon;
  const ShellDBus = imports.ui.shellDBus;
  const Sidebar = imports.ui.sidebar;
  const WindowManager = imports.ui.windowManager;