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

[Dan Winship <danw src gnome org>]

commit 3b4e2202f70efd25f0504b52d86d5ab0a99b36e7
Merge: 3b5c468... 236a9b1...
Author: Dan Winship <danw gnome org>
Date:   Wed Dec 2 17:03:48 2009 -0500

    Merge branch 'master' into message-tray

 data/Makefile.am              |    2 +-
 data/info.svg                 |   74 ----
 data/theme/close-window.svg   |   76 ++++
 data/theme/gnome-shell.css    |  120 ++++++-
 js/misc/Makefile.am           |    3 +-
 js/misc/params.js             |   33 ++
 js/ui/Makefile.am             |    2 -
 js/ui/altTab.js               |   47 ++-
 js/ui/appDisplay.js           |  819 +++++++++++++++++++++++++++++------------
 js/ui/appIcon.js              |    2 +-
 js/ui/button.js               |  172 ---------
 js/ui/chrome.js               |  140 +++-----
 js/ui/dash.js                 |   36 --
 js/ui/genericDisplay.js       |   69 +----
 js/ui/panel.js                |  179 +++------
 js/ui/runDialog.js            |    2 +-
 js/ui/widgetBox.js            |    4 +-
 js/ui/workspaces.js           |  447 +++++++++++++----------
 po/pt_BR.po                   |  102 ++++--
 src/Makefile-st.am            |    4 +
 src/Makefile.am               |    4 -
 src/gnome-shell-plugin.c      |    2 +
 src/shell-app-system.c        |    2 +
 src/shell-app-usage.c         |    7 +-
 src/shell-app.c               |    2 +
 src/shell-arrow.c             |    2 +
 src/shell-button-box.c        |  317 ----------------
 src/shell-button-box.h        |   36 --
 src/shell-drawing-area.c      |  102 -----
 src/shell-drawing-area.h      |   38 --
 src/shell-drawing.c           |   98 +-----
 src/shell-drawing.h           |    6 -
 src/shell-embedded-window.c   |    2 +
 src/shell-gconf.c             |    2 +
 src/shell-generic-container.c |    2 +
 src/shell-global.c            |    5 +
 src/shell-gtk-embed.c         |    2 +
 src/shell-menu.c              |    2 +
 src/shell-overflow-list.c     |    2 +
 src/shell-process.c           |    2 +
 src/shell-recorder-src.c      |    2 +
 src/shell-recorder.c          |    2 +
 src/shell-stack.c             |    2 +
 src/shell-texture-cache.c     |    2 +
 src/shell-tray-manager.c      |    2 +
 src/shell-uri-util.c          |    4 +-
 src/shell-window-tracker.c    |    3 +
 src/shell-wm.c                |    2 +
 src/st/st-clickable.c         |  330 +++++++++++++++++
 src/st/st-clickable.h         |   35 ++
 src/st/st-drawing-area.c      |  125 +++++++
 src/st/st-drawing-area.h      |   39 ++
 src/st/st-theme-node.c        |   63 +++-
 src/st/st-theme-node.h        |   10 +
 src/st/st-widget.c            |  153 ++++++++-
 src/tray/na-tray-child.c      |    2 +-
 src/tray/na-tray-manager.c    |    2 +-
 57 files changed, 2071 insertions(+), 1675 deletions(-)
---