[gnome-shell/zeitgeist: 75/120] Merge remote branch 'origin/master' into zeitgeist
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/zeitgeist: 75/120] Merge remote branch 'origin/master' into zeitgeist
- Date: Mon, 14 Mar 2011 22:37:49 +0000 (UTC)
commit a70ea12be892e53b9a5187f6acbe87109b278f81
Merge: fb5a3a5 162d029
Author: Federico Mena Quintero <federico gnome org>
Date: Wed Mar 9 18:50:07 2011 -0500
Merge remote branch 'origin/master' into zeitgeist
.gitignore | 2 +-
configure.ac | 50 +-
data/Makefile.am | 5 +-
data/theme/close-window.svg | 128 ++-
...filter-selected.svg => filter-selected-ltr.svg} | 0
...filter-selected.svg => filter-selected-rtl.svg} | 16 +-
data/theme/gnome-shell.css | 176 +++-
data/theme/process-working.png | Bin 4097 -> 0 bytes
data/theme/process-working.svg | 261 +++++
js/misc/history.js | 89 ++-
js/ui/altTab.js | 2 +-
js/ui/appDisplay.js | 49 +-
js/ui/ctrlAltTab.js | 143 ++-
js/ui/dash.js | 5 -
js/ui/dateMenu.js | 2 +
js/ui/dnd.js | 50 +-
js/ui/lookingGlass.js | 20 +-
js/ui/main.js | 20 +-
js/ui/messageTray.js | 242 +++--
js/ui/notificationDaemon.js | 25 +-
js/ui/overview.js | 80 +-
js/ui/panel.js | 77 +-
js/ui/panelMenu.js | 28 +-
js/ui/popupMenu.js | 182 +--
js/ui/runDialog.js | 15 +-
js/ui/statusMenu.js | 19 +-
js/ui/telepathyClient.js | 13 +-
js/ui/viewSelector.js | 39 +-
js/ui/windowAttentionHandler.js | 45 +-
js/ui/windowManager.js | 17 +-
js/ui/workspace.js | 248 ++---
js/ui/workspaceThumbnail.js | 4 -
js/ui/workspacesView.js | 249 ++---
js/ui/xdndHandler.js | 11 +-
po/POTFILES.in | 1 +
po/ar.po | 152 ++--
po/bg.po | 1008 ++++++++++++-----
po/ca.po | 1210 ++++++++++++++++++--
po/el.po | 822 ++++++++------
po/en_GB.po | 1140 ++++++++++++++-----
po/es.po | 156 ++--
po/kn.po | 279 +++---
po/nb.po | 155 ++--
po/pa.po | 259 +++--
po/pl.po | 1014 ++++++++++++----
po/sl.po | 425 +++++---
po/ta.po | 39 +-
po/vi.po | 990 ++++++++++-------
src/Makefile-calendar-server.am | 5 +-
src/Makefile-gvc.am | 3 +-
src/Makefile.am | 79 +-
src/gnome-shell-installed.in | 41 -
src/gnome-shell-jhbuild.in | 29 +-
src/gnome-shell-plugin.c | 432 +-------
src/main.c | 460 ++++++++
src/shell-a11y.c | 3 -
src/shell-app-system.c | 2 +-
src/shell-app-system.h | 2 +-
src/shell-app-usage.c | 7 +-
src/shell-app.c | 12 +-
src/shell-app.h | 3 +-
src/shell-global-private.h | 4 +-
src/shell-global.c | 60 +-
src/shell-global.h | 3 +-
src/shell-tray-manager.c | 6 +-
src/shell-window-tracker.c | 9 +-
src/shell-window-tracker.h | 2 +-
src/shell-wm.c | 4 +-
src/shell-wm.h | 2 +-
src/st/st-button.c | 2 +-
src/st/st-container.c | 18 +-
src/st/st-entry.c | 2 +-
src/st/st-focus-manager.c | 23 +
src/st/st-focus-manager.h | 2 +
src/st/st-scroll-view.c | 3 +-
src/st/st-texture-cache.c | 38 +-
src/st/st-widget.c | 62 +-
src/st/st-widget.h | 14 +-
tests/Makefile.am | 2 +-
tests/run-test.sh.in | 2 +-
tools/build/gnome-shell-build-setup.sh | 12 +-
tools/build/gnome-shell.modules | 6 +-
tools/check-for-missing.py | 2 +-
83 files changed, 7560 insertions(+), 3758 deletions(-)
---
diff --cc js/ui/lookingGlass.js
index 03b83ec,ede95a1..0615e50
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@@ -26,8 -26,8 +26,9 @@@ var commandHeader = 'const Clutter = im
'const Gtk = imports.gi.Gtk; ' +
'const Mainloop = imports.mainloop; ' +
'const Meta = imports.gi.Meta; ' +
+ 'const Semantic = imports.misc.semantic' +
'const Shell = imports.gi.Shell; ' +
+ 'const Tp = imports.gi.TelepathyGLib; ' +
'const Main = imports.ui.main; ' +
'const Lang = imports.lang; ' +
'const Tweener = imports.ui.tweener; ' +
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
