Bump version to 3.11.2

Update NEWS.
build: Add built js-resources to CLEANFILES
2013-11-13 21:24:30 +01:00 · 2013-11-13 21:24:30 +01:00 · 2013-11-13 15:15:03 -05:00 · 2013-11-11 14:45:06 +05:30 · 2013-11-10 14:19:51 +08:00 · 2013-11-09 17:58:59 +01:00
59 changed files with 3843 additions and 4931 deletions
--- a/.gitignore
+++ b/.gitignore
@ -43,6 +43,8 @@ docs/reference/*/xml/
 docs/reference/shell/doc-gen-*
 gtk-doc.make
 js/misc/config.js
+js/js-resources.c
+js/js-resources.h
 intltool-extract.in
 intltool-merge.in
 intltool-update.in
--- a/Makefile.am
+++ b/Makefile.am
@ -1,7 +1,11 @@
 # Point to our macro directory and pick up user flags from the environment
 ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}

-SUBDIRS = data js src browser-plugin tests po docs
+SUBDIRS = data js src  tests po docs
+
+if BUILD_BROWSER_PLUGIN
+SUBDIRS += browser-plugin
+endif

 if ENABLE_MAN
 SUBDIRS += man
--- a/20
+++ b/20
@ -1,3 +1,23 @@
+3.11.2
+======
+* Cache search result display actors [Jasper; #704912]
+* Use username in userWidget if real name doesn't fit [Jasper; #706851]
+* Support shell_global_reexec_self() on OpenBSD [Antoine; #709571]
+* Support disabling browser plugin [Colin; #711218]
+* Restore support for 'disable-restart-buttons' [Florian; #711244]
+* Validate parameters of exposed DBus methods [Florian; #699752]
+* Connect applications to systemd journal if available [Colin; #711626]
+* Misc bug fixes and cleanups [Florian, Jasper; #711205, #698486, #711416,
+  #644306, #711555, #709806, #711631, #711732]
+
+Contributors:
+  Cosimo Cecchi, Antoine Jacoutot, Florian Müllner, Jasper St. Pierre,
+  Rico Tzschichholz, Colin Walters
+
+Translations:
+  Yuri Myasoedov [ru], Kjartan Maraas [nb], Efstathios Iosifidis [el],
+  Benjamin Steinwender [de], eternalhui [zh_CN], Shantha kumar [ta]
+
 3.11.1
 ======
 * power: Use UPower directly instead of gnome-settings-daemon [Bastien; #710273]
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.11.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.11.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -58,6 +58,21 @@ fi

 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)

+AC_ARG_ENABLE([systemd],
+              AS_HELP_STRING([--enable-systemd], [Use systemd]),
+              [enable_systemd=$enableval],
+              [enable_systemd=auto])
+AS_IF([test x$enable_systemd != xno], [
+  AC_MSG_CHECKING([for libsystemd-journal])
+  PKG_CHECK_EXISTS([libsystemd-journal],
+                   [have_systemd=yes
+                    AC_DEFINE([HAVE_SYSTEMD], [1], [Define if we have systemd])],
+                   [have_systemd=no])
+  AC_MSG_RESULT($have_systemd)
+])
+
+AC_MSG_RESULT($enable_systemd)
+
 CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.38.1
@ -71,7 +86,6 @@ POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
 GCR_MIN_VERSION=3.7.5
 GNOME_DESKTOP_REQUIRED_VERSION=3.7.90
-GNOME_MENUS_REQUIRED_VERSION=3.5.3
 NETWORKMANAGER_MIN_VERSION=0.9.8
 PULSE_MIN_VERS=2.0

@ -81,7 +95,6 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
            gtk+-3.0 >= $GTK_MIN_VERSION
            atk-bridge-2.0
            gjs-internals-1.0 >= $GJS_MIN_VERSION
-            libgnome-menu-3.0 >= $GNOME_MENUS_REQUIRED_VERSION
            $recorder_modules
            gdk-x11-3.0 libsoup-2.4
            xtst
@ -95,6 +108,9 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
            libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
            libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
            libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION"
+if test x$have_systemd = xyes; then
+  SHARED_PCS="${SHARED_PCS} libsystemd-journal"
+fi

 PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
 PKG_CHECK_MODULES(MUTTER, libmutter >= $MUTTER_MIN_VERSION)
@ -110,12 +126,20 @@ PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
 PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
 PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
 PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
-PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse >= $PULSE_MIN_VERS libpulse-mainloop-glib gobject-2.0)
 PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4)
 PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)

+AC_ARG_ENABLE(browser-plugin,
+              [AS_HELP_STRING([--enable-browser-plugin],
+                              [Enable browser plugin [default=yes]])],,
+              enable_browser_plugin=yes)
+AS_IF([test x$enable_browser_plugin = xyes], [
+  PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
+])
+AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes)
+
 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0],
        [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
@ -148,6 +172,9 @@ AC_SUBST(MUTTER_TYPELIB_DIR)
 GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
 AC_SUBST(GJS_CONSOLE)

+GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
+AC_SUBST(GLIB_COMPILE_RESOURCES)
+
 AC_CHECK_FUNCS(fdwalk)
 AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_HEADERS([sys/resource.h])
--- a/js/Makefile.am
+++ b/js/Makefile.am
@ -1,7 +1,5 @@
 NULL =
-
-EXTRA_DIST = misc/config.js.in
-CLEANFILES = misc/config.js
+BUILT_SOURCES =

 misc/config.js: misc/config.js.in Makefile
 	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
@ -14,110 +12,26 @@ misc/config.js: misc/config.js.in Makefile
 	    -e "s|[@]sysconfdir@|$(sysconfdir)|g" \
               $< > $@

-jsdir = $(pkgdatadir)/js
+js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/js-resources.gresource.xml)
+js-resources.h: js-resources.gresource.xml $(js_resource_files) misc/config.js
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate --c-name shell_js_resources $<
+js-resources.c: js-resources.gresource.xml $(js_resource_files) misc/config.js
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate --c-name shell_js_resources $<

-nobase_dist_js_DATA = 	\
-	gdm/authPrompt.js	\
-	gdm/batch.js		\
-	gdm/fingerprint.js	\
-	gdm/loginDialog.js	\
-	gdm/oVirt.js		\
-	gdm/realmd.js		\
-	gdm/util.js		\
-	extensionPrefs/main.js	\
-	misc/config.js		\
-	misc/extensionUtils.js	\
-	misc/fileUtils.js	\
-	misc/gnomeSession.js	\
-	misc/hash.js		\
-	misc/history.js		\
-	misc/jsParse.js		\
-	misc/loginManager.js	\
-	misc/modemManager.js	\
-	misc/objectManager.js	\
-	misc/params.js		\
-	misc/smartcardManager.js \
-	misc/util.js		\
-	perf/core.js		\
-	ui/altTab.js		\
-	ui/animation.js		\
-	ui/appDisplay.js	\
-	ui/appFavorites.js	\
-	ui/backgroundMenu.js	\
-	ui/background.js	\
-	ui/boxpointer.js	\
-	ui/calendar.js		\
-	ui/checkBox.js		\
-	ui/ctrlAltTab.js	\
-	ui/dash.js		\
-	ui/dateMenu.js		\
-	ui/dnd.js		\
-	ui/endSessionDialog.js	\
-	ui/extensionSystem.js	\
-	ui/extensionDownloader.js \
-	ui/environment.js	\
-	ui/focusCaretTracker.js\
-	ui/ibusCandidatePopup.js\
-	ui/grabHelper.js	\
-	ui/iconGrid.js		\
-	ui/keyboard.js		\
-	ui/layout.js		\
-	ui/lightbox.js		\
-	ui/lookingGlass.js	\
-	ui/magnifier.js		\
-	ui/magnifierDBus.js	\
-	ui/main.js		\
-	ui/messageTray.js	\
-	ui/modalDialog.js	\
-	ui/separator.js		\
-	ui/sessionMode.js	\
-	ui/shellEntry.js	\
-	ui/shellMountOperation.js \
-	ui/slider.js		\
-	ui/notificationDaemon.js \
-	ui/osdWindow.js		\
-	ui/overview.js		\
-	ui/overviewControls.js	\
-	ui/panel.js		\
-	ui/panelMenu.js		\
-	ui/pointerWatcher.js    \
-	ui/popupMenu.js		\
-	ui/remoteSearch.js	\
-	ui/remoteMenu.js	\
-	ui/runDialog.js		\
-	ui/screencast.js	\
-	ui/screenshot.js	\
-        ui/screenShield.js	\
-	ui/scripting.js		\
-	ui/search.js		\
-	ui/shellDBus.js		\
-	ui/status/accessibility.js	\
-	ui/status/brightness.js	\
-	ui/status/keyboard.js	\
-	ui/status/network.js	\
-	ui/status/power.js	\
-	ui/status/rfkill.js	\
-	ui/status/volume.js	\
-	ui/status/bluetooth.js	\
-	ui/status/screencast.js	\
-	ui/status/system.js	\
-	ui/switcherPopup.js	\
-	ui/tweener.js		\
-	ui/unlockDialog.js	\
-	ui/userWidget.js	\
-	ui/viewSelector.js	\
-	ui/windowAttentionHandler.js	\
-	ui/windowManager.js	\
-	ui/workspace.js		\
-	ui/workspaceThumbnail.js	\
-	ui/workspacesView.js	\
-	ui/workspaceSwitcherPopup.js    \
-	ui/xdndHandler.js	\
-	ui/components/__init__.js		\
-	ui/components/autorunManager.js		\
-	ui/components/automountManager.js	\
-	ui/components/networkAgent.js		\
-	ui/components/polkitAgent.js		\
-	ui/components/telepathyClient.js	\
-	ui/components/keyring.js		\
+js_built_sources = js-resources.c js-resources.h
+
+BUILT_SOURCES += $(js_built_sources)
+
+all-local: $(js_built_sources)
+
+js_resource_dist_files = $(filter-out misc/config.js, $(js_resource_files))
+
+EXTRA_DIST = \
+	$(js_resource_dist_files) \
+	js-resources.gresource.xml \
+	misc/config.js.in \
+	$(NULL)
+
+CLEANFILES = \
+	$(js_built_sources) \
 	$(NULL)
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@ -206,11 +206,11 @@ const Application = new Lang.Class({
    _scanExtensions: function() {
        let finder = new ExtensionUtils.ExtensionFinder();
        finder.connect('extension-found', Lang.bind(this, this._extensionFound));
-        finder.connect('extensions-loaded', Lang.bind(this, this._extensionsLoaded));
        finder.scanExtensions();
+        this._extensionsLoaded();
    },

-    _extensionFound: function(signals, extension) {
+    _extensionFound: function(finder, extension) {
        let iter = this._model.append();
        this._model.set(iter, [0, 1], [extension.uuid, extension.metadata.name]);
        this._extensionIters[extension.uuid] = iter;
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -59,7 +59,7 @@ const UserListItem = new Lang.Class({
        this._userChangedId = this.user.connect('changed',
                                                 Lang.bind(this, this._onUserChanged));

-        let layout = new St.BoxLayout({ vertical: false });
+        let layout = new St.BoxLayout({ vertical: true });
        this.actor = new St.Button({ style_class: 'login-dialog-user-list-item',
                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                     can_focus: true,
@ -68,39 +68,18 @@ const UserListItem = new Lang.Class({
                                     x_align: St.Align.START,
                                     x_fill: true });

-        this._userAvatar = new UserWidget.Avatar(this.user,
-                                                 { styleClass: 'login-dialog-user-list-item-icon' });
-        layout.add(this._userAvatar.actor);
-        let textLayout = new St.BoxLayout({ style_class: 'login-dialog-user-list-item-text-box',
-                                            vertical:    true });
-        layout.add(textLayout, { expand: true });
-
-        this._nameLabel = new St.Label({ style_class: 'login-dialog-user-list-item-name' });
-        this.actor.label_actor = this._nameLabel;
-        textLayout.add(this._nameLabel,
-                       { y_fill: false,
-                         y_align: St.Align.MIDDLE,
-                         expand: true });
+        this._userWidget = new UserWidget.UserWidget(this.user);
+        layout.add(this._userWidget.actor);

        this._timedLoginIndicator = new St.Bin({ style_class: 'login-dialog-timed-login-indicator',
                                                 scale_x: 0 });
-        textLayout.add(this._timedLoginIndicator,
-                       { x_fill: true,
-                         x_align: St.Align.MIDDLE,
-                         y_fill: false,
-                         y_align: St.Align.END });
+        layout.add(this._timedLoginIndicator);

        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
        this._onUserChanged();
    },

    _onUserChanged: function() {
-        this._nameLabel.set_text(this.user.get_real_name());
-        this._userAvatar.update();
-        this._updateLoggedIn();
-    },
-
-    syncStyleClasses: function() {
        this._updateLoggedIn();
    },

@ -189,7 +168,6 @@ const UserList = new Lang.Class({
        for (let userName in this._items) {
            let item = this._items[userName];
            item.actor.sync_hover();
-            item.syncStyleClasses();
        }
    },

--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/shell">
+    <file>gdm/authPrompt.js</file>
+    <file>gdm/batch.js</file>
+    <file>gdm/fingerprint.js</file>
+    <file>gdm/loginDialog.js</file>
+    <file>gdm/oVirt.js</file>
+    <file>gdm/realmd.js</file>
+    <file>gdm/util.js</file>
+    <file>extensionPrefs/main.js</file>
+    <file>misc/config.js</file>
+    <file>misc/extensionUtils.js</file>
+    <file>misc/fileUtils.js</file>
+    <file>misc/gnomeSession.js</file>
+    <file>misc/hash.js</file>
+    <file>misc/history.js</file>
+    <file>misc/jsParse.js</file>
+    <file>misc/loginManager.js</file>
+    <file>misc/modemManager.js</file>
+    <file>misc/objectManager.js</file>
+    <file>misc/params.js</file>
+    <file>misc/smartcardManager.js</file>
+    <file>misc/util.js</file>
+    <file>perf/core.js</file>
+    <file>ui/altTab.js</file>
+    <file>ui/animation.js</file>
+    <file>ui/appDisplay.js</file>
+    <file>ui/appFavorites.js</file>
+    <file>ui/backgroundMenu.js</file>
+    <file>ui/background.js</file>
+    <file>ui/boxpointer.js</file>
+    <file>ui/calendar.js</file>
+    <file>ui/checkBox.js</file>
+    <file>ui/ctrlAltTab.js</file>
+    <file>ui/dash.js</file>
+    <file>ui/dateMenu.js</file>
+    <file>ui/dnd.js</file>
+    <file>ui/endSessionDialog.js</file>
+    <file>ui/extensionSystem.js</file>
+    <file>ui/extensionDownloader.js</file>
+    <file>ui/environment.js</file>
+    <file>ui/focusCaretTracker.js</file>
+    <file>ui/ibusCandidatePopup.js</file>
+    <file>ui/grabHelper.js</file>
+    <file>ui/iconGrid.js</file>
+    <file>ui/keyboard.js</file>
+    <file>ui/layout.js</file>
+    <file>ui/lightbox.js</file>
+    <file>ui/lookingGlass.js</file>
+    <file>ui/magnifier.js</file>
+    <file>ui/magnifierDBus.js</file>
+    <file>ui/main.js</file>
+    <file>ui/messageTray.js</file>
+    <file>ui/modalDialog.js</file>
+    <file>ui/separator.js</file>
+    <file>ui/sessionMode.js</file>
+    <file>ui/shellEntry.js</file>
+    <file>ui/shellMountOperation.js</file>
+    <file>ui/slider.js</file>
+    <file>ui/notificationDaemon.js</file>
+    <file>ui/osdWindow.js</file>
+    <file>ui/overview.js</file>
+    <file>ui/overviewControls.js</file>
+    <file>ui/panel.js</file>
+    <file>ui/panelMenu.js</file>
+    <file>ui/pointerWatcher.js</file>
+    <file>ui/popupMenu.js</file>
+    <file>ui/remoteSearch.js</file>
+    <file>ui/remoteMenu.js</file>
+    <file>ui/runDialog.js</file>
+    <file>ui/screencast.js</file>
+    <file>ui/screenshot.js</file>
+    <file>ui/screenShield.js</file>
+    <file>ui/scripting.js</file>
+    <file>ui/search.js</file>
+    <file>ui/shellDBus.js</file>
+    <file>ui/status/accessibility.js</file>
+    <file>ui/status/brightness.js</file>
+    <file>ui/status/keyboard.js</file>
+    <file>ui/status/network.js</file>
+    <file>ui/status/power.js</file>
+    <file>ui/status/rfkill.js</file>
+    <file>ui/status/volume.js</file>
+    <file>ui/status/bluetooth.js</file>
+    <file>ui/status/screencast.js</file>
+    <file>ui/status/system.js</file>
+    <file>ui/switcherPopup.js</file>
+    <file>ui/tweener.js</file>
+    <file>ui/unlockDialog.js</file>
+    <file>ui/userWidget.js</file>
+    <file>ui/viewSelector.js</file>
+    <file>ui/windowAttentionHandler.js</file>
+    <file>ui/windowManager.js</file>
+    <file>ui/workspace.js</file>
+    <file>ui/workspaceThumbnail.js</file>
+    <file>ui/workspacesView.js</file>
+    <file>ui/workspaceSwitcherPopup.js</file>
+    <file>ui/xdndHandler.js</file>
+    <file>ui/components/__init__.js</file>
+    <file>ui/components/autorunManager.js</file>
+    <file>ui/components/automountManager.js</file>
+    <file>ui/components/networkAgent.js</file>
+    <file>ui/components/polkitAgent.js</file>
+    <file>ui/components/telepathyClient.js</file>
+    <file>ui/components/keyring.js</file>
+  </gresource>
+</gresources>
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@ -174,17 +174,9 @@ const ExtensionFinder = new Lang.Class({
        this.emit('extension-found', extension);
    },

-    _extensionsLoaded: function() {
-        this.emit('extensions-loaded');
-    },
-
    scanExtensions: function() {
        let perUserDir = Gio.File.new_for_path(global.userdatadir);
-        FileUtils.collectFromDatadirsAsync('extensions',
-                                           { processFile: Lang.bind(this, this._loadExtension),
-                                             loadedCallback: Lang.bind(this, this._extensionsLoaded),
-                                             includeUserDir: true,
-                                             data: perUserDir });
+        FileUtils.collectFromDatadirs('extensions', true, Lang.bind(this, this._loadExtension, perUserDir));
    }
 });
 Signals.addSignalMethods(ExtensionFinder.prototype);
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@ -25,60 +25,27 @@ function listDirAsync(file, callback) {
    });
 }

-function _collectFromDirectoryAsync(dir, loadState) {
-    function done() {
-        loadState.numLoading--;
-        if (loadState.loadedCallback &&
-            loadState.numLoading == 0)
-            loadState.loadedCallback(loadState.data);
-    }
-
-    dir.query_info_async('standard::type', Gio.FileQueryInfoFlags.NONE,
-        GLib.PRIORITY_DEFAULT, null, function(object, res) {
-            try {
-                object.query_info_finish(res);
-            } catch (e) {
-                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                    log(e.message);
-                done();
-                return;
-            }
-
-            listDirAsync(dir, Lang.bind(this, function(infos) {
-                for (let i = 0; i < infos.length; i++)
-                    loadState.processFile(dir.get_child(infos[i].get_name()),
-                                          infos[i], loadState.data);
-                done();
-            }));
-        });
-}
-
-function collectFromDatadirsAsync(subdir, params) {
-    params = Params.parse(params, { includeUserDir: false,
-                                    processFile: null,
-                                    loadedCallback: null,
-                                    data: null });
-    let loadState = { data: params.data,
-                      numLoading: 0,
-                      loadedCallback: params.loadedCallback,
-                      processFile: params.processFile };
-
-    if (params.processFile == null) {
-        if (params.loadedCallback)
-            params.loadedCallback(params.data);
-        return;
-    }
-
+function collectFromDatadirs(subdir, includeUserDir, processFile) {
    let dataDirs = GLib.get_system_data_dirs();
-    if (params.includeUserDir)
+    if (includeUserDir)
        dataDirs.unshift(GLib.get_user_data_dir());
-    loadState.numLoading = dataDirs.length;

    for (let i = 0; i < dataDirs.length; i++) {
        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', subdir]);
        let dir = Gio.File.new_for_path(path);

-        _collectFromDirectoryAsync(dir, loadState);
+        let fileEnum;
+        try {
+            fileEnum = dir.enumerate_children('standard::name,standard::type',
+                                              Gio.FileQueryInfoFlags.NONE, null);
+        } catch (e) {
+            fileEnum = null;
+        }
+        if (fileEnum != null) {
+            let info;
+            while ((info = fileEnum.next_file(null)))
+                processFile(fileEnum.get_child(info), info);
+        }
    }
 }

--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -55,13 +55,13 @@ function _loadCategory(dir, view) {
    while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
        if (nextType == GMenu.TreeItemType.ENTRY) {
            let entry = iter.get_entry();
-            let app = appSystem.lookup_app_by_tree_entry(entry);
-            if (!entry.get_app_info().get_nodisplay())
+            let appInfo = entry.get_app_info();
+            let app = appSystem.lookup_app(entry.get_desktop_file_id());
+            if (appInfo.should_show())
                view.addApp(app);
        } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
            let itemDir = iter.get_directory();
-            if (!itemDir.get_is_nodisplay())
-                _loadCategory(itemDir, view);
+            _loadCategory(itemDir, view);
        }
    }
 };
@ -92,7 +92,7 @@ const BaseAppView = new Lang.Class({
    },

    removeAll: function() {
-        this._grid.removeAll();
+        this._grid.destroyAll();
        this._items = {};
        this._allItems = [];
    },
@ -613,6 +613,10 @@ const FrequentView = new Lang.Class({
        return this._usage.get_most_used("").length >= MIN_FREQUENT_APPS_COUNT;
    },

+    removeAll: function() {
+        this._grid.destroyAll();
+    },
+
    loadApps: function() {
        let mostUsed = this._usage.get_most_used ("");
        let hasUsefulData = this.hasUsefulData();
@ -691,8 +695,7 @@ const AppDisplay = new Lang.Class({
    Name: 'AppDisplay',

    _init: function() {
-        this._appSystem = Shell.AppSystem.get_default();
-        this._appSystem.connect('installed-changed', Lang.bind(this, function() {
+        Shell.AppSystem.get_default().connect('installed-changed', Lang.bind(this, function() {
            Main.queueDeferredWork(this._allAppsWorkId);
        }));
        Main.overview.connect('showing', Lang.bind(this, function() {
@ -813,7 +816,8 @@ const AppDisplay = new Lang.Class({

        view.removeAll();

-        let tree = this._appSystem.get_tree();
+        let tree = new GMenu.Tree({ menu_basename: "applications.menu" });
+        tree.load_sync();
        let root = tree.get_root_directory();

        let iter = root.iter();
@ -822,8 +826,6 @@ const AppDisplay = new Lang.Class({
        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
            if (nextType == GMenu.TreeItemType.DIRECTORY) {
                let dir = iter.get_directory();
-                if (dir.get_is_nodisplay())
-                    continue;

                if (folderCategories.indexOf(dir.get_menu_id()) != -1)
                    view.addFolder(dir);
@ -871,8 +873,8 @@ const AppSearchProvider = new Lang.Class({
    getResultMetas: function(apps, callback) {
        let metas = [];
        for (let i = 0; i < apps.length; i++) {
-            let app = apps[i];
-            metas.push({ 'id': app,
+            let app = this._appSys.lookup_app(apps[i]);
+            metas.push({ 'id': app.get_id(),
                         'name': app.get_name(),
                         'createIcon': function(size) {
                             return app.create_icon_texture(size);
@ -886,15 +888,16 @@ const AppSearchProvider = new Lang.Class({
        return results.slice(0, maxNumber);
    },

-    getInitialResultSet: function(terms) {
-        this.searchSystem.setResults(this, this._appSys.initial_search(terms));
+    getInitialResultSet: function(terms, callback, cancellable) {
+        callback(this._appSys.initial_search(terms));
    },

-    getSubsearchResultSet: function(previousResults, terms) {
-        this.searchSystem.setResults(this, this._appSys.subsearch(previousResults, terms));
+    getSubsearchResultSet: function(previousResults, terms, callback, cancellable) {
+        callback(this._appSys.subsearch(previousResults, terms));
    },

-    activateResult: function(app) {
+    activateResult: function(result) {
+        let app = this._appSys.lookup_app(result);
        let event = Clutter.get_current_event();
        let modifiers = event ? event.get_state() : 0;
        let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK;
@ -913,8 +916,8 @@ const AppSearchProvider = new Lang.Class({
        app.open_new_window(workspace);
    },

-    createResultObject: function (resultMeta, terms) {
-        let app = resultMeta['id'];
+    createResultObject: function (resultMeta) {
+        let app = this._appSys.lookup_app(resultMeta['id']);
        return new AppIcon(app);
    }
 });
@ -1352,7 +1355,9 @@ const AppIcon = new Lang.Class({
            this._removeMenuTimeout();
            this._menuTimeoutId = Mainloop.timeout_add(MENU_POPUP_TIMEOUT,
                Lang.bind(this, function() {
+                    this._menuTimeoutId = 0;
                    this.popupMenu();
+                    return false;
                }));
        } else if (button == 3) {
            this.popupMenu();
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@ -138,6 +138,8 @@ const NetworkSecretDialog = new Lang.Class({
                           key:    Clutter.KEY_Escape,
                         },
                         this._okButton]);
+
+        this._updateOkButton();
    },

    _updateOkButton: function() {
@ -432,6 +434,7 @@ const VPNRequestHandler = new Lang.Class({
    },

    _vpnChildFinished: function(pid, status, requestObj) {
+        this._childWatch = 0;
        if (this._newStylePlugin) {
            // For new style plugin, all work is done in the async reading functions
            // Just reap the process here
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@ -960,6 +960,8 @@ const ChatNotification = new Lang.Class({
    },

    appendTimestamp: function() {
+        this._timestampTimeoutId = 0;
+
        let lastMessageTime = this._history[0].time;
        let lastMessageDate = new Date(lastMessageTime * 1000);

--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -576,6 +576,7 @@ const Dash = new Lang.Class({
                    Lang.bind(this, function() {
                        this._labelShowing = true;
                        item.showLabel();
+                        this._showLabelTimeoutId = 0;
                        return false;
                    }));
                if (this._resetHoverTimeoutId > 0) {
@ -592,6 +593,7 @@ const Dash = new Lang.Class({
                this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
                    Lang.bind(this, function() {
                        this._labelShowing = false;
+                        this._resetHoverTimeoutId = 0;
                        return false;
                    }));
            }
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -236,7 +236,7 @@ const _Draggable = new Lang.Class({

        if (this.actor._delegate && this.actor._delegate.getDragActor) {
            this._dragActor = this.actor._delegate.getDragActor();
-            this._dragActor.reparent(Main.uiGroup);
+            Main.uiGroup.add_child(this._dragActor);
            this._dragActor.raise_top();
            Shell.util_set_hidden_from_pick(this._dragActor, true);

@ -285,7 +285,8 @@ const _Draggable = new Lang.Class({
            this._dragOffsetX = actorStageX - this._dragStartX;
            this._dragOffsetY = actorStageY - this._dragStartY;

-            this._dragActor.reparent(Main.uiGroup);
+            this._dragOrigParent.remove_actor(this._dragActor);
+            Main.uiGroup.add_child(this._dragActor);
            this._dragActor.raise_top();
            Shell.util_set_hidden_from_pick(this._dragActor, true);
        }
@ -345,6 +346,7 @@ const _Draggable = new Lang.Class({
    },

    _updateDragHover : function () {
+        this._updateHoverId = 0;
        let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
                                                                  this._dragX, this._dragY);
        let dragEvent = {
@ -389,7 +391,7 @@ const _Draggable = new Lang.Class({

    _queueUpdateDragHover: function() {
        if (this._updateHoverId)
-            GLib.source_remove(this._updateHoverId);
+            return;

        this._updateHoverId = GLib.idle_add(GLib.PRIORITY_DEFAULT,
                                            Lang.bind(this, this._updateDragHover));
@ -555,7 +557,8 @@ const _Draggable = new Lang.Class({

    _onAnimationComplete : function (dragActor, eventTime) {
        if (this._dragOrigParent) {
-            dragActor.reparent(this._dragOrigParent);
+            Main.uiGroup.remove_child(this._dragActor);
+            this._dragOrigParent.add_actor(this._dragActor);
            dragActor.set_scale(this._dragOrigScale, this._dragOrigScale);
            dragActor.set_position(this._dragOrigX, this._dragOrigY);
        } else {
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -415,6 +415,7 @@ const EndSessionDialog = new Lang.Class({
                let dialogContent = DialogContent[this._type];
                let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
                this._confirm(button.signal);
+                this._timerId = 0;

                return false;
            }));
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -253,7 +253,7 @@ function onEnabledExtensionsChanged() {
    newEnabledExtensions.filter(function(uuid) {
        return enabledExtensions.indexOf(uuid) == -1;
    }).forEach(function(uuid) {
-            enableExtension(uuid);
+        enableExtension(uuid);
    });

    // Find and disable all the newly disabled extensions: UUIDs found in the
@ -261,7 +261,7 @@ function onEnabledExtensionsChanged() {
    enabledExtensions.filter(function(item) {
        return newEnabledExtensions.indexOf(item) == -1;
    }).forEach(function(uuid) {
-            disableExtension(uuid);
+        disableExtension(uuid);
    });

    enabledExtensions = newEnabledExtensions;
@ -272,7 +272,7 @@ function _loadExtensions() {
    enabledExtensions = getEnabledExtensions();

    let finder = new ExtensionUtils.ExtensionFinder();
-    finder.connect('extension-found', function(signals, extension) {
+    finder.connect('extension-found', function(finder, extension) {
        loadExtension(extension);
    });
    finder.scanExtensions();
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@ -413,15 +413,18 @@ const IconGrid = new Lang.Class({
    },

    removeAll: function() {
+        this._items = [];
+        this._grid.remove_all_children();
+    },
+
+    destroyAll: function() {
        this._items = [];
        this._grid.destroy_all_children();
    },

    addItem: function(item, index) {
-        if (!item.icon || !item.icon instanceof BaseIcon) {
-            log('Only items with a BaseIcon icon property can be added to IconGrid');
-            return;
-        }
+        if (!item.icon instanceof BaseIcon)
+            throw new Error('Only items with a BaseIcon icon property can be added to IconGrid');

        this._items.push(item);
        if (index !== undefined)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -112,11 +112,6 @@ function start() {
    Gio.DesktopAppInfo.set_desktop_env('GNOME');

    sessionMode = new SessionMode.SessionMode();
-    sessionMode.connect('sessions-loaded', _sessionsLoaded);
-    sessionMode.init();
-}
-
-function _sessionsLoaded() {
    sessionMode.connect('updated', _sessionUpdated);
    _initializePrefs();
    _initializeUI();
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -2373,7 +2373,6 @@ const MessageTray = new Lang.Class({
                    this._showNotification();
            }
        } else if (this._notificationState == State.SHOWN) {
-            let pinned = this._pointerInNotification && !this._notificationRemoved;
            let expired = (this._userActiveWhileNotificationShown &&
                           this._notificationTimeoutId == 0 &&
                           !(this._notification.urgency == Urgency.CRITICAL) &&
@ -2384,9 +2383,9 @@ const MessageTray = new Lang.Class({
            if (mustClose) {
                let animate = hasNotifications && !this._notificationRemoved;
                this._hideNotification(animate);
-            } else if (pinned && !this._notification.expanded) {
+            } else if (this._pointerInNotification && !this._notification.expanded) {
                this._expandNotification(false);
-            } else if (pinned) {
+            } else if (this._pointerInNotification) {
                this._ensureNotificationFocused();
            }
        }
@ -2756,12 +2755,12 @@ const MessageTray = new Lang.Class({
        } else if (this._notification.y != expandedY) {
            // Tween also opacity here, to override a possible tween that's
            // currently hiding the notification.
-            this._tween(this._notificationWidget, '_notificationState', State.SHOWN,
-                        { y: expandedY,
-                          opacity: 255,
-                          time: ANIMATION_TIME,
-                          transition: 'easeOutQuad'
-                        });
+            Tweener.addTween(this._notificationWidget,
+                             { y: expandedY,
+                               opacity: 255,
+                               time: ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
        }
    },

--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -582,7 +582,7 @@ const FdoNotificationDaemonSource = new Lang.Class({
    },

    _createPolicy: function() {
-        if (this.app) {
+        if (this.app && this.app.get_app_info()) {
            let id = this.app.get_id().replace(/\.desktop$/,'');
            return new MessageTray.NotificationApplicationPolicy(id);
        } else {
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -363,11 +363,13 @@ const Overview = new Lang.Class({
            this._lastHoveredWindow = dragEvent.targetActor._delegate.metaWindow;
            this._windowSwitchTimeoutId = Mainloop.timeout_add(DND_WINDOW_SWITCH_TIMEOUT,
                                            Lang.bind(this, function() {
+                                                this._windowSwitchTimeoutId = 0;
                                                this._needsFakePointerEvent = true;
                                                Main.activateWindow(dragEvent.targetActor._delegate.metaWindow,
                                                                    this._windowSwitchTimestamp);
                                                this.hide();
                                                this._lastHoveredWindow = null;
+                                                return false;
                                            }));
        }

@ -443,17 +445,17 @@ const Overview = new Lang.Class({
        this._inDrag = false;
    },

-    beginWindowDrag: function(source) {
-        this.emit('window-drag-begin');
+    beginWindowDrag: function(clone) {
+        this.emit('window-drag-begin', clone);
        this._inDrag = true;
    },

-    cancelledWindowDrag: function(source) {
-        this.emit('window-drag-cancelled');
+    cancelledWindowDrag: function(clone) {
+        this.emit('window-drag-cancelled', clone);
    },

-    endWindowDrag: function(source) {
-        this.emit('window-drag-end');
+    endWindowDrag: function(clone) {
+        this.emit('window-drag-end', clone);
        this._inDrag = false;
    },

--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@ -36,6 +36,7 @@ const SlideLayout = new Lang.Class({

    _init: function(params) {
        this._slideX = 1;
+        this._translationX = 0;
        this._direction = SlideDirection.LEFT;

        this.parent(params);
@ -66,9 +67,9 @@ const SlideLayout = new Lang.Class({
        let alignX = (realDirection == SlideDirection.LEFT) ? (availWidth - natWidth) : 0;

        let actorBox = new Clutter.ActorBox();
-        actorBox.x1 = alignX;
-        actorBox.x2 = actorBox.x1 + child.x_expand ? availWidth : natWidth;
-        actorBox.y1 = 0;
+        actorBox.x1 = box.x1 + alignX + this._translationX;
+        actorBox.x2 = actorBox.x1 + (child.x_expand ? availWidth : natWidth);
+        actorBox.y1 = box.y1;
        actorBox.y2 = actorBox.y1 + availHeight;

        child.allocate(actorBox, flags);
@ -90,7 +91,16 @@ const SlideLayout = new Lang.Class({

    get slideDirection() {
        return this._direction;
-    }
+    },
+
+    set translationX(value) {
+        this._translationX = value;
+        this.layout_changed();
+    },
+
+    get translationX() {
+        return this._translationX;
+    },
 });

 const SlidingControl = new Lang.Class({
@ -99,8 +109,8 @@ const SlidingControl = new Lang.Class({
    _init: function(params) {
        params = Params.parse(params, { slideDirection: SlideDirection.LEFT });

-        this.visible = true;
-        this.inDrag = false;
+        this._visible = true;
+        this._inDrag = false;

        this.layout = new SlideLayout();
        this.layout.slideDirection = params.slideDirection;
@ -109,6 +119,7 @@ const SlidingControl = new Lang.Class({
                                     clip_to_allocation: true });

        Main.overview.connect('showing', Lang.bind(this, this._onOverviewShowing));
+        Main.overview.connect('hiding', Lang.bind(this, this._onOverviewHiding));

        Main.overview.connect('item-drag-begin', Lang.bind(this, this._onDragBegin));
        Main.overview.connect('item-drag-end', Lang.bind(this, this._onDragEnd));
@ -119,12 +130,12 @@ const SlidingControl = new Lang.Class({
        Main.overview.connect('window-drag-end', Lang.bind(this, this._onWindowDragEnd));
    },

-    getSlide: function() {
+    _getSlide: function() {
        throw new Error('getSlide() must be overridden');
    },

-    updateSlide: function() {
-        Tweener.addTween(this.layout, { slideX: this.getSlide(),
+    _updateSlide: function() {
+        Tweener.addTween(this.layout, { slideX: this._getSlide(),
                                        time: SIDE_CONTROLS_ANIMATION_TIME,
                                        transition: 'easeOutQuad' });
    },
@ -151,28 +162,30 @@ const SlidingControl = new Lang.Class({
        let translationEnd = 0;
        let translation = this._getTranslation();

-        if (this.visible) {
+        if (this._visible) {
            translationStart = translation;
        } else {
            translationEnd = translation;
        }

-        if (this.actor.translation_x == translationEnd)
+        if (this.layout.translationX == translationEnd)
            return;

-        this.actor.translation_x = translationStart;
-        Tweener.addTween(this.actor, { translation_x: translationEnd,
-                                       time: SIDE_CONTROLS_ANIMATION_TIME,
-                                       transition: 'easeOutQuad'
-                                     });
+        this.layout.translationX = translationStart;
+        Tweener.addTween(this.layout, { translationX: translationEnd,
+                                        time: SIDE_CONTROLS_ANIMATION_TIME,
+                                        transition: 'easeOutQuad' });
    },

    _onOverviewShowing: function() {
-        // reset any translation and make sure the actor is visible when
-        // entering the overview
-        this.visible = true;
-        this.layout.slideX = this.getSlide();
-        this.actor.translation_x = 0;
+        this._visible = true;
+        this.layout.slideX = this._getSlide();
+        this.layout.translationX = this._getTranslation();
+        this.slideIn();
+    },
+
+    _onOverviewHiding: function() {
+        this.slideOut();
    },

    _onWindowDragBegin: function() {
@ -184,14 +197,14 @@ const SlidingControl = new Lang.Class({
    },

    _onDragBegin: function() {
-        this.inDrag = true;
-        this.actor.translation_x = 0;
-        this.updateSlide();
+        this._inDrag = true;
+        this.layout.translationX = 0;
+        this._updateSlide();
    },

    _onDragEnd: function() {
-        this.inDrag = false;
-        this.updateSlide();
+        this._inDrag = false;
+        this._updateSlide();
    },

    fadeIn: function() {
@ -209,13 +222,13 @@ const SlidingControl = new Lang.Class({
    },

    slideIn: function() {
-        this.visible = true;
+        this._visible = true;
        this._updateTranslation();
        // we will update slideX and the translation from pageEmpty
    },

    slideOut: function() {
-        this.visible = false;
+        this._visible = false;
        this._updateTranslation();
        // we will update slideX from pageEmpty
    },
@ -225,7 +238,7 @@ const SlidingControl = new Lang.Class({
        // selector; this means we can now safely set the full slide for
        // the next page, since slideIn or slideOut might have been called,
        // changing the visiblity
-        this.layout.slideX = this.getSlide();
+        this.layout.slideX = this._getSlide();
        this._updateTranslation();
    }
 });
@ -244,16 +257,15 @@ const ThumbnailsSlider = new Lang.Class({
        this.actor.track_hover = true;
        this.actor.add_actor(this._thumbnailsBox.actor);

-        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this.updateSlide));
-        Main.overview.connect('hiding', Lang.bind(this, this.slideOut));
-        this.actor.connect('notify::hover', Lang.bind(this, this.updateSlide));
+        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._updateSlide));
+        this.actor.connect('notify::hover', Lang.bind(this, this._updateSlide));
        this._thumbnailsBox.actor.bind_property('visible', this.actor, 'visible', GObject.BindingFlags.SYNC_CREATE);
    },

    _getAlwaysZoomOut: function() {
        // Always show the pager when hover, during a drag, or if workspaces are
        // actually used, e.g. there are windows on more than one
-        let alwaysZoomOut = this.actor.hover || this.inDrag || !Meta.prefs_get_dynamic_workspaces() || global.screen.n_workspaces > 2;
+        let alwaysZoomOut = this.actor.hover || this._inDrag || !Meta.prefs_get_dynamic_workspaces() || global.screen.n_workspaces > 2;

        if (!alwaysZoomOut) {
            let monitors = Main.layoutManager.monitors;
@ -273,20 +285,13 @@ const ThumbnailsSlider = new Lang.Class({
        return alwaysZoomOut;
    },

-    _onOverviewShowing: function() {
-        this.visible = true;
-        this.layout.slideX = this.getSlide();
-        this.actor.translation_x = this._getTranslation();
-        this.slideIn();
-    },
-
    getNonExpandedWidth: function() {
        let child = this.actor.get_first_child();
        return child.get_theme_node().get_length('visible-width');
    },

-    getSlide: function() {
-        if (!this.visible)
+    _getSlide: function() {
+        if (!this._visible)
            return 0;

        let alwaysZoomOut = this._getAlwaysZoomOut();
@ -323,29 +328,22 @@ const DashSlider = new Lang.Class({
        // available allocation
        this._dash.actor.x_expand = true;

+        this.actor.x_expand = true;
        this.actor.x_align = Clutter.ActorAlign.START;
        this.actor.y_expand = true;

        this.actor.add_actor(this._dash.actor);

-        this._dash.connect('icon-size-changed', Lang.bind(this, this.updateSlide));
-        Main.overview.connect('hiding', Lang.bind(this, this.slideOut));
+        this._dash.connect('icon-size-changed', Lang.bind(this, this._updateSlide));
    },

-    getSlide: function() {
-        if (this.visible || this.inDrag)
+    _getSlide: function() {
+        if (this._visible || this._inDrag)
            return 1;
        else
            return 0;
    },

-    _onOverviewShowing: function() {
-        this.visible = true;
-        this.layout.slideX = this.getSlide();
-        this.actor.translation_x = this._getTranslation();
-        this.slideIn();
-    },
-
    _onWindowDragBegin: function() {
        this.fadeHalf();
    },
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -1114,7 +1114,7 @@ const PopupMenuManager = new Lang.Class({

    removeMenu: function(menu) {
        if (menu == this.activeMenu)
-            this._closeMenu(menu);
+            this._closeMenu(false, menu);

        let position = this._findMenu(menu);
        if (position == -1) // not a menu we manage
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@ -7,6 +7,7 @@ const Lang = imports.lang;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;

+const FileUtils = imports.misc.fileUtils;
 const Search = imports.ui.search;

 const KEY_FILE_GROUP = 'Shell Search Provider';
@ -62,7 +63,7 @@ const SearchProvider2Iface = '<node> \
 var SearchProviderProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProviderIface);
 var SearchProvider2ProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProvider2Iface);

-function loadRemoteSearchProviders(addProviderCallback) {
+function loadRemoteSearchProviders(callback) {
    let objectPaths = {};
    let loadedProviders = [];

@ -116,30 +117,25 @@ function loadRemoteSearchProviders(addProviderCallback) {
        }
    }

-    let dataDirs = GLib.get_system_data_dirs();
-    dataDirs.forEach(function(dataDir) {
-        let path = GLib.build_filenamev([dataDir, 'gnome-shell', 'search-providers']);
-        let dir = Gio.File.new_for_path(path);
-        let fileEnum;
-        try {
-            fileEnum = dir.enumerate_children('standard::name,standard::type',
-                                              Gio.FileQueryInfoFlags.NONE, null);
-        } catch (e) {
-            fileEnum = null;
-        }
-        if (fileEnum != null) {
-            let info;
-            while ((info = fileEnum.next_file(null)))
-                loadRemoteSearchProvider(fileEnum.get_child(info));
-        }
-    });
-
    let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
+    if (searchSettings.get_boolean('disable-external')) {
+        callback([]);
+        return;
+    }
+
+    FileUtils.collectFromDatadirs('search-providers', false, loadRemoteSearchProvider);
+
    let sortOrder = searchSettings.get_strv('sort-order');

    // Special case gnome-control-center to be always active and always first
    sortOrder.unshift('gnome-control-center.desktop');

+    loadedProviders = loadedProviders.filter(function(provider) {
+        let appId = provider.appInfo.get_id();
+        let disabled = searchSettings.get_strv('disabled');
+        return disabled.indexOf(appId) == -1;
+    });
+
    loadedProviders.sort(function(providerA, providerB) {
        let idxA, idxB;
        let appIdA, appIdB;
@ -170,7 +166,7 @@ function loadRemoteSearchProviders(addProviderCallback) {
        return (idxA - idxB);
    });

-    loadedProviders.forEach(addProviderCallback);
+    callback(loadedProviders);
 }

 const RemoteSearchProvider = new Lang.Class({
@ -192,8 +188,6 @@ const RemoteSearchProvider = new Lang.Class({
        this.appInfo = appInfo;
        this.id = appInfo.get_id();
        this.isRemoteProvider = true;
-
-        this._cancellable = new Gio.Cancellable();
    },

    createIcon: function(size, meta) {
@ -223,29 +217,27 @@ const RemoteSearchProvider = new Lang.Class({
        return regularResults.slice(0, maxNumber).concat(specialResults.slice(0, maxNumber));
    },

-    _getResultsFinished: function(results, error) {
+    _getResultsFinished: function(results, error, callback) {
        if (error) {
            if (!error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                log('Received error from DBus search provider %s: %s'.format(this.id, String(error)));
-        } else {
-            this.searchSystem.setResults(this, results[0]);
+            callback([]);
+            return;
        }
+
+        callback(results[0]);
    },

-    getInitialResultSet: function(terms) {
-        this._cancellable.cancel();
-        this._cancellable.reset();
+    getInitialResultSet: function(terms, callback, cancellable) {
        this.proxy.GetInitialResultSetRemote(terms,
-                                             Lang.bind(this, this._getResultsFinished),
-                                             this._cancellable);
+                                             Lang.bind(this, this._getResultsFinished, callback),
+                                             cancellable);
    },

-    getSubsearchResultSet: function(previousResults, newTerms) {
-        this._cancellable.cancel();
-        this._cancellable.reset();
+    getSubsearchResultSet: function(previousResults, newTerms, callback, cancellable) {
        this.proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
-                                               Lang.bind(this, this._getResultsFinished),
-                                               this._cancellable);
+                                               Lang.bind(this, this._getResultsFinished, callback),
+                                               cancellable);
    },

    _getResultMetasFinished: function(results, error, callback) {
@ -273,12 +265,10 @@ const RemoteSearchProvider = new Lang.Class({
        callback(resultMetas);
    },

-    getResultMetas: function(ids, callback) {
-        this._cancellable.cancel();
-        this._cancellable.reset();
+    getResultMetas: function(ids, callback, cancellable) {
        this.proxy.GetResultMetasRemote(ids,
                                        Lang.bind(this, this._getResultMetasFinished, callback),
-                                        this._cancellable);
+                                        cancellable);
    },

    activateResult: function(id) {
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -198,8 +198,8 @@ const NotificationsBox = new Lang.Class({

            let body = '';
            if (n.bannerBodyText) {
-                body = n.bannerBodyMarkup ? n.bannerBodyText :
-                GLib.markup_escape_text(n.bannerBodyMarkup, -1);
+                body = n.bannerBodyMarkup ? n.bannerBodyText
+                                          : GLib.markup_escape_text(n.bannerBodyText, -1);
            }

            let label = new St.Label({ style_class: 'screen-shield-notification-count-text' });
--- a/js/ui/screencast.js
+++ b/js/ui/screencast.js
@ -105,8 +105,10 @@ const ScreencastService = new Lang.Class({

    ScreencastAsync: function(params, invocation) {
        let returnValue = [false, ''];
-        if (!Main.sessionMode.allowScreencast)
+        if (!Main.sessionMode.allowScreencast) {
            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }

        let sender = invocation.get_sender();
        let recorder = this._ensureRecorderForSender(sender);
@ -124,8 +126,10 @@ const ScreencastService = new Lang.Class({

    ScreencastAreaAsync: function(params, invocation) {
        let returnValue = [false, ''];
-        if (!Main.sessionMode.allowScreencast)
+        if (!Main.sessionMode.allowScreencast) {
            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }

        let sender = invocation.get_sender();
        let recorder = this._ensureRecorderForSender(sender);
@ -133,6 +137,16 @@ const ScreencastService = new Lang.Class({
        if (!recorder.is_recording()) {
            let [x, y, width, height, fileTemplate, options] = params;

+            if (x < 0 || y < 0 ||
+                width <= 0 || height <= 0 ||
+                x + width > global.screen_width ||
+                y + height > global.screen_height) {
+                invocation.return_error_literal(Gio.IOErrorEnum,
+                                                Gio.IOErrorEnum.CANCELLED,
+                                                "Invalid params");
+                return;
+            }
+
            recorder.set_file_template(fileTemplate);
            recorder.set_area(x, y, width, height);
            this._applyOptionalParameters(recorder, options);
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@ -79,7 +79,9 @@ const ScreenshotService = new Lang.Class({

    ScreenshotAreaAsync : function (params, invocation) {
        let [x, y, width, height, flash, filename, callback] = params;
-        if (height <= 0 || width <= 0) {
+        if (x < 0 || y < 0 ||
+            width <= 0 || height <= 0 ||
+            x + width > global.screen_width || y + height > global.screen_height) {
            invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
                        "Invalid params");
            return;
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -2,18 +2,20 @@

 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
+const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 const St = imports.gi.St;
 const Atk = imports.gi.Atk;

+const AppDisplay = imports.ui.appDisplay;
 const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
+const RemoteSearch = imports.ui.remoteSearch;
 const Separator = imports.ui.separator;
-const Search = imports.ui.search;
 const Util = imports.misc.util;

 const SEARCH_PROVIDERS_SCHEMA = 'org.gnome.desktop.search-providers';
@ -26,88 +28,95 @@ const SearchSystem = new Lang.Class({

    _init: function() {
        this._providers = [];
-        this._remoteProviders = [];
-        this.reset();
+
+        this._registerProvider(new AppDisplay.AppSearchProvider());
+
+        this._searchSettings = new Gio.Settings({ schema: SEARCH_PROVIDERS_SCHEMA });
+        this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
+        this._searchSettings.connect('changed::disable-external', Lang.bind(this, this._reloadRemoteProviders));
+        this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders));
+
+        this._reloadRemoteProviders();
+
+        this._cancellable = new Gio.Cancellable();
    },

-    registerProvider: function (provider) {
-        provider.searchSystem = this;
+    addProvider: function(provider) {
        this._providers.push(provider);
-
-        if (provider.isRemoteProvider)
-            this._remoteProviders.push(provider);
+        this.emit('providers-changed');
    },

-    unregisterProvider: function (provider) {
-        let index = this._providers.indexOf(provider);
-        if (index == -1)
-            return;
-        provider.searchSystem = null;
-        this._providers.splice(index, 1);
+    _reloadRemoteProviders: function() {
+        let remoteProviders = this._providers.filter(function(provider) {
+            return provider.isRemoteProvider;
+        });
+        remoteProviders.forEach(Lang.bind(this, function(provider) {
+            this._unregisterProvider(provider);
+        }));

-        let remoteIndex = this._remoteProviders.indexOf(provider);
-        if (remoteIndex != -1)
-            this._remoteProviders.splice(remoteIndex, 1);
+        RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, function(providers) {
+            providers.forEach(Lang.bind(this, this._registerProvider));
+        }));
+
+        this.emit('providers-changed');
+    },
+
+    _registerProvider: function (provider) {
+        this._providers.push(provider);
+    },
+
+    _unregisterProvider: function (provider) {
+        let index = this._providers.indexOf(provider);
+        this._providers.splice(index, 1);
    },

    getProviders: function() {
        return this._providers;
    },

-    getRemoteProviders: function() {
-        return this._remoteProviders;
-    },
-
    getTerms: function() {
-        return this._previousTerms;
+        return this._terms;
    },

    reset: function() {
-        this._previousTerms = [];
-        this._previousResults = [];
+        this._terms = [];
+        this._results = {};
    },

-    setResults: function(provider, results) {
-        let i = this._providers.indexOf(provider);
-        if (i == -1)
-            return;
-
-        this._previousResults[i] = [provider, results];
-        this.emit('search-updated', this._previousResults[i]);
+    _gotResults: function(results, provider) {
+        this._results[provider.id] = results;
+        this.emit('search-updated', provider, results);
    },

-    updateSearchResults: function(terms) {
+    setTerms: function(terms) {
+        this._cancellable.cancel();
+        this._cancellable.reset();
+
+        let previousResults = this._results;
+        let previousTerms = this._terms;
+        this.reset();
+
        if (!terms)
            return;

        let searchString = terms.join(' ');
-        let previousSearchString = this._previousTerms.join(' ');
+        let previousSearchString = previousTerms.join(' ');
        if (searchString == previousSearchString)
            return;

        let isSubSearch = false;
-        if (this._previousTerms.length > 0)
+        if (previousTerms.length > 0)
            isSubSearch = searchString.indexOf(previousSearchString) == 0;

-        let previousResultsArr = this._previousResults;
+        this._terms = terms;

-        let results = [];
-        this._previousTerms = terms;
-        this._previousResults = results;
-
-        if (isSubSearch) {
-            for (let i = 0; i < this._providers.length; i++) {
-                let [provider, previousResults] = previousResultsArr[i];
-                results.push([provider, []]);
-                provider.getSubsearchResultSet(previousResults, terms);
-            }
-        } else {
-            for (let i = 0; i < this._providers.length; i++) {
-                let provider = this._providers[i];
-                results.push([provider, []]);
-                provider.getInitialResultSet(terms);
-            }
-        }
+        this._providers.forEach(Lang.bind(this, function(provider) {
+            let previousProviderResults = previousResults[provider.id];
+            if (isSubSearch && previousProviderResults)
+                provider.getSubsearchResultSet(previousProviderResults, terms, Lang.bind(this, this._gotResults, provider), this._cancellable);
+            else
+                provider.getInitialResultSet(terms, Lang.bind(this, this._gotResults, provider), this._cancellable);
+        }));
    }
 });
 Signals.addSignalMethods(SearchSystem.prototype);
@ -135,10 +144,9 @@ const MaxWidthBin = new Lang.Class({
 const SearchResult = new Lang.Class({
    Name: 'SearchResult',

-    _init: function(provider, metaInfo, terms) {
+    _init: function(provider, metaInfo) {
        this.provider = provider;
        this.metaInfo = metaInfo;
-        this.terms = terms;

        this.actor = new St.Button({ reactive: true,
                                     can_focus: true,
@ -151,8 +159,7 @@ const SearchResult = new Lang.Class({
    },

    activate: function() {
-        this.provider.activateResult(this.metaInfo.id, this.terms);
-        Main.overview.toggle();
+        this.emit('activate', this.metaInfo.id);
    },

    setSelected: function(selected) {
@ -162,6 +169,7 @@ const SearchResult = new Lang.Class({
            this.actor.remove_style_pseudo_class('selected');
    }
 });
+Signals.addSignalMethods(SearchResult.prototype);

 const ListSearchResult = new Lang.Class({
    Name: 'ListSearchResult',
@ -169,8 +177,8 @@ const ListSearchResult = new Lang.Class({

    ICON_SIZE: 64,

-    _init: function(provider, metaInfo, terms) {
-        this.parent(provider, metaInfo, terms);
+    _init: function(provider, metaInfo) {
+        this.parent(provider, metaInfo);

        this.actor.style_class = 'list-search-result';
        this.actor.x_fill = true;
@ -214,12 +222,12 @@ const GridSearchResult = new Lang.Class({
    Name: 'GridSearchResult',
    Extends: SearchResult,

-    _init: function(provider, metaInfo, terms) {
-        this.parent(provider, metaInfo, terms);
+    _init: function(provider, metaInfo) {
+        this.parent(provider, metaInfo);

        this.actor.style_class = 'grid-search-result';

-        let content = provider.createResultObject(metaInfo, terms);
+        let content = provider.createResultObject(metaInfo);
        let dragSource = null;

        if (content == null) {
@ -292,6 +300,10 @@ const SearchResultsBase = new Lang.Class({

        let separator = new Separator.HorizontalSeparator({ style_class: 'search-section-separator' });
        this.actor.add(separator.actor);
+
+        this._resultDisplays = {};
+
+        this._cancellable = new Gio.Cancellable();
    },

    destroy: function() {
@ -303,6 +315,7 @@ const SearchResultsBase = new Lang.Class({
    },

    clear: function() {
+        this._resultDisplays = {};
        this._clearResultDisplay();
        this.actor.hide();
    },
@ -311,9 +324,38 @@ const SearchResultsBase = new Lang.Class({
        this.emit('key-focus-in', actor);
    },

+    _activateResult: function(result, id) {
+        this.provider.activateResult(id, this._terms);
+        Main.overview.toggle();
+    },
+
    _setMoreIconVisible: function(visible) {
    },

+    _ensureResultActors: function(results, callback) {
+        let metasNeeded = results.filter(Lang.bind(this, function(resultId) {
+            return this._resultDisplays[resultId] === undefined;
+        }));
+
+        if (metasNeeded.length === 0) {
+            callback();
+        } else {
+            this._cancellable.cancel();
+            this._cancellable.reset();
+
+            this.provider.getResultMetas(metasNeeded, Lang.bind(this, function(metas) {
+                metasNeeded.forEach(Lang.bind(this, function(resultId, i) {
+                    let meta = metas[i];
+                    let display = this._createResultDisplay(meta);
+                    display.connect('activate', Lang.bind(this, this._activateResult));
+                    display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
+                    this._resultDisplays[resultId] = display;
+                }));
+                callback();
+            }), this._cancellable);
+        }
+    },
+
    updateSearch: function(providerResults, terms, callback) {
        this._terms = terms;

@ -326,15 +368,17 @@ const SearchResultsBase = new Lang.Class({
            let results = this.provider.filterResults(providerResults, maxResults);
            let hasMoreResults = results.length < providerResults.length;

-            this.provider.getResultMetas(results, Lang.bind(this, function(metas) {
-                this.clear();
+            this._ensureResultActors(results, Lang.bind(this, function() {
+                this._clearResultDisplay();

                // To avoid CSS transitions causing flickering when
                // the first search result stays the same, we hide the
                // content while filling in the results.
                this.actor.hide();
                this._clearResultDisplay();
-                this._renderResults(metas);
+                results.forEach(Lang.bind(this, function(resultId) {
+                    this._addItem(this._resultDisplays[resultId]);
+                }));
                this._setMoreIconVisible(hasMoreResults && this.provider.canLaunchSearch);
                this.actor.show();
                callback();
@ -379,16 +423,16 @@ const ListSearchResults = new Lang.Class({
        return MAX_LIST_SEARCH_RESULTS_ROWS;
    },

-    _renderResults: function(metas) {
-        for (let i = 0; i < metas.length; i++) {
-            let display = new ListSearchResult(this.provider, metas[i], this._terms);
-            display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
-            this._content.add_actor(display.actor);
-        }
+    _clearResultDisplay: function () {
+        this._content.remove_all_children();
    },

-    _clearResultDisplay: function () {
-        this._content.destroy_all_children();
+    _createResultDisplay: function(meta) {
+        return new ListSearchResult(this.provider, meta);
+    },
+
+    _addItem: function(display) {
+        this._content.add_actor(display.actor);
    },

    getFirstResult: function() {
@ -421,7 +465,8 @@ const GridSearchResults = new Lang.Class({

    _renderResults: function(metas) {
        for (let i = 0; i < metas.length; i++) {
-            let display = new GridSearchResult(this.provider, metas[i], this._terms);
+            let display = new GridSearchResult(this.provider, metas[i]);
+            display.connect('activate', Lang.bind(this, this._activateResult));
            display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
            this._grid.addItem(display);
        }
@ -431,6 +476,14 @@ const GridSearchResults = new Lang.Class({
        this._grid.removeAll();
    },

+    _createResultDisplay: function(meta) {
+        return new GridSearchResult(this.provider, meta);
+    },
+
+    _addItem: function(display) {
+        this._grid.addItem(display);
+    },
+
    getFirstResult: function() {
        if (this._grid.visibleItemsCount() > 0)
            return this._grid.getItemAtIndex(0)._delegate;
@ -443,10 +496,7 @@ Signals.addSignalMethods(GridSearchResults.prototype);
 const SearchResults = new Lang.Class({
    Name: 'SearchResults',

-    _init: function(searchSystem) {
-        this._searchSystem = searchSystem;
-        this._searchSystem.connect('search-updated', Lang.bind(this, this._updateResults));
-
+    _init: function() {
        this.actor = new St.BoxLayout({ name: 'searchResults',
                                        vertical: true });

@ -481,14 +531,14 @@ const SearchResults = new Lang.Class({
                                       y_align: St.Align.MIDDLE });
        this._content.add(this._statusBin, { expand: true });
        this._statusBin.add_actor(this._statusText);
-        this._providers = this._searchSystem.getProviders();
-        this._providerDisplays = {};
-        for (let i = 0; i < this._providers.length; i++) {
-            this.createProviderDisplay(this._providers[i]);
-        }

        this._highlightDefault = false;
        this._defaultResult = null;
+
+        this._searchSystem = new SearchSystem();
+        this._searchSystem.connect('search-updated', Lang.bind(this, this._updateResults));
+        this._searchSystem.connect('providers-changed', Lang.bind(this, this._updateProviderDisplays));
+        this._updateProviderDisplays();
    },

    _onPan: function(action) {
@ -502,31 +552,29 @@ const SearchResults = new Lang.Class({
        Util.ensureActorVisibleInScrollView(this._scrollView, actor);
    },

-    createProviderDisplay: function(provider) {
-        let providerDisplay = null;
+    _ensureProviderDisplay: function(provider) {
+        if (provider.display)
+            return;

-        if (provider.appInfo) {
+        let providerDisplay;
+        if (provider.appInfo)
            providerDisplay = new ListSearchResults(provider);
-        } else {
+        else
            providerDisplay = new GridSearchResults(provider);
-        }

        providerDisplay.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
-        this._providerDisplays[provider.id] = providerDisplay;
        this._content.add(providerDisplay.actor);
+        provider.display = providerDisplay;
    },

-    destroyProviderDisplay: function(provider) {
-        this._providerDisplays[provider.id].destroy();
-        delete this._providerDisplays[provider.id];
+    _updateProviderDisplays: function() {
+        this._searchSystem.getProviders().forEach(Lang.bind(this, this._ensureProviderDisplay));
    },

    _clearDisplay: function() {
-        for (let i = 0; i < this._providers.length; i++) {
-            let provider = this._providers[i];
-            let providerDisplay = this._providerDisplays[provider.id];
-            providerDisplay.clear();
-        }
+        this._searchSystem.getProviders().forEach(function(provider) {
+            provider.display.clear();
+        });
    },

    reset: function() {
@ -542,12 +590,17 @@ const SearchResults = new Lang.Class({
        this._statusBin.show();
    },

+    setTerms: function(terms) {
+        this._searchSystem.setTerms(terms);
+    },
+
    _maybeSetInitialSelection: function() {
        let newDefaultResult = null;

-        for (let i = 0; i < this._providers.length; i++) {
-            let provider = this._providers[i];
-            let display = this._providerDisplays[provider.id];
+        let providers = this._searchSystem.getProviders();
+        for (let i = 0; i < providers.length; i++) {
+            let provider = providers[i];
+            let display = provider.display;

            if (!display.actor.visible)
                continue;
@ -570,16 +623,10 @@ const SearchResults = new Lang.Class({
    },

    _updateStatusText: function () {
-        let haveResults = false;
-
-        for (let i = 0; i < this._providers.length; i++) {
-            let provider = this._providers[i];
-            let display = this._providerDisplays[provider.id];
-            if (display.getFirstResult()) {
-                haveResults = true;
-                break;
-            }
-        }
+        let haveResults = this._searchSystem.getProviders().some(function(provider) {
+            let display = provider.display;
+            return (display.getFirstResult() != null);
+        });

        if (!haveResults) {
            this._statusText.set_text(_("No results."));
@ -589,12 +636,11 @@ const SearchResults = new Lang.Class({
        }
    },

-    _updateResults: function(searchSystem, results) {
+    _updateResults: function(searchSystem, provider, results) {
        let terms = searchSystem.getTerms();
-        let [provider, providerResults] = results;
-        let display = this._providerDisplays[provider.id];
+        let display = provider.display;

-        display.updateSearch(providerResults, terms, Lang.bind(this, function() {
+        display.updateSearch(results, terms, Lang.bind(this, function() {
            this._maybeSetInitialSelection();
            this._updateStatusText();
        }));
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@ -102,19 +102,12 @@ const _modes = {
    }
 };

-function _getModes(modesLoadedCallback) {
-    FileUtils.collectFromDatadirsAsync('modes',
-                                       { processFile: _loadMode,
-                                         loadedCallback: modesLoadedCallback,
-                                         data: _modes });
-}
-
-function _loadMode(file, info, loadedData) {
+function _loadMode(file, info) {
    let name = info.get_name();
    let suffix = name.indexOf('.json');
    let modeName = suffix == -1 ? name : name.slice(name, suffix);

-    if (loadedData.hasOwnProperty(modeName))
+    if (_modes.hasOwnProperty(modeName))
        return;

    let fileContent, success, tag, newMode;
@ -125,18 +118,23 @@ function _loadMode(file, info, loadedData) {
        return;
    }

-    loadedData[modeName] = {};
+    _modes[modeName] = {};
    let propBlacklist = ['unlockDialog'];
    for (let prop in loadedData[DEFAULT_MODE]) {
        if (newMode[prop] !== undefined &&
            propBlacklist.indexOf(prop) == -1)
-            loadedData[modeName][prop]= newMode[prop];
+            loadedData[modeName][prop] = newMode[prop];
    }
-    loadedData[modeName]['isPrimary'] = true;
+    _modes[modeName]['isPrimary'] = true;
+}
+
+function _getModes() {
+    FileUtils.collectFromDatadirs('modes', false, _loadMode);
 }

 function listModes() {
-    _getModes(function(modes) {
+    let modes = _getModes();
+    modes.forEach(function() {
        let names = Object.getOwnPropertyNames(modes);
        for (let i = 0; i < names.length; i++)
            if (_modes[names[i]].isPrimary)
@ -149,17 +147,12 @@ function listModes() {
 const SessionMode = new Lang.Class({
    Name: 'SessionMode',

-    init: function() {
-        _getModes(Lang.bind(this, function(modes) {
-            this._modes = modes;
-            let primary = modes[global.session_mode] &&
-                          modes[global.session_mode].isPrimary;
-            let mode = primary ? global.session_mode : 'user';
-            this._modeStack = [mode];
-            this._sync();
-
-            this.emit('sessions-loaded');
-        }));
+    _init: function() {
+        let isPrimary = (_modes[global.session_mode] &&
+                         _modes[global.session_mode].isPrimary);
+        let mode = isPrimary ? global.session_mode : 'user';
+        this._modeStack = [mode];
+        this._sync();
    },

    pushMode: function(mode) {
@ -186,13 +179,13 @@ const SessionMode = new Lang.Class({
    },

    _sync: function() {
-        let params = this._modes[this.currentMode];
+        let params = _modes[this.currentMode];
        let defaults;
        if (params.parentMode)
-            defaults = Params.parse(this._modes[params.parentMode],
-                                    this._modes[DEFAULT_MODE]);
+            defaults = Params.parse(_modes[params.parentMode],
+                                    _modes[DEFAULT_MODE]);
        else
-            defaults = this._modes[DEFAULT_MODE];
+            defaults = _modes[DEFAULT_MODE];
        params = Params.parse(params, defaults);

        // A simplified version of Lang.copyProperties, handles
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@ -119,7 +119,7 @@ const GnomeShell = new Lang.Class({
                returnValue = '';
            success = true;
        } catch (e) {
-            returnValue = JSON.stringify(e);
+            returnValue = '' + e;
            success = false;
        }
        return [success, returnValue];
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@ -228,7 +228,7 @@ const PinNotification = new Lang.Class({

    _ok: function() {
        if (this._numeric) {
-            let num = parseInt(this._entry.text);
+            let num = parseInt(this._entry.text, 10);
            if (isNaN(num)) {
                // user reply was empty, or was invalid
                // cancel the operation
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@ -18,10 +18,12 @@ const PopupMenu = imports.ui.popupMenu;

 const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
+const LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
 const PRIVACY_SCHEMA = 'org.gnome.desktop.privacy'
 const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
 const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
 const DISABLE_LOG_OUT_KEY = 'disable-log-out';
+const DISABLE_RESTART_KEY = 'disable-restart-buttons';
 const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';

 const AltSwitcher = new Lang.Class({
@ -91,6 +93,7 @@ const Indicator = new Lang.Class({
        this.parent();

        this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
+        this._loginScreenSettings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
        this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });
        this._orientationSettings = new Gio.Settings({ schema: 'org.gnome.settings-daemon.peripherals.touchscreen' });
@ -261,7 +264,10 @@ const Indicator = new Lang.Class({
    },

    _updatePowerOff: function() {
-        this._powerOffAction.visible = this._haveShutdown && !Main.sessionMode.isLocked;
+        let disabled = Main.sessionMode.isLocked ||
+                       (Main.sessionMode.isGreeter &&
+                        this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
+        this._powerOffAction.visible = this._haveShutdown && !disabled;
        this._updateActionsVisibility();
    },

@ -273,7 +279,10 @@ const Indicator = new Lang.Class({
    },

    _updateSuspend: function() {
-        this._suspendAction.visible = this._haveSuspend && !Main.sessionMode.isLocked;
+        let disabled = Main.sessionMode.isLocked ||
+                       (Main.sessionMode.isGreeter &&
+                        this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
+        this._suspendAction.visible = this._haveShutdown && !disabled;
        this._updateActionsVisibility();
    },

--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@ -11,29 +11,8 @@ const Signals = imports.signals;
 const Tweener = imports.tweener.tweener;

 // This is a wrapper around imports.tweener.tweener that adds a bit of
-// Clutter integration and some additional callbacks:
-//
-//   1. If the tweening target is a Clutter.Actor, then the tweenings
-//      will automatically be removed if the actor is destroyed
-//
-//   2. If target._delegate.onAnimationStart() exists, it will be
-//      called when the target starts being animated.
-//
-//   3. If target._delegate.onAnimationComplete() exists, it will be
-//      called once the target is no longer being animated.
-//
-// The onAnimationStart() and onAnimationComplete() callbacks differ
-// from the tweener onStart and onComplete parameters, in that (1)
-// they track whether or not the target has *any* tweens attached to
-// it, as opposed to be called for *each* tween, and (2)
-// onAnimationComplete() is always called when the object stops being
-// animated, regardless of whether it stopped normally or abnormally.
-//
-// onAnimationComplete() is called at idle time, which means that if a
-// tween completes and then another is added before returning to the
-// main loop, the complete callback will not be called (until the new
-// tween finishes).
-
+// Clutter integration. If the tweening target is a Clutter.Actor, then
+// the tweenings will automatically be removed if the actor is destroyed.

 // ActionScript Tweener methods that imports.tweener.tweener doesn't
 // currently implement: getTweens, getVersion, registerTransition,
@ -77,7 +56,6 @@ function _wrapTweening(target, tweeningParameters) {
    if (!Gtk.Settings.get_default().gtk_enable_animations)
        tweeningParameters['time'] = 0.000001;

-    _addHandler(target, tweeningParameters, 'onStart', _tweenStarted);
    _addHandler(target, tweeningParameters, 'onComplete', _tweenCompleted);
 }

@ -85,7 +63,7 @@ function _getTweenState(target) {
    // If we were paranoid, we could keep a plist mapping targets to
    // states... but we're not that paranoid.
    if (!target.__ShellTweenerState)
-        _resetTweenState(target);
+        target.__ShellTweenerState = {};
    return target.__ShellTweenerState;
 }

@ -95,8 +73,6 @@ function _resetTweenState(target) {
    if (state) {
        if (state.destroyedId)
            state.actor.disconnect(state.destroyedId);
-        if (state.idleCompletedId)
-            Mainloop.source_remove(state.idleCompletedId);
    }

    target.__ShellTweenerState = {};
@ -122,32 +98,9 @@ function _actorDestroyed(target) {
    Tweener.removeTweens(target);
 }

-function _tweenStarted(target) {
-    let state = _getTweenState(target);
-    let delegate = target._delegate;
-
-    if (!state.running && delegate && delegate.onAnimationStart)
-        delegate.onAnimationStart();
-    state.running = true;
-}
-
 function _tweenCompleted(target) {
-    let state = _getTweenState(target);
-
-    if (!state.idleCompletedId)
-        state.idleCompletedId = Mainloop.idle_add(Lang.bind(null, _idleCompleted, target));
-}
-
-function _idleCompleted(target) {
-    let state = _getTweenState(target);
-    let delegate = target._delegate;
-
-    if (!isTweening(target)) {
+    if (!isTweening(target))
        _resetTweenState(target);
-        if (delegate && delegate.onAnimationComplete)
-            delegate.onAnimationComplete();
-    }
-    return false;
 }

 function getTweenCount(scope) {
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@ -1,7 +1,8 @@
-
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 //
 // A widget showing the user avatar and name
+
+const Clutter = imports.gi.Clutter;
 const AccountsService = imports.gi.AccountsService;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
@ -56,6 +57,83 @@ const Avatar = new Lang.Class({
    }
 });

+const UserWidgetLabel = new Lang.Class({
+    Name: 'UserWidgetLabel',
+    Extends: St.Widget,
+
+    _init: function(user) {
+        this.parent({ layout_manager: new Clutter.BinLayout() });
+
+        this._user = user;
+
+        this._realNameLabel = new St.Label({ style_class: 'user-widget-label',
+                                             y_align: Clutter.ActorAlign.CENTER });
+        this.add_child(this._realNameLabel);
+
+        this._userNameLabel = new St.Label({ style_class: 'user-widget-label',
+                                             y_align: Clutter.ActorAlign.CENTER });
+        this.add_child(this._userNameLabel);
+
+        this._currentLabel = null;
+
+        this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUser));
+        this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUser));
+        this._updateUser();
+    },
+
+    vfunc_destroy: function() {
+        if (this._userLoadedId != 0) {
+            this._user.disconnect(this._userLoadedId);
+            this._userLoadedId = 0;
+        }
+
+        if (this._userChangedId != 0) {
+            this._user.disconnect(this._userChangedId);
+            this._userChangedId = 0;
+        }
+    },
+
+    vfunc_allocate: function(box, flags) {
+        this.set_allocation(box, flags);
+
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
+
+        let [minRealNameWidth, minRealNameHeight,
+             natRealNameWidth, natRealNameHeight] = this._realNameLabel.get_preferred_size();
+
+        let [minUserNameWidth, minUserNameHeight,
+             natUserNameWidth, natUserNameHeight] = this._userNameLabel.get_preferred_size();
+
+        if (natRealNameWidth <= availWidth)
+            this._currentLabel = this._realNameLabel;
+        else
+            this._currentLabel = this._userNameLabel;
+
+        let childBox = new Clutter.ActorBox();
+        childBox.x1 = 0;
+        childBox.y1 = 0;
+        childBox.x2 = availWidth;
+        childBox.y2 = availHeight;
+
+        this._currentLabel.allocate(childBox, flags);
+    },
+
+    vfunc_paint: function() {
+        this._currentLabel.paint();
+    },
+
+    _updateUser: function() {
+        if (this._user.is_loaded) {
+            this._realNameLabel.text = this._user.get_real_name();
+            this._userNameLabel.text = this._user.get_user_name();
+        } else {
+            this._realNameLabel.text = '';
+            this._userNameLabel.text = '';
+        }
+    },
+});
+
 const UserWidget = new Lang.Class({
    Name: 'UserWidget',

@ -67,22 +145,14 @@ const UserWidget = new Lang.Class({
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        this._avatar = new Avatar(user);
-        this.actor.add(this._avatar.actor,
-                       { x_fill: true, y_fill: true });
+        this.actor.add_child(this._avatar.actor);

-        this._label = new St.Label({ style_class: 'user-widget-label' });
-        this.actor.add(this._label,
-                       { expand: true,
-                         x_fill: true,
-                         y_fill: false,
-                         y_align: St.Align.MIDDLE });
+        this._label = new UserWidgetLabel(user);
+        this.actor.add_child(this._label);

-        this._userLoadedId = this._user.connect('notify::is-loaded',
-                                                Lang.bind(this, this._updateUser));
-        this._userChangedId = this._user.connect('changed',
-                                                 Lang.bind(this, this._updateUser));
-        if (this._user.is_loaded)
-            this._updateUser();
+        this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUser));
+        this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUser));
+        this._updateUser();
    },

    _onDestroy: function() {
@ -98,11 +168,6 @@ const UserWidget = new Lang.Class({
    },

    _updateUser: function() {
-        if (this._user.is_loaded)
-            this._label.text = this._user.get_real_name();
-        else
-            this._label.text = '';
-
        this._avatar.update();
    }
 });
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -14,7 +14,6 @@ const AppDisplay = imports.ui.appDisplay;
 const Main = imports.ui.main;
 const OverviewControls = imports.ui.overviewControls;
 const Params = imports.misc.params;
-const RemoteSearch = imports.ui.remoteSearch;
 const Search = imports.ui.search;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
@ -64,8 +63,6 @@ const ViewSelector = new Lang.Class({
        this._searchActive = false;
        this._searchTimeoutId = 0;

-        this._searchSystem = new Search.SearchSystem();
-
        this._entry = searchEntry;
        ShellEntry.addContextMenu(this._entry);

@ -101,22 +98,11 @@ const ViewSelector = new Lang.Class({
        this._appsPage = this._addPage(this.appDisplay.actor,
                                       _("Applications"), 'view-grid-symbolic');

-        this._searchResults = new Search.SearchResults(this._searchSystem);
+        this._searchResults = new Search.SearchResults();
        this._searchPage = this._addPage(this._searchResults.actor,
                                         _("Search"), 'edit-find-symbolic',
                                         { a11yFocus: this._entry });

-        this._searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
-        this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
-        this._searchSettings.connect('changed::disable-external', Lang.bind(this, this._reloadRemoteProviders));
-        this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders));
-
-        // Default search providers
-        this.addSearchProvider(new AppDisplay.AppSearchProvider());
-
-        // Load remote search providers provided by applications
-        RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
-
        // Since the entry isn't inside the results container we install this
        // dummy widget as the last results container child so that we can
        // include the entry in the keynav tab path
@ -482,45 +468,10 @@ const ViewSelector = new Lang.Class({

        let terms = getTermsForSearchString(this._entry.get_text());

-        this._searchSystem.updateSearchResults(terms);
+        this._searchResults.setTerms(terms);
        this._showPage(this._searchPage);
    },

-    _shouldUseSearchProvider: function(provider) {
-        // the disable-external GSetting only affects remote providers
-        if (!provider.isRemoteProvider)
-            return true;
-
-        if (this._searchSettings.get_boolean('disable-external'))
-            return false;
-
-        let appId = provider.appInfo.get_id();
-        let disable = this._searchSettings.get_strv('disabled');
-        return disable.indexOf(appId) == -1;
-    },
-
-    _reloadRemoteProviders: function() {
-        // removeSearchProvider() modifies the provider list we iterate on,
-        // so make a copy first
-        let remoteProviders = this._searchSystem.getRemoteProviders().slice(0);
-
-        remoteProviders.forEach(Lang.bind(this, this.removeSearchProvider));
-        RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
-    },
-
-    addSearchProvider: function(provider) {
-        if (!this._shouldUseSearchProvider(provider))
-            return;
-
-        this._searchSystem.registerProvider(provider);
-        this._searchResults.createProviderDisplay(provider);
-    },
-
-    removeSearchProvider: function(provider) {
-        this._searchSystem.unregisterProvider(provider);
-        this._searchResults.destroyProviderDisplay(provider);
-    },
-
    getActivePage: function() {
        if (this._activePage == this._workspacesPage)
            return ViewPage.WINDOWS;
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -10,19 +10,14 @@ const St = imports.gi.St;
 const Signals = imports.signals;

 const DND = imports.ui.dnd;
-const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
-const Panel = imports.ui.panel;
 const Tweener = imports.ui.tweener;

-const FOCUS_ANIMATION_TIME = 0.15;
-
 const WINDOW_DND_SIZE = 256;

 const WINDOW_CLONE_MAXIMUM_SCALE = 0.7;

-const LIGHTBOX_FADE_TIME = 0.1;
 const CLOSE_BUTTON_FADE_TIME = 0.1;

 const DRAGGING_WINDOW_OPACITY = 100;
@ -892,6 +887,19 @@ function padArea(area, padding) {
    };
 }

+function rectEqual(one, two) {
+    if (one == two)
+        return true;
+
+    if (!one || !two)
+        return false;
+
+    return (one.x == two.x &&
+            one.y == two.y &&
+            one.width == two.width &&
+            one.height == two.height);
+}
+
 /**
 * @metaWorkspace: a #Meta.Workspace, or null
 */
@ -967,11 +975,17 @@ const Workspace = new Lang.Class({
    },

    setFullGeometry: function(geom) {
+        if (rectEqual(this._fullGeometry, geom))
+            return;
+
        this._fullGeometry = geom;
        this._recalculateWindowPositions(WindowPositionFlags.NONE);
    },

    setActualGeometry: function(geom) {
+        if (rectEqual(this._actualGeometry, geom))
+            return;
+
        this._actualGeometry = geom;

        if (this._actualGeometryLater)
@ -1194,6 +1208,7 @@ const Workspace = new Lang.Class({
        }

        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
+        this._repositionWindowsId = 0;
        return false;
    },

@ -1449,17 +1464,17 @@ const Workspace = new Lang.Class({
        clone.connect('selected',
                      Lang.bind(this, this._onCloneSelected));
        clone.connect('drag-begin',
-                      Lang.bind(this, function(clone) {
-                          Main.overview.beginWindowDrag();
+                      Lang.bind(this, function() {
+                          Main.overview.beginWindowDrag(clone);
                          overlay.hide();
                      }));
        clone.connect('drag-cancelled',
-                      Lang.bind(this, function(clone) {
-                          Main.overview.cancelledWindowDrag();
+                      Lang.bind(this, function() {
+                          Main.overview.cancelledWindowDrag(clone);
                      }));
        clone.connect('drag-end',
-                      Lang.bind(this, function(clone) {
-                          Main.overview.endWindowDrag();
+                      Lang.bind(this, function() {
+                          Main.overview.endWindowDrag(clone);
                          overlay.show();
                      }));
        clone.connect('size-changed',
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -438,16 +438,16 @@ const WorkspaceThumbnail = new Lang.Class({
                          this.activate(time);
                      }));
        clone.connect('drag-begin',
-                      Lang.bind(this, function(clone) {
-                          Main.overview.beginWindowDrag();
+                      Lang.bind(this, function() {
+                          Main.overview.beginWindowDrag(clone);
                      }));
        clone.connect('drag-cancelled',
-                      Lang.bind(this, function(clone) {
-                          Main.overview.cancelledWindowDrag();
+                      Lang.bind(this, function() {
+                          Main.overview.cancelledWindowDrag(clone);
                      }));
        clone.connect('drag-end',
-                      Lang.bind(this, function(clone) {
-                          Main.overview.endWindowDrag();
+                      Lang.bind(this, function() {
+                          Main.overview.endWindowDrag(clone);
                      }));
        this._contents.add_actor(clone.actor);

--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -23,75 +23,92 @@ const MAX_WORKSPACES = 16;

 const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';

-function rectEqual(one, two) {
-    if (one == two)
-        return true;
+const WorkspacesViewBase = new Lang.Class({
+    Name: 'WorkspacesViewBase',

-    if (!one || !two)
-        return false;
-
-    return (one.x == two.x &&
-            one.y == two.y &&
-            one.width == two.width &&
-            one.height == two.height);
-}
-
-const WorkspacesView = new Lang.Class({
-    Name: 'WorkspacesView',
-
-    _init: function(workspaces) {
+    _init: function(monitorIndex) {
        this.actor = new St.Widget({ style_class: 'workspaces-view',
                                     reactive: true });
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        // The actor itself isn't a drop target, so we don't want to pick on its area
        this.actor.set_size(0, 0);

-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this.actor.connect('style-changed', Lang.bind(this,
-            function() {
-                let node = this.actor.get_theme_node();
-                this._spacing = node.get_length('spacing');
-                this._updateWorkspaceActors(false);
-            }));
+        this._monitorIndex = monitorIndex;

        this._fullGeometry = null;
        this._actualGeometry = null;

-        this._spacing = 0;
+        this._inDrag = false;
+        this._windowDragBeginId = Main.overview.connect('window-drag-begin', Lang.bind(this, this._dragBegin));
+        this._windowDragEndId = Main.overview.connect('window-drag-end', Lang.bind(this, this._dragEnd));
+    },
+
+    _onDestroy: function() {
+        this._dragEnd();
+
+        if (this._windowDragBeginId > 0) {
+            Main.overview.disconnect(this._windowDragBeginId);
+            this._windowDragBeginId = 0;
+        }
+        if (this._windowDragEndId > 0) {
+            Main.overview.disconnect(this._windowDragEndId);
+            this._windowDragEndId = 0;
+        }
+    },
+
+    _dragBegin: function(overview, clone) {
+        this._inDrag = true;
+        this._setReservedSlot(clone);
+    },
+
+    _dragEnd: function() {
+        this._inDrag = false;
+        this._setReservedSlot(null);
+    },
+
+    destroy: function() {
+        this.actor.destroy();
+    },
+
+    setFullGeometry: function(geom) {
+        this._fullGeometry = geom;
+        this._syncGeometry();
+    },
+
+    setActualGeometry: function(geom) {
+        this._actualGeometry = geom;
+        this._syncGeometry();
+    },
+});
+
+const WorkspacesView = new Lang.Class({
+    Name: 'WorkspacesView',
+    Extends: WorkspacesViewBase,
+
+    _init: function(monitorIndex) {
+        this.parent(monitorIndex);
+
        this._animating = false; // tweening
        this._scrolling = false; // swipe-scrolling
        this._animatingScroll = false; // programatically updating the adjustment
-        this._inDrag = false; // dragging a window

        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
-        this._updateExtraWorkspacesId =
-            this._settings.connect('changed::workspaces-only-on-primary',
-                                   Lang.bind(this, this._updateExtraWorkspaces));

        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        this._workspaces = workspaces;
+        this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
+                                                    lower: 0,
+                                                    page_increment: 1,
+                                                    page_size: 1,
+                                                    step_increment: 0,
+                                                    upper: 0 });
+        this.scrollAdjustment.connect('notify::value',
+                                      Lang.bind(this, this._onScroll));

-        // Add workspace actors
-        for (let w = 0; w < global.screen.n_workspaces; w++)
-            this.actor.add_actor(this._workspaces[w].actor);
-        this._workspaces[activeWorkspaceIndex].actor.raise_top();
+        this._workspaces = [];
+        this._updateWorkspaces();
+        this._updateWorkspacesId = global.screen.connect('notify::n-workspaces', Lang.bind(this, this._updateWorkspaces));

-        this._extraWorkspaces = [];
-        this._updateExtraWorkspaces();
-
-        // Position/scale the desktop windows and their children after the
-        // workspaces have been created. This cannot be done first because
-        // window movement depends on the Workspaces object being accessible
-        // as an Overview member.
-        this._overviewShowingId =
-            Main.overview.connect('showing',
-                                 Lang.bind(this, function() {
-                for (let w = 0; w < this._workspaces.length; w++)
-                    this._workspaces[w].zoomToOverview();
-                for (let w = 0; w < this._extraWorkspaces.length; w++)
-                    this._extraWorkspaces[w].zoomToOverview();
-        }));
        this._overviewShownId =
            Main.overview.connect('shown',
                                 Lang.bind(this, function() {
@ -99,72 +116,21 @@ const WorkspacesView = new Lang.Class({
                                    this._fullGeometry.width, this._fullGeometry.height);
        }));

-        this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
-                                                    lower: 0,
-                                                    page_increment: 1,
-                                                    page_size: 1,
-                                                    step_increment: 0,
-                                                    upper: this._workspaces.length });
-        this.scrollAdjustment.connect('notify::value',
-                                      Lang.bind(this, this._onScroll));
-
        this._switchWorkspaceNotifyId =
            global.window_manager.connect('switch-workspace',
                                          Lang.bind(this, this._activeWorkspaceChanged));
-
-        this._itemDragBeginId = Main.overview.connect('item-drag-begin',
-                                                      Lang.bind(this, this._dragBegin));
-        this._itemDragEndId = Main.overview.connect('item-drag-end',
-                                                     Lang.bind(this, this._dragEnd));
-        this._windowDragBeginId = Main.overview.connect('window-drag-begin',
-                                                        Lang.bind(this, this._dragBegin));
-        this._windowDragEndId = Main.overview.connect('window-drag-end',
-                                                      Lang.bind(this, this._dragEnd));
    },

-    _updateExtraWorkspaces: function() {
-        this._destroyExtraWorkspaces();
-
-        if (!this._settings.get_boolean('workspaces-only-on-primary'))
-            return;
-
-        let monitors = Main.layoutManager.monitors;
-        for (let i = 0; i < monitors.length; i++) {
-            if (i == Main.layoutManager.primaryIndex)
-                continue;
-
-            let ws = new Workspace.Workspace(null, i);
-            ws.setFullGeometry(monitors[i]);
-            ws.setActualGeometry(monitors[i]);
-            Main.layoutManager.overviewGroup.add_actor(ws.actor);
-            this._extraWorkspaces.push(ws);
-        }
-    },
-
-    _destroyExtraWorkspaces: function() {
-        for (let m = 0; m < this._extraWorkspaces.length; m++)
-            this._extraWorkspaces[m].destroy();
-        this._extraWorkspaces = [];
-    },
-
-    setFullGeometry: function(geom) {
-        if (rectEqual(this._fullGeometry, geom))
-            return;
-
-        this._fullGeometry = geom;
-
+    _setReservedSlot: function(clone) {
        for (let i = 0; i < this._workspaces.length; i++)
-            this._workspaces[i].setFullGeometry(geom);
+            this._workspaces[i].setReservedSlot(clone);
    },

-    setActualGeometry: function(geom) {
-        if (rectEqual(this._actualGeometry, geom))
-            return;
-
-        this._actualGeometry = geom;
-
+    _syncGeometry: function() {
        for (let i = 0; i < this._workspaces.length; i++)
-            this._workspaces[i].setActualGeometry(geom);
+            this._workspaces[i].setFullGeometry(this._fullGeometry);
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].setActualGeometry(this._actualGeometry);
    },

    getActiveWorkspace: function() {
@ -172,29 +138,22 @@ const WorkspacesView = new Lang.Class({
        return this._workspaces[active];
    },

-    hide: function() {
-        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        let activeWorkspace = this._workspaces[activeWorkspaceIndex];
-
-        activeWorkspace.actor.raise_top();
+    zoomToOverview: function() {
+        for (let w = 0; w < this._workspaces.length; w++)
+            this._workspaces[w].zoomToOverview();
+        this._updateWorkspaceActors(false);
+    },

+    zoomFromOverview: function() {
        this.actor.remove_clip();

        for (let w = 0; w < this._workspaces.length; w++)
            this._workspaces[w].zoomFromOverview();
-        for (let w = 0; w < this._extraWorkspaces.length; w++)
-            this._extraWorkspaces[w].zoomFromOverview();
-    },
-
-    destroy: function() {
-        this.actor.destroy();
    },

    syncStacking: function(stackIndices) {
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].syncStacking(stackIndices);
-        for (let i = 0; i < this._extraWorkspaces.length; i++)
-            this._extraWorkspaces[i].syncStacking(stackIndices);
    },

    _scrollToActive: function() {
@ -216,7 +175,7 @@ const WorkspacesView = new Lang.Class({

            Tweener.removeTweens(workspace.actor);

-            let y = (w - active) * (this._fullGeometry.height + this._spacing);
+            let y = (w - active) * this._fullGeometry.height;

            if (showAnimation) {
                let params = { y: y,
@ -276,25 +235,31 @@ const WorkspacesView = new Lang.Class({
        });
    },

-    updateWorkspaces: function(oldNumWorkspaces, newNumWorkspaces) {
-        let active = global.screen.get_active_workspace_index();
+    _updateWorkspaces: function() {
+        let oldNumWorkspaces = this._workspaces.length;
+        let newNumWorkspaces = global.screen.n_workspaces;

-        Tweener.addTween(this.scrollAdjustment,
-                         { upper: newNumWorkspaces,
-                           time: WORKSPACE_SWITCH_TIME,
-                           transition: 'easeOutQuad'
-                         });
+        this.scrollAdjustment.upper = newNumWorkspaces;

        if (newNumWorkspaces > oldNumWorkspaces) {
            for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-                this._workspaces[w].setFullGeometry(this._fullGeometry);
-                if (this._actualGeometry)
-                    this._workspaces[w].setActualGeometry(this._actualGeometry);
-                this.actor.add_actor(this._workspaces[w].actor);
+                let metaWorkspace = global.screen.get_workspace_by_index(w);
+                let workspace = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
+                this._workspaces.push(workspace);
+                this.actor.add_actor(workspace.actor);
            }

-            this._updateWorkspaceActors(false);
+            if (this._fullGeometry)
+                this._updateWorkspaceActors(false);
+        } else if (newNumWorkspaces < oldNumWorkspaces) {
+            let nRemoved = (newNumWorkspaces - oldNumWorkspaces);
+            let removed = this._workspaces.splice(oldNumWorkspaces, nRemoved);
+            removed.forEach(function(workspace) {
+                workspace.destroy();
+            });
        }
+
+        this._syncGeometry();
    },

    _activeWorkspaceChanged: function(wm, from, to, direction) {
@ -305,70 +270,12 @@ const WorkspacesView = new Lang.Class({
    },

    _onDestroy: function() {
-        this._destroyExtraWorkspaces();
+        this.parent();
+
        this.scrollAdjustment.run_dispose();
-        Main.overview.disconnect(this._overviewShowingId);
        Main.overview.disconnect(this._overviewShownId);
        global.window_manager.disconnect(this._switchWorkspaceNotifyId);
-        this._settings.disconnect(this._updateExtraWorkspacesId);
-
-        if (this._inDrag)
-            this._dragEnd();
-
-        if (this._itemDragBeginId > 0) {
-            Main.overview.disconnect(this._itemDragBeginId);
-            this._itemDragBeginId = 0;
-        }
-        if (this._itemDragEndId > 0) {
-            Main.overview.disconnect(this._itemDragEndId);
-            this._itemDragEndId = 0;
-        }
-        if (this._windowDragBeginId > 0) {
-            Main.overview.disconnect(this._windowDragBeginId);
-            this._windowDragBeginId = 0;
-        }
-        if (this._windowDragEndId > 0) {
-            Main.overview.disconnect(this._windowDragEndId);
-            this._windowDragEndId = 0;
-        }
-    },
-
-    _dragBegin: function() {
-        if (this._scrolling)
-            return;
-
-        this._inDrag = true;
-        this._firstDragMotion = true;
-
-        this._dragMonitor = {
-            dragMotion: Lang.bind(this, this._onDragMotion)
-        };
-        DND.addDragMonitor(this._dragMonitor);
-    },
-
-    _onDragMotion: function(dragEvent) {
-        if (Main.overview.animationInProgress)
-             return DND.DragMotionResult.CONTINUE;
-
-        if (this._firstDragMotion) {
-            this._firstDragMotion = false;
-            for (let i = 0; i < this._workspaces.length; i++)
-                this._workspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
-            for (let i = 0; i < this._extraWorkspaces.length; i++)
-                this._extraWorkspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
-        }
-
-        return DND.DragMotionResult.CONTINUE;
-    },
-
-    _dragEnd: function() {
-        DND.removeDragMonitor(this._dragMonitor);
-        this._inDrag = false;
-
-        for (let i = 0; i < this._workspaces.length; i++)
-            this._workspaces[i].setReservedSlot(null);
-        for (let i = 0; i < this._extraWorkspaces.length; i++)
-            this._extraWorkspaces[i].setReservedSlot(null);
+        global.screen.disconnect(this._updateWorkspacesId);
    },

    startSwipeScroll: function() {
@ -427,6 +334,42 @@ const WorkspacesView = new Lang.Class({
 });
 Signals.addSignalMethods(WorkspacesView.prototype);

+const ExtraWorkspaceView = new Lang.Class({
+    Name: 'ExtraWorkspaceView',
+    Extends: WorkspacesViewBase,
+
+    _init: function(monitorIndex) {
+        this.parent(monitorIndex);
+        this._workspace = new Workspace.Workspace(null, monitorIndex);
+        this.actor.add_actor(this._workspace.actor);
+    },
+
+    _setReservedSlot: function(clone) {
+        this._workspace.setReservedSlot(clone);
+    },
+
+    _syncGeometry: function() {
+        this._workspace.setFullGeometry(this._fullGeometry);
+        this._workspace.setActualGeometry(this._actualGeometry);
+    },
+
+    zoomToOverview: function() {
+        this._workspace.zoomToOverview();
+    },
+
+    zoomFromOverview: function() {
+        this._workspace.zoomFromOverview();
+    },
+
+    syncStacking: function(stackIndices) {
+        this._workspace.syncStacking(stackIndices);
+    },
+
+    startSwipeScroll: function() {
+    },
+    endSwipeScroll: function() {
+    },
+});

 const WorkspacesDisplay = new Lang.Class({
    Name: 'WorkspacesDisplay',
@ -471,7 +414,6 @@ const WorkspacesDisplay = new Lang.Class({
        this._primaryIndex = Main.layoutManager.primaryIndex;

        this._workspacesViews = [];
-        this._workspaces = [];
        this._primaryScrollAdjustment = null;

        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
@ -480,9 +422,6 @@ const WorkspacesDisplay = new Lang.Class({
                                         this._workspacesOnlyOnPrimaryChanged));
        this._workspacesOnlyOnPrimaryChanged();

-        global.screen.connect('notify::n-workspaces',
-                              Lang.bind(this, this._workspacesChanged));
-
        this._switchWorkspaceNotifyId = 0;

        this._notifyOpacityId = 0;
@ -500,6 +439,8 @@ const WorkspacesDisplay = new Lang.Class({

    show: function() {
        this._updateWorkspacesViews();
+        for (let i = 0; i < this._workspacesViews.length; i++)
+            this._workspacesViews[i].zoomToOverview();

        this._restackedNotifyId =
            Main.overview.connect('windows-restacked',
@ -509,9 +450,8 @@ const WorkspacesDisplay = new Lang.Class({
    },

    zoomFromOverview: function() {
-        for (let i = 0; i < this._workspacesViews.length; i++) {
-            this._workspacesViews[i].hide();
-        }
+        for (let i = 0; i < this._workspacesViews.length; i++)
+            this._workspacesViews[i].zoomFromOverview();
    },

    hide: function() {
@ -543,46 +483,38 @@ const WorkspacesDisplay = new Lang.Class({
            this._workspacesViews[i].destroy();

        this._workspacesViews = [];
-        this._workspaces = [];
        let monitors = Main.layoutManager.monitors;
        for (let i = 0; i < monitors.length; i++) {
+            let view;
            if (this._workspacesOnlyOnPrimary && i != this._primaryIndex)
-                continue;  // we are only interested in the primary monitor
+                view = new ExtraWorkspaceView(i);
+            else
+                view = new WorkspacesView(i);

-            let monitorWorkspaces = [];
-            for (let w = 0; w < global.screen.n_workspaces; w++) {
-                let metaWorkspace = global.screen.get_workspace_by_index(w);
-                monitorWorkspaces.push(new Workspace.Workspace(metaWorkspace, i));
-            }
-
-            this._workspaces.push(monitorWorkspaces);
-
-            let view = new WorkspacesView(monitorWorkspaces);
            view.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
-            if (this._workspacesOnlyOnPrimary || i == this._primaryIndex) {
+            if (i == this._primaryIndex) {
                this._scrollAdjustment = view.scrollAdjustment;
                this._scrollAdjustment.connect('notify::value',
                                               Lang.bind(this, this._scrollValueChanged));
            }
+
            this._workspacesViews.push(view);
+            Main.layoutManager.overviewGroup.add_actor(view.actor);
        }

        this._updateWorkspacesFullGeometry();
        this._updateWorkspacesActualGeometry();
-
-        for (let i = 0; i < this._workspacesViews.length; i++)
-            Main.layoutManager.overviewGroup.add_actor(this._workspacesViews[i].actor);
    },

    _scrollValueChanged: function() {
-        if (this._workspacesOnlyOnPrimary)
-            return;
-
        for (let i = 0; i < this._workspacesViews.length; i++) {
            if (i == this._primaryIndex)
                continue;

            let adjustment = this._workspacesViews[i].scrollAdjustment;
+            if (!adjustment)
+                continue;
+
            // the adjustments work in terms of workspaces, so the
            // values map directly
            adjustment.value = this._scrollAdjustment.value;
@ -592,10 +524,7 @@ const WorkspacesDisplay = new Lang.Class({
    _getPrimaryView: function() {
        if (!this._workspacesViews.length)
            return null;
-        if (this._workspacesOnlyOnPrimary)
-            return this._workspacesViews[0];
-        else
-            return this._workspacesViews[this._primaryIndex];
+        return this._workspacesViews[this._primaryIndex];
    },

    activeWorkspaceHasMaximizedWindows: function() {
@ -641,15 +570,9 @@ const WorkspacesDisplay = new Lang.Class({
            return;

        let monitors = Main.layoutManager.monitors;
-        let m = 0;
        for (let i = 0; i < monitors.length; i++) {
-            if (i == this._primaryIndex) {
-                this._workspacesViews[m].setFullGeometry(this._fullGeometry);
-                m++;
-            } else if (!this._workspacesOnlyOnPrimary) {
-                this._workspacesViews[m].setFullGeometry(monitors[i]);
-                m++;
-            }
+            let geometry = (i == this._primaryIndex) ? this._fullGeometry : monitors[i];
+            this._workspacesViews[i].setFullGeometry(geometry);
        }
    },

@ -660,18 +583,12 @@ const WorkspacesDisplay = new Lang.Class({
        let [x, y] = this.actor.get_transformed_position();
        let width = this.actor.allocation.x2 - this.actor.allocation.x1;
        let height = this.actor.allocation.y2 - this.actor.allocation.y1;
-        let geometry = { x: x, y: y, width: width, height: height };
+        let primaryGeometry = { x: x, y: y, width: width, height: height };

        let monitors = Main.layoutManager.monitors;
-        let m = 0;
        for (let i = 0; i < monitors.length; i++) {
-            if (i == this._primaryIndex) {
-                this._workspacesViews[m].setActualGeometry(geometry);
-                m++;
-            } else if (!this._workspacesOnlyOnPrimary) {
-                this._workspacesViews[m].setActualGeometry(monitors[i]);
-                m++;
-            }
+            let geometry = (i == this._primaryIndex) ? primaryGeometry : monitors[i];
+            this._workspacesViews[i].setActualGeometry(geometry);
        }
    },

@ -680,60 +597,6 @@ const WorkspacesDisplay = new Lang.Class({
            this._workspacesViews[i].syncStacking(stackIndices);
    },

-    _workspacesChanged: function() {
-        if (!this._workspacesViews.length)
-            return;
-
-        let oldNumWorkspaces = this._workspaces[0].length;
-        let newNumWorkspaces = global.screen.n_workspaces;
-        let active = global.screen.get_active_workspace_index();
-
-        let lostWorkspaces = [];
-        if (newNumWorkspaces > oldNumWorkspaces) {
-            let monitors = Main.layoutManager.monitors;
-            let m = 0;
-            for (let i = 0; i < monitors.length; i++) {
-                if (this._workspacesOnlyOnPrimary &&
-                    i != this._primaryIndex)
-                    continue;
-
-                // Assume workspaces are only added at the end
-                for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-                    let metaWorkspace = global.screen.get_workspace_by_index(w);
-                    this._workspaces[m][w] =
-                        new Workspace.Workspace(metaWorkspace, i);
-                }
-                m++;
-            }
-        } else {
-            // Assume workspaces are only removed sequentially
-            // (e.g. 2,3,4 - not 2,4,7)
-            let removedIndex;
-            let removedNum = oldNumWorkspaces - newNumWorkspaces;
-            for (let w = 0; w < oldNumWorkspaces; w++) {
-                let metaWorkspace = global.screen.get_workspace_by_index(w);
-                if (this._workspaces[0][w].metaWorkspace != metaWorkspace) {
-                    removedIndex = w;
-                    break;
-                }
-            }
-
-            for (let i = 0; i < this._workspaces.length; i++) {
-                lostWorkspaces = this._workspaces[i].splice(removedIndex,
-                                                            removedNum);
-
-                for (let l = 0; l < lostWorkspaces.length; l++) {
-                    lostWorkspaces[l].disconnectAll();
-                    lostWorkspaces[l].destroy();
-                }
-            }
-        }
-
-        for (let i = 0; i < this._workspacesViews.length; i++)
-            this._workspacesViews[i].updateWorkspaces(oldNumWorkspaces,
-                                                      newNumWorkspaces);
-    },
-
    _onScrollEvent: function(actor, event) {
        if (!this.actor.mapped)
            return false;
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/ta.po
+++ b/po/ta.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@ -156,8 +156,10 @@ libst_1_0_la_SOURCES =				\
 	$(st_source_private_h)			\
 	$(st_source_private_c)			\
 	$(st_source_h)				\
-	st.h					\
+	$(NULL)
+nodist_libst_1_0_la_SOURCES =			\
 	$(st_built_sources)			\
+	st.h					\
 	$(NULL)
 libst_1_0_la_CPPFLAGS = $(st_cflags)
 libst_1_0_la_LDFLAGS = $(LDADD)
--- a/src/Makefile-tray.am
+++ b/src/Makefile-tray.am
@ -4,8 +4,6 @@ tray_cflags =					\
 	$(TRAY_CFLAGS)				\
 	$(NULL)

-BUILT_SOURCES += $(tray_built_sources)
-
 # please, keep this sorted alphabetically
 tray_source =			\
 	tray/na-tray-child.c	\
@ -19,7 +17,6 @@ noinst_LTLIBRARIES += libtray.la
 libtray_la_LIBADD = $(TRAY_LIBS)
 libtray_la_SOURCES =		\
 	$(tray_source)		\
-	$(tray_built_sources)	\
 	$(NULL)
 libtray_la_CPPFLAGS = $(tray_cflags)
 libtray_la_LDFLAGS = $(LDADD)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -75,8 +75,7 @@ gnome_shell_cflags =				\
 	-DDATADIR=\"$(datadir)\"		\
 	-DGNOME_SHELL_LIBEXECDIR=\"$(libexecdir)\"	\
 	-DGNOME_SHELL_DATADIR=\"$(pkgdatadir)\"	\
-	-DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\" \
-	-DJSDIR=\"$(pkgdatadir)/js\"
+	-DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\"

 privlibdir = $(pkglibdir)
 privlib_LTLIBRARIES = libgnome-shell-js.la libgnome-shell-menu.la libgnome-shell.la
@ -152,7 +151,6 @@ libgnome_shell_base_la_SOURCES = 	\
 	$(NULL)

 libgnome_shell_sources =		\
-	$(shell_built_sources)		\
 	$(shell_public_headers_h)	\
 	shell-app-private.h		\
 	shell-app-system-private.h	\
@ -173,10 +171,17 @@ libgnome_shell_sources =		\
 	shell-wm.c			\
 	$(NULL)

+libgnome_shell_built_sources =		\
+	$(shell_built_sources)		\
+	$(top_builddir)/js/js-resources.c		\
+	$(top_builddir)/js/js-resources.h		\
+	$(NULL)
+
 libgnome_shell_la_SOURCES = $(libgnome_shell_sources)
+nodist_libgnome_shell_la_SOURCES = $(libgnome_shell_built_sources)

 libgnome_shell_la_gir_sources = \
-	$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_base_la_SOURCES) $(libgnome_shell_sources))
+	$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_base_la_SOURCES) $(libgnome_shell_sources) $(libgnome_shell_built_sources))

 gnome_shell_SOURCES = main.c
 gnome_shell_CPPFLAGS = \
@ -191,6 +196,7 @@ gnome_shell_DEPENDENCIES = libgnome-shell.la

 if HAVE_MUTTER_WAYLAND
 libgnome_shell_wayland_la_SOURCES = $(libgnome_shell_sources)
+nodist_libgnome_shell_wayland_la_SOURCES = $(libgnome_shell_built_sources)

 gnome_shell_wayland_SOURCES = main.c
 gnome_shell_wayland_CPPFLAGS = \
@ -207,7 +213,7 @@ endif HAVE_MUTTER_WAYLAND

 libgnome_shell_js_la_SOURCES =		\
 	shell-js.h			\
-	shell-js.cpp		\
+	shell-js.cpp			\
 	$(NULL)

 libgnome_shell_js_la_LIBADD =		\
--- a/src/shell-app-private.h
+++ b/src/shell-app-private.h
@ -12,9 +12,9 @@ G_BEGIN_DECLS

 ShellApp* _shell_app_new_for_window (MetaWindow *window);

-ShellApp* _shell_app_new (GMenuTreeEntry *entry);
+ShellApp* _shell_app_new (GDesktopAppInfo *info);

-void _shell_app_set_entry (ShellApp *app, GMenuTreeEntry *entry);
+void _shell_app_set_app_info (ShellApp *app, GDesktopAppInfo *info);

 void _shell_app_handle_startup_sequence (ShellApp *app, SnStartupSequence *sequence);

--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@ -38,18 +38,12 @@ enum {
 static guint signals[LAST_SIGNAL] = { 0 };

 struct _ShellAppSystemPrivate {
-  GMenuTree *apps_tree;
-
  GHashTable *running_apps;
-  GHashTable *visible_id_to_app;
  GHashTable *id_to_app;
-  GHashTable *startup_wm_class_to_app;
-
-  GSList *known_vendor_prefixes;
+  GHashTable *startup_wm_class_to_id;
 };

 static void shell_app_system_finalize (GObject *object);
-static void on_apps_tree_changed_cb (GMenuTree *tree, gpointer user_data);

 G_DEFINE_TYPE(ShellAppSystem, shell_app_system, G_TYPE_OBJECT);

@ -77,10 +71,45 @@ static void shell_app_system_class_init(ShellAppSystemClass *klass)
  g_type_class_add_private (gobject_class, sizeof (ShellAppSystemPrivate));
 }

+static void
+scan_startup_wm_class_to_id (ShellAppSystem *self)
+{
+  ShellAppSystemPrivate *priv = self->priv;
+  GList *apps, *l;
+
+  g_hash_table_remove_all (priv->startup_wm_class_to_id);
+
+  apps = g_app_info_get_all ();
+  for (l = apps; l != NULL; l = l->next)
+    {
+      GAppInfo *info = l->data;
+      const char *startup_wm_class, *id;
+
+      id = g_app_info_get_id (info);
+      startup_wm_class = g_desktop_app_info_get_startup_wm_class (G_DESKTOP_APP_INFO (info));
+      if (startup_wm_class != NULL)
+        g_hash_table_insert (priv->startup_wm_class_to_id, (char *) startup_wm_class, (char *) id);
+    }
+
+  g_list_free_full (apps, g_object_unref);
+}
+
+static void
+installed_changed (GAppInfoMonitor *monitor,
+                   gpointer         user_data)
+{
+  ShellAppSystem *self = user_data;
+
+  scan_startup_wm_class_to_id (self);
+
+  g_signal_emit (self, signals[INSTALLED_CHANGED], 0, NULL);
+}
+
 static void
 shell_app_system_init (ShellAppSystem *self)
 {
  ShellAppSystemPrivate *priv;
+  GAppInfoMonitor *monitor;

  self->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
                                                   SHELL_TYPE_APP_SYSTEM,
@ -91,19 +120,11 @@ shell_app_system_init (ShellAppSystem *self)
                                           NULL,
                                           (GDestroyNotify)g_object_unref);

-  /* All the objects in this hash table are owned by id_to_app */
-  priv->visible_id_to_app = g_hash_table_new (g_str_hash, g_str_equal);
+  priv->startup_wm_class_to_id = g_hash_table_new (g_str_hash, g_str_equal);

-  priv->startup_wm_class_to_app = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                         NULL,
-                                                         (GDestroyNotify)g_object_unref);
-
-  /* We want to track NoDisplay apps, so we add INCLUDE_NODISPLAY. We'll
-   * filter NoDisplay apps out when showing them to the user. */
-  priv->apps_tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
-  g_signal_connect (priv->apps_tree, "changed", G_CALLBACK (on_apps_tree_changed_cb), self);
-
-  on_apps_tree_changed_cb (priv->apps_tree, self);
+  monitor = g_app_info_monitor_get ();
+  g_signal_connect (monitor, "changed", G_CALLBACK (installed_changed), self);
+  installed_changed (monitor, self);
 }

 static void
@ -112,313 +133,13 @@ shell_app_system_finalize (GObject *object)
  ShellAppSystem *self = SHELL_APP_SYSTEM (object);
  ShellAppSystemPrivate *priv = self->priv;

-  g_object_unref (priv->apps_tree);
-
  g_hash_table_destroy (priv->running_apps);
  g_hash_table_destroy (priv->id_to_app);
-  g_hash_table_destroy (priv->visible_id_to_app);
-  g_hash_table_destroy (priv->startup_wm_class_to_app);
-
-  g_slist_free_full (priv->known_vendor_prefixes, g_free);
-  priv->known_vendor_prefixes = NULL;
+  g_hash_table_destroy (priv->startup_wm_class_to_id);

  G_OBJECT_CLASS (shell_app_system_parent_class)->finalize (object);
 }

-static char *
-get_prefix_for_entry (GMenuTreeEntry *entry)
-{
-  char *prefix = NULL, *file_prefix = NULL;
-  const char *id;
-  GFile *file;
-  char *name;
-  int i = 0;
-
-  id = gmenu_tree_entry_get_desktop_file_id (entry);
-  file = g_file_new_for_path (gmenu_tree_entry_get_desktop_file_path (entry));
-  name = g_file_get_basename (file);
-
-  if (!name)
-    {
-      g_object_unref (file);
-      return NULL;
-    }
-  for (i = 0; vendor_prefixes[i]; i++)
-    {
-      if (g_str_has_prefix (name, vendor_prefixes[i]))
-        {
-          file_prefix = g_strdup (vendor_prefixes[i]);
-          break;
-        }
-    }
-
-  while (strcmp (name, id) != 0)
-    {
-      char *t;
-      char *pname;
-      GFile *parent = g_file_get_parent (file);
-
-      if (!parent)
-        {
-          g_warn_if_reached ();
-          break;
-        }
-
-      pname = g_file_get_basename (parent);
-      if (!pname)
-        {
-          g_object_unref (parent);
-          break;
-        }
-      if (!g_strstr_len (id, -1, pname))
-        {
-          /* handle <LegacyDir prefix="..."> */
-          char *t;
-          size_t name_len = strlen (name);
-          size_t id_len = strlen (id);
-          char *t_id = g_strdup (id);
-
-          t_id[id_len - name_len] = '\0';
-          t = g_strdup(t_id);
-          g_free (prefix);
-          g_free (t_id);
-          g_free (name);
-          name = g_strdup (id);
-          prefix = t;
-
-          g_object_unref (file);
-          file = parent;
-          g_free (pname);
-          g_free (file_prefix);
-          file_prefix = NULL;
-          break;
-        }
-
-      t = g_strconcat (pname, "-", name, NULL);
-      g_free (name);
-      name = t;
-
-      t = g_strconcat (pname, "-", prefix, NULL);
-      g_free (prefix);
-      prefix = t;
-
-      g_object_unref (file);
-      file = parent;
-      g_free (pname);
-    }
-
-  if (file)
-    g_object_unref (file);
-
-  if (strcmp (name, id) == 0)
-    {
-      g_free (name);
-      if (file_prefix && !prefix)
-        return file_prefix;
-      if (file_prefix)
-        {
-          char *t = g_strconcat (prefix, "-", file_prefix, NULL);
-          g_free (prefix);
-          g_free (file_prefix);
-          prefix = t;
-        }
-      return prefix;
-    }
-
-  g_free (name);
-  g_free (prefix);
-  g_free (file_prefix);
-  g_return_val_if_reached (NULL);
-}
-
-static void
-get_flattened_entries_recurse (GMenuTreeDirectory *dir,
-                               GHashTable         *entry_set)
-{
-  GMenuTreeIter *iter = gmenu_tree_directory_iter (dir);
-  GMenuTreeItemType next_type;
-
-  while ((next_type = gmenu_tree_iter_next (iter)) != GMENU_TREE_ITEM_INVALID)
-    {
-      gpointer item = NULL;
-
-      switch (next_type)
-        {
-        case GMENU_TREE_ITEM_ENTRY:
-          {
-            GMenuTreeEntry *entry;
-            item = entry = gmenu_tree_iter_get_entry (iter);
-            /* Key is owned by entry */
-            g_hash_table_replace (entry_set,
-                                  (char*)gmenu_tree_entry_get_desktop_file_id (entry),
-                                  gmenu_tree_item_ref (entry));
-          }
-          break;
-        case GMENU_TREE_ITEM_DIRECTORY:
-          {
-            item = gmenu_tree_iter_get_directory (iter);
-            get_flattened_entries_recurse ((GMenuTreeDirectory*)item, entry_set);
-          }
-          break;
-        default:
-          break;
-        }
-      if (item != NULL)
-        gmenu_tree_item_unref (item);
-    }
-
-  gmenu_tree_iter_unref (iter);
-}
-
-static GHashTable *
-get_flattened_entries_from_tree (GMenuTree *tree)
-{
-  GHashTable *table;
-  GMenuTreeDirectory *root;
-
-  table = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                 (GDestroyNotify) NULL,
-                                 (GDestroyNotify) gmenu_tree_item_unref);
-
-  root = gmenu_tree_get_root_directory (tree);
-  
-  if (root != NULL)
-    get_flattened_entries_recurse (root, table);
-
-  gmenu_tree_item_unref (root);
-  
-  return table;
-}
-
-static void
-on_apps_tree_changed_cb (GMenuTree *tree,
-                         gpointer   user_data)
-{
-  ShellAppSystem *self = SHELL_APP_SYSTEM (user_data);
-  GError *error = NULL;
-  GHashTable *new_apps;
-  GHashTableIter iter;
-  gpointer key, value;
-
-  g_assert (tree == self->priv->apps_tree);
-
-  g_hash_table_remove_all (self->priv->visible_id_to_app);
-  g_slist_free_full (self->priv->known_vendor_prefixes, g_free);
-  self->priv->known_vendor_prefixes = NULL;
-
-  if (!gmenu_tree_load_sync (self->priv->apps_tree, &error))
-    {
-      if (error)
-        {
-          g_warning ("Failed to load apps: %s", error->message);
-          g_error_free (error);
-        }
-      else
-        {
-          g_warning ("Failed to load apps");
-        }
-      return;
-    }
-
-  new_apps = get_flattened_entries_from_tree (self->priv->apps_tree);
-  g_hash_table_iter_init (&iter, new_apps);
-  while (g_hash_table_iter_next (&iter, &key, &value))
-    {
-      const char *id = key;
-      GMenuTreeEntry *entry = value;
-      GMenuTreeEntry *old_entry;
-      char *prefix;
-      ShellApp *app;
-      GDesktopAppInfo *info;
-      const char *startup_wm_class;
-
-      prefix = get_prefix_for_entry (entry);
-
-      if (prefix != NULL
-          && !g_slist_find_custom (self->priv->known_vendor_prefixes, prefix,
-                                   (GCompareFunc)g_strcmp0))
-        self->priv->known_vendor_prefixes = g_slist_append (self->priv->known_vendor_prefixes,
-                                                            prefix);
-      else
-        g_free (prefix);
-
-      app = g_hash_table_lookup (self->priv->id_to_app, id);
-      if (app != NULL)
-        {
-          /* We hold a reference to the original entry temporarily,
-           * because otherwise the hash table would be referencing
-           * potentially free'd memory until we replace it below with
-           * the new data.
-           */
-          old_entry = shell_app_get_tree_entry (app);
-          gmenu_tree_item_ref (old_entry);
-          _shell_app_set_entry (app, entry);
-          g_object_ref (app);  /* Extra ref, removed in _replace below */
-        }
-      else
-        {
-          old_entry = NULL;
-          app = _shell_app_new (entry);
-        }
-      /* Note that "id" is owned by app->entry.  Since we're always
-       * setting a new entry, even if the app already exists in the
-       * hash table we need to replace the key so that the new id
-       * string is pointed to.
-       */
-      g_hash_table_replace (self->priv->id_to_app, (char*)id, app);
-      if (!gmenu_tree_entry_get_is_nodisplay_recurse (entry))
-        g_hash_table_replace (self->priv->visible_id_to_app, (char*)id, app);
-
-      if (old_entry)
-        {
-          GDesktopAppInfo *old_info;
-          const gchar *old_startup_wm_class;
-
-          old_info = gmenu_tree_entry_get_app_info (old_entry);
-          old_startup_wm_class = g_desktop_app_info_get_startup_wm_class (old_info);
-
-          if (old_startup_wm_class)
-            g_hash_table_remove (self->priv->startup_wm_class_to_app, old_startup_wm_class);
-        }
-
-      info = gmenu_tree_entry_get_app_info (entry);
-      startup_wm_class = g_desktop_app_info_get_startup_wm_class (info);
-      if (startup_wm_class)
-        g_hash_table_replace (self->priv->startup_wm_class_to_app,
-                              (char*)startup_wm_class, g_object_ref (app));
-
-      if (old_entry)
-        gmenu_tree_item_unref (old_entry);
-    }
-  /* Now iterate over the apps again; we need to unreference any apps
-   * which have been removed.  The JS code may still be holding a
-   * reference; that's fine.
-   */
-  g_hash_table_iter_init (&iter, self->priv->id_to_app);
-  while (g_hash_table_iter_next (&iter, &key, &value))
-    {
-      const char *id = key;
-      
-      if (!g_hash_table_lookup (new_apps, id))
-        g_hash_table_iter_remove (&iter);
-    }
-
-  g_hash_table_destroy (new_apps);
-
-  g_signal_emit (self, signals[INSTALLED_CHANGED], 0);
-}
-
-/**
- * shell_app_system_get_tree:
- *
- * Return Value: (transfer none): The #GMenuTree for apps
- */
-GMenuTree *
-shell_app_system_get_tree (ShellAppSystem *self)
-{
-  return self->priv->apps_tree;
-}
-
 /**
 * shell_app_system_get_default:
 *
@ -446,61 +167,21 @@ ShellApp *
 shell_app_system_lookup_app (ShellAppSystem   *self,
                             const char       *id)
 {
-  return g_hash_table_lookup (self->priv->id_to_app, id);
-}
-
-/**
- * shell_app_system_lookup_app_by_tree_entry:
- * @system: a #ShellAppSystem
- * @entry: a #GMenuTreeEntry
- *
- * Find a #ShellApp corresponding to a #GMenuTreeEntry.
- *
- * Return value: (transfer none): The #ShellApp for @entry, or %NULL if none
- */
-ShellApp *
-shell_app_system_lookup_app_by_tree_entry (ShellAppSystem  *self,
-                                           GMenuTreeEntry  *entry)
-{
-  /* If we looked up directly in ->entry_to_app, we'd lose the
-   * override of running apps.  Thus, indirect through the id.
-   */
-  return shell_app_system_lookup_app (self, gmenu_tree_entry_get_desktop_file_id (entry));
-}
-
-/**
- * shell_app_system_lookup_app_for_path:
- * @system: a #ShellAppSystem
- * @desktop_path: (type utf8): UTF-8 encoded absolute file name
- *
- * Find or create a #ShellApp corresponding to a given absolute file
- * name which must be in the standard paths (XDG_DATA_DIRS).  For
- * files outside the datadirs, this function returns %NULL.
- *
- * Return value: (transfer none): The #ShellApp for id, or %NULL if none
- */
-ShellApp *
-shell_app_system_lookup_app_for_path (ShellAppSystem   *system,
-                                      const char       *desktop_path)
-{
-  const char *basename;
-  const char *app_path;
+  ShellAppSystemPrivate *priv = self->priv;
  ShellApp *app;
+  GDesktopAppInfo *info;

-  basename = g_strrstr (desktop_path, "/");
-  if (basename)
-    basename += 1;
-  else
-    basename = desktop_path;
+  app = g_hash_table_lookup (priv->id_to_app, id);
+  if (app)
+    return app;

-  app = shell_app_system_lookup_app (system, basename);
-  if (!app)
-    return NULL;
-
-  app_path = g_desktop_app_info_get_filename (shell_app_get_app_info (app));
-  if (strcmp (desktop_path, app_path) != 0)
+  info = g_desktop_app_info_new (id);
+  if (!info)
    return NULL;

+  app = _shell_app_new (info);
+  g_hash_table_insert (priv->id_to_app, (char *) shell_app_get_id (app), app);
+  g_object_unref (info);
  return app;
 }

@ -520,15 +201,15 @@ shell_app_system_lookup_heuristic_basename (ShellAppSystem *system,
                                            const char     *name)
 {
  ShellApp *result;
-  GSList *prefix;
+  const char *const *prefix;

  result = shell_app_system_lookup_app (system, name);
  if (result != NULL)
    return result;

-  for (prefix = system->priv->known_vendor_prefixes; prefix; prefix = g_slist_next (prefix))
+  for (prefix = vendor_prefixes; *prefix != NULL; prefix++)
    {
-      char *tmpid = g_strconcat ((char*)prefix->data, name, NULL);
+      char *tmpid = g_strconcat (*prefix, name, NULL);
      result = shell_app_system_lookup_app (system, tmpid);
      g_free (tmpid);
      if (result != NULL)
@ -603,10 +284,16 @@ ShellApp *
 shell_app_system_lookup_startup_wmclass (ShellAppSystem *system,
                                         const char     *wmclass)
 {
+  const char *id;
+
  if (wmclass == NULL)
    return NULL;

-  return g_hash_table_lookup (system->priv->startup_wm_class_to_app, wmclass);
+  id = g_hash_table_lookup (system->priv->startup_wm_class_to_id, wmclass);
+  if (id == NULL)
+    return NULL;
+
+  return shell_app_system_lookup_app (system, id);
 }

 void
@ -681,13 +368,22 @@ sort_and_concat_results (ShellAppSystem *system,
                         GSList         *prefix_matches,
                         GSList         *substring_matches)
 {
+  GSList *matches = NULL;
+  GSList *l;
+
  prefix_matches = g_slist_sort_with_data (prefix_matches,
                                           compare_apps_by_usage,
                                           system);
  substring_matches = g_slist_sort_with_data (substring_matches,
                                              compare_apps_by_usage,
                                              system);
-  return g_slist_concat (prefix_matches, substring_matches);
+
+  for (l = substring_matches; l != NULL; l = l->next)
+    matches = g_slist_prepend (matches, (char *) shell_app_get_id (SHELL_APP (l->data)));
+  for (l = prefix_matches; l != NULL; l = l->next)
+    matches = g_slist_prepend (matches, (char *) shell_app_get_id (SHELL_APP (l->data)));
+
+  return g_slist_reverse (matches);
 }

 /**
@ -734,7 +430,6 @@ search_tree (ShellAppSystem *self,
  g_slist_free_full (normalized_terms, g_free);

  return sort_and_concat_results (self, prefix_results, substring_results);
-
 }

 /**
@ -744,26 +439,26 @@ search_tree (ShellAppSystem *self,
 *
 * Search through applications for the given search terms.
 *
- * Returns: (transfer container) (element-type ShellApp): List of applications
+ * Returns: (transfer container) (element-type utf8): List of applications
 */
 GSList *
 shell_app_system_initial_search (ShellAppSystem  *self,
                                 GSList          *terms)
 {
-  return search_tree (self, terms, self->priv->visible_id_to_app);
+  return search_tree (self, terms, self->priv->id_to_app);
 }

 /**
 * shell_app_system_subsearch:
 * @system: A #ShellAppSystem
- * @previous_results: (element-type ShellApp): List of previous results
+ * @previous_results: (element-type utf8): List of previous results
 * @terms: (element-type utf8): List of terms, logical AND
 *
 * Search through a previous result set; for more information, see
 * js/ui/search.js. Note that returned strings are only valid until
 * a return to the main loop.
 *
- * Returns: (transfer container) (element-type ShellApp): List of application identifiers
+ * Returns: (transfer container) (element-type utf8): List of application identifiers
 */
 GSList *
 shell_app_system_subsearch (ShellAppSystem   *system,
@ -779,8 +474,8 @@ shell_app_system_subsearch (ShellAppSystem   *system,

  for (iter = previous_results; iter; iter = iter->next)
    {
-      ShellApp *app = iter->data;
-      
+      ShellApp *app = shell_app_system_lookup_app (system, iter->data);
+
      _shell_app_do_match (app, normalized_terms,
                           &prefix_results,
                           &substring_results);
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@ -5,8 +5,6 @@
 #include <gio/gio.h>
 #include <clutter/clutter.h>
 #include <meta/window.h>
-#define GMENU_I_KNOW_THIS_IS_UNSTABLE
-#include <gmenu-tree.h>

 #include "shell-app.h"

@ -39,14 +37,8 @@ struct _ShellAppSystemClass
 GType           shell_app_system_get_type    (void) G_GNUC_CONST;
 ShellAppSystem *shell_app_system_get_default (void);

-GMenuTree      *shell_app_system_get_tree                     (ShellAppSystem *system);
-
 ShellApp       *shell_app_system_lookup_app                   (ShellAppSystem  *system,
                                                               const char      *id);
-ShellApp       *shell_app_system_lookup_app_by_tree_entry     (ShellAppSystem  *system,
-                                                               GMenuTreeEntry  *entry);
-ShellApp       *shell_app_system_lookup_app_for_path          (ShellAppSystem  *system,
-                                                               const char      *desktop_path);
 ShellApp       *shell_app_system_lookup_heuristic_basename    (ShellAppSystem  *system,
                                                               const char      *id);

--- a/src/shell-app.c
+++ b/src/shell-app.c
@ -17,6 +17,12 @@
 #include "st.h"
 #include "gtkactionmuxer.h"

+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-journal.h>
+#include <errno.h>
+#include <unistd.h>
+#endif
+
 typedef enum {
  MATCH_NONE,
  MATCH_SUBSTRING, /* Not prefix, substring */
@ -37,7 +43,7 @@ typedef struct {
  GSList *windows;

  /* Whether or not we need to resort the windows; this is done on demand */
-  gboolean window_sort_stale : 1;
+  guint window_sort_stale : 1;

  /* DBus property notification subscription */
  guint properties_changed_id : 1;
@ -53,7 +59,7 @@ typedef struct {
 * SECTION:shell-app
 * @short_description: Object representing an application
 *
- * This object wraps a #GMenuTreeEntry, providing methods and signals
+ * This object wraps a #GDesktopAppInfo, providing methods and signals
 * primarily useful for running applications.
 */
 struct _ShellApp
@ -64,7 +70,7 @@ struct _ShellApp

  ShellAppState state;

-  GMenuTreeEntry *entry; /* If NULL, this app is backed by one or more
+  GDesktopAppInfo *info; /* If NULL, this app is backed by one or more
                          * MetaWindow.  For purposes of app title
                          * etc., we use the first window added,
                          * because it's most likely to be what we
@ -137,15 +143,15 @@ shell_app_get_property (GObject    *gobject,
 const char *
 shell_app_get_id (ShellApp *app)
 {
-  if (app->entry)
-    return gmenu_tree_entry_get_desktop_file_id (app->entry);
+  if (app->info)
+    return g_app_info_get_id (G_APP_INFO (app->info));
  return app->window_id_string;
 }

 static MetaWindow *
 window_backed_app_get_window (ShellApp     *app)
 {
-  g_assert (app->entry == NULL);
+  g_assert (app->info == NULL);
  g_assert (app->running_state);
  g_assert (app->running_state->windows);
  return app->running_state->windows->data;
@ -194,10 +200,10 @@ shell_app_create_icon_texture (ShellApp   *app,

  ret = NULL;

-  if (app->entry == NULL)
+  if (app->info == NULL)
    return window_backed_app_get_icon (app, size);

-  icon = g_app_info_get_icon (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
+  icon = g_app_info_get_icon (G_APP_INFO (app->info));
  if (icon != NULL)
    ret = st_texture_cache_load_gicon (st_texture_cache_get_default (), NULL, icon, size);

@ -245,7 +251,7 @@ shell_app_create_faded_icon_cpu (StTextureCache *cache,

  info = NULL;

-  icon = g_app_info_get_icon (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
+  icon = g_app_info_get_icon (G_APP_INFO (app->info));
  if (icon != NULL)
    {
      info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (),
@ -347,7 +353,7 @@ shell_app_get_faded_icon (ShellApp *app, int size, ClutterTextDirection directio
   * property tracking bits, and this helps us visually distinguish
   * app-tracked from not.
   */
-  if (!app->entry)
+  if (!app->info)
    return window_backed_app_get_icon (app, size);

  /* Use icon: prefix so that we get evicted from the cache on
@ -384,8 +390,8 @@ shell_app_get_faded_icon (ShellApp *app, int size, ClutterTextDirection directio
 const char *
 shell_app_get_name (ShellApp *app)
 {
-  if (app->entry)
-    return g_app_info_get_name (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
+  if (app->info)
+    return g_app_info_get_name (G_APP_INFO (app->info));
  else
    {
      MetaWindow *window = window_backed_app_get_window (app);
@ -401,8 +407,8 @@ shell_app_get_name (ShellApp *app)
 const char *
 shell_app_get_description (ShellApp *app)
 {
-  if (app->entry)
-    return g_app_info_get_description (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
+  if (app->info)
+    return g_app_info_get_description (G_APP_INFO (app->info));
  else
    return NULL;
 }
@ -417,7 +423,7 @@ shell_app_get_description (ShellApp *app)
 gboolean
 shell_app_is_window_backed (ShellApp *app)
 {
-  return app->entry == NULL;
+  return app->info == NULL;
 }

 typedef struct {
@ -665,7 +671,7 @@ void
 shell_app_open_new_window (ShellApp      *app,
                           int            workspace)
 {
-  g_return_if_fail (app->entry != NULL);
+  g_return_if_fail (app->info != NULL);

  /* Here we just always launch the application again, even if we know
   * it was already running.  For most applications this
@ -855,25 +861,24 @@ _shell_app_new_for_window (MetaWindow      *window)
 }

 ShellApp *
-_shell_app_new (GMenuTreeEntry *info)
+_shell_app_new (GDesktopAppInfo *info)
 {
  ShellApp *app;

  app = g_object_new (SHELL_TYPE_APP, NULL);

-  _shell_app_set_entry (app, info);
+  _shell_app_set_app_info (app, info);

  return app;
 }

 void
-_shell_app_set_entry (ShellApp       *app,
-                      GMenuTreeEntry *entry)
+_shell_app_set_app_info (ShellApp        *app,
+                         GDesktopAppInfo *info)
 {
-  if (app->entry != NULL)
-    gmenu_tree_item_unref (app->entry);
-  app->entry = gmenu_tree_item_ref (entry);
-  
+  g_clear_object (&app->info);
+  app->info = g_object_ref (info);
+
  if (app->name_collation_key != NULL)
    g_free (app->name_collation_key);
  app->name_collation_key = g_utf8_collate_key (shell_app_get_name (app), -1);
@ -1162,6 +1167,29 @@ _gather_pid_callback (GDesktopAppInfo   *gapp,
                                               app);
 }

+#ifdef HAVE_SYSTEMD
+/* This sets up the launched application to log to the journal
+ * using its own identifier, instead of just "gnome-session".
+ */
+static void
+app_child_setup (gpointer user_data)
+{
+  const char *appid = user_data;
+  int res;
+  int journalfd = sd_journal_stream_fd (appid, LOG_INFO, FALSE);
+  if (journalfd >= 0)
+    {
+      do
+        res = dup2 (journalfd, 1);
+      while (G_UNLIKELY (res == -1 && errno == EINTR));
+      do
+        res = dup2 (journalfd, 2);
+      while (G_UNLIKELY (res == -1 && errno == EINTR));
+      (void) close (journalfd);
+    }
+}
+#endif
+
 /**
 * shell_app_launch:
 * @timestamp: Event timestamp, or 0 for current event timestamp
@ -1174,14 +1202,13 @@ shell_app_launch (ShellApp     *app,
                  int           workspace,
                  GError      **error)
 {
-  GDesktopAppInfo *gapp;
  GdkAppLaunchContext *context;
  gboolean ret;
  ShellGlobal *global;
  MetaScreen *screen;
  GdkDisplay *gdisplay;

-  if (app->entry == NULL)
+  if (app->info == NULL)
    {
      MetaWindow *window = window_backed_app_get_window (app);
      meta_window_activate (window, timestamp);
@ -1202,11 +1229,14 @@ shell_app_launch (ShellApp     *app,
  gdk_app_launch_context_set_timestamp (context, timestamp);
  gdk_app_launch_context_set_desktop (context, workspace);

-  gapp = gmenu_tree_entry_get_app_info (app->entry);
-  ret = g_desktop_app_info_launch_uris_as_manager (gapp, NULL,
+  ret = g_desktop_app_info_launch_uris_as_manager (app->info, NULL,
                                                   G_APP_LAUNCH_CONTEXT (context),
                                                   G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+#ifdef HAVE_SYSTEMD
+                                                   app_child_setup, (gpointer)shell_app_get_id (app),
+#else
                                                   NULL, NULL,
+#endif
                                                   _gather_pid_callback, app,
                                                   error);
  g_object_unref (context);
@ -1223,21 +1253,7 @@ shell_app_launch (ShellApp     *app,
 GDesktopAppInfo *
 shell_app_get_app_info (ShellApp *app)
 {
-  if (app->entry)
-    return gmenu_tree_entry_get_app_info (app->entry);
-  return NULL;
-}
-
-/**
- * shell_app_get_tree_entry:
- * @app: a #ShellApp
- *
- * Returns: (transfer none): The #GMenuTreeEntry for this app, or %NULL if backed by a window
- */
-GMenuTreeEntry *
-shell_app_get_tree_entry (ShellApp *app)
-{
-  return app->entry;
+  return app->info;
 }

 static void
@ -1352,24 +1368,22 @@ shell_app_init_search_data (ShellApp *app)
  const char *exec;
  const char * const *keywords;
  char *normalized_exec;
-  GDesktopAppInfo *appinfo;

-  appinfo = gmenu_tree_entry_get_app_info (app->entry);
-  name = g_app_info_get_name (G_APP_INFO (appinfo));
+  name = g_app_info_get_name (G_APP_INFO (app->info));
  app->casefolded_name = shell_util_normalize_casefold_and_unaccent (name);

-  generic_name = g_desktop_app_info_get_generic_name (appinfo);
+  generic_name = g_desktop_app_info_get_generic_name (app->info);
  if (generic_name)
    app->casefolded_generic_name = shell_util_normalize_casefold_and_unaccent (generic_name);
  else
    app->casefolded_generic_name = NULL;

-  exec = g_app_info_get_executable (G_APP_INFO (appinfo));
+  exec = g_app_info_get_executable (G_APP_INFO (app->info));
  normalized_exec = shell_util_normalize_casefold_and_unaccent (exec);
  app->casefolded_exec = trim_exec_line (normalized_exec);
  g_free (normalized_exec);

-  keywords = g_desktop_app_info_get_keywords (appinfo);
+  keywords = g_desktop_app_info_get_keywords (app->info);

  if (keywords)
    {
@ -1490,16 +1504,14 @@ _shell_app_do_match (ShellApp         *app,
                     GSList          **substring_results)
 {
  ShellAppSearchMatch match;
-  GAppInfo *appinfo;

  g_assert (app != NULL);

  /* Skip window-backed apps */ 
-  appinfo = (GAppInfo*)shell_app_get_app_info (app);
-  if (appinfo == NULL)
+  if (app->info == NULL)
    return;
  /* Skip not-visible apps */ 
-  if (!g_app_info_should_show (appinfo))
+  if (!g_app_info_should_show (G_APP_INFO (app->info)))
    return;

  match = _shell_app_match_search_terms (app, terms);
@ -1528,11 +1540,7 @@ shell_app_dispose (GObject *object)
 {
  ShellApp *app = SHELL_APP (object);

-  if (app->entry)
-    {
-      gmenu_tree_item_unref (app->entry);
-      app->entry = NULL;
-    }
+  g_clear_object (&app->info);

  if (app->running_state)
    {
--- a/src/shell-app.h
+++ b/src/shell-app.h
@ -4,9 +4,8 @@

 #include <clutter/clutter.h>
 #include <gio/gio.h>
+#include <gio/gdesktopappinfo.h>
 #include <meta/window.h>
-#define GMENU_I_KNOW_THIS_IS_UNSTABLE
-#include <gmenu-tree.h>

 G_BEGIN_DECLS

@ -39,7 +38,6 @@ GType shell_app_get_type (void) G_GNUC_CONST;

 const char *shell_app_get_id (ShellApp *app);

-GMenuTreeEntry *shell_app_get_tree_entry (ShellApp *app);
 GDesktopAppInfo *shell_app_get_app_info (ShellApp *app);

 ClutterActor *shell_app_create_icon_texture (ShellApp *app, int size);
--- a/src/shell-global.c
+++ b/src/shell-global.c
@ -33,6 +33,11 @@
 #include <malloc.h>
 #endif

+#ifdef __OpenBSD__
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
+
 #include "shell-enum-types.h"
 #include "shell-global-private.h"
 #include "shell-perf-log.h"
@ -283,9 +288,16 @@ shell_global_init (ShellGlobal *global)
                           NULL);
  ca_context_open (global->sound_context);

-  if (!shell_js)
-    shell_js = JSDIR;
-  search_path = g_strsplit (shell_js, ":", -1);
+  if (shell_js)
+    {
+      search_path = g_strsplit (shell_js, ":", -1);
+    }
+  else
+    {
+      search_path = g_malloc0 (2 * sizeof (char *));
+      search_path[0] = g_strdup ("resource:///org/gnome/shell");
+    }
+
  global->js_context = g_object_new (GJS_TYPE_CONTEXT,
                                     "search-path", search_path,
                                     "js-version", "1.8",
@ -1102,20 +1114,30 @@ shell_global_reexec_self (ShellGlobal *global)
  char *buf_p;
  char *buf_end;
  GError *error = NULL;
-  
-  /* Linux specific (I think, anyways). */
+
+#if defined __linux__
  if (!g_file_get_contents ("/proc/self/cmdline", &buf, &len, &error))
    {
      g_warning ("failed to get /proc/self/cmdline: %s", error->message);
      return;
    }
-      
+#elif defined __OpenBSD__
+  int pid = getpid();
+  int mib[] = { CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_ARGV };
+  if (sysctl(mib, G_N_ELEMENTS (mib), &buf, &len, NULL, 0) == -1) {
+    g_warning ("failed to get command line args: %d", errno);
+    return;
+  }
+#else
+  return;
+#endif
+  
  buf_end = buf+len;
  arr = g_ptr_array_new ();
  /* The cmdline file is NUL-separated */
  for (buf_p = buf; buf_p < buf_end; buf_p = buf_p + strlen (buf_p) + 1)
    g_ptr_array_add (arr, buf_p);
-  
+
  g_ptr_array_add (arr, NULL);

  /* Close all file descriptors other than stdin/stdout/stderr, otherwise
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@ -844,6 +844,7 @@ ShellApp *
 shell_startup_sequence_get_app (ShellStartupSequence *sequence)
 {
  const char *appid;
+  char *basename;
  ShellAppSystem *appsys;
  ShellApp *app;

@ -851,8 +852,10 @@ shell_startup_sequence_get_app (ShellStartupSequence *sequence)
  if (!appid)
    return NULL;

+  basename = g_path_get_basename (appid);
  appsys = shell_app_system_get_default ();
-  app = shell_app_system_lookup_app_for_path (appsys, appid);
+  app = shell_app_system_lookup_app (appsys, basename);
+  g_free (basename);
  return app;
 }

--- a/src/st/st-adjustment.c
+++ b/src/st/st-adjustment.c
@ -45,7 +45,7 @@ struct _StAdjustmentPrivate
 {
  /* Do not sanity-check values while constructing,
   * not all properties may be set yet. */
-  gboolean is_constructing : 1;
+  guint is_constructing : 1;

  gdouble  lower;
  gdouble  upper;
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@ -98,8 +98,8 @@ struct _StScrollViewPrivate

  StScrollViewFade *fade_effect;

-  gboolean      row_size_set : 1;
-  gboolean      column_size_set : 1;
+  guint         row_size_set : 1;
+  guint         column_size_set : 1;
  guint         mouse_scroll : 1;
  guint         overlay_scrollbars : 1;
  guint         hscrollbar_visible : 1;
--- a/src/st/st-theme.c
+++ b/src/st/st-theme.c
@ -45,10 +45,7 @@
 #include "st-theme-node.h"
 #include "st-theme-private.h"

-static GObject *st_theme_constructor (GType                  type,
-                                      guint                  n_construct_properties,
-                                      GObjectConstructParam *construct_properties);
-
+static void st_theme_constructed  (GObject      *object);
 static void st_theme_finalize     (GObject      *object);
 static void st_theme_set_property (GObject      *object,
                                   guint         prop_id,
@ -114,7 +111,7 @@ st_theme_class_init (StThemeClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);

-  object_class->constructor = st_theme_constructor;
+  object_class->constructed = st_theme_constructed;
  object_class->finalize = st_theme_finalize;
  object_class->set_property = st_theme_set_property;
  object_class->get_property = st_theme_get_property;
@ -302,21 +299,15 @@ st_theme_get_custom_stylesheets (StTheme *theme)
  return result;
 }

-static GObject *
-st_theme_constructor (GType                  type,
-                      guint                  n_construct_properties,
-                      GObjectConstructParam *construct_properties)
+static void
+st_theme_constructed (GObject *object)
 {
-  GObject *object;
-  StTheme *theme;
+  StTheme *theme = ST_THEME (object);
  CRStyleSheet *application_stylesheet;
  CRStyleSheet *theme_stylesheet;
  CRStyleSheet *default_stylesheet;

-  object = (*G_OBJECT_CLASS (st_theme_parent_class)->constructor) (type,
-                                                                      n_construct_properties,
-                                                                      construct_properties);
-  theme = ST_THEME (object);
+  G_OBJECT_CLASS (st_theme_parent_class)->constructed (object);

  application_stylesheet = parse_stylesheet_nofail (theme->application_stylesheet);
  theme_stylesheet = parse_stylesheet_nofail (theme->theme_stylesheet);
@ -332,8 +323,6 @@ st_theme_constructor (GType                  type,
  insert_stylesheet (theme, theme->application_stylesheet, application_stylesheet);
  insert_stylesheet (theme, theme->theme_stylesheet, theme_stylesheet);
  insert_stylesheet (theme, theme->default_stylesheet, default_stylesheet);
-
-  return object;
 }

 static void
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@ -59,13 +59,12 @@ struct _StWidgetPrivate

  StThemeNodeTransition *transition_animation;

-  gboolean      is_stylable : 1;
-  gboolean      is_style_dirty : 1;
-  gboolean      draw_bg_color : 1;
-  gboolean      draw_border_internal : 1;
-  gboolean      track_hover : 1;
-  gboolean      hover : 1;
-  gboolean      can_focus : 1;
+  guint is_style_dirty : 1;
+  guint draw_bg_color : 1;
+  guint draw_border_internal : 1;
+  guint track_hover : 1;
+  guint hover : 1;
+  guint can_focus : 1;

  gulong texture_file_changed_id;

@ -105,7 +104,6 @@ enum
  PROP_PSEUDO_CLASS,
  PROP_STYLE_CLASS,
  PROP_STYLE,
-  PROP_STYLABLE,
  PROP_TRACK_HOVER,
  PROP_HOVER,
  PROP_CAN_FOCUS,
@ -164,14 +162,6 @@ st_widget_set_property (GObject      *gobject,
      st_widget_set_style (actor, g_value_get_string (value));
      break;

-    case PROP_STYLABLE:
-      if (actor->priv->is_stylable != g_value_get_boolean (value))
-        {
-          actor->priv->is_stylable = g_value_get_boolean (value);
-          clutter_actor_queue_relayout ((ClutterActor *) gobject);
-        }
-      break;
-
    case PROP_TRACK_HOVER:
      st_widget_set_track_hover (actor, g_value_get_boolean (value));
      break;
@ -229,10 +219,6 @@ st_widget_get_property (GObject    *gobject,
      g_value_set_string (value, priv->inline_style);
      break;

-    case PROP_STYLABLE:
-      g_value_set_boolean (value, priv->is_stylable);
-      break;
-
    case PROP_TRACK_HOVER:
      g_value_set_boolean (value, priv->track_hover);
      break;
@ -538,12 +524,6 @@ notify_children_of_style_change (ClutterActor *self)
 static void
 st_widget_real_style_changed (StWidget *self)
 {
-  StWidgetPrivate *priv = ST_WIDGET (self)->priv;
-
-  /* application has request this widget is not stylable */
-  if (!priv->is_stylable)
-    return;
-
  clutter_actor_queue_redraw ((ClutterActor *) self);
  notify_children_of_style_change ((ClutterActor *) self);
 }
@ -929,20 +909,6 @@ st_widget_class_init (StWidgetClass *klass)
                                                        ST_TYPE_THEME,
                                                        ST_PARAM_READWRITE));

-  /**
-   * StWidget:stylable:
-   *
-   * Enable or disable styling of the widget
-   */
-  pspec = g_param_spec_boolean ("stylable",
-                                "Stylable",
-                                "Whether the table should be styled",
-                                TRUE,
-                                ST_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_STYLABLE,
-                                   pspec);
-
  /**
   * StWidget:track-hover:
   *
@ -1533,7 +1499,6 @@ st_widget_init (StWidget *actor)
  int i;

  actor->priv = priv = ST_WIDGET_GET_PRIVATE (actor);
-  priv->is_stylable = TRUE;
  priv->transition_animation = NULL;
  priv->local_state_set = atk_state_set_new ();