[gnome-shell/zeitgeist: 204/205] 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: 204/205] Merge remote branch origin/master into zeitgeist
- Date: Mon, 28 Mar 2011 22:37:54 +0000 (UTC)
commit e4e6b26e15ab808fc866a36e5d36460ea693504e
Merge: 9551e1c 9b4dbd0
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Mar 25 18:28:15 2011 -0400
Merge remote branch origin/master into zeitgeist
.gitignore | 3 +-
configure.ac | 18 +-
data/Makefile.am | 4 +-
data/gnome-shell.desktop.in.in | 1 +
data/gnome-shell.schemas | 15 +
data/org.gnome.shell.gschema.xml.in | 8 +-
.../{corner-ripple.png => corner-ripple-ltr.png} | Bin 2493 -> 2493 bytes
data/theme/corner-ripple-rtl.png | Bin 0 -> 2386 bytes
data/theme/gnome-shell.css | 181 ++-
data/theme/source-button-border.svg | 74 +
js/Makefile.am | 2 +
js/misc/modemManager.js | 225 +++
js/misc/util.js | 129 +-
js/ui/altTab.js | 11 +-
js/ui/appDisplay.js | 21 +-
js/ui/chrome.js | 9 +-
js/ui/ctrlAltTab.js | 1 +
js/ui/dash.js | 19 +
js/ui/dateMenu.js | 8 +-
js/ui/dnd.js | 3 +
js/ui/endSessionDialog.js | 78 +-
js/ui/iconGrid.js | 5 +-
js/ui/main.js | 108 +-
js/ui/messageTray.js | 472 +++--
js/ui/modalDialog.js | 80 +-
js/ui/notificationDaemon.js | 60 +-
js/ui/overview.js | 19 +-
js/ui/panel.js | 115 +-
js/ui/polkitAuthenticationAgent.js | 18 +-
js/ui/popupMenu.js | 100 +-
js/ui/runDialog.js | 22 +-
js/ui/searchDisplay.js | 39 +-
js/ui/status/accessibility.js | 15 +-
js/ui/status/bluetooth.js | 24 +-
js/ui/status/keyboard.js | 3 +-
js/ui/status/network.js | 2107 ++++++++++++++++++++
js/ui/status/power.js | 3 +-
js/ui/status/volume.js | 3 +-
js/ui/statusMenu.js | 60 +-
js/ui/telepathyClient.js | 202 ++-
js/ui/viewSelector.js | 15 +-
js/ui/windowManager.js | 88 +-
js/ui/workspace.js | 116 +-
js/ui/workspaceThumbnail.js | 76 +-
js/ui/workspacesView.js | 110 +-
po/LINGUAS | 2 +
po/POTFILES.in | 4 +
po/ar.po | 432 +++--
po/bn_IN.po | 1189 +++++++++++
po/es.po | 513 ++++--
po/et.po | 497 +++--
po/fr.po | 1179 +++++++++---
po/gl.po | 978 ++++++----
po/he.po | 342 +++-
po/hu.po | 478 +++--
po/id.po | 1180 ++++++++++--
po/it.po | 479 +++--
po/ko.po | 452 +++--
po/lt.po | 1262 ++++++++++---
po/lv.po | 1287 ++++++++++++
po/nb.po | 425 +++--
po/nl.po | 344 +++-
po/pa.po | 474 ++++--
po/pl.po | 345 +++-
po/pt.po | 1268 ++++++++++---
po/pt_BR.po | 1234 ++++++++-----
po/ro.po | 316 +++-
po/ru.po | 1207 ++++++++++--
po/sl.po | 681 ++++---
po/sr.po | 1346 ++++++++++---
po/sr latin po | 1346 ++++++++++---
po/sv.po | 1227 +++++++-----
po/uk.po | 451 +++--
po/vi.po | 513 ++++--
po/zh_CN.po | 569 ++++--
po/zh_HK.po | 845 ++++-----
po/zh_TW.po | 852 ++++-----
src/Makefile.am | 12 +-
src/gdmuser/gdm-user.c | 11 +-
src/gnome-shell-jhbuild.in | 10 +-
src/gnome-shell-plugin.c | 32 +-
src/main.c | 67 +-
src/shell-app-system.c | 252 ++-
src/shell-app-system.h | 3 -
src/shell-app.c | 57 +-
src/shell-global.c | 249 ++-
src/shell-global.h | 36 +-
src/shell-mobile-providers.c | 816 ++++++++
src/shell-mobile-providers.h | 96 +
src/shell-tray-icon.c | 73 +
src/shell-tray-icon.h | 3 +
src/shell-window-tracker.c | 23 +-
src/st/st-button.c | 5 +-
src/st/st-container.c | 12 +-
src/st/st-label.c | 9 +-
src/st/st-private.c | 42 +-
src/st/st-texture-cache.c | 91 +-
src/st/st-theme-node.c | 9 +
src/st/st-tooltip.c | 218 ++-
src/st/st-tooltip.h | 18 +
src/st/st-widget.c | 246 ++-
src/st/st-widget.h | 4 +
tools/build/gnome-shell.modules | 23 +-
103 files changed, 23519 insertions(+), 7285 deletions(-)
---
diff --cc js/Makefile.am
index 2cb6be0,a085bfc..a892d24
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@@ -8,10 -8,9 +8,11 @@@ nobase_dist_js_DATA =
misc/format.js \
misc/gnomeSession.js \
misc/history.js \
+ misc/modemManager.js \
misc/params.js \
+ misc/semantic.js \
misc/util.js \
+ misc/zeitgeist.js \
perf/core.js \
ui/altTab.js \
ui/appDisplay.js \
diff --cc js/ui/overview.js
index ad04b78,8fdd661..6f1c9a5
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@@ -23,7 -24,7 +23,8 @@@ const PlaceDisplay = imports.ui.placeDi
const Tweener = imports.ui.tweener;
const ViewSelector = imports.ui.viewSelector;
const WorkspacesView = imports.ui.workspacesView;
+ const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
+const ZeitgeistSearch = imports.ui.zeitgeistSearch;
// Time for initial animation going into Overview mode
const ANIMATION_TIME = 0.25;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
