[gnome-shell/datetime: 63/63] Fix merge conflicts

[David Zeuthen <davidz src gnome org>]

commit 51481bed821cd46066aed2de640b6b42a16e0b01
Merge: 8dd05f9 991a0c6
Author: David Zeuthen <davidz redhat com>
Date:   Tue Nov 30 11:11:10 2010 -0500

    Fix merge conflicts
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 configure.ac                           |    8 +-
 data/Makefile.am                       |    2 +
 data/org.gnome.shell.gschema.xml.in    |   12 -
 data/theme/dash-placeholder.svg        |   84 ++
 data/theme/gnome-shell.css             |  340 ++++-----
 data/theme/running-indicator.svg       |   89 ++
 js/Makefile.am                         |    3 +
 js/misc/utils.js                       |   19 +
 js/ui/appDisplay.js                    |  275 +------
 js/ui/appFavorites.js                  |   29 +-
 js/ui/boxpointer.js                    |   14 +-
 js/ui/calendar.js                      |    6 +-
 js/ui/dash.js                          | 1035 ++++++------------------
 js/ui/dnd.js                           |   72 ++-
 js/ui/environment.js                   |    4 +-
 js/ui/messageTray.js                   |  182 ++++-
 js/ui/notificationDaemon.js            |   13 +-
 js/ui/overview.js                      |  510 +++++--------
 js/ui/placeDisplay.js                  |    2 +-
 js/ui/popupMenu.js                     |    8 +-
 js/ui/search.js                        |    4 +-
 js/ui/searchDisplay.js                 |  332 ++++++++
 js/ui/status/power.js                  |   85 ++-
 js/ui/status/volume.js                 |   62 +-
 js/ui/statusMenu.js                    |    8 +-
 js/ui/telepathyClient.js               |   75 ++-
 js/ui/viewSelector.js                  |  628 ++++++++++++++
 js/ui/workspace.js                     |  305 ++------
 js/ui/workspacesView.js                | 1421 +++++++++++---------------------
 po/POTFILES.in                         |    5 +-
 po/gl.po                               |  207 +++---
 po/nb.po                               |   90 +--
 po/th.po                               |  547 ++++++++++--
 po/ug.po                               |  286 ++++---
 src/Makefile.am                        |    2 -
 src/gnome-shell.in                     |    2 +-
 src/shell-generic-container.c          |   29 +
 src/shell-global.c                     |    5 +
 src/shell-global.h                     |    3 +-
 src/st/st-box-layout.c                 |   79 ++-
 src/st/st-group.c                      |   28 +
 src/st/st-icon.c                       |   83 ++-
 src/st/st-im-text.c                    |    8 +
 src/st/st-theme-node.c                 |   28 +-
 src/st/st-widget.c                     |   27 +
 tests/Makefile.am                      |    2 -
 tests/run-test.sh.in                   |   10 +-
 tools/build/gnome-shell-build-setup.sh |    5 +-
 tools/build/gnome-shell.modules        |   30 -
 49 files changed, 3694 insertions(+), 3409 deletions(-)
---
diff --cc data/theme/gnome-shell.css
index e1a3f1d,77ee7f8..7536d38
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@@ -892,63 -774,13 +822,67 @@@ StTooltip StLabel 
  }
  
  .calendar-other-month-day {
 -    color: #cccccc;
 +    color: #333333;
 +}
 +
 +.events-header {
 +    height: 40px;
 +}
 +
 +.events-day-header {
 +    padding-left: 20px;
 +    padding-right: 40px;
 +    font-weight: bold;
 +    font-size: 14px;
 +    color: rgba(153, 153, 153, 1.0);
 +}
 +
 +.events-day-time {
 +    font-size: 14px;
 +    font-weight: bold;
 +    color: #fff;
 +}
 +
 +.events-day-task {
 +    font-weight: bold;
 +    font-size: 14px;
 +    color: rgba(153, 153, 153, 1.0);
 +}
 +
 +.events-day-name-box {
 +    width: 50px;
 +}
 +
 +.events-time-box {
 +    width: 70px;
 +}
 +
 +.events-event-box {
 +    width: 300px;
 +}
 +
 +.events-no-events {
 +    font-weight: bold;
 +    padding-left: 40px;
 +    padding-right: 40px;
 +    font-size: 14px;
 +    color: rgba(153, 153, 153, 1.0);
 +}
 +
 +.open-calendar {
 +    padding-bottom: 12px;
 +    padding-left: 12px;
 +    height: 40px;
 +}
 +
 +.open-calendar:hover {
 +    background: #666;
  }
  
+ .url-highlighter {
+     link-color: #ccccff;
+ }
+ 
  /* Message Tray */
  #message-tray {
      background-gradient-direction: vertical;
diff --cc js/ui/calendar.js
index 96813e6,8f58f69..8bf75d5
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@@ -4,11 -4,8 +4,11 @@@ const Clutter = imports.gi.Clutter
  const Gio = imports.gi.Gio;
  const Lang = imports.lang;
  const St = imports.gi.St;
 +const Signals = imports.signals;
  const Pango = imports.gi.Pango;
- const Gettext_gtk20 = imports.gettext.domain('gtk20');
+ const Gettext_gtk30 = imports.gettext.domain('gtk30');
 +const Gettext = imports.gettext.domain('gnome-shell');
 +const _ = Gettext.gettext;
  
  const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
  const WEEKDATE_HEADER_WIDTH_DIGITS = 3;