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

[David Zeuthen <davidz src gnome org>]

commit 3d1063dacb19db676d9b31e29352381fec46c7e1
Merge: b4c038c ec018a0
Author: David Zeuthen <davidz redhat com>
Date:   Tue Oct 26 11:48:34 2010 -0400

    Merge branch 'master' into datetime
    
    Conflicts:
    	configure.ac

 configure.ac                    |    2 +-
 data/gs-applications.menu       |    1 +
 data/theme/gnome-shell.css      |   10 +-
 js/ui/altTab.js                 |   11 +-
 js/ui/boxpointer.js             |   43 +++---
 js/ui/chrome.js                 |    2 +-
 js/ui/dnd.js                    |   11 ++
 js/ui/iconGrid.js               |   18 +--
 js/ui/lookingGlass.js           |    2 +-
 js/ui/main.js                   |   73 ++++-----
 js/ui/messageTray.js            |    3 +-
 js/ui/notificationDaemon.js     |    2 +-
 js/ui/popupMenu.js              |  334 +++++++++++++++++++++++++++++---------
 js/ui/status/volume.js          |   28 +++-
 js/ui/statusIconDispatcher.js   |    4 +-
 js/ui/statusMenu.js             |   34 +++-
 js/ui/windowManager.js          |    2 +-
 js/ui/workspace.js              |   14 +--
 js/ui/workspaceSwitcherPopup.js |    3 +-
 js/ui/workspacesView.js         |    7 +-
 po/es.po                        |   81 ++++++----
 po/gl.po                        |  181 +++++++++++++++------
 po/he.po                        |  124 +++++++++++----
 src/gnome-shell-plugin.c        |  141 ++++++++--------
 src/shell-global-private.h      |    2 +-
 src/shell-global.c              |   60 ++++----
 src/shell-global.h              |    4 +-
 src/shell-tray-manager.c        |   22 ++-
 src/shell-wm-private.h          |   50 +++---
 src/shell-wm.c                  |  102 ++++++------
 src/shell-wm.h                  |   28 ++--
 src/st/st-box-layout.c          |    4 +-
 src/st/st-button.c              |    2 +-
 src/st/st-entry.c               |    6 +-
 src/st/st-overflow-box.c        |    4 +-
 src/st/st-scroll-bar.c          |    4 +-
 src/st/st-table.c               |    6 +-
 src/st/st-theme-node.c          |  137 ++++++++++++++---
 src/st/st-theme-node.h          |   35 +++--
 src/st/st-widget.c              |    2 +-
 src/tray/na-tray-manager.c      |    2 +-
 tools/build/gnome-shell.modules |    1 +
 42 files changed, 1026 insertions(+), 576 deletions(-)
---
diff --cc configure.ac
index 6da1d19,fe98add..dc712da
--- a/configure.ac
+++ b/configure.ac
@@@ -70,8 -69,7 +70,8 @@@ PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.
                                   gio-unix-2.0 dbus-glib-1
                                   gtk+-3.0 >= $GTK_MIN_VERSION
                                   mutter-plugins >= $MUTTER_MIN_VERSION
-                                  gjs-gi-1.0 >= $GJS_MIN_VERSION
+                                  gjs-internals-1.0 >= $GJS_MIN_VERSION
 +                                 libical >= $LIBICAL_MIN_VERSION
  				 libgnome-menu $recorder_modules gconf-2.0
                                   gdk-x11-3.0
  				 clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
diff --cc src/shell-global.c
index 1a2018d,a1518b4..a830519
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@@ -23,9 -23,8 +23,9 @@@
  #include <gio/gio.h>
  #include <math.h>
  #include <X11/extensions/Xfixes.h>
- #include <gjs/gjs.h>
+ #include <gjs/gjs-module.h>
  #include <canberra.h>
 +#include <libical/ical.h>
  #ifdef HAVE_SYS_RESOURCE_H
  #include <sys/resource.h>
  #endif