[gnome-shell/datetime: 134/134] Catch up with master

[David Zeuthen <davidz src gnome org>]

commit 0d9095d2d4425792966c50c50ae1265adbe4528e
Merge: 8bc396a a739f89
Author: David Zeuthen <davidz redhat com>
Date:   Wed Jan 19 11:09:57 2011 -0500

    Catch up with master

 .gitignore                                       |    5 +-
 configure.ac                                     |   28 +-
 data/Makefile.am                                 |    9 +-
 data/clock-preferences.ui                        |  188 -----
 data/gnome-shell-clock-preferences.desktop.in.in |   15 -
 data/org.gnome.shell.gschema.xml.in              |   43 +-
 data/search_providers/google.xml                 |    7 +
 data/search_providers/wikipedia.xml              |   44 +
 data/theme/gnome-shell.css                       |  239 ++++---
 js/Makefile.am                                   |   11 +-
 js/misc/config.js.in                             |    7 +
 js/misc/docInfo.js                               |    3 +-
 js/misc/gnomeSession.js                          |   58 ++
 js/misc/util.js                                  |  175 +++++
 js/misc/utils.js                                 |   19 -
 js/prefs/clockPreferences.js                     |   97 ---
 js/ui/altTab.js                                  |   53 +-
 js/ui/appDisplay.js                              |   17 +-
 js/ui/boxpointer.js                              |   60 +-
 js/ui/ctrlAltTab.js                              |  254 ++++++
 js/ui/dash.js                                    |   22 +-
 js/ui/docDisplay.js                              |  476 -----------
 js/ui/endSessionDialog.js                        |  504 ++++++++++++
 js/ui/environment.js                             |    2 +-
 js/ui/extensionSystem.js                         |   42 +-
 js/ui/genericDisplay.js                          |  693 ----------------
 js/ui/lookingGlass.js                            |   18 +-
 js/ui/main.js                                    |  129 ++-
 js/ui/messageTray.js                             |  199 +++---
 js/ui/modalDialog.js                             |  233 ++++++
 js/ui/notificationDaemon.js                      |   38 +-
 js/ui/overview.js                                |  250 +++++--
 js/ui/panel.js                                   |  144 ++--
 js/ui/panelMenu.js                               |    7 +-
 js/ui/placeDisplay.js                            |  178 +-----
 js/ui/popupMenu.js                               |  231 ++++--
 js/ui/runDialog.js                               |  150 ++---
 js/ui/search.js                                  |  114 +++
 js/ui/searchDisplay.js                           |  137 +++-
 js/ui/status/accessibility.js                    |    4 +-
 js/ui/status/bluetooth.js                        |   78 ++-
 js/ui/status/keyboard.js                         |  206 +++++
 js/ui/status/power.js                            |   14 +-
 js/ui/status/volume.js                           |    4 +-
 js/ui/statusIconDispatcher.js                    |    4 +-
 js/ui/statusMenu.js                              |   21 +-
 js/ui/telepathyClient.js                         |    2 +
 js/ui/viewSelector.js                            |   65 +-
 js/ui/windowManager.js                           |    2 +
 js/ui/workspacesView.js                          |    3 +
 js/ui/xdndHandler.js                             |  130 +++
 po/POTFILES.in                                   |    7 +-
 po/ar.po                                         |  595 ++++++++++-----
 po/de.po                                         |  567 +++++++++++---
 po/el.po                                         |  913 +++++++++++++++-------
 po/es.po                                         |  583 +++++++++-----
 po/et.po                                         |  320 ++++++---
 po/gl.po                                         |  614 ++++++++++-----
 po/he.po                                         |  567 +++++++++-----
 po/it.po                                         |  538 ++++++++-----
 po/nb.po                                         |  502 ++++++++-----
 po/pa.po                                         |  718 +++++++++++++-----
 po/sv.po                                         |  757 +++++++++++++++---
 po/ug.po                                         |  525 +++++++++----
 po/vi.po                                         |  893 +++++++++++++++++++---
 po/zh_CN.po                                      |  256 +++++--
 po/zh_HK.po                                      |  833 +++++++++++++++-----
 po/zh_TW.po                                      |  837 +++++++++++++++-----
 src/Makefile-st.am                               |   10 +-
 src/Makefile-tray.am                             |    1 -
 src/Makefile.am                                  |   14 +-
 src/gdmuser/gdm-user-manager.c                   |   14 -
 src/gnome-shell-clock-preferences.in             |   24 -
 src/gnome-shell-plugin.c                         |  130 +++-
 src/gnome-shell.in                               |    7 +-
 src/gtk-compat.h                                 |   19 -
 src/shell-app-system.h                           |  114 ++--
 src/shell-app.c                                  |    3 +-
 src/shell-embedded-window.c                      |    1 -
 src/shell-generic-container.c                    |    2 +
 src/shell-global-private.h                       |    2 +
 src/shell-global.c                               |  281 +++++++-
 src/shell-global.h                               |   10 +
 src/shell-gtk-embed.c                            |   26 +-
 src/shell-marshal.list                           |    1 +
 src/shell-process.c                              |  129 ---
 src/shell-process.h                              |   37 -
 src/shell-tray-icon.c                            |    1 -
 src/shell-tray-manager.c                         |    9 +-
 src/st/st-box-layout.c                           |   11 +
 src/st/st-box-layout.h                           |    4 +
 src/st/st-container.c                            |   23 +
 src/st/st-container.h                            |    3 +
 src/st/st-icon.c                                 |    2 +-
 src/st/st-im-text.c                              |    5 +-
 src/st/st-texture-cache.c                        |   66 ++-
 src/tray/na-tray-child.c                         |    1 -
 src/tray/na-tray-manager.c                       |    2 -
 tools/build/gnome-shell-build-setup.sh           |   11 +-
 tools/build/gnome-shell.modules                  |    8 +-
 100 files changed, 10956 insertions(+), 5472 deletions(-)
---
diff --cc js/Makefile.am
index f496db5,3a7a2da..21683af
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@@ -18,13 -17,13 +17,14 @@@ nobase_dist_js_DATA = 	
  	ui/boxpointer.js	\
  	ui/calendar.js		\
  	ui/chrome.js		\
+ 	ui/ctrlAltTab.js	\
  	ui/dash.js		\
 +	ui/dateMenu.js		\
  	ui/dnd.js		\
  	ui/docDisplay.js	\
+ 	ui/endSessionDialog.js	\
  	ui/environment.js	\
  	ui/extensionSystem.js	\
- 	ui/genericDisplay.js	\
  	ui/iconGrid.js		\
  	ui/lightbox.js		\
  	ui/link.js		\