[gnome-shell/datetime: 86/86] Merge branch 'master' into datetime
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/datetime: 86/86] Merge branch 'master' into datetime
- Date: Tue, 16 Nov 2010 15:27:40 +0000 (UTC)
commit 7aa3aba0c26c9a5a595cae9b8e94a6a4f4391df8
Merge: eb66993 b8a5d3f
Author: David Zeuthen <davidz redhat com>
Date: Tue Nov 16 09:16:38 2010 -0500
Merge branch 'master' into datetime
.gitignore | 1 +
configure.ac | 4 +-
data/gnome-shell.schemas | 18 +
...rg.gnome.accessibility.magnifier.gschema.xml.in | 4 +-
data/theme/gnome-shell.css | 44 +-
js/misc/telepathy.js | 43 +-
js/ui/appDisplay.js | 3 +-
js/ui/lookingGlass.js | 11 +-
js/ui/magnifier.js | 6 +-
js/ui/main.js | 1 +
js/ui/messageTray.js | 50 +-
js/ui/notificationDaemon.js | 11 +-
js/ui/panel.js | 12 +-
js/ui/panelMenu.js | 27 +-
js/ui/placeDisplay.js | 8 +-
js/ui/popupMenu.js | 216 +++---
js/ui/status/accessibility.js | 57 +-
js/ui/status/volume.js | 12 +-
js/ui/statusIconDispatcher.js | 4 +-
js/ui/statusMenu.js | 19 +-
js/ui/telepathyClient.js | 4 +-
po/LINGUAS | 1 +
po/ar.po | 530 +++++++++++--
po/cs.po | 343 +++++++--
po/es.po | 28 +-
po/gl.po | 64 +-
po/he.po | 26 +-
po/pa.po | 296 ++++++-
po/pt_BR.po | 638 +++++++++++++--
po/ro.po | 862 +++++++++++++++++---
po/ug.po | 694 ++++++++++++++++
po/zh_CN.po | 118 ++-
src/Makefile-st.am | 8 +-
src/Makefile.am | 31 +
src/gnome-shell-plugin.c | 2 +
src/gnome-shell.in | 1 +
src/run-js-test.c | 144 ++++
src/shell-app-system.c | 14 +-
src/shell-generic-container.c | 22 +
src/shell-global.c | 15 +
src/shell-window-tracker.c | 2 +-
src/shell-xfixes-cursor.c | 35 +-
src/st/st-adjustment.c | 11 +-
src/st/st-adjustment.h | 7 +-
src/st/st-bin.c | 34 +-
src/st/st-bin.h | 7 +-
src/st/st-border-image.c | 18 +
src/st/st-border-image.h | 19 +
src/st/st-box-layout-child.c | 5 +-
src/st/st-box-layout-child.h | 5 +-
src/st/st-box-layout.c | 9 +-
src/st/st-box-layout.h | 7 +-
src/st/st-button.c | 141 ++--
src/st/st-button.h | 10 +-
src/st/st-clickable.c | 51 ++
src/st/st-clickable.h | 19 +
src/st/st-clipboard.c | 6 +-
src/st/st-clipboard.h | 6 +-
src/st/st-container.c | 335 ++++++++-
src/st/st-container.h | 11 +-
src/st/st-drawing-area.c | 18 +
src/st/st-drawing-area.h | 19 +
src/st/st-entry.c | 32 +-
src/st/st-entry.h | 7 +-
src/st/st-focus-manager.c | 201 +++++
src/st/st-focus-manager.h | 79 ++
src/st/st-group.c | 8 +-
src/st/st-group.h | 7 +-
src/st/st-icon-colors.c | 108 +++
src/st/st-icon-colors.h | 41 +
src/st/st-icon.c | 492 +++++++++++
src/st/st-icon.h | 100 +++
src/st/st-im-text.c | 10 +-
src/st/st-im-text.h | 10 +-
src/st/st-label.c | 8 +-
src/st/st-label.h | 7 +-
src/st/st-overflow-box.c | 77 ++-
src/st/st-overflow-box.h | 6 +-
src/st/st-private.c | 63 ++
src/st/st-private.h | 11 +-
src/st/st-scroll-bar.c | 11 +-
src/st/st-scroll-bar.h | 8 +-
src/st/st-scroll-view.c | 11 +-
src/st/st-scroll-view.h | 10 +-
src/st/st-scrollable.c | 8 +-
src/st/st-scrollable.h | 8 +-
src/st/st-shadow.c | 19 +
src/st/st-shadow.h | 19 +
src/st/st-subtexture.c | 576 -------------
src/st/st-subtexture.h | 97 ---
src/st/st-table-child.c | 8 +-
src/st/st-table-child.h | 7 +-
src/st/st-table-private.h | 5 +-
src/st/st-table.c | 9 +-
src/st/st-table.h | 7 +-
src/st/st-texture-cache.c | 221 +++++-
src/st/st-texture-cache.h | 35 +-
src/st/st-theme-context.c | 43 +
src/st/st-theme-context.h | 20 +
src/st/st-theme-node-drawing.c | 437 +++++-----
src/st/st-theme-node-private.h | 24 +-
src/st/st-theme-node-transition.c | 28 +-
src/st/st-theme-node-transition.h | 19 +
src/st/st-theme-node.c | 144 ++++
src/st/st-theme-node.h | 24 +
src/st/st-theme-private.h | 19 +
src/st/st-theme.c | 42 +-
src/st/st-theme.h | 18 +
src/st/st-tooltip.c | 8 +-
src/st/st-tooltip.h | 8 +-
src/st/st-types.h | 11 +-
src/st/st-widget.c | 192 +++++-
src/st/st-widget.h | 22 +-
src/st/test-theme.c | 18 +
tests/Makefile.am | 1 +
tests/interactive/icons.js | 88 ++
tests/run-test.sh.in | 9 +-
tests/testcommon/ui.js | 1 -
tools/build/gnome-shell-build-setup.sh | 54 +-
tools/build/gnome-shell.modules | 66 ++-
120 files changed, 6787 insertions(+), 2002 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
