Bump version to 3.8.2

Update NEWS.
shellEntry: Set the input-purpose property for password entries
2013-05-14 01:33:19 +02:00 · 2013-05-14 00:40:27 +02:00 · 2013-05-14 00:40:18 +02:00 · 2013-05-14 00:40:15 +02:00 · 2013-05-14 00:40:11 +02:00 · 2013-05-14 00:34:55 +02:00
97 changed files with 4374 additions and 6903 deletions
--- a/76
+++ b/76
@ -1,9 +1,10 @@
-3.9.2
+3.8.2
 =====
-* Use a symbolic icon for DESKTOP windows [Matthias; #697914]
-* Move paint state cache into StWidget [Jasper; #697274]
+* Fix hotcorner regression in RTL locales [Jasper; #698884]
+* Allow some keybindings to work while a top bar menu is open [Florian; #698938]
+* Make open-app-menu keybinding a toggle action [Florian; #686756]
+* ctrlAltTab: Use symbolic icons for desktop windows [Matthias; #697914]
 * gdm: Fix regression where domain login hint not shown [Stef; #698200]
-* Make calendar keyboard navigable [Tanner; #667434]
 * Hide "Open Calendar" item when no calendar app is installed [Lionel; #697725]
 * Update how branding appears on login screen [Florian; #694912, #699877]
 * Allow OSD popups to grow if necessary [Marta; #696523]
@ -11,69 +12,22 @@
 * Fix insensitive button preventing empty keyring password [Stef; #696304]
 * Allow cancelling keyring dialog between prompts [Stef; #682830]
 * modalDialog: Show spinner while working [Stef; #684438]
-* overview: Only show close buttons for windows that may close [Jasper; #699269]
+* Provide a DBus API for screencasting [Florian; #696247]
+* Implement app folder keynav and shortcuts [Florian; #695314]
+* polkitAgent: Allow retrying after mistyped passwords [Stef; #684431]
 * Add input purpose and hints to StEntry and StIMText [Daiki; #691392]
 * Set input-purpose property for password entries [Rui; #700043]
-* Provide a DBus API for screencasting [Florian; #696247]
-* overview: Disable hotcorner during DND [Jasper; #698484]
-* polkitAgent: Allow retrying after mistyped passwords [Stef; #684431]
-* Add a way to get backtraces from criticals and warnings [Giovanni; #700262]
-* Allow switch-to-workspace-n keybindings in overview [Florian; #649977]
-* Update man page [Matthias; #700339]
-* Add FocusSearch DBus method [Florian; #700536]
-* Hide frequent view when app monitoring is disabled [Florian; #699714]
-* Show switcher popup for switch-to-workspace-n keybindings [Elad; #659288]
-* gdm: Update the session chooser style [Allan; #695742]
-* Fix some app folders getting truncated at the top [Florian; #694371]
-* Don't block the message tray while a notification is showing [Jasper; #700639]
-* popupMenu: Allow for an optional border for slider handle [Florian; #697917]
-* Re-lock screen when restarted after a crash [Colin; #691987]
-* Synchronize input source switching with key events [Rui; #697007]
-* Switch input source on modifiers-only accelerator [Rui; #697008]
-* Allow input source switching in message tray [Rui; #697009]
-* Misc bug fixes and cleanups [Alban, Jasper, Giovanni, Florian, Rui, Tomeu,
-  Stef, Gustavo; #698863, #699799, #699800, #676285, #699975, #700097, #698812,
-  #698486, #700194, #695314, #700257, #699678, #700356, #700322, #700394,
-  #700409, #700595, #700625, #691746, #700620, #700807, #659288, #700784,
-  #700842, #700847, #700488, #700735, #696159, #700900, #700853, #700923,
-  #700944, #697661, #700854, #700190, #699189, #701097]
+* Misc fixes and cleanups [Jasper, Florian, Giovanni, Tim, Rui; #697203,
+  #698959, #696720, #698531, #676285, #698812, #699189]

 Contributors:
-  Elad Alfassa, Alban Browaeys, Giovanni Campagna, Matthias Clasen, Allan Day,
-  Tanner Doshier, Lionel Landwerlin, Rui Matos, Simon McVittie,
-  Marta Milakovic, Florian Müllner, Gustavo Padovan, Jasper St. Pierre,
-  Daiki Ueno, Tomeu Vizoso, Stef Walter, Colin Walters
+  Giovanni Campagna, Matthias Clasen, Lionel Landwerlin, Tim Lunn, Rui Matos,
+  Simon McVittie, Marta Milakovic, Florian Müllner, Jasper St. Pierre,
+  Daiki Ueno, Stef Walter

 Translations:
-  Matej Urbančič [sl], Kjartan Maraas [nb], Victor Ibragimov [tg],
-  Dušan Kazik [sk], Gil Forcada [ca], Daniel Mustieles [es]
-
-3.9.1
-=====
-* Add additional toggle-overview keybinding [Matthias; #698251]
-* Disable <super> shortcut when sticky keys are enabled [Matthias; #685974]
-* Disable tray context menu while a notification displays [Jasper; #695800]
-* Watch GApplication busy state [Cosimo; #697207]
-* Disable style transitions if animations are disabled [Jasper; #698391]
-* Filter out hidden applications from "Frequent" view [Giovanni; #696949]
-* Fix window previews swapping place randomly [Jasper; #694469, #698776]
-* Add support for serialized GIcons in remote search providers [Cosimo; #698761]
-* Fix hotcorner regression in RTL locales [Jasper; #698884]
-* Allow some keybindings to work while a top bar menu is open [Florian; #698938]
-* Make open-app-menu keybinding a toggle action [Florian; #686756]
-* Only recognize common URL schemes in notification messages [Monica; #661225]
-* Misc fixes and cleanups [Tim, Jasper, Florian, Giovanni, Owen; #698531,
-  #698622, #698427, #698483, #698513, #697203, #698959, #698918, #699029,
-  #699075, #696720, #649748]
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Monica Chelliah, Matthias Clasen, Tim Lunn,
-  Florian Müllner, Jasper St. Pierre, Michael Wood, Owen W. Taylor
-
-Translations:
-  Fran Diéguez [gl], Muhammet Kara [tr], Daniel Mustieles [es],
-  Gil Forcada [ia], Anish A [ml], Dimitris Spingos [el], Marek Černocký [cs],
-  Žygimantas Beručka [lt]
+  Muhammet Kara [tr], Nik Kalach [ia], Žygimantas Beručka [lt],
+  Kjartan Maraas [nb]

 3.8.1
 =====
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.9.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.8.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])
@ -63,9 +63,9 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.35.4
-MUTTER_MIN_VERSION=3.9.2
+MUTTER_MIN_VERSION=3.8.2
 GTK_MIN_VERSION=3.7.9
-GIO_MIN_VERSION=2.37.0
+GIO_MIN_VERSION=2.35.0
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.5.3
 TELEPATHY_GLIB_MIN_VERSION=0.17.5
@ -74,7 +74,7 @@ STARTUP_NOTIFICATION_MIN_VERSION=0.11
 GCR_MIN_VERSION=3.3.90
 GNOME_DESKTOP_REQUIRED_VERSION=3.7.90
 GNOME_MENUS_REQUIRED_VERSION=3.5.3
-NETWORKMANAGER_MIN_VERSION=0.9.8
+NETWORKMANAGER_MIN_VERSION=0.9.6
 PULSE_MIN_VERS=2.0

 # Collect more than 20 libraries for a prize!
@ -96,7 +96,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
                               libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
                               libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
-                               libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION)
+                               libsecret-unstable gcr-3 >= $GCR_MIN_VERSION)

 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)
--- a/data/50-gnome-shell-system.xml.in
+++ b/data/50-gnome-shell-system.xml.in
@ -11,9 +11,6 @@
 	<KeyListEntry name="focus-active-notification"
                      _description="Focus the active notification"/>

-	<KeyListEntry name="toggle-overview"
-                      _description="Show the overview"/>
-
 	<KeyListEntry name="toggle-application-view"
                      _description="Show all applications"/>

--- a/data/org.gnome.ShellSearchProvider2.xml
+++ b/data/org.gnome.ShellSearchProvider2.xml
@ -46,7 +46,7 @@
    <!--
        GetResultMetas:
        @identifiers: An array of result identifiers as returned by GetInitialResultSet() or GetSubsearchResultSet()
-        @metas: A dictionary describing the given search result, containing a human-readable 'name' (string), along with the result identifier this meta is for, 'id' (string). Optionally, 'icon' (a serialized GIcon as obtained by g_icon_serialize) can be specified if the result can be better served with a thumbnail of the content (such as with images). 'gicon' (a serialized GIcon as obtained by g_icon_to_string) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) are deprecated values that can also be used for that purpose. A 'description' field (string) may also be specified if more context would help the user find the desired result.
+        @metas: A dictionary describing the given search result, containing a human-readable 'name' (string), along with the result identifier this meta is for, 'id' (string). Optionally, either 'gicon' (a serialized GIcon) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) can be specified if the result can be better served with a thumbnail of the content (such as with images). A 'description' field (string) may also be specified if more context would help the user find the desired result.

        Return an array of meta data used to display each given result
    -->
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@ -21,6 +21,16 @@
        EnableExtension and DisableExtension DBus methods on org.gnome.Shell.
      </_description>
    </key>
+    <key name="enable-app-monitoring" type="b">
+      <default>true</default>
+      <_summary>Whether to collect stats about applications usage</_summary>
+      <_description>
+        The shell normally monitors active applications in order to present
+        the most used ones (e.g. in launchers). While this data will be
+        kept private, you may want to disable this for privacy reasons.
+        Please note that doing so won't remove already saved data.
+      </_description>
+    </key>
    <key name="favorite-apps" type="as">
      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
      <_summary>List of desktop file IDs for favorite applications</_summary>
@ -107,13 +117,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
        Overview.
      </_description>
    </key>
-    <key name="toggle-overview" type="as">
-      <default>["&lt;Super&gt;s"]</default>
-      <_summary>Keybinding to open the overview</_summary>
-      <_description>
-        Keybinding to open the Activities Overview.
-      </_description>
-    </key>
    <key name="toggle-message-tray" type="as">
      <default>["&lt;Super&gt;m"]</default>
      <_summary>Keybinding to toggle the visibility of the message tray</_summary>
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -125,10 +125,6 @@ StScrollBar StButton#vhandle:active {

 /* PopupMenu */

-.popup-menu-ornament {
-    text-align: center;
-}
-
 .popup-menu-boxpointer,
 .candidate-popup-boxpointer {
    -arrow-border-radius: 8px;
@ -1188,8 +1184,7 @@ StScrollBar StButton#vhandle:active {
    background-image: url("calendar-arrow-right.svg");
 }

-.calendar-change-month-back:hover,
-.calendar-change-month-back:focus {
+.calendar-change-month-back:hover {
    background-color: #999999;
 }
 .calendar-change-month-back:active {
@ -1207,8 +1202,7 @@ StScrollBar StButton#vhandle:active {
    background-image: url("calendar-arrow-left.svg");
 }

-.calendar-change-month-forward:hover,
-.calendar-change-month-forward:focus {
+.calendar-change-month-forward:hover {
    background-color: #999999;
 }
 .calendar-change-month-forward:active {
@ -1229,8 +1223,7 @@ StScrollBar StButton#vhandle:active {
    height: 2.4em;
 }

-.calendar-day-base:hover,
-.calendar-day-base:focus {
+.calendar-day-base:hover {
    background-color: #777777;
 }

@ -2345,43 +2338,52 @@ StScrollBar StButton#vhandle:active {
    width: 15em;
 }

-.login-dialog-session-list,
-.login-dialog-session-list-item {
-    color: #babdb6;
-}
-
-.login-dialog-session-list-button:focus,
-.login-dialog-session-list-button:active,
-.login-dialog-session-list-button:hover,
-.login-dialog-session-list-item:focus,
-.login-dialog-session-list-item:hover {
-    color: white;
+.login-dialog-session-list {
+    color: #ffffff;
+    font-size: 10.5pt;
 }

 .login-dialog-session-list-button {
    padding: 4px;
 }

-.login-dialog-session-list-scroll-view {
-    padding: 6px;
+.login-dialog-session-list-button:focus {
+    background-color: #4c4c4c;
 }

-.login-dialog-session-list-item {
-    padding-bottom: 6px;
+.login-dialog-session-list-button:active {
+    background-color: #4c4c4c;
+}
+
+.login-dialog-session-list-button:hover {
+    font-weight: bold;
+}
+
+.login-dialog-session-list-scroll-view {
+    background-gradient-start: rgba(80,80,80,0.3);
+    background-gradient-end: rgba(80,80,80,0.7);
+    background-gradient-direction: vertical;
+    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9);
+    border-radius: 8px;
+    border: 1px solid rgba(80,80,80,1.0);
+    padding: .5em;
+}
+
+.login-dialog-session-list-item:focus {
+    background-color: #666666;
 }

 .login-dialog-session-list-triangle {
-    padding-right: 6px;
+    padding-right: .5em;
 }

 .login-dialog-session-list-item-box {
-    padding-left: 6px;
-    spacing: 6px;
+    spacing: .25em;
 }

 .login-dialog-session-list-item-dot {
-    width: 10px;
-    height: 10px;
+    width: .75em;
+    height: .75em;
 }

 .login-dialog-logo-bin {
@ -2450,7 +2452,6 @@ StScrollBar StButton#vhandle:active {

 .screen-shield-background {
    background: black;
-    box-shadow: 0px 4px 8px rgba(0,0,0,0.9);
 }

 #lockDialogGroup {
--- a/docs/reference/shell/shell-docs.sgml.in
+++ b/docs/reference/shell/shell-docs.sgml.in
@ -46,7 +46,6 @@
    <xi:include href="doc-gen-org.gnome.Shell.SearchProvider.xml"/>
    <xi:include href="doc-gen-org.gnome.Shell.SearchProvider2.xml"/>
    <xi:include href="xml/shell-global.xml"/>
-    <xi:include href="xml/shell-keybinding-modes.xml"/>
    <xi:include href="xml/shell-wm.xml"/>
    <xi:include href="xml/shell-xfixes-cursor.xml"/>
    <xi:include href="xml/shell-util.xml"/>
--- a/js/Makefile.am
+++ b/js/Makefile.am
@ -77,7 +77,6 @@ nobase_dist_js_DATA = 	\
 	ui/pointerWatcher.js    \
 	ui/popupMenu.js		\
 	ui/remoteSearch.js	\
-	ui/remoteMenu.js	\
 	ui/runDialog.js		\
 	ui/screencast.js	\
 	ui/screenshot.js	\
--- a/js/misc/hash.js
+++ b/js/misc/hash.js
@ -58,7 +58,6 @@ const Map = new Lang.Class({

    _init: function(iterable) {
        this._pool = { };
-        this._size = 0;

        if (iterable) {
            for (let i = 0; i < iterable.length; i++) {
@ -100,7 +99,6 @@ const Map = new Lang.Class({
            node.value = value;
        } else {
            this._pool[hash] = { key: key, value: value };
-            this._size++;
        }
    },

@ -110,7 +108,6 @@ const Map = new Lang.Class({

        if (node && _sameValue(node.key, key)) {
            delete this._pool[hash];
-            this._size--;
            return [node.key, node.value];
        } else {
            return [null, null];
@ -139,6 +136,6 @@ const Map = new Lang.Class({
    },

    size: function() {
-        return this._size;
+        return Object.getOwnPropertyNames(this._pool).length;
    },
 });
--- a/js/misc/util.js
+++ b/js/misc/util.js
@ -18,7 +18,7 @@ const _urlRegexp = new RegExp(
    '(^|' + _leadingJunk + ')' +
    '(' +
        '(?:' +
-            '(?:http|https|ftp)://' +             // scheme://
+            '[a-z][\\w-]+://' +                   // scheme://
            '|' +
            'www\\d{0,3}[.]' +                    // www.
            '|' +
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -234,7 +234,7 @@ const AppSwitcherPopup = new Lang.Class({
    _finish : function(timestamp) {
        let appIcon = this._items[this._selectedIndex];
        if (this._currentWindow < 0)
-            appIcon.app.activate_window(appIcon.cachedWindows[0], timestamp);
+            appIcon.app.activate_full(-1, timestamp);
        else
            Main.activateWindow(appIcon.cachedWindows[this._currentWindow], timestamp);

--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -187,9 +187,6 @@ const AllView = new Lang.Class({
    _init: function() {
        this.parent();

-        this._grid.actor.y_align = Clutter.ActorAlign.START;
-        this._grid.actor.y_expand = true;
-
        let box = new St.BoxLayout({ vertical: true });
        this._stack = new St.Widget({ layout_manager: new AllViewLayout() });
        this._stack.add_actor(this._grid.actor);
@ -279,12 +276,8 @@ const AllView = new Lang.Class({
                this._eventBlocker.reactive = isOpen;
                this._currentPopup = isOpen ? popup : null;
                this._updateIconOpacities(isOpen);
-                if (isOpen) {
+                if (isOpen)
                    this._ensureIconVisible(popup.actor);
-                    this._grid.actor.y = popup.parentOffset;
-                } else {
-                    this._grid.actor.y = 0;
-                }
            }));
    },

@ -323,8 +316,6 @@ const FrequentView = new Lang.Class({
    loadApps: function() {
        let mostUsed = this._usage.get_most_used ("");
        for (let i = 0; i < mostUsed.length; i++) {
-            if (!mostUsed[i].get_app_info().should_show())
-                continue;
            let appIcon = new AppIcon(mostUsed[i]);
            this._grid.addItem(appIcon.actor, -1);
        }
@ -350,9 +341,6 @@ const AppDisplay = new Lang.Class({
        global.settings.connect('changed::app-folder-categories', Lang.bind(this, function() {
            Main.queueDeferredWork(this._allAppsWorkId);
        }));
-        this._privacySettings = new Gio.Settings({ schema: 'org.gnome.desktop.privacy' });
-        this._privacySettings.connect('changed::remember-app-usage',
-                                      Lang.bind(this, this._updateFrequentVisibility));

        this._views = [];

@ -396,7 +384,6 @@ const AppDisplay = new Lang.Class({
                }));
        }
        this._showView(Views.FREQUENT);
-        this._updateFrequentVisibility();

        // We need a dummy actor to catch the keyboard focus if the
        // user Ctrl-Alt-Tabs here before the deferred work creates
@ -426,19 +413,6 @@ const AppDisplay = new Lang.Class({
        }
    },

-    _updateFrequentVisibility: function() {
-        let enabled = this._privacySettings.get_boolean('remember-app-usage');
-        this._views[Views.FREQUENT].control.visible = enabled;
-
-        let visibleViews = this._views.filter(function(v) {
-            return v.control.visible;
-        });
-        this._controls.visible = visibleViews.length > 1;
-
-        if (!enabled && this._views[Views.FREQUENT].view.actor.visible)
-            this._showView(Views.ALL);
-    },
-
    _redisplay: function() {
        this._redisplayFrequentApps();
        this._redisplayAllApps();
@ -598,11 +572,7 @@ const FolderIcon = new Lang.Class({
        // Position the popup above or below the source icon
        if (side == St.Side.BOTTOM) {
            this._popup.actor.show();
-            let closeButtonOffset = -this._popup.closeButton.translation_y;
-            let y = this.actor.y - this._popup.actor.height;
-            let yWithButton = y - closeButtonOffset;
-            this._popup.parentOffset = yWithButton < 0 ? -yWithButton : 0;
-            this._popup.actor.y = Math.max(y, closeButtonOffset);
+            this._popup.actor.y = this.actor.y - this._popup.actor.height;
            this._popup.actor.hide();
        } else {
            this._popup.actor.y = this.actor.y + this.actor.height;
@ -625,7 +595,6 @@ const AppFolderPopup = new Lang.Class({
        this._arrowSide = side;

        this._isOpen = false;
-        this.parentOffset = 0;

        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                     visible: false,
@ -649,11 +618,11 @@ const AppFolderPopup = new Lang.Class({
        this.actor.add_actor(this._boxPointer.actor);
        this._boxPointer.bin.set_child(this._view.actor);

-        this.closeButton = Util.makeCloseButton();
-        this.closeButton.connect('clicked', Lang.bind(this, this.popdown));
-        this.actor.add_actor(this.closeButton);
+        let closeButton = Util.makeCloseButton();
+        closeButton.connect('clicked', Lang.bind(this, this.popdown));
+        this.actor.add_actor(closeButton);

-        this._boxPointer.actor.bind_property('opacity', this.closeButton, 'opacity',
+        this._boxPointer.actor.bind_property('opacity', closeButton, 'opacity',
                                             GObject.BindingFlags.SYNC_CREATE);

        global.focus_manager.add_group(this.actor);
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -443,18 +443,16 @@ const Calendar = new Lang.Class({
        this.actor.add(this._topBox,
                       { row: 0, col: 0, col_span: offsetCols + 7 });

-        this._backButton = new St.Button({ style_class: 'calendar-change-month-back',
-                                           can_focus: true });
-        this._topBox.add(this._backButton);
-        this._backButton.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
+        let back = new St.Button({ style_class: 'calendar-change-month-back' });
+        this._topBox.add(back);
+        back.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));

        this._monthLabel = new St.Label({style_class: 'calendar-month-label'});
        this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });

-        this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward',
-                                              can_focus: true });
-        this._topBox.add(this._forwardButton);
-        this._forwardButton.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));
+        let forward = new St.Button({ style_class: 'calendar-change-month-forward' });
+        this._topBox.add(forward);
+        forward.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));

        // Add weekday labels...
        //
@ -513,12 +511,10 @@ const Calendar = new Lang.Class({
            }
        }

-        this._backButton.grab_key_focus();
-
        this.setDate(newDate, false);
-    },
+   },

-    _onNextMonthButtonClicked: function() {
+   _onNextMonthButtonClicked: function() {
        let newDate = new Date(this._selectedDate);
        let oldMonth = newDate.getMonth();
        if (oldMonth == 11) {
@ -537,9 +533,7 @@ const Calendar = new Lang.Class({
            }
        }

-        this._forwardButton.grab_key_focus();
-
-        this.setDate(newDate, false);
+       this.setDate(newDate, false);
    },

    _onSettingsChange: function() {
@ -596,8 +590,7 @@ const Calendar = new Lang.Class({
        // nRows here means 6 weeks + one header + one navbar
        let nRows = 8;
        while (row < 8) {
-            let button = new St.Button({ label: iter.getDate().toString(),
-                                         can_focus: true });
+            let button = new St.Button({ label: iter.getDate().toString() });
            let rtl = button.get_text_direction() == Clutter.TextDirection.RTL;

            if (this._eventSource.isDummy)
@ -605,12 +598,8 @@ const Calendar = new Lang.Class({

            let iterStr = iter.toUTCString();
            button.connect('clicked', Lang.bind(this, function() {
-                this._shouldDateGrabFocus = true;
-
                let newlySelectedDate = new Date(iterStr);
                this.setDate(newlySelectedDate, false);
-
-                this._shouldDateGrabFocus = false;
            }));

            let hasEvents = this._eventSource.hasEvents(iter);
@ -635,6 +624,9 @@ const Calendar = new Lang.Class({
            else if (iter.getMonth() != this._selectedDate.getMonth())
                styleClass += ' calendar-other-month-day';

+            if (_sameDay(this._selectedDate, iter))
+                button.add_style_pseudo_class('active');
+
            if (hasEvents)
                styleClass += ' calendar-day-with-events'

@ -644,13 +636,6 @@ const Calendar = new Lang.Class({
            this.actor.add(button,
                           { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7 });

-            if (_sameDay(this._selectedDate, iter)) {
-                button.add_style_pseudo_class('active');
-
-                if (this._shouldDateGrabFocus)
-                    button.grab_key_focus();
-            }
-
            if (this._useWeekdate && iter.getDay() == 4) {
                let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
                                           style_class: 'calendar-day-base calendar-week-number'});
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@ -61,7 +61,8 @@ const CtrlAltTabManager = new Lang.Class({
        if (item.focusCallback) {
            item.focusCallback(timestamp);
        } else {
-            if (global.stage_input_mode == Shell.StageInputMode.NORMAL)
+            if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
+                global.stage_input_mode == Shell.StageInputMode.NORMAL)
                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);

            item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@ -49,6 +49,11 @@ const DateMenuButton = new Lang.Class({
            menuAlignment = 1.0 - menuAlignment;
        this.parent(menuAlignment);

+        // At this moment calendar menu is not keyboard navigable at
+        // all (so not accessible), so it doesn't make sense to set as
+        // role ATK_ROLE_MENU like other elements of the panel.
+        this.actor.accessible_role = Atk.Role.LABEL;
+
        this._clockDisplay = new St.Label();
        this.actor.add_actor(this._clockDisplay);

@ -85,10 +90,12 @@ const DateMenuButton = new Lang.Class({

        this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
        this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
+        this._openCalendarItem.actor.can_focus = false;
        vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});

        this._openClocksItem = new PopupMenu.PopupMenuItem(_("Open Clocks"));
        this._openClocksItem.connect('activate', Lang.bind(this, this._onOpenClocksActivate));
+        this._openClocksItem.actor.can_focus = false;
        vbox.add(this._openClocksItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});

        Shell.AppSystem.get_default().connect('installed-changed',
@ -97,6 +104,7 @@ const DateMenuButton = new Lang.Class({
        item = this.menu.addSettingsAction(_("Date & Time Settings"), 'gnome-datetime-panel.desktop');
        if (item) {
            item.actor.show_on_set_parent = false;
+            item.actor.can_focus = false;
            item.actor.reparent(vbox);
            this._dateAndTimeSeparator = separator;
        }
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -43,7 +43,9 @@ let dragMonitors = [];

 function _getEventHandlerActor() {
    if (!eventHandlerActor) {
-        eventHandlerActor = new Clutter.Actor({ width: 0, height: 0 });
+        eventHandlerActor = new Clutter.Rectangle();
+        eventHandlerActor.width = 0;
+        eventHandlerActor.height = 0;
        Main.uiGroup.add_actor(eventHandlerActor);
        // We connect to 'event' rather than 'captured-event' because the capturing phase doesn't happen
        // when you've grabbed the pointer.
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -292,7 +292,7 @@ function disableAllExtensions() {
        return;

    if (initted) {
-        extensionOrder.slice().reverse().forEach(function(uuid) {
+        enabledExtensions.forEach(function(uuid) {
            disableExtension(uuid);
        });
    }
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@ -211,8 +211,10 @@ const GrabHelper = new Lang.Class({
            this._grabbedFromKeynav = hadFocus;
            this._preGrabInputMode = global.stage_input_mode;

-            if (this._preGrabInputMode == Shell.StageInputMode.NORMAL)
+            if (this._preGrabInputMode == Shell.StageInputMode.NONREACTIVE ||
+                this._preGrabInputMode == Shell.StageInputMode.NORMAL) {
                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+            }

            this._keyFocusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
            this._focusWindowChangedId = metaDisplay.connect('notify::focus-window', Lang.bind(this, this._focusWindowChanged));
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@ -118,25 +118,10 @@ const MonitorConstraint = new Lang.Class({
    }
 });

-const Monitor = new Lang.Class({
-    Name: 'Monitor',
-
-    _init: function(index, geometry) {
-        this.index = index;
-        this.x = geometry.x;
-        this.y = geometry.y;
-        this.width = geometry.width;
-        this.height = geometry.height;
-    },
-
-    get inFullscreen() {
-        return global.screen.get_monitor_in_fullscreen(this.index);
-    }
-})
-
 const defaultParams = {
    trackFullscreen: false,
    affectsStruts: false,
+    affectsInputRegion: true
 };

 const LayoutManager = new Lang.Class({
@ -188,12 +173,10 @@ const LayoutManager = new Lang.Class({
        global.stage.remove_actor(global.window_group);
        this.uiGroup.add_actor(global.window_group);

+        global.stage.remove_actor(global.overlay_group);
+        this.uiGroup.add_actor(global.overlay_group);
        global.stage.add_child(this.uiGroup);

-        this.overviewGroup = new St.Widget({ name: 'overviewGroup',
-                                             visible: false });
-        this.addChrome(this.overviewGroup);
-
        this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',
                                                 visible: false,
                                                 clip_to_allocation: true,
@ -244,24 +227,24 @@ const LayoutManager = new Lang.Class({
        this._monitorsChanged();
    },

-    // This is called by Main after everything else is constructed
+    // This is called by Main after everything else is constructed;
+    // it needs access to Main.overview, which didn't exist
+    // yet when the LayoutManager was constructed.
    init: function() {
+        Main.overview.connect('showing', Lang.bind(this, this._overviewShowing));
+        Main.overview.connect('hidden', Lang.bind(this, this._overviewHidden));
        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));

-        this._loadBackground();
+        this._prepareStartupAnimation();
    },

-    showOverview: function() {
-        this.overviewGroup.show();
-
+    _overviewShowing: function() {
        this._inOverview = true;
        this._updateVisibility();
        this._queueUpdateRegions();
    },

-    hideOverview: function() {
-        this.overviewGroup.hide();
-
+    _overviewHidden: function() {
        this._inOverview = false;
        this._updateVisibility();
        this._queueUpdateRegions();
@ -278,7 +261,7 @@ const LayoutManager = new Lang.Class({
        this.monitors = [];
        let nMonitors = screen.get_n_monitors();
        for (let i = 0; i < nMonitors; i++)
-            this.monitors.push(new Monitor(i, screen.get_monitor_geometry(i)));
+            this.monitors.push(screen.get_monitor_geometry(i));

        if (nMonitors == 1) {
            this.primaryIndex = this.bottomIndex = 0;
@ -300,10 +283,8 @@ const LayoutManager = new Lang.Class({

    _updateHotCorners: function() {
        // destroy old hot corners
-        this.hotCorners.forEach(function(corner) {
-            if (corner)
-                corner.destroy();
-        });
+        for (let i = 0; i < this.hotCorners.length; i++)
+            this.hotCorners[i].destroy();
        this.hotCorners = [];

        let size = this.panelBox.height;
@ -314,9 +295,9 @@ const LayoutManager = new Lang.Class({
            let cornerX = this._rtl ? monitor.x + monitor.width : monitor.x;
            let cornerY = monitor.y;

-            let haveTopLeftCorner = true;
-
            if (i != this.primaryIndex) {
+                let haveTopLeftCorner = true;
+
                // Check if we have a top left (right for RTL) corner.
                // I.e. if there is no monitor directly above or to the left(right)
                let besideX = this._rtl ? monitor.x + 1 : cornerX - 1;
@ -343,15 +324,14 @@ const LayoutManager = new Lang.Class({
                        break;
                    }
                }
+
+                if (!haveTopLeftCorner)
+                    continue;
            }

-            if (haveTopLeftCorner) {
-                let corner = new HotCorner(this, monitor, cornerX, cornerY);
-                corner.setBarrierSize(size);
-                this.hotCorners.push(corner);
-            } else {
-                this.hotCorners.push(null);
-            }
+            let corner = new HotCorner(this, monitor, cornerX, cornerY);
+            corner.setBarrierSize(size);
+            this.hotCorners.push(corner);
        }

        this.emit('hot-corners-changed');
@ -428,8 +408,7 @@ const LayoutManager = new Lang.Class({

        let size = this.panelBox.height;
        this.hotCorners.forEach(function(corner) {
-            if (corner)
-                corner.setBarrierSize(size);
+            corner.setBarrierSize(size);
        });
    },

@ -557,25 +536,6 @@ const LayoutManager = new Lang.Class({
        return this._keyboardIndex;
    },

-    _loadBackground: function() {
-        this._systemBackground = new Background.SystemBackground();
-        this._systemBackground.actor.hide();
-
-        global.stage.insert_child_below(this._systemBackground.actor, null);
-
-        let constraint = new Clutter.BindConstraint({ source: global.stage,
-                                                      coordinate: Clutter.BindCoordinate.ALL });
-        this._systemBackground.actor.add_constraint(constraint);
-
-        let signalId = this._systemBackground.connect('loaded', Lang.bind(this, function() {
-            this._systemBackground.disconnect(signalId);
-            this._systemBackground.actor.show();
-            global.stage.show();
-
-            this._prepareStartupAnimation();
-        }));
-    },
-
    // Startup Animations
    //
    // We have two different animations, depending on whether we're a greeter
@ -621,18 +581,35 @@ const LayoutManager = new Lang.Class({
            global.window_group.set_clip(monitor.x, monitor.y, monitor.width, monitor.height);
        }

-        this.emit('startup-prepared');
+        this._systemBackground = new Background.SystemBackground();
+        this._systemBackground.actor.hide();

-        // We're mostly prepared for the startup animation
-        // now, but since a lot is going on asynchronously
-        // during startup, let's defer the startup animation
-        // until the event loop is uncontended and idle.
-        // This helps to prevent us from running the animation
-        // when the system is bogged down
-        GLib.idle_add(GLib.PRIORITY_LOW, Lang.bind(this, function() {
-            this._startupAnimation();
-            return false;
-        }));
+        global.stage.insert_child_below(this._systemBackground.actor, null);
+
+        let constraint = new Clutter.BindConstraint({ source: global.stage,
+                                                      coordinate: Clutter.BindCoordinate.ALL });
+        this._systemBackground.actor.add_constraint(constraint);
+
+        let signalId = this._systemBackground.connect('loaded',
+                                                      Lang.bind(this, function() {
+                                                          this._systemBackground.disconnect(signalId);
+                                                          this._systemBackground.actor.show();
+                                                          global.stage.show();
+
+                                                          this.emit('startup-prepared');
+
+                                                          // We're mostly prepared for the startup animation
+                                                          // now, but since a lot is going on asynchronously
+                                                          // during startup, let's defer the startup animation
+                                                          // until the event loop is uncontended and idle.
+                                                          // This helps to prevent us from running the animation
+                                                          // when the system is bogged down
+                                                          GLib.idle_add(GLib.PRIORITY_LOW,
+                                                                        Lang.bind(this, function() {
+                                                                            this._startupAnimation();
+                                                                            return false;
+                                                                        }));
+                                                      }));
    },

    _startupAnimation: function() {
@ -689,6 +666,7 @@ const LayoutManager = new Lang.Class({
    },

    showKeyboard: function () {
+        this.keyboardBox.raise_top();
        Tweener.addTween(this.keyboardBox,
                         { anchor_y: this.keyboardBox.height,
                           time: KEYBOARD_ANIMATION_TIME,
@ -733,10 +711,11 @@ const LayoutManager = new Lang.Class({
    // @actor: an actor to add to the chrome
    // @params: (optional) additional params
    //
-    // Adds @actor to the chrome, and extends the input region
-    // to include it. Changes in @actor's size, position, and
-    // visibility will automatically result in appropriate changes
-    // to the input region.
+    // Adds @actor to the chrome, and (unless %affectsInputRegion in
+    // @params is %false) extends the input region to include it.
+    // Changes in @actor's size, position, and visibility will
+    // automatically result in appropriate changes to the input
+    // region.
    //
    // If %affectsStruts in @params is %true (and @actor is along a
    // screen edge), then @actor's size and position will also affect
@ -921,8 +900,13 @@ const LayoutManager = new Lang.Class({
    },

    _updateFullscreen: function() {
+        for (let i = 0; i < this.monitors.length; i++)
+            this.monitors[i].inFullscreen = global.screen.get_monitor_in_fullscreen (i);
+
        this._updateVisibility();
        this._queueUpdateRegions();
+
+        this.emit('fullscreen-changed');
    },

    _windowsRestacked: function() {
@ -950,7 +934,7 @@ const LayoutManager = new Lang.Class({

        for (i = 0; i < this._trackedActors.length; i++) {
            let actorData = this._trackedActors[i];
-            if (!wantsInputRegion && !actorData.affectsStruts)
+            if (!(actorData.affectsInputRegion && wantsInputRegion) && !actorData.affectsStruts)
                continue;

            let [x, y] = actorData.actor.get_transformed_position();
@ -960,8 +944,13 @@ const LayoutManager = new Lang.Class({
            w = Math.round(w);
            h = Math.round(h);

-            if (wantsInputRegion && actorData.actor.get_paint_visibility())
-                rects.push(new Meta.Rectangle({ x: x, y: y, width: w, height: h }));
+            if (actorData.affectsInputRegion && wantsInputRegion) {
+                let rect = new Meta.Rectangle({ x: x, y: y, width: w, height: h});
+
+                if (actorData.actor.get_paint_visibility() &&
+                    !this.uiGroup.get_skip_paint(actorData.actor))
+                    rects.push(rect);
+            }

            if (actorData.affectsStruts) {
                // Limit struts to the size of the screen
@ -1132,11 +1121,11 @@ const HotCorner = new Lang.Class({
                                             height: 3,
                                             reactive: true });

-            this._corner = new Clutter.Actor({ name: 'hot-corner',
-                                               width: 1,
-                                               height: 1,
-                                               opacity: 0,
-                                               reactive: true });
+            this._corner = new Clutter.Rectangle({ name: 'hot-corner',
+                                                   width: 1,
+                                                   height: 1,
+                                                   opacity: 0,
+                                                   reactive: true });
            this._corner._delegate = this;

            this.actor.add_child(this._corner);
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -308,6 +308,10 @@ const Result = new Lang.Class({
        box.add(resultTxt);
        let objLink = new ObjLink(this._lookingGlass, o);
        box.add(objLink.actor);
+        let line = new Clutter.Rectangle({ name: 'Separator' });
+        let padBin = new St.Bin({ name: 'Separator', x_fill: true, y_fill: true });
+        padBin.add_actor(line);
+        this.actor.add(padBin);
    }
 });

@ -985,18 +989,28 @@ const LookingGlass = new Lang.Class({

    _showCompletions: function(completions) {
        if (!this._completionActor) {
-            this._completionActor = new St.Label({ name: 'LookingGlassAutoCompletionText', style_class: 'lg-completions-text' });
-            this._completionActor.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            this._completionActor.clutter_text.line_wrap = true;
+            let actor = new St.BoxLayout({ vertical: true });
+
+            this._completionText = new St.Label({ name: 'LookingGlassAutoCompletionText', style_class: 'lg-completions-text' });
+            this._completionText.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+            this._completionText.clutter_text.line_wrap = true;
+            actor.add(this._completionText);
+
+            let line = new Clutter.Rectangle();
+            let padBin = new St.Bin({ x_fill: true, y_fill: true });
+            padBin.add_actor(line);
+            actor.add(padBin);
+
+            this._completionActor = actor;
            this._evalBox.insert_child_below(this._completionActor, this._entryArea);
        }

-        this._completionActor.set_text(completions.join(', '));
+        this._completionText.set_text(completions.join(', '));

        // Setting the height to -1 allows us to get its actual preferred height rather than
        // whatever was last given in set_height by Tweener.
        this._completionActor.set_height(-1);
-        let [minHeight, naturalHeight] = this._completionActor.get_preferred_height(this._resultsArea.get_width());
+        let [minHeight, naturalHeight] = this._completionText.get_preferred_height(this._resultsArea.get_width());

        // Don't reanimate if we are already visible
        if (this._completionActor.visible) {
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -38,11 +38,9 @@ const Magnifier = imports.ui.magnifier;
 const XdndHandler = imports.ui.xdndHandler;
 const Util = imports.misc.util;

+const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
 const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);

-const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
-const STICKY_KEYS_ENABLE = 'stickykeys-enable';
-
 let componentManager = null;
 let panel = null;
 let overview = null;
@ -70,7 +68,7 @@ let layoutManager = null;
 let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
-let _a11ySettings = null;
+let _overridesSettings = null;

 function _sessionUpdated() {
    _loadDefaultStylesheet();
@ -125,9 +123,11 @@ function _initializeUI() {
    // and recalculate application associations, so to avoid
    // races for now we initialize it here.  It's better to
    // be predictable anyways.
-    Shell.WindowTracker.get_default();
+    let tracker = Shell.WindowTracker.get_default();
    Shell.AppUsage.get_default();

+    tracker.connect('startup-sequence-changed', _queueCheckWorkspaces);
+
    _loadDefaultStylesheet();

    // Setup the stage hierarchy early
@ -157,12 +157,9 @@ function _initializeUI() {
    layoutManager.init();
    overview.init();

-    _a11ySettings = new Gio.Settings({ schema: A11Y_SCHEMA });
-
-    global.display.connect('overlay-key', Lang.bind(overview, function () {
-        if (!_a11ySettings.get_boolean (STICKY_KEYS_ENABLE))
-            overview.toggle();
-    }));
+    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
+                                            false, -1, 1);
+    global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));

    // Provide the bus object for gnome-session to
    // initiate logouts.
@ -182,6 +179,17 @@ function _initializeUI() {
        Scripting.runPerfScript(module, perfOutput);
    }

+    _overridesSettings = new Gio.Settings({ schema: OVERRIDES_SCHEMA });
+    _overridesSettings.connect('changed::dynamic-workspaces', _queueCheckWorkspaces);
+
+    global.screen.connect('notify::n-workspaces', _nWorkspacesChanged);
+
+    global.screen.connect('window-entered-monitor', _windowEnteredMonitor);
+    global.screen.connect('window-left-monitor', _windowLeftMonitor);
+    global.screen.connect('restacked', _windowsRestacked);
+
+    _nWorkspacesChanged();
+
    ExtensionDownloader.init();
    ExtensionSystem.init();

@ -195,12 +203,190 @@ function _initializeUI() {
                              if (keybindingMode == Shell.KeyBindingMode.NONE) {
                                  keybindingMode = Shell.KeyBindingMode.NORMAL;
                              }
-                              if (screenShield) {
-                                  screenShield.lockIfWasLocked();
-                              }
                          });
 }

+let _workspaces = [];
+let _checkWorkspacesId = 0;
+
+/*
+ * When the last window closed on a workspace is a dialog or splash
+ * screen, we assume that it might be an initial window shown before
+ * the main window of an application, and give the app a grace period
+ * where it can map another window before we remove the workspace.
+ */
+const LAST_WINDOW_GRACE_TIME = 1000;
+
+function _checkWorkspaces() {
+    let i;
+    let emptyWorkspaces = [];
+
+    if (!Meta.prefs_get_dynamic_workspaces()) {
+        _checkWorkspacesId = 0;
+        return false;
+    }
+
+    for (i = 0; i < _workspaces.length; i++) {
+        let lastRemoved = _workspaces[i]._lastRemovedWindow;
+        if ((lastRemoved &&
+             (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
+              lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
+              lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
+            _workspaces[i]._keepAliveId)
+                emptyWorkspaces[i] = false;
+        else
+            emptyWorkspaces[i] = true;
+    }
+
+    let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
+    for (i = 0; i < sequences.length; i++) {
+        let index = sequences[i].get_workspace();
+        if (index >= 0 && index <= global.screen.n_workspaces)
+            emptyWorkspaces[index] = false;
+    }
+
+    let windows = global.get_window_actors();
+    for (i = 0; i < windows.length; i++) {
+        let win = windows[i];
+
+        if (win.get_meta_window().is_on_all_workspaces())
+            continue;
+
+        let workspaceIndex = win.get_workspace();
+        emptyWorkspaces[workspaceIndex] = false;
+    }
+
+    // If we don't have an empty workspace at the end, add one
+    if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
+        global.screen.append_new_workspace(false, global.get_current_time());
+        emptyWorkspaces.push(false);
+    }
+
+    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+    let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] &&
+                                    activeWorkspaceIndex < emptyWorkspaces.length - 1);
+    // Don't enter the overview when removing multiple empty workspaces at startup
+    let showOverview  = (removingCurrentWorkspace &&
+                         !emptyWorkspaces.every(function(x) { return x; }));
+
+    if (removingCurrentWorkspace) {
+        // "Merge" the empty workspace we are removing with the one at the end
+        wm.blockAnimations();
+    }
+
+    // Delete other empty workspaces; do it from the end to avoid index changes
+    for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
+        if (emptyWorkspaces[i])
+            global.screen.remove_workspace(_workspaces[i], global.get_current_time());
+    }
+
+    if (removingCurrentWorkspace) {
+        global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
+        wm.unblockAnimations();
+
+        if (!overview.visible && showOverview)
+            overview.show();
+    }
+
+    _checkWorkspacesId = 0;
+    return false;
+}
+
+function keepWorkspaceAlive(workspace, duration) {
+    if (workspace._keepAliveId)
+        Mainloop.source_remove(workspace._keepAliveId);
+
+    workspace._keepAliveId = Mainloop.timeout_add(duration, function() {
+        workspace._keepAliveId = 0;
+        _queueCheckWorkspaces();
+        return false;
+    });
+}
+
+function _windowRemoved(workspace, window) {
+    workspace._lastRemovedWindow = window;
+    _queueCheckWorkspaces();
+    Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, function() {
+        if (workspace._lastRemovedWindow == window) {
+            workspace._lastRemovedWindow = null;
+            _queueCheckWorkspaces();
+        }
+        return false;
+    });
+}
+
+function _windowLeftMonitor(metaScreen, monitorIndex, metaWin) {
+    // If the window left the primary monitor, that
+    // might make that workspace empty
+    if (monitorIndex == layoutManager.primaryIndex)
+        _queueCheckWorkspaces();
+}
+
+function _windowEnteredMonitor(metaScreen, monitorIndex, metaWin) {
+    // If the window entered the primary monitor, that
+    // might make that workspace non-empty
+    if (monitorIndex == layoutManager.primaryIndex)
+        _queueCheckWorkspaces();
+}
+
+function _windowsRestacked() {
+    // Figure out where the pointer is in case we lost track of
+    // it during a grab. (In particular, if a trayicon popup menu
+    // is dismissed, see if we need to close the message tray.)
+    global.sync_pointer();
+}
+
+function _queueCheckWorkspaces() {
+    if (_checkWorkspacesId == 0)
+        _checkWorkspacesId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, _checkWorkspaces);
+}
+
+function _nWorkspacesChanged() {
+    let oldNumWorkspaces = _workspaces.length;
+    let newNumWorkspaces = global.screen.n_workspaces;
+
+    if (oldNumWorkspaces == newNumWorkspaces)
+        return false;
+
+    let lostWorkspaces = [];
+    if (newNumWorkspaces > oldNumWorkspaces) {
+        let w;
+
+        // Assume workspaces are only added at the end
+        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++)
+            _workspaces[w] = global.screen.get_workspace_by_index(w);
+
+        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
+            let workspace = _workspaces[w];
+            workspace._windowAddedId = workspace.connect('window-added', _queueCheckWorkspaces);
+            workspace._windowRemovedId = workspace.connect('window-removed', _windowRemoved);
+        }
+
+    } 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 workspace = global.screen.get_workspace_by_index(w);
+            if (_workspaces[w] != workspace) {
+                removedIndex = w;
+                break;
+            }
+        }
+
+        let lostWorkspaces = _workspaces.splice(removedIndex, removedNum);
+        lostWorkspaces.forEach(function(workspace) {
+                                   workspace.disconnect(workspace._windowAddedId);
+                                   workspace.disconnect(workspace._windowRemovedId);
+                               });
+    }
+
+    _queueCheckWorkspaces();
+
+    return false;
+}
+
 function _loadDefaultStylesheet() {
    if (!sessionMode.isPrimary)
        return;
@ -251,8 +437,7 @@ function loadTheme() {
    if (_cssStylesheet != null)
        cssStylesheet = _cssStylesheet;

-    let theme = new St.Theme ({ application_stylesheet: cssStylesheet,
-                                default_stylesheet: _defaultCssStylesheet });
+    let theme = new St.Theme ({ application_stylesheet: cssStylesheet });

    if (previousTheme) {
        let customStylesheets = previousTheme.get_custom_stylesheets();
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -1530,7 +1530,11 @@ const MessageTrayContextMenu = new Lang.Class({
    },

    _updateClearSensitivity: function() {
-        this._clearItem.setSensitive(this._tray.clearableCount > 0);
+        let sources = this._tray.getSources();
+        sources = sources.filter(function(source) {
+            return !source.trayIcon && !source.isChat && !source.resident;
+        });
+        this._clearItem.setSensitive(sources.length > 0);
    },

    setPosition: function(x, y) {
@ -1553,22 +1557,23 @@ const MessageTray = new Lang.Class({

        this.actor = new St.Widget({ name: 'message-tray',
                                     reactive: true,
+                                     track_hover: true,
                                     layout_manager: new Clutter.BinLayout(),
                                     x_expand: true,
                                     y_expand: true,
                                     y_align: Clutter.ActorAlign.START,
                                   });
+        this.actor.connect('notify::hover', Lang.bind(this, this._onTrayHoverChanged));

        this._notificationWidget = new St.Widget({ name: 'notification-container',
-                                                   reactive: true,
-                                                   track_hover: true,
                                                   y_align: Clutter.ActorAlign.START,
                                                   x_align: Clutter.ActorAlign.CENTER,
                                                   y_expand: true,
                                                   x_expand: true,
                                                   layout_manager: new Clutter.BinLayout() });
        this._notificationWidget.connect('key-release-event', Lang.bind(this, this._onNotificationKeyRelease));
-        this._notificationWidget.connect('notify::hover', Lang.bind(this, this._onNotificationHoverChanged));
+
+        this.actor.add_actor(this._notificationWidget);

        this._notificationBin = new St.Bin({ y_expand: true });
        this._notificationBin.set_y_align(Clutter.ActorAlign.START);
@ -1623,25 +1628,24 @@ const MessageTray = new Lang.Class({
                                                     { keybindingMode: Shell.KeyBindingMode.MESSAGE_TRAY });
        this._grabHelper.addActor(this._summaryBoxPointer.actor);
        this._grabHelper.addActor(this.actor);
-        this._grabHelper.addActor(this._notificationWidget);

        Main.layoutManager.connect('keyboard-visible-changed', Lang.bind(this, this._onKeyboardVisibleChanged));

        this._trayState = State.HIDDEN;
        this._traySummoned = false;
-        this._useLongerNotificationLeftTimeout = false;
+        this._useLongerTrayLeftTimeout = false;
        this._trayLeftTimeoutId = 0;

-        // pointerInNotification is sort of a misnomer -- it tracks whether
+        // pointerInTray is sort of a misnomer -- it tracks whether
        // a message tray notification should expand. The value is
-        // partially driven by the hover state of the notification, but has
+        // partially driven by the hover state of the tray, but has
        // a lot of complex state related to timeouts and the current
        // state of the pointer when a notification pops up.
-        this._pointerInNotification = false;
+        this._pointerInTray = false;

-        // This tracks this._notificationWidget.hover and is used to fizzle
-        // out non-changing hover notifications in onNotificationHoverChanged.
-        this._notificationHovered = false;
+        // This tracks this.actor.hover and is used to fizzle
+        // out non-changing hover notifications in onTrayHoverChanged.
+        this._trayHovered = false;

        this._keyboardVisible = false;
        this._notificationClosed = false;
@ -1653,29 +1657,23 @@ const MessageTray = new Lang.Class({
        this._desktopCloneState = State.HIDDEN;
        this._notificationRemoved = false;
        this._reNotifyAfterHideNotification = null;
+        this._inFullscreen = false;
        this._desktopClone = null;
        this._inCtrlAltTab = false;

-        this.clearableCount = 0;
-
-        this._lightboxes = [];
-        let lightboxContainers = [global.window_group,
-                                  Main.layoutManager.overviewGroup];
-        for (let i = 0; i < lightboxContainers.length; i++)
-            this._lightboxes.push(new Lightbox.Lightbox(lightboxContainers[i],
-                                                        { inhibitEvents: true,
-                                                          fadeInTime: ANIMATION_TIME,
-                                                          fadeOutTime: ANIMATION_TIME,
-                                                          fadeFactor: 0.2
-                                                        }));
+        this._lightbox = new Lightbox.Lightbox(global.overlay_group,
+                                               { inhibitEvents: true,
+                                                 fadeInTime: ANIMATION_TIME,
+                                                 fadeOutTime: ANIMATION_TIME,
+                                                 fadeFactor: 0.2
+                                               });

        Main.layoutManager.trayBox.add_actor(this.actor);
-        Main.layoutManager.trayBox.add_actor(this._notificationWidget);
        Main.layoutManager.trackChrome(this.actor);
        Main.layoutManager.trackChrome(this._notificationWidget);
        Main.layoutManager.trackChrome(this._closeButton);

-        global.screen.connect('in-fullscreen-changed', Lang.bind(this, this._updateState));
+        Main.layoutManager.connect('fullscreen-changed', Lang.bind(this, this._updateState));
        Main.layoutManager.connect('hot-corners-changed', Lang.bind(this, this._hotCornersChanged));

        // If the overview shows or hides while we're in
@ -1723,6 +1721,9 @@ const MessageTray = new Lang.Class({
        this.actor.add_action(clickAction);

        clickAction.connect('clicked', Lang.bind(this, function(action) {
+            if (this._trayState != State.SHOWN)
+                return;
+
            let button = action.get_button();
            if (button == 3)
                this._openContextMenu();
@ -1733,7 +1734,7 @@ const MessageTray = new Lang.Class({
        clickAction.connect('long-press', Lang.bind(this, function(action, actor, state) {
            switch (state) {
            case Clutter.LongPressState.QUERY:
-                return true;
+                return this._trayState == State.SHOWN;
            case Clutter.LongPressState.ACTIVATE:
                this._openContextMenu();
            }
@ -1749,7 +1750,7 @@ const MessageTray = new Lang.Class({
        let [x, y, mask] = global.get_pointer();
        this._contextMenu.setPosition(Math.round(x), Math.round(y));
        this._grabHelper.grab({ actor: this._contextMenu.actor,
-                                modal: true,
+                                grabFocus: true,
                                onUngrab: Lang.bind(this, function () {
                                    this._contextMenu.close(BoxPointer.PopupAnimation.FULL);
                                })
@ -1795,12 +1796,12 @@ const MessageTray = new Lang.Class({
                           y == monitor.y + monitor.height - 1);
        if (shouldDwell) {
            // We only set up dwell timeout when the user is not hovering over the tray
-            // (!this._notificationHovered). This avoids bringing up the message tray after the
+            // (!this.actor.hover). This avoids bringing up the message tray after the
            // user clicks on a notification with the pointer on the bottom pixel
            // of the monitor. The _trayDwelling variable is used so that we only try to
            // fire off one tray dwell - if it fails (because, say, the user has the mouse down),
            // we don't try again until the user moves the mouse up and down again.
-            if (!this._trayDwelling && !this._notificationHovered && this._trayDwellTimeoutId == 0) {
+            if (!this._trayDwelling && !this.actor.hover && this._trayDwellTimeoutId == 0) {
                // Save the interaction timestamp so we can detect user input
                let focusWindow = global.display.focus_window;
                this._trayDwellUserTime = focusWindow ? focusWindow.user_time : 0;
@ -1898,9 +1899,6 @@ const MessageTray = new Lang.Class({
            this._summary.insert_child_at_index(summaryItem.actor, this._chatSummaryItemsCount);
        }

-        if (!source.trayIcon && !source.isChat && !source.resident)
-            this.clearableCount++;
-
        this._sources.set(source, obj);

        obj.notifyId = source.connect('notify', Lang.bind(this, this._onNotify));
@ -1942,9 +1940,6 @@ const MessageTray = new Lang.Class({
        if (source.isChat)
            this._chatSummaryItemsCount--;

-        if (!source.trayIcon && !source.isChat && !source.resident)
-            this.clearableCount--;
-
        source.disconnect(obj.notifyId);
        source.disconnect(obj.destroyId);
        source.disconnect(obj.mutedChangedId);
@ -2000,6 +1995,7 @@ const MessageTray = new Lang.Class({
        }

        let index = this._notificationQueue.indexOf(notification);
+        notification.destroy();
        if (index != -1)
            this._notificationQueue.splice(index, 1);
    },
@ -2028,6 +2024,7 @@ const MessageTray = new Lang.Class({

    hide: function() {
        this._traySummoned = false;
+        this.actor.set_hover(false);
        this._updateState();
    },

@ -2094,21 +2091,25 @@ const MessageTray = new Lang.Class({
            this._grabHelper.addActor(corner.actor);
    },

-    _onNotificationHoverChanged: function() {
-        if (this._notificationWidget.hover == this._notificationHovered)
+    _onTrayHoverChanged: function() {
+        if (this.actor.hover == this._trayHovered)
            return;

-        this._notificationHovered = this._notificationWidget.hover;
-        if (this._notificationHovered) {
+        this._trayHovered = this.actor.hover;
+        if (this._trayHovered) {
            // No dwell inside notifications at the bottom of the screen
            this._cancelTrayDwell();

-            this._useLongerNotificationLeftTimeout = false;
-            if (this._notificationLeftTimeoutId) {
-                Mainloop.source_remove(this._notificationLeftTimeoutId);
-                this._notificationLeftTimeoutId = 0;
-                this._notificationLeftMouseX = -1;
-                this._notificationLeftMouseY = -1;
+            // Don't do anything if the one pixel area at the bottom is hovered over while the tray is hidden.
+            if (this._trayState == State.HIDDEN && this._notificationState == State.HIDDEN)
+                return;
+
+            this._useLongerTrayLeftTimeout = false;
+            if (this._trayLeftTimeoutId) {
+                Mainloop.source_remove(this._trayLeftTimeoutId);
+                this._trayLeftTimeoutId = 0;
+                this._trayLeftMouseX = -1;
+                this._trayLeftMouseY = -1;
                return;
            }

@ -2117,32 +2118,32 @@ const MessageTray = new Lang.Class({
                    global.stage.get_actor_at_pos(Clutter.PickMode.ALL, this._showNotificationMouseX, this._showNotificationMouseY);
                this._showNotificationMouseX = -1;
                this._showNotificationMouseY = -1;
-                // Don't set this._pointerInNotification to true if the pointer was initially in the area where the notification
+                // Don't set this._pointerInTray to true if the pointer was initially in the area where the notification
                // popped up. That way we will not be expanding notifications that happen to pop up over the pointer
                // automatically. Instead, the user is able to expand the notification by mousing away from it and then
                // mousing back in. Because this is an expected action, we set the boolean flag that indicates that a longer
                // timeout should be used before popping down the notification.
                if (this.actor.contains(actorAtShowNotificationPosition)) {
-                    this._useLongerNotificationLeftTimeout = true;
+                    this._useLongerTrayLeftTimeout = true;
                    return;
                }
            }
-            this._pointerInNotification = true;
+            this._pointerInTray = true;
            this._updateState();
        } else {
            // We record the position of the mouse the moment it leaves the tray. These coordinates are used in
-            // this._onNotificationLeftTimeout() to determine if the mouse has moved far enough during the initial timeout for us
+            // this._onTrayLeftTimeout() to determine if the mouse has moved far enough during the initial timeout for us
            // to consider that the user intended to leave the tray and therefore hide the tray. If the mouse is still
            // close to its previous position, we extend the timeout once.
            let [x, y, mods] = global.get_pointer();
-            this._notificationLeftMouseX = x;
-            this._notificationLeftMouseY = y;
+            this._trayLeftMouseX = x;
+            this._trayLeftMouseY = y;

            // We wait just a little before hiding the message tray in case the user quickly moves the mouse back into it.
            // We wait for a longer period if the notification popped up where the mouse pointer was already positioned.
            // That gives the user more time to mouse away from the notification and mouse back in in order to expand it.
-            let timeout = this._useLongerNotificationLeftTimeout ? LONGER_HIDE_TIMEOUT * 1000 : HIDE_TIMEOUT * 1000;
-            this._notificationLeftTimeoutId = Mainloop.timeout_add(timeout, Lang.bind(this, this._onNotificationLeftTimeout));
+            let timeout = this._useLongerTrayLeftTimeout ? LONGER_HIDE_TIMEOUT * 1000 : HIDE_TIMEOUT * 1000;
+            this._trayLeftTimeoutId = Mainloop.timeout_add(timeout, Lang.bind(this, this._onTrayLeftTimeout));
        }
    },

@ -2166,22 +2167,22 @@ const MessageTray = new Lang.Class({
        this._updateState();
    },

-    _onNotificationLeftTimeout: function() {
+    _onTrayLeftTimeout: function() {
        let [x, y, mods] = global.get_pointer();
        // We extend the timeout once if the mouse moved no further than MOUSE_LEFT_ACTOR_THRESHOLD to either side or up.
        // We don't check how far down the mouse moved because any point above the tray, but below the exit coordinate,
        // is close to the tray.
-        if (this._notificationLeftMouseX > -1 &&
-            y > this._notificationLeftMouseY - MOUSE_LEFT_ACTOR_THRESHOLD &&
-            x < this._notificationLeftMouseX + MOUSE_LEFT_ACTOR_THRESHOLD &&
-            x > this._notificationLeftMouseX - MOUSE_LEFT_ACTOR_THRESHOLD) {
-            this._notificationLeftMouseX = -1;
-            this._notificationLeftTimeoutId = Mainloop.timeout_add(LONGER_HIDE_TIMEOUT * 1000,
-                                                             Lang.bind(this, this._onNotificationLeftTimeout));
+        if (this._trayLeftMouseX > -1 &&
+            y > this._trayLeftMouseY - MOUSE_LEFT_ACTOR_THRESHOLD &&
+            x < this._trayLeftMouseX + MOUSE_LEFT_ACTOR_THRESHOLD &&
+            x > this._trayLeftMouseX - MOUSE_LEFT_ACTOR_THRESHOLD) {
+            this._trayLeftMouseX = -1;
+            this._trayLeftTimeoutId = Mainloop.timeout_add(LONGER_HIDE_TIMEOUT * 1000,
+                                                             Lang.bind(this, this._onTrayLeftTimeout));
        } else {
-            this._notificationLeftTimeoutId = 0;
-            this._useLongerNotificationLeftTimeout = false;
-            this._pointerInNotification = false;
+            this._trayLeftTimeoutId = 0;
+            this._useLongerTrayLeftTimeout = false;
+            this._pointerInTray = false;
            this._updateNotificationTimeout(0);
            this._updateState();
        }
@ -2189,7 +2190,7 @@ const MessageTray = new Lang.Class({
    },

    _escapeTray: function() {
-        this._pointerInNotification = false;
+        this._pointerInTray = false;
        this._traySummoned = false;
        this._setClickedSummaryItem(null);
        this._updateNotificationTimeout(0);
@ -2198,33 +2199,26 @@ const MessageTray = new Lang.Class({

    // All of the logic for what happens when occurs here; the various
    // event handlers merely update variables such as
-    // 'this._pointerInNotification', 'this._traySummoned', etc, and
+    // 'this._pointerInTray', 'this._traySummoned', etc, and
    // _updateState() figures out what (if anything) needs to be done
    // at the present time.
    _updateState: function() {
        // Notifications
-        let notificationQueue = this._notificationQueue.filter(function(n) {
-            return !n.acknowledged;
-        });
-        let hasNotifications = Main.sessionMode.hasNotifications;
-
-        this._notificationQueue = notificationQueue;
+        let notificationQueue = this._notificationQueue;
        let notificationUrgent = notificationQueue.length > 0 && notificationQueue[0].urgency == Urgency.CRITICAL;
        let notificationForFeedback = notificationQueue.length > 0 && notificationQueue[0].forFeedback;
        let notificationsLimited = this._busy || Main.layoutManager.bottomMonitor.inFullscreen;
-        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent || notificationForFeedback) && hasNotifications;
+        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent || notificationForFeedback) && Main.sessionMode.hasNotifications;
        let nextNotification = notificationQueue.length > 0 ? notificationQueue[0] : null;
-        let notificationPinned = this._pointerInNotification && !this._notificationRemoved;
+        let notificationPinned = this._pointerInTray && !this._notificationRemoved;
        let notificationExpanded = this._notification && this._notification.expanded;
        let notificationExpired = this._notificationTimeoutId == 0 &&
                                  !(this._notification && this._notification.urgency == Urgency.CRITICAL) &&
                                  !(this._notification && this._notification.focused) &&
-                                  !this._pointerInNotification;
-        let notificationLockedOut = !hasNotifications && this._notification;
-        let notificationMustClose = (this._notificationRemoved || notificationLockedOut ||
-                                     (notificationExpired && this._userActiveWhileNotificationShown) ||
-                                     this._notificationClosed || this._traySummoned);
-        let canShowNotification = notificationsPending && this._trayState == State.HIDDEN && !this._traySummoned;
+                                  !this._pointerInTray;
+        let notificationLockedOut = !Main.sessionMode.hasNotifications && this._notification;
+        let notificationMustClose = this._notificationRemoved || notificationLockedOut || (notificationExpired && this._userActiveWhileNotificationShown) || this._notificationClosed;
+        let canShowNotification = notificationsPending && this._trayState == State.HIDDEN;

        if (this._notificationState == State.HIDDEN) {
            if (canShowNotification)
@ -2238,6 +2232,12 @@ const MessageTray = new Lang.Class({
                this._ensureNotificationFocused();
        }

+        let notificationsVisible = this._notificationState != State.HIDDEN;
+        let notificationsDone = !notificationsVisible && !notificationsPending;
+
+        let mustHideTray = ((notificationsPending && notificationUrgent)
+                           || notificationsVisible || !Main.sessionMode.hasNotifications);
+
        // Summary notification
        let haveClickedSummaryItem = this._clickedSummaryItem != null;
        let summarySourceIsMainNotificationSource = (haveClickedSummaryItem && this._notification &&
@ -2245,15 +2245,10 @@ const MessageTray = new Lang.Class({
        let canShowSummaryBoxPointer = this._trayState == State.SHOWN;
        // We only have sources with empty notification stacks for legacy tray icons. Currently, we never attempt
        // to show notifications for legacy tray icons, but this would be necessary if we did.
-        let requestedNotificationStackIsEmpty = (haveClickedSummaryItem &&
-                                                 this._clickedSummaryItemMouseButton == 1 &&
-                                                 this._clickedSummaryItem.source.notifications.length == 0);
-        let wrongSummaryNotificationStack = (haveClickedSummaryItem &&
-                                             this._clickedSummaryItemMouseButton == 1 &&
+        let requestedNotificationStackIsEmpty = (this._clickedSummaryItemMouseButton == 1 && this._clickedSummaryItem.source.notifications.length == 0);
+        let wrongSummaryNotificationStack = (this._clickedSummaryItemMouseButton == 1 &&
                                             this._summaryBoxPointer.bin.child != this._clickedSummaryItem.notificationStackWidget);
-        let wrongSummaryRightClickMenu = (haveClickedSummaryItem &&
-                                          this._clickedSummaryItemMouseButton == 3 &&
-                                          this._clickedSummaryItem.rightClickMenu != null &&
+        let wrongSummaryRightClickMenu = (this._clickedSummaryItemMouseButton == 3 &&
                                          this._summaryBoxPointer.bin.child != this._clickedSummaryItem.rightClickMenu);
        let wrongSummaryBoxPointer = (haveClickedSummaryItem &&
                                      (wrongSummaryNotificationStack || wrongSummaryRightClickMenu));
@ -2262,7 +2257,7 @@ const MessageTray = new Lang.Class({
            if (haveClickedSummaryItem && !summarySourceIsMainNotificationSource && canShowSummaryBoxPointer && !requestedNotificationStackIsEmpty)
                this._showSummaryBoxPointer();
        } else if (this._summaryBoxPointerState == State.SHOWN) {
-            if (!haveClickedSummaryItem || !canShowSummaryBoxPointer || wrongSummaryBoxPointer || !hasNotifications) {
+            if (!haveClickedSummaryItem || !canShowSummaryBoxPointer || wrongSummaryBoxPointer || mustHideTray) {
                this._hideSummaryBoxPointer();
                if (wrongSummaryBoxPointer)
                    this._showSummaryBoxPointer();
@ -2272,7 +2267,7 @@ const MessageTray = new Lang.Class({
        // Tray itself
        let trayIsVisible = (this._trayState == State.SHOWING ||
                             this._trayState == State.SHOWN);
-        let trayShouldBeVisible = this._traySummoned && !this._keyboardVisible && hasNotifications;
+        let trayShouldBeVisible = this._traySummoned && !this._keyboardVisible && !mustHideTray;
        if (!trayIsVisible && trayShouldBeVisible)
            trayShouldBeVisible = this._showTray();
        else if (trayIsVisible && !trayShouldBeVisible)
@ -2329,8 +2324,7 @@ const MessageTray = new Lang.Class({
                      transition: 'easeOutQuad'
                    });

-        for (let i = 0; i < this._lightboxes.length; i++)
-            this._lightboxes[i].show();
+        this._lightbox.show();

        return true;
    },
@ -2353,7 +2347,7 @@ const MessageTray = new Lang.Class({

        if (this._desktopClone)
            this._desktopClone.destroy();
-        let cloneSource = Main.overview.visible ? Main.layoutManager.overviewGroup : global.window_group;
+        let cloneSource = Main.overview.visible ? global.overlay_group : global.window_group;
        this._desktopClone = new Clutter.Clone({ source: cloneSource,
                                                 clip: new Clutter.Geometry(this._bottomMonitorGeometry) });
        Main.uiGroup.insert_child_above(this._desktopClone, cloneSource);
@ -2385,8 +2379,7 @@ const MessageTray = new Lang.Class({
        // which would happen if GrabHelper ungrabbed for us.
        // This is a no-op in that case.
        this._grabHelper.ungrab({ actor: this.actor });
-        for (let i = 0; i < this._lightboxes.length; i++)
-            this._lightboxes[i].hide();
+        this._lightbox.hide();
    },

    _hideDesktopClone: function() {
@ -2435,7 +2428,7 @@ const MessageTray = new Lang.Class({
        let [x, y, mods] = global.get_pointer();
        // We save the position of the mouse at the time when we started showing the notification
        // in order to determine if the notification popped up under it. We make that check if
-        // the user starts moving the mouse and _onNotificationHoverChanged() gets called. We don't
+        // the user starts moving the mouse and _onTrayHoverChanged() gets called. We don't
        // expand the notification if it just happened to pop up under the mouse unless the user
        // explicitly mouses away from it and then mouses back in.
        this._showNotificationMouseX = x;
@ -2497,13 +2490,13 @@ const MessageTray = new Lang.Class({

    _notificationTimeout: function() {
        let [x, y, mods] = global.get_pointer();
-        if (y > this._lastSeenMouseY + 10 && !this._notificationHovered) {
+        if (y > this._lastSeenMouseY + 10 && !this.actor.hover) {
            // The mouse is moving towards the notification, so don't
            // hide it yet. (We just create a new timeout (and destroy
            // the old one) each time because the bookkeeping is
            // simpler.)
            this._updateNotificationTimeout(1000);
-        } else if (this._useLongerNotificationLeftTimeout && !this._notificationLeftTimeoutId &&
+        } else if (this._useLongerTrayLeftTimeout && !this._trayLeftTimeoutId &&
                  (x != this._lastSeenMouseX || y != this._lastSeenMouseY)) {
            // Refresh the timeout if the notification originally
            // popped up under the pointer, and the pointer is hovering
@ -2547,12 +2540,12 @@ const MessageTray = new Lang.Class({
            this._notificationUnfocusedId = 0;
        }

-        this._useLongerNotificationLeftTimeout = false;
-        if (this._notificationLeftTimeoutId) {
-            Mainloop.source_remove(this._notificationLeftTimeoutId);
-            this._notificationLeftTimeoutId = 0;
-            this._notificationLeftMouseX = -1;
-            this._notificationLeftMouseY = -1;
+        this._useLongerTrayLeftTimeout = false;
+        if (this._trayLeftTimeoutId) {
+            Mainloop.source_remove(this._trayLeftTimeoutId);
+            this._trayLeftTimeoutId = 0;
+            this._trayLeftMouseX = -1;
+            this._trayLeftMouseY = -1;
        }

        if (this._notificationRemoved) {
@ -2582,9 +2575,14 @@ const MessageTray = new Lang.Class({
        if (notification.isTransient)
            notification.destroy(NotificationDestroyedReason.EXPIRED);

-        this._closeButton.hide();
-        this._pointerInNotification = false;
        this._notificationRemoved = false;
+        this._closeButton.hide();
+        this._pointerInTray = false;
+
+        // Clutter will send a leave-event the next time the mouse
+        // moves, but we need to set this here now to update the
+        // state machine.
+        this.actor.hover = false;
        this._notificationBin.child = null;
        this._notificationWidget.hide();
    },
@ -2644,37 +2642,38 @@ const MessageTray = new Lang.Class({
    },

    _showSummaryBoxPointer: function() {
-        let child;
-        let summaryItem = this._clickedSummaryItem;
-        if (this._clickedSummaryItemMouseButton == 1) {
-            // Acknowledge all our notifications
-            summaryItem.source.notifications.forEach(function(n) { n.acknowledged = true; });
-
-            child = summaryItem.notificationStackWidget;
-
-            let closeButton = summaryItem.closeButton;
-            closeButton.show();
-            this._summaryBoxPointerCloseClickedId = closeButton.connect('clicked', Lang.bind(this, this._hideSummaryBoxPointer));
-            summaryItem.prepareNotificationStackForShowing();
-        } else if (this._clickedSummaryItemMouseButton == 3) {
-            child = summaryItem.rightClickMenu;
-            this._summaryBoxPointerCloseClickedId = 0;
-        }
-
-        // If the user clicked the middle mouse button, or the item
-        // doesn't have a right-click menu, do nothing.
-        if (!child)
-            return;
-
-        this._summaryBoxPointerItem = summaryItem;
+        this._summaryBoxPointerItem = this._clickedSummaryItem;
        this._summaryBoxPointerContentUpdatedId = this._summaryBoxPointerItem.connect('content-updated',
                                                                                      Lang.bind(this, this._onSummaryBoxPointerContentUpdated));
        this._sourceDoneDisplayingId = this._summaryBoxPointerItem.source.connect('done-displaying-content',
                                                                                  Lang.bind(this, this._onSourceDoneDisplayingContent));

-        this._summaryBoxPointer.bin.child = child;
+        let hasRightClickMenu = this._summaryBoxPointerItem.rightClickMenu != null;
+        if (this._clickedSummaryItemMouseButton == 1 || !hasRightClickMenu) {
+            let newQueue = [];
+            for (let i = 0; i < this._notificationQueue.length; i++) {
+                let notification = this._notificationQueue[i];
+                let sameSource = this._summaryBoxPointerItem.source == notification.source;
+                if (sameSource)
+                    notification.acknowledged = true;
+                else
+                    newQueue.push(notification);
+            }
+            this._notificationQueue = newQueue;
+
+            this._summaryBoxPointer.bin.child = this._summaryBoxPointerItem.notificationStackWidget;
+
+            let closeButton = this._summaryBoxPointerItem.closeButton;
+            closeButton.show();
+            this._summaryBoxPointerCloseClickedId = closeButton.connect('clicked', Lang.bind(this, this._hideSummaryBoxPointer));
+            this._summaryBoxPointerItem.prepareNotificationStackForShowing();
+        } else if (this._clickedSummaryItemMouseButton == 3) {
+            this._summaryBoxPointer.bin.child = this._clickedSummaryItem.rightClickMenu;
+            this._summaryBoxPointerCloseClickedId = 0;
+        }
+
        this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
-                                modal: true,
+                                grabFocus: true,
                                onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });

        this._summaryBoxPointer.actor.opacity = 0;
@ -2783,14 +2782,17 @@ const MessageTray = new Lang.Class({
        this._summaryBoxPointerState = State.HIDDEN;
        this._summaryBoxPointer.bin.child = null;

+        let sourceNotificationStackDoneShowing = null;
        if (doneShowingNotificationStack) {
-            let source = this._summaryBoxPointerItem.source;
-
            this._summaryBoxPointerItem.doneShowingNotificationStack();
-            this._summaryBoxPointerItem = null;
+            sourceNotificationStackDoneShowing = this._summaryBoxPointerItem.source;
+        }

-            if (source.isTransient && !this._reNotifyAfterHideNotification)
-                source.destroy(NotificationDestroyedReason.EXPIRED);
+        this._summaryBoxPointerItem = null;
+
+        if (sourceNotificationStackDoneShowing) {
+            if (sourceNotificationStackDoneShowing.isTransient && !this._reNotifyAfterHideNotification)
+                sourceNotificationStackDoneShowing.destroy(NotificationDestroyedReason.EXPIRED);
            if (this._reNotifyAfterHideNotification) {
                this._onNotify(this._reNotifyAfterHideNotification.source, this._reNotifyAfterHideNotification);
                this._reNotifyAfterHideNotification = null;
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@ -107,7 +107,7 @@ const OsdWindow = new Lang.Class({
                                   Lang.bind(this, this._monitorsChanged));
        this._monitorsChanged();

-        Main.uiGroup.add_child(this.actor);
+        Main.layoutManager.addChrome(this.actor, { affectsInputRegion: false });
    },

    setIcon: function(icon) {
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -11,6 +11,7 @@ const Shell = imports.gi.Shell;
 const Gdk = imports.gi.Gdk;

 const Background = imports.ui.background;
+const Dash = imports.ui.dash;
 const DND = imports.ui.dnd;
 const LayoutManager = imports.ui.layout;
 const Main = imports.ui.main;
@ -19,6 +20,7 @@ const OverviewControls = imports.ui.overviewControls;
 const Panel = imports.ui.panel;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
+const ViewSelector = imports.ui.viewSelector;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;

 // Time for initial animation going into Overview mode
@ -115,7 +117,7 @@ const Overview = new Lang.Class({
        let monitor = Main.layoutManager.primaryMonitor;

        this._desktopFade = new St.Bin();
-        Main.layoutManager.overviewGroup.add_child(this._desktopFade);
+        global.overlay_group.add_actor(this._desktopFade);

        let layout = new Clutter.BinLayout();
        this._stack = new Clutter.Actor({ layout_manager: layout });
@ -131,8 +133,17 @@ const Overview = new Lang.Class({
                                            y_expand: true });
        this._overview._delegate = this;

+        this._groupStack = new St.Widget({ layout_manager: new Clutter.BinLayout(),
+                                           x_expand: true, y_expand: true,
+                                           clip_to_allocation: true });
+        this._group = new St.BoxLayout({ name: 'overview-group',
+                                         reactive: true,
+                                         x_expand: true, y_expand: true });
+        this._groupStack.add_actor(this._group);
+
        this._backgroundGroup = new Meta.BackgroundGroup();
-        Main.layoutManager.overviewGroup.add_child(this._backgroundGroup);
+        global.overlay_group.add_child(this._backgroundGroup);
+        this._backgroundGroup.hide();
        this._bgManagers = [];

        this._activationTime = 0;
@ -146,13 +157,14 @@ const Overview = new Lang.Class({
        // During transitions, we raise this to the top to avoid having the overview
        // area be reactive; it causes too many issues such as double clicks on
        // Dash elements, or mouseover handlers in the workspaces.
-        this._coverPane = new Clutter.Actor({ opacity: 0,
-                                              reactive: true });
+        this._coverPane = new Clutter.Rectangle({ opacity: 0,
+                                                  reactive: true });
        this._overview.add_actor(this._coverPane);
        this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return true; }));

+        this._stack.hide();
        this._stack.add_actor(this._overview);
-        Main.layoutManager.overviewGroup.add_child(this._stack);
+        global.overlay_group.add_actor(this._stack);

        this._coverPane.hide();

@ -165,6 +177,7 @@ const Overview = new Lang.Class({
        Main.xdndHandler.connect('drag-end', Lang.bind(this, this._onDragEnd));

        global.screen.connect('restacked', Lang.bind(this, this._onRestacked));
+        this._group.connect('scroll-event', Lang.bind(this, this._onScrollEvent));

        this._windowSwitchTimeoutId = 0;
        this._windowSwitchTimestamp = 0;
@ -263,13 +276,28 @@ const Overview = new Lang.Class({
        this._overview.add_actor(this._searchEntryBin);

        // Create controls
-        this._controls = new OverviewControls.ControlsManager(this._searchEntry);
-        this._dash = this._controls.dash;
-        this._viewSelector = this._controls.viewSelector;
+        this._dash = new Dash.Dash();
+        this._viewSelector = new ViewSelector.ViewSelector(this._searchEntry,
+                                                           this._dash.showAppsButton);
+        this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
+        this._controls = new OverviewControls.ControlsManager(this._dash,
+                                                              this._thumbnailsBox,
+                                                              this._viewSelector);
+
+        this._controls.dashActor.x_align = Clutter.ActorAlign.START;
+        this._controls.dashActor.y_expand = true;
+
+        // Put the dash in a separate layer to allow content to be centered
+        this._groupStack.add_actor(this._controls.dashActor);
+
+        // Pack all the actors into the group
+        this._group.add_actor(this._controls.dashSpacer);
+        this._group.add(this._viewSelector.actor, { x_fill: true,
+                                                    expand: true });
+        this._group.add_actor(this._controls.thumbnailsActor);

        // Add our same-line elements after the search entry
-        this._overview.add(this._controls.actor, { y_fill: true, expand: true });
-        this._controls.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+        this._overview.add(this._groupStack, { y_fill: true, expand: true });

        this._stack.add_actor(this._controls.indicatorActor);

@ -433,7 +461,6 @@ const Overview = new Lang.Class({

    beginItemDrag: function(source) {
        this.emit('item-drag-begin');
-        this._inDrag = true;
    },

    cancelledItemDrag: function(source) {
@ -442,12 +469,10 @@ const Overview = new Lang.Class({

    endItemDrag: function(source) {
        this.emit('item-drag-end');
-        this._inDrag = false;
    },

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

    cancelledWindowDrag: function(source) {
@ -456,31 +481,24 @@ const Overview = new Lang.Class({

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

    // show:
    //
    // Animates the overview visible and grabs mouse and keyboard input
-    show: function() {
+    show : function() {
        if (this.isDummy)
            return;
        if (this._shown)
            return;
        this._shown = true;

-        if (!this._syncGrab())
+        if (!this._syncInputMode())
            return;

-        Main.layoutManager.showOverview();
        this._animateVisible();
    },

-    focusSearch: function() {
-        this.show();
-        this._searchEntry.grab_key_focus();
-    },
-
    fadeInDesktop: function() {
            this._desktopFade.opacity = 0;
            this._desktopFade.show();
@ -522,6 +540,8 @@ const Overview = new Lang.Class({
        //
        // Disable unredirection while in the overview
        Meta.disable_unredirect_for_screen(global.screen);
+        this._stack.show();
+        this._backgroundGroup.show();
        this._viewSelector.show();

        this._stack.opacity = 0;
@ -562,7 +582,7 @@ const Overview = new Lang.Class({
        this._animateNotVisible();

        this._shown = false;
-        this._syncGrab();
+        this._syncInputMode();
    },

    toggle: function() {
@ -584,8 +604,6 @@ const Overview = new Lang.Class({
    shouldToggleByCornerOrButton: function() {
        if (this.animationInProgress)
            return false;
-        if (this._inDrag)
-            return false;
        if (this._activationTime == 0 || Date.now() / 1000 - this._activationTime > OVERVIEW_ACTIVATION_TIMEOUT)
            return true;
        return false;
@ -593,8 +611,8 @@ const Overview = new Lang.Class({

    //// Private methods ////

-    _syncGrab: function() {
-        // We delay grab changes during animation so that when removing the
+    _syncInputMode: function() {
+        // We delay input mode changes during animation so that when removing the
        // overview we don't have a problem with the release of a press/release
        // going to an application.
        if (this.animationInProgress)
@ -612,12 +630,16 @@ const Overview = new Lang.Class({
                        return false;
                    }
                }
+            } else {
+                global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
            }
        } else {
            if (this._modal) {
                Main.popModal(this._overview);
                this._modal = false;
            }
+            else if (global.stage_input_mode == Shell.StageInputMode.FULLSCREEN)
+                global.stage_input_mode = Shell.StageInputMode.NORMAL;
        }
        return true;
    },
@ -656,7 +678,7 @@ const Overview = new Lang.Class({
        if (!this._shown)
            this._animateNotVisible();

-        this._syncGrab();
+        this._syncInputMode();
        global.sync_pointer();
    },

@ -666,19 +688,20 @@ const Overview = new Lang.Class({

        this._viewSelector.hide();
        this._desktopFade.hide();
-        this._coverPane.hide();
+        this._backgroundGroup.hide();
+        this._stack.hide();

        this.visible = false;
        this.animationInProgress = false;

+        this._coverPane.hide();
+
        this.emit('hidden');
        // Handle any calls to show* while we were hiding
        if (this._shown)
            this._animateVisible();
-        else
-            Main.layoutManager.hideOverview();

-        this._syncGrab();
+        this._syncInputMode();

        // Fake a pointer event if requested
        if (this._needsFakePointerEvent) {
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@ -6,12 +6,10 @@ const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;

-const Dash = imports.ui.dash;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 const ViewSelector = imports.ui.viewSelector;
-const WorkspaceThumbnail = imports.ui.workspaceThumbnail;

 const SIDE_CONTROLS_ANIMATION_TIME = 0.16;

@ -271,11 +269,6 @@ const ThumbnailsSlider = new Lang.Class({
        return alwaysZoomOut;
    },

-    getNonExpandedWidth: function() {
-        let child = this.actor.get_first_child();
-        return child.get_theme_node().get_length('visible-width');
-    },
-
    getSlide: function() {
        if (!this.visible)
            return 0;
@ -287,16 +280,18 @@ const ThumbnailsSlider = new Lang.Class({
        let child = this.actor.get_first_child();
        let preferredHeight = child.get_preferred_height(-1)[1];
        let expandedWidth = child.get_preferred_width(preferredHeight)[1];
+        let visibleWidth = child.get_theme_node().get_length('visible-width');

-        return this.getNonExpandedWidth() / expandedWidth;
+        return visibleWidth / expandedWidth;
    },

    getVisibleWidth: function() {
        let alwaysZoomOut = this._getAlwaysZoomOut();
        if (alwaysZoomOut)
            return this.parent();
-        else
-            return this.getNonExpandedWidth();
+
+        let child = this.actor.get_first_child();
+        return child.get_theme_node().get_length('visible-width');
    }
 });

@ -314,10 +309,6 @@ const DashSlider = new Lang.Class({
        // available allocation
        this._dash.actor.x_expand = true;
        this._dash.actor.y_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));
@ -488,77 +479,39 @@ const MessagesIndicator = new Lang.Class({
 const ControlsManager = new Lang.Class({
    Name: 'ControlsManager',

-    _init: function(searchEntry) {
-        this.dash = new Dash.Dash();
-        this._dashSlider = new DashSlider(this.dash);
-        this._dashSpacer = new DashSpacer();
-        this._dashSpacer.setDashActor(this._dashSlider.actor);
+    _init: function(dash, thumbnails, viewSelector) {
+        this._dashSlider = new DashSlider(dash);
+        this.dashActor = this._dashSlider.actor;
+        this.dashSpacer = new DashSpacer();
+        this.dashSpacer.setDashActor(this.dashActor);

-        this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
-        this._thumbnailsSlider = new ThumbnailsSlider(this._thumbnailsBox);
+        this._thumbnailsSlider = new ThumbnailsSlider(thumbnails);
+        this.thumbnailsActor = this._thumbnailsSlider.actor;

-        this.viewSelector = new ViewSelector.ViewSelector(searchEntry,
-                                                          this.dash.showAppsButton);
-        this.viewSelector.connect('page-changed', Lang.bind(this, this._setVisibility));
-        this.viewSelector.connect('page-empty', Lang.bind(this, this._onPageEmpty));
-
-        this._indicator = new MessagesIndicator(this.viewSelector);
+        this._indicator = new MessagesIndicator(viewSelector);
        this.indicatorActor = this._indicator.actor;

-        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
-                                     reactive: true,
-                                     x_expand: true, y_expand: true,
-                                     clip_to_allocation: true });
-        this._group = new St.BoxLayout({ name: 'overview-group',
-                                        x_expand: true, y_expand: true });
-        this.actor.add_actor(this._group);
-
-        this.actor.add_actor(this._dashSlider.actor);
-
-        this._group.add_actor(this._dashSpacer);
-        this._group.add(this.viewSelector.actor, { x_fill: true,
-                                                   expand: true });
-        this._group.add_actor(this._thumbnailsSlider.actor);
-
-        this._group.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesGeometry));
+        this._viewSelector = viewSelector;
+        this._viewSelector.connect('page-changed', Lang.bind(this, this._setVisibility));
+        this._viewSelector.connect('page-empty', Lang.bind(this, this._onPageEmpty));

        Main.overview.connect('showing', Lang.bind(this, this._updateSpacerVisibility));
        Main.overview.connect('item-drag-begin', Lang.bind(this,
            function() {
-                let activePage = this.viewSelector.getActivePage();
+                let activePage = this._viewSelector.getActivePage();
                if (activePage != ViewSelector.ViewPage.WINDOWS)
-                    this.viewSelector.fadeHalf();
+                    this._viewSelector.fadeHalf();
            }));
        Main.overview.connect('item-drag-end', Lang.bind(this,
            function() {
-                this.viewSelector.fadeIn();
+                this._viewSelector.fadeIn();
            }));
        Main.overview.connect('item-drag-cancelled', Lang.bind(this,
            function() {
-                this.viewSelector.fadeIn();
+                this._viewSelector.fadeIn();
            }));
    },

-    _updateWorkspacesGeometry: function() {
-        let [x, y] = this.actor.get_transformed_position();
-        let [width, height] = this.actor.get_transformed_size();
-        let geometry = { x: x, y: y, width: width, height: height };
-
-        let spacing = this.actor.get_theme_node().get_length('spacing');
-        let dashWidth = this._dashSlider.getVisibleWidth() + spacing;
-        let thumbnailsWidth = this._thumbnailsSlider.getNonExpandedWidth() + spacing;
-
-        geometry.width -= dashWidth;
-        geometry.width -= thumbnailsWidth;
-
-        if (this.actor.get_text_direction() == Clutter.TextDirection.LTR)
-            geometry.x += dashWidth;
-        else
-            geometry.x += thumbnailsWidth;
-
-        this.viewSelector.setWorkspacesFullGeometry(geometry);
-    },
-
    _setVisibility: function() {
        // Ignore the case when we're leaving the overview, since
        // actors will be made visible again when entering the overview
@ -568,7 +521,7 @@ const ControlsManager = new Lang.Class({
            (Main.overview.animationInProgress && !Main.overview.visibleTarget))
            return;

-        let activePage = this.viewSelector.getActivePage();
+        let activePage = this._viewSelector.getActivePage();
        let dashVisible = (activePage == ViewSelector.ViewPage.WINDOWS ||
                           activePage == ViewSelector.ViewPage.APPS);
        let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS);
@ -588,8 +541,8 @@ const ControlsManager = new Lang.Class({
        if (Main.overview.animationInProgress && !Main.overview.visibleTarget)
            return;

-        let activePage = this.viewSelector.getActivePage();
-        this._dashSpacer.visible = (activePage == ViewSelector.ViewPage.WINDOWS);
+        let activePage = this._viewSelector.getActivePage();
+        this.dashSpacer.visible = (activePage == ViewSelector.ViewPage.WINDOWS);
    },

    _onPageEmpty: function() {
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -21,7 +21,6 @@ const DND = imports.ui.dnd;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
-const RemoteMenu = imports.ui.remoteMenu;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

@ -569,14 +568,9 @@ const AppMenuButton = new Lang.Class({
        }

        if (targetApp == this._targetApp) {
-            if (targetApp &&
-                targetApp.get_state() != Shell.AppState.STARTING &&
-                targetApp.get_state() != Shell.AppState.BUSY) {
+            if (targetApp && targetApp.get_state() != Shell.AppState.STARTING) {
                this.stopAnimation();
                this._maybeSetMenu();
-            } else if (targetApp &&
-                       targetApp.get_state() == Shell.AppState.BUSY) {
-                this.startAnimation();
            }
            return;
        }
@ -609,8 +603,7 @@ const AppMenuButton = new Lang.Class({
        this._iconBox.set_child(icon);
        this._iconBox.show();

-        if (targetApp.get_state() == Shell.AppState.STARTING ||
-            targetApp.get_state() == Shell.AppState.BUSY)
+        if (targetApp.get_state() == Shell.AppState.STARTING)
            this.startAnimation();
        else
            this._maybeSetMenu();
@ -622,11 +615,11 @@ const AppMenuButton = new Lang.Class({
        let menu;

        if (this._targetApp.action_group && this._targetApp.menu) {
-            if (this.menu instanceof RemoteMenu.RemoteMenu &&
+            if (this.menu instanceof PopupMenu.RemoteMenu &&
                this.menu.actionGroup == this._targetApp.action_group)
                return;

-            menu = new RemoteMenu.RemoteMenu(this.actor, this._targetApp.menu, this._targetApp.action_group);
+            menu = new PopupMenu.RemoteMenu(this.actor, this._targetApp.menu, this._targetApp.action_group);
            menu.connect('activate', Lang.bind(this, function() {
                let win = this._targetApp.get_windows()[0];
                win.check_alive(global.get_current_time());
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@ -184,9 +184,6 @@ const Button = new Lang.Class({
    },

    _onMenuKeyPress: function(actor, event) {
-        if (global.focus_manager.navigate_from_event(event))
-            return true;
-
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
            let group = global.focus_manager.get_group(this.actor);
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -19,12 +19,6 @@ const Tweener = imports.ui.tweener;

 const SLIDER_SCROLL_STEP = 0.05; /* Slider scrolling step in % */

-const Ornament = {
-    NONE: 0,
-    DOT: 1,
-    CHECK: 2,
-};
-
 function _ensureStyle(actor) {
    if (actor.get_children) {
        let children = actor.get_children();
@ -59,9 +53,7 @@ const PopupBaseMenuItem = new Lang.Class({
        this.actor._delegate = this;

        this._children = [];
-        this._ornament = Ornament.NONE;
-        this._ornamentLabel = new St.Label({ style_class: 'popup-menu-ornament' });
-        this.actor.add_actor(this._ornamentLabel);
+        this._dot = null;
        this._columnWidths = null;
        this._spacing = 0;
        this.active = false;
@ -184,24 +176,40 @@ const PopupBaseMenuItem = new Lang.Class({
        this._removeChild(child);
    },

-    setOrnament: function(ornament) {
-        if (ornament == this._ornament)
-            return;
+    setShowDot: function(show) {
+        if (show) {
+            if (this._dot)
+                return;

-        this._ornament = ornament;
+            this._dot = new St.DrawingArea({ style_class: 'popup-menu-item-dot' });
+            this._dot.connect('repaint', Lang.bind(this, this._onRepaintDot));
+            this.actor.add_actor(this._dot);
+            this.actor.add_accessible_state (Atk.StateType.CHECKED);
+        } else {
+            if (!this._dot)
+                return;

-        if (ornament == Ornament.DOT) {
-            this._ornamentLabel.text = '\u2022';
-            this.actor.add_accessible_state(Atk.StateType.CHECKED);
-        } else if (ornament == Ornament.CHECK) {
-            this._ornamentLabel.text = '\u2713';
-            this.actor.add_accessible_state(Atk.StateType.CHECKED);
-        } else if (ornament == Ornament.NONE) {
-            this._ornamentLabel.text = '';
-            this.actor.remove_accessible_state(Atk.StateType.CHECKED);
+            this._dot.destroy();
+            this._dot = null;
+            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
        }
    },

+    _onRepaintDot: function(area) {
+        let cr = area.get_context();
+        let [width, height] = area.get_surface_size();
+        let color = area.get_theme_node().get_foreground_color();
+
+        cr.setSourceRGBA (
+            color.red / 255,
+            color.green / 255,
+            color.blue / 255,
+            color.alpha / 255);
+        cr.arc(width / 2, height / 2, width / 3, 0, 2 * Math.PI);
+        cr.fill();
+        cr.$dispose();
+    },
+
    // This returns column widths in logical order (i.e. from the dot
    // to the image), not in visual order (left to right)
    getColumnWidths: function() {
@ -272,25 +280,26 @@ const PopupBaseMenuItem = new Lang.Class({
        let height = box.y2 - box.y1;
        let direction = this.actor.get_text_direction();

-        // The ornament is placed outside box
-        // one quarter of padding from the border of the container
-        // (so 3/4 from the inner border)
-        // (padding is box.x1)
-        let ornamentBox = new Clutter.ActorBox();
-        let ornamentWidth = box.x1;
+        if (this._dot) {
+            // The dot is placed outside box
+            // one quarter of padding from the border of the container
+            // (so 3/4 from the inner border)
+            // (padding is box.x1)
+            let dotBox = new Clutter.ActorBox();
+            let dotWidth = Math.round(box.x1 / 2);

-        ornamentBox.x1 = 0;
-        ornamentBox.x2 = ornamentWidth;
-        ornamentBox.y1 = box.y1;
-        ornamentBox.y2 = box.y2;
-
-        if (direction == Clutter.TextDirection.RTL) {
-            ornamentBox.x1 += box.x2;
-            ornamentBox.x2 += box.x2;
+            if (direction == Clutter.TextDirection.LTR) {
+                dotBox.x1 = Math.round(box.x1 / 4);
+                dotBox.x2 = dotBox.x1 + dotWidth;
+            } else {
+                dotBox.x2 = box.x2 + 3 * Math.round(box.x1 / 4);
+                dotBox.x1 = dotBox.x2 - dotWidth;
+            }
+            dotBox.y1 = Math.round(box.y1 + (height - dotWidth) / 2);
+            dotBox.y2 = dotBox.y1 + dotWidth;
+            this._dot.allocate(dotBox, flags);
        }

-        this._ornamentLabel.allocate(ornamentBox, flags);
-
        let x;
        if (direction == Clutter.TextDirection.LTR)
            x = box.x1;
@ -393,19 +402,12 @@ const PopupSeparatorMenuItem = new Lang.Class({
    Name: 'PopupSeparatorMenuItem',
    Extends: PopupBaseMenuItem,

-    _init: function (text) {
+    _init: function () {
        this.parent({ reactive: false,
                      can_focus: false});

-        this._box = new St.BoxLayout();
-        this.addActor(this._box, { span: -1, expand: true });
-
-        this.label = new St.Label({ text: text || '' });
-        this._box.add(this.label);
-        this.actor.label_actor = this.label;
-
        this._separator = new Separator.HorizontalSeparator({ style_class: 'popup-separator-menu-item' });
-        this._box.add(this._separator.actor, { expand: true });
+        this.addActor(this._separator.actor, { span: -1, expand: true });
    }
 });

@ -551,10 +553,6 @@ const PopupSliderMenuItem = new Lang.Class({

        let handleRadius = themeNode.get_length('-slider-handle-radius');

-        let handleBorderWidth = themeNode.get_length('-slider-handle-border-width');
-        let [hasHandleColor, handleBorderColor] =
-            themeNode.lookup_color('-slider-handle-border-color', false);
-
        let sliderWidth = width - 2 * handleRadius;
        let sliderHeight = themeNode.get_length('-slider-height');

@ -606,16 +604,7 @@ const PopupSliderMenuItem = new Lang.Class({
            color.blue / 255,
            color.alpha / 255);
        cr.arc(handleX, handleY, handleRadius, 0, 2 * Math.PI);
-        cr.fillPreserve();
-        if (hasHandleColor && handleBorderWidth) {
-          cr.setSourceRGBA(
-              handleBorderColor.red / 255,
-              handleBorderColor.green / 255,
-              handleBorderColor.blue / 255,
-              handleBorderColor.alpha / 255);
-          cr.setLineWidth(handleBorderWidth);
-          cr.stroke();
-        }
+        cr.fill();
        cr.$dispose();
    },

@ -1003,9 +992,6 @@ const PopupMenuBase = new Lang.Class({
    },

    _updateSeparatorVisibility: function(menuItem) {
-        if (menuItem.label.text)
-            return;
-
        let children = this.box.get_children();

        let index = children.indexOf(menuItem.actor);
@ -1489,12 +1475,23 @@ const PopupMenuSection = new Lang.Class({
        this.actor = this.box;
        this.actor._delegate = this;
        this.isOpen = true;
+
+        // an array of externally managed separators
+        this.separators = [];
    },

    // deliberately ignore any attempt to open() or close(), but emit the
    // corresponding signal so children can still pick it up
    open: function() { this.emit('open-state-changed', true); },
    close: function() { this.emit('open-state-changed', false); },
+
+    destroy: function() {
+        for (let i = 0; i < this.separators.length; i++)
+            this.separators[i].destroy();
+        this.separators = [];
+
+        this.parent();
+    }
 });

 const PopupSubMenuMenuItem = new Lang.Class({
@ -1529,30 +1526,15 @@ const PopupSubMenuMenuItem = new Lang.Class({
        this.parent();
    },

-    setSubmenuShown: function(open) {
-        if (open)
-            this.menu.open(BoxPointer.PopupAnimation.FULL);
-        else
-            this.menu.close(BoxPointer.PopupAnimation.FULL);
-    },
-
-    _setOpenState: function(open) {
-        this.setSubmenuShown(open);
-    },
-
-    _getOpenState: function() {
-        return this.menu.isOpen;
-    },
-
    _onKeyPressEvent: function(actor, event) {
        let symbol = event.get_key_symbol();

        if (symbol == Clutter.KEY_Right) {
-            this._setOpenState(true);
+            this.menu.open(BoxPointer.PopupAnimation.FULL);
            this.menu.actor.navigate_focus(null, Gtk.DirectionType.DOWN, false);
            return true;
-        } else if (symbol == Clutter.KEY_Left && this._getOpenState()) {
-            this._setOpenState(false);
+        } else if (symbol == Clutter.KEY_Left && this.menu.isOpen) {
+            this.menu.close();
            return true;
        }

@ -1560,11 +1542,11 @@ const PopupSubMenuMenuItem = new Lang.Class({
    },

    activate: function(event) {
-        this._setOpenState(true);
+        this.menu.open(BoxPointer.PopupAnimation.FULL);
    },

    _onButtonReleaseEvent: function(actor) {
-        this._setOpenState(!this._getOpenState());
+        this.menu.toggle();
    }
 });

@ -1810,6 +1792,260 @@ const PopupComboBoxMenuItem = new Lang.Class({
    }
 });

+/**
+ * RemoteMenu:
+ *
+ * A PopupMenu that tracks a GMenuModel and shows its actions
+ * (exposed by GApplication/GActionGroup)
+ */
+const RemoteMenu = new Lang.Class({
+    Name: 'RemoteMenu',
+    Extends: PopupMenu,
+
+    _init: function(sourceActor, model, actionGroup) {
+        this.parent(sourceActor, 0.0, St.Side.TOP);
+
+        this.model = model;
+        this.actionGroup = actionGroup;
+
+        this._actions = { };
+        this._modelChanged(this.model, 0, 0, this.model.get_n_items(), this);
+
+        this._actionStateChangeId = this.actionGroup.connect('action-state-changed', Lang.bind(this, this._actionStateChanged));
+        this._actionEnableChangeId = this.actionGroup.connect('action-enabled-changed', Lang.bind(this, this._actionEnabledChanged));
+    },
+
+    destroy: function() {
+        if (this._actionStateChangeId) {
+            this.actionGroup.disconnect(this._actionStateChangeId);
+            this._actionStateChangeId = 0;
+        }
+
+        if (this._actionEnableChangeId) {
+            this.actionGroup.disconnect(this._actionEnableChangeId);
+            this._actionEnableChangeId = 0;
+        }
+
+        this.parent();
+    },
+
+    _createMenuItem: function(model, index) {
+        let labelValue = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_LABEL, null);
+        let label = labelValue ? labelValue.deep_unpack() : '';
+        // remove all underscores that are not followed by another underscore
+        label = label.replace(/_([^_])/, '$1');
+
+        let section_link = model.get_item_link(index, Gio.MENU_LINK_SECTION);
+        if (section_link) {
+            let item = new PopupMenuSection();
+            if (label) {
+                let title = new PopupMenuItem(label, { reactive: false,
+                                                       style_class: 'popup-subtitle-menu-item' });
+                item._titleMenuItem = title;
+                title._ignored = true;
+                item.addMenuItem(title);
+            }
+            this._modelChanged(section_link, 0, 0, section_link.get_n_items(), item);
+            return [item, true, ''];
+        }
+
+        let submenu_link = model.get_item_link(index, Gio.MENU_LINK_SUBMENU);
+
+        if (submenu_link) {
+            let item = new PopupSubMenuMenuItem(label);
+            this._modelChanged(submenu_link, 0, 0, submenu_link.get_n_items(), item.menu);
+            return [item, false, ''];
+        }
+
+        let action_id = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_ACTION, null).deep_unpack();
+        if (!this.actionGroup.has_action(action_id)) {
+            // the action may not be there yet, wait for action-added
+            return [null, false, 'action-added'];
+        }
+
+        if (!this._actions[action_id])
+            this._actions[action_id] = { enabled: this.actionGroup.get_action_enabled(action_id),
+                                         state: this.actionGroup.get_action_state(action_id),
+                                         items: [ ],
+                                       };
+        let action = this._actions[action_id];
+        let item, target, destroyId, specificSignalId;
+
+        if (action.state) {
+            // Docs have get_state_hint(), except that the DBus protocol
+            // has no provision for it (so ShellApp does not implement it,
+            // and neither GApplication), and g_action_get_state_hint()
+            // always returns null
+            // Funny :)
+
+            switch (String.fromCharCode(action.state.classify())) {
+            case 'b':
+                item = new PopupSwitchMenuItem(label, action.state.get_boolean());
+                action.items.push(item);
+                specificSignalId = item.connect('toggled', Lang.bind(this, function(item) {
+                    this.actionGroup.activate_action(action_id, null);
+                }));
+                break;
+            case 's':
+                item = new PopupMenuItem(label);
+                item._remoteTarget = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_TARGET, null).deep_unpack();
+                action.items.push(item);
+                item.setShowDot(action.state.deep_unpack() == item._remoteTarget);
+                specificSignalId = item.connect('activate', Lang.bind(this, function(item) {
+                    this.actionGroup.activate_action(action_id, GLib.Variant.new_string(item._remoteTarget));
+                }));
+                break;
+            default:
+                log('Action "%s" has state of type %s, which is not supported'.format(action_id, action.state.get_type_string()));
+                return [null, false, 'action-state-changed'];
+            }
+        } else {
+            target = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_TARGET, null);
+            item = new PopupMenuItem(label);
+            action.items.push(item);
+            specificSignalId = item.connect('activate', Lang.bind(this, function() {
+                this.actionGroup.activate_action(action_id, target);
+            }));
+        }
+
+        item.actor.reactive = item.actor.can_focus = action.enabled;
+
+        destroyId = item.connect('destroy', Lang.bind(this, function() {
+            item.disconnect(destroyId);
+            item.disconnect(specificSignalId);
+
+            let pos = action.items.indexOf(item);
+            if (pos != -1)
+                action.items.splice(pos, 1);
+        }));
+
+        return [item, false, ''];
+    }, 
+
+    _modelChanged: function(model, position, removed, added, target) {
+        let j, k;
+        let j0, k0;
+
+        let currentItems = target._getMenuItems();
+
+        k0 = 0;
+        // skip ignored items at the beginning
+        while (k0 < currentItems.length && currentItems[k0]._ignored)
+            k0++;
+        // find the right menu item matching the model item
+        for (j0 = 0; k0 < currentItems.length && j0 < position; j0++, k0++) {
+            if (currentItems[k0]._ignored)
+                k0++;
+        }
+
+        if (removed == -1) {
+            // special flag to indicate we should destroy everything
+            for (k = k0; k < currentItems.length; k++)
+                currentItems[k].destroy();
+        } else {
+            for (j = j0, k = k0; k < currentItems.length && j < j0 + removed; j++, k++) {
+                currentItems[k].destroy();
+
+                if (currentItems[k]._ignored)
+                    j--;
+            }
+        }
+
+        for (j = j0, k = k0; j < j0 + added; j++, k++) {
+            let [item, addSeparator, changeSignal] = this._createMenuItem(model, j);
+
+            if (item) {
+                // separators must be added in the parent to make autohiding work
+                if (addSeparator) {
+                    let separator = new PopupSeparatorMenuItem();
+                    item.separators.push(separator);
+                    separator._ignored = true;
+                    target.addMenuItem(separator, k+1);
+                    k++;
+                }
+
+                target.addMenuItem(item, k);
+
+                if (addSeparator) {
+                    let separator = new PopupSeparatorMenuItem();
+                    item.separators.push(separator);
+                    separator._ignored = true;
+                    target.addMenuItem(separator, k+1);
+                    k++;
+                }
+            } else if (changeSignal) {
+                let signalId = this.actionGroup.connect(changeSignal, Lang.bind(this, function(actionGroup, actionName) {
+                    actionGroup.disconnect(signalId);
+                    if (this._actions[actionName]) return;
+
+                    // force a full update
+                    this._modelChanged(model, 0, -1, model.get_n_items(), target);
+                }));
+            }
+        }
+
+        if (!model._changedId) {
+            model._changedId = model.connect('items-changed', Lang.bind(this, this._modelChanged, target));
+            model._destroyId = target.connect('destroy', function() {
+                if (model._changedId)
+                    model.disconnect(model._changedId);
+                if (model._destroyId)
+                    target.disconnect(model._destroyId);
+                model._changedId = 0;
+                model._destroyId = 0;
+            });
+        }
+
+        if (target instanceof PopupMenuSection) {
+            if (target._titleMenuItem)
+                target.actor.visible = target.numMenuItems != 1;
+            else
+                target.actor.visible = target.numMenuItems != 0;
+        } else {
+            let sourceItem = target.sourceActor._delegate;
+            if (sourceItem instanceof PopupSubMenuMenuItem)
+                sourceItem.actor.visible = target.numMenuItems != 0;
+        }
+    },
+
+    _actionStateChanged: function(actionGroup, action_id) {
+        let action = this._actions[action_id];
+        if (!action)
+            return;
+
+        action.state = actionGroup.get_action_state(action_id);
+        if (action.items.length) {
+            switch (String.fromCharCode(action.state.classify())) {
+            case 'b':
+                for (let i = 0; i < action.items.length; i++)
+                    action.items[i].setToggleState(action.state.get_boolean());
+                break;
+            case 'd':
+                for (let i = 0; i < action.items.length; i++)
+                    action.items[i].setValue(action.state.get_double());
+                break;
+            case 's':
+                for (let i = 0; i < action.items.length; i++)
+                    action.items[i].setShowDot(action.items[i]._remoteTarget == action.state.deep_unpack());
+            }
+        }
+    },
+
+    _actionEnabledChanged: function(actionGroup, action_id) {
+        let action = this._actions[action_id];
+        if (!action)
+            return;
+
+        action.enabled = actionGroup.get_action_enabled(action_id);
+        if (action.items.length) {
+            for (let i = 0; i < action.items.length; i++) {
+                let item = action.items[i];
+                item.actor.reactive = item.actor.can_focus = action.enabled;
+            }
+        }
+    }
+});
+
 /* Basic implementation of a menu manager.
 * Call addMenu to add menus
 */
@ -1888,7 +2124,7 @@ const PopupMenuManager = new Lang.Class({

    _onMenuOpenState: function(menu, open) {
        if (open) {
-            if (this.activeMenu && !this.activeMenu.isChildMenu(menu))
+            if (this.activeMenu)
                this.activeMenu.close(BoxPointer.PopupAnimation.FADE);
            this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor,
                                    onUngrab: Lang.bind(this, this._closeMenu, menu) });
--- a/js/ui/remoteMenu.js
+++ b/js/ui/remoteMenu.js
@ -1,199 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Atk = imports.gi.Atk;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const ShellMenu = imports.gi.ShellMenu;
-const St = imports.gi.St;
-
-const PopupMenu = imports.ui.popupMenu;
-
-function stripMnemonics(label) {
-    if (!label)
-        return '';
-
-    // remove all underscores that are not followed by another underscore
-    return label.replace(/_([^_])/, '$1');
-}
-
-function _insertItem(menu, trackerItem, position) {
-    let mapper;
-
-    if (trackerItem.get_is_separator())
-        mapper = new RemoteMenuSeparatorItemMapper(trackerItem);
-    else if (trackerItem.get_has_submenu())
-        mapper = new RemoteMenuSubmenuItemMapper(trackerItem);
-    else
-        mapper = new RemoteMenuItemMapper(trackerItem);
-
-    let item = mapper.menuItem;
-    menu.addMenuItem(item, position);
-}
-
-function _removeItem(menu, position) {
-    let items = menu._getMenuItems();
-    items[position].destroy();
-}
-
-const RemoteMenuSeparatorItemMapper = new Lang.Class({
-    Name: 'RemoteMenuSeparatorItemMapper',
-
-    _init: function(trackerItem) {
-        this._trackerItem = trackerItem;
-        this.menuItem = new PopupMenu.PopupSeparatorMenuItem();
-        this._trackerItem.connect('notify::label', Lang.bind(this, this._updateLabel));
-        this._updateLabel();
-
-        this.menuItem.connect('destroy', function() {
-            trackerItem.run_dispose();
-        });
-    },
-
-    _updateLabel: function() {
-        this.menuItem.label.text = stripMnemonics(this._trackerItem.label);
-    },
-});
-
-const RequestSubMenu = new Lang.Class({
-    Name: 'RequestSubMenu',
-    Extends: PopupMenu.PopupSubMenuMenuItem,
-
-    _init: function() {
-        this.parent('');
-        this._requestOpen = false;
-    },
-
-    _setOpenState: function(open) {
-        this.emit('request-open', open);
-        this._requestOpen = open;
-    },
-
-    _getOpenState: function() {
-        return this._requestOpen;
-    },
-});
-
-const RemoteMenuSubmenuItemMapper = new Lang.Class({
-    Name: 'RemoteMenuSubmenuItemMapper',
-
-    _init: function(trackerItem) {
-        this._trackerItem = trackerItem;
-        this.menuItem = new RequestSubMenu();
-        this._trackerItem.connect('notify::label', Lang.bind(this, this._updateLabel));
-        this._updateLabel();
-
-        this._tracker = Shell.MenuTracker.new_for_item_submenu(this._trackerItem,
-                                                               _insertItem.bind(null, this.menuItem.menu),
-                                                               _removeItem.bind(null, this.menuItem.menu));
-
-        this.menuItem.connect('request-open', Lang.bind(this, function(menu, open) {
-            this._trackerItem.request_submenu_shown(open);
-        }));
-
-        this._trackerItem.connect('notify::submenu-shown', Lang.bind(this, function() {
-            this.menuItem.setSubmenuShown(this._trackerItem.get_submenu_shown());
-        }));
-
-        this.menuItem.connect('destroy', function() {
-            trackerItem.run_dispose();
-        });
-    },
-
-    destroy: function() {
-        this._tracker.destroy();
-        this.parent();
-    },
-
-    _updateLabel: function() {
-        this.menuItem.label.text = stripMnemonics(this._trackerItem.label);
-    },
-});
-
-const RemoteMenuItemMapper = new Lang.Class({
-    Name: 'RemoteMenuItemMapper',
-
-    _init: function(trackerItem) {
-        this._trackerItem = trackerItem;
-
-        this.menuItem = new PopupMenu.PopupBaseMenuItem();
-        this._label = new St.Label();
-        this.menuItem.addActor(this._label);
-        this.menuItem.actor.label_actor = this._label;
-
-        this.menuItem.connect('activate', Lang.bind(this, function() {
-            this._trackerItem.activated();
-        }));
-
-        this._trackerItem.bind_property('visible', this.menuItem.actor, 'visible', GObject.BindingFlags.SYNC_CREATE);
-
-        this._trackerItem.connect('notify::label', Lang.bind(this, this._updateLabel));
-        this._trackerItem.connect('notify::sensitive', Lang.bind(this, this._updateSensitivity));
-        this._trackerItem.connect('notify::role', Lang.bind(this, this._updateRole));
-        this._trackerItem.connect('notify::toggled', Lang.bind(this, this._updateDecoration));
-
-        this._updateLabel();
-        this._updateSensitivity();
-        this._updateRole();
-
-        this.menuItem.connect('destroy', function() {
-            trackerItem.run_dispose();
-        });
-    },
-
-    _updateLabel: function() {
-        this._label.text = stripMnemonics(this._trackerItem.label);
-    },
-
-    _updateSensitivity: function() {
-        this.menuItem.setSensitive(this._trackerItem.sensitive);
-    },
-
-    _updateDecoration: function() {
-        let ornamentForRole = {};
-        ornamentForRole[ShellMenu.MenuTrackerItemRole.RADIO] = PopupMenu.Ornament.DOT;
-        ornamentForRole[ShellMenu.MenuTrackerItemRole.CHECK] = PopupMenu.Ornament.CHECK;
-
-        let ornament = PopupMenu.Ornament.NONE;
-        if (this._trackerItem.toggled)
-            ornament = ornamentForRole[this._trackerItem.role];
-
-        this.menuItem.setOrnament(ornament);
-    },
-
-    _updateRole: function() {
-        let a11yRoles = {};
-        a11yRoles[ShellMenu.MenuTrackerItemRole.NORMAL] = Atk.Role.MENU_ITEM;
-        a11yRoles[ShellMenu.MenuTrackerItemRole.RADIO] = Atk.Role.RADIO_MENU_ITEM;
-        a11yRoles[ShellMenu.MenuTrackerItemRole.CHECK] = Atk.Role.CHECK_MENU_ITEM;
-
-        let a11yRole = a11yRoles[this._trackerItem.role];
-        this.menuItem.actor.accessible_role = a11yRole;
-
-        this._updateDecoration();
-    },
-});
-
-const RemoteMenu = new Lang.Class({
-    Name: 'RemoteMenu',
-    Extends: PopupMenu.PopupMenu,
-
-    _init: function(sourceActor, model, actionGroup) {
-        this.parent(sourceActor, 0.0, St.Side.TOP);
-
-        this._model = model;
-        this._actionGroup = actionGroup;
-        this._tracker = Shell.MenuTracker.new(this._actionGroup,
-                                              this._model,
-                                              null, /* action namespace */
-                                              _insertItem.bind(null, this),
-                                              _removeItem.bind(null, this));
-    },
-
-    destroy: function() {
-        this._tracker.destroy();
-        this.parent();
-    },
-});
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@ -187,9 +187,7 @@ const RemoteSearchProvider = new Lang.Class({

    createIcon: function(size, meta) {
        let gicon;
-        if (meta['icon']) {
-            gicon = Gio.icon_deserialize(meta['icon']);
-        } else if (meta['gicon']) {
+        if (meta['gicon']) {
            gicon = Gio.icon_new_for_string(meta['gicon']);
        } else if (meta['icon-data']) {
            let [width, height, rowStride, hasAlpha,
@ -242,12 +240,8 @@ const RemoteSearchProvider = new Lang.Class({
        let metas = results[0];
        let resultMetas = [];
        for (let i = 0; i < metas.length; i++) {
-            for (let prop in metas[i]) {
-                // we can use the serialized icon variant directly
-                if (prop != 'icon')
-                    metas[i][prop] = metas[i][prop].deep_unpack();
-            }
-
+            for (let prop in metas[i])
+                metas[i][prop] = metas[i][prop].deep_unpack();
            resultMetas.push({ id: metas[i]['id'],
                               name: metas[i]['name'],
                               description: metas[i]['description'],
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -30,7 +30,6 @@ const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
 const LOCK_ENABLED_KEY = 'lock-enabled';
 const LOCK_DELAY_KEY = 'lock-delay';

-const LOCKED_STATE_STR = 'screenShield.locked';
 // fraction of screen height the arrow must reach before completing
 // the slide up automatically
 const ARROW_DRAG_THRESHOLD = 0.1;
@ -215,7 +214,6 @@ const NotificationsBox = new Lang.Class({

        if (musicNotification != null &&
            this._musicBin.child == null) {
-            musicNotification.acknowledged = true;
            if (musicNotification.actor.get_parent() != null)
                musicNotification.actor.get_parent().remove_actor(musicNotification.actor);
            this._musicBin.child = musicNotification.actor;
@ -248,7 +246,6 @@ const NotificationsBox = new Lang.Class({
            sourceCountChangedId: 0,
            sourceTitleChangedId: 0,
            sourceUpdatedId: 0,
-            sourceNotifyId: 0,
            musicNotification: null,
            sourceBox: null,
            titleLabel: null,
@ -259,12 +256,6 @@ const NotificationsBox = new Lang.Class({
        this._showSource(source, obj, obj.sourceBox);
        this._notificationBox.add(obj.sourceBox, { x_fill: false, x_align: St.Align.START });

-        if (obj.musicNotification) {
-            obj.sourceNotifyId = source.connect('notify', Lang.bind(this, function(source, notification) {
-                notification.acknowledged = true;
-            }));
-        }
-
        obj.sourceCountChangedId = source.connect('count-updated', Lang.bind(this, function(source) {
            this._countChanged(source, obj);
        }));
@ -345,8 +336,6 @@ const NotificationsBox = new Lang.Class({
        if (obj.musicNotification) {
            this._musicBin.child = null;
            obj.musicNotification = null;
-
-            source.disconnect(obj.sourceNotifyId);
        }

        source.disconnect(obj.sourceDestroyId);
@ -1134,14 +1123,6 @@ const ScreenShield = new Lang.Class({
        if (Main.sessionMode.currentMode == 'unlock-dialog')
            Main.sessionMode.popMode('unlock-dialog');

-        if (this._dialog && !this._isGreeter)
-            this._dialog.popModal();
-
-        if (this._isModal) {
-            Main.popModal(this.actor);
-            this._isModal = false;
-        }
-
        Tweener.addTween(this._lockDialogGroup, {
            scale_x: 0,
            scale_y: 0,
@ -1159,6 +1140,12 @@ const ScreenShield = new Lang.Class({
        }

        this._lightbox.hide();
+
+        if (this._isModal) {
+            Main.popModal(this.actor);
+            this._isModal = false;
+        }
+
        this.actor.hide();

        if (this._becameActiveId != 0) {
@ -1176,7 +1163,6 @@ const ScreenShield = new Lang.Class({
        this._isLocked = false;
        this.emit('active-changed');
        this.emit('locked-changed');
-        global.set_runtime_state(LOCKED_STATE_STR, null);
    },

    activate: function(animate) {
@ -1193,7 +1179,6 @@ const ScreenShield = new Lang.Class({
        }

        this._resetLockScreen(animate, animate);
-        global.set_runtime_state(LOCKED_STATE_STR, GLib.Variant.new('b', true));

        // We used to set isActive and emit active-changed here,
        // but now we do that from lockScreenShown, which means
@ -1220,15 +1205,5 @@ const ScreenShield = new Lang.Class({

        this.emit('locked-changed');
    },
-
-    // If the previous shell crashed, and gnome-session restarted us, then re-lock
-    lockIfWasLocked: function() {
-        let wasLocked = global.get_runtime_state('b', LOCKED_STATE_STR);
-        if (wasLocked === null)
-            return;
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-            this.lock(false);
-        }));
-    }
 });
 Signals.addSignalMethods(ScreenShield.prototype);
--- a/js/ui/screencast.js
+++ b/js/ui/screencast.js
@ -105,8 +105,7 @@ const ScreencastService = new Lang.Class({

            recorder.set_file_template(fileTemplate);
            this._applyOptionalParameters(recorder, options);
-            let [success, fileName] = recorder.record();
-            returnValue = [success, fileName ? fileName : ''];
+            returnValue = recorder.record();
        }

        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
@ -126,8 +125,7 @@ const ScreencastService = new Lang.Class({
            recorder.set_file_template(fileTemplate);
            recorder.set_area(x, y, width, height);
            this._applyOptionalParameters(recorder, options);
-            let [success, fileName] = recorder.record();
-            returnValue = [success, fileName ? fileName : ''];
+            returnValue = recorder.record();
        }

        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@ -78,6 +78,17 @@ const _modes = {
        panelStyle: 'unlock-screen'
    },

+    'initial-setup': {
+        hasWindows: true,
+        isPrimary: true,
+        components: ['networkAgent', 'keyring'],
+        panel: {
+            left: [],
+            center: ['dateMenu'],
+            right: ['a11yGreeter', 'keyboard', 'volume', 'battery']
+        }
+    },
+
    'user': {
        hasOverview: true,
        showCalendarEvents: true,
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@ -21,7 +21,6 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
    <arg type="b" direction="out" name="success" />
    <arg type="s" direction="out" name="result" />
 </method>
-<method name="FocusSearch"/>
 <method name="ShowOSD">
    <arg type="a{sv}" direction="in" name="params"/>
 </method>
@ -117,10 +116,6 @@ const GnomeShell = new Lang.Class({
        return [success, returnValue];
    },

-    FocusSearch: function() {
-        Main.overview.focusSearch();
-    },
-
    ShowOSD: function(params) {
        for (let param in params)
            params[param] = params[param].deep_unpack();
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@ -363,7 +363,7 @@ const ConfirmNotification = new Lang.Class({
        this._applet = applet;
        this._devicePath = device_path;
        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
-        this.addBody(_("Please confirm whether the Passkey '%06d' matches the one on the device.").format(pin));
+        this.addBody(_("Please confirm whether the PIN '%06d' matches the one on the device.").format(pin));

        /* Translators: this is the verb, not the noun */
        this.addButton('matches', _("Matches"));
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -33,33 +33,6 @@ const KEY_INPUT_SOURCES = 'sources';
 const INPUT_SOURCE_TYPE_XKB = 'xkb';
 const INPUT_SOURCE_TYPE_IBUS = 'ibus';

-// This is the longest we'll keep the keyboard frozen until an input
-// source is active.
-const MAX_INPUT_SOURCE_ACTIVATION_TIME = 4000; // ms
-
-const BUS_NAME = 'org.gnome.SettingsDaemon.Keyboard';
-const OBJECT_PATH = '/org/gnome/SettingsDaemon/Keyboard';
-
-const KeyboardManagerInterface =
-<interface name="org.gnome.SettingsDaemon.Keyboard">
-<method name="SetInputSource">
-    <arg type="u" direction="in" />
-</method>
-</interface>;
-
-const KeyboardManagerProxy = Gio.DBusProxy.makeProxyWrapper(KeyboardManagerInterface);
-
-function releaseKeyboard() {
-    if (Main.modalCount > 0)
-        global.display.unfreeze_keyboard(global.get_current_time());
-    else
-        global.display.ungrab_keyboard(global.get_current_time());
-}
-
-function holdKeyboard() {
-    global.freeze_keyboard(global.get_current_time());
-}
-
 const IBusManager = new Lang.Class({
    Name: 'IBusManager',

@ -356,14 +329,14 @@ const InputSourceIndicator = new Lang.Class({
            Main.wm.addKeybinding('switch-input-source',
                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
                                  Meta.KeyBindingFlags.REVERSES,
-                                  Shell.KeyBindingMode.ALL,
+                                  Shell.KeyBindingMode.ALL & ~Shell.KeyBindingMode.MESSAGE_TRAY,
                                  Lang.bind(this, this._switchInputSource));
        this._keybindingActionBackward =
            Main.wm.addKeybinding('switch-input-source-backward',
                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
                                  Meta.KeyBindingFlags.REVERSES |
                                  Meta.KeyBindingFlags.REVERSED,
-                                  Shell.KeyBindingMode.ALL,
+                                  Shell.KeyBindingMode.ALL & ~Shell.KeyBindingMode.MESSAGE_TRAY,
                                  Lang.bind(this, this._switchInputSource));
        this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA });
        this._settings.connect('changed::' + KEY_CURRENT_INPUT_SOURCE, Lang.bind(this, this._currentInputSourceChanged));
@ -383,15 +356,6 @@ const InputSourceIndicator = new Lang.Class({
        this._ibusManager.connect('property-updated', Lang.bind(this, this._ibusPropertyUpdated));
        this._inputSourcesChanged();

-        this._keyboardManager = new KeyboardManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
-                                                         function(proxy, error) {
-                                                             if (error)
-                                                                 log(error.message);
-                                                         });
-        this._keyboardManager.g_default_timeout = MAX_INPUT_SOURCE_ACTIVATION_TIME;
-
-        global.display.connect('modifiers-accelerator-activated', Lang.bind(this, this._modifiersSwitcher));
-
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this._showLayoutItem = this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, this._showLayout));

@ -425,43 +389,10 @@ const InputSourceIndicator = new Lang.Class({
        this._inputSourcesChanged();
    },

-    _modifiersSwitcher: function() {
-        let sourceIndexes = Object.keys(this._inputSources);
-        if (sourceIndexes.length == 0) {
-            releaseKeyboard();
-            return true;
-        }
-
-        let is = this._currentSource;
-        if (!is)
-            is = this._inputSources[sourceIndexes[0]];
-
-        let nextIndex = is.index + 1;
-        if (nextIndex > sourceIndexes[sourceIndexes.length - 1])
-            nextIndex = 0;
-
-        while (!(is = this._inputSources[nextIndex]))
-            nextIndex += 1;
-
-        is.activate();
-        return true;
-    },
-
    _switchInputSource: function(display, screen, window, binding) {
        if (this._mruSources.length < 2)
            return;

-        // HACK: Fall back on simple input source switching since we
-        // can't show a popup switcher while a GrabHelper grab is in
-        // effect without considerable work to consolidate the usage
-        // of pushModal/popModal and grabHelper. See
-        // https://bugzilla.gnome.org/show_bug.cgi?id=695143 .
-        if (Main.keybindingMode == Shell.KeyBindingMode.MESSAGE_TRAY ||
-            Main.keybindingMode == Shell.KeyBindingMode.TOPBAR_POPUP) {
-            this._modifiersSwitcher();
-            return;
-        }
-
        let popup = new InputSourcePopup(this._mruSources, this._keybindingAction, this._keybindingActionBackward);
        let modifiers = binding.get_modifiers();
        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
@ -478,7 +409,7 @@ const InputSourceIndicator = new Lang.Class({
        [oldSource, this._currentSource] = [this._currentSource, newSource];

        if (oldSource) {
-            oldSource.menuItem.setOrnament(PopupMenu.Ornament.NONE);
+            oldSource.menuItem.setShowDot(false);
            oldSource.indicatorLabel.hide();
        }

@ -496,7 +427,7 @@ const InputSourceIndicator = new Lang.Class({

        this.actor.show();

-        newSource.menuItem.setOrnament(PopupMenu.Ornament.DOT);
+        newSource.menuItem.setShowDot(true);
        newSource.indicatorLabel.show();

        this._buildPropSection(newSource.properties);
@ -520,7 +451,6 @@ const InputSourceIndicator = new Lang.Class({

        this._inputSources = {};
        this._ibusSources = {};
-        this._currentSource = null;

        let inputSourcesByShortName = {};

@ -549,8 +479,10 @@ const InputSourceIndicator = new Lang.Class({
            let is = new InputSource(type, id, displayName, shortName, i);

            is.connect('activate', Lang.bind(this, function() {
-                holdKeyboard();
-                this._keyboardManager.SetInputSourceRemote(is.index, releaseKeyboard);
+                if (this._currentSource && this._currentSource.index == is.index)
+                    return;
+                this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
+                                         GLib.Variant.new_uint32(is.index));
            }));

            if (!(is.shortName in inputSourcesByShortName))
@ -720,8 +652,7 @@ const InputSourceIndicator = new Lang.Class({
                item.prop = prop;
                radioGroup.push(item);
                item.radioGroup = radioGroup;
-                item.setOrnament(prop.get_state() == IBus.PropState.CHECKED ?
-                                 PopupMenu.Ornament.DOT : PopupMenu.Ornament.NONE);
+                item.setShowDot(prop.get_state() == IBus.PropState.CHECKED);
                item.connect('activate', Lang.bind(this, function() {
                    if (item.prop.get_state() == IBus.PropState.CHECKED)
                        return;
@ -729,12 +660,12 @@ const InputSourceIndicator = new Lang.Class({
                    let group = item.radioGroup;
                    for (let i = 0; i < group.length; ++i) {
                        if (group[i] == item) {
-                            item.setOrnament(PopupMenu.Ornament.DOT);
+                            item.setShowDot(true);
                            item.prop.set_state(IBus.PropState.CHECKED);
                            this._ibusManager.activateProperty(item.prop.get_key(),
                                                               IBus.PropState.CHECKED);
                        } else {
-                            group[i].setOrnament(PopupMenu.Ornament.NONE);
+                            group[i].setShowDot(false);
                            group[i].prop.set_state(IBus.PropState.UNCHECKED);
                            this._ibusManager.activateProperty(group[i].prop.get_key(),
                                                               IBus.PropState.UNCHECKED);
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -5,10 +5,17 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const NetworkManager = imports.gi.NetworkManager;
 const NMClient = imports.gi.NMClient;
-const NMGtk = imports.gi.NMGtk;
 const Signals = imports.signals;
 const St = imports.gi.St;

+// Some of the new code depends on as-yet-unreleased NM
+var NMGtk;
+try {
+    NMGtk = imports.gi.NMGtk;
+} catch(e) {
+    NMGtk = null;
+}
+
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@ -27,6 +34,7 @@ const NMConnectionCategory = {
 };

 const NMAccessPointSecurity = {
+    UNKNOWN: 0,
    NONE: 1,
    WEP: 2,
    WPA_PSK: 3,
@ -44,6 +52,20 @@ const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];
 // (the remaining are placed into More…)
 const NUM_VISIBLE_NETWORKS = 5;

+function macToArray(string) {
+    return string.split(':').map(function(el) {
+        return parseInt(el, 16);
+    });
+}
+
+function macCompare(one, two) {
+    for (let i = 0; i < 6; i++) {
+        if (one[i] != two[i])
+            return false;
+    }
+    return true;
+}
+
 function ssidCompare(one, two) {
    if (!one || !two)
        return false;
@ -69,6 +91,13 @@ function signalToIcon(value) {
    return 'none';
 }

+// shared between NMNetworkMenuItem and NMDeviceWireless
+function sortAccessPoints(accessPoints) {
+    return accessPoints.sort(function (one, two) {
+        return two.strength - one.strength;
+    });
+}
+
 function ssidToLabel(ssid) {
    let label = NetworkManager.utils_ssid_to_utf8(ssid);
    if (!label)
@ -101,7 +130,8 @@ const NMNetworkMenuItem = new Lang.Class({
        this._icons.add_actor(this._signalIcon);

        this._secureIcon = new St.Icon({ style_class: 'popup-menu-icon' });
-        if (this.bestAP._secType != NMAccessPointSecurity.NONE)
+        if (this.bestAP._secType != NMAccessPointSecurity.UNKNOWN &&
+            this.bestAP._secType != NMAccessPointSecurity.NONE)
            this._secureIcon.icon_name = 'network-wireless-encrypted-symbolic';
        this._icons.add_actor(this._secureIcon);
    },
@ -123,12 +153,18 @@ const NMWirelessSectionTitleMenuItem = new Lang.Class({
    Name: 'NMWirelessSectionTitleMenuItem',
    Extends: PopupMenu.PopupSwitchMenuItem,

-    _init: function(client) {
-        this.parent(_("Wi-Fi"), false, { style_class: 'popup-subtitle-menu-item' });
+    _init: function(client, property, title, params) {
+        params = params || { };
+        params.style_class = 'popup-subtitle-menu-item';
+        this.parent(title, false, params);

        this._client = client;
-        this._client.connect('notify::wireless-enabled', Lang.bind(this, this._propertyChanged));
-        this._client.connect('notify::wireless-hardware-enabled', Lang.bind(this, this._propertyChanged));
+        this._property = property + '_enabled';
+        this._propertyHardware = property + '_hardware_enabled';
+        this._setEnabledFunc = property + '_set_enabled';
+
+        this._client.connect('notify::' + property + '-enabled', Lang.bind(this, this._propertyChanged));
+        this._client.connect('notify::' + property + '-hardware-enabled', Lang.bind(this, this._propertyChanged));

        this._propertyChanged();
    },
@ -150,12 +186,12 @@ const NMWirelessSectionTitleMenuItem = new Lang.Class({
    activate: function(event) {
        this.parent(event);

-        this._client.wireless_set_enabled(this._switch.state);
+        this._client[this._setEnabledFunc](this._switch.state);
    },

    _propertyChanged: function() {
-        this._softwareEnabled = this._client.wireless_enabled;
-        this._hardwareEnabled = this._client.wireless_hardware_enabled;
+        this._softwareEnabled = this._client[this._property];
+        this._hardwareEnabled = this._client[this._propertyHardware];

        let enabled = this._softwareEnabled && this._hardwareEnabled;
        this.setToggleState(enabled);
@ -173,7 +209,22 @@ const NMConnectionBased = new Lang.Class({

    _init: function(connections) {
        this._connections = [ ];
-        connections.forEach(Lang.bind(this, this.checkConnection));
+        for (let i = 0; i < connections.length; i++) {
+            if (!connections[i].get_uuid())
+                continue;
+            if (!this.connectionValid(connections[i]))
+                continue;
+            // record the connection
+            let obj = {
+                connection: connections[i],
+                name: connections[i].get_id(),
+                uuid: connections[i].get_uuid(),
+                timestamp: connections[i]._timestamp,
+                item: null,
+            };
+            this._connections.push(obj);
+        }
+        this._connections.sort(this._connectionSortFunction);
    },

    checkConnection: function(connection) {
@ -264,6 +315,7 @@ const NMDevice = new Lang.Class({

        this._activeConnection = null;
        this._activeConnectionItem = null;
+        this._autoConnectionItem = null;
        this._overflowItem = null;

        this.statusItem = new PopupMenu.PopupSwitchMenuItem('', this.connected, { style_class: 'popup-subtitle-menu-item' });
@ -350,9 +402,13 @@ const NMDevice = new Lang.Class({
    },

    _activateAutomaticConnection: function() {
-        let connection = new NetworkManager.Connection();
-        this._client.add_and_activate_connection(connection, this.device, null, null);
-        return true;
+        let connection = this._createAutomaticConnection();
+        if (connection) {
+            this._client.add_and_activate_connection(connection, this.device, null, null);
+            return true;
+        }
+
+        return false;
    },

    get connected() {
@ -446,6 +502,11 @@ const NMDevice = new Lang.Class({
            this.statusItem.label.text = this.device._description;
    },

+    // protected
+    _createAutomaticConnection: function() {
+        throw new TypeError('Invoking pure virtual function NMDevice.createAutomaticConnection');
+    },
+
    _queueCreateSection: function() {
        if (this._deferredWorkId) {
            this._clearSection();
@ -456,6 +517,7 @@ const NMDevice = new Lang.Class({
    _clearSection: function() {
        // Clear everything
        this.section.removeAll();
+        this._autoConnectionItem = null;
        this._activeConnectionItem = null;
        this._overflowItem = null;
        for (let i = 0; i < this._connections.length; i++) {
@ -494,6 +556,14 @@ const NMDevice = new Lang.Class({
                } else
                    this.section.addMenuItem(obj.item);
            }
+        } else if (this._autoConnectionName) {
+            this._autoConnectionItem = new PopupMenu.PopupMenuItem(this._autoConnectionName);
+            this._autoConnectionItem.connect('activate', Lang.bind(this, function() {
+                let connection = this._createAutomaticConnection();
+                if (connection)
+                    this._client.add_and_activate_connection(connection, this.device, null, null);
+            }));
+            this.section.addMenuItem(this._autoConnectionItem);
        }
    },

@ -518,7 +588,7 @@ const NMDevice = new Lang.Class({
            title = _("Connected (private)");
        }
        this._activeConnectionItem = new PopupMenu.PopupMenuItem(title, { reactive: false });
-        this._activeConnectionItem.setOrnament(PopupMenu.Ornament.DOT);
+        this._activeConnectionItem.setShowDot(true);
    },

    _deviceStateChanged: function(device, newstate, oldstate, reason) {
@ -595,10 +665,24 @@ const NMDeviceWired = new Lang.Class({

    _init: function(client, device, connections) {
        device._description = _("Wired");
+        this._autoConnectionName = _("Auto Ethernet");
        this.category = NMConnectionCategory.WIRED;

        this.parent(client, device, connections);
    },
+
+    _createAutomaticConnection: function() {
+        let connection = new NetworkManager.Connection();
+        let uuid = NetworkManager.utils_uuid_generate();
+        connection.add_setting(new NetworkManager.SettingWired());
+        connection.add_setting(new NetworkManager.SettingConnection({
+            uuid: uuid,
+            id: this._autoConnectionName,
+            type: NetworkManager.SETTING_WIRED_SETTING_NAME,
+            autoconnect: true
+        }));
+        return connection;
+    }
 });

 const NMDeviceModem = new Lang.Class({
@ -639,10 +723,13 @@ const NMDeviceModem = new Lang.Class({
            this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
        }

-        if (is_wwan)
+        if (is_wwan) {
            this.category = NMConnectionCategory.WWAN;
-        else
+            this._autoConnectionName = _("Auto broadband");
+        } else {
            this.category = NMConnectionCategory.WIRED;
+            this._autoConnectionName = _("Auto dial-up");
+        }

        if (this.mobileDevice) {
            this._operatorNameId = this.mobileDevice.connect('notify::operator-name', Lang.bind(this, function() {
@ -737,20 +824,50 @@ const NMDeviceBluetooth = new Lang.Class({

    _init: function(client, device, connections) {
        device._description = _("Bluetooth");
+        this._autoConnectionName = this._makeConnectionName(device);
+        device.connect('notify::name', Lang.bind(this, this._updateAutoConnectionName));

        this.category = NMConnectionCategory.WWAN;

        this.parent(client, device, connections);
    },

+    _createAutomaticConnection: function() {
+        let connection = new NetworkManager.Connection;
+        let uuid = NetworkManager.utils_uuid_generate();
+        connection.add_setting(new NetworkManager.SettingBluetooth);
+        connection.add_setting(new NetworkManager.SettingConnection({
+            uuid: uuid,
+            id: this._autoConnectionName,
+            type: NetworkManager.SETTING_BLUETOOTH_SETTING_NAME,
+            autoconnect: false
+        }));
+        return connection;
+    },
+
    _activateAutomaticConnection: function() {
        // FIXME: DUN devices are configured like modems, so
-        // We need to spawn the mobile wizard
+        // we need to spawn the mobile wizard
        // but the network panel doesn't support bluetooth at the moment
        // so we just create an empty connection and hope
        // that this phone supports PAN

        return this.parent();
+    },
+
+    _makeConnectionName: function(device) {
+        let name = device.name;
+        if (name)
+            return _("Auto %s").format(name);
+        else
+            return _("Auto bluetooth");
+    },
+
+    _updateAutoConnectionName: function() {
+        this._autoConnectionName = this._makeConnectionName(this.device);
+
+        this._queueCreateSection();
+        this._updateStatusItem();
    }
 });

@ -764,19 +881,76 @@ const NMDeviceWireless = new Lang.Class({
        this._overflowItem = null;
        this._networks = [ ];

-        this.parent(client, device, connections);
+        // breaking the layers with this, but cannot call
+        // this.connectionValid until I have a device
+        this.device = device;

-        let accessPoints = device.get_access_points() || [ ];
-        accessPoints.forEach(Lang.bind(this, function(ap) {
-            this._accessPointAdded(this.device, ap);
+        let validConnections = connections.filter(Lang.bind(this, function(connection) {
+            return this.connectionValid(connection);
        }));
+        let accessPoints = device.get_access_points() || [ ];
+        for (let i = 0; i < accessPoints.length; i++) {
+            // Access points are grouped by network
+            let ap = accessPoints[i];

-        this._activeApChanged();
+            if (ap.get_ssid() == null) {
+                // hidden access point cannot be added, we need to know
+                // the SSID and security details to connect
+                // nevertheless, the access point can acquire a SSID when
+                // NetworkManager connects to it (via nmcli or the control-center)
+                ap._notifySsidId = ap.connect('notify::ssid', Lang.bind(this, this._notifySsidCb));
+                continue;
+            }
+
+            let pos = this._findNetwork(ap);
+            let obj;
+            if (pos != -1) {
+                obj = this._networks[pos];
+                obj.accessPoints.push(ap);
+            } else {
+                obj = { ssid: ap.get_ssid(),
+                        mode: ap.mode,
+                        security: this._getApSecurityType(ap),
+                        connections: [ ],
+                        item: null,
+                        accessPoints: [ ap ]
+                      };
+                obj.ssidText = ssidToLabel(obj.ssid);
+                this._networks.push(obj);
+            }
+            ap._updateId = ap.connect('notify::strength', Lang.bind(this, this._onApStrengthChanged));
+
+            // Check if some connection is valid for this AP
+            for (let j = 0; j < validConnections.length; j++) {
+                let connection = validConnections[j];
+                if (ap.connection_valid(connection) &&
+                    obj.connections.indexOf(connection) == -1) {
+                    obj.connections.push(connection);
+                }
+            }
+        }
+
+        // Sort APs within each network by strength
+        for (let i = 0; i < this._networks.length; i++)
+            sortAccessPoints(this._networks[i].accessPoints);
+
+        if (this.device.active_access_point) {
+            let networkPos = this._findNetwork(this.device.active_access_point);
+
+            if (networkPos == -1) // the connected access point is invisible
+                this._activeNetwork = null;
+            else
+                this._activeNetwork = this._networks[networkPos];
+        } else {
+            this._activeNetwork = null;
+        }
        this._networks.sort(this._networkSortFunction);

        this._apChangedId = device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged));
        this._apAddedId = device.connect('access-point-added', Lang.bind(this, this._accessPointAdded));
        this._apRemovedId = device.connect('access-point-removed', Lang.bind(this, this._accessPointRemoved));
+
+        this.parent(client, device, validConnections);
    },

    destroy: function() {
@ -916,9 +1090,9 @@ const NMDeviceWireless = new Lang.Class({

    _findExistingNetwork: function(accessPoint) {
        for (let i = 0; i < this._networks.length; i++) {
-            let network = this._networks[i];
-            for (let j = 0; j < network.accessPoints.length; j++) {
-                if (network.accessPoints[j] == accessPoint)
+            let apObj = this._networks[i];
+            for (let j = 0; j < apObj.accessPoints.length; j++) {
+                if (apObj.accessPoints[j] == accessPoint)
                    return { network: i, ap: j };
            }
        }
@ -966,30 +1140,30 @@ const NMDeviceWireless = new Lang.Class({
        }

        let pos = this._findNetwork(accessPoint);
-        let network;
+        let apObj;
        let needsupdate = false;

        if (pos != -1) {
-            network = this._networks[pos];
-            if (network.accessPoints.indexOf(accessPoint) != -1) {
+            apObj = this._networks[pos];
+            if (apObj.accessPoints.indexOf(accessPoint) != -1) {
                log('Access point was already seen, not adding again');
                return;
            }

-            Util.insertSorted(network.accessPoints, accessPoint, function(one, two) {
+            Util.insertSorted(apObj.accessPoints, accessPoint, function(one, two) {
                return two.strength - one.strength;
            });
-            if (network.item)
-                network.item.updateBestAP(network.accessPoints[0]);
+            if (apObj.item)
+                apObj.item.updateBestAP(apObj.accessPoints[0]);
        } else {
-            network = { ssid: accessPoint.get_ssid(),
-                        mode: accessPoint.mode,
-                        security: this._getApSecurityType(accessPoint),
-                        connections: [ ],
-                        item: null,
-                        accessPoints: [ accessPoint ]
-                      };
-            network.ssidText = ssidToLabel(network.ssid);
+            apObj = { ssid: accessPoint.get_ssid(),
+                      mode: accessPoint.mode,
+                      security: this._getApSecurityType(accessPoint),
+                      connections: [ ],
+                      item: null,
+                      accessPoints: [ accessPoint ]
+                    };
+            apObj.ssidText = ssidToLabel(apObj.ssid);
        }
        accessPoint._updateId = accessPoint.connect('notify::strength', Lang.bind(this, this._onApStrengthChanged));

@ -997,14 +1171,14 @@ const NMDeviceWireless = new Lang.Class({
        for (let i = 0; i < this._connections.length; i++) {
            let connection = this._connections[i].connection;
            if (accessPoint.connection_valid(connection) &&
-                network.connections.indexOf(connection) == -1) {
-                network.connections.push(connection);
+                apObj.connections.indexOf(connection) == -1) {
+                apObj.connections.push(connection);
            }
        }

        if (pos != -1)
            this._networks.splice(pos, 1);
-        let newPos = Util.insertSorted(this._networks, network, this._networkSortFunction);
+        let newPos = Util.insertSorted(this._networks, apObj, this._networkSortFunction);

        // Queue an update of the UI if we changed the order
        if (newPos != pos)
@ -1024,28 +1198,28 @@ const NMDeviceWireless = new Lang.Class({
            return;
        }

-        let network = this._networks[res.network];
-        network.accessPoints.splice(res.ap, 1);
+        let apObj = this._networks[res.network];
+        apObj.accessPoints.splice(res.ap, 1);

-        if (network.accessPoints.length == 0) {
-            if (this._activeNetwork == network)
+        if (apObj.accessPoints.length == 0) {
+            if (this._activeNetwork == apObj)
                this._activeNetwork = null;

-            if (network.item)
-                network.item.destroy();
+            if (apObj.item)
+                apObj.item.destroy();

            if (this._overflowItem) {
-                if (!network.isMore) {
+                if (!apObj.isMore) {
                    // we removed an item in the main menu, and we have a more submenu
                    // we need to extract the first item in more and move it to the submenu

                    let item = this._overflowItem.menu.firstMenuItem;
-                    if (item && item._network) {
+                    if (item && item._apObj) {
                        item.destroy();
                        // clear the cycle, and allow the construction of the new item
-                        item._network.item = null;
+                        item._apObj.item = null;

-                        this._createNetworkItem(item._network, NUM_VISIBLE_NETWORKS-1);
+                        this._createNetworkItem(item._apObj, NUM_VISIBLE_NETWORKS-1);
                    } else {
                        log('The more... menu was existing and empty! This should not happen');
                    }
@ -1064,14 +1238,14 @@ const NMDeviceWireless = new Lang.Class({
            let okPrev = true, okNext = true;

            if (res.network > 0)
-                okPrev = this._networkSortFunction(this._networks[res.network - 1], network) >= 0;
+                okPrev = this._networkSortFunction(this._networks[res.network - 1], apObj) >= 0;
            if (res.network < this._networks.length-1)
-                okNext = this._networkSortFunction(this._networks[res.network + 1], network) <= 0;
+                okNext = this._networkSortFunction(this._networks[res.network + 1], apObj) <= 0;

            if (!okPrev || !okNext)
                this._queueCreateSection();
-            else if (network.item)
-                network.item.updateBestAP(network.accessPoints[0]);
+            else if (apObj.item)
+                apObj.item.updateBestAP(apObj.accessPoints[0]);
        }
    },

@ -1110,20 +1284,20 @@ const NMDeviceWireless = new Lang.Class({

        let forceupdate = false;
        for (let i = 0; i < this._networks.length; i++) {
-            let network = this._networks[i];
-            let connections = network.connections;
+            let apObj = this._networks[i];
+            let connections = apObj.connections;
            for (let k = 0; k < connections.length; k++) {
                if (connections[k].get_uuid() == connection.get_uuid()) {
                    // remove the connection from the access point group
-                    connections.splice(k, 1);
+                    connections.splice(k);
                    forceupdate = forceupdate || connections.length == 0;

                    if (forceupdate)
                        break;

-                    if (network.item) {
-                        if (network.item instanceof PopupMenu.PopupSubMenuMenuItem) {
-                            let items = network.item.menu._getMenuItems();
+                    if (apObj.item) {
+                        if (apObj.item instanceof PopupMenu.PopupSubMenuMenuItem) {
+                            let items = apObj.item.menu._getMenuItems();
                            if (items.length == 2) {
                                // we need to update the connection list to convert this to a normal item
                                forceupdate = true;
@ -1136,8 +1310,8 @@ const NMDeviceWireless = new Lang.Class({
                                }
                            }
                        } else {
-                            network.item.destroy();
-                            network.item = null;
+                            apObj.item.destroy();
+                            apObj.item = null;
                        }
                    }
                    break;
@ -1163,13 +1337,13 @@ const NMDeviceWireless = new Lang.Class({
        // find an appropriate access point
        let forceupdate = false;
        for (let i = 0; i < this._networks.length; i++) {
-            let network = this._networks[i];
+            let apObj = this._networks[i];

            // Check if connection is valid for any of these access points
-            for (let k = 0; k < network.accessPoints.length; k++) {
-                let ap = network.accessPoints[k];
+            for (let k = 0; k < apObj.accessPoints.length; k++) {
+                let ap = apObj.accessPoints[k];
                if (ap.connection_valid(connection)) {
-                    network.connections.push(connection);
+                    apObj.connections.push(connection);
                    // this potentially changes the sorting order
                    forceupdate = true;
                    break;
@ -1190,30 +1364,55 @@ const NMDeviceWireless = new Lang.Class({
        else
            title = _("Connected (private)");

-        this._activeConnectionItem = new NMNetworkMenuItem(this.device.active_access_point, undefined,
-                                                           { reactive: false });
-        this._activeConnectionItem.setOrnament(PopupMenu.Ornament.DOT);
+        if (this._activeNetwork)
+            this._activeConnectionItem = new NMNetworkMenuItem(this.device.active_access_point, undefined,
+                                                               { reactive: false });
+        else
+            this._activeConnectionItem = new PopupMenu.PopupImageMenuItem(title,
+                                                                          'network-wireless-connected-symbolic',
+                                                                          { reactive: false });
+        this._activeConnectionItem.setShowDot(true);
    },

-    _createNetworkItem: function(network, position) {
-        if(!network.accessPoints || network.accessPoints.length == 0) {
+    _createAutomaticConnection: function(apObj) {
+        let name;
+        let ssid = NetworkManager.utils_ssid_to_utf8(apObj.ssid);
+        if (ssid) {
+            /* TRANSLATORS: this the automatic wireless connection name (including the network name) */
+            name = _("Auto %s").format(ssid);
+        } else
+            name = _("Auto wireless");
+
+        let connection = new NetworkManager.Connection();
+        connection.add_setting(new NetworkManager.SettingWireless());
+        connection.add_setting(new NetworkManager.SettingConnection({
+            id: name,
+            autoconnect: true, // NetworkManager will know to ignore this if appropriate
+            uuid: NetworkManager.utils_uuid_generate(),
+            type: NetworkManager.SETTING_WIRELESS_SETTING_NAME
+        }));
+        return connection;
+    },
+
+    _createNetworkItem: function(apObj, position) {
+        if(!apObj.accessPoints || apObj.accessPoints.length == 0) {
            // this should not happen, but I have no idea why it happens
            return;
        }

-        if(network.connections.length > 0) {
-            if (network.connections.length == 1) {
-                network.item = this._createAPItem(network.connections[0], network, false);
+        if(apObj.connections.length > 0) {
+            if (apObj.connections.length == 1) {
+                apObj.item = this._createAPItem(apObj.connections[0], apObj, false);
            } else {
-                let title = network.ssidText;
-                network.item = new PopupMenu.PopupSubMenuMenuItem(title);
-                for (let i = 0; i < network.connections.length; i++)
-                    network.item.menu.addMenuItem(this._createAPItem(network.connections[i], network, true));
+                let title = apObj.ssidText;
+                apObj.item = new PopupMenu.PopupSubMenuMenuItem(title);
+                for (let i = 0; i < apObj.connections.length; i++)
+                    apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true));
            }
        } else {
-            network.item = new NMNetworkMenuItem(network.accessPoints[0]);
-            network.item.connect('activate', Lang.bind(this, function() {
-                let accessPoints = network.accessPoints;
+            apObj.item = new NMNetworkMenuItem(apObj.accessPoints[0]);
+            apObj.item.connect('activate', Lang.bind(this, function() {
+                let accessPoints = apObj.accessPoints;
                if (   (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)
                    || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
                    // 802.1x-enabled APs require further configuration, so they're
@ -1221,23 +1420,23 @@ const NMDeviceWireless = new Lang.Class({
                    Util.spawn(['gnome-control-center', 'network', 'connect-8021x-wifi',
                                this.device.get_path(), accessPoints[0].dbus_path]);
                } else {
-                    let connection = new NetworkManager.Connection();
+                    let connection = this._createAutomaticConnection(apObj);
                    this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
                }
            }));
        }
-        network.item._network = network;
+        apObj.item._apObj = apObj;

        if (position < NUM_VISIBLE_NETWORKS) {
-            network.isMore = false;
-            this.section.addMenuItem(network.item, position);
+            apObj.isMore = false;
+            this.section.addMenuItem(apObj.item, position);
        } else {
            if (!this._overflowItem) {
                this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More…"));
                this.section.addMenuItem(this._overflowItem);
            }
-            this._overflowItem.menu.addMenuItem(network.item, position - NUM_VISIBLE_NETWORKS);
-            network.isMore = true;
+            this._overflowItem.menu.addMenuItem(apObj.item, position - NUM_VISIBLE_NETWORKS);
+            apObj.isMore = true;
        }
    },

@ -1253,13 +1452,13 @@ const NMDeviceWireless = new Lang.Class({
        let activeOffset = this._activeConnectionItem ? 1 : 0;

        for(let j = 0; j < this._networks.length; j++) {
-            let network = this._networks[j];
-            if (network == this._activeNetwork) {
+            let apObj = this._networks[j];
+            if (apObj == this._activeNetwork) {
                activeOffset--;
                continue;
            }

-            this._createNetworkItem(network, j + activeOffset);
+            this._createNetworkItem(apObj, j + activeOffset);
        }
    },
 });
@ -1319,14 +1518,18 @@ const NMVPNSection = new Lang.Class({
    Extends: NMConnectionBased,
    category: NMConnectionCategory.VPN,

-    _init: function(client) {
-        this.parent([]);
+    _init: function(client, connections) {
+        this.parent(connections);
        this._client = client;

        this.section = new PopupMenu.PopupMenuSection();
        this._deferredWorkId = Main.initializeDeferredWork(this.section.actor, Lang.bind(this, this._createSection));
    },

+    get empty() {
+        return this._connections.length == 0;
+    },
+
    connectionValid: function(connection) {
        // filtering is done by NMApplet code
        return true;
@ -1477,9 +1680,11 @@ const NMApplet = new Lang.Class({

        // Virtual device types
        this._vtypes = { };
-        this._vtypes[NetworkManager.SETTING_VLAN_SETTING_NAME] = NMDeviceVirtual;
-        this._vtypes[NetworkManager.SETTING_BOND_SETTING_NAME] = NMDeviceVirtual;
-        this._vtypes[NetworkManager.SETTING_BRIDGE_SETTING_NAME] = NMDeviceVirtual;
+        if (NMGtk) {
+            this._vtypes[NetworkManager.SETTING_VLAN_SETTING_NAME] = NMDeviceVirtual;
+            this._vtypes[NetworkManager.SETTING_BOND_SETTING_NAME] = NMDeviceVirtual;
+            this._vtypes[NetworkManager.SETTING_BRIDGE_SETTING_NAME] = NMDeviceVirtual;
+        }

        // Connection types
        this._ctypes = { };
@ -1491,9 +1696,11 @@ const NMApplet = new Lang.Class({
        this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
        this._ctypes[NetworkManager.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN;
        this._ctypes[NetworkManager.SETTING_INFINIBAND_SETTING_NAME] = NMConnectionCategory.WIRED;
-        this._ctypes[NetworkManager.SETTING_VLAN_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
-        this._ctypes[NetworkManager.SETTING_BOND_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
-        this._ctypes[NetworkManager.SETTING_BRIDGE_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
+        if (NMGtk) {
+            this._ctypes[NetworkManager.SETTING_VLAN_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
+            this._ctypes[NetworkManager.SETTING_BOND_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
+            this._ctypes[NetworkManager.SETTING_BRIDGE_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
+        }
        this._ctypes[NetworkManager.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN;

        NMClient.Client.new_async(null, Lang.bind(this, this._clientGot));
@ -1561,7 +1768,7 @@ const NMApplet = new Lang.Class({
        this._devices.wireless = {
            section: new PopupMenu.PopupMenuSection(),
            devices: [ ],
-            item: this._makeWirelessToggle()
+            item: this._makeToggleItem('wireless', _("Wi-Fi"))
        };
        this._devices.wireless.section.addMenuItem(this._devices.wireless.item);
        this._devices.wireless.section.actor.hide();
@ -1576,7 +1783,7 @@ const NMApplet = new Lang.Class({
        this.menu.addMenuItem(this._devices.wwan.section);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

-        this._vpnSection = new NMVPNSection(this._client);
+        this._vpnSection = new NMVPNSection(this._client, this._connections);
        this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed));
        this.menu.addMenuItem(this._vpnSection.section);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@ -1608,14 +1815,14 @@ const NMApplet = new Lang.Class({
        }
    },

-    _makeWirelessToggle: function() {
-        let item = new NMWirelessSectionTitleMenuItem(this._client);
+    _makeToggleItem: function(type, title) {
+        let item = new NMWirelessSectionTitleMenuItem(this._client, type, title);
        item.connect('enabled-changed', Lang.bind(this, function(item, enabled) {
-            let devices = this._devices.wireless.devices;
+            let devices = this._devices[type].devices;
            devices.forEach(function(dev) {
                dev.setEnabled(enabled);
            });
-            this._syncSectionTitle('wireless');
+            this._syncSectionTitle(type);
        }));
        return item;
    },
@ -1693,12 +1900,19 @@ const NMApplet = new Lang.Class({
    },

    _syncDeviceNames: function() {
-        let names = NMGtk.utils_disambiguate_device_names(this._nmDevices);
-        for (let i = 0; i < this._nmDevices.length; i++) {
-            let device = this._nmDevices[i];
-            device._description = names[i];
-            if (device._delegate)
+        if (NMGtk) {
+            let names = NMGtk.utils_disambiguate_device_names(this._nmDevices);
+            for (let i = 0; i < this._nmDevices.length; i++) {
+                let device = this._nmDevices[i];
+                device._description = names[i];
+                if (device._delegate)
+                    device._delegate.syncDescription();
+            }
+        } else {
+            for (let i = 0; i < this._nmDevices.length; i++) {
+                let device = this._nmDevices[i];
                device._delegate.syncDescription();
+            }
        }
    },

@ -1734,6 +1948,11 @@ const NMApplet = new Lang.Class({
        wrapper._deviceStateChangedId = wrapper.connect('state-changed', Lang.bind(this, function(dev) {
            this._syncSectionTitle(dev.category);
        }));
+        wrapper._destroyId = wrapper.connect('destroy', function(wrapper) {
+            wrapper.disconnect(wrapper._activationFailedId);
+            wrapper.disconnect(wrapper._deviceStateChangedId);
+            wrapper.disconnect(wrapper._destroyId);
+        });

        let section = this._devices[wrapper.category].section;
        section.addMenuItem(wrapper.statusItem);
@ -1765,8 +1984,6 @@ const NMApplet = new Lang.Class({
    },

    _removeDeviceWrapper: function(wrapper) {
-        wrapper.disconnect(wrapper._activationFailedId);
-        wrapper.disconnect(wrapper._deviceStateChangedId);
        wrapper.destroy();

        let devices = this._devices[wrapper.category].devices;
@ -1863,19 +2080,27 @@ const NMApplet = new Lang.Class({

            if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING)
                activating = a;
-            else if (a.state == NetworkManager.ActiveConnectionState.ACTIVATED)
+            else if (a.state == NetworkManager.ActiveConnectionState.ACTIVE)
                active_any = a;

            if (a._type == 'vpn' &&
                (a.state == NetworkManager.ActiveConnectionState.ACTIVATING ||
-                 a.state == NetworkManager.ActiveConnectionState.ACTIVATED))
+                 a.state == NetworkManager.ActiveConnectionState.ACTIVE))
                active_vpn = a;

            if (!a._primaryDevice) {
-                if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME)
-                    // This list is guaranteed to have one device in it.
-                    a._primaryDevice = a.get_devices()[0]._delegate;
-                else
+                if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME) {
+                    // find a good device to be considered primary
+                    a._primaryDevice = null;
+                    let devices = a.get_devices() || [];
+                    for (let j = 0; j < devices.length; j++) {
+                        let d = devices[j];
+                        if (d._delegate) {
+                            a._primaryDevice = d._delegate;
+                            break;
+                        }
+                    }
+                } else
                    a._primaryDevice = this._vpnSection;

                if (a._primaryDevice)
@ -1915,7 +2140,25 @@ const NMApplet = new Lang.Class({
        return false;
    },

-    _addConnection: function(connection) {
+    _readConnections: function() {
+        let connections = this._settings.list_connections();
+        for (let i = 0; i < connections.length; i++) {
+            let connection = connections[i];
+            if (this._ignoreConnection(connection))
+                continue;
+            if (connection._updatedId) {
+                // connection was already seen (for example because NetworkManager was restarted)
+                continue;
+            }
+            connection._removedId = connection.connect('removed', Lang.bind(this, this._connectionRemoved));
+            connection._updatedId = connection.connect('updated', Lang.bind(this, this._updateConnection));
+
+            this._updateConnection(connection);
+            this._connections.push(connection);
+        }
+    },
+
+    _newConnection: function(settings, connection) {
        if (this._ignoreConnection(connection))
            return;
        if (connection._updatedId) {
@ -1928,22 +2171,14 @@ const NMApplet = new Lang.Class({

        this._updateConnection(connection);
        this._connections.push(connection);
-    },

-    _readConnections: function() {
-        let connections = this._settings.list_connections();
-        connections.forEach(Lang.bind(this, this._addConnection));
-    },
-
-    _newConnection: function(settings, connection) {
-        this._addConnection(connection);
        this._updateIcon();
    },

    _connectionRemoved: function(connection) {
        let pos = this._connections.indexOf(connection);
        if (pos != -1)
-            this._connections.splice(connection, 1);
+            this._connections.splice(connection);

        let section = connection._section;

--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@ -307,7 +307,7 @@ const Indicator = new Lang.Class({
            this._headphoneIcon.visible = value;
        }));

-        this._headphoneIcon = this.addIcon(new Gio.ThemedIcon({ name: 'audio-headphones-symbolic' }));
+        this._headphoneIcon = this.addIcon(new Gio.ThemedIcon({ name: 'headphones-symbolic' }));
        this._headphoneIcon.visible = false;

        this.menu.addMenuItem(this._volumeMenu);
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@ -16,7 +16,6 @@ const UserWidget = new Lang.Class({

        this.actor = new St.BoxLayout({ style_class: 'user-widget',
                                        vertical: false });
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        this._avatar = new UserMenu.UserAvatarWidget(user);
        this.actor.add(this._avatar.actor,
@ -37,7 +36,7 @@ const UserWidget = new Lang.Class({
            this._updateUser();
    },

-    _onDestroy: function() {
+    destroy: function() {
        if (this._userLoadedId != 0) {
            this._user.disconnect(this._userLoadedId);
            this._userLoadedId = 0;
@ -47,6 +46,8 @@ const UserWidget = new Lang.Class({
            this._user.disconnect(this._userChangedId);
            this._userChangedId = 0;
        }
+
+        this.actor.destroy();
    },

    _updateUser: function() {
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -150,14 +150,6 @@ const ViewSelector = new Lang.Class({
                              Shell.KeyBindingMode.NORMAL |
                              Shell.KeyBindingMode.OVERVIEW,
                              Lang.bind(this, this._toggleAppsPage));
-
-        Main.wm.addKeybinding('toggle-overview',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                              Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL |
-                              Shell.KeyBindingMode.OVERVIEW,
-                              Lang.bind(Main.overview, Main.overview.toggle));
-
    },

    _toggleAppsPage: function() {
@ -186,10 +178,6 @@ const ViewSelector = new Lang.Class({
            Main.overview.fadeInDesktop();
    },

-    setWorkspacesFullGeometry: function(geom) {
-        this._workspacesDisplay.setWorkspacesFullGeometry(geom);
-    },
-
    hide: function() {
        this._workspacesDisplay.hide();
    },
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
@ -67,209 +66,6 @@ function getWindowDimmer(actor) {
    }
 }

-/*
- * When the last window closed on a workspace is a dialog or splash
- * screen, we assume that it might be an initial window shown before
- * the main window of an application, and give the app a grace period
- * where it can map another window before we remove the workspace.
- */
-const LAST_WINDOW_GRACE_TIME = 1000;
-
-const WorkspaceTracker = new Lang.Class({
-    Name: 'WorkspaceTracker',
-
-    _init: function(wm) {
-        this._wm = wm;
-
-        this._workspaces = [];
-        this._checkWorkspacesId = 0;
-
-        let tracker = Shell.WindowTracker.get_default();
-        tracker.connect('startup-sequence-changed', Lang.bind(this, this._queueCheckWorkspaces));
-
-        global.screen.connect('notify::n-workspaces', Lang.bind(this, this._nWorkspacesChanged));
-
-        global.screen.connect('window-entered-monitor', Lang.bind(this, this._windowEnteredMonitor));
-        global.screen.connect('window-left-monitor', Lang.bind(this, this._windowLeftMonitor));
-        global.screen.connect('restacked', Lang.bind(this, this._windowsRestacked));
-
-        this._overrideSettings = new Gio.Settings({ schema: 'org.gnome.shell.overrides' });
-        this._overrideSettings.connect('changed::dynamic-workspaces', Lang.bind(this, this._queueCheckWorkspaces));
-
-        this._nWorkspacesChanged();
-    },
-
-    _checkWorkspaces: function() {
-        let i;
-        let emptyWorkspaces = [];
-
-        if (!Meta.prefs_get_dynamic_workspaces()) {
-            this._checkWorkspacesId = 0;
-            return false;
-        }
-
-        for (i = 0; i < this._workspaces.length; i++) {
-            let lastRemoved = this._workspaces[i]._lastRemovedWindow;
-            if ((lastRemoved &&
-                 (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
-                  lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
-                  lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
-                this._workspaces[i]._keepAliveId)
-                emptyWorkspaces[i] = false;
-            else
-                emptyWorkspaces[i] = true;
-        }
-
-        let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
-        for (i = 0; i < sequences.length; i++) {
-            let index = sequences[i].get_workspace();
-            if (index >= 0 && index <= global.screen.n_workspaces)
-                emptyWorkspaces[index] = false;
-        }
-
-        let windows = global.get_window_actors();
-        for (i = 0; i < windows.length; i++) {
-            let win = windows[i];
-
-            if (win.get_meta_window().is_on_all_workspaces())
-                continue;
-
-            let workspaceIndex = win.get_workspace();
-            emptyWorkspaces[workspaceIndex] = false;
-        }
-
-        // If we don't have an empty workspace at the end, add one
-        if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
-            global.screen.append_new_workspace(false, global.get_current_time());
-            emptyWorkspaces.push(false);
-        }
-
-        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] &&
-                                        activeWorkspaceIndex < emptyWorkspaces.length - 1);
-        // Don't enter the overview when removing multiple empty workspaces at startup
-        let showOverview  = (removingCurrentWorkspace &&
-                             !emptyWorkspaces.every(function(x) { return x; }));
-
-        if (removingCurrentWorkspace) {
-            // "Merge" the empty workspace we are removing with the one at the end
-            this._wm.blockAnimations();
-        }
-
-        // Delete other empty workspaces; do it from the end to avoid index changes
-        for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
-            if (emptyWorkspaces[i])
-                global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
-        }
-
-        if (removingCurrentWorkspace) {
-            global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
-            this._wm.unblockAnimations();
-
-            if (!Main.overview.visible && showOverview)
-                Main.overview.show();
-        }
-
-        this._checkWorkspacesId = 0;
-        return false;
-    },
-
-    keepWorkspaceAlive: function(workspace, duration) {
-        if (workspace._keepAliveId)
-            Mainloop.source_remove(workspace._keepAliveId);
-
-        workspace._keepAliveId = Mainloop.timeout_add(duration, Lang.bind(this, function() {
-            workspace._keepAliveId = 0;
-            this._queueCheckWorkspaces();
-            return false;
-        }));
-    },
-
-    _windowRemoved: function(workspace, window) {
-        workspace._lastRemovedWindow = window;
-        this._queueCheckWorkspaces();
-        Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, Lang.bind(this, function() {
-            if (workspace._lastRemovedWindow == window) {
-                workspace._lastRemovedWindow = null;
-                this._queueCheckWorkspaces();
-            }
-            return false;
-        }));
-    },
-
-    _windowLeftMonitor: function(metaScreen, monitorIndex, metaWin) {
-        // If the window left the primary monitor, that
-        // might make that workspace empty
-        if (monitorIndex == Main.layoutManager.primaryIndex)
-            this._queueCheckWorkspaces();
-    },
-
-    _windowEnteredMonitor: function(metaScreen, monitorIndex, metaWin) {
-        // If the window entered the primary monitor, that
-        // might make that workspace non-empty
-        if (monitorIndex == Main.layoutManager.primaryIndex)
-            this._queueCheckWorkspaces();
-    },
-
-    _windowsRestacked: function() {
-        // Figure out where the pointer is in case we lost track of
-        // it during a grab. (In particular, if a trayicon popup menu
-        // is dismissed, see if we need to close the message tray.)
-        global.sync_pointer();
-    },
-
-    _queueCheckWorkspaces: function() {
-        if (this._checkWorkspacesId == 0)
-            this._checkWorkspacesId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, this._checkWorkspaces));
-    },
-
-    _nWorkspacesChanged: function() {
-        let oldNumWorkspaces = this._workspaces.length;
-        let newNumWorkspaces = global.screen.n_workspaces;
-
-        if (oldNumWorkspaces == newNumWorkspaces)
-            return false;
-
-        let lostWorkspaces = [];
-        if (newNumWorkspaces > oldNumWorkspaces) {
-            let w;
-
-            // Assume workspaces are only added at the end
-            for (w = oldNumWorkspaces; w < newNumWorkspaces; w++)
-                this._workspaces[w] = global.screen.get_workspace_by_index(w);
-
-            for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-                let workspace = this._workspaces[w];
-                workspace._windowAddedId = workspace.connect('window-added', Lang.bind(this, this._queueCheckWorkspaces));
-                workspace._windowRemovedId = workspace.connect('window-removed', Lang.bind(this, this._windowRemoved));
-            }
-
-        } 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 workspace = global.screen.get_workspace_by_index(w);
-                if (this._workspaces[w] != workspace) {
-                    removedIndex = w;
-                    break;
-                }
-            }
-
-            let lostWorkspaces = this._workspaces.splice(removedIndex, removedNum);
-            lostWorkspaces.forEach(function(workspace) {
-                workspace.disconnect(workspace._windowAddedId);
-                workspace.disconnect(workspace._windowRemovedId);
-            });
-        }
-
-        this._queueCheckWorkspaces();
-
-        return false;
-    }
-});
-
 const WindowManager = new Lang.Class({
    Name: 'WindowManager',

@ -340,90 +136,6 @@ const WindowManager = new Lang.Class({
                                        Shell.KeyBindingMode.NORMAL |
                                        Shell.KeyBindingMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-1',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-2',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-3',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-4',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-5',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-6',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-7',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-8',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-9',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-10',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-11',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-12',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-1',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-2',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-3',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-4',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-5',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-6',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-7',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-8',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-9',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-10',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-11',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-12',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-applications',
                                        Shell.KeyBindingMode.NORMAL,
                                        Lang.bind(this, this._startAppSwitcher));
@ -472,11 +184,6 @@ const WindowManager = new Lang.Class({
            for (let i = 0; i < this._dimmedWindows.length; i++)
                this._dimWindow(this._dimmedWindows[i]);
        }));
-
-        this._workspaceTracker = new WorkspaceTracker(this);
-
-        global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
-                                                false, -1, 1);
    },

    setCustomKeybindingHandler: function(name, modes, handler) {
@ -981,31 +688,19 @@ const WindowManager = new Lang.Class({
        if (screen.n_workspaces == 1)
            return;

-        let [action,,,target] = binding.get_name().split('-');
+        let [action,,,direction] = binding.get_name().split('-');
+        let direction = Meta.MotionDirection[direction.toUpperCase()];
        let newWs;
-        let direction;

-        if (isNaN(target)) {
-            direction = Meta.MotionDirection[target.toUpperCase()];
-            newWs = screen.get_active_workspace().get_neighbor(direction);
-        } else if (target > 0) {
-            target--;
-            newWs = screen.get_workspace_by_index(target);
-
-            if (screen.get_active_workspace().index() > target)
-                direction = Meta.MotionDirection.UP;
-            else
-                direction = Meta.MotionDirection.DOWN;
-        }

        if (direction != Meta.MotionDirection.UP &&
            direction != Meta.MotionDirection.DOWN)
            return;

        if (action == 'switch')
-            this.actionMoveWorkspace(newWs);
+            newWs = this.actionMoveWorkspace(direction);
        else
-            this.actionMoveWindow(window, newWs);
+            newWs = this.actionMoveWindow(window, direction);

        if (!Main.overview.visible) {
            if (this._workspaceSwitcherPopup == null) {
@ -1018,27 +713,31 @@ const WindowManager = new Lang.Class({
        }
    },

-    actionMoveWorkspace: function(workspace) {
+    actionMoveWorkspace: function(direction) {
        let activeWorkspace = global.screen.get_active_workspace();
+        let toActivate = activeWorkspace.get_neighbor(direction);

-        if (activeWorkspace != workspace)
-            workspace.activate(global.get_current_time());
+        if (activeWorkspace != toActivate)
+            toActivate.activate(global.get_current_time());

+        return toActivate;
    },

-    actionMoveWindow: function(window, workspace) {
+    actionMoveWindow: function(window, direction) {
        let activeWorkspace = global.screen.get_active_workspace();
+        let toActivate = activeWorkspace.get_neighbor(direction);

-        if (activeWorkspace != workspace) {
+        if (activeWorkspace != toActivate) {
            // This won't have any effect for "always sticky" windows
            // (like desktop windows or docks)

            this._movingWindow = window;
-            window.change_workspace(workspace);
+            window.change_workspace(toActivate);

            global.display.clear_mouse_mode();
-            workspace.activate_with_focus (window, global.get_current_time());
+            toActivate.activate_with_focus (window, global.get_current_time());
        }

+        return toActivate;
    },
 });
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -453,10 +453,6 @@ const WindowOverlay = new Lang.Class({
        metaWindow.delete(global.get_current_time());
    },

-    _windowCanClose: function() {
-        return this._windowClone.metaWindow.can_close();
-    },
-
    _onWindowAdded: function(workspace, win) {
        let metaWindow = this._windowClone.metaWindow;

@ -492,14 +488,12 @@ const WindowOverlay = new Lang.Class({
    _animateVisible: function() {
        this._parentActor.raise_top();

-        if (this._windowCanClose()) {
-            this.closeButton.show();
-            this.closeButton.opacity = 0;
-            Tweener.addTween(this.closeButton,
-                             { opacity: 255,
-                               time: CLOSE_BUTTON_FADE_TIME,
-                               transition: 'easeOutQuad' });
-        }
+        this.closeButton.show();
+        this.closeButton.opacity = 0;
+        Tweener.addTween(this.closeButton,
+                         { opacity: 255,
+                           time: CLOSE_BUTTON_FADE_TIME,
+                           transition: 'easeOutQuad' });

        this.border.show();
        this.border.opacity = 0;
@ -759,6 +753,13 @@ const LayoutStrategy = new Lang.Class({
        layout.space = space;
    },

+    _getDistance: function (row, actor) {
+        let dist_x = actor.x - row.x;
+        let dist_y = actor.y - row.y;
+
+        return Math.sqrt(Math.pow(dist_x, 2) + Math.pow(dist_y, 2));
+    },
+
    computeWindowSlots: function(layout, area) {
        this._computeRowSizes(layout);

@ -766,36 +767,28 @@ const LayoutStrategy = new Lang.Class({

        let slots = [];

-        // Do this in three parts.
-        let height = 0;
-        for (let i = 0; i < rows.length; i++) {
-            let row = rows[i];
-            height += row.height + this._rowSpacing;
-        }
-
-        height -= this._rowSpacing;
-
        let y = 0;
-
        for (let i = 0; i < rows.length; i++) {
            let row = rows[i];
-
-            // If this window layout row doesn't fit in the actual
-            // geometry, then apply an additional scale to it.
-            row.additionalScale = Math.min(1, area.width / row.width, area.height / height);
-
-            row.x = area.x + (Math.max(area.width - row.width, 0) / 2) * row.additionalScale;
-            row.y = area.y + (y + Math.max(area.height - height, 0) / 2) * row.additionalScale;
+            row.x = area.x + (area.width - row.width) / 2;
+            row.y = area.y + y;
            y += row.height + this._rowSpacing;
+            row.windows.sort(Lang.bind(this, function(a, b) {
+                return this._getDistance(row, a.realWindow) - this._getDistance(row, b.realWindow);
+            }));
        }

+        let height = y - this._rowSpacing;
+        let baseY = (area.height - height) / 2;
+
        for (let i = 0; i < rows.length; i++) {
            let row = rows[i];
+            row.y += baseY;
            let x = row.x;
            for (let j = 0; j < row.windows.length; j++) {
                let window = row.windows[j];

-                let s = scale * this._computeWindowScale(window) * row.additionalScale;
+                let s = scale * this._computeWindowScale(window);
                let cellWidth = window.actor.width * s;
                let cellHeight = window.actor.height * s;

@ -839,13 +832,6 @@ const UnalignedLayoutStrategy = new Lang.Class({
        return false;
    },

-    _sortRow: function(row) {
-        // Sort windows horizontally to minimize travel distance
-        row.windows.sort(function(a, b) {
-            return a.realWindow.x - b.realWindow.x;
-        });
-    },
-
    computeLayout: function(windows, layout) {
        let numRows = layout.numRows;

@ -876,7 +862,6 @@ const UnalignedLayoutStrategy = new Lang.Class({
                    row.windows.push(window);
                    row.fullWidth += width;
                } else {
-                    this._sortRow(row);
                    break;
                }
            }
@ -898,14 +883,6 @@ const UnalignedLayoutStrategy = new Lang.Class({
    }
 });

-function padArea(area, padding) {
-    return {
-        x: area.x + padding.left,
-        y: area.y + padding.top,
-        width: area.width - padding.left - padding.right,
-        height: area.height - padding.top - padding.bottom,
-    };
-}

 /**
 * @metaWorkspace: a #Meta.Workspace, or null
@ -917,19 +894,10 @@ const Workspace = new Lang.Class({
        // When dragging a window, we use this slot for reserve space.
        this._reservedSlot = null;
        this.metaWorkspace = metaWorkspace;
-
-        // The full geometry is the geometry we should try and position
-        // windows for. The actual geometry we allocate may be less than
-        // this, like if the workspace switcher is slid out.
-        this._fullGeometry = null;
-
-        // The actual geometry is the geometry we need to arrange windows
-        // in. If this is a smaller area than the full geometry, we'll
-        // do some simple aspect ratio like math to fit the layout calculated
-        // for the full geometry into this area.
-        this._actualGeometry = null;
-
-        this._currentLayout = null;
+        this._x = 0;
+        this._y = 0;
+        this._width = 0;
+        this._height = 0;

        this.monitorIndex = monitorIndex;
        this._monitor = Main.layoutManager.monitors[this.monitorIndex];
@ -942,7 +910,7 @@ const Workspace = new Lang.Class({
            this.actor.add_style_class_name('external-monitor');
        this.actor.set_size(0, 0);

-        this._dropRect = new Clutter.Actor({ opacity: 0 });
+        this._dropRect = new Clutter.Rectangle({ opacity: 0 });
        this._dropRect._delegate = this;

        this.actor.add_actor(this._dropRect);
@ -979,29 +947,23 @@ const Workspace = new Lang.Class({

        this._positionWindowsFlags = 0;
        this._positionWindowsId = 0;
+
+        this._currentLayout = null;
    },

-    setFullGeometry: function(geom) {
-        this._fullGeometry = geom;
-        this._recalculateWindowPositions(WindowPositionFlags.NONE);
-    },
+    setGeometry: function(x, y, width, height) {
+        this._x = x;
+        this._y = y;
+        this._width = width;
+        this._height = height;

-    setActualGeometry: function(geom) {
-        this._actualGeometry = geom;
-
-        if (this._actualGeometryLater)
-            return;
-
-        this._actualGeometryLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-            let geom = this._actualGeometry;
-
-            this._dropRect.set_position(geom.x, geom.y);
-            this._dropRect.set_size(geom.width, geom.height);
-            this._updateWindowPositions(WindowPositionFlags.NONE);
-
-            this._actualGeometryLater = 0;
+        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+            this._dropRect.set_position(x, y);
+            this._dropRect.set_size(width, height);
            return false;
        }));
+
+        this.positionWindows(WindowPositionFlags.NONE);
    },

    _lookupIndex: function (metaWindow) {
@ -1029,32 +991,37 @@ const Workspace = new Lang.Class({
            clone = null;

        this._reservedSlot = clone;
-        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
+        this._currentLayout = null;
+        this.positionWindows(WindowPositionFlags.ANIMATE);
    },

-    _recalculateWindowPositions: function(flags) {
+    /**
+     * positionWindows:
+     * @flags:
+     *  INITIAL - this is the initial positioning of the windows.
+     *  ANIMATE - Indicates that we need animate changing position.
+     */
+    positionWindows: function(flags) {
        this._positionWindowsFlags |= flags;

        if (this._positionWindowsId > 0)
            return;

        this._positionWindowsId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-            this._realRecalculateWindowPositions(this._positionWindowsFlags);
+            this._realPositionWindows(this._positionWindowsFlags);
            this._positionWindowsFlags = 0;
            this._positionWindowsId = 0;
            return false;
        }));
    },

-    _realRecalculateWindowPositions: function(flags) {
+    _realPositionWindows : function(flags) {
        if (this._repositionWindowsId > 0) {
            Mainloop.source_remove(this._repositionWindowsId);
            this._repositionWindowsId = 0;
        }

        let clones = this._windows.slice();
-        if (clones.length == 0)
-            return;

        clones.sort(function(a, b) {
            return a.metaWindow.get_stable_sequence() - b.metaWindow.get_stable_sequence();
@ -1063,25 +1030,11 @@ const Workspace = new Lang.Class({
        if (this._reservedSlot)
            clones.push(this._reservedSlot);

-        this._currentLayout = this._computeLayout(clones);
-        this._updateWindowPositions(flags);
-    },
-
-    _updateWindowPositions: function(flags) {
-        if (this._currentLayout == null) {
-            this._recalculateWindowPositions(flags);
-            return;
-        }
-
        let initialPositioning = flags & WindowPositionFlags.INITIAL;
        let animate = flags & WindowPositionFlags.ANIMATE;

-        let layout = this._currentLayout;
-        let strategy = layout.strategy;
-
-        let [, , padding] = this._getSpacingAndPadding();
-        let area = padArea(this._actualGeometry, padding);
-        let slots = strategy.computeWindowSlots(layout, area);
+        // Start the animations
+        let slots = this._computeAllWindowSlots(clones);

        let currentWorkspace = global.screen.get_active_workspace();
        let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
@ -1195,8 +1148,8 @@ const Workspace = new Lang.Class({
        let [x, y, mask] = global.get_pointer();

        let pointerHasMoved = (this._cursorX != x && this._cursorY != y);
-        let inWorkspace = (this._fullGeometry.x < x && x < this._fullGeometry.x + this._fullGeometry.width &&
-                           this._fullGeometry.y < y && y < this._fullGeometry.y + this._fullGeometry.height);
+        let inWorkspace = (this._x < x && x < this._x + this._width &&
+                           this._y < y && y < this._y + this._height);

        if (pointerHasMoved && inWorkspace) {
            // store current cursor position
@ -1211,7 +1164,7 @@ const Workspace = new Lang.Class({
                return true;
        }

-        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
+        this.positionWindows(WindowPositionFlags.ANIMATE);
        return false;
    },

@ -1316,7 +1269,7 @@ const Workspace = new Lang.Class({
        }

        this._currentLayout = null;
-        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
+        this.positionWindows(WindowPositionFlags.ANIMATE);
    },

    _windowAdded : function(metaWorkspace, metaWin) {
@ -1353,8 +1306,13 @@ const Workspace = new Lang.Class({

    // Animate the full-screen to Overview transition.
    zoomToOverview : function() {
+        this._currentLayout = null;
+
        // Position and scale the windows.
-        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE | WindowPositionFlags.INITIAL);
+        if (Main.overview.animationInProgress)
+            this.positionWindows(WindowPositionFlags.ANIMATE | WindowPositionFlags.INITIAL);
+        else
+            this.positionWindows(WindowPositionFlags.INITIAL);
    },

    // Animates the return from Overview mode
@ -1478,7 +1436,7 @@ const Workspace = new Lang.Class({
                      }));
        clone.connect('size-changed',
                      Lang.bind(this, function() {
-                          this._recalculateWindowPositions(WindowPositionFlags.NONE);
+                          this.positionWindows(0);
                      }));

        this.actor.add_actor(clone.actor);
@ -1527,14 +1485,12 @@ const Workspace = new Lang.Class({
        }
    },

-    _getBestLayout: function(windows, area, rowSpacing, columnSpacing) {
+    _computeLayout: function(windows, area, rowSpacing, columnSpacing) {
        // We look for the largest scale that allows us to fit the
        // largest row/tallest column on the workspace.

        let lastLayout = {};

-        let strategy = new UnalignedLayoutStrategy(this._monitor, rowSpacing, columnSpacing);
-
        for (let numRows = 1; ; numRows++) {
            let numColumns = Math.ceil(windows.length / numRows);

@ -1544,6 +1500,8 @@ const Workspace = new Lang.Class({
            if (numColumns == lastLayout.numColumns)
                break;

+            let strategy = new UnalignedLayoutStrategy(this._monitor, rowSpacing, columnSpacing);
+
            let layout = { area: area, strategy: strategy, numRows: numRows, numColumns: numColumns };
            strategy.computeLayout(windows, layout);
            strategy.computeScaleAndSpace(layout);
@ -1557,7 +1515,18 @@ const Workspace = new Lang.Class({
        return lastLayout;
    },

-    _getSpacingAndPadding: function() {
+    _rectEqual: function(one, two) {
+        if (one == two)
+            return true;
+
+        return (one.x == two.x &&
+                one.y == two.y &&
+                one.width == two.width &&
+                one.height == two.height);
+    },
+
+    _computeAllWindowSlots: function(windows) {
+        let totalWindows = windows.length;
        let node = this.actor.get_theme_node();

        // Window grid spacing
@ -1570,14 +1539,21 @@ const Workspace = new Lang.Class({
            right: node.get_padding(St.Side.RIGHT),
        };

+        if (!totalWindows)
+            return [];
+
        let closeButtonHeight, captionHeight;
        let leftBorder, rightBorder;
-
-        // All of the overlays have the same chrome sizes,
-        // so just pick the first one.
-        let overlay = this._windowOverlays[0];
-        [closeButtonHeight, captionHeight] = overlay.chromeHeights();
-        [leftBorder, rightBorder] = overlay.chromeWidths();
+        if (this._windowOverlays.length) {
+            // All of the overlays have the same chrome sizes,
+            // so just pick the first one.
+            let overlay = this._windowOverlays[0];
+            [closeButtonHeight, captionHeight] = overlay.chromeHeights();
+            [leftBorder, rightBorder] = overlay.chromeWidths();
+        } else {
+            [closeButtonHeight, captionHeight] = [0, 0];
+            [leftBorder, rightBorder] = [0, 0];
+        }

        rowSpacing += captionHeight;
        columnSpacing += (rightBorder + leftBorder) / 2;
@ -1586,13 +1562,25 @@ const Workspace = new Lang.Class({
        padding.left += leftBorder;
        padding.right += rightBorder;

-        return [rowSpacing, columnSpacing, padding];
-    },
+        let area = {
+            x: this._x + padding.left,
+            y: this._y + padding.top,
+            width: this._width - padding.left - padding.right,
+            height: this._height - padding.top - padding.bottom,
+        };

-    _computeLayout: function(windows) {
-        let [rowSpacing, columnSpacing, padding] = this._getSpacingAndPadding();
-        let area = padArea(this._fullGeometry, padding);
-        return this._getBestLayout(windows, area, rowSpacing, columnSpacing);
+        if (!this._currentLayout)
+            this._currentLayout = this._computeLayout(windows, area, rowSpacing, columnSpacing);
+
+        let layout = this._currentLayout;
+        let strategy = layout.strategy;
+
+        if (!this._rectEqual(area, layout.area)) {
+            layout.area = area;
+            strategy.computeScaleAndSpace(layout);
+        }
+
+        return strategy.computeWindowSlots(layout, area);
    },

    _onCloneSelected : function (clone, time) {
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -23,18 +23,6 @@ const MAX_WORKSPACES = 16;

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

-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);
-}

 const WorkspacesView = new Lang.Class({
    Name: 'WorkspacesView',
@ -55,9 +43,10 @@ const WorkspacesView = new Lang.Class({
                this._updateWorkspaceActors(false);
            }));

-        this._fullGeometry = null;
-        this._actualGeometry = null;
-
+        this._width = 0;
+        this._height = 0;
+        this._x = 0;
+        this._y = 0;
        this._spacing = 0;
        this._animating = false; // tweening
        this._scrolling = false; // swipe-scrolling
@ -96,8 +85,8 @@ const WorkspacesView = new Lang.Class({
        this._overviewShownId =
            Main.overview.connect('shown',
                                 Lang.bind(this, function() {
-                this.actor.set_clip(this._fullGeometry.x, this._fullGeometry.y,
-                                    this._fullGeometry.width, this._fullGeometry.height);
+                this.actor.set_clip(this._x, this._y,
+                                    this._width, this._height);
        }));

        this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
@ -135,9 +124,11 @@ const WorkspacesView = new Lang.Class({
                continue;

            let ws = new Workspace.Workspace(null, i);
-            ws.setFullGeometry(monitors[i]);
-            ws.setActualGeometry(monitors[i]);
-            Main.layoutManager.overviewGroup.add_actor(ws.actor);
+            ws.setGeometry(monitors[i].x,
+                           monitors[i].y,
+                           monitors[i].width,
+                           monitors[i].height);
+            global.overlay_group.add_actor(ws.actor);
            this._extraWorkspaces.push(ws);
        }
    },
@ -148,24 +139,18 @@ const WorkspacesView = new Lang.Class({
        this._extraWorkspaces = [];
    },

-    setFullGeometry: function(geom) {
-        if (rectEqual(this._fullGeometry, geom))
-            return;
+    setGeometry: function(x, y, width, height) {
+      if (this._x == x && this._y == y &&
+          this._width == width && this._height == height)
+          return;

-        this._fullGeometry = geom;
+        this._width = width;
+        this._height = height;
+        this._x = x;
+        this._y = y;

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

    _lookupWorkspaceForMetaWindow: function (metaWindow) {
@ -225,7 +210,7 @@ const WorkspacesView = new Lang.Class({

            Tweener.removeTweens(workspace.actor);

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

            if (showAnimation) {
                let params = { y: y,
@ -296,9 +281,8 @@ const WorkspacesView = new Lang.Class({

        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._workspaces[w].setGeometry(this._x, this._y,
+                                                this._width, this._height);
                this.actor.add_actor(this._workspaces[w].actor);
            }

@ -446,7 +430,7 @@ const WorkspacesDisplay = new Lang.Class({

    _init: function() {
        this.actor = new St.Widget({ clip_to_allocation: true });
-        this.actor.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesActualGeometry));
+        this.actor.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesGeometry));
        this.actor.connect('parent-set', Lang.bind(this, this._parentSet));

        let clickAction = new Clutter.ClickAction()
@ -500,8 +484,6 @@ const WorkspacesDisplay = new Lang.Class({

        this._notifyOpacityId = 0;
        this._scrollEventId = 0;
-
-        this._fullGeometry = null;
    },

    _onPan: function(action) {
@ -590,11 +572,10 @@ const WorkspacesDisplay = new Lang.Class({
            this._workspacesViews.push(view);
        }

-        this._updateWorkspacesFullGeometry();
-        this._updateWorkspacesActualGeometry();
+        this._updateWorkspacesGeometry();

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

    _scrollValueChanged: function() {
@ -638,7 +619,7 @@ const WorkspacesDisplay = new Lang.Class({

                // This is kinda hackish - we want the primary view to
                // appear as parent of this.actor, though in reality it
-                // is added directly to Main.layoutManager.overviewGroup
+                // is added directly to overlay_group
                this._notifyOpacityId = newParent.connect('notify::opacity',
                    Lang.bind(this, function() {
                        let opacity = this.actor.get_parent().opacity;
@ -651,48 +632,31 @@ const WorkspacesDisplay = new Lang.Class({
        }));
    },

-    // This geometry should always be the fullest geometry
-    // the workspaces switcher can ever be allocated, as if
-    // the sliding controls were never slid in at all.
-    setWorkspacesFullGeometry: function(geom) {
-        this._fullGeometry = geom;
-        this._updateWorkspacesFullGeometry();
-    },
-
-    _updateWorkspacesFullGeometry: function() {
+    _updateWorkspacesGeometry: function() {
        if (!this._workspacesViews.length)
            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 fullWidth = this.actor.allocation.x2 - this.actor.allocation.x1;
+        let fullHeight = this.actor.allocation.y2 - this.actor.allocation.y1;

-    _updateWorkspacesActualGeometry: function() {
-        if (!this._workspacesViews.length)
-            return;
+        let width = fullWidth;
+        let height = fullHeight;

        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 rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);

        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);
+                this._workspacesViews[m].setGeometry(x, y, width, height);
                m++;
            } else if (!this._workspacesOnlyOnPrimary) {
-                this._workspacesViews[m].setActualGeometry(monitors[i]);
+                this._workspacesViews[m].setGeometry(monitors[i].x,
+                                                     monitors[i].y,
+                                                     monitors[i].width,
+                                                     monitors[i].height);
                m++;
            }
        }
@ -760,20 +724,15 @@ const WorkspacesDisplay = new Lang.Class({
    _onScrollEvent: function(actor, event) {
        if (!this.actor.mapped)
            return false;
-        let activeWs = global.screen.get_active_workspace();
-        let ws;
        switch (event.get_scroll_direction()) {
        case Clutter.ScrollDirection.UP:
-            ws = activeWs.get_neighbor(Meta.MotionDirection.UP);
-            break;
+            Main.wm.actionMoveWorkspace(Meta.MotionDirection.UP);
+            return true;
        case Clutter.ScrollDirection.DOWN:
-            ws = activeWs.get_neighbor(Meta.MotionDirection.DOWN);
-            break;
-        default:
-            return false;
+            Main.wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
+            return true;
        }
-        Main.wm.actionMoveWorkspace(ws);
-        return true;
+        return false;
    }
 });
 Signals.addSignalMethods(WorkspacesDisplay.prototype);
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@ -16,7 +16,7 @@ const XdndHandler = new Lang.Class({
        this._cursorWindowClone = null;

        // Used as a drag actor in case we don't have a cursor window clone
-        this._dummy = new Clutter.Actor({ width: 1, height: 1, opacity: 0 });
+        this._dummy = new Clutter.Rectangle({ width: 1, height: 1, opacity: 0 });
        Main.uiGroup.add_actor(this._dummy);
        Shell.util_set_hidden_from_pick(this._dummy, true);
        this._dummy.hide();
--- a/man/gnome-shell.xml
+++ b/man/gnome-shell.xml
@ -125,12 +125,6 @@
                                <listitem><para>List possible modes and exit</para></listitem>
                        </varlistentry>

-                        <varlistentry>
-                                <term><option>--clutter-display=<replaceable>DISPLAY</replaceable></option></term>
-
-                                <listitem><para>Clutter the option display (otherwise ignored)</para></listitem>
-                        </varlistentry>
-
                </variablelist>

        </refsect1>
--- a/po/ca.po
+++ b/po/ca.po
@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2013-03-11 21:29+0000\n"
-"PO-Revision-Date: 2013-05-26 08:21+0200\n"
+"PO-Revision-Date: 2013-03-11 00:03+0100\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
@ -1048,7 +1048,7 @@ msgstr "Obre els rellotges"

 #: ../js/ui/dateMenu.js:105
 msgid "Date & Time Settings"
-msgstr "Configuració de la data i de l'hora"
+msgstr "Configuració de la data i l'hora"

 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
--- a/po/cs.po
+++ b/po/cs.po
@ -5,23 +5,23 @@
 # Andre Klapper <ak-47@gmx.net>, 2009.
 # Petr Kovar <pknbe@volny.cz>, 2009, 2010, 2011, 2012.
 # Adam Matoušek <adydas95@gmail.com>, 2012, 2013.
-# Marek Černocký <marek@manet.cz>, 2012, 2013.
+# Marek Černocký <marek@manet.cz>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-26 16:24+0000\n"
-"PO-Revision-Date: 2013-04-26 19:18+0200\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
+"POT-Creation-Date: 2013-03-04 08:38+0000\n"
+"PO-Revision-Date: 2013-03-08 19:47+0100\n"
+"Last-Translator: Adam Matoušek <adamatousek@gmail.com>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.5.4\n"
 "X-Project-Style: gnome\n"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
@ -45,14 +45,10 @@ msgid "Focus the active notification"
 msgstr "Zaměřovat aktivní upozornění"

 #: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Show the overview"
-msgstr "Zobrazit přehled"
-
-#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Show all applications"
 msgstr "Zobrazit všechny aplikace"

-#: ../data/50-gnome-shell-system.xml.in.h:6
+#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Open the application menu"
 msgstr "Otevřít nabídku aplikací"

@ -138,8 +134,8 @@ msgid ""
 "Each category name in this list will be represented as folder in the "
 "application view, rather than being displayed inline in the main view."
 msgstr ""
-"Každá kategorie v tomto seznamu bude zobrazena jako složka, místo toho aby "
-"byla zobrazena v hlavním pohledu."
+"Každá kategorie v tomto seznamu bude zobrazena jako složka, místo toho "
+"aby byla zobrazena v hlavním pohledu."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
@ -223,50 +219,42 @@ msgid ""
 msgstr "Klávesová zkratka k otevření nabídky aplikací v Přehledu aktivit"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-msgid "Keybinding to open the overview"
-msgstr "Klávesová zkratka k otevření přehledu"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-msgid "Keybinding to open the Activities Overview."
-msgstr "Klávesová zkratka k otevření přehledu činností"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Klávesová zkratka k přepnutí viditelnosti lišty zpráv"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Klávesová zkratka k přepnutí viditelnosti lišty zpráv."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to focus the active notification"
 msgstr "Klávesová zkratka k zaměření aktivního upozornění"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification."
 msgstr "Klávesová zkratka k zaměření aktivního upozornění."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Klávesová zkratka k záznamu obrazovky"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "Klávesová zkratka k započnutí nebo ukončení záznamu dění na obrazovce."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
 msgstr "Která klávesnice se má používat"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
 msgstr "Typ klávesnice, který se má používat."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Framerate used for recording screencasts."
 msgstr "Frekvence snímků při nahrávání dění na obrazovce."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@ -274,11 +262,11 @@ msgstr ""
 "Frekvence snímků za sekundu výsledné nahrávky dění na obrazovce, která byla "
 "nahrána záznamovým programem GNOME Shell."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Roura systému gstreamer určená ke kódování nahrávky dění na obrazovce"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -303,11 +291,11 @@ msgstr ""
 "nahráváním do WEBM s kodekem VP8. %T je použito jako zástupný symbol odhadu "
 "nejvhodnějšího počtu vláken na systému."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "File extension used for storing the screencast"
 msgstr "Přípona souboru s nahrávkou dění na obrazovce"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@ -317,11 +305,11 @@ msgstr ""
 "názvu vycházejícího z aktuálního data a bude používat tuto příponu. Při "
 "nahrávání do jiného formátu kontejneru by měla být provedena úprava pravidel."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "The application icon mode."
 msgstr "Režim ikon aplikací"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
@ -331,20 +319,20 @@ msgstr ""
 "only“ (zobrazí náhled okna), „app-icon-only“ (zobrazí pouze ikonu aplikace) "
 "a „both“ (zobrazí náhled i ikonu)."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Attach modal dialog to the parent window"
 msgstr "Připojovat modální dialogová okna k rodičovským oknům"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr "Tento kíč přepisuje klíč v org.gnome.mutter, když běží GNOME Shell."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
 msgid "Arrangement of buttons on the titlebar"
 msgstr "Uspořádání tlačítek v záhlaví"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
@ -352,15 +340,15 @@ msgstr ""
 "Tento kíč přepisuje klíč v org.gnome.desktop.wm.preferences, když běží GNOME "
 "Shell."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Nechat okna upuštěná při okraji obrazovky vytvářet dlaždice"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:49
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
 msgid "Workspaces are managed dynamically"
 msgstr "Pracovní plochy jsou spravovány dynamicky"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:50
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
 msgid "Workspaces only on primary monitor"
 msgstr "Pracovní plochy pouze na hlavním monitoru"

@ -386,36 +374,36 @@ msgstr "Sezení…"
 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:630
+#: ../js/gdm/loginDialog.js:629
 msgid "Not listed?"
 msgstr "Nejste na seznamu?"

-#: ../js/gdm/loginDialog.js:787 ../js/ui/components/networkAgent.js:137
-#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:376
+#: ../js/gdm/loginDialog.js:783 ../js/ui/components/networkAgent.js:137
+#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:375
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:100
-#: ../js/ui/userMenu.js:938
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:126
+#: ../js/ui/userMenu.js:934
 msgid "Cancel"
 msgstr "Zrušit"

-#: ../js/gdm/loginDialog.js:803
+#: ../js/gdm/loginDialog.js:799
 msgctxt "button"
 msgid "Sign In"
 msgstr "Přihlásit se"

-#: ../js/gdm/loginDialog.js:803
+#: ../js/gdm/loginDialog.js:799
 msgid "Next"
 msgstr "Následující"

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:918 ../js/ui/components/networkAgent.js:260
+#: ../js/gdm/loginDialog.js:904 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
 msgstr "Uživatelské jméno: "

-#: ../js/gdm/loginDialog.js:1174
+#: ../js/gdm/loginDialog.js:1157
 msgid "Login Window"
 msgstr "Přihlašovací okno"

@ -424,8 +412,8 @@ msgstr "Přihlašovací okno"
 msgid "Power"
 msgstr "Vypnout"

-#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:696 ../js/ui/userMenu.js:700
-#: ../js/ui/userMenu.js:816
+#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:695 ../js/ui/userMenu.js:699
+#: ../js/ui/userMenu.js:815
 msgid "Suspend"
 msgstr "Uspat do paměti"

@ -433,58 +421,58 @@ msgstr "Uspat do paměti"
 msgid "Restart"
 msgstr "Restartovat"

-#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:698
-#: ../js/ui/userMenu.js:700 ../js/ui/userMenu.js:815 ../js/ui/userMenu.js:942
+#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:697
+#: ../js/ui/userMenu.js:699 ../js/ui/userMenu.js:814 ../js/ui/userMenu.js:938
 msgid "Power Off"
 msgstr "Vypnout"

-#: ../js/gdm/util.js:249
+#: ../js/gdm/util.js:182
 msgid "Authentication error"
 msgstr "Chyba ověření"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:366
+#: ../js/gdm/util.js:299
 msgid "(or swipe finger)"
 msgstr "(nebo otiskněte prst)"

-#: ../js/gdm/util.js:391
+#: ../js/gdm/util.js:324
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(např. uživatel nebo %s)"

-#: ../js/misc/util.js:97
+#: ../js/misc/util.js:94
 msgid "Command not found"
 msgstr "Příkaz nenalezen"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:130
+#: ../js/misc/util.js:127
 msgid "Could not parse command:"
 msgstr "Nelze analyzovat příkaz:"

-#: ../js/misc/util.js:138
+#: ../js/misc/util.js:135
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Vykonání „%s“ selhalo:"

-#: ../js/ui/appDisplay.js:351
+#: ../js/ui/appDisplay.js:348
 msgid "Frequent"
 msgstr "Časté"

-#: ../js/ui/appDisplay.js:358
+#: ../js/ui/appDisplay.js:355
 msgid "All"
 msgstr "Všechny"

-#: ../js/ui/appDisplay.js:916
+#: ../js/ui/appDisplay.js:913
 msgid "New Window"
 msgstr "Nové okno"

-#: ../js/ui/appDisplay.js:919 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:916 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Odstranit z oblíbených"

-#: ../js/ui/appDisplay.js:920
+#: ../js/ui/appDisplay.js:917
 msgid "Add to Favorites"
 msgstr "Přidat mezi oblíbené"

@ -498,7 +486,7 @@ msgstr "%s byl přidán mezi oblíbené."
 msgid "%s has been removed from your favorites."
 msgstr "%s byl odstraněn z oblíbených."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:789
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:788
 msgid "Settings"
 msgstr "Nastavení"

@ -519,15 +507,15 @@ msgstr "Celý den"
 #: ../js/ui/calendar.js:68
 msgctxt "event list time"
 msgid "%H\\u2236%M"
-msgstr "%H:%M"
+msgstr "%H.%M"

-#. Translators: Shown in calendar event list, if 12h format,
+#. Transators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space
 #: ../js/ui/calendar.js:77
 msgctxt "event list time"
 msgid "%l\\u2236%M\\u2009%p"
-msgstr "%l:%M\\u2009%p"
+msgstr "%l.%M\\u2009%p"

 #. Translators: Calendar grid abbreviation for Sunday.
 #. *
@ -623,35 +611,35 @@ msgid "S"
 msgstr "So"

 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:720
+#: ../js/ui/calendar.js:692
 msgid "Nothing Scheduled"
 msgstr "Nic nenaplánováno"

 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:736
+#: ../js/ui/calendar.js:708
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"

 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:739
+#: ../js/ui/calendar.js:711
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e. %B %Y"

-#: ../js/ui/calendar.js:749
+#: ../js/ui/calendar.js:721
 msgid "Today"
 msgstr "Dnes"

-#: ../js/ui/calendar.js:753
+#: ../js/ui/calendar.js:725
 msgid "Tomorrow"
 msgstr "Zítra"

-#: ../js/ui/calendar.js:764
+#: ../js/ui/calendar.js:736
 msgid "This week"
 msgstr "Tento týden"

-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:744
 msgid "Next week"
 msgstr "Následující týden"

@ -667,12 +655,12 @@ msgstr "Externí svazek odpojen"
 msgid "Removable Devices"
 msgstr "Výměnná zařízení"

-#: ../js/ui/components/autorunManager.js:594
+#: ../js/ui/components/autorunManager.js:593
 #, c-format
 msgid "Open with %s"
 msgstr "Otevřít s %s"

-#: ../js/ui/components/autorunManager.js:620
+#: ../js/ui/components/autorunManager.js:619
 msgid "Eject"
 msgstr "Vysunout"

@ -781,7 +769,7 @@ msgid "Sorry, that didn't work. Please try again."
 msgstr "Ověření bohužel nebylo úspěšné. Zkuste to prosím znovu."

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/components/recorder.js:47
+#: ../js/ui/components/recorder.js:48
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "Záznam obrazovky z %d %t"
@ -1055,7 +1043,7 @@ msgstr "Nastavení data a času"
 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:215
+#: ../js/ui/dateMenu.js:205
 msgid "%A %B %e, %Y"
 msgstr "%A, %e. %B, %Y"

@ -1230,24 +1218,24 @@ msgstr "Vymazat zprávy"
 msgid "Notification Settings"
 msgstr "Nastavení upozornění"

-#: ../js/ui/messageTray.js:1710
+#: ../js/ui/messageTray.js:1707
 msgid "No Messages"
 msgstr "Žádné zprávy"

-#: ../js/ui/messageTray.js:1783
+#: ../js/ui/messageTray.js:1787
 msgid "Message Tray"
 msgstr "Lišta zpráv"

-#: ../js/ui/messageTray.js:2801
+#: ../js/ui/messageTray.js:2864
 msgid "System Information"
 msgstr "Informace o systému"

-#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:378
+#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Neznámé"

-#: ../js/ui/overviewControls.js:472 ../js/ui/screenShield.js:149
+#: ../js/ui/overviewControls.js:460 ../js/ui/screenShield.js:153
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1259,7 +1247,7 @@ msgstr[2] "%d nových zpráv"
 msgid "Undo"
 msgstr "Zpět"

-#: ../js/ui/overview.js:127
+#: ../js/ui/overview.js:129
 msgid "Overview"
 msgstr "Přehled"

@ -1267,21 +1255,21 @@ msgstr "Přehled"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:260
+#: ../js/ui/overview.js:284
 msgid "Type to search…"
 msgstr "Vyhledávejte psaním…"

-#: ../js/ui/panel.js:641
+#: ../js/ui/panel.js:613
 msgid "Quit"
 msgstr "Ukončit"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:692
+#: ../js/ui/panel.js:642
 msgid "Activities"
 msgstr "Činnosti"

-#: ../js/ui/panel.js:989
+#: ../js/ui/panel.js:983
 msgid "Top Bar"
 msgstr "Horní lišta"

@ -1290,25 +1278,25 @@ msgstr "Horní lišta"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:718
+#: ../js/ui/popupMenu.js:727
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:74
+#: ../js/ui/runDialog.js:205
 msgid "Enter a Command"
 msgstr "Zadejte příkaz:"

-#: ../js/ui/runDialog.js:110
+#: ../js/ui/runDialog.js:241
 msgid "Close"
 msgstr "Zavřít"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:86
+#: ../js/ui/screenShield.js:90
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"

-#: ../js/ui/screenShield.js:151
+#: ../js/ui/screenShield.js:155
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1316,11 +1304,11 @@ msgstr[0] "%d nové upozornění"
 msgstr[1] "%d nová upozornění"
 msgstr[2] "%d nových upozornění"

-#: ../js/ui/screenShield.js:438 ../js/ui/userMenu.js:807
+#: ../js/ui/screenShield.js:442 ../js/ui/userMenu.js:806
 msgid "Lock"
 msgstr "Uzamknout"

-#: ../js/ui/screenShield.js:641
+#: ../js/ui/screenShield.js:639
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME potřebuje uzamknout obrazovku"

@ -1331,19 +1319,19 @@ msgstr "GNOME potřebuje uzamknout obrazovku"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:762 ../js/ui/screenShield.js:1198
+#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1169
 msgid "Unable to lock"
 msgstr "Nelze uzamknout obrazovku"

-#: ../js/ui/screenShield.js:763 ../js/ui/screenShield.js:1199
+#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1170
 msgid "Lock was blocked by an application"
 msgstr "Zamknutí bylo zablokováno některou z aplikací"

-#: ../js/ui/searchDisplay.js:453
+#: ../js/ui/searchDisplay.js:431
 msgid "Searching…"
 msgstr "Hledá se…"

-#: ../js/ui/searchDisplay.js:497
+#: ../js/ui/searchDisplay.js:475
 msgid "No results."
 msgstr "Žádné výsledky."

@ -1355,11 +1343,11 @@ msgstr "Kopírovat"
 msgid "Paste"
 msgstr "Vložit"

-#: ../js/ui/shellEntry.js:101
+#: ../js/ui/shellEntry.js:105
 msgid "Show Text"
 msgstr "Zobrazit text"

-#: ../js/ui/shellEntry.js:103
+#: ../js/ui/shellEntry.js:107
 msgid "Hide Text"
 msgstr "Skrýt text"

@ -1371,7 +1359,7 @@ msgstr "Heslo"
 msgid "Remember Password"
 msgstr "Pamatovat si heslo"

-#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:114
+#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:140
 msgid "Unlock"
 msgstr "Odemknout"

@ -1426,7 +1414,7 @@ msgstr "Styl velkého textu"
 #: ../js/ui/status/bluetooth.js:28 ../js/ui/status/bluetooth.js:32
 #: ../js/ui/status/bluetooth.js:289 ../js/ui/status/bluetooth.js:321
 #: ../js/ui/status/bluetooth.js:357 ../js/ui/status/bluetooth.js:388
-#: ../js/ui/status/network.js:761
+#: ../js/ui/status/network.js:826
 msgid "Bluetooth"
 msgstr "Bluetooth"

@ -1447,7 +1435,7 @@ msgid "Bluetooth Settings"
 msgstr "Nastavit Bluetooth"

 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
-#: ../js/ui/status/bluetooth.js:104 ../js/ui/status/network.js:149
+#: ../js/ui/status/bluetooth.js:104 ../js/ui/status/network.js:178
 msgid "hardware disabled"
 msgstr "zařízení zakázáno"

@ -1455,12 +1443,12 @@ msgstr "zařízení zakázáno"
 msgid "Connection"
 msgstr "Připojení"

-#: ../js/ui/status/bluetooth.js:208 ../js/ui/status/network.js:426
+#: ../js/ui/status/bluetooth.js:208 ../js/ui/status/network.js:460
 msgid "disconnecting..."
 msgstr "odpojování…"

-#: ../js/ui/status/bluetooth.js:221 ../js/ui/status/network.js:432
-#: ../js/ui/status/network.js:1417
+#: ../js/ui/status/bluetooth.js:221 ../js/ui/status/network.js:466
+#: ../js/ui/status/network.js:1546
 msgid "connecting..."
 msgstr "připojování…"

@ -1552,91 +1540,117 @@ msgstr "Místní a jazyková nastavení"
 msgid "Volume, network, battery"
 msgstr "Hlasitost, síť, baterie"

-#: ../js/ui/status/network.js:82
+#: ../js/ui/status/network.js:104
 msgid "<unknown>"
 msgstr "<neznámé>"

-#: ../js/ui/status/network.js:134
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:171
+#: ../js/ui/status/network.js:200
 msgid "disabled"
 msgstr "zakázáno"

 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu)
-#: ../js/ui/status/network.js:424
+#: ../js/ui/status/network.js:458
 msgid "unmanaged"
 msgstr "nespravováno"

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:435 ../js/ui/status/network.js:1420
+#: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1549
 msgid "authentication required"
 msgstr "je vyžadováno ověření"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:479
 msgid "firmware missing"
 msgstr "nedostupný firmware"

 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:452
+#: ../js/ui/status/network.js:486
 msgid "cable unplugged"
 msgstr "kabel byl odpojen"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage
-#: ../js/ui/status/network.js:457
+#: ../js/ui/status/network.js:491
 msgid "unavailable"
 msgstr "nedostupné"

-#: ../js/ui/status/network.js:459 ../js/ui/status/network.js:1422
+#: ../js/ui/status/network.js:493 ../js/ui/status/network.js:1551
 msgid "connection failed"
 msgstr "připojení selhalo"

-#: ../js/ui/status/network.js:512 ../js/ui/status/network.js:1306
-#: ../js/ui/status/network.js:1498
+#: ../js/ui/status/network.js:552 ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1627
 msgid "More…"
 msgstr "Další…"

 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
-#: ../js/ui/status/network.js:540 ../js/ui/status/network.js:1261
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1365
 msgid "Connected (private)"
 msgstr "Připojení (soukromé)"

-#: ../js/ui/status/network.js:619
+#: ../js/ui/status/network.js:667
 msgid "Wired"
 msgstr "Drátová"

-#: ../js/ui/status/network.js:633
+#: ../js/ui/status/network.js:668
+msgid "Auto Ethernet"
+msgstr "Automatické Ethernet"
+
+#: ../js/ui/status/network.js:695
 msgid "Mobile broadband"
 msgstr "Mobilní širokopásmová"

-#: ../js/ui/status/network.js:1596
+#: ../js/ui/status/network.js:728
+msgid "Auto broadband"
+msgstr "Automatické širokopásmové"
+
+#: ../js/ui/status/network.js:731
+msgid "Auto dial-up"
+msgstr "Automatické vytáčené"
+
+#. TRANSLATORS: this the automatic wireless connection name (including the network name)
+#: ../js/ui/status/network.js:861 ../js/ui/status/network.js:1382
+#, c-format
+msgid "Auto %s"
+msgstr "Automatické %s"
+
+#: ../js/ui/status/network.js:863
+msgid "Auto bluetooth"
+msgstr "Automatické Bluetooth"
+
+#: ../js/ui/status/network.js:1384
+msgid "Auto wireless"
+msgstr "Automatické bezdrátové"
+
+#: ../js/ui/status/network.js:1729
 msgid "Enable networking"
 msgstr "Povolit síť"

-#: ../js/ui/status/network.js:1657
+#: ../js/ui/status/network.js:1771
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../js/ui/status/network.js:1790
 msgid "Network Settings"
 msgstr "Nastavení sítě"

-#: ../js/ui/status/network.js:1674
+#: ../js/ui/status/network.js:1807
 msgid "Network Manager"
 msgstr "Network Manager"

-#: ../js/ui/status/network.js:1764
+#: ../js/ui/status/network.js:1897
 msgid "Connection failed"
 msgstr "Připojení selhalo"

-#: ../js/ui/status/network.js:1765
+#: ../js/ui/status/network.js:1898
 msgid "Activation of network connection failed"
 msgstr "Aktivace síťového připojení selhala"

-#: ../js/ui/status/network.js:2123
+#: ../js/ui/status/network.js:2276
 msgid "Networking is disabled"
 msgstr "Síť je zakázána"

@ -1754,11 +1768,11 @@ msgstr "Hlasitost"
 msgid "Microphone"
 msgstr "Mikrofon"

-#: ../js/ui/unlockDialog.js:125
+#: ../js/ui/unlockDialog.js:151
 msgid "Log in as another user"
 msgstr "Přihlásit se jako jiný uživatel"

-#: ../js/ui/unlockDialog.js:146
+#: ../js/ui/unlockDialog.js:177
 msgid "Unlock Window"
 msgstr "Odemykací okno"

@ -1786,27 +1800,27 @@ msgstr "Nečinný"
 msgid "Offline"
 msgstr "Odpojen"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:780
 msgid "Notifications"
 msgstr "Upozornění"

-#: ../js/ui/userMenu.js:797
+#: ../js/ui/userMenu.js:796
 msgid "Switch User"
 msgstr "Přepnout uživatele"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:801
 msgid "Log Out"
 msgstr "Odhlásit se"

-#: ../js/ui/userMenu.js:822
+#: ../js/ui/userMenu.js:821
 msgid "Install Updates & Restart"
 msgstr "Nainstalovat aktualizace a restartovat"

-#: ../js/ui/userMenu.js:840
+#: ../js/ui/userMenu.js:839
 msgid "Your chat status will be set to busy"
 msgstr "Váš stav v konverzacích byl nastaven na „Zaneprázdněn“"

-#: ../js/ui/userMenu.js:841
+#: ../js/ui/userMenu.js:840
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@ -1814,22 +1828,20 @@ msgstr ""
 "Upozornění jsou nyní vypnuta, včetně zpráv v konverzacích. Váš stav on-line "
 "byl změněn tak, aby ostatní věděli, že si jejich zprávy nemusíte přečíst."

-#: ../js/ui/userMenu.js:888
+#: ../js/ui/userMenu.js:886
 msgid "Other users are logged in."
 msgstr "Jsou přihlášeni jiní uživatelé."

-#: ../js/ui/userMenu.js:893
+#: ../js/ui/userMenu.js:891
 msgid "Shutting down might cause them to lose unsaved work."
 msgstr "Vypnutí by mohlo způsobit ztrátu jejich neuložené práce."

-#. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/userMenu.js:921
+#: ../js/ui/userMenu.js:918
 #, c-format
 msgid "%s (remote)"
 msgstr "%s (vzdálený)"

-#. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/userMenu.js:924
+#: ../js/ui/userMenu.js:920
 #, c-format
 msgid "%s (console)"
 msgstr "%s (konzole)"
@ -1842,7 +1854,7 @@ msgstr "Aplikace"
 msgid "Search"
 msgstr "Hledat"

-#: ../js/ui/wanda.js:77
+#: ../js/ui/wanda.js:92
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1851,7 +1863,7 @@ msgstr ""
 "Promiňte, dnes žádné moudro:\n"
 "%s"

-#: ../js/ui/wanda.js:81
+#: ../js/ui/wanda.js:96
 #, c-format
 msgid "%s the Oracle says"
 msgstr "%s říká Prorok"
@ -1905,7 +1917,7 @@ msgstr "Použít pro přihlašovací obrazovku určitý mód, např. „gdm“."
 msgid "List possible modes"
 msgstr "Vypsat možné režimy"

-#: ../src/shell-app.c:626
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Nelze spustit „%s“"
--- a/po/el.po
+++ b/po/el.po
@ -5,8 +5,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell.po.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-19 02:48+0000\n"
-"PO-Revision-Date: 2013-04-25 08:11+0300\n"
+"POT-Creation-Date: 2013-03-02 23:02+0000\n"
+"PO-Revision-Date: 2013-03-03 13:22+0300\n"
 "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
 "Language-Team: team@gnome.gr\n"
 "Language: el\n"
@ -40,14 +40,10 @@ msgid "Focus the active notification"
 msgstr "Εστίαση στην ενεργή ειδοποίηση"

 #: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Show the overview"
-msgstr "Εμφάνιση της επισκόπησης"
-
-#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Show all applications"
 msgstr "Προβολή όλων των εφαρμογών"

-#: ../data/50-gnome-shell-system.xml.in.h:6
+#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Open the application menu"
 msgstr "Άνοιγμα του μενού εφαρμογών"

@ -227,55 +223,45 @@ msgstr ""
 "επισκόπησης ενεργειών."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-#| msgid "Keybinding to open the \"Show Applications\" view"
-msgid "Keybinding to open the overview"
-msgstr "Συνδυασμός πλήκτρων για το άνοιγμα της επισκόπησης"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-#| msgid "Keybinding to open the \"Show Applications\" view"
-msgid "Keybinding to open the Activities Overview."
-msgstr "Συνδυασμός πλήκτρων για το άνοιγμα της προβολής ενέργειες."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Συνδυασμός πλήκτρων για την ορατότητα της περιοχής ειδοποιήσεων"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Συνδυασμός πλήκτρων για την ορατότητα της περιοχής ειδοποιήσεων."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to focus the active notification"
 msgstr "Ο συνδυασμός πλήκτρων για εστίαση της ενεργής ειδοποίησης"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification."
 msgstr "Ο συνδυασμός πλήκτρων για εστίαση της ενεργής ειδοποίησης."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Συνδυασμός πλήκτρων για την εναλλαγή της μαγνητοσκόπησης οθόνης"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr ""
 "Συνδυασμός πλήκτρων για το άνοιγμα/κλείσιμο της ενσωματωμένης "
 "μαγνητοσκόπησης οθόνης."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
 msgstr "Ποιο πληκτρολόγιο θα χρησιμοποιηθεί"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
 msgstr "Ο τύπος του πληκτρολογίου που θα χρησιμοποιηθεί."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Framerate used for recording screencasts."
 msgstr ""
 "Ο ρυθμός καρέ που θα χρησιμοποιηθεί για την καταγραφή του βίντεο οθόνης."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@ -283,13 +269,13 @@ msgstr ""
 "Ο ρυθμός καρέ του στιγμιότυπου που παράγεται από τον εγγραφέα βίντεο οθόνης "
 "του GNOME Shell σε καρέ ανά δευτερόλεπτο."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr ""
 "Ο δίαυλος του gstreamer που χρησιμοποιήθηκε για την κωδικοποίηση του βίντεο "
 "οθόνης"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -317,12 +303,12 @@ msgstr ""
 "χρησιμοποιείται ως παράδειγμα για το πιθανό βέλτιστο αριθμό πυρήνων του "
 "συστήματος."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "File extension used for storing the screencast"
 msgstr ""
 "Επέκταση αρχείου που θα χρησιμοποιηθεί για την αποθήκευση του βίντεο οθόνης"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@ -332,11 +318,11 @@ msgstr ""
 "βασισμένο στην τρέχουσα ημερομηνία και θα χρησιμοποιεί αυτή την επέκταση. Θα "
 "πρέπει να αλλάζει όταν γίνεται εγγραφή σε διαφορετικό πρότυπο περιέκτη."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "The application icon mode."
 msgstr "Η κατάσταση εικονιδίου εφαρμογής."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
@ -347,22 +333,22 @@ msgstr ""
 "παραθύρου), 'app-icon-only' (εμφανίζει μόνο το εικονίδιο της εφαρμογής) ή "
 "'both' - και τα δύο."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Attach modal dialog to the parent window"
 msgstr "Προσάρτηση αναγκαστικού διαλόγου στο γονικό παράθυρο"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Αυτό το κλειδί υπερισχύει του κλειδιού στο org.gnome.mutter όταν εκτελείται "
 "το κέλυφος GNOME."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
 msgid "Arrangement of buttons on the titlebar"
 msgstr "Διάταξη των κουμπιών στη γραμμή τίτλου"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
@ -370,17 +356,17 @@ msgstr ""
 "Αυτό το κλειδί υπερισχύει του κλειδιού στο org.gnome.desktop.wm.preferences "
 "όταν εκτελείται το κέλυφος GNOME."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
 "Ενεργοποίηση της παράθεσης άκρων όταν αποθέτετε παράθυρα στις άκρες της "
 "οθόνης"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:49
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
 msgid "Workspaces are managed dynamically"
 msgstr "Οι χώροι εργασίας διαχειρίζονται δυναμικά"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:50
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
 msgid "Workspaces only on primary monitor"
 msgstr "Χώροι εργασίας μόνο στην κύρια οθόνη"

@ -402,42 +388,43 @@ msgstr ""
 "πολλαπλών επιλογών."

 #: ../js/gdm/loginDialog.js:405
+#| msgid "Session..."
 msgid "Session…"
 msgstr "Συνεδρία…"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:630
+#: ../js/gdm/loginDialog.js:629
 msgid "Not listed?"
 msgstr "Δεν είστε στη λίστα;"

-#: ../js/gdm/loginDialog.js:787 ../js/ui/components/networkAgent.js:137
-#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:376
+#: ../js/gdm/loginDialog.js:783 ../js/ui/components/networkAgent.js:137
+#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:375
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:100
-#: ../js/ui/userMenu.js:938
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:126
+#: ../js/ui/userMenu.js:932
 msgid "Cancel"
 msgstr "Ακύρωση"

-#: ../js/gdm/loginDialog.js:803
+#: ../js/gdm/loginDialog.js:799
 msgctxt "button"
 msgid "Sign In"
 msgstr "Σύνδεση"

-#: ../js/gdm/loginDialog.js:803
+#: ../js/gdm/loginDialog.js:799
 msgid "Next"
 msgstr "Επόμενο"

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:918 ../js/ui/components/networkAgent.js:260
+#: ../js/gdm/loginDialog.js:904 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
 msgstr "Όνομα χρήστη: "

-#: ../js/gdm/loginDialog.js:1174
+#: ../js/gdm/loginDialog.js:1157
 msgid "Login Window"
 msgstr "Παράθυρο σύνδεσης"

@ -446,8 +433,8 @@ msgstr "Παράθυρο σύνδεσης"
 msgid "Power"
 msgstr "Ενέργεια"

-#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:696 ../js/ui/userMenu.js:700
-#: ../js/ui/userMenu.js:816
+#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:694 ../js/ui/userMenu.js:698
+#: ../js/ui/userMenu.js:814
 msgid "Suspend"
 msgstr "Αναστολή"

@ -455,58 +442,58 @@ msgstr "Αναστολή"
 msgid "Restart"
 msgstr "Επανεκκίνηση"

-#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:698
-#: ../js/ui/userMenu.js:700 ../js/ui/userMenu.js:815 ../js/ui/userMenu.js:942
+#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:696
+#: ../js/ui/userMenu.js:698 ../js/ui/userMenu.js:813 ../js/ui/userMenu.js:936
 msgid "Power Off"
 msgstr "Απενεργοποίηση"

-#: ../js/gdm/util.js:249
+#: ../js/gdm/util.js:182
 msgid "Authentication error"
 msgstr "Σφάλμα πιστοποίησης"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:366
+#: ../js/gdm/util.js:299
 msgid "(or swipe finger)"
 msgstr "(ή περάστε το δάκτυλο σας)"

-#: ../js/gdm/util.js:391
+#: ../js/gdm/util.js:324
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(π.χ χρήστης ή %s)"

-#: ../js/misc/util.js:97
+#: ../js/misc/util.js:94
 msgid "Command not found"
 msgstr "Δε βρέθηκε η εντολή"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:130
+#: ../js/misc/util.js:127
 msgid "Could not parse command:"
 msgstr "Δεν ήταν δυνατό να επεξεργαστεί η εντολή:"

-#: ../js/misc/util.js:138
+#: ../js/misc/util.js:135
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Η εκτέλεση του '%s' απέτυχε:"

-#: ../js/ui/appDisplay.js:349
+#: ../js/ui/appDisplay.js:348
 msgid "Frequent"
 msgstr "Συχνό"

-#: ../js/ui/appDisplay.js:356
+#: ../js/ui/appDisplay.js:355
 msgid "All"
 msgstr "Όλα"

-#: ../js/ui/appDisplay.js:914
+#: ../js/ui/appDisplay.js:913
 msgid "New Window"
 msgstr "Νέο παράθυρο"

-#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:916 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Αφαίρεση από τα αγαπημένα"

-#: ../js/ui/appDisplay.js:918
+#: ../js/ui/appDisplay.js:917
 msgid "Add to Favorites"
 msgstr "Προσθήκη στα αγαπημένα"

@ -520,7 +507,7 @@ msgstr "Tο %s προστέθηκε στα αγαπημένα σας."
 msgid "%s has been removed from your favorites."
 msgstr "Tο %s αφαιρέθηκε από τα αγαπημένα σας."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:789
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:787
 msgid "Settings"
 msgstr "Ρυθμίσεις"

@ -543,7 +530,7 @@ msgctxt "event list time"
 msgid "%H\\u2236%M"
 msgstr "%Ω\\u2236%Λ"

-#. Translators: Shown in calendar event list, if 12h format,
+#. Transators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space
 #: ../js/ui/calendar.js:77
@ -645,35 +632,35 @@ msgid "S"
 msgstr "Σ"

 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:720
+#: ../js/ui/calendar.js:692
 msgid "Nothing Scheduled"
 msgstr "Τίποτα προγραμματισμένο"

 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:736
+#: ../js/ui/calendar.js:708
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d"

 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:739
+#: ../js/ui/calendar.js:711
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"

-#: ../js/ui/calendar.js:749
+#: ../js/ui/calendar.js:721
 msgid "Today"
 msgstr "Σήμερα"

-#: ../js/ui/calendar.js:753
+#: ../js/ui/calendar.js:725
 msgid "Tomorrow"
 msgstr "Αύριο"

-#: ../js/ui/calendar.js:764
+#: ../js/ui/calendar.js:736
 msgid "This week"
 msgstr "Αυτή η εβδομάδα"

-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:744
 msgid "Next week"
 msgstr "Επόμενη εβδομάδα"

@ -689,12 +676,12 @@ msgstr "Αποσυνδέθηκε εξωτερικός δίσκος"
 msgid "Removable Devices"
 msgstr "Αφαιρούμενες συσκευές"

-#: ../js/ui/components/autorunManager.js:594
+#: ../js/ui/components/autorunManager.js:593
 #, c-format
 msgid "Open with %s"
 msgstr "Άνοιγμα με %s"

-#: ../js/ui/components/autorunManager.js:620
+#: ../js/ui/components/autorunManager.js:619
 msgid "Eject"
 msgstr "Εξαγωγή"

@ -803,7 +790,7 @@ msgid "Sorry, that didn't work. Please try again."
 msgstr "Συγνώμη, αυτό δεν λειτούργησε. Παρακαλώ προσπαθήστε ξανά."

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/components/recorder.js:47
+#: ../js/ui/components/recorder.js:48
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "Βίντεο οθόνης από %d %t"
@ -1050,7 +1037,7 @@ msgstr "Προβολή λογαριασμού"
 msgid "Unknown reason"
 msgstr "Άγνωστος λόγος"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:96
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:97
 msgid "Windows"
 msgstr "Παράθυρα"

@ -1079,7 +1066,7 @@ msgstr "Ρυθμίσεις ημερομηνίας & ώρας"
 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:215
+#: ../js/ui/dateMenu.js:205
 msgid "%A %B %e, %Y"
 msgstr "%A %B %e, %Y"

@ -1248,6 +1235,7 @@ msgid "Remove"
 msgstr "Αφαίρεση"

 #: ../js/ui/messageTray.js:1501
+#| msgid "No Messages"
 msgid "Clear Messages"
 msgstr "Καθαρισμός μηνυμάτων"

@ -1255,15 +1243,15 @@ msgstr "Καθαρισμός μηνυμάτων"
 msgid "Notification Settings"
 msgstr "Ρυθμίσεις ειδοποιήσεων"

-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1707
 msgid "No Messages"
 msgstr "Κανένα μήνυμα"

-#: ../js/ui/messageTray.js:1785
+#: ../js/ui/messageTray.js:1787
 msgid "Message Tray"
 msgstr "Περιοχή ειδοποιήσεων"

-#: ../js/ui/messageTray.js:2813
+#: ../js/ui/messageTray.js:2864
 msgid "System Information"
 msgstr "Πληροφορίες συστήματος"

@ -1272,14 +1260,14 @@ msgctxt "program"
 msgid "Unknown"
 msgstr "Άγνωστο"

-#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
+#: ../js/ui/overviewControls.js:460 ../js/ui/screenShield.js:153
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d νέο μήνυμα"
 msgstr[1] "%d νέα μηνύματα"

-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:82
 msgid "Undo"
 msgstr "Αναίρεση"

@ -1291,21 +1279,22 @@ msgstr "Επισκόπηση"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:271
+#: ../js/ui/overview.js:284
+#| msgid "Type to search..."
 msgid "Type to search…"
 msgstr "Πληκτρολογήστε για αναζήτηση…"

-#: ../js/ui/panel.js:633
+#: ../js/ui/panel.js:613
 msgid "Quit"
 msgstr "Έξοδος"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:657
+#: ../js/ui/panel.js:642
 msgid "Activities"
 msgstr "Δραστηριότητες"

-#: ../js/ui/panel.js:954
+#: ../js/ui/panel.js:983
 msgid "Top Bar"
 msgstr "Πάνω μπάρα"

@ -1318,32 +1307,32 @@ msgstr "Πάνω μπάρα"
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:74
+#: ../js/ui/runDialog.js:205
 msgid "Enter a Command"
 msgstr "Εισαγωγή εντολής"

-#: ../js/ui/runDialog.js:110
+#: ../js/ui/runDialog.js:241
 msgid "Close"
 msgstr "Κλείσιμο"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:86
+#: ../js/ui/screenShield.js:90
 msgid "%A, %B %d"
 msgstr "%A, %B %d"

-#: ../js/ui/screenShield.js:151
+#: ../js/ui/screenShield.js:155
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d νέα ειδοποίηση"
 msgstr[1] "%d νέες ειδοποιήσεις"

-#: ../js/ui/screenShield.js:438 ../js/ui/userMenu.js:807
+#: ../js/ui/screenShield.js:442 ../js/ui/userMenu.js:805
 msgid "Lock"
 msgstr "Κλείδωμα"

-#: ../js/ui/screenShield.js:641
+#: ../js/ui/screenShield.js:639
 msgid "GNOME needs to lock the screen"
 msgstr "Το GNOME χρειάζεται να κλειδώσει την οθόνη"

@ -1354,19 +1343,21 @@ msgstr "Το GNOME χρειάζεται να κλειδώσει την οθόν
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:762 ../js/ui/screenShield.js:1198
+#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1169
+#| msgid "Unable to connect to %s"
 msgid "Unable to lock"
 msgstr "Αδυναμία κλειδώματος"

-#: ../js/ui/screenShield.js:763 ../js/ui/screenShield.js:1199
+#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1170
 msgid "Lock was blocked by an application"
 msgstr "Το κλείδωμα εμποδίστηκε από μια εφαρμογή"

-#: ../js/ui/searchDisplay.js:453
+#: ../js/ui/searchDisplay.js:431
+#| msgid "Searching..."
 msgid "Searching…"
 msgstr "Αναζήτηση…"

-#: ../js/ui/searchDisplay.js:497
+#: ../js/ui/searchDisplay.js:475
 msgid "No results."
 msgstr "Δε βρέθηκαν αποτελέσματα."

@ -1378,11 +1369,11 @@ msgstr "Αντιγραφή"
 msgid "Paste"
 msgstr "Επικόλληση"

-#: ../js/ui/shellEntry.js:101
+#: ../js/ui/shellEntry.js:105
 msgid "Show Text"
 msgstr "Εμφάνιση κειμένου"

-#: ../js/ui/shellEntry.js:103
+#: ../js/ui/shellEntry.js:107
 msgid "Hide Text"
 msgstr "Απόκρυψη κειμένου"

@ -1394,7 +1385,7 @@ msgstr "Κωδικός"
 msgid "Remember Password"
 msgstr "Απομνημόνευση κωδικού"

-#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:114
+#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:140
 msgid "Unlock"
 msgstr "Ξεκλείδωμα"

@ -1458,10 +1449,12 @@ msgid "Visibility"
 msgstr "Ορατότητα"

 #: ../js/ui/status/bluetooth.js:59
+#| msgid "Send Files to Device..."
 msgid "Send Files to Device…"
 msgstr "Αποστολή αρχείων σε συσκευή…"

 #: ../js/ui/status/bluetooth.js:60
+#| msgid "Set Up a New Device..."
 msgid "Set Up a New Device…"
 msgstr "Ρύθμιση νέας συσκευής…"

@ -1488,6 +1481,7 @@ msgid "connecting..."
 msgstr "σύνδεση..."

 #: ../js/ui/status/bluetooth.js:239
+#| msgid "Send Files..."
 msgid "Send Files…"
 msgstr "Αποστολή αρχείων…"

@ -1700,6 +1694,7 @@ msgstr "Ρυθμίσεις τροφοδοσίας"
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
 #: ../js/ui/status/power.js:99
+#| msgid "Estimating..."
 msgid "Estimating…"
 msgstr "Υπολογισμός…"

@ -1799,59 +1794,59 @@ msgstr "Ένταση ήχου"
 msgid "Microphone"
 msgstr "Μικρόφωνο"

-#: ../js/ui/unlockDialog.js:125
+#: ../js/ui/unlockDialog.js:151
 msgid "Log in as another user"
 msgstr "Είσοδος ως άλλος χρήστης"

-#: ../js/ui/unlockDialog.js:146
+#: ../js/ui/unlockDialog.js:177
 msgid "Unlock Window"
 msgstr "Ξεκλείδωμα παραθύρου"

-#: ../js/ui/userMenu.js:193
+#: ../js/ui/userMenu.js:192
 msgid "Available"
 msgstr "Διαθέσιμος-η"

-#: ../js/ui/userMenu.js:196
+#: ../js/ui/userMenu.js:195
 msgid "Busy"
 msgstr "Απασχολημένος-η"

-#: ../js/ui/userMenu.js:199
+#: ../js/ui/userMenu.js:198
 msgid "Invisible"
 msgstr "Αόρατος-η"

-#: ../js/ui/userMenu.js:202
+#: ../js/ui/userMenu.js:201
 msgid "Away"
 msgstr "Απουσιάζει"

-#: ../js/ui/userMenu.js:205
+#: ../js/ui/userMenu.js:204
 msgid "Idle"
 msgstr "Αδρανής"

-#: ../js/ui/userMenu.js:208
+#: ../js/ui/userMenu.js:207
 msgid "Offline"
 msgstr "Εκτός σύνδεσης"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:779
 msgid "Notifications"
 msgstr "Ειδοποιήσεις"

-#: ../js/ui/userMenu.js:797
+#: ../js/ui/userMenu.js:795
 msgid "Switch User"
 msgstr "Αλλαγή χρήστη"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:800
 msgid "Log Out"
 msgstr "Αποσύνδεση"

-#: ../js/ui/userMenu.js:822
+#: ../js/ui/userMenu.js:820
 msgid "Install Updates & Restart"
 msgstr "Εγκατάσταση ενημερώσεων & επανεκκίνηση"

-#: ../js/ui/userMenu.js:840
+#: ../js/ui/userMenu.js:838
 msgid "Your chat status will be set to busy"
 msgstr "Η κατάσταση συνομιλίας σας θα ορισθεί σε απασχολημένος"

-#: ../js/ui/userMenu.js:841
+#: ../js/ui/userMenu.js:839
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@ -1860,36 +1855,34 @@ msgstr ""
 "κατάσταση σας έχει ορισθεί έτσι ώστε να γίνεται γνωστό ότι πιθανόν να μην "
 "δείτε τα μηνύματα τους."

-#: ../js/ui/userMenu.js:888
+#: ../js/ui/userMenu.js:885
 msgid "Other users are logged in."
 msgstr "Και άλλοι χρήστες είναι συνδεμένοι."

-#: ../js/ui/userMenu.js:893
+#: ../js/ui/userMenu.js:890
 msgid "Shutting down might cause them to lose unsaved work."
 msgstr ""
 "Κλείνοντας μπορεί να τους προκαλέσετε την απώλεια αναποθήκευτης εργασίας."

-#. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/userMenu.js:921
+#: ../js/ui/userMenu.js:916
 #, c-format
 msgid "%s (remote)"
 msgstr "%s (απομακρυσμένο)"

-#. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/userMenu.js:924
+#: ../js/ui/userMenu.js:918
 #, c-format
 msgid "%s (console)"
 msgstr "%s (κονσόλα)"

-#: ../js/ui/viewSelector.js:100
+#: ../js/ui/viewSelector.js:101
 msgid "Applications"
 msgstr "Εφαρμογές"

-#: ../js/ui/viewSelector.js:104
+#: ../js/ui/viewSelector.js:105
 msgid "Search"
 msgstr "Αναζήτηση"

-#: ../js/ui/wanda.js:77
+#: ../js/ui/wanda.js:92
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1898,7 +1891,7 @@ msgstr ""
 "Συγγνώμη, κανένα απόφθεγμα για εσάς σήμερα:\n"
 "%s"

-#: ../js/ui/wanda.js:81
+#: ../js/ui/wanda.js:96
 #, c-format
 msgid "%s the Oracle says"
 msgstr "%s ο Προφήτης λέει"
--- a/po/es.po
+++ b/po/es.po
--- a/po/gl.po
+++ b/po/gl.po
@ -10,9 +10,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-18 01:27+0200\n"
-"PO-Revision-Date: 2013-04-18 01:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-03-02 23:02+0000\n"
+"PO-Revision-Date: 2013-03-04 12:40+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@ -29,7 +30,7 @@ msgstr "Capturas de pantalla"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:2
 msgid "Record a screencast"
-msgstr "Facer unha gravación da pantalla"
+msgstr "Gravar unha gravación de pantalla"

 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@ -62,16 +63,16 @@ msgstr "Xestor de xanelas e inicio de aplicativos"
 #: ../data/gnome-shell-extension-prefs.desktop.in.in.h:1
 #: ../js/extensionPrefs/main.js:153
 msgid "GNOME Shell Extension Preferences"
-msgstr "Preferencias das extensións de GNOME Shell"
+msgstr "Preferencias de extensións de GNOME Shell"

 #: ../data/gnome-shell-extension-prefs.desktop.in.in.h:2
 msgid "Configure GNOME Shell Extensions"
-msgstr "Configure as extensións de GNOME Shell"
+msgstr "Configurar as extensións de GNOME Shell"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
-"Activar as ferramentas internas útiles para os desenvolvedores e probadores "
+"Activar as ferramentas internas útiles para os desenvolvedores e probadores, "
 "usando Alt-F2"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
@ -84,7 +85,7 @@ msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "Uuids of extensions to enable"
-msgstr "UUIDs das extensións a activar"
+msgstr "Uuid das extensións que activar"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
 msgid ""
@ -374,42 +375,43 @@ msgstr ""
 "Seleccione unha extensión que configurar usando a caixa combinada de arriba."

 #: ../js/gdm/loginDialog.js:405
+#| msgid "Session..."
 msgid "Session…"
 msgstr "Sesión…"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:630
+#: ../js/gdm/loginDialog.js:629
 msgid "Not listed?"
 msgstr "Non está na lista?"

-#: ../js/gdm/loginDialog.js:787 ../js/ui/components/networkAgent.js:137
-#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:376
+#: ../js/gdm/loginDialog.js:783 ../js/ui/components/networkAgent.js:137
+#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:375
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:100
-#: ../js/ui/userMenu.js:938
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:126
+#: ../js/ui/userMenu.js:932
 msgid "Cancel"
 msgstr "Cancelar"

-#: ../js/gdm/loginDialog.js:803
+#: ../js/gdm/loginDialog.js:799
 msgctxt "button"
 msgid "Sign In"
 msgstr "Iniciar sesión"

-#: ../js/gdm/loginDialog.js:803
+#: ../js/gdm/loginDialog.js:799
 msgid "Next"
 msgstr "Seguinte"

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:918 ../js/ui/components/networkAgent.js:260
+#: ../js/gdm/loginDialog.js:904 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
 msgstr "Nome de usuario: "

-#: ../js/gdm/loginDialog.js:1174
+#: ../js/gdm/loginDialog.js:1157
 msgid "Login Window"
 msgstr "Xanela de inicio de sesión"

@ -418,8 +420,8 @@ msgstr "Xanela de inicio de sesión"
 msgid "Power"
 msgstr "Apagar"

-#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:696 ../js/ui/userMenu.js:700
-#: ../js/ui/userMenu.js:816
+#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:694 ../js/ui/userMenu.js:698
+#: ../js/ui/userMenu.js:814
 msgid "Suspend"
 msgstr "Suspender"

@ -427,58 +429,58 @@ msgstr "Suspender"
 msgid "Restart"
 msgstr "Reiniciar"

-#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:698
-#: ../js/ui/userMenu.js:700 ../js/ui/userMenu.js:815 ../js/ui/userMenu.js:942
+#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:696
+#: ../js/ui/userMenu.js:698 ../js/ui/userMenu.js:813 ../js/ui/userMenu.js:936
 msgid "Power Off"
 msgstr "Apagar"

-#: ../js/gdm/util.js:249
+#: ../js/gdm/util.js:182
 msgid "Authentication error"
 msgstr "Erro de autenticación"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:366
+#: ../js/gdm/util.js:299
 msgid "(or swipe finger)"
 msgstr "(ou pase o dedo)"

-#: ../js/gdm/util.js:391
+#: ../js/gdm/util.js:324
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(p.ex., usuario ou %s)"

-#: ../js/misc/util.js:97
+#: ../js/misc/util.js:94
 msgid "Command not found"
 msgstr "Orde non atopada"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:130
+#: ../js/misc/util.js:127
 msgid "Could not parse command:"
 msgstr "Non foi posíbel analizar a orde:"

-#: ../js/misc/util.js:138
+#: ../js/misc/util.js:135
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Produciuse un fallo na execución de «%s»:"

-#: ../js/ui/appDisplay.js:349
+#: ../js/ui/appDisplay.js:348
 msgid "Frequent"
 msgstr "Frecuentes"

-#: ../js/ui/appDisplay.js:356
+#: ../js/ui/appDisplay.js:355
 msgid "All"
 msgstr "Todos"

-#: ../js/ui/appDisplay.js:914
+#: ../js/ui/appDisplay.js:913
 msgid "New Window"
 msgstr "Xanela nova"

-#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:916 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Retirar dos marcadores"

-#: ../js/ui/appDisplay.js:918
+#: ../js/ui/appDisplay.js:917
 msgid "Add to Favorites"
 msgstr "Engadir aos favoritos"

@ -492,7 +494,7 @@ msgstr "%s foi engadido aos seus favoritos."
 msgid "%s has been removed from your favorites."
 msgstr "%s retirouse dos seus marcadores."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:789
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:787
 msgid "Settings"
 msgstr "Preferencias"

@ -515,7 +517,7 @@ msgctxt "event list time"
 msgid "%H\\u2236%M"
 msgstr "%H\\u2236%M"

-#. Translators: Shown in calendar event list, if 12h format,
+#. Transators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space
 #: ../js/ui/calendar.js:77
@ -617,35 +619,35 @@ msgid "S"
 msgstr "S"

 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:720
+#: ../js/ui/calendar.js:692
 msgid "Nothing Scheduled"
 msgstr "Nada programado"

 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:736
+#: ../js/ui/calendar.js:708
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"

 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:739
+#: ../js/ui/calendar.js:711
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"

-#: ../js/ui/calendar.js:749
+#: ../js/ui/calendar.js:721
 msgid "Today"
 msgstr "Hoxe"

-#: ../js/ui/calendar.js:753
+#: ../js/ui/calendar.js:725
 msgid "Tomorrow"
 msgstr "Mañá"

-#: ../js/ui/calendar.js:764
+#: ../js/ui/calendar.js:736
 msgid "This week"
 msgstr "Esta semana"

-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:744
 msgid "Next week"
 msgstr "A vindeira semana"

@ -661,12 +663,12 @@ msgstr "Unidade externa desconectada"
 msgid "Removable Devices"
 msgstr "Dispositivos extraíbeis"

-#: ../js/ui/components/autorunManager.js:594
+#: ../js/ui/components/autorunManager.js:593
 #, c-format
 msgid "Open with %s"
 msgstr "Abrir con %s"

-#: ../js/ui/components/autorunManager.js:620
+#: ../js/ui/components/autorunManager.js:619
 msgid "Eject"
 msgstr "Expulsar"

@ -775,7 +777,7 @@ msgid "Sorry, that didn't work. Please try again."
 msgstr "Desculpe, iso non funcionou. Ténteo de novo."

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/components/recorder.js:47
+#: ../js/ui/components/recorder.js:48
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "Screencast desde %d %t"
@ -1022,7 +1024,7 @@ msgstr "Ver conta"
 msgid "Unknown reason"
 msgstr "Razón descoñecida"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:96
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:97
 msgid "Windows"
 msgstr "Xanelas"

@ -1038,7 +1040,7 @@ msgstr "Taboleiro"

 #: ../js/ui/dateMenu.js:91
 msgid "Open Calendar"
-msgstr "Abrir Calendario"
+msgstr "Abrir o calendario"

 #: ../js/ui/dateMenu.js:96
 msgid "Open Clocks"
@ -1051,7 +1053,7 @@ msgstr "Preferencias de data e hora"
 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:215
+#: ../js/ui/dateMenu.js:205
 msgid "%A %B %e, %Y"
 msgstr "%a, %e de %B, %Y"

@ -1069,7 +1071,7 @@ msgstr "Saír da sesión"
 #: ../js/ui/endSessionDialog.js:65
 msgid "Click Log Out to quit these applications and log out of the system."
 msgstr ""
-"Prema en «Saír da sesión» para pechar estes aplicativos e saír da sesión do "
+"Prema sobre «Saír da sesión» para saír deses aplicativos e saír da sesión do "
 "sistema."

 #: ../js/ui/endSessionDialog.js:67
@ -1088,7 +1090,7 @@ msgstr[1] "A súa sesión pecharase automaticamente en %d segundos."

 #: ../js/ui/endSessionDialog.js:76
 msgid "Logging out of the system."
-msgstr "Saíndo da sesión do sistema."
+msgstr "Saíndo da sesión."

 #: ../js/ui/endSessionDialog.js:78
 msgctxt "button"
@ -1102,7 +1104,7 @@ msgstr "Apagar"

 #: ../js/ui/endSessionDialog.js:84
 msgid "Click Power Off to quit these applications and power off the system."
-msgstr "Prema sobre «Apagar» para pechar estes aplicativos e apagar o sistema."
+msgstr "Prema sobre «Apagar» para saír deses aplicativos e apagar o sistema."

 #: ../js/ui/endSessionDialog.js:86
 #, c-format
@ -1132,7 +1134,7 @@ msgstr "Reiniciar"

 #: ../js/ui/endSessionDialog.js:101
 msgid "Click Restart to quit these applications and restart the system."
-msgstr "Prema «Reiniciar» para pechar estes aplicativos e reiniciar o sistema."
+msgstr "Prema «Reiniciar» para saír deses aplicativos e reiniciar o sistema."

 #: ../js/ui/endSessionDialog.js:103
 #, c-format
@ -1167,7 +1169,7 @@ msgstr "Non hai ningunha extensión instalada"
 #: ../js/ui/lookingGlass.js:747
 #, c-format
 msgid "%s has not emitted any errors."
-msgstr "%s non emitiu ningún erro."
+msgstr "%s non xerou ningún erro."

 #: ../js/ui/lookingGlass.js:753
 msgid "Hide Errors"
@ -1193,7 +1195,7 @@ msgstr "Erro"

 #: ../js/ui/lookingGlass.js:773
 msgid "Out of date"
-msgstr "Obsoleto"
+msgstr "Caducado"

 #: ../js/ui/lookingGlass.js:775
 msgid "Downloading"
@ -1216,6 +1218,7 @@ msgid "Remove"
 msgstr "Retirar"

 #: ../js/ui/messageTray.js:1501
+#| msgid "No Messages"
 msgid "Clear Messages"
 msgstr "Limpar mensaxes"

@ -1223,15 +1226,15 @@ msgstr "Limpar mensaxes"
 msgid "Notification Settings"
 msgstr "Preferencias das notificacións"

-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1707
 msgid "No Messages"
 msgstr "Non hai mensaxes"

-#: ../js/ui/messageTray.js:1785
+#: ../js/ui/messageTray.js:1787
 msgid "Message Tray"
 msgstr "Bandexa de mensaxes"

-#: ../js/ui/messageTray.js:2813
+#: ../js/ui/messageTray.js:2864
 msgid "System Information"
 msgstr "Información do sistema"

@ -1240,14 +1243,14 @@ msgctxt "program"
 msgid "Unknown"
 msgstr "Descoñecido"

-#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
+#: ../js/ui/overviewControls.js:460 ../js/ui/screenShield.js:153
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d mensaxe nova"
 msgstr[1] "%d mensaxes novas"

-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:82
 msgid "Undo"
 msgstr "Desfacer"

@ -1259,21 +1262,22 @@ msgstr "Vista xeral"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:271
+#: ../js/ui/overview.js:284
+#| msgid "Type to search..."
 msgid "Type to search…"
 msgstr "Escriba para buscar…"

-#: ../js/ui/panel.js:633
+#: ../js/ui/panel.js:613
 msgid "Quit"
 msgstr "Saír"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:657
+#: ../js/ui/panel.js:642
 msgid "Activities"
 msgstr "Actividades"

-#: ../js/ui/panel.js:954
+#: ../js/ui/panel.js:983
 msgid "Top Bar"
 msgstr "Barra superior"

@ -1286,34 +1290,34 @@ msgstr "Barra superior"
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:74
+#: ../js/ui/runDialog.js:205
 msgid "Enter a Command"
 msgstr "Escriba unha orde"

-#: ../js/ui/runDialog.js:110
+#: ../js/ui/runDialog.js:241
 msgid "Close"
 msgstr "Pechar"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:86
+#: ../js/ui/screenShield.js:90
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"

-#: ../js/ui/screenShield.js:151
+#: ../js/ui/screenShield.js:155
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d notificación nova"
 msgstr[1] "%d notificacións novas"

-#: ../js/ui/screenShield.js:438 ../js/ui/userMenu.js:807
+#: ../js/ui/screenShield.js:442 ../js/ui/userMenu.js:805
 msgid "Lock"
 msgstr "Bloquear"

-#: ../js/ui/screenShield.js:641
+#: ../js/ui/screenShield.js:639
 msgid "GNOME needs to lock the screen"
-msgstr "GNOME precisa bloquear a pantalla"
+msgstr "GNOME debe bloquear a pantalla"

 #. We could not become modal, so we can't activate the
 #. screenshield. The user is probably very upset at this
@ -1322,19 +1326,22 @@ msgstr "GNOME precisa bloquear a pantalla"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:762 ../js/ui/screenShield.js:1198
+#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1169
+#| msgid "Unable to connect to %s"
 msgid "Unable to lock"
 msgstr "Non foi posíbel bloquear"

-#: ../js/ui/screenShield.js:763 ../js/ui/screenShield.js:1199
+#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1170
+#| msgid "No such application"
 msgid "Lock was blocked by an application"
-msgstr "Un aplicativo impediu o bloqueo"
+msgstr "O bloqueo foi impedido por un aplicativo"

-#: ../js/ui/searchDisplay.js:453
+#: ../js/ui/searchDisplay.js:431
+#| msgid "Searching..."
 msgid "Searching…"
 msgstr "Buscando…"

-#: ../js/ui/searchDisplay.js:497
+#: ../js/ui/searchDisplay.js:475
 msgid "No results."
 msgstr "Sen resultados."

@ -1346,11 +1353,11 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Pegar"

-#: ../js/ui/shellEntry.js:101
+#: ../js/ui/shellEntry.js:105
 msgid "Show Text"
 msgstr "Mostrar texto"

-#: ../js/ui/shellEntry.js:103
+#: ../js/ui/shellEntry.js:107
 msgid "Hide Text"
 msgstr "Ocultar texto"

@ -1360,9 +1367,9 @@ msgstr "Contrasinal"

 #: ../js/ui/shellMountOperation.js:391
 msgid "Remember Password"
-msgstr "Lembrar contrasinal"
+msgstr "Lembrar o contrasinal"

-#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:114
+#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:140
 msgid "Unlock"
 msgstr "Desbloquear"

@ -1426,10 +1433,12 @@ msgid "Visibility"
 msgstr "Visibilidade"

 #: ../js/ui/status/bluetooth.js:59
+#| msgid "Send Files to Device..."
 msgid "Send Files to Device…"
 msgstr "Enviar ficheiros ao dispositivo…"

 #: ../js/ui/status/bluetooth.js:60
+#| msgid "Set Up a New Device..."
 msgid "Set Up a New Device…"
 msgstr "Configurar un dispositivo novo…"

@ -1456,6 +1465,7 @@ msgid "connecting..."
 msgstr "conectando…"

 #: ../js/ui/status/bluetooth.js:239
+#| msgid "Send Files..."
 msgid "Send Files…"
 msgstr "Enviar ficheiros…"

@ -1537,7 +1547,7 @@ msgstr "Mostrar a distribución do teclado"

 #: ../js/ui/status/keyboard.js:373
 msgid "Region & Language Settings"
-msgstr "Preferencias de rexión e idioma"
+msgstr "Configuración rexional e de idioma"

 #: ../js/ui/status/lockScreenMenu.js:43
 msgid "Volume, network, battery"
@ -1582,7 +1592,7 @@ msgstr "non dispoñíbel"

 #: ../js/ui/status/network.js:493 ../js/ui/status/network.js:1551
 msgid "connection failed"
-msgstr "conexión fallada"
+msgstr "conexión fallida"

 #: ../js/ui/status/network.js:552 ../js/ui/status/network.js:1435
 #: ../js/ui/status/network.js:1627
@ -1668,6 +1678,7 @@ msgstr "Preferencias de enerxía"
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
 #: ../js/ui/status/power.js:99
+#| msgid "Estimating..."
 msgid "Estimating…"
 msgstr "Estimando…"

@ -1767,59 +1778,59 @@ msgstr "Volume"
 msgid "Microphone"
 msgstr "Micrófono"

-#: ../js/ui/unlockDialog.js:125
+#: ../js/ui/unlockDialog.js:151
 msgid "Log in as another user"
 msgstr "Iniciar sesión como outro usuario"

-#: ../js/ui/unlockDialog.js:146
+#: ../js/ui/unlockDialog.js:177
 msgid "Unlock Window"
 msgstr "Desbloquear xanela"

-#: ../js/ui/userMenu.js:193
+#: ../js/ui/userMenu.js:192
 msgid "Available"
 msgstr "Dispoñíbel"

-#: ../js/ui/userMenu.js:196
+#: ../js/ui/userMenu.js:195
 msgid "Busy"
 msgstr "Ocupado"

-#: ../js/ui/userMenu.js:199
+#: ../js/ui/userMenu.js:198
 msgid "Invisible"
 msgstr "Invisíbel"

-#: ../js/ui/userMenu.js:202
+#: ../js/ui/userMenu.js:201
 msgid "Away"
 msgstr "Ausente"

-#: ../js/ui/userMenu.js:205
+#: ../js/ui/userMenu.js:204
 msgid "Idle"
 msgstr "Inactivo"

-#: ../js/ui/userMenu.js:208
+#: ../js/ui/userMenu.js:207
 msgid "Offline"
 msgstr "Desconectado"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:779
 msgid "Notifications"
 msgstr "Notificacións"

-#: ../js/ui/userMenu.js:797
+#: ../js/ui/userMenu.js:795
 msgid "Switch User"
 msgstr "Cambiar de usuario"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:800
 msgid "Log Out"
 msgstr "Saír da sesión"

-#: ../js/ui/userMenu.js:822
+#: ../js/ui/userMenu.js:820
 msgid "Install Updates & Restart"
 msgstr "Instalar actualizacións e reiniciar"

-#: ../js/ui/userMenu.js:840
+#: ../js/ui/userMenu.js:838
 msgid "Your chat status will be set to busy"
-msgstr "O seu estado de conversa estabelecerase a «ocupado»"
+msgstr "O seu estado de conversa definirase como «ocupado»"

-#: ../js/ui/userMenu.js:841
+#: ../js/ui/userMenu.js:839
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@ -1828,35 +1839,33 @@ msgstr ""
 "conversa. O seu estado de conexión axustouse para que outros saiban que non "
 "quere ver as súas mensaxes."

-#: ../js/ui/userMenu.js:888
+#: ../js/ui/userMenu.js:885
 msgid "Other users are logged in."
 msgstr "Hai outros usuarios conectados."

-#: ../js/ui/userMenu.js:893
+#: ../js/ui/userMenu.js:890
 msgid "Shutting down might cause them to lose unsaved work."
 msgstr "Se apaga o computador pode perder o traballo que non gardou."

-#. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/userMenu.js:921
+#: ../js/ui/userMenu.js:916
 #, c-format
 msgid "%s (remote)"
 msgstr "%s (remoto)"

-#. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/userMenu.js:924
+#: ../js/ui/userMenu.js:918
 #, c-format
 msgid "%s (console)"
 msgstr "%s (consola)"

-#: ../js/ui/viewSelector.js:100
+#: ../js/ui/viewSelector.js:101
 msgid "Applications"
 msgstr "Aplicativos"

-#: ../js/ui/viewSelector.js:104
+#: ../js/ui/viewSelector.js:105
 msgid "Search"
 msgstr "Buscar"

-#: ../js/ui/wanda.js:77
+#: ../js/ui/wanda.js:92
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1865,7 +1874,7 @@ msgstr ""
 "Hoxe non ten ningunha mensaxe:\n"
 "%s"

-#: ../js/ui/wanda.js:81
+#: ../js/ui/wanda.js:96
 #, c-format
 msgid "%s the Oracle says"
 msgstr "%s o oráculo dí"
--- a/po/ia.po
+++ b/po/ia.po
@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell master\n"
+"Project-Id-Version: gnome-shell 3.8\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-23 19:57+0000\n"
+"POT-Creation-Date: 2013-04-19 21:48+0000\n"
 "PO-Revision-Date: 2013-04-23 08:00+0400\n"
 "Last-Translator: Nik Kalach <nikka@fedoraproject.org>\n"
 "Language-Team: Interlingua <trans-ia@lists.fedoraproject.org>\n"
@ -39,14 +39,10 @@ msgid "Focus the active notification"
 msgstr "Mitter foco al notificationes active"

 #: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Show the overview"
-msgstr "Monstrar le panorama"
-
-#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Show all applications"
 msgstr "Monstrar tote le applicationes"

-#: ../data/50-gnome-shell-system.xml.in.h:6
+#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Open the application menu"
 msgstr "Aperir le menu de applicationes"

@ -226,52 +222,44 @@ msgstr ""
 "panorama de activitates."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-msgid "Keybinding to open the overview"
-msgstr "Association de claves pro aperir le panorama"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-msgid "Keybinding to open the Activities Overview."
-msgstr "Association de claves pro aperir le panorama de activitates"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr ""
 "Association de claves pro commutar le visibilitate del tiratorio de messages"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr ""
 "Association de claves pro commutar le visibilitate del tiratorio de messages."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to focus the active notification"
 msgstr "Association de claves pro mitter foco al notificationes active"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification."
 msgstr "Association de claves pro mitter foco al notificationes active."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Association de claves pro commutar le registrator de schermo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "Association de claves pro initiar/arrestar le registration de schermo."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
 msgstr "Que claviero usar"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
 msgstr "Le typo de claviero a usar."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Framerate used for recording screencasts."
 msgstr "Rata de quadros usate pro registrar le video de schermo."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@ -279,11 +267,11 @@ msgstr ""
 "Le numero de imagines per secunda in le video de schermo registrate per le "
 "registrator incorporate in GNOME Shell."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Le catena usante per gstreamer pro codificar video de schermo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -309,11 +297,11 @@ msgstr ""
 "queue ! webmmux' e registra in WEBM usante le codec VP8. %T designa le "
 "numero de filos optimal pro le systema."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "File extension used for storing the screencast"
 msgstr "Extension de file a usar pro slaveguardar le video de schermo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@ -323,11 +311,11 @@ msgstr ""
 "currente e iste extension. Illo deberea esser modificate si le formato de "
 "container usate pro registar le video es differente."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "The application icon mode."
 msgstr "Le modo de icone in le selector de applicationes."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
@ -338,22 +326,22 @@ msgstr ""
 "fenestra), 'app-icon-only' (monstrar solmente un icone del application) o "
 "'both' (monstrar tote le duo)."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Attach modal dialog to the parent window"
 msgstr "Attaccar le dialogo modal al fenestra parental"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Iste clave supplanta le clave in org.gnome.mutter quando GNOME Shell es "
 "lanceate."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
 msgid "Arrangement of buttons on the titlebar"
 msgstr "Arrangiamento de buttones sur le barra de titulo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
@ -361,15 +349,15 @@ msgstr ""
 "Iste clave supplanta le clave in org.gnome.desktop.wm.preferences quando "
 "GNOME Shell es lanceate."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Activar le tegulage de fenestras depositate sur le bordos del schermo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:49
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
 msgid "Workspaces are managed dynamically"
 msgstr "Le spatios de travalio se gere dynamicamente"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:50
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
 msgid "Workspaces only on primary monitor"
 msgstr "Le spatios de travalio es solmente sur le schermo principal"

@ -475,23 +463,23 @@ msgstr "Impossibile de analysar le commando:"
 msgid "Execution of '%s' failed:"
 msgstr "Falta al execution de '%s':"

-#: ../js/ui/appDisplay.js:351
+#: ../js/ui/appDisplay.js:349
 msgid "Frequent"
 msgstr "Frequente"

-#: ../js/ui/appDisplay.js:358
+#: ../js/ui/appDisplay.js:356
 msgid "All"
 msgstr "Tote"

-#: ../js/ui/appDisplay.js:916
+#: ../js/ui/appDisplay.js:914
 msgid "New Window"
 msgstr "Nove fenestra"

-#: ../js/ui/appDisplay.js:919 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Remover del favoritos"

-#: ../js/ui/appDisplay.js:920
+#: ../js/ui/appDisplay.js:918
 msgid "Add to Favorites"
 msgstr "Adder al favoritos"

@ -1238,35 +1226,35 @@ msgstr "Expunger messages"
 msgid "Notification Settings"
 msgstr "Parametros de notificationes"

-#: ../js/ui/messageTray.js:1710
+#: ../js/ui/messageTray.js:1709
 msgid "No Messages"
 msgstr "Necun message"

-#: ../js/ui/messageTray.js:1783
+#: ../js/ui/messageTray.js:1785
 msgid "Message Tray"
 msgstr "Tiratorio de messages"

-#: ../js/ui/messageTray.js:2801
+#: ../js/ui/messageTray.js:2813
 msgid "System Information"
 msgstr "Information de systema"

-#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:378
+#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Incognite"

-#: ../js/ui/overviewControls.js:472 ../js/ui/screenShield.js:149
+#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nove message"
 msgstr[1] "%d nove messages"

-#: ../js/ui/overview.js:82
+#: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Disfacer"

-#: ../js/ui/overview.js:127
+#: ../js/ui/overview.js:129
 msgid "Overview"
 msgstr "Panorama"

@ -1274,21 +1262,21 @@ msgstr "Panorama"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:260
+#: ../js/ui/overview.js:271
 msgid "Type to search…"
 msgstr "Scribe pro cercar…"

-#: ../js/ui/panel.js:641
+#: ../js/ui/panel.js:633
 msgid "Quit"
 msgstr "Quitar"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:692
+#: ../js/ui/panel.js:657
 msgid "Activities"
 msgstr "Activitates"

-#: ../js/ui/panel.js:989
+#: ../js/ui/panel.js:954
 msgid "Top Bar"
 msgstr "Barra superior"

@ -1297,7 +1285,7 @@ msgstr "Barra superior"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:718
+#: ../js/ui/popupMenu.js:727
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

@ -1932,7 +1920,7 @@ msgstr "Usar un modo specific, per ex. \"gdm\" pro le schermo de accesso"
 msgid "List possible modes"
 msgstr "Monstrar le lista del modos possibile"

-#: ../src/shell-app.c:626
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Impossibile de lancear '%s'"
--- a/po/ml.po
+++ b/po/ml.po
@ -10,9 +10,9 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-24 18:23+0000\n"
-"PO-Revision-Date: 2013-04-25 00:32+0530\n"
-"Last-Translator: Balasankar C <c.balasankar@gmail.com>\n"
+"POT-Creation-Date: 2013-03-23 11:49+0000\n"
+"PO-Revision-Date: 2013-03-25 14:57+0530\n"
+"Last-Translator: Ani Peter <peter.ani@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: ml\n"
 "MIME-Version: 1.0\n"
@ -44,14 +44,10 @@ msgid "Focus the active notification"
 msgstr "സജീവമായ അറിയിപ്പിനെ കേന്ദ്രീകരിക്കുക"

 #: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Show the overview"
-msgstr "പൊതുവായ അവലോകനം കാണിക്കുക"
-
-#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Show all applications"
 msgstr "എല്ലാ പ്രയോഗങ്ങളും കാണിയ്ക്കുക"

-#: ../data/50-gnome-shell-system.xml.in.h:6
+#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Open the application menu"
 msgstr "പ്രയോഗത്തിന്റെ മെനു തുറക്കുക"

@ -75,7 +71,8 @@ msgstr "ഗ്നോം ഷെല്‍ എക്സ്റ്റെന്‍ഷ
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
-"Alt-F2-ല്‍ ഡവലപ്പര്‍മാര്‍ക്കും ടെസ്റ്റേര്‍സിനും പ്രയോജനകരമായ ആന്തരിക പ്രയോഗങ്ങള്‍ പ്രവര്‍ത്തന "
+"Alt-F2-ല്‍ ഡവലപ്പര്‍മാര്‍ക്കും ടെസ്റ്റേര്‍സിനും പ്രയോജനകരമായ ആന്തരിക "
+"പ്രയോഗങ്ങള്‍ പ്രവര്‍ത്തന "
 "സജ്ജമാക്കുന്നു"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
@ -83,7 +80,8 @@ msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
 msgstr ""
-"Alt-F2 ഡയലോഗ് ഉപയോഗിച്ചു് ആന്തരിക ഡീബഗ്ഗിലേക്കും നീരീക്ഷണ പ്രയോഗങ്ങളിലേക്കും പ്രവേശനം "
+"Alt-F2 ഡയലോഗ് ഉപയോഗിച്ചു് ആന്തരിക ഡീബഗ്ഗിലേക്കും നീരീക്ഷണ പ്രയോഗങ്ങളിലേക്കും "
+"പ്രവേശനം "
 "അനുവദിയ്ക്കുക."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
@ -97,14 +95,19 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
-"ഗ്നോം ഷെല്‍ എക്സ്റ്റെന്‍ഷനുകള്‍ക്കു് ഒരു യുയുഐഡി വിശേഷതയുണ്ടു്; ലഭ്യമാക്കേണ്ട എക്സ്റ്റെന്‍ഷനുകള്‍ ഈ കീ പട്ടിക "
-"ലഭ്യമാക്കുന്നു. ലഭ്യമാക്കേണ്ട ഏതു് എക്സ്റ്റെന്‍ഷനും ഈ പട്ടികയിലുണ്ടാവണം. org.gnome.Shell-ല്‍ "
-"നിങ്ങള്‍ക്കു് EnableExtension, DisableExtension എന്നീ ഡീബസ് രീതികളിലൂടെ ഈ പട്ടിക "
+"ഗ്നോം ഷെല്‍ എക്സ്റ്റെന്‍ഷനുകള്‍ക്കു് ഒരു യുയുഐഡി വിശേഷതയുണ്ടു്; ലഭ്യമാക്കേണ്ട "
+"എക്സ്റ്റെന്‍ഷനുകള്‍ ഈ കീ പട്ടിക "
+"ലഭ്യമാക്കുന്നു. ലഭ്യമാക്കേണ്ട ഏതു് എക്സ്റ്റെന്‍ഷനും ഈ പട്ടികയിലുണ്ടാവണം. "
+"org.gnome.Shell-ല്‍ "
+"നിങ്ങള്‍ക്കു് EnableExtension, DisableExtension എന്നീ ഡീബസ് രീതികളിലൂടെ ഈ "
+"പട്ടിക "
 "കൈകാര്യം ചെയ്യുവാനും സാധിയ്ക്കുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Whether to collect stats about applications usage"
-msgstr "പ്രയോഗങ്ങളുടെ ഉപയോഗത്തെപ്പറ്റിയുള്ള സ്ഥിതിവിവരക്കണക്കുകള്‍ ശേഖരിയ്ക്കണമോ എന്നു്"
+msgstr ""
+"പ്രയോഗങ്ങളുടെ ഉപയോഗത്തെപ്പറ്റിയുള്ള സ്ഥിതിവിവരക്കണക്കുകള്‍ ശേഖരിയ്ക്കണമോ "
+"എന്നു്"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:6
 msgid ""
@ -113,9 +116,12 @@ msgid ""
 "want to disable this for privacy reasons. Please note that doing so won't "
 "remove already saved data."
 msgstr ""
-"ഏറ്റവും കൂടുതല്‍ തവണ ഉപയോഗിയ്ക്കുന്ന പ്രയോഗങ്ങള്‍ ലഭ്യമാക്കുന്നതിനായി ഷെല്‍ സാധാരണയായി സജീവമായ "
-"പ്രയോഗങ്ങളെ നിരീക്ഷിയ്ക്കുന്നു. (ഉദാഹരണത്തിനു്, ലോഞ്ചേര്‍സ്). ഈ ഡേറ്റാ സ്വകാര്യമായി "
-"സൂക്ഷിയ്ക്കുന്നെങ്കിലും, ചില കാരണങ്ങളാല്‍ ഇതു് പ്രവര്‍ത്തന രഹിതമാക്കേണ്ടതുണ്ടു്. ഇങ്ങനെ ചെയ്യുന്നതു് "
+"ഏറ്റവും കൂടുതല്‍ തവണ ഉപയോഗിയ്ക്കുന്ന പ്രയോഗങ്ങള്‍ ലഭ്യമാക്കുന്നതിനായി ഷെല്‍ "
+"സാധാരണയായി സജീവമായ "
+"പ്രയോഗങ്ങളെ നിരീക്ഷിയ്ക്കുന്നു. (ഉദാഹരണത്തിനു്, ലോഞ്ചേര്‍സ്). ഈ ഡേറ്റാ "
+"സ്വകാര്യമായി "
+"സൂക്ഷിയ്ക്കുന്നെങ്കിലും, ചില കാരണങ്ങളാല്‍ ഇതു് പ്രവര്‍ത്തന "
+"രഹിതമാക്കേണ്ടതുണ്ടു്. ഇങ്ങനെ ചെയ്യുന്നതു് "
 "നിങ്ങള്‍ സൂക്ഷിച്ച ഡേറ്റയെ ബാധിയ്ക്കുന്നതല്ല."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
@ -126,7 +132,8 @@ msgstr "ഇഷ്ടമുള്ള പ്രയോഗങ്ങള്‍ക്
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
-msgstr "ഈ ഐഡന്റിഫയറുകള്‍ക്കുള്ള പ്രയോഗങ്ങള്‍ ഉചിതമായ സ്ഥലങ്ങളില്‍ കാണിയ്ക്കുന്നു."
+msgstr ""
+"ഈ ഐഡന്റിഫയറുകള്‍ക്കുള്ള പ്രയോഗങ്ങള്‍ ഉചിതമായ സ്ഥലങ്ങളില്‍ കാണിയ്ക്കുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "List of categories that should be displayed as folders"
@ -137,8 +144,8 @@ msgid ""
 "Each category name in this list will be represented as folder in the "
 "application view, rather than being displayed inline in the main view."
 msgstr ""
-"ഈ പട്ടികയിലുള്ള ഓരോ വിഭാഗത്തിന്റെ പേരും, പ്രധാന കാഴ്ചയില്‍ ഓരോ വരിയായി കാണിയ്ക്കുന്നതിനു് "
-"പകരം പ്രയോഗങ്ങളുടെ കാഴ്ചയില്‍ ഫോള്‍ഡറായി കാണിയ്ക്കുന്നു. "
+"ഈ പട്ടികയിലുള്ള ഓരോ വിഭാഗത്തിന്റെ പേരും, പ്രധാന കാഴ്ചയില്‍ ഓരോ വരിയായി "
+"കാണിയ്ക്കുന്നതിനു് പകരം പ്രയോഗങ്ങളുടെ കാഴ്ചയില്‍ ഫോള്‍ഡറായി കാണിയ്ക്കുന്നു. "

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
@ -153,7 +160,8 @@ msgid ""
 "Internally used to store the last IM presence explicitly set by the user. "
 "The value here is from the TpConnectionPresenceType enumeration."
 msgstr ""
-"ഉപയോക്താവു് സജ്ജമാക്കിയ അവസാന ഐഎം ആന്തരികമായി സൂക്ഷിയ്ക്കുന്നതിനു് ഉപയോഗിയ്ക്കുന്നു. മൂല്യം "
+"ഉപയോക്താവു് സജ്ജമാക്കിയ അവസാന ഐഎം ആന്തരികമായി സൂക്ഷിയ്ക്കുന്നതിനു് "
+"ഉപയോഗിയ്ക്കുന്നു. മൂല്യം "
 "TpConnectionPresenceType തരത്തിലുള്ളതാകുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:14
@ -161,7 +169,8 @@ msgid ""
 "Internally used to store the last session presence status for the user. The "
 "value here is from the GsmPresenceStatus enumeration."
 msgstr ""
-"ഉപയോക്താവിനുള്ള അവസാന സെഷന്‍ അവസ്ഥ ആന്തരികമായി സൂക്ഷിയ്ക്കുന്നതിനു് ഉപയോഗിയ്ക്കുന്നു. മൂല്യം "
+"ഉപയോക്താവിനുള്ള അവസാന സെഷന്‍ അവസ്ഥ ആന്തരികമായി സൂക്ഷിയ്ക്കുന്നതിനു് "
+"ഉപയോഗിയ്ക്കുന്നു. മൂല്യം "
 "GsmPresenceStatus തരത്തിലുള്ളതാകുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
@ -173,13 +182,15 @@ msgid ""
 "This key overrides the automatic hiding of the 'Log out' menuitem in single-"
 "user, single-session situations."
 msgstr ""
-"സിംഗിള്‍ യൂസര്‍, സിംഗിള്‍ സെഷനില്‍ 'ലോഗൌട്ട്' മെനുവസ്തു അദൃശ്യമാക്കുന്നതിനായി ഈ കീ ഉപയോഗിയ്ക്കുന്നു"
+"സിംഗിള്‍ യൂസര്‍, സിംഗിള്‍ സെഷനില്‍ 'ലോഗൌട്ട്' മെനുവസ്തു അദൃശ്യമാക്കുന്നതിനായി "
+"ഈ കീ ഉപയോഗിയ്ക്കുന്നു"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
-"എന്‍ക്രിപ്റ്റ് ചെയ്തതോ വിദൂരമോ ആയ ഫയല്‍സിസ്റ്റങ്ങള്‍ മൌണ്ട് ചെയ്യുമ്പോഴുള്ള രഹസ്യവാക്ക് ഓര്‍മ്മിക്കണോ എന്ന്"
+"എന്‍ക്രിപ്റ്റ് ചെയ്തതോ വിദൂരമോ ആയ ഫയല്‍സിസ്റ്റങ്ങള്‍ മൌണ്ട് ചെയ്യുമ്പോഴുള്ള "
+"രഹസ്യവാക്ക് ഓര്‍മ്മിക്കണോ എന്ന്"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid ""
@ -188,9 +199,10 @@ msgid ""
 "'Remember Password' checkbox will be present. This key sets the default "
 "state of the checkbox."
 msgstr ""
-"ഒരു എന്‍ക്രിപ്റ്റ് ചെയ്ത ഡിവൈസ് അല്ലെങ്കില്‍ വിദൂര ഫയല്‍സിസ്റ്റം മൌണ്ട് ചെയ്യുമ്പോള്‍ ഷെല്‍ ഒരു രഹസ്യവാക്ക് "
-"ആവശ്യപ്പെടുന്നു. രഹസ്യവാക്ക് സൂക്ഷിയ്ക്കുവാന്‍ സാധ്യമെങ്കില്‍,  'രഹസ്യവാക്ക് ഓര്‍ത്തു്വയ്ക്കുക' ചെക്ക്ബോക്സ് "
-"കാണാം. ഈ കീ ചെക്ക്ബോക്സിന്റെ സ്വതവേയുള്ള അവസ്ഥ സജ്ജമാക്കുന്നു."
+"ഒരു എന്‍ക്രിപ്റ്റ് ചെയ്ത ഡിവൈസ് അല്ലെങ്കില്‍ വിദൂര ഫയല്‍സിസ്റ്റം മൌണ്ട് "
+"ചെയ്യുമ്പോള്‍ ഷെല്‍ ഒരു രഹസ്യവാക്ക് ആവശ്യപ്പെടുന്നു. രഹസ്യവാക്ക് "
+"സൂക്ഷിയ്ക്കുവാന്‍ സാധ്യമെങ്കില്‍,  'രഹസ്യവാക്ക് ഓര്‍ത്തു്വയ്ക്കുക' "
+"ചെക്ക്ബോക്സ് കാണാം. ഈ കീ ചെക്ക്ബോക്സിന്റെ സ്വതവേയുള്ള അവസ്ഥ സജ്ജമാക്കുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Show the week date in the calendar"
@ -216,65 +228,61 @@ msgstr "\"പ്രയോഗങ്ങള്‍ കാണിയ്ക്കുക
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr ""
-"പ്രവര്‍ത്തികളുടെ അവലോകനത്തിന്റെ \"പ്രയോഗങ്ങള്‍ കാണിയ്ക്കുക\" എന്ന കാഴ്ച തുറക്കുന്നതിനുള്ള കീബൈന്‍ഡിങ്"
+"പ്രവര്‍ത്തികളുടെ അവലോകനത്തിന്റെ \"പ്രയോഗങ്ങള്‍ കാണിയ്ക്കുക\" എന്ന കാഴ്ച "
+"തുറക്കുന്നതിനുള്ള കീബൈന്‍ഡിങ്"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-msgid "Keybinding to open the overview"
-msgstr "പൊതുവായ അവലോകനം  തുറക്കുന്നതിനുള്ള കീബൈന്‍ഡിങ്"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-msgid "Keybinding to open the Activities Overview."
-msgstr "പ്രയോഗങ്ങളുടെ പൊതുവായ അവലോകനം എന്ന കാഴ്ച തുറക്കുന്നതിനുള്ള കീബൈന്‍ഡിങ്"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "സന്ദേശ ട്രേയുടെ ദൃശ്യത ടൊഗ്ഗിള്‍ ചെയ്യുന്നതിനുള്ള കീക്കൂട്ടം"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "സന്ദേശ ട്രേയുടെ ദൃശ്യത ടൊഗ്ഗിള്‍ ചെയ്യുന്നതിനുള്ള കീക്കൂട്ടം."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to focus the active notification"
 msgstr "സജീവമായ അറിയിപ്പിനുള്ള കീബൈന്‍ഡിങ്"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification."
 msgstr "സജീവമായ അറിയിപ്പിനുള്ള കീബൈന്‍ഡിങ്."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to toggle the screen recorder"
 msgstr "സ്ക്രീന്‍ റിക്കോര്‍ഡര്‍ ടൊഗ്ഗിള്‍ ചെയ്യുന്നതിനുള്ള കീക്കൂട്ടം"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Keybinding to start/stop the builtin screen recorder."
-msgstr "ബിള്‍ട്ടിന്‍ സ്ക്രീന്‍ റിക്കോര്‍ഡര്‍ തുടങ്ങുവാന്‍/നിര്‍ത്തുന്നതിനുള്ള കീക്കൂട്ടം."
+msgstr ""
+"ബിള്‍ട്ടിന്‍ സ്ക്രീന്‍ റിക്കോര്‍ഡര്‍ തുടങ്ങുവാന്‍/നിര്‍ത്തുന്നതിനുള്ള "
+"കീക്കൂട്ടം."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
 msgstr "ഏതു് കീബോര്‍ഡ് ഉപയോഗിയ്ക്കണം"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
 msgstr "ഏതു് തരം കീബോര്‍ഡ് ഉപയോഗിയ്ക്കണം."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Framerate used for recording screencasts."
 msgstr "സ്ക്രീന്‍കാസ്റ്റുകള്‍ റിക്കോര്‍ഡ് ചെയ്യുന്നതിനുള്ള ഫ്രെയിം റേറ്റ്."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
 msgstr ""
-"ഗ്നോം ഷെല്ലിന്റെ സ്ക്രീന്‍കാസ്റ്റ് റിക്കോര്‍ഡര്‍ റീക്കോര്‍ഡ് ചെയ്തിട്ടുള്ള സ്ക്രീന്‍കാസ്റ്റിന്റെ "
+"ഗ്നോം ഷെല്ലിന്റെ സ്ക്രീന്‍കാസ്റ്റ് റിക്കോര്‍ഡര്‍ റീക്കോര്‍ഡ് ചെയ്തിട്ടുള്ള "
+"സ്ക്രീന്‍കാസ്റ്റിന്റെ "
 "ഫ്രെയിംറേറ്റ്, ഒരു സെക്കന്‍ഡില്‍ ഒരു ഫ്രെയിം."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "സ്ക്രീന്‍കാസ്റ്റ് എന്‍കോഡ് ചെയ്യുന്നതിനുള്ള gstreamer പൈപ്പ്‌ലൈന്‍"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -288,68 +296,78 @@ msgid ""
 "threads=%T ! queue ! webmmux' and records to WEBM using the VP8 codec. %T is "
 "used as a placeholder for a guess at the optimal thread count on the system."
 msgstr ""
-"റിക്കോര്‍ഡിങുകള്‍ എന്‍കോഡ് ചെയ്യുന്നതിനായി GStreamer പൈപ്പ് ലൈന്‍ ഉപയോഗിയ്ക്കുന്നു. gst-launch-"
-"നുള്ള സിന്റാക്സ് ഉപയോഗിയ്ക്കുന്നു. കാലിയായി സജ്ജമാക്കുമ്പോള്‍ കാലിയാകുന്നു.ഇതു് നിലവില്‍ 'vp8enc "
+"റിക്കോര്‍ഡിങുകള്‍ എന്‍കോഡ് ചെയ്യുന്നതിനായി GStreamer പൈപ്പ് ലൈന്‍ "
+"ഉപയോഗിയ്ക്കുന്നു. gst-launch-"
+"നുള്ള സിന്റാക്സ് ഉപയോഗിയ്ക്കുന്നു. കാലിയായി സജ്ജമാക്കുമ്പോള്‍ "
+"കാലിയാകുന്നു.ഇതു് നിലവില്‍ 'vp8enc "
 "min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! "
 "queue ! webmmux' ആകുന്നുസ WEBM VP8 കോഡ് ഉപയോഗിച്ചു് റിക്കോര്‍ഡ് ചെയ്യുന്നു."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "File extension used for storing the screencast"
 msgstr "സ്ക്രീന്‍കാസ്റ്റ് സൂക്ഷിയ്ക്കുന്നതിനുള്ള ഫയല്‍ എക്സ്റ്റെന്‍ഷന്‍"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
 "a different container format."
 msgstr ""
-"റിക്കോര്‍ഡ് ചെയ്ത സ്ക്രീന്‍കാസ്റ്റുകള്‍ക്കുള്ള ഫയല്‍നാമം നിലവിലുള്ള തീയതി, എക്സ്റ്റെന്‍ഷന്‍ എന്നിവ "
-"അനുസരിച്ചാകുന്നു. മറ്റൊരു ശൈലിയിലേക്കു് റിക്കോര്‍ഡ് ചെയ്യുമ്പോള്‍ ഇതു് മാറ്റണം."
+"റിക്കോര്‍ഡ് ചെയ്ത സ്ക്രീന്‍കാസ്റ്റുകള്‍ക്കുള്ള ഫയല്‍നാമം നിലവിലുള്ള തീയതി, "
+"എക്സ്റ്റെന്‍ഷന്‍ എന്നിവ "
+"അനുസരിച്ചാകുന്നു. മറ്റൊരു ശൈലിയിലേക്കു് റിക്കോര്‍ഡ് ചെയ്യുമ്പോള്‍ ഇതു് "
+"മാറ്റണം."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "The application icon mode."
 msgstr "പ്രയോഗത്തിന്റെ ഐക്കണ്‍ മോഡ്."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
 "only' (shows only the application icon) or 'both'."
 msgstr ""
-"സ്വിച്ചറില്‍ ജാലകങ്ങള്‍ എങ്ങനെ കാണിയ്ക്കുന്നു എന്നു് ക്രമീകരിയ്ക്കുന്നു. ശരിയായ സാധ്യതകള്‍: "
-"'thumbnail-only' (ജാലകത്തിന്റെ പ്രതിരൂപം കാണിയ്ക്കുന്നു), 'app-icon-"
+"സ്വിച്ചറില്‍ ജാലകങ്ങള്‍ എങ്ങനെ കാണിയ്ക്കുന്നു എന്നു് ക്രമീകരിയ്ക്കുന്നു. "
+"ശരിയായ "
+"സാധ്യതകള്‍: 'thumbnail-only' (ജാലകത്തിന്റെ പ്രതിരൂപം കാണിയ്ക്കുന്നു), "
+"'app-icon-"
 "only' (പ്രയോഗത്തിന്റെ പ്രതിരൂപം കാണിയ്ക്കുന്നു) അല്ലെങ്കില്‍ 'both'."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Attach modal dialog to the parent window"
 msgstr "പേരന്റ് ജാലകത്തിലേക്കു് ഡയലോഗ് ചേര്‍ക്കുക"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr "ഗ്നോം ഷെല്‍ പ്രവര്‍ത്തിയ്ക്കുമ്പോള്‍ org.gnome.mutter-ലുള്ള കീ ഈ കീ തിരുത്തിയെഴുതുന്നു."
+msgstr ""
+"ഗ്നോം ഷെല്‍ പ്രവര്‍ത്തിയ്ക്കുമ്പോള്‍ org.gnome.mutter-ലുള്ള കീ ഈ കീ "
+"തിരുത്തിയെഴുതുന്നു."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
 msgid "Arrangement of buttons on the titlebar"
 msgstr "തലക്കെട്ടിനുള്ള ബാറില്‍ ബട്ടണുകളുടെ ക്രമീകരണം"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
-"ഗ്നോം ഷെല്‍ പ്രവര്‍ത്തിയ്ക്കുമ്പോള്‍ org.gnome.desktop.wm.preferences-ലുള്ള കീ ഈ കീ "
-"തിരുത്തിയെഴുതുന്നു."
+"ഗ്നോം ഷെല്‍ പ്രവര്‍ത്തിയ്ക്കുമ്പോള്‍ org.gnome.desktop.wm.preferences-ലുള്ള "
+"കീ ഈ കീ തിരുത്തിയെഴുതുന്നു."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
 msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "സ്ക്രീന്‍ കോണുകളില്‍ ജാലകങ്ങള്‍ എത്തിയ്ക്കുമ്പോള്‍ കോണ്‍ ചരിയ്ക്കുന്നതിനായി പ്രവര്‍ത്തന സജ്ജമാക്കുക"
+msgstr ""
+"സ്ക്രീന്‍ കോണുകളില്‍ ജാലകങ്ങള്‍ എത്തിയ്ക്കുമ്പോള്‍ കോണ്‍ ചരിയ്ക്കുന്നതിനായി "
+"പ്രവര്‍ത്തന സജ്ജമാക്കുക"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:49
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
 msgid "Workspaces are managed dynamically"
 msgstr "പണിയിടങ്ങള്‍ ഡയനാമിക്കായി കൈകാര്യം ചെയ്തിരിക്കുന്നു"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:50
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
 msgid "Workspaces only on primary monitor"
 msgstr "പ്രധാന മോണിറ്ററില്‍ മാത്രം പണിയിടങ്ങള്‍"

@ -364,9 +382,12 @@ msgstr "എക്സ്റ്റെന്‍ഷന്‍"

 #: ../js/extensionPrefs/main.js:189
 msgid "Select an extension to configure using the combobox above."
-msgstr "മുകളിലുള്ള കോമ്പോ ബോക്സ് ഉപയോഗിച്ചു് ക്രമീകരിയ്ക്കുന്നതിനുള്ളൊരു എക്സ്റ്റെന്‍ഷന്‍ തെര‍ഞ്ഞെടുക്കുക."
+msgstr ""
+"മുകളിലുള്ള കോമ്പോ ബോക്സ് ഉപയോഗിച്ചു് ക്രമീകരിയ്ക്കുന്നതിനുള്ളൊരു "
+"എക്സ്റ്റെന്‍ഷന്‍ തെര‍ഞ്ഞെടുക്കുക."

 #: ../js/gdm/loginDialog.js:405
+#| msgid "Session..."
 msgid "Session…"
 msgstr "പ്രവര്‍ത്തനവേള..."

@ -377,32 +398,32 @@ msgstr "പ്രവര്‍ത്തനവേള..."
 msgid "Not listed?"
 msgstr "ലഭ്യമല്ലേ?"

-#: ../js/gdm/loginDialog.js:787 ../js/ui/components/networkAgent.js:137
-#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:376
+#: ../js/gdm/loginDialog.js:786 ../js/ui/components/networkAgent.js:137
+#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:375
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:100
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:99
 #: ../js/ui/userMenu.js:938
 msgid "Cancel"
 msgstr "വേണ്ട"

-#: ../js/gdm/loginDialog.js:803
+#: ../js/gdm/loginDialog.js:802
 msgctxt "button"
 msgid "Sign In"
 msgstr "അകത്തുകയറുക"

-#: ../js/gdm/loginDialog.js:803
+#: ../js/gdm/loginDialog.js:802
 msgid "Next"
 msgstr "അടുത്തത്"

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:918 ../js/ui/components/networkAgent.js:260
+#: ../js/gdm/loginDialog.js:917 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
 msgstr "ഉപയോക്തൃ നാമം: "

-#: ../js/gdm/loginDialog.js:1174
+#: ../js/gdm/loginDialog.js:1173
 msgid "Login Window"
 msgstr "പ്രവേശന ജാലകം"

@ -455,23 +476,23 @@ msgstr "ആജ്ഞ പ്രാവര്‍ത്തികമാക്കാ
 msgid "Execution of '%s' failed:"
 msgstr "'%s' നടപ്പിലാക്കുന്നതില്‍ പരാജയപ്പെട്ടു:"

-#: ../js/ui/appDisplay.js:351
+#: ../js/ui/appDisplay.js:349
 msgid "Frequent"
 msgstr "ഇടയ്ക്കിടെ"

-#: ../js/ui/appDisplay.js:358
+#: ../js/ui/appDisplay.js:356
 msgid "All"
 msgstr "എല്ലാം"

-#: ../js/ui/appDisplay.js:916
+#: ../js/ui/appDisplay.js:914
 msgid "New Window"
 msgstr "പുതിയ വിന്‍ഡോ"

-#: ../js/ui/appDisplay.js:919 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "ഇഷ്ടപ്പെട്ടവയില്‍ നിന്നും നീക്കം ചെയ്യുക"

-#: ../js/ui/appDisplay.js:920
+#: ../js/ui/appDisplay.js:918
 msgid "Add to Favorites"
 msgstr "ഇഷ്ടപ്പെട്ടവയിലേക്ക് ചേര്‍ക്കുക"

@ -508,7 +529,7 @@ msgctxt "event list time"
 msgid "%H\\u2236%M"
 msgstr "%H\\u2236%M"

-#. Translators: Shown in calendar event list, if 12h format,
+#. Transators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space
 #: ../js/ui/calendar.js:77
@ -711,7 +732,8 @@ msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 msgstr ""
-"വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്ക് '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി രഹസ്യവാക്കുകള്‍ അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
+"വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്ക് '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി രഹസ്യവാക്കുകള്‍ "
+"അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
 "ആവശ്യമുണ്ടു്."

 #: ../js/ui/components/networkAgent.js:314
@ -768,7 +790,7 @@ msgid "Sorry, that didn't work. Please try again."
 msgstr "ക്ഷമിക്കണം, അതു ശരിയല്ല. ദയവായി വീണ്ടും ശ്രമിക്കുക."

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/components/recorder.js:47
+#: ../js/ui/components/recorder.js:48
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "%d-ല്‍ നിന്നുള്ള സ്ക്രീന്‍കാസ്റ്റ്, %t-ല്‍"
@ -891,7 +913,8 @@ msgstr "%s നിങ്ങള്‍ക്കു് %s അയച്ചിരി
 #: ../js/ui/components/telepathyClient.js:1206
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr "നിങ്ങള്‍ ഓണ്‍ലൈന്‍ ആകുമ്പോള്‍ കാണുന്നതിനുള്ള അനുമതി %s-നു് ആവശ്യമുണ്ടു്"
+msgstr ""
+"നിങ്ങള്‍ ഓണ്‍ലൈന്‍ ആകുമ്പോള്‍ കാണുന്നതിനുള്ള അനുമതി %s-നു് ആവശ്യമുണ്ടു്"

 #: ../js/ui/components/telepathyClient.js:1298
 msgid "Network error"
@ -964,7 +987,9 @@ msgstr "ഈ അക്കൌണ്ട് നിലവില്‍ സര്‍വ
 #: ../js/ui/components/telepathyClient.js:1332
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr "അതേ ശ്രോതസ്സ് ഉപയോഗിച്ചു് ഒരു പുതിയ കണക്ഷന്‍ ഉപയോഗിച്ചു് ഈ കണക്ഷന്‍ മാറ്റിസ്ഥാപിയ്ക്കുന്നു"
+msgstr ""
+"അതേ ശ്രോതസ്സ് ഉപയോഗിച്ചു് ഒരു പുതിയ കണക്ഷന്‍ ഉപയോഗിച്ചു് ഈ കണക്ഷന്‍ "
+"മാറ്റിസ്ഥാപിയ്ക്കുന്നു"

 #: ../js/ui/components/telepathyClient.js:1334
 msgid "The account already exists on the server"
@ -981,14 +1006,17 @@ msgstr "സമ്മതപത്രം വീണ്ടും ആവശ്യപ
 #: ../js/ui/components/telepathyClient.js:1340
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr "സമ്മതപത്രം സുരക്ഷിതമല്ലാത്തൊരു സിഫര്‍ ആല്‍ഗോരിഥം ഉപയോഗിയ്ക്കുന്നു അല്ലെങ്കില്‍ ഉചിതമല്ല"
+msgstr ""
+"സമ്മതപത്രം സുരക്ഷിതമല്ലാത്തൊരു സിഫര്‍ ആല്‍ഗോരിഥം ഉപയോഗിയ്ക്കുന്നു "
+"അല്ലെങ്കില്‍ ഉചിതമല്ല"

 #: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
-"സര്‍വറിന്റെ സമ്മതപത്രത്തിന്റെ വ്യാപ്തി, അല്ലെങ്കില്‍ സര്‍വര്‍ സമ്മതപത്ര ചെയിന്റെ വ്യാപ്തി, എന്നിവ "
+"സര്‍വറിന്റെ സമ്മതപത്രത്തിന്റെ വ്യാപ്തി, അല്ലെങ്കില്‍ സര്‍വര്‍ സമ്മതപത്ര "
+"ചെയിന്റെ വ്യാപ്തി, എന്നിവ "
 "പരിധിയില്‍ കൂടുന്നു"

 #: ../js/ui/components/telepathyClient.js:1344
@ -1057,7 +1085,8 @@ msgstr "പുറത്ത് കടക്കുക"
 #: ../js/ui/endSessionDialog.js:65
 msgid "Click Log Out to quit these applications and log out of the system."
 msgstr ""
-"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പുറത്തു കടക്കുക ക്ലിക്ക് ചെയ്തു് സിസ്റ്റത്തില്‍ നിന്നും "
+"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പുറത്തു കടക്കുക ക്ലിക്ക് "
+"ചെയ്തു് സിസ്റ്റത്തില്‍ നിന്നും "
 "പുറത്തു് കടക്കുക."

 #: ../js/ui/endSessionDialog.js:67
@ -1091,7 +1120,8 @@ msgstr "നിര്‍ത്തുക"
 #: ../js/ui/endSessionDialog.js:84
 msgid "Click Power Off to quit these applications and power off the system."
 msgstr ""
-"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പവര്‍ ഓഫ് ചെയ്യുക ക്ലിക്ക് ചെയ്തു സിസ്റ്റിന്റെ പവര്‍ "
+"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പവര്‍ ഓഫ് ചെയ്യുക ക്ലിക്ക് "
+"ചെയ്തു സിസ്റ്റിന്റെ പവര്‍ "
 "ഓഫ് ചെയ്യുക."

 #: ../js/ui/endSessionDialog.js:86
@ -1122,7 +1152,8 @@ msgstr "പുനരാരംഭിക്കുക"

 #: ../js/ui/endSessionDialog.js:101
 msgid "Click Restart to quit these applications and restart the system."
-msgstr "ഈ പ്രയോഗങ്ങള്‍ നിറുത്തി സിസ്റ്റം പുനരാരംഭിക്കുവാന്‍ പുനരാരംഭിക്കൂ അമര്‍ത്തുക"
+msgstr ""
+"ഈ പ്രയോഗങ്ങള്‍ നിറുത്തി സിസ്റ്റം പുനരാരംഭിക്കുവാന്‍ പുനരാരംഭിക്കൂ അമര്‍ത്തുക"

 #: ../js/ui/endSessionDialog.js:103
 #, c-format
@ -1142,7 +1173,9 @@ msgstr "ഇന്‍സ്റ്റോള്‍"
 #: ../js/ui/extensionDownloader.js:204
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
-msgstr "extensions.gnome.org ഇല്‍ നിന്നും '%s' ഡൗണ്‍ലോട് ചെയ്ത് ഇന്‍സ്റ്റോള്‍ ചെയ്യേണമോ?"
+msgstr ""
+"extensions.gnome.org ഇല്‍ നിന്നും '%s' ഡൗണ്‍ലോട് ചെയ്ത് ഇന്‍സ്റ്റോള്‍ "
+"ചെയ്യേണമോ?"

 #: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:314
 #: ../js/ui/status/power.js:211
@ -1171,9 +1204,7 @@ msgstr "പിശകുകള്‍ കാണിക്കുക"
 msgid "Enabled"
 msgstr "പ്രവര്‍ത്തനക്ഷമമാക്കി"

-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:769 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/lookingGlass.js:769
 msgid "Disabled"
 msgstr "പ്രവര്‍ത്തനരഹിതമാക്കി"

@ -1206,6 +1237,7 @@ msgid "Remove"
 msgstr "നീക്കം ചെയ്യുക"

 #: ../js/ui/messageTray.js:1501
+#| msgid "No Messages"
 msgid "Clear Messages"
 msgstr "സന്ദേശങ്ങള്‍ വെടിപ്പാക്കുക"

@ -1213,35 +1245,35 @@ msgstr "സന്ദേശങ്ങള്‍ വെടിപ്പാക്ക
 msgid "Notification Settings"
 msgstr "അറിയിപ്പു് ക്രമീകരണങ്ങള്‍"

-#: ../js/ui/messageTray.js:1710
+#: ../js/ui/messageTray.js:1709
 msgid "No Messages"
 msgstr "സന്ദേശങ്ങളില്ല"

-#: ../js/ui/messageTray.js:1783
+#: ../js/ui/messageTray.js:1782
 msgid "Message Tray"
 msgstr "സന്ദേശത്തിന്റെ ട്രേ"

-#: ../js/ui/messageTray.js:2801
+#: ../js/ui/messageTray.js:2810
 msgid "System Information"
 msgstr "സിസ്റ്റത്തെക്കുറിച്ചുള്ള വിവരം"

-#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:378
+#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "അജ്ഞാതം"

-#: ../js/ui/overviewControls.js:472 ../js/ui/screenShield.js:149
+#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d പുതിയ സന്ദേശം"
 msgstr[1] "%d പുതിയ സന്ദേശങ്ങള്‍"

-#: ../js/ui/overview.js:82
+#: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "വേണ്ട"

-#: ../js/ui/overview.js:127
+#: ../js/ui/overview.js:129
 msgid "Overview"
 msgstr "അവലോകനം"

@ -1249,21 +1281,22 @@ msgstr "അവലോകനം"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:260
+#: ../js/ui/overview.js:271
+#| msgid "Type to search..."
 msgid "Type to search…"
 msgstr "തെരയുന്നതിനായി ടൈപ്പ് ചെയ്യുക..."

-#: ../js/ui/panel.js:641
+#: ../js/ui/panel.js:612
 msgid "Quit"
 msgstr "നിര്‍ത്തുക"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:692
+#: ../js/ui/panel.js:636
 msgid "Activities"
 msgstr "പ്രവര്‍ത്തനങ്ങള്‍"

-#: ../js/ui/panel.js:989
+#: ../js/ui/panel.js:933
 msgid "Top Bar"
 msgstr "മുകളിലുള്ള ബാര്‍"

@ -1272,15 +1305,15 @@ msgstr "മുകളിലുള്ള ബാര്‍"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:718
+#: ../js/ui/popupMenu.js:727
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"

-#: ../js/ui/runDialog.js:74
+#: ../js/ui/runDialog.js:73
 msgid "Enter a Command"
 msgstr "ഒരു കമാന്‍ഡ് നല്‍കുക"

-#: ../js/ui/runDialog.js:110
+#: ../js/ui/runDialog.js:109
 msgid "Close"
 msgstr "അടക്കുക"

@ -1301,7 +1334,7 @@ msgstr[1] "%d പുതിയ അറിയിപ്പുകള്‍"
 msgid "Lock"
 msgstr "പൂട്ടുക"

-#: ../js/ui/screenShield.js:641
+#: ../js/ui/screenShield.js:637
 msgid "GNOME needs to lock the screen"
 msgstr "ഗ്നോമിന് സ്ക്രീന്‍ പൂട്ടണം"

@ -1312,15 +1345,17 @@ msgstr "ഗ്നോമിന് സ്ക്രീന്‍ പൂട്ടണ
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:762 ../js/ui/screenShield.js:1198
+#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1194
+#| msgid "Unable to connect to %s"
 msgid "Unable to lock"
 msgstr "പൂട്ടുവാന്‍ സാധ്യമല്ല"

-#: ../js/ui/screenShield.js:763 ../js/ui/screenShield.js:1199
+#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1195
 msgid "Lock was blocked by an application"
 msgstr "പൂട്ടുന്ന സംവിധാനം ഒരു പ്രയോഗം തടസ്സപ്പെടുത്തിയിരിയ്ക്കുന്നു"

 #: ../js/ui/searchDisplay.js:453
+#| msgid "Searching..."
 msgid "Searching…"
 msgstr "തെരയുന്നു..."

@ -1336,11 +1371,11 @@ msgstr "പകര്‍ത്തുക"
 msgid "Paste"
 msgstr "ഒട്ടിയ്ക്കുക"

-#: ../js/ui/shellEntry.js:101
+#: ../js/ui/shellEntry.js:106
 msgid "Show Text"
 msgstr "പദാവലി കാണിക്കുക"

-#: ../js/ui/shellEntry.js:103
+#: ../js/ui/shellEntry.js:108
 msgid "Hide Text"
 msgstr "പദാവലി മറക്കുക"

@ -1352,7 +1387,7 @@ msgstr "രഹസ്യവാക്ക്"
 msgid "Remember Password"
 msgstr "രഹസ്യവാക്ക് ഓര്‍ത്തു് വയ്ക്കുക"

-#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:114
+#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:113
 msgid "Unlock"
 msgstr "പൂട്ട് തുറക്കുക"

@ -1416,10 +1451,12 @@ msgid "Visibility"
 msgstr "കാഴ്ച"

 #: ../js/ui/status/bluetooth.js:59
+#| msgid "Send Files to Device..."
 msgid "Send Files to Device…"
 msgstr "ഡിവൈസിലേക്കു് ഫയലുകള്‍ അയയ്ക്കുക..."

 #: ../js/ui/status/bluetooth.js:60
+#| msgid "Set Up a New Device..."
 msgid "Set Up a New Device…"
 msgstr "പുതിയൊരു ഡിവൈസ് സജ്ജമാക്കുക..."

@ -1446,6 +1483,7 @@ msgid "connecting..."
 msgstr "ബന്ധിപ്പിയ്ക്കുന്നു...."

 #: ../js/ui/status/bluetooth.js:239
+#| msgid "Send Files..."
 msgid "Send Files…"
 msgstr "ഫയലുകള്‍ അയയ്ക്കുക..."

@ -1658,6 +1696,7 @@ msgstr "ഊര്‍ജ്ജ ക്രമീകരണങ്ങള്‍"
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
 #: ../js/ui/status/power.js:99
+#| msgid "Estimating..."
 msgid "Estimating…"
 msgstr "കണക്കുകൂട്ടുന്നു..."

@ -1757,11 +1796,11 @@ msgstr "ഒച്ച"
 msgid "Microphone"
 msgstr "മൈക്രോഫോണ്‍"

-#: ../js/ui/unlockDialog.js:125
+#: ../js/ui/unlockDialog.js:124
 msgid "Log in as another user"
 msgstr "മറ്റൊരു ഉപയോക്താവായി പ്രവേശിയ്ക്കുക"

-#: ../js/ui/unlockDialog.js:146
+#: ../js/ui/unlockDialog.js:145
 msgid "Unlock Window"
 msgstr "ജാലകത്തിന്റെ പൂട്ടു തുറക്കുക"

@ -1814,8 +1853,10 @@ msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
 msgstr ""
-"ചാറ്റ് സന്ദേശങ്ങള്‍ എന്ന പോലെ അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നു. മറ്റുള്ളവരുടെ ചാറ്റ് സന്ദേശങ്ങള്‍ "
-"നിങ്ങള്‍ക്കു് കാണുവാന്‍ സാധ്യമല്ല എന്നു് നിങ്ങളുടെ ഓണ്‍ലൈന്‍ അവസ്ഥയില്‍ വ്യക്തമാക്കുന്നു."
+"ചാറ്റ് സന്ദേശങ്ങള്‍ എന്ന പോലെ അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നു. "
+"മറ്റുള്ളവരുടെ ചാറ്റ് സന്ദേശങ്ങള്‍ "
+"നിങ്ങള്‍ക്കു് കാണുവാന്‍ സാധ്യമല്ല എന്നു് നിങ്ങളുടെ ഓണ്‍ലൈന്‍ അവസ്ഥയില്‍ "
+"വ്യക്തമാക്കുന്നു."

 #: ../js/ui/userMenu.js:888
 msgid "Other users are logged in."
@ -1868,28 +1909,6 @@ msgstr "'%s' തയ്യാറാണ്"
 msgid "Evolution Calendar"
 msgstr "ഇവല്യൂഷന്‍ കലണ്ടര്‍"

-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1837
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u ഔട്ട്പുട്ട്"
-msgstr[1] "%u ഔട്ട്പുട്ടുകള്‍"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1847
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u ഇന്‍പുട്ട്"
-msgstr[1] "%u ഇന്‍പുട്ടുകള്‍"
-
-#: ../src/gvc/gvc-mixer-control.c:2371
-msgid "System Sounds"
-msgstr "സിസ്റ്റം ശബ്ദങ്ങള്‍"
-
 #: ../src/main.c:347
 msgid "Print version"
 msgstr "പ്രിന്റ് ചെയ്യുവാന്‍ സാധിയ്ക്കുന്ന പതിപ്പു്"
@ -1906,7 +1925,7 @@ msgstr "ഒരു പ്രത്യേക മോഡ് ഉപയോഗിയ്
 msgid "List possible modes"
 msgstr "സാധ്യമായ മോഡുകള്‍ ലഭ്യമാക്കുക"

-#: ../src/shell-app.c:626
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "'%s' ലഭ്യമാക്കുന്നതില്‍ പരാജയം"
@ -1936,6 +1955,19 @@ msgstr "ഉപയോക്താവു് ആധികാരികത ഉറപ
 #~ msgid "More..."
 #~ msgstr "കൂടുതല്‍..."

+#~ msgid "%u Output"
+#~ msgid_plural "%u Outputs"
+#~ msgstr[0] "%u ഔട്ട്പുട്ട്"
+#~ msgstr[1] "%u ഔട്ട്പുട്ടുകള്‍"
+
+#~ msgid "%u Input"
+#~ msgid_plural "%u Inputs"
+#~ msgstr[0] "%u ഇന്‍പുട്ട്"
+#~ msgstr[1] "%u ഇന്‍പുട്ടുകള്‍"
+
+#~ msgid "System Sounds"
+#~ msgstr "സിസ്റ്റം ശബ്ദങ്ങള്‍"
+
 #~ msgctxt "event list time"
 #~ msgid "%H:%M"
 #~ msgstr "%H:%M"
--- a/po/nb.po
+++ b/po/nb.po
@ -6,10 +6,10 @@
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 3.9.x\n"
+"Project-Id-Version: gnome-shell 3.8.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 09:43+0200\n"
-"PO-Revision-Date: 2013-05-28 09:44+0200\n"
+"POT-Creation-Date: 2013-05-13 09:47+0200\n"
+"PO-Revision-Date: 2013-04-03 13:31+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@ -39,14 +39,10 @@ msgid "Focus the active notification"
 msgstr "Fokuser aktiv varsling"

 #: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Show the overview"
-msgstr "Vis oversikt"
-
-#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Show all applications"
 msgstr "Vis alle programmer"

-#: ../data/50-gnome-shell-system.xml.in.h:6
+#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Open the application menu"
 msgstr "Åpne programmenyen"

@ -96,10 +92,26 @@ msgstr ""
 "EnablExtension og DisableExtension på org.gnome.Shell."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
+msgid "Whether to collect stats about applications usage"
+msgstr "Om det skal samles statistikk om bruk av programmer"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:6
+msgid ""
+"The shell normally monitors active applications in order to present the most "
+"used ones (e.g. in launchers). While this data will be kept private, you may "
+"want to disable this for privacy reasons. Please note that doing so won't "
+"remove already saved data."
+msgstr ""
+"GNOME Shell vil normalt holde øye med åpne programmer for å kunne vise de "
+"mest bruke (for eksempel i oppstartsmenyer). Denne informasjonen vil bli "
+"holdt privat, men du kan deaktivere denne lagringen av personvernårsaker. "
+"Hvis du slår det av, vil det ikke fjerne allerede lagret informasjon."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
 msgstr "Liste av skrivebordfil-ider for favorittprogrammer"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:6
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:8
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
@ -107,52 +119,52 @@ msgstr ""
 "Programmene som passer til disse identifikatorene vil bli vist i "
 "favorittområdet."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:7
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "List of categories that should be displayed as folders"
 msgstr "Liste med kategorier som skal vises som mapper"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:8
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
 msgid ""
 "Each category name in this list will be represented as folder in the "
 "application view, rather than being displayed inline in the main view."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:9
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
 msgstr "Historikk for kommandodialog (Alt-F2)"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
 msgid "History for the looking glass dialog"
 msgstr "Historikk for forstørrelsesglass-dialogen"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid ""
 "Internally used to store the last IM presence explicitly set by the user. "
 "The value here is from the TpConnectionPresenceType enumeration."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
 msgid ""
 "Internally used to store the last session presence status for the user. The "
 "value here is from the GsmPresenceStatus enumeration."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Always show the 'Log out' menuitem in the user menu."
 msgstr "Alltid vis menyoppføringen «Logg ut» i brukermenyen."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menuitem in single-"
 "user, single-session situations."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid ""
 "The shell will request a password when an encrypted device or a remote "
 "filesystem is mounted. If the password can be saved for future use a "
@ -160,40 +172,32 @@ msgid ""
 "state of the checkbox."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Show the week date in the calendar"
 msgstr "Vis dato for uken i kalender"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Viser ISO-ukedato i kalenderen hvis «true»."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to open the application menu"
 msgstr "Tastaturbinding som åpner programmenyen"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to open the application menu."
 msgstr "Tastaturbinding som åpner programmenyen."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Tastaturbinding som åpner visningen «Vis programmer»"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr ""
 "Tastaturbinding som åpner visningen «Vis programmer» i aktivitetsoversikten."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
-msgid "Keybinding to open the overview"
-msgstr "Tastaturbinding som åpner oversikten"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
-msgid "Keybinding to open the Activities Overview."
-msgstr "Tastaturbinding som åpner aktivitetsoversikten."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Tastaturbinding som slår av/på synlighet for meldingstrau"
@ -343,7 +347,7 @@ msgid "Not listed?"
 msgstr "Ikke listet?"

 #: ../js/gdm/loginDialog.js:776 ../js/ui/components/networkAgent.js:137
-#: ../js/ui/components/polkitAgent.js:161 ../js/ui/endSessionDialog.js:376
+#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:376
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:96
 #: ../js/ui/userMenu.js:938
@ -422,23 +426,23 @@ msgstr "Klarte ikke å lese kommando:"
 msgid "Execution of '%s' failed:"
 msgstr "Kjøring av «%s» feilet:"

-#: ../js/ui/appDisplay.js:361
+#: ../js/ui/appDisplay.js:349
 msgid "Frequent"
 msgstr "Ofte"

-#: ../js/ui/appDisplay.js:368
+#: ../js/ui/appDisplay.js:356
 msgid "All"
 msgstr "Alle"

-#: ../js/ui/appDisplay.js:960
+#: ../js/ui/appDisplay.js:914
 msgid "New Window"
 msgstr "Nytt vindu"

-#: ../js/ui/appDisplay.js:963 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"

-#: ../js/ui/appDisplay.js:964
+#: ../js/ui/appDisplay.js:918
 msgid "Add to Favorites"
 msgstr "Legg til i favoritter"

@ -577,35 +581,35 @@ msgid "S"
 msgstr "Lø"

 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:735
+#: ../js/ui/calendar.js:720
 msgid "Nothing Scheduled"
 msgstr "Ingenting planlagt"

 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:751
+#: ../js/ui/calendar.js:736
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A %B %d"

 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:754
+#: ../js/ui/calendar.js:739
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %B %d, %Y"

-#: ../js/ui/calendar.js:764
+#: ../js/ui/calendar.js:749
 msgid "Today"
 msgstr "I dag"

-#: ../js/ui/calendar.js:768
+#: ../js/ui/calendar.js:753
 msgid "Tomorrow"
 msgstr "I morgen"

-#: ../js/ui/calendar.js:779
+#: ../js/ui/calendar.js:764
 msgid "This week"
 msgstr "Denne uken"

-#: ../js/ui/calendar.js:787
+#: ../js/ui/calendar.js:772
 msgid "Next week"
 msgstr "Neste uke"

@ -630,7 +634,7 @@ msgstr "Åpne med %s"
 msgid "Eject"
 msgstr "Løs ut"

-#: ../js/ui/components/keyring.js:88 ../js/ui/components/polkitAgent.js:280
+#: ../js/ui/components/keyring.js:88 ../js/ui/components/polkitAgent.js:275
 msgid "Password:"
 msgstr "Passord:"

@ -714,15 +718,15 @@ msgstr "Nettverkspassord for mobilt bredbånd"
 msgid "A password is required to connect to '%s'."
 msgstr "Et passord kreves for å koble til «%s»."

-#: ../js/ui/components/polkitAgent.js:54
+#: ../js/ui/components/polkitAgent.js:55
 msgid "Authentication Required"
 msgstr "Autentisering kreves"

-#: ../js/ui/components/polkitAgent.js:92
+#: ../js/ui/components/polkitAgent.js:93
 msgid "Administrator"
 msgstr "Administrator"

-#: ../js/ui/components/polkitAgent.js:170
+#: ../js/ui/components/polkitAgent.js:171
 msgid "Authenticate"
 msgstr "Autentiser"

@ -730,7 +734,7 @@ msgstr "Autentiser"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: ../js/ui/components/polkitAgent.js:266 ../js/ui/shellMountOperation.js:383
+#: ../js/ui/components/polkitAgent.js:263 ../js/ui/shellMountOperation.js:383
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Beklager, det virket ikke. Vennligst prøv igjen."

@ -993,22 +997,22 @@ msgstr "Vis programmer"
 msgid "Dash"
 msgstr "Favoritter"

-#: ../js/ui/dateMenu.js:86
+#: ../js/ui/dateMenu.js:91
 msgid "Open Calendar"
 msgstr "Åpne kalender"

-#: ../js/ui/dateMenu.js:90
+#: ../js/ui/dateMenu.js:96
 msgid "Open Clocks"
 msgstr "Åpne Klokker"

-#: ../js/ui/dateMenu.js:97
+#: ../js/ui/dateMenu.js:104
 msgid "Date & Time Settings"
 msgstr "Innstillinger for dato og klokkeslett"

 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:208
+#: ../js/ui/dateMenu.js:216
 msgid "%A %B %e, %Y"
 msgstr "%a %e %B, %Y"

@ -1113,56 +1117,56 @@ msgstr "Installer"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Last ned og installer «%s» fra extensions.gnome.org?"

-#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:333
+#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:314
 #: ../js/ui/status/power.js:211
 msgid "Keyboard"
 msgstr "Tastatur"

-#: ../js/ui/lookingGlass.js:689
+#: ../js/ui/lookingGlass.js:693
 msgid "No extensions installed"
 msgstr "Ingen utvidelser installert"

 #. Translators: argument is an extension UUID.
-#: ../js/ui/lookingGlass.js:743
+#: ../js/ui/lookingGlass.js:747
 #, c-format
 msgid "%s has not emitted any errors."
 msgstr "%s har ikke avgitt noen feil."

-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:753
 msgid "Hide Errors"
 msgstr "Skjul feil"

-#: ../js/ui/lookingGlass.js:753 ../js/ui/lookingGlass.js:813
+#: ../js/ui/lookingGlass.js:757 ../js/ui/lookingGlass.js:817
 msgid "Show Errors"
 msgstr "Vis feil"

-#: ../js/ui/lookingGlass.js:762
+#: ../js/ui/lookingGlass.js:766
 msgid "Enabled"
 msgstr "Aktivert"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:765 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/lookingGlass.js:769 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Deaktivert"

-#: ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:771
 msgid "Error"
 msgstr "Feil"

-#: ../js/ui/lookingGlass.js:769
+#: ../js/ui/lookingGlass.js:773
 msgid "Out of date"
 msgstr "Utdatert"

-#: ../js/ui/lookingGlass.js:771
+#: ../js/ui/lookingGlass.js:775
 msgid "Downloading"
 msgstr "Laster ned"

-#: ../js/ui/lookingGlass.js:795
+#: ../js/ui/lookingGlass.js:799
 msgid "View Source"
 msgstr "Vis kildekode"

-#: ../js/ui/lookingGlass.js:804
+#: ../js/ui/lookingGlass.js:808
 msgid "Web Page"
 msgstr "Nettside"

@ -1182,35 +1186,35 @@ msgstr "Tøm meldinger"
 msgid "Notification Settings"
 msgstr "Innstillinger for varsling"

-#: ../js/ui/messageTray.js:1707
+#: ../js/ui/messageTray.js:1709
 msgid "No Messages"
 msgstr "Ingen meldinger"

-#: ../js/ui/messageTray.js:1780
+#: ../js/ui/messageTray.js:1785
 msgid "Message Tray"
 msgstr "Meldingstrau"

-#: ../js/ui/messageTray.js:2805
+#: ../js/ui/messageTray.js:2813
 msgid "System Information"
 msgstr "Systeminformasjon"

-#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:378
+#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Ukjent"

-#: ../js/ui/overviewControls.js:472 ../js/ui/screenShield.js:150
+#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d ny melding"
 msgstr[1] "%d nye meldinger"

-#: ../js/ui/overview.js:82
+#: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Angre"

-#: ../js/ui/overview.js:127
+#: ../js/ui/overview.js:129
 msgid "Overview"
 msgstr "Oversikt"

@ -1218,21 +1222,21 @@ msgstr "Oversikt"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:258
+#: ../js/ui/overview.js:271
 msgid "Type to search…"
 msgstr "Skriv for å søke …"

-#: ../js/ui/panel.js:642
+#: ../js/ui/panel.js:635
 msgid "Quit"
 msgstr "Avslutt"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:693
+#: ../js/ui/panel.js:686
 msgid "Activities"
 msgstr "Aktiviteter"

-#: ../js/ui/panel.js:989
+#: ../js/ui/panel.js:982
 msgid "Top Bar"
 msgstr "Topp-panel"

@ -1241,7 +1245,7 @@ msgstr "Topp-panel"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:738
+#: ../js/ui/popupMenu.js:727
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

@ -1255,22 +1259,22 @@ msgstr "Lukk"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:87
+#: ../js/ui/screenShield.js:86
 msgid "%A, %B %d"
 msgstr "%A, %B %d"

-#: ../js/ui/screenShield.js:152
+#: ../js/ui/screenShield.js:151
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d ny varsling"
 msgstr[1] "%d nye varslinger"

-#: ../js/ui/screenShield.js:449 ../js/ui/userMenu.js:807
+#: ../js/ui/screenShield.js:438 ../js/ui/userMenu.js:807
 msgid "Lock"
 msgstr "Lås"

-#: ../js/ui/screenShield.js:652
+#: ../js/ui/screenShield.js:641
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME må låse skjermen"

@ -1281,11 +1285,11 @@ msgstr "GNOME må låse skjermen"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:773 ../js/ui/screenShield.js:1213
+#: ../js/ui/screenShield.js:762 ../js/ui/screenShield.js:1198
 msgid "Unable to lock"
 msgstr "Kan ikke låse"

-#: ../js/ui/screenShield.js:774 ../js/ui/screenShield.js:1214
+#: ../js/ui/screenShield.js:763 ../js/ui/screenShield.js:1199
 msgid "Lock was blocked by an application"
 msgstr "Låsing ble stoppet av et program"

@ -1297,19 +1301,19 @@ msgstr "Søker …"
 msgid "No results."
 msgstr "Ingen resultater."

-#: ../js/ui/shellEntry.js:27
+#: ../js/ui/shellEntry.js:29
 msgid "Copy"
 msgstr "Kopier"

-#: ../js/ui/shellEntry.js:32
+#: ../js/ui/shellEntry.js:34
 msgid "Paste"
 msgstr "Lim inn"

-#: ../js/ui/shellEntry.js:99
+#: ../js/ui/shellEntry.js:101
 msgid "Show Text"
 msgstr "Vis tekst"

-#: ../js/ui/shellEntry.js:101
+#: ../js/ui/shellEntry.js:103
 msgid "Hide Text"
 msgstr "Skjul tekst"

@ -1376,7 +1380,7 @@ msgstr "Stor tekst"
 #: ../js/ui/status/bluetooth.js:28 ../js/ui/status/bluetooth.js:32
 #: ../js/ui/status/bluetooth.js:289 ../js/ui/status/bluetooth.js:321
 #: ../js/ui/status/bluetooth.js:357 ../js/ui/status/bluetooth.js:388
-#: ../js/ui/status/network.js:739
+#: ../js/ui/status/network.js:826
 msgid "Bluetooth"
 msgstr "Bluetooth"

@ -1397,7 +1401,7 @@ msgid "Bluetooth Settings"
 msgstr "Innstillinger for Bluetooth"

 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
-#: ../js/ui/status/bluetooth.js:104 ../js/ui/status/network.js:142
+#: ../js/ui/status/bluetooth.js:104 ../js/ui/status/network.js:178
 msgid "hardware disabled"
 msgstr "maskinvare slått av"

@ -1405,12 +1409,12 @@ msgstr "maskinvare slått av"
 msgid "Connection"
 msgstr "Tilkobling"

-#: ../js/ui/status/bluetooth.js:208 ../js/ui/status/network.js:404
+#: ../js/ui/status/bluetooth.js:208 ../js/ui/status/network.js:460
 msgid "disconnecting..."
 msgstr "kobler fra …"

-#: ../js/ui/status/bluetooth.js:221 ../js/ui/status/network.js:410
-#: ../js/ui/status/network.js:1343
+#: ../js/ui/status/bluetooth.js:221 ../js/ui/status/network.js:466
+#: ../js/ui/status/network.js:1546
 msgid "connecting..."
 msgstr "kobler til …"

@ -1465,9 +1469,8 @@ msgstr "Enhet %s vil koble seg sammen med denne datamaskinen"

 #: ../js/ui/status/bluetooth.js:366
 #, c-format
-msgid ""
-"Please confirm whether the Passkey '%06d' matches the one on the device."
-msgstr "Vennligst bekreft om passord «%06d» er lik den som brukes på enheten."
+msgid "Please confirm whether the PIN '%06d' matches the one on the device."
+msgstr "Vennligst bekreft om PIN «%06d» er lik den som brukes på enheten."

 #. Translators: this is the verb, not the noun
 #: ../js/ui/status/bluetooth.js:369
@ -1491,11 +1494,11 @@ msgstr "Vennligst oppgi PIN som oppgitt på enheten."
 msgid "OK"
 msgstr "OK"

-#: ../js/ui/status/keyboard.js:396
+#: ../js/ui/status/keyboard.js:368
 msgid "Show Keyboard Layout"
 msgstr "Vis tastaturutforming"

-#: ../js/ui/status/keyboard.js:401
+#: ../js/ui/status/keyboard.js:373
 msgid "Region & Language Settings"
 msgstr "Innstillinger for region og språk"

@ -1503,91 +1506,117 @@ msgstr "Innstillinger for region og språk"
 msgid "Volume, network, battery"
 msgstr "Volum, nettverk, batteri"

-#: ../js/ui/status/network.js:75
+#: ../js/ui/status/network.js:104
 msgid "<unknown>"
 msgstr "<ukjent>"

-#: ../js/ui/status/network.js:127
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:164
+#: ../js/ui/status/network.js:200
 msgid "disabled"
 msgstr "slått av"

 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu)
-#: ../js/ui/status/network.js:402
+#: ../js/ui/status/network.js:458
 msgid "unmanaged"
 msgstr "ikke håndtert"

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:413 ../js/ui/status/network.js:1346
+#: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1549
 msgid "authentication required"
 msgstr "autentisering kreves"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:423
+#: ../js/ui/status/network.js:479
 msgid "firmware missing"
 msgstr "fastvare mangler"

 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:430
+#: ../js/ui/status/network.js:486
 msgid "cable unplugged"
 msgstr "kabel koblet fra"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage
-#: ../js/ui/status/network.js:435
+#: ../js/ui/status/network.js:491
 msgid "unavailable"
 msgstr "ikke tilgjengelig"

-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1348
+#: ../js/ui/status/network.js:493 ../js/ui/status/network.js:1551
 msgid "connection failed"
 msgstr "tilkobling feilet"

-#: ../js/ui/status/network.js:490 ../js/ui/status/network.js:1236
-#: ../js/ui/status/network.js:1424
+#: ../js/ui/status/network.js:552 ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1627
 msgid "More…"
 msgstr "Mer …"

 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
-#: ../js/ui/status/network.js:518 ../js/ui/status/network.js:1191
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1365
 msgid "Connected (private)"
 msgstr "Tilkoblet (privat)"

-#: ../js/ui/status/network.js:597
+#: ../js/ui/status/network.js:667
 msgid "Wired"
 msgstr "Kablet"

-#: ../js/ui/status/network.js:611
+#: ../js/ui/status/network.js:668
+msgid "Auto Ethernet"
+msgstr "Automatisk Ethernet"
+
+#: ../js/ui/status/network.js:695
 msgid "Mobile broadband"
 msgstr "Mobilt bredbånd"

-#: ../js/ui/status/network.js:1522
+#: ../js/ui/status/network.js:728
+msgid "Auto broadband"
+msgstr "Automatisk bredbånd"
+
+#: ../js/ui/status/network.js:731
+msgid "Auto dial-up"
+msgstr "Automatisk oppringt"
+
+#. TRANSLATORS: this the automatic wireless connection name (including the network name)
+#: ../js/ui/status/network.js:861 ../js/ui/status/network.js:1382
+#, c-format
+msgid "Auto %s"
+msgstr "Automatisk %s"
+
+#: ../js/ui/status/network.js:863
+msgid "Auto bluetooth"
+msgstr "Automatisk Bluetooth"
+
+#: ../js/ui/status/network.js:1384
+msgid "Auto wireless"
+msgstr "Automatisk trådløst"
+
+#: ../js/ui/status/network.js:1729
 msgid "Enable networking"
 msgstr "Slå på nettverk"

-#: ../js/ui/status/network.js:1583
+#: ../js/ui/status/network.js:1771
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../js/ui/status/network.js:1790
 msgid "Network Settings"
 msgstr "Innstillinger for nettverk"

-#: ../js/ui/status/network.js:1600
+#: ../js/ui/status/network.js:1807
 msgid "Network Manager"
 msgstr "Nettverkshåndtering"

-#: ../js/ui/status/network.js:1690
+#: ../js/ui/status/network.js:1897
 msgid "Connection failed"
 msgstr "Tilkobling feilet"

-#: ../js/ui/status/network.js:1691
+#: ../js/ui/status/network.js:1898
 msgid "Activation of network connection failed"
 msgstr "Aktivering av nettverkstilkobling feilet"

-#: ../js/ui/status/network.js:2047
+#: ../js/ui/status/network.js:2282
 msgid "Networking is disabled"
 msgstr "Nettverk er slått av"

@ -1833,27 +1862,27 @@ msgid_plural "%u Inputs"
 msgstr[0] "%u inngang"
 msgstr[1] "%u innganger"

-#: ../src/gvc/gvc-mixer-control.c:2373
+#: ../src/gvc/gvc-mixer-control.c:2371
 msgid "System Sounds"
 msgstr "Systemlyder"

-#: ../src/main.c:372
+#: ../src/main.c:347
 msgid "Print version"
 msgstr "Skriv ut versjon"

-#: ../src/main.c:378
+#: ../src/main.c:353
 msgid "Mode used by GDM for login screen"
 msgstr "Modus som brukes av GDM for innloggingsskjermen"

-#: ../src/main.c:384
+#: ../src/main.c:359
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "Bruk spesifikt modus, f.eks «gdm» for innloggingsskjerm"

-#: ../src/main.c:390
+#: ../src/main.c:365
 msgid "List possible modes"
 msgstr "Vis mulige modi"

-#: ../src/shell-app.c:626
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Klarte ikke å starte «%s»"
--- a/po/sk.po
+++ b/po/sk.po
@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-05-24 21:21+0000\n"
-"PO-Revision-Date: 2013-05-24 23:24+0100\n"
+"POT-Creation-Date: 2013-03-23 11:49+0000\n"
+"PO-Revision-Date: 2013-03-23 16:21+0000\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@ -34,30 +34,22 @@ msgstr "Zaznamenať dianie na obrazovke"
 msgid "System"
 msgstr "Systém"

-# nazov klavesovej skratky
 #: ../data/50-gnome-shell-system.xml.in.h:2
 msgid "Show the message tray"
-msgstr "Zobraziť lištu správ"
+msgstr "Zobrazí lištu správ"

-# nazov klavesovej skratky
 #: ../data/50-gnome-shell-system.xml.in.h:3
 msgid "Focus the active notification"
 msgstr "Zamerať aktívne oznámenie"

-# nazov klavesovej skratky
+# tooltip
 #: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Show the overview"
-msgstr "Zobraziť prehľad"
-
-# nazov klavesovej skratky
-#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Show all applications"
-msgstr "Zobraziť všetky aplikácie"
+msgstr "Zobrazí všetky aplikácie"

-# nazov klavesovej skratky
-#: ../data/50-gnome-shell-system.xml.in.h:6
+#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Open the application menu"
-msgstr "Otvoriť ponuku aplikácií"
+msgstr "Otvorí ponuku aplikácií"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@ -108,10 +100,26 @@ msgstr ""
 "gnome.Shell."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
+msgid "Whether to collect stats about applications usage"
+msgstr "Či sa majú zhromažďovať štatistické údaje o používaní aplikácií"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:6
+msgid ""
+"The shell normally monitors active applications in order to present the most "
+"used ones (e.g. in launchers). While this data will be kept private, you may "
+"want to disable this for privacy reasons. Please note that doing so won't "
+"remove already saved data."
+msgstr ""
+"Prostredie shell obvykle sleduje aktívne aplikácie, aby mohlo ponúkať "
+"najpoužívanejšie z nich (napr. v spúšťačoch). Aj keď sú tieto údaje "
+"uchovávané v tajnosti, môžete ich kvôli lepšej ochrane súkromia zakázať. Ak "
+"tak urobíte, údaje, ktoré už boli uložené, zostanú zachované."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
 msgstr "Zoznam identifikátorov súborov plochy pre obľúbené aplikácie"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:6
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:8
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
@ -120,29 +128,29 @@ msgstr ""
 "obľúbenými aplikáciami."

 # summary
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:7
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "List of categories that should be displayed as folders"
 msgstr "Zoznam kategórií, ktoré sa majú zobraziť ako priečinky"

 # description
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:8
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
+
 msgid ""
 "Each category name in this list will be represented as folder in the "
 "application view, rather than being displayed inline in the main view."
 msgstr ""
-"Každá z názvov kategórií v tomto zoznamu bude reprezentovaná ako priečinok v "
-"zobrazení aplikácií namiesto toho, aby sa zobrazila v hlavnom zobrazení."
+"Každá z názvov kategórií v tomto zoznamu bude reprezentovaná ako priečinok v zobrazení aplikácií namiesto toho, aby sa zobrazila v hlavnom zobrazení."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:9
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
 msgstr "História dialógového okna príkazov (Alt-F2)"

 # * https://live.gnome.org/GnomeShell/LookingGlass
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
 msgid "History for the looking glass dialog"
 msgstr "História dialógového okna integrovaného odlaďovača"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid ""
 "Internally used to store the last IM presence explicitly set by the user. "
 "The value here is from the TpConnectionPresenceType enumeration."
@ -151,7 +159,7 @@ msgstr ""
 "komunikátora výlučne nastavenej používateľom. Táto hodnota je z vymenovaných "
 "hodnôt typu TpConnectionPresenceType."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
 msgid ""
 "Internally used to store the last session presence status for the user. The "
 "value here is from the GsmPresenceStatus enumeration."
@ -160,11 +168,11 @@ msgstr ""
 "používateľa. Táto hodnota je z vymenovaných hodnôt typu "
 "GsmPresenceStatusType."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Always show the 'Log out' menuitem in the user menu."
 msgstr "Vždy zobraziť položku „Odhlásiť sa“ v ponuke používateľa"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menuitem in single-"
 "user, single-session situations."
@ -173,7 +181,7 @@ msgstr ""
 "s jedným používateľom alebo jednou reláciou."

 # summary
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
@ -181,7 +189,7 @@ msgstr ""
 "prenosných súborových systémov"

 # description
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid ""
 "The shell will request a password when an encrypted device or a remote "
 "filesystem is mounted. If the password can be saved for future use a "
@ -193,42 +201,34 @@ msgstr ""
 "zobrazí sa zaškrtávacie pole „Zapamätať heslo“. Tento kľúč nastaví "
 "predvolený stav zaškrtávacieho poľa."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Show the week date in the calendar"
 msgstr "Zobraziť čísla týždňov v kalendári"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "If true, display the ISO week date in the calendar."
 msgstr ""
 "Ak je true, zobrazí v kalendári poradie dní v týždni podľa štandardu ISO."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to open the application menu"
 msgstr "Klávesová skratka na otvorenie ponuky aplikácií"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to open the application menu."
 msgstr "Klávesová skratka na otvorenie ponuky aplikácií."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Klávesová skratka na otvorenie pohľadu „Zobraziť aplikácie“"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr ""
 "Klávesová skratka na otvorenie pohľadu „Zobraziť aplikácie“ v prehľade "
 "aktivít."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
-msgid "Keybinding to open the overview"
-msgstr "Klávesová skratka na otvorenie prehľadu"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
-msgid "Keybinding to open the Activities Overview."
-msgstr "Klávesová skratka na otvorenie prehľadu aktivít."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Klávesová skratka na prepnutie viditeľnosti lišty správ"
@ -384,7 +384,7 @@ msgstr "Rozšírenie"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Použitím ponuky vyberte rozšírenie na nastavenie"

-#: ../js/gdm/loginDialog.js:371
+#: ../js/gdm/loginDialog.js:405
 msgid "Session…"
 msgstr "Relácia…"

@ -392,43 +392,36 @@ msgstr "Relácia…"
 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:601
+#: ../js/gdm/loginDialog.js:630
 msgid "Not listed?"
 msgstr "Nie ste v zozname?"

-#: ../js/gdm/loginDialog.js:776 ../js/ui/components/networkAgent.js:137
-#: ../js/ui/components/polkitAgent.js:161 ../js/ui/endSessionDialog.js:376
+#: ../js/gdm/loginDialog.js:786 ../js/ui/components/networkAgent.js:137
+#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:375
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:96
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:99
 #: ../js/ui/userMenu.js:938
 msgid "Cancel"
 msgstr "Zrušiť"

-#: ../js/gdm/loginDialog.js:791
+#: ../js/gdm/loginDialog.js:802
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prihlásiť sa"

-#: ../js/gdm/loginDialog.js:791
+#: ../js/gdm/loginDialog.js:802
 msgid "Next"
 msgstr "Ďalej"

-#. Translators: this message is shown below the username entry field
-#. to clue the user in on how to login to the local network realm
-#: ../js/gdm/loginDialog.js:888
-#, c-format
-msgid "(e.g., user or %s)"
-msgstr "(napr., používateľ alebo %s)"
-
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:892 ../js/ui/components/networkAgent.js:260
+#: ../js/gdm/loginDialog.js:917 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
 msgstr "Používateľské meno: "

-#: ../js/gdm/loginDialog.js:1158
+#: ../js/gdm/loginDialog.js:1173
 msgid "Login Window"
 msgstr "Prihlasovacie okno"

@ -451,16 +444,21 @@ msgstr "Reštartovať"
 msgid "Power Off"
 msgstr "Vypnúť"

-#: ../js/gdm/util.js:247
+#: ../js/gdm/util.js:249
 msgid "Authentication error"
 msgstr "Chyba pri overovaní totožnosti"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:364
+#: ../js/gdm/util.js:366
 msgid "(or swipe finger)"
 msgstr "(alebo prejdite prstom)"

+#: ../js/gdm/util.js:391
+#, c-format
+msgid "(e.g., user or %s)"
+msgstr "(napr., používateľ alebo %s)"
+
 #: ../js/misc/util.js:97
 msgid "Command not found"
 msgstr "Príkaz nebol nájdený"
@ -476,23 +474,23 @@ msgstr "Nepodarilo sa analyzovať príkaz:"
 msgid "Execution of '%s' failed:"
 msgstr "Spustenie „%s“ zlyhalo:"

-#: ../js/ui/appDisplay.js:361
+#: ../js/ui/appDisplay.js:349
 msgid "Frequent"
 msgstr "Často používané"

-#: ../js/ui/appDisplay.js:368
+#: ../js/ui/appDisplay.js:356
 msgid "All"
 msgstr "Všetky"

-#: ../js/ui/appDisplay.js:960
+#: ../js/ui/appDisplay.js:914
 msgid "New Window"
 msgstr "Nové okno"

-#: ../js/ui/appDisplay.js:963 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Odstrániť z obľúbených"

-#: ../js/ui/appDisplay.js:964
+#: ../js/ui/appDisplay.js:918
 msgid "Add to Favorites"
 msgstr "Pridať do obľúbených"

@ -529,7 +527,7 @@ msgctxt "event list time"
 msgid "%H\\u2236%M"
 msgstr "%H\\u2236%M"

-#. Translators: Shown in calendar event list, if 12h format,
+#. Transators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space
 #: ../js/ui/calendar.js:77
@ -631,35 +629,35 @@ msgid "S"
 msgstr "So"

 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:735
+#: ../js/ui/calendar.js:720
 msgid "Nothing Scheduled"
 msgstr "Žiadne naplánované udalosti"

 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:751
+#: ../js/ui/calendar.js:736
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"

 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:754
+#: ../js/ui/calendar.js:739
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e. %B %Y"

-#: ../js/ui/calendar.js:764
+#: ../js/ui/calendar.js:749
 msgid "Today"
 msgstr "Dnes"

-#: ../js/ui/calendar.js:768
+#: ../js/ui/calendar.js:753
 msgid "Tomorrow"
 msgstr "Zajtra"

-#: ../js/ui/calendar.js:779
+#: ../js/ui/calendar.js:764
 msgid "This week"
 msgstr "Tento týždeň"

-#: ../js/ui/calendar.js:787
+#: ../js/ui/calendar.js:772
 msgid "Next week"
 msgstr "Ďalší týždeň"

@ -685,11 +683,11 @@ msgstr "Otvoriť pomocou programu %s"
 msgid "Eject"
 msgstr "Vysunúť"

-#: ../js/ui/components/keyring.js:88 ../js/ui/components/polkitAgent.js:280
+#: ../js/ui/components/keyring.js:82 ../js/ui/components/polkitAgent.js:268
 msgid "Password:"
 msgstr "Heslo:"

-#: ../js/ui/components/keyring.js:107
+#: ../js/ui/components/keyring.js:101
 msgid "Type again:"
 msgstr "Zadajte znovu:"

@ -769,16 +767,16 @@ msgstr "Heslo k mobilnej sieti"
 msgid "A password is required to connect to '%s'."
 msgstr "Na pripojenie k „%s“ sa požaduje heslo."

-#: ../js/ui/components/polkitAgent.js:54
+#: ../js/ui/components/polkitAgent.js:55
 msgid "Authentication Required"
 msgstr "Požaduje sa overenie totožnosti"

 # PŠ: ináč toto je riadna hlúposť, keďže sa pýta heslo používateľa "root"
-#: ../js/ui/components/polkitAgent.js:92
+#: ../js/ui/components/polkitAgent.js:93
 msgid "Administrator"
 msgstr "Správca"

-#: ../js/ui/components/polkitAgent.js:170
+#: ../js/ui/components/polkitAgent.js:165
 msgid "Authenticate"
 msgstr "Overiť totožnosť"

@ -786,13 +784,13 @@ msgstr "Overiť totožnosť"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: ../js/ui/components/polkitAgent.js:266 ../js/ui/shellMountOperation.js:383
+#: ../js/ui/components/polkitAgent.js:256 ../js/ui/shellMountOperation.js:383
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Prepáčte, ale nezabralo to. Skúste to, prosím, znova."

 # %d je datum, %t je cas
 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/components/recorder.js:47
+#: ../js/ui/components/recorder.js:48
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "Záznam videa obrazovky dňa %d o %t"
@ -1051,22 +1049,22 @@ msgstr "Zobrazí aplikácie"
 msgid "Dash"
 msgstr "Dok"

-#: ../js/ui/dateMenu.js:86
+#: ../js/ui/dateMenu.js:91
 msgid "Open Calendar"
 msgstr "Otvoriť kalendár"

-#: ../js/ui/dateMenu.js:90
+#: ../js/ui/dateMenu.js:96
 msgid "Open Clocks"
 msgstr "Otvoriť hodiny"

-#: ../js/ui/dateMenu.js:97
+#: ../js/ui/dateMenu.js:105
 msgid "Date & Time Settings"
 msgstr "Nastavenia dátumu a času"

 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:208
+#: ../js/ui/dateMenu.js:215
 msgid "%A %B %e, %Y"
 msgstr "%A, %e. %B %Y"

@ -1180,52 +1178,50 @@ msgstr "Stiahnuť a nainštalovať „%s“ z extensions.gnome.org?"
 msgid "Keyboard"
 msgstr "Klávesnica"

-#: ../js/ui/lookingGlass.js:689
+#: ../js/ui/lookingGlass.js:693
 msgid "No extensions installed"
 msgstr "Žiadne nainštalované rozšírenia"

 #. Translators: argument is an extension UUID.
-#: ../js/ui/lookingGlass.js:743
+#: ../js/ui/lookingGlass.js:747
 #, c-format
 msgid "%s has not emitted any errors."
 msgstr "%s nevyslal žiadnu chybu."

-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:753
 msgid "Hide Errors"
 msgstr "Skryť chyby"

-#: ../js/ui/lookingGlass.js:753 ../js/ui/lookingGlass.js:813
+#: ../js/ui/lookingGlass.js:757 ../js/ui/lookingGlass.js:817
 msgid "Show Errors"
 msgstr "Zobraziť chyby"

-#: ../js/ui/lookingGlass.js:762
+#: ../js/ui/lookingGlass.js:766
 msgid "Enabled"
 msgstr "Povolené"

-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:765 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/lookingGlass.js:769
 msgid "Disabled"
 msgstr "Zakázané"

-#: ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:771
 msgid "Error"
 msgstr "Chyba"

-#: ../js/ui/lookingGlass.js:769
+#: ../js/ui/lookingGlass.js:773
 msgid "Out of date"
 msgstr "Neaktuálne"

-#: ../js/ui/lookingGlass.js:771
+#: ../js/ui/lookingGlass.js:775
 msgid "Downloading"
 msgstr "Sťahuje sa"

 # PK: ide tu o zdrojovy kod?
-#: ../js/ui/lookingGlass.js:795
+#: ../js/ui/lookingGlass.js:799
 msgid "View Source"
 msgstr "Zobraziť zdroj"

-#: ../js/ui/lookingGlass.js:804
+#: ../js/ui/lookingGlass.js:808
 msgid "Web Page"
 msgstr "Webová stránka"

@ -1245,26 +1241,26 @@ msgstr "Vymazať správy"
 msgid "Notification Settings"
 msgstr "Nastavenia oznámení"

-#: ../js/ui/messageTray.js:1707
+#: ../js/ui/messageTray.js:1709
 msgid "No Messages"
 msgstr "Žiadne správy"

 # DK: zvazoval som pouzit "Panel správ"
 # neviem co bude vhodnejsie ako preklad "tray"
-#: ../js/ui/messageTray.js:1780
+#: ../js/ui/messageTray.js:1782
 msgid "Message Tray"
 msgstr "Lišta správ"

-#: ../js/ui/messageTray.js:2800
+#: ../js/ui/messageTray.js:2810
 msgid "System Information"
 msgstr "Informácie o systéme"

-#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:378
+#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Neznámy"

-#: ../js/ui/overviewControls.js:472 ../js/ui/screenShield.js:150
+#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1272,11 +1268,11 @@ msgstr[0] "%d nových správ"
 msgstr[1] "%d nová správa"
 msgstr[2] "%d nové správy"

-#: ../js/ui/overview.js:82
+#: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Vrátiť"

-#: ../js/ui/overview.js:127
+#: ../js/ui/overview.js:129
 msgid "Overview"
 msgstr "Prehľad"

@ -1285,21 +1281,21 @@ msgstr "Prehľad"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:258
+#: ../js/ui/overview.js:271
 msgid "Type to search…"
 msgstr "Zadajte text na vyhľadanie…"

-#: ../js/ui/panel.js:642
+#: ../js/ui/panel.js:612
 msgid "Quit"
 msgstr "Ukončiť"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:693
+#: ../js/ui/panel.js:636
 msgid "Activities"
 msgstr "Aktivity"

-#: ../js/ui/panel.js:989
+#: ../js/ui/panel.js:933
 msgid "Top Bar"
 msgstr "Horná lišta"

@ -1308,15 +1304,15 @@ msgstr "Horná lišta"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:738
+#: ../js/ui/popupMenu.js:727
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:74
+#: ../js/ui/runDialog.js:73
 msgid "Enter a Command"
 msgstr "Zadajte príkaz"

-#: ../js/ui/runDialog.js:110
+#: ../js/ui/runDialog.js:109
 msgid "Close"
 msgstr "Zavrieť"

@ -1325,11 +1321,11 @@ msgstr "Zavrieť"
 # v ostatnych retazcoch je pouzite %e, tak to bude asi OK
 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:87
+#: ../js/ui/screenShield.js:86
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"

-#: ../js/ui/screenShield.js:152
+#: ../js/ui/screenShield.js:151
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1337,11 +1333,11 @@ msgstr[0] "%d nových oznámení"
 msgstr[1] "%d nové oznámenie"
 msgstr[2] "%d nové oznámenia"

-#: ../js/ui/screenShield.js:449 ../js/ui/userMenu.js:807
+#: ../js/ui/screenShield.js:438 ../js/ui/userMenu.js:807
 msgid "Lock"
 msgstr "Uzamknúť"

-#: ../js/ui/screenShield.js:652
+#: ../js/ui/screenShield.js:637
 msgid "GNOME needs to lock the screen"
 msgstr "Prostredie GNOME vyžaduje uzamknutie obrazovky"

@ -1352,11 +1348,11 @@ msgstr "Prostredie GNOME vyžaduje uzamknutie obrazovky"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:773 ../js/ui/screenShield.js:1213
+#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1194
 msgid "Unable to lock"
 msgstr "Nepodarilo sa uzamknúť obrazovku"

-#: ../js/ui/screenShield.js:774 ../js/ui/screenShield.js:1214
+#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1195
 msgid "Lock was blocked by an application"
 msgstr "Uzamknutie bolo zablokované aplikáciou"

@ -1368,19 +1364,19 @@ msgstr "Hľadá sa…"
 msgid "No results."
 msgstr "Žiadne výsledky."

-#: ../js/ui/shellEntry.js:27
+#: ../js/ui/shellEntry.js:29
 msgid "Copy"
 msgstr "Kopírovať"

-#: ../js/ui/shellEntry.js:32
+#: ../js/ui/shellEntry.js:34
 msgid "Paste"
 msgstr "Prilepiť"

-#: ../js/ui/shellEntry.js:99
+#: ../js/ui/shellEntry.js:106
 msgid "Show Text"
 msgstr "Zobraziť text"

-#: ../js/ui/shellEntry.js:101
+#: ../js/ui/shellEntry.js:108
 msgid "Hide Text"
 msgstr "Skryť text"

@ -1392,7 +1388,7 @@ msgstr "Heslo"
 msgid "Remember Password"
 msgstr "Zapamätať heslo"

-#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:109
+#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:113
 msgid "Unlock"
 msgstr "Odblokovať"

@ -1450,7 +1446,7 @@ msgstr "Veľký text"
 #: ../js/ui/status/bluetooth.js:28 ../js/ui/status/bluetooth.js:32
 #: ../js/ui/status/bluetooth.js:289 ../js/ui/status/bluetooth.js:321
 #: ../js/ui/status/bluetooth.js:357 ../js/ui/status/bluetooth.js:388
-#: ../js/ui/status/network.js:739
+#: ../js/ui/status/network.js:826
 msgid "Bluetooth"
 msgstr "Bluetooth"

@ -1471,7 +1467,7 @@ msgid "Bluetooth Settings"
 msgstr "Nastavenia Bluetooth"

 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
-#: ../js/ui/status/bluetooth.js:104 ../js/ui/status/network.js:142
+#: ../js/ui/status/bluetooth.js:104 ../js/ui/status/network.js:178
 msgid "hardware disabled"
 msgstr "hardvér zakázaný"

@ -1479,12 +1475,12 @@ msgstr "hardvér zakázaný"
 msgid "Connection"
 msgstr "Pripojenie"

-#: ../js/ui/status/bluetooth.js:208 ../js/ui/status/network.js:404
+#: ../js/ui/status/bluetooth.js:208 ../js/ui/status/network.js:460
 msgid "disconnecting..."
 msgstr "odpája sa…"

-#: ../js/ui/status/bluetooth.js:221 ../js/ui/status/network.js:410
-#: ../js/ui/status/network.js:1343
+#: ../js/ui/status/bluetooth.js:221 ../js/ui/status/network.js:466
+#: ../js/ui/status/network.js:1546
 msgid "connecting..."
 msgstr "pripája sa…"

@ -1540,9 +1536,8 @@ msgstr "Zariadenie %s sa chce spárovať s týmto počítačom"

 #: ../js/ui/status/bluetooth.js:366
 #, c-format
-msgid ""
-"Please confirm whether the Passkey '%06d' matches the one on the device."
-msgstr "Prosím, potvrďte, či sa heslo „%06d“ zhoduje s tým na zariadení."
+msgid "Please confirm whether the PIN '%06d' matches the one on the device."
+msgstr "Prosím, potvrďte, či sa PIN „%06d“ zhoduje s tým na zariadení."

 #. Translators: this is the verb, not the noun
 #: ../js/ui/status/bluetooth.js:369
@ -1579,91 +1574,117 @@ msgid "Volume, network, battery"
 msgstr "Hlasitosť, sieť, batéria"

 # zariadenie
-#: ../js/ui/status/network.js:75
+#: ../js/ui/status/network.js:104
 msgid "<unknown>"
 msgstr "<neznáme>"

-#: ../js/ui/status/network.js:127
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:164
+#: ../js/ui/status/network.js:200
 msgid "disabled"
 msgstr "zakázané"

 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu)
-#: ../js/ui/status/network.js:402
+#: ../js/ui/status/network.js:458
 msgid "unmanaged"
 msgstr "nespravované"

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:413 ../js/ui/status/network.js:1346
+#: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1549
 msgid "authentication required"
 msgstr "požaduje sa overenie totožnosti"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:423
+#: ../js/ui/status/network.js:479
 msgid "firmware missing"
 msgstr "chýba firmvér"

 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:430
+#: ../js/ui/status/network.js:486
 msgid "cable unplugged"
 msgstr "kábel odpojený"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage
-#: ../js/ui/status/network.js:435
+#: ../js/ui/status/network.js:491
 msgid "unavailable"
 msgstr "nedostupné"

-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1348
+#: ../js/ui/status/network.js:493 ../js/ui/status/network.js:1551
 msgid "connection failed"
 msgstr "pripojenie zlyhalo"

-#: ../js/ui/status/network.js:490 ../js/ui/status/network.js:1236
-#: ../js/ui/status/network.js:1424
+#: ../js/ui/status/network.js:552 ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1627
 msgid "More…"
 msgstr "Viac…"

 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
-#: ../js/ui/status/network.js:518 ../js/ui/status/network.js:1191
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1365
 msgid "Connected (private)"
 msgstr "Pripojené (súkromne)"

-#: ../js/ui/status/network.js:597
+#: ../js/ui/status/network.js:667
 msgid "Wired"
 msgstr "Drôtové pripojenie"

-#: ../js/ui/status/network.js:611
+#: ../js/ui/status/network.js:668
+msgid "Auto Ethernet"
+msgstr "Automatický ethernet"
+
+#: ../js/ui/status/network.js:695
 msgid "Mobile broadband"
 msgstr "Širokopásmové pripojenie"

-#: ../js/ui/status/network.js:1522
+#: ../js/ui/status/network.js:728
+msgid "Auto broadband"
+msgstr "Automatické širokopásmové pripojenie"
+
+#: ../js/ui/status/network.js:731
+msgid "Auto dial-up"
+msgstr "Automatické vytáčané pripojenie"
+
+#. TRANSLATORS: this the automatic wireless connection name (including the network name)
+#: ../js/ui/status/network.js:861 ../js/ui/status/network.js:1382
+#, c-format
+msgid "Auto %s"
+msgstr "Automatické pripojenie %s"
+
+#: ../js/ui/status/network.js:863
+msgid "Auto bluetooth"
+msgstr "Automatický bluetooth"
+
+#: ../js/ui/status/network.js:1384
+msgid "Auto wireless"
+msgstr "Automatická bezdrôtová sieť"
+
+#: ../js/ui/status/network.js:1729
 msgid "Enable networking"
 msgstr "Povoliť sieť"

-#: ../js/ui/status/network.js:1583
+#: ../js/ui/status/network.js:1771
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../js/ui/status/network.js:1790
 msgid "Network Settings"
 msgstr "Nastavenia siete"

-#: ../js/ui/status/network.js:1600
+#: ../js/ui/status/network.js:1807
 msgid "Network Manager"
 msgstr "Správca siete"

-#: ../js/ui/status/network.js:1690
+#: ../js/ui/status/network.js:1897
 msgid "Connection failed"
 msgstr "Pripojenie zlyhalo"

-#: ../js/ui/status/network.js:1691
+#: ../js/ui/status/network.js:1898
 msgid "Activation of network connection failed"
 msgstr "Aktivácia pripojenia k sieti zlyhala"

-#: ../js/ui/status/network.js:2047
+#: ../js/ui/status/network.js:2276
 msgid "Networking is disabled"
 msgstr "Sieť je zakázaná"

@ -1781,11 +1802,11 @@ msgstr "Hlasitosť"
 msgid "Microphone"
 msgstr "Mikrofón"

-#: ../js/ui/unlockDialog.js:120
+#: ../js/ui/unlockDialog.js:124
 msgid "Log in as another user"
 msgstr "Prihlásiť ako iný používateľ"

-#: ../js/ui/unlockDialog.js:141
+#: ../js/ui/unlockDialog.js:145
 msgid "Unlock Window"
 msgstr "Odomykacie okno"

@ -1894,56 +1915,32 @@ msgstr "Program „%s“ je pripravený"
 msgid "Evolution Calendar"
 msgstr "Kalendár Evolution"

-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1837
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u výstupov"
-msgstr[1] "%u výstup"
-msgstr[2] "%u výstupy"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1847
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u vstupov"
-msgstr[1] "%u vstup"
-msgstr[2] "%u vstupy"
-
-#: ../src/gvc/gvc-mixer-control.c:2373
-msgid "System Sounds"
-msgstr "Systémové zvuky"
-
-#: ../src/main.c:372
+#: ../src/main.c:347
 msgid "Print version"
 msgstr "Verzia pre tlač"

-#: ../src/main.c:378
+#: ../src/main.c:353
 msgid "Mode used by GDM for login screen"
 msgstr "Režim používaný GDM pre prihlasovaciu obrazovku"

-#: ../src/main.c:384
+#: ../src/main.c:359
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "Použitie zvláštneho režimu, napr. „gdm“  pre prihlasovaciu obrazovku"

-#: ../src/main.c:390
+#: ../src/main.c:365
 msgid "List possible modes"
 msgstr "Zoznam možných režimov"

-#: ../src/shell-app.c:626
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Zlyhalo spustenie „%s“"

-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:708
 msgid "Passwords do not match."
 msgstr "Heslá sa nezhodujú."

-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:716
 msgid "Password cannot be blank"
 msgstr "Heslo nemôže byť prázdne"

@ -1951,35 +1948,3 @@ msgstr "Heslo nemôže byť prázdne"
 #: ../src/shell-polkit-authentication-agent.c:343
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Dialógové okno overenia totožnosti bolo zatvorené používateľom"
-
-#~ msgid "Whether to collect stats about applications usage"
-#~ msgstr "Či sa majú zhromažďovať štatistické údaje o používaní aplikácií"
-
-#~ msgid ""
-#~ "The shell normally monitors active applications in order to present the "
-#~ "most used ones (e.g. in launchers). While this data will be kept private, "
-#~ "you may want to disable this for privacy reasons. Please note that doing "
-#~ "so won't remove already saved data."
-#~ msgstr ""
-#~ "Prostredie shell obvykle sleduje aktívne aplikácie, aby mohlo ponúkať "
-#~ "najpoužívanejšie z nich (napr. v spúšťačoch). Aj keď sú tieto údaje "
-#~ "uchovávané v tajnosti, môžete ich kvôli lepšej ochrane súkromia zakázať. "
-#~ "Ak tak urobíte, údaje, ktoré už boli uložené, zostanú zachované."
-
-#~ msgid "Auto Ethernet"
-#~ msgstr "Automatický ethernet"
-
-#~ msgid "Auto broadband"
-#~ msgstr "Automatické širokopásmové pripojenie"
-
-#~ msgid "Auto dial-up"
-#~ msgstr "Automatické vytáčané pripojenie"
-
-#~ msgid "Auto %s"
-#~ msgstr "Automatické pripojenie %s"
-
-#~ msgid "Auto bluetooth"
-#~ msgstr "Automatický bluetooth"
-
-#~ msgid "Auto wireless"
-#~ msgstr "Automatická bezdrôtová sieť"
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/tg.po
+++ b/po/tg.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -129,18 +129,13 @@ shell_public_headers_h =		\
 	shell-wm.h			\
 	shell-xfixes-cursor.h

-shell_private_sources = 		\
-	gtkactionmuxer.h		\
-	gtkactionmuxer.c		\
-	gtkactionobservable.h		\
-	gtkactionobservable.c		\
-	gtkactionobserver.h		\
-	gtkactionobserver.c		\
-	gtkmenutrackeritem.c		\
-	gtkmenutrackeritem.h		\
-	gtkmenutracker.c		\
-	gtkmenutracker.h		\
-	$(NULL)
+shell_private_sources = \
+	gactionmuxer.h			\
+	gactionmuxer.c			\
+	gactionobservable.h		\
+	gactionobservable.c		\
+	gactionobserver.h		\
+	gactionobserver.c

 libgnome_shell_la_SOURCES =		\
 	$(shell_built_sources)		\
@ -163,8 +158,6 @@ libgnome_shell_la_SOURCES =		\
 	shell-invert-lightness-effect.c	\
 	shell-keyring-prompt.h		\
 	shell-keyring-prompt.c		\
-	shell-menu-tracker.c		\
-	shell-menu-tracker.h		\
 	shell-mount-operation.c		\
 	shell-network-agent.c		\
 	shell-perf-log.c		\
@ -293,34 +286,12 @@ libgnome_shell_la_LIBADD =		\

 libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)

-ShellMenu-0.1.gir: libgnome-shell.la
-ShellMenu_0_1_gir_INCLUDES = Gio-2.0
-ShellMenu_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
-ShellMenu_0_1_gir_LIBS = libgnome-shell.la
-ShellMenu_0_1_gir_FILES = \
-	gtkactionmuxer.h		\
-	gtkactionmuxer.c		\
-	gtkactionobservable.h		\
-	gtkactionobservable.c		\
-	gtkactionobserver.h		\
-	gtkactionobserver.c		\
-	gtkmenutrackeritem.c		\
-	gtkmenutrackeritem.h		\
-	$(NULL)
-ShellMenu_0_1_gir_SCANNERFLAGS = 	\
-	--namespace=ShellMenu --identifier-prefix=Gtk \
-	$(if $(BLUETOOTH_DIR),-L $(BLUETOOTH_DIR),)
-INTROSPECTION_GIRS += ShellMenu-0.1.gir
-CLEANFILES += ShellMenu-0.1.gir
-
-Shell-0.1.gir: libgnome-shell.la St-1.0.gir ShellMenu-0.1.gir
+Shell-0.1.gir: libgnome-shell.la St-1.0.gir
 Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
 Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
 Shell_0_1_gir_LIBS = libgnome-shell.la
 Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
-Shell_0_1_gir_SCANNERFLAGS =	\
-	--include-uninstalled=$(builddir)/St-1.0.gir \
-	--include-uninstalled=$(builddir)/ShellMenu-0.1.gir \
+Shell_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \
 	--add-include-path=$(MUTTER_GIR_DIR) $(if $(BLUETOOTH_DIR),-L $(BLUETOOTH_DIR),)
 INTROSPECTION_GIRS += Shell-0.1.gir
 CLEANFILES += Shell-0.1.gir
--- a/src/gactionmuxer.c
+++ b/src/gactionmuxer.c
@ -0,0 +1,546 @@
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#include "config.h"
+
+#include "gactionmuxer.h"
+
+#include "gactionobservable.h"
+#include "gactionobserver.h"
+
+#include <clutter/clutter.h>
+
+#include <string.h>
+
+/*
+ * SECTION:gactionmuxer
+ * @short_description: Aggregate and monitor several action groups
+ *
+ * #GActionMuxer is a #GActionGroup and #GActionObservable that is
+ * capable of containing other #GActionGroup instances.
+ *
+ * The typical use is aggregating all of the actions applicable to a
+ * particular context into a single action group, with namespacing.
+ *
+ * Consider the case of two action groups -- one containing actions
+ * applicable to an entire application (such as 'quit') and one
+ * containing actions applicable to a particular window in the
+ * application (such as 'fullscreen').
+ *
+ * In this case, each of these action groups could be added to a
+ * #GActionMuxer with the prefixes "app" and "win", respectively.  This
+ * would expose the actions as "app.quit" and "win.fullscreen" on the
+ * #GActionGroup interface presented by the #GActionMuxer.
+ *
+ * Activations and state change requests on the #GActionMuxer are wired
+ * through to the underlying action group in the expected way.
+ *
+ * This class is typically only used at the site of "consumption" of
+ * actions (eg: when displaying a menu that contains many actions on
+ * different objects).
+ */
+
+static void     g_action_muxer_group_iface_init         (GActionGroupInterface      *iface);
+static void     g_action_muxer_observable_iface_init    (GActionObservableInterface *iface);
+
+typedef GObjectClass GActionMuxerClass;
+
+struct _GActionMuxer
+{
+  GObject parent_instance;
+
+  GHashTable *actions;
+  GHashTable *groups;
+};
+
+G_DEFINE_TYPE_WITH_CODE (GActionMuxer, g_action_muxer, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP, g_action_muxer_group_iface_init)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_OBSERVABLE, g_action_muxer_observable_iface_init))
+
+typedef struct
+{
+  GActionMuxer *muxer;
+  GSList       *watchers;
+  gchar        *fullname;
+} Action;
+
+typedef struct
+{
+  GActionMuxer *muxer;
+  GActionGroup *group;
+  gchar        *prefix;
+  gulong        handler_ids[4];
+} Group;
+
+static gchar **
+g_action_muxer_list_actions (GActionGroup *action_group)
+{
+  GActionMuxer *muxer = G_ACTION_MUXER (action_group);
+  GHashTableIter iter;
+  gchar *key;
+  gchar **keys;
+  gsize i;
+
+  keys = g_new (gchar *, g_hash_table_size (muxer->actions) + 1);
+
+  i = 0;
+  g_hash_table_iter_init (&iter, muxer->actions);
+  while (g_hash_table_iter_next (&iter, (gpointer *) &key, NULL))
+    keys[i++] = g_strdup (key);
+  keys[i] = NULL;
+
+  return keys;
+}
+
+static Group *
+g_action_muxer_find_group (GActionMuxer  *muxer,
+                              const gchar     **name)
+{
+  const gchar *dot;
+  gchar *prefix;
+  Group *group;
+
+  dot = strchr (*name, '.');
+
+  if (!dot)
+    return NULL;
+
+  prefix = g_strndup (*name, dot - *name);
+  group = g_hash_table_lookup (muxer->groups, prefix);
+  g_free (prefix);
+
+  *name = dot + 1;
+
+  return group;
+}
+
+static Action *
+g_action_muxer_lookup_action (GActionMuxer  *muxer,
+                              const gchar   *prefix,
+                              const gchar   *action_name,
+                              gchar        **fullname)
+{
+  Action *action;
+
+  *fullname = g_strconcat (prefix, ".", action_name, NULL);
+  action = g_hash_table_lookup (muxer->actions, *fullname);
+
+  return action;
+}
+
+static void
+g_action_muxer_action_enabled_changed (GActionGroup *action_group,
+                                       const gchar  *action_name,
+                                       gboolean      enabled,
+                                       gpointer      user_data)
+{
+  Group *group = user_data;
+  gchar *fullname;
+  Action *action;
+  GSList *node;
+
+  action = g_action_muxer_lookup_action (group->muxer, group->prefix, action_name, &fullname);
+  for (node = action ? action->watchers : NULL; node; node = node->next)
+    g_action_observer_action_enabled_changed (node->data, G_ACTION_OBSERVABLE (group->muxer), fullname, enabled);
+  g_action_group_action_enabled_changed (G_ACTION_GROUP (group->muxer), fullname, enabled);
+  g_free (fullname);
+}
+
+static void
+g_action_muxer_action_state_changed (GActionGroup *action_group,
+                                     const gchar  *action_name,
+                                     GVariant     *state,
+                                     gpointer      user_data)
+{
+  Group *group = user_data;
+  gchar *fullname;
+  Action *action;
+  GSList *node;
+
+  action = g_action_muxer_lookup_action (group->muxer, group->prefix, action_name, &fullname);
+  for (node = action ? action->watchers : NULL; node; node = node->next)
+    g_action_observer_action_state_changed (node->data, G_ACTION_OBSERVABLE (group->muxer), fullname, state);
+  g_action_group_action_state_changed (G_ACTION_GROUP (group->muxer), fullname, state);
+  g_free (fullname);
+}
+
+static void
+g_action_muxer_action_added (GActionGroup *action_group,
+                             const gchar  *action_name,
+                             gpointer      user_data)
+{
+  const GVariantType *parameter_type;
+  Group *group = user_data;
+  gboolean enabled;
+  GVariant *state;
+
+  if (g_action_group_query_action (group->group, action_name, &enabled, &parameter_type, NULL, NULL, &state))
+    {
+      gchar *fullname;
+      Action *action;
+      GSList *node;
+
+      action = g_action_muxer_lookup_action (group->muxer, group->prefix, action_name, &fullname);
+
+      for (node = action ? action->watchers : NULL; node; node = node->next)
+        g_action_observer_action_added (node->data,
+                                        G_ACTION_OBSERVABLE (group->muxer),
+                                        fullname, parameter_type, enabled, state);
+
+      g_action_group_action_added (G_ACTION_GROUP (group->muxer), fullname);
+
+      if (state)
+        g_variant_unref (state);
+
+      g_free (fullname);
+    }
+}
+
+static void
+g_action_muxer_action_removed (GActionGroup *action_group,
+                               const gchar  *action_name,
+                               gpointer      user_data)
+{
+  Group *group = user_data;
+  gchar *fullname;
+  Action *action;
+  GSList *node;
+
+  action = g_action_muxer_lookup_action (group->muxer, group->prefix, action_name, &fullname);
+  for (node = action ? action->watchers : NULL; node; node = node->next)
+    g_action_observer_action_removed (node->data, G_ACTION_OBSERVABLE (group->muxer), fullname);
+  g_action_group_action_removed (G_ACTION_GROUP (group->muxer), fullname);
+  g_free (fullname);
+}
+
+static gboolean
+g_action_muxer_query_action (GActionGroup        *action_group,
+                             const gchar         *action_name,
+                             gboolean            *enabled,
+                             const GVariantType **parameter_type,
+                             const GVariantType **state_type,
+                             GVariant           **state_hint,
+                             GVariant           **state)
+{
+  GActionMuxer *muxer = G_ACTION_MUXER (action_group);
+  Group *group;
+
+  group = g_action_muxer_find_group (muxer, &action_name);
+
+  if (!group)
+    return FALSE;
+
+  return g_action_group_query_action (group->group, action_name, enabled,
+                                      parameter_type, state_type, state_hint, state);
+}
+
+static GVariant *
+get_platform_data (void)
+{
+  gchar time[32];
+  GVariantBuilder *builder;
+  GVariant *result;
+
+  g_snprintf (time, 32, "_TIME%d", clutter_get_current_event_time ());
+
+  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
+
+  g_variant_builder_add (builder, "{sv}", "desktop-startup-id",
+                         g_variant_new_string (time));
+
+  result = g_variant_builder_end (builder);
+  g_variant_builder_unref (builder);
+
+  return result;
+}
+
+static void
+g_action_muxer_activate_action (GActionGroup *action_group,
+                                const gchar  *action_name,
+                                GVariant     *parameter)
+{
+  GActionMuxer *muxer = G_ACTION_MUXER (action_group);
+  Group *group;
+
+  group = g_action_muxer_find_group (muxer, &action_name);
+
+  if (group)
+    {
+      if (G_IS_REMOTE_ACTION_GROUP (group->group))
+        g_remote_action_group_activate_action_full (G_REMOTE_ACTION_GROUP (group->group),
+                                                    action_name,
+                                                    parameter,
+                                                    get_platform_data ());
+      else
+        g_action_group_activate_action (group->group, action_name, parameter);
+    }
+}
+
+static void
+g_action_muxer_change_action_state (GActionGroup *action_group,
+                                    const gchar  *action_name,
+                                    GVariant     *state)
+{
+  GActionMuxer *muxer = G_ACTION_MUXER (action_group);
+  Group *group;
+
+  group = g_action_muxer_find_group (muxer, &action_name);
+
+  if (group)
+    {
+      if (G_IS_REMOTE_ACTION_GROUP (group->group))
+        g_remote_action_group_change_action_state_full (G_REMOTE_ACTION_GROUP (group->group),
+                                                        action_name,
+                                                        state,
+                                                        get_platform_data ());
+      else
+        g_action_group_change_action_state (group->group, action_name, state);
+    }
+}
+
+static void
+g_action_muxer_unregister_internal (Action   *action,
+                                    gpointer  observer)
+{
+  GActionMuxer *muxer = action->muxer;
+  GSList **ptr;
+
+  for (ptr = &action->watchers; *ptr; ptr = &(*ptr)->next)
+    if ((*ptr)->data == observer)
+      {
+        *ptr = g_slist_remove (*ptr, observer);
+
+        if (action->watchers == NULL)
+          {
+            g_hash_table_remove (muxer->actions, action->fullname);
+            g_free (action->fullname);
+
+            g_slice_free (Action, action);
+
+            g_object_unref (muxer);
+          }
+
+        break;
+      }
+}
+
+static void
+g_action_muxer_weak_notify (gpointer  data,
+                            GObject  *where_the_object_was)
+{
+  Action *action = data;
+
+  g_action_muxer_unregister_internal (action, where_the_object_was);
+}
+
+static void
+g_action_muxer_register_observer (GActionObservable *observable,
+                                  const gchar       *name,
+                                  GActionObserver   *observer)
+{
+  GActionMuxer *muxer = G_ACTION_MUXER (observable);
+  Action *action;
+
+  action = g_hash_table_lookup (muxer->actions, name);
+
+  if (action == NULL)
+    {
+      action = g_slice_new (Action);
+      action->muxer = g_object_ref (muxer);
+      action->fullname = g_strdup (name);
+      action->watchers = NULL;
+
+      g_hash_table_insert (muxer->actions, action->fullname, action);
+    }
+
+  action->watchers = g_slist_prepend (action->watchers, observer);
+  g_object_weak_ref (G_OBJECT (observer), g_action_muxer_weak_notify, action);
+}
+
+static void
+g_action_muxer_unregister_observer (GActionObservable *observable,
+                                    const gchar       *name,
+                                    GActionObserver   *observer)
+{
+  GActionMuxer *muxer = G_ACTION_MUXER (observable);
+  Action *action;
+
+  action = g_hash_table_lookup (muxer->actions, name);
+  g_object_weak_unref (G_OBJECT (observer), g_action_muxer_weak_notify, action);
+  g_action_muxer_unregister_internal (action, observer);
+}
+
+static void
+g_action_muxer_free_group (gpointer data)
+{
+  Group *group = data;
+  gint i;
+
+  /* 'for loop' or 'four loop'? */
+  for (i = 0; i < 4; i++)
+    g_signal_handler_disconnect (group->group, group->handler_ids[i]);
+
+  g_object_unref (group->group);
+  g_free (group->prefix);
+
+  g_slice_free (Group, group);
+}
+
+static void
+g_action_muxer_finalize (GObject *object)
+{
+  GActionMuxer *muxer = G_ACTION_MUXER (object);
+
+  g_assert_cmpint (g_hash_table_size (muxer->actions), ==, 0);
+  g_hash_table_unref (muxer->actions);
+  g_hash_table_unref (muxer->groups);
+
+  G_OBJECT_CLASS (g_action_muxer_parent_class)
+    ->finalize (object);
+}
+
+static void
+g_action_muxer_init (GActionMuxer *muxer)
+{
+  muxer->actions = g_hash_table_new (g_str_hash, g_str_equal);
+  muxer->groups = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_action_muxer_free_group);
+}
+
+static void
+g_action_muxer_observable_iface_init (GActionObservableInterface *iface)
+{
+  iface->register_observer = g_action_muxer_register_observer;
+  iface->unregister_observer = g_action_muxer_unregister_observer;
+}
+
+static void
+g_action_muxer_group_iface_init (GActionGroupInterface *iface)
+{
+  iface->list_actions = g_action_muxer_list_actions;
+  iface->query_action = g_action_muxer_query_action;
+  iface->activate_action = g_action_muxer_activate_action;
+  iface->change_action_state = g_action_muxer_change_action_state;
+}
+
+static void
+g_action_muxer_class_init (GObjectClass *class)
+{
+  class->finalize = g_action_muxer_finalize;
+}
+
+/*
+ * g_action_muxer_insert:
+ * @muxer: a #GActionMuxer
+ * @prefix: the prefix string for the action group
+ * @action_group: a #GActionGroup
+ *
+ * Adds the actions in @action_group to the list of actions provided by
+ * @muxer.  @prefix is prefixed to each action name, such that for each
+ * action <varname>x</varname> in @action_group, there is an equivalent
+ * action @prefix<literal>.</literal><varname>x</varname> in @muxer.
+ *
+ * For example, if @prefix is "<literal>app</literal>" and @action_group
+ * contains an action called "<literal>quit</literal>", then @muxer will
+ * now contain an action called "<literal>app.quit</literal>".
+ *
+ * If any #GActionObservers are registered for actions in the group,
+ * "action_added" notifications will be emitted, as appropriate.
+ *
+ * @prefix must not contain a dot ('.').
+ */
+void
+g_action_muxer_insert (GActionMuxer *muxer,
+                       const gchar  *prefix,
+                       GActionGroup *action_group)
+{
+  gchar **actions;
+  Group *group;
+  gint i;
+
+  /* TODO: diff instead of ripout and replace */
+  g_action_muxer_remove (muxer, prefix);
+
+  group = g_slice_new (Group);
+  group->muxer = muxer;
+  group->group = g_object_ref (action_group);
+  group->prefix = g_strdup (prefix);
+
+  g_hash_table_insert (muxer->groups, group->prefix, group);
+
+  actions = g_action_group_list_actions (group->group);
+  for (i = 0; actions[i]; i++)
+    g_action_muxer_action_added (group->group, actions[i], group);
+  g_strfreev (actions);
+
+  group->handler_ids[0] = g_signal_connect (group->group, "action-added",
+                                            G_CALLBACK (g_action_muxer_action_added), group);
+  group->handler_ids[1] = g_signal_connect (group->group, "action-removed",
+                                            G_CALLBACK (g_action_muxer_action_removed), group);
+  group->handler_ids[2] = g_signal_connect (group->group, "action-enabled-changed",
+                                            G_CALLBACK (g_action_muxer_action_enabled_changed), group);
+  group->handler_ids[3] = g_signal_connect (group->group, "action-state-changed",
+                                            G_CALLBACK (g_action_muxer_action_state_changed), group);
+}
+
+/*
+ * g_action_muxer_remove:
+ * @muxer: a #GActionMuxer
+ * @prefix: the prefix of the action group to remove
+ *
+ * Removes a #GActionGroup from the #GActionMuxer.
+ *
+ * If any #GActionObservers are registered for actions in the group,
+ * "action_removed" notifications will be emitted, as appropriate.
+ */
+void
+g_action_muxer_remove (GActionMuxer *muxer,
+                       const gchar  *prefix)
+{
+  Group *group;
+
+  group = g_hash_table_lookup (muxer->groups, prefix);
+
+  if (group != NULL)
+    {
+      gchar **actions;
+      gint i;
+
+      g_hash_table_steal (muxer->groups, prefix);
+
+      actions = g_action_group_list_actions (group->group);
+      for (i = 0; actions[i]; i++)
+        g_action_muxer_action_removed (group->group, actions[i], group);
+      g_strfreev (actions);
+
+      g_action_muxer_free_group (group);
+    }
+}
+
+/*
+ * g_action_muxer_new:
+ *
+ * Creates a new #GActionMuxer.
+ */
+GActionMuxer *
+g_action_muxer_new (void)
+{
+  return g_object_new (G_TYPE_ACTION_MUXER, NULL);
+}
--- a/src/gactionmuxer.h
+++ b/src/gactionmuxer.h
@ -0,0 +1,53 @@
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __G_ACTION_MUXER_H__
+#define __G_ACTION_MUXER_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define G_TYPE_ACTION_MUXER                                 (g_action_muxer_get_type ())
+#define G_ACTION_MUXER(inst)                                (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             G_TYPE_ACTION_MUXER, GActionMuxer))
+#define G_IS_ACTION_MUXER(inst)                             (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
+                                                             G_TYPE_ACTION_MUXER))
+
+typedef struct _GActionMuxer                                GActionMuxer;
+
+G_GNUC_INTERNAL
+GType                   g_action_muxer_get_type                         (void);
+G_GNUC_INTERNAL
+GActionMuxer *          g_action_muxer_new                              (void);
+
+G_GNUC_INTERNAL
+void                    g_action_muxer_insert                           (GActionMuxer *muxer,
+                                                                         const gchar  *prefix,
+                                                                         GActionGroup *group);
+
+G_GNUC_INTERNAL
+void                    g_action_muxer_remove                           (GActionMuxer *muxer,
+                                                                         const gchar  *prefix);
+
+G_END_DECLS
+
+#endif /* __G_ACTION_MUXER_H__ */
--- a/src/gactionobservable.c
+++ b/src/gactionobservable.c
@ -0,0 +1,80 @@
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * licence or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ * USA.
+ *
+ * Authors: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#include "config.h"
+
+#include "gactionobservable.h"
+
+G_DEFINE_INTERFACE (GActionObservable, g_action_observable, G_TYPE_OBJECT)
+
+/*
+ * SECTION:gactionobserable
+ * @short_description: an interface implemented by objects that report
+ *                     changes to actions
+ */
+
+void
+g_action_observable_default_init (GActionObservableInterface *iface)
+{
+}
+
+/*
+ * g_action_observable_register_observer:
+ * @observable: a #GActionObservable
+ * @action_name: the name of the action
+ * @observer: the #GActionObserver to which the events will be reported
+ *
+ * Registers @observer as being interested in changes to @action_name on
+ * @observable.
+ */
+void
+g_action_observable_register_observer (GActionObservable *observable,
+                                       const gchar       *action_name,
+                                       GActionObserver   *observer)
+{
+  g_return_if_fail (G_IS_ACTION_OBSERVABLE (observable));
+
+  G_ACTION_OBSERVABLE_GET_IFACE (observable)
+    ->register_observer (observable, action_name, observer);
+}
+
+/*
+ * g_action_observable_unregister_observer:
+ * @observable: a #GActionObservable
+ * @action_name: the name of the action
+ * @observer: the #GActionObserver to which the events will be reported
+ *
+ * Removes the registration of @observer as being interested in changes
+ * to @action_name on @observable.
+ *
+ * If the observer was registered multiple times, it must be
+ * unregistered an equal number of times.
+ */
+void
+g_action_observable_unregister_observer (GActionObservable *observable,
+                                         const gchar       *action_name,
+                                         GActionObserver   *observer)
+{
+  g_return_if_fail (G_IS_ACTION_OBSERVABLE (observable));
+
+  G_ACTION_OBSERVABLE_GET_IFACE (observable)
+    ->unregister_observer (observable, action_name, observer);
+}
--- a/src/gactionobservable.h
+++ b/src/gactionobservable.h
@ -0,0 +1,64 @@
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * licence or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ * USA.
+ *
+ * Authors: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __G_ACTION_OBSERVABLE_H__
+#define __G_ACTION_OBSERVABLE_H__
+
+#include "gactionobserver.h"
+
+G_BEGIN_DECLS
+
+#define G_TYPE_ACTION_OBSERVABLE                            (g_action_observable_get_type ())
+#define G_ACTION_OBSERVABLE(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             G_TYPE_ACTION_OBSERVABLE, GActionObservable))
+#define G_IS_ACTION_OBSERVABLE(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
+                                                             G_TYPE_ACTION_OBSERVABLE))
+#define G_ACTION_OBSERVABLE_GET_IFACE(inst)                 (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
+                                                             G_TYPE_ACTION_OBSERVABLE, GActionObservableInterface))
+
+typedef struct _GActionObservableInterface                  GActionObservableInterface;
+
+struct _GActionObservableInterface
+{
+  GTypeInterface g_iface;
+
+  void (* register_observer)   (GActionObservable *observable,
+                                const gchar       *action_name,
+                                GActionObserver   *observer);
+  void (* unregister_observer) (GActionObservable *observable,
+                                const gchar       *action_name,
+                                GActionObserver   *observer);
+};
+
+G_GNUC_INTERNAL
+GType                   g_action_observable_get_type                    (void);
+G_GNUC_INTERNAL
+void                    g_action_observable_register_observer           (GActionObservable  *observable,
+                                                                         const gchar        *action_name,
+                                                                         GActionObserver    *observer);
+G_GNUC_INTERNAL
+void                    g_action_observable_unregister_observer         (GActionObservable  *observable,
+                                                                         const gchar        *action_name,
+                                                                         GActionObserver    *observer);
+
+G_END_DECLS
+
+#endif /* __G_ACTION_OBSERVABLE_H__ */
--- a/src/gtkactionobserver.c
+++ b/src/gtkactionobserver.c
@ -1,7 +1,7 @@
 /*
 * Copyright © 2011 Canonical Limited
 *
- * This library is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as
 * published by the Free Software Foundation; either version 2 of the
 * licence or (at your option) any later version.
@ -12,23 +12,25 @@
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ * USA.
 *
 * Authors: Ryan Lortie <desrt@desrt.ca>
 */

 #include "config.h"

-#include "gtkactionobserver.h"
+#include "gactionobserver.h"

-G_DEFINE_INTERFACE (GtkActionObserver, gtk_action_observer, G_TYPE_OBJECT)
+G_DEFINE_INTERFACE (GActionObserver, g_action_observer, G_TYPE_OBJECT)

 /**
- * SECTION:gtkactionobserver
+ * SECTION:gactionobserver
 * @short_description: an interface implemented by objects that are
 *                     interested in monitoring actions for changes
 *
- * GtkActionObserver is a simple interface allowing objects that wish to
+ * GActionObserver is a simple interface allowing objects that wish to
 * be notified of changes to actions to be notified of those changes.
 *
 * It is also possible to monitor changes to action groups using
@ -50,13 +52,13 @@ G_DEFINE_INTERFACE (GtkActionObserver, gtk_action_observer, G_TYPE_OBJECT)
 */

 void
-gtk_action_observer_default_init (GtkActionObserverInterface *class)
+g_action_observer_default_init (GActionObserverInterface *class)
 {
 }

-/**
- * gtk_action_observer_action_added:
- * @observer: a #GtkActionObserver
+/*
+ * g_action_observer_action_added:
+ * @observer: a #GActionObserver
 * @observable: the source of the event
 * @action_name: the name of the action
 * @enabled: %TRUE if the action is now enabled
@ -72,22 +74,22 @@ gtk_action_observer_default_init (GtkActionObserverInterface *class)
 * observer has explicitly registered itself to receive events.
 */
 void
-gtk_action_observer_action_added (GtkActionObserver   *observer,
-                                  GtkActionObservable *observable,
-                                  const gchar         *action_name,
-                                  const GVariantType  *parameter_type,
-                                  gboolean             enabled,
-                                  GVariant            *state)
+g_action_observer_action_added (GActionObserver    *observer,
+                                GActionObservable  *observable,
+                                const gchar        *action_name,
+                                const GVariantType *parameter_type,
+                                gboolean            enabled,
+                                GVariant           *state)
 {
-  g_return_if_fail (GTK_IS_ACTION_OBSERVER (observer));
+  g_return_if_fail (G_IS_ACTION_OBSERVER (observer));

-  GTK_ACTION_OBSERVER_GET_IFACE (observer)
+  G_ACTION_OBSERVER_GET_IFACE (observer)
    ->action_added (observer, observable, action_name, parameter_type, enabled, state);
 }

-/**
- * gtk_action_observer_action_enabled_changed:
- * @observer: a #GtkActionObserver
+/*
+ * g_action_observer_action_enabled_changed:
+ * @observer: a #GActionObserver
 * @observable: the source of the event
 * @action_name: the name of the action
 * @enabled: %TRUE if the action is now enabled
@ -99,45 +101,45 @@ gtk_action_observer_action_added (GtkActionObserver   *observer,
 * observer has explicitly registered itself to receive events.
 */
 void
-gtk_action_observer_action_enabled_changed (GtkActionObserver   *observer,
-                                            GtkActionObservable *observable,
-                                            const gchar         *action_name,
-                                            gboolean             enabled)
+g_action_observer_action_enabled_changed (GActionObserver   *observer,
+                                          GActionObservable *observable,
+                                          const gchar       *action_name,
+                                          gboolean           enabled)
 {
-  g_return_if_fail (GTK_IS_ACTION_OBSERVER (observer));
+  g_return_if_fail (G_IS_ACTION_OBSERVER (observer));

-  GTK_ACTION_OBSERVER_GET_IFACE (observer)
+  G_ACTION_OBSERVER_GET_IFACE (observer)
    ->action_enabled_changed (observer, observable, action_name, enabled);
 }

-/**
- * gtk_action_observer_action_state_changed:
- * @observer: a #GtkActionObserver
+/*
+ * g_action_observer_action_state_changed:
+ * @observer: a #GActionObserver
 * @observable: the source of the event
 * @action_name: the name of the action
 * @state: the new state of the action
 *
 * This function is called when an action that the observer is
- * registered to receive events for changes to its state.
+ * registered to receive events for changes its state.
 *
 * This function should only be called by objects with which the
 * observer has explicitly registered itself to receive events.
 */
 void
-gtk_action_observer_action_state_changed (GtkActionObserver   *observer,
-                                          GtkActionObservable *observable,
-                                          const gchar         *action_name,
-                                          GVariant            *state)
+g_action_observer_action_state_changed (GActionObserver   *observer,
+                                        GActionObservable *observable,
+                                        const gchar       *action_name,
+                                        GVariant          *state)
 {
-  g_return_if_fail (GTK_IS_ACTION_OBSERVER (observer));
+  g_return_if_fail (G_IS_ACTION_OBSERVER (observer));

-  GTK_ACTION_OBSERVER_GET_IFACE (observer)
+  G_ACTION_OBSERVER_GET_IFACE (observer)
    ->action_state_changed (observer, observable, action_name, state);
 }

-/**
- * gtk_action_observer_action_removed:
- * @observer: a #GtkActionObserver
+/*
+ * g_action_observer_action_removed:
+ * @observer: a #GActionObserver
 * @observable: the source of the event
 * @action_name: the name of the action
 *
@ -148,12 +150,12 @@ gtk_action_observer_action_state_changed (GtkActionObserver   *observer,
 * observer has explicitly registered itself to receive events.
 */
 void
-gtk_action_observer_action_removed (GtkActionObserver   *observer,
-                                    GtkActionObservable *observable,
-                                    const gchar         *action_name)
+g_action_observer_action_removed (GActionObserver   *observer,
+                                  GActionObservable *observable,
+                                  const gchar       *action_name)
 {
-  g_return_if_fail (GTK_IS_ACTION_OBSERVER (observer));
+  g_return_if_fail (G_IS_ACTION_OBSERVER (observer));

-  GTK_ACTION_OBSERVER_GET_IFACE (observer)
+  G_ACTION_OBSERVER_GET_IFACE (observer)
    ->action_removed (observer, observable, action_name);
 }
--- a/src/gactionobserver.h
+++ b/src/gactionobserver.h
@ -0,0 +1,90 @@
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * licence or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ * USA.
+ *
+ * Authors: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __G_ACTION_OBSERVER_H__
+#define __G_ACTION_OBSERVER_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define G_TYPE_ACTION_OBSERVER                              (g_action_observer_get_type ())
+#define G_ACTION_OBSERVER(inst)                             (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             G_TYPE_ACTION_OBSERVER, GActionObserver))
+#define G_IS_ACTION_OBSERVER(inst)                          (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
+                                                             G_TYPE_ACTION_OBSERVER))
+#define G_ACTION_OBSERVER_GET_IFACE(inst)                   (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
+                                                             G_TYPE_ACTION_OBSERVER, GActionObserverInterface))
+
+typedef struct _GActionObserverInterface                    GActionObserverInterface;
+typedef struct _GActionObservable                           GActionObservable;
+typedef struct _GActionObserver                             GActionObserver;
+
+struct _GActionObserverInterface
+{
+  GTypeInterface g_iface;
+
+  void (* action_added)           (GActionObserver    *observer,
+                                   GActionObservable  *observable,
+                                   const gchar        *action_name,
+                                   const GVariantType *parameter_type,
+                                   gboolean            enabled,
+                                   GVariant           *state);
+  void (* action_enabled_changed) (GActionObserver    *observer,
+                                   GActionObservable  *observable,
+                                   const gchar        *action_name,
+                                   gboolean            enabled);
+  void (* action_state_changed)   (GActionObserver    *observer,
+                                   GActionObservable  *observable,
+                                   const gchar        *action_name,
+                                   GVariant           *state);
+  void (* action_removed)         (GActionObserver    *observer,
+                                   GActionObservable  *observable,
+                                   const gchar        *action_name);
+};
+
+G_GNUC_INTERNAL
+GType                   g_action_observer_get_type                      (void);
+G_GNUC_INTERNAL
+void                    g_action_observer_action_added                  (GActionObserver    *observer,
+                                                                         GActionObservable  *observable,
+                                                                         const gchar        *action_name,
+                                                                         const GVariantType *parameter_type,
+                                                                         gboolean            enabled,
+                                                                         GVariant           *state);
+G_GNUC_INTERNAL
+void                    g_action_observer_action_enabled_changed        (GActionObserver    *observer,
+                                                                         GActionObservable  *observable,
+                                                                         const gchar        *action_name,
+                                                                         gboolean            enabled);
+G_GNUC_INTERNAL
+void                    g_action_observer_action_state_changed          (GActionObserver    *observer,
+                                                                         GActionObservable  *observable,
+                                                                         const gchar        *action_name,
+                                                                         GVariant           *state);
+G_GNUC_INTERNAL
+void                    g_action_observer_action_removed                (GActionObserver    *observer,
+                                                                         GActionObservable  *observable,
+                                                                         const gchar        *action_name);
+
+G_END_DECLS
+
+#endif /* __G_ACTION_OBSERVER_H__ */
--- a/src/gtkactionmuxer.c
+++ b/src/gtkactionmuxer.c
@ -1,808 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#include "config.h"
-
-#include "gtkactionmuxer.h"
-
-#include "gtkactionobservable.h"
-#include "gtkactionobserver.h"
-
-#include <clutter/clutter.h>
-
-#include <string.h>
-
-/**
- * SECTION:gtkactionmuxer
- * @short_description: Aggregate and monitor several action groups
- *
- * #GtkActionMuxer is a #GActionGroup and #GtkActionObservable that is
- * capable of containing other #GActionGroup instances.
- *
- * The typical use is aggregating all of the actions applicable to a
- * particular context into a single action group, with namespacing.
- *
- * Consider the case of two action groups -- one containing actions
- * applicable to an entire application (such as 'quit') and one
- * containing actions applicable to a particular window in the
- * application (such as 'fullscreen').
- *
- * In this case, each of these action groups could be added to a
- * #GtkActionMuxer with the prefixes "app" and "win", respectively.  This
- * would expose the actions as "app.quit" and "win.fullscreen" on the
- * #GActionGroup interface presented by the #GtkActionMuxer.
- *
- * Activations and state change requests on the #GtkActionMuxer are wired
- * through to the underlying action group in the expected way.
- *
- * This class is typically only used at the site of "consumption" of
- * actions (eg: when displaying a menu that contains many actions on
- * different objects).
- */
-
-static void     gtk_action_muxer_group_iface_init         (GActionGroupInterface        *iface);
-static void     gtk_action_muxer_observable_iface_init    (GtkActionObservableInterface *iface);
-
-typedef GObjectClass GtkActionMuxerClass;
-
-struct _GtkActionMuxer
-{
-  GObject parent_instance;
-
-  GHashTable *observed_actions;
-  GHashTable *groups;
-  GtkActionMuxer *parent;
-};
-
-G_DEFINE_TYPE_WITH_CODE (GtkActionMuxer, gtk_action_muxer, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP, gtk_action_muxer_group_iface_init)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTION_OBSERVABLE, gtk_action_muxer_observable_iface_init))
-
-enum
-{
-  PROP_0,
-  PROP_PARENT,
-  NUM_PROPERTIES
-};
-
-static GParamSpec *properties[NUM_PROPERTIES];
-
-typedef struct
-{
-  GtkActionMuxer *muxer;
-  GSList       *watchers;
-  gchar        *fullname;
-} Action;
-
-typedef struct
-{
-  GtkActionMuxer *muxer;
-  GActionGroup *group;
-  gchar        *prefix;
-  gulong        handler_ids[4];
-} Group;
-
-static void
-gtk_action_muxer_append_group_actions (gpointer key,
-                                       gpointer value,
-                                       gpointer user_data)
-{
-  const gchar *prefix = key;
-  Group *group = value;
-  GArray *actions = user_data;
-  gchar **group_actions;
-  gchar **action;
-
-  group_actions = g_action_group_list_actions (group->group);
-  for (action = group_actions; *action; action++)
-    {
-      gchar *fullname;
-
-      fullname = g_strconcat (prefix, ".", *action, NULL);
-      g_array_append_val (actions, fullname);
-    }
-
-  g_strfreev (group_actions);
-}
-
-static gchar **
-gtk_action_muxer_list_actions (GActionGroup *action_group)
-{
-  GtkActionMuxer *muxer = GTK_ACTION_MUXER (action_group);
-  GArray *actions;
-
-  actions = g_array_new (TRUE, FALSE, sizeof (gchar *));
-
-  for ( ; muxer != NULL; muxer = muxer->parent)
-    {
-      g_hash_table_foreach (muxer->groups,
-                            gtk_action_muxer_append_group_actions,
-                            actions);
-    }
-
-  return (gchar **) g_array_free (actions, FALSE);
-}
-
-static Group *
-gtk_action_muxer_find_group (GtkActionMuxer  *muxer,
-                             const gchar     *full_name,
-                             const gchar    **action_name)
-{
-  const gchar *dot;
-  gchar *prefix;
-  Group *group;
-
-  dot = strchr (full_name, '.');
-
-  if (!dot)
-    return NULL;
-
-  prefix = g_strndup (full_name, dot - full_name);
-  group = g_hash_table_lookup (muxer->groups, prefix);
-  g_free (prefix);
-
-  if (action_name)
-    *action_name = dot + 1;
-
-  return group;
-}
-
-static void
-gtk_action_muxer_action_enabled_changed (GtkActionMuxer *muxer,
-                                         const gchar    *action_name,
-                                         gboolean        enabled)
-{
-  Action *action;
-  GSList *node;
-
-  action = g_hash_table_lookup (muxer->observed_actions, action_name);
-  for (node = action ? action->watchers : NULL; node; node = node->next)
-    gtk_action_observer_action_enabled_changed (node->data, GTK_ACTION_OBSERVABLE (muxer), action_name, enabled);
-  g_action_group_action_enabled_changed (G_ACTION_GROUP (muxer), action_name, enabled);
-}
-
-static void
-gtk_action_muxer_group_action_enabled_changed (GActionGroup *action_group,
-                                               const gchar  *action_name,
-                                               gboolean      enabled,
-                                               gpointer      user_data)
-{
-  Group *group = user_data;
-  gchar *fullname;
-
-  fullname = g_strconcat (group->prefix, ".", action_name, NULL);
-  gtk_action_muxer_action_enabled_changed (group->muxer, fullname, enabled);
-
-  g_free (fullname);
-}
-
-static void
-gtk_action_muxer_parent_action_enabled_changed (GActionGroup *action_group,
-                                                const gchar  *action_name,
-                                                gboolean      enabled,
-                                                gpointer      user_data)
-{
-  GtkActionMuxer *muxer = user_data;
-
-  gtk_action_muxer_action_enabled_changed (muxer, action_name, enabled);
-}
-
-static void
-gtk_action_muxer_action_state_changed (GtkActionMuxer *muxer,
-                                       const gchar    *action_name,
-                                       GVariant       *state)
-{
-  Action *action;
-  GSList *node;
-
-  action = g_hash_table_lookup (muxer->observed_actions, action_name);
-  for (node = action ? action->watchers : NULL; node; node = node->next)
-    gtk_action_observer_action_state_changed (node->data, GTK_ACTION_OBSERVABLE (muxer), action_name, state);
-  g_action_group_action_state_changed (G_ACTION_GROUP (muxer), action_name, state);
-}
-
-static void
-gtk_action_muxer_group_action_state_changed (GActionGroup *action_group,
-                                             const gchar  *action_name,
-                                             GVariant     *state,
-                                             gpointer      user_data)
-{
-  Group *group = user_data;
-  gchar *fullname;
-
-  fullname = g_strconcat (group->prefix, ".", action_name, NULL);
-  gtk_action_muxer_action_state_changed (group->muxer, fullname, state);
-
-  g_free (fullname);
-}
-
-static void
-gtk_action_muxer_parent_action_state_changed (GActionGroup *action_group,
-                                              const gchar  *action_name,
-                                              GVariant     *state,
-                                              gpointer      user_data)
-{
-  GtkActionMuxer *muxer = user_data;
-
-  gtk_action_muxer_action_state_changed (muxer, action_name, state);
-}
-
-static void
-gtk_action_muxer_action_added (GtkActionMuxer *muxer,
-                               const gchar    *action_name,
-                               GActionGroup   *original_group,
-                               const gchar    *orignal_action_name)
-{
-  const GVariantType *parameter_type;
-  gboolean enabled;
-  GVariant *state;
-  Action *action;
-
-  action = g_hash_table_lookup (muxer->observed_actions, action_name);
-
-  if (action && action->watchers &&
-      g_action_group_query_action (original_group, orignal_action_name,
-                                   &enabled, &parameter_type, NULL, NULL, &state))
-    {
-      GSList *node;
-
-      for (node = action->watchers; node; node = node->next)
-        gtk_action_observer_action_added (node->data,
-                                        GTK_ACTION_OBSERVABLE (muxer),
-                                        action_name, parameter_type, enabled, state);
-
-      if (state)
-        g_variant_unref (state);
-    }
-
-  g_action_group_action_added (G_ACTION_GROUP (muxer), action_name);
-}
-
-static void
-gtk_action_muxer_action_added_to_group (GActionGroup *action_group,
-                                        const gchar  *action_name,
-                                        gpointer      user_data)
-{
-  Group *group = user_data;
-  gchar *fullname;
-
-  fullname = g_strconcat (group->prefix, ".", action_name, NULL);
-  gtk_action_muxer_action_added (group->muxer, fullname, action_group, action_name);
-
-  g_free (fullname);
-}
-
-static void
-gtk_action_muxer_action_added_to_parent (GActionGroup *action_group,
-                                         const gchar  *action_name,
-                                         gpointer      user_data)
-{
-  GtkActionMuxer *muxer = user_data;
-
-  gtk_action_muxer_action_added (muxer, action_name, action_group, action_name);
-}
-
-static void
-gtk_action_muxer_action_removed (GtkActionMuxer *muxer,
-                                 const gchar    *action_name)
-{
-  Action *action;
-  GSList *node;
-
-  action = g_hash_table_lookup (muxer->observed_actions, action_name);
-  for (node = action ? action->watchers : NULL; node; node = node->next)
-    gtk_action_observer_action_removed (node->data, GTK_ACTION_OBSERVABLE (muxer), action_name);
-  g_action_group_action_removed (G_ACTION_GROUP (muxer), action_name);
-}
-
-static void
-gtk_action_muxer_action_removed_from_group (GActionGroup *action_group,
-                                            const gchar  *action_name,
-                                            gpointer      user_data)
-{
-  Group *group = user_data;
-  gchar *fullname;
-
-  fullname = g_strconcat (group->prefix, ".", action_name, NULL);
-  gtk_action_muxer_action_removed (group->muxer, fullname);
-
-  g_free (fullname);
-}
-
-static void
-gtk_action_muxer_action_removed_from_parent (GActionGroup *action_group,
-                                             const gchar  *action_name,
-                                             gpointer      user_data)
-{
-  GtkActionMuxer *muxer = user_data;
-
-  gtk_action_muxer_action_removed (muxer, action_name);
-}
-
-static gboolean
-gtk_action_muxer_query_action (GActionGroup        *action_group,
-                               const gchar         *action_name,
-                               gboolean            *enabled,
-                               const GVariantType **parameter_type,
-                               const GVariantType **state_type,
-                               GVariant           **state_hint,
-                               GVariant           **state)
-{
-  GtkActionMuxer *muxer = GTK_ACTION_MUXER (action_group);
-  Group *group;
-  const gchar *unprefixed_name;
-
-  group = gtk_action_muxer_find_group (muxer, action_name, &unprefixed_name);
-
-  if (group)
-    return g_action_group_query_action (group->group, unprefixed_name, enabled,
-                                        parameter_type, state_type, state_hint, state);
-
-  if (muxer->parent)
-    return g_action_group_query_action (G_ACTION_GROUP (muxer->parent), action_name,
-                                        enabled, parameter_type,
-                                        state_type, state_hint, state);
-
-  return FALSE;
-}
-
-static void
-gtk_action_muxer_activate_action (GActionGroup *action_group,
-                                  const gchar  *action_name,
-                                  GVariant     *parameter)
-{
-  GtkActionMuxer *muxer = GTK_ACTION_MUXER (action_group);
-  Group *group;
-  const gchar *unprefixed_name;
-
-  group = gtk_action_muxer_find_group (muxer, action_name, &unprefixed_name);
-
-  if (group)
-    g_action_group_activate_action (group->group, unprefixed_name, parameter);
-  else if (muxer->parent)
-    g_action_group_activate_action (G_ACTION_GROUP (muxer->parent), action_name, parameter);
-}
-
-static GVariant *
-get_platform_data (void)
-{
-  gchar time[32];
-  GVariantBuilder *builder;
-  GVariant *result;
-
-  g_snprintf (time, 32, "_TIME%d", clutter_get_current_event_time ());
-
-  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
-
-  g_variant_builder_add (builder, "{sv}", "desktop-startup-id",
-                         g_variant_new_string (time));
-
-  result = g_variant_builder_end (builder);
-  g_variant_builder_unref (builder);
-
-  return result;
-}
-
-static void
-gtk_action_muxer_change_action_state (GActionGroup *action_group,
-                                      const gchar  *action_name,
-                                      GVariant     *state)
-{
-  GtkActionMuxer *muxer = GTK_ACTION_MUXER (action_group);
-  Group *group;
-  const gchar *unprefixed_name;
-
-  group = gtk_action_muxer_find_group (muxer, action_name, &unprefixed_name);
-
-  if (group)
-    {
-      if (G_IS_REMOTE_ACTION_GROUP (group->group))
-        g_remote_action_group_change_action_state_full (G_REMOTE_ACTION_GROUP (group->group),
-                                                        unprefixed_name,
-                                                        state,
-                                                        get_platform_data ());
-      else
-        g_action_group_change_action_state (group->group, unprefixed_name, state);
-    }
-  else if (muxer->parent)
-    g_action_group_change_action_state (G_ACTION_GROUP (muxer->parent), action_name, state);
-}
-
-static void
-gtk_action_muxer_unregister_internal (Action   *action,
-                                      gpointer  observer)
-{
-  GtkActionMuxer *muxer = action->muxer;
-  GSList **ptr;
-
-  for (ptr = &action->watchers; *ptr; ptr = &(*ptr)->next)
-    if ((*ptr)->data == observer)
-      {
-        *ptr = g_slist_remove (*ptr, observer);
-
-        if (action->watchers == NULL)
-            g_hash_table_remove (muxer->observed_actions, action->fullname);
-
-        break;
-      }
-}
-
-static void
-gtk_action_muxer_weak_notify (gpointer  data,
-                              GObject  *where_the_object_was)
-{
-  Action *action = data;
-
-  gtk_action_muxer_unregister_internal (action, where_the_object_was);
-}
-
-static void
-gtk_action_muxer_register_observer (GtkActionObservable *observable,
-                                    const gchar         *name,
-                                    GtkActionObserver   *observer)
-{
-  GtkActionMuxer *muxer = GTK_ACTION_MUXER (observable);
-  Action *action;
-
-  action = g_hash_table_lookup (muxer->observed_actions, name);
-
-  if (action == NULL)
-    {
-      action = g_slice_new (Action);
-      action->muxer = muxer;
-      action->fullname = g_strdup (name);
-      action->watchers = NULL;
-
-      g_hash_table_insert (muxer->observed_actions, action->fullname, action);
-    }
-
-  action->watchers = g_slist_prepend (action->watchers, observer);
-  g_object_weak_ref (G_OBJECT (observer), gtk_action_muxer_weak_notify, action);
-}
-
-static void
-gtk_action_muxer_unregister_observer (GtkActionObservable *observable,
-                                      const gchar         *name,
-                                      GtkActionObserver   *observer)
-{
-  GtkActionMuxer *muxer = GTK_ACTION_MUXER (observable);
-  Action *action;
-
-  action = g_hash_table_lookup (muxer->observed_actions, name);
-  g_object_weak_unref (G_OBJECT (observer), gtk_action_muxer_weak_notify, action);
-  gtk_action_muxer_unregister_internal (action, observer);
-}
-
-static void
-gtk_action_muxer_free_group (gpointer data)
-{
-  Group *group = data;
-  gint i;
-
-  /* 'for loop' or 'four loop'? */
-  for (i = 0; i < 4; i++)
-    g_signal_handler_disconnect (group->group, group->handler_ids[i]);
-
-  g_object_unref (group->group);
-  g_free (group->prefix);
-
-  g_slice_free (Group, group);
-}
-
-static void
-gtk_action_muxer_free_action (gpointer data)
-{
-  Action *action = data;
-  GSList *it;
-
-  for (it = action->watchers; it; it = it->next)
-    g_object_weak_unref (G_OBJECT (it->data), gtk_action_muxer_weak_notify, action);
-
-  g_slist_free (action->watchers);
-  g_free (action->fullname);
-
-  g_slice_free (Action, action);
-}
-
-static void
-gtk_action_muxer_finalize (GObject *object)
-{
-  GtkActionMuxer *muxer = GTK_ACTION_MUXER (object);
-
-  g_assert_cmpint (g_hash_table_size (muxer->observed_actions), ==, 0);
-  g_hash_table_unref (muxer->observed_actions);
-  g_hash_table_unref (muxer->groups);
-
-  G_OBJECT_CLASS (gtk_action_muxer_parent_class)
-    ->finalize (object);
-}
-
-static void
-gtk_action_muxer_dispose (GObject *object)
-{
-  GtkActionMuxer *muxer = GTK_ACTION_MUXER (object);
-
-  if (muxer->parent)
-  {
-    g_signal_handlers_disconnect_by_func (muxer->parent, gtk_action_muxer_action_added_to_parent, muxer);
-    g_signal_handlers_disconnect_by_func (muxer->parent, gtk_action_muxer_action_removed_from_parent, muxer);
-    g_signal_handlers_disconnect_by_func (muxer->parent, gtk_action_muxer_parent_action_enabled_changed, muxer);
-    g_signal_handlers_disconnect_by_func (muxer->parent, gtk_action_muxer_parent_action_state_changed, muxer);
-
-    g_clear_object (&muxer->parent);
-  }
-
-  g_hash_table_remove_all (muxer->observed_actions);
-
-  G_OBJECT_CLASS (gtk_action_muxer_parent_class)
-    ->dispose (object);
-}
-
-static void
-gtk_action_muxer_get_property (GObject    *object,
-                               guint       property_id,
-                               GValue     *value,
-                               GParamSpec *pspec)
-{
-  GtkActionMuxer *muxer = GTK_ACTION_MUXER (object);
-
-  switch (property_id)
-    {
-    case PROP_PARENT:
-      g_value_set_object (value, gtk_action_muxer_get_parent (muxer));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-gtk_action_muxer_set_property (GObject      *object,
-                               guint         property_id,
-                               const GValue *value,
-                               GParamSpec   *pspec)
-{
-  GtkActionMuxer *muxer = GTK_ACTION_MUXER (object);
-
-  switch (property_id)
-    {
-    case PROP_PARENT:
-      gtk_action_muxer_set_parent (muxer, g_value_get_object (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-gtk_action_muxer_init (GtkActionMuxer *muxer)
-{
-  muxer->observed_actions = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, gtk_action_muxer_free_action);
-  muxer->groups = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, gtk_action_muxer_free_group);
-}
-
-static void
-gtk_action_muxer_observable_iface_init (GtkActionObservableInterface *iface)
-{
-  iface->register_observer = gtk_action_muxer_register_observer;
-  iface->unregister_observer = gtk_action_muxer_unregister_observer;
-}
-
-static void
-gtk_action_muxer_group_iface_init (GActionGroupInterface *iface)
-{
-  iface->list_actions = gtk_action_muxer_list_actions;
-  iface->query_action = gtk_action_muxer_query_action;
-  iface->activate_action = gtk_action_muxer_activate_action;
-  iface->change_action_state = gtk_action_muxer_change_action_state;
-}
-
-static void
-gtk_action_muxer_class_init (GObjectClass *class)
-{
-  class->get_property = gtk_action_muxer_get_property;
-  class->set_property = gtk_action_muxer_set_property;
-  class->finalize = gtk_action_muxer_finalize;
-  class->dispose = gtk_action_muxer_dispose;
-
-  properties[PROP_PARENT] = g_param_spec_object ("parent", "Parent",
-                                                 "The parent muxer",
-                                                 GTK_TYPE_ACTION_MUXER,
-                                                 G_PARAM_READWRITE |
-                                                 G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (class, NUM_PROPERTIES, properties);
-}
-
-/**
- * gtk_action_muxer_insert:
- * @muxer: a #GtkActionMuxer
- * @prefix: the prefix string for the action group
- * @action_group: a #GActionGroup
- *
- * Adds the actions in @action_group to the list of actions provided by
- * @muxer.  @prefix is prefixed to each action name, such that for each
- * action <varname>x</varname> in @action_group, there is an equivalent
- * action @prefix<literal>.</literal><varname>x</varname> in @muxer.
- *
- * For example, if @prefix is "<literal>app</literal>" and @action_group
- * contains an action called "<literal>quit</literal>", then @muxer will
- * now contain an action called "<literal>app.quit</literal>".
- *
- * If any #GtkActionObservers are registered for actions in the group,
- * "action_added" notifications will be emitted, as appropriate.
- *
- * @prefix must not contain a dot ('.').
- */
-void
-gtk_action_muxer_insert (GtkActionMuxer *muxer,
-                         const gchar    *prefix,
-                         GActionGroup   *action_group)
-{
-  gchar **actions;
-  Group *group;
-  gint i;
-
-  /* TODO: diff instead of ripout and replace */
-  gtk_action_muxer_remove (muxer, prefix);
-
-  group = g_slice_new (Group);
-  group->muxer = muxer;
-  group->group = g_object_ref (action_group);
-  group->prefix = g_strdup (prefix);
-
-  g_hash_table_insert (muxer->groups, group->prefix, group);
-
-  actions = g_action_group_list_actions (group->group);
-  for (i = 0; actions[i]; i++)
-    gtk_action_muxer_action_added_to_group (group->group, actions[i], group);
-  g_strfreev (actions);
-
-  group->handler_ids[0] = g_signal_connect (group->group, "action-added",
-                                            G_CALLBACK (gtk_action_muxer_action_added_to_group), group);
-  group->handler_ids[1] = g_signal_connect (group->group, "action-removed",
-                                            G_CALLBACK (gtk_action_muxer_action_removed_from_group), group);
-  group->handler_ids[2] = g_signal_connect (group->group, "action-enabled-changed",
-                                            G_CALLBACK (gtk_action_muxer_group_action_enabled_changed), group);
-  group->handler_ids[3] = g_signal_connect (group->group, "action-state-changed",
-                                            G_CALLBACK (gtk_action_muxer_group_action_state_changed), group);
-}
-
-/**
- * gtk_action_muxer_remove:
- * @muxer: a #GtkActionMuxer
- * @prefix: the prefix of the action group to remove
- *
- * Removes a #GActionGroup from the #GtkActionMuxer.
- *
- * If any #GtkActionObservers are registered for actions in the group,
- * "action_removed" notifications will be emitted, as appropriate.
- */
-void
-gtk_action_muxer_remove (GtkActionMuxer *muxer,
-                         const gchar    *prefix)
-{
-  Group *group;
-
-  group = g_hash_table_lookup (muxer->groups, prefix);
-
-  if (group != NULL)
-    {
-      gchar **actions;
-      gint i;
-
-      g_hash_table_steal (muxer->groups, prefix);
-
-      actions = g_action_group_list_actions (group->group);
-      for (i = 0; actions[i]; i++)
-        gtk_action_muxer_action_removed_from_group (group->group, actions[i], group);
-      g_strfreev (actions);
-
-      gtk_action_muxer_free_group (group);
-    }
-}
-
-/**
- * gtk_action_muxer_new:
- *
- * Creates a new #GtkActionMuxer.
- */
-GtkActionMuxer *
-gtk_action_muxer_new (void)
-{
-  return g_object_new (GTK_TYPE_ACTION_MUXER, NULL);
-}
-
-/**
- * gtk_action_muxer_get_parent:
- * @muxer: a #GtkActionMuxer
- *
- * Returns: (transfer none): the parent of @muxer, or NULL.
- */
-GtkActionMuxer *
-gtk_action_muxer_get_parent (GtkActionMuxer *muxer)
-{
-  g_return_val_if_fail (GTK_IS_ACTION_MUXER (muxer), NULL);
-
-  return muxer->parent;
-}
-
-/**
- * gtk_action_muxer_set_parent:
- * @muxer: a #GtkActionMuxer
- * @parent: (allow-none): the new parent #GtkActionMuxer
- *
- * Sets the parent of @muxer to @parent.
- */
-void
-gtk_action_muxer_set_parent (GtkActionMuxer *muxer,
-                             GtkActionMuxer *parent)
-{
-  g_return_if_fail (GTK_IS_ACTION_MUXER (muxer));
-  g_return_if_fail (parent == NULL || GTK_IS_ACTION_MUXER (parent));
-
-  if (muxer->parent == parent)
-    return;
-
-  if (muxer->parent != NULL)
-    {
-      gchar **actions;
-      gchar **it;
-
-      actions = g_action_group_list_actions (G_ACTION_GROUP (muxer->parent));
-      for (it = actions; *it; it++)
-        gtk_action_muxer_action_removed (muxer, *it);
-      g_strfreev (actions);
-
-      g_signal_handlers_disconnect_by_func (muxer->parent, gtk_action_muxer_action_added_to_parent, muxer);
-      g_signal_handlers_disconnect_by_func (muxer->parent, gtk_action_muxer_action_removed_from_parent, muxer);
-      g_signal_handlers_disconnect_by_func (muxer->parent, gtk_action_muxer_parent_action_enabled_changed, muxer);
-      g_signal_handlers_disconnect_by_func (muxer->parent, gtk_action_muxer_parent_action_state_changed, muxer);
-
-      g_object_unref (muxer->parent);
-    }
-
-  muxer->parent = parent;
-
-  if (muxer->parent != NULL)
-    {
-      gchar **actions;
-      gchar **it;
-
-      g_object_ref (muxer->parent);
-
-      actions = g_action_group_list_actions (G_ACTION_GROUP (muxer->parent));
-      for (it = actions; *it; it++)
-        gtk_action_muxer_action_added (muxer, *it, G_ACTION_GROUP (muxer->parent), *it);
-      g_strfreev (actions);
-
-      g_signal_connect (muxer->parent, "action-added",
-                        G_CALLBACK (gtk_action_muxer_action_added_to_parent), muxer);
-      g_signal_connect (muxer->parent, "action-removed",
-                        G_CALLBACK (gtk_action_muxer_action_removed_from_parent), muxer);
-      g_signal_connect (muxer->parent, "action-enabled-changed",
-                        G_CALLBACK (gtk_action_muxer_parent_action_enabled_changed), muxer);
-      g_signal_connect (muxer->parent, "action-state-changed",
-                        G_CALLBACK (gtk_action_muxer_parent_action_state_changed), muxer);
-    }
-
-  g_object_notify_by_pspec (G_OBJECT (muxer), properties[PROP_PARENT]);
-}
--- a/src/gtkactionmuxer.h
+++ b/src/gtkactionmuxer.h
@ -1,52 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_ACTION_MUXER_H__
-#define __GTK_ACTION_MUXER_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION_MUXER                               (gtk_action_muxer_get_type ())
-#define GTK_ACTION_MUXER(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             GTK_TYPE_ACTION_MUXER, GtkActionMuxer))
-#define GTK_IS_ACTION_MUXER(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             GTK_TYPE_ACTION_MUXER))
-
-typedef struct _GtkActionMuxer                              GtkActionMuxer;
-
-GType                   gtk_action_muxer_get_type                       (void);
-GtkActionMuxer *        gtk_action_muxer_new                            (void);
-
-void                    gtk_action_muxer_insert                         (GtkActionMuxer *muxer,
-                                                                         const gchar    *prefix,
-                                                                         GActionGroup   *action_group);
-
-void                    gtk_action_muxer_remove                         (GtkActionMuxer *muxer,
-                                                                         const gchar    *prefix);
-
-GtkActionMuxer *        gtk_action_muxer_get_parent                     (GtkActionMuxer *muxer);
-
-void                    gtk_action_muxer_set_parent                     (GtkActionMuxer *muxer,
-                                                                         GtkActionMuxer *parent);
-
-G_END_DECLS
-
-#endif /* __GTK_ACTION_MUXER_H__ */
--- a/src/gtkactionobservable.c
+++ b/src/gtkactionobservable.c
@ -1,78 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#include "config.h"
-
-#include "gtkactionobservable.h"
-
-G_DEFINE_INTERFACE (GtkActionObservable, gtk_action_observable, G_TYPE_OBJECT)
-
-/*
- * SECTION:gtkactionobserable
- * @short_description: an interface implemented by objects that report
- *                     changes to actions
- */
-
-void
-gtk_action_observable_default_init (GtkActionObservableInterface *iface)
-{
-}
-
-/**
- * gtk_action_observable_register_observer:
- * @observable: a #GtkActionObservable
- * @action_name: the name of the action
- * @observer: the #GtkActionObserver to which the events will be reported
- *
- * Registers @observer as being interested in changes to @action_name on
- * @observable.
- */
-void
-gtk_action_observable_register_observer (GtkActionObservable *observable,
-                                         const gchar         *action_name,
-                                         GtkActionObserver   *observer)
-{
-  g_return_if_fail (GTK_IS_ACTION_OBSERVABLE (observable));
-
-  GTK_ACTION_OBSERVABLE_GET_IFACE (observable)
-    ->register_observer (observable, action_name, observer);
-}
-
-/**
- * gtk_action_observable_unregister_observer:
- * @observable: a #GtkActionObservable
- * @action_name: the name of the action
- * @observer: the #GtkActionObserver to which the events will be reported
- *
- * Removes the registration of @observer as being interested in changes
- * to @action_name on @observable.
- *
- * If the observer was registered multiple times, it must be
- * unregistered an equal number of times.
- */
-void
-gtk_action_observable_unregister_observer (GtkActionObservable *observable,
-                                           const gchar         *action_name,
-                                           GtkActionObserver   *observer)
-{
-  g_return_if_fail (GTK_IS_ACTION_OBSERVABLE (observable));
-
-  GTK_ACTION_OBSERVABLE_GET_IFACE (observable)
-    ->unregister_observer (observable, action_name, observer);
-}
--- a/src/gtkactionobservable.h
+++ b/src/gtkactionobservable.h
@ -1,60 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_ACTION_OBSERVABLE_H__
-#define __GTK_ACTION_OBSERVABLE_H__
-
-#include "gtkactionobserver.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION_OBSERVABLE                          (gtk_action_observable_get_type ())
-#define GTK_ACTION_OBSERVABLE(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             GTK_TYPE_ACTION_OBSERVABLE, GtkActionObservable))
-#define GTK_IS_ACTION_OBSERVABLE(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             GTK_TYPE_ACTION_OBSERVABLE))
-#define GTK_ACTION_OBSERVABLE_GET_IFACE(inst)               (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
-                                                             GTK_TYPE_ACTION_OBSERVABLE,                             \
-                                                             GtkActionObservableInterface))
-
-typedef struct _GtkActionObservableInterface                GtkActionObservableInterface;
-
-struct _GtkActionObservableInterface
-{
-  GTypeInterface g_iface;
-
-  void (* register_observer)   (GtkActionObservable *observable,
-                                const gchar         *action_name,
-                                GtkActionObserver   *observer);
-  void (* unregister_observer) (GtkActionObservable *observable,
-                                const gchar         *action_name,
-                                GtkActionObserver   *observer);
-};
-
-GType                   gtk_action_observable_get_type                  (void);
-void                    gtk_action_observable_register_observer         (GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         GtkActionObserver   *observer);
-void                    gtk_action_observable_unregister_observer       (GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         GtkActionObserver   *observer);
-
-G_END_DECLS
-
-#endif /* __GTK_ACTION_OBSERVABLE_H__ */
--- a/src/gtkactionobserver.h
+++ b/src/gtkactionobserver.h
@ -1,83 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_ACTION_OBSERVER_H__
-#define __GTK_ACTION_OBSERVER_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION_OBSERVER                            (gtk_action_observer_get_type ())
-#define GTK_ACTION_OBSERVER(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             GTK_TYPE_ACTION_OBSERVER, GtkActionObserver))
-#define GTK_IS_ACTION_OBSERVER(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             GTK_TYPE_ACTION_OBSERVER))
-#define GTK_ACTION_OBSERVER_GET_IFACE(inst)                 (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
-                                                             GTK_TYPE_ACTION_OBSERVER, GtkActionObserverInterface))
-
-typedef struct _GtkActionObserverInterface                  GtkActionObserverInterface;
-typedef struct _GtkActionObservable                         GtkActionObservable;
-typedef struct _GtkActionObserver                           GtkActionObserver;
-
-struct _GtkActionObserverInterface
-{
-  GTypeInterface g_iface;
-
-  void (* action_added)           (GtkActionObserver    *observer,
-                                   GtkActionObservable  *observable,
-                                   const gchar          *action_name,
-                                   const GVariantType   *parameter_type,
-                                   gboolean              enabled,
-                                   GVariant             *state);
-  void (* action_enabled_changed) (GtkActionObserver    *observer,
-                                   GtkActionObservable  *observable,
-                                   const gchar          *action_name,
-                                   gboolean              enabled);
-  void (* action_state_changed)   (GtkActionObserver    *observer,
-                                   GtkActionObservable  *observable,
-                                   const gchar          *action_name,
-                                   GVariant             *state);
-  void (* action_removed)         (GtkActionObserver    *observer,
-                                   GtkActionObservable  *observable,
-                                   const gchar          *action_name);
-};
-
-GType                   gtk_action_observer_get_type                    (void);
-void                    gtk_action_observer_action_added                (GtkActionObserver   *observer,
-                                                                         GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         const GVariantType  *parameter_type,
-                                                                         gboolean             enabled,
-                                                                         GVariant            *state);
-void                    gtk_action_observer_action_enabled_changed      (GtkActionObserver   *observer,
-                                                                         GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         gboolean             enabled);
-void                    gtk_action_observer_action_state_changed        (GtkActionObserver   *observer,
-                                                                         GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         GVariant            *state);
-void                    gtk_action_observer_action_removed              (GtkActionObserver   *observer,
-                                                                         GtkActionObservable *observable,
-                                                                         const gchar         *action_name);
-
-G_END_DECLS
-
-#endif /* __GTK_ACTION_OBSERVER_H__ */
--- a/src/gtkmenutracker.c
+++ b/src/gtkmenutracker.c
@ -1,495 +0,0 @@
-/*
- * Copyright © 2013 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#include "config.h"
-
-#include "gtkmenutracker.h"
-
-/**
- * SECTION:gtkmenutracker
- * @Title: GtkMenuTracker
- * @Short_description: A helper class for interpreting #GMenuModel
- *
- * #GtkMenuTracker is a simple object to ease implementations of #GMenuModel.
- * Given a #GtkActionObservable (usually a #GActionMuxer) along with a
- * #GMenuModel, it will tell you which menu items to create and where to place
- * them. If a menu item is removed, it will tell you the position of the menu
- * item to remove.
- *
- * Using #GtkMenuTracker is fairly simple. The only guarantee you must make
- * to #GtkMenuTracker is that you must obey all insert signals and track the
- * position of items that #GtkMenuTracker gives you. That is, #GtkMenuTracker
- * expects positions of all the latter items to change when it calls your
- * insertion callback with an early position, as it may ask you to remove
- * an item with a readjusted position later.
- *
- * #GtkMenuTracker will give you a #GtkMenuTrackerItem in your callback. You
- * must hold onto this object until a remove signal is emitted. This item
- * represents a single menu item, which can be one of three classes: normal item,
- * separator, or submenu.
- *
- * Certain properties on the #GtkMenuTrackerItem are mutable, and you must
- * listen for changes in the item. For more details, see the documentation
- * for #GtkMenuTrackerItem along with https://live.gnome.org/GApplication/GMenuModel.
- *
- * The idea of @with_separators is for special cases where menu models may
- * be tracked in places where separators are not available, like in toplevel
- * "File", "Edit" menu bars. Ignoring separator items is wrong, as #GtkMenuTracker
- * expects the position to change, so we must tell #GtkMenuTracker to ignore
- * separators itself.
- */
-
-typedef struct _GtkMenuTrackerSection GtkMenuTrackerSection;
-
-struct _GtkMenuTracker
-{
-  GtkActionObservable      *observable;
-  GtkMenuTrackerInsertFunc  insert_func;
-  GtkMenuTrackerRemoveFunc  remove_func;
-  gpointer                  user_data;
-
-  GtkMenuTrackerSection    *toplevel;
-};
-
-struct _GtkMenuTrackerSection
-{
-  GMenuModel *model;
-  GSList     *items;
-  gchar      *action_namespace;
-
-  guint       with_separators : 1;
-  guint       has_separator   : 1;
-
-  gulong      handler;
-};
-
-static GtkMenuTrackerSection *  gtk_menu_tracker_section_new    (GtkMenuTracker        *tracker,
-                                                                 GMenuModel            *model,
-                                                                 gboolean               with_separators,
-                                                                 gint                   offset,
-                                                                 const gchar           *action_namespace);
-static void                    gtk_menu_tracker_section_free    (GtkMenuTrackerSection *section);
-
-static GtkMenuTrackerSection *
-gtk_menu_tracker_section_find_model (GtkMenuTrackerSection *section,
-                                     GMenuModel            *model,
-                                     gint                  *offset)
-{
-  GSList *item;
-
-  if (section->has_separator)
-    (*offset)++;
-
-  if (section->model == model)
-    return section;
-
-  for (item = section->items; item; item = item->next)
-    {
-      GtkMenuTrackerSection *subsection = item->data;
-
-      if (subsection)
-        {
-          GtkMenuTrackerSection *found_section;
-
-          found_section = gtk_menu_tracker_section_find_model (subsection, model, offset);
-
-          if (found_section)
-            return found_section;
-        }
-      else
-        (*offset)++;
-    }
-
-  return FALSE;
-}
-
-/* this is responsible for syncing the showing of a separator for a
- * single subsection (and its children).
- *
- * we only ever show separators if we have _actual_ children (ie: we do
- * not show a separator if the section contains only empty child
- * sections).  it's difficult to determine this on-the-fly, so we have
- * this separate function to come back later and figure it out.
- *
- * 'section' is that section.
- *
- * 'tracker' is passed in so that we can emit callbacks when we decide
- * to add/remove separators.
- *
- * 'offset' is passed in so we know which position to emit in our
- * callbacks.  ie: if we add a separator right at the top of this
- * section then we would emit it with this offset.  deeper inside, we
- * adjust accordingly.
- *
- * could_have_separator is true in two situations:
- *
- *  - our parent section had with_separators defined and we are not the
- *    first section (ie: we should add a separator if we have content in
- *    order to divide us from the items above)
- *
- *  - if we had a 'label' attribute set for this section
- *
- * parent_model and parent_index are passed in so that we can give them
- * to the insertion callback so that it can see the label (and anything
- * else that happens to be defined on the section).
- *
- * we iterate each item in ourselves.  for subsections, we recursively
- * run ourselves to sync separators.  after we are done, we notice if we
- * have any items in us or if we are completely empty and sync if our
- * separator is shown or not.
- */
-static gint
-gtk_menu_tracker_section_sync_separators (GtkMenuTrackerSection *section,
-                                          GtkMenuTracker        *tracker,
-                                          gint                   offset,
-                                          gboolean               could_have_separator,
-                                          GMenuModel            *parent_model,
-                                          gint                   parent_index)
-{
-  gboolean should_have_separator;
-  gint n_items = 0;
-  GSList *item;
-  gint i = 0;
-
-  for (item = section->items; item; item = item->next)
-    {
-      GtkMenuTrackerSection *subsection = item->data;
-
-      if (subsection)
-        {
-          gboolean could_have_separator;
-
-          could_have_separator = (section->with_separators && i > 0) ||
-                                 g_menu_model_get_item_attribute (section->model, i, "label", "s", NULL);
-
-          n_items += gtk_menu_tracker_section_sync_separators (subsection, tracker, offset + n_items,
-                                                               could_have_separator, section->model, i);
-        }
-      else
-        n_items++;
-
-      i++;
-    }
-
-  should_have_separator = could_have_separator && n_items != 0;
-
-  if (should_have_separator > section->has_separator)
-    {
-      /* Add a separator */
-      GtkMenuTrackerItem *item;
-
-      item = _gtk_menu_tracker_item_new (tracker->observable, parent_model, parent_index, NULL, TRUE);
-      (* tracker->insert_func) (item, offset, tracker->user_data);
-      g_object_unref (item);
-
-      section->has_separator = TRUE;
-    }
-  else if (should_have_separator < section->has_separator)
-    {
-      /* Remove a separator */
-      (* tracker->remove_func) (offset, tracker->user_data);
-      section->has_separator = FALSE;
-    }
-
-  n_items += section->has_separator;
-
-  return n_items;
-}
-
-static gint
-gtk_menu_tracker_section_measure (GtkMenuTrackerSection *section)
-{
-  GSList *item;
-  gint n_items;
-
-  if (section == NULL)
-    return 1;
-
-  n_items = 0;
-
-  if (section->has_separator)
-    n_items++;
-
-  for (item = section->items; item; item = item->next)
-    n_items += gtk_menu_tracker_section_measure (item->data);
-
-  return n_items;
-}
-
-static void
-gtk_menu_tracker_remove_items (GtkMenuTracker  *tracker,
-                               GSList         **change_point,
-                               gint             offset,
-                               gint             n_items)
-{
-  gint i;
-
-  for (i = 0; i < n_items; i++)
-    {
-      GtkMenuTrackerSection *subsection;
-      gint n;
-
-      subsection = (*change_point)->data;
-      *change_point = g_slist_delete_link (*change_point, *change_point);
-
-      n = gtk_menu_tracker_section_measure (subsection);
-      gtk_menu_tracker_section_free (subsection);
-
-      while (n--)
-        (* tracker->remove_func) (offset, tracker->user_data);
-    }
-}
-
-static void
-gtk_menu_tracker_add_items (GtkMenuTracker         *tracker,
-                            GtkMenuTrackerSection  *section,
-                            GSList                **change_point,
-                            gint                    offset,
-                            GMenuModel             *model,
-                            gint                    position,
-                            gint                    n_items)
-{
-  while (n_items--)
-    {
-      GMenuModel *submenu;
-
-      submenu = g_menu_model_get_item_link (model, position + n_items, G_MENU_LINK_SECTION);
-      g_assert (submenu != model);
-      if (submenu != NULL)
-        {
-          GtkMenuTrackerSection *subsection;
-          gchar *action_namespace = NULL;
-
-          g_menu_model_get_item_attribute (model, position + n_items,
-                                           G_MENU_ATTRIBUTE_ACTION_NAMESPACE, "s", &action_namespace);
-
-          if (section->action_namespace)
-            {
-              gchar *namespace;
-
-              namespace = g_strjoin (".", section->action_namespace, action_namespace, NULL);
-              subsection = gtk_menu_tracker_section_new (tracker, submenu, FALSE, offset, namespace);
-              g_free (namespace);
-            }
-          else
-            subsection = gtk_menu_tracker_section_new (tracker, submenu, FALSE, offset, section->action_namespace);
-
-          *change_point = g_slist_prepend (*change_point, subsection);
-          g_free (action_namespace);
-          g_object_unref (submenu);
-        }
-      else
-        {
-          GtkMenuTrackerItem *item;
-
-          item = _gtk_menu_tracker_item_new (tracker->observable, model, position + n_items,
-                                             section->action_namespace, FALSE);
-          (* tracker->insert_func) (item, offset, tracker->user_data);
-          g_object_unref (item);
-
-          *change_point = g_slist_prepend (*change_point, NULL);
-        }
-    }
-}
-
-static void
-gtk_menu_tracker_model_changed (GMenuModel *model,
-                                gint        position,
-                                gint        removed,
-                                gint        added,
-                                gpointer    user_data)
-{
-  GtkMenuTracker *tracker = user_data;
-  GtkMenuTrackerSection *section;
-  GSList **change_point;
-  gint offset = 0;
-  gint i;
-
-  /* First find which section the changed model corresponds to, and the
-   * position of that section within the overall menu.
-   */
-  section = gtk_menu_tracker_section_find_model (tracker->toplevel, model, &offset);
-
-  /* Next, seek through that section to the change point.  This gives us
-   * the correct GSList** to make the change to and also finds the final
-   * offset at which we will make the changes (by measuring the number
-   * of items within each item of the section before the change point).
-   */
-  change_point = &section->items;
-  for (i = 0; i < position; i++)
-    {
-      offset += gtk_menu_tracker_section_measure ((*change_point)->data);
-      change_point = &(*change_point)->next;
-    }
-
-  /* We remove items in order and add items in reverse order.  This
-   * means that the offset used for all inserts and removes caused by a
-   * single change will be the same.
-   *
-   * This also has a performance advantage: GtkMenuShell stores the
-   * menu items in a linked list.  In the case where we are creating a
-   * menu for the first time, adding the items in reverse order means
-   * that we only ever insert at index zero, prepending the list.  This
-   * means that we can populate in O(n) time instead of O(n^2) that we
-   * would do by appending.
-   */
-  gtk_menu_tracker_remove_items (tracker, change_point, offset, removed);
-  gtk_menu_tracker_add_items (tracker, section, change_point, offset, model, position, added);
-
-  /* The offsets for insertion/removal of separators will be all over
-   * the place, however...
-   */
-  gtk_menu_tracker_section_sync_separators (tracker->toplevel, tracker, 0, FALSE, NULL, 0);
-}
-
-static void
-gtk_menu_tracker_section_free (GtkMenuTrackerSection *section)
-{
-  if (section == NULL)
-    return;
-
-  g_signal_handler_disconnect (section->model, section->handler);
-  g_slist_free_full (section->items, (GDestroyNotify) gtk_menu_tracker_section_free);
-  g_free (section->action_namespace);
-  g_object_unref (section->model);
-  g_slice_free (GtkMenuTrackerSection, section);
-}
-
-static GtkMenuTrackerSection *
-gtk_menu_tracker_section_new (GtkMenuTracker *tracker,
-                              GMenuModel     *model,
-                              gboolean        with_separators,
-                              gint            offset,
-                              const gchar    *action_namespace)
-{
-  GtkMenuTrackerSection *section;
-
-  section = g_slice_new0 (GtkMenuTrackerSection);
-  section->model = g_object_ref (model);
-  section->with_separators = with_separators;
-  section->action_namespace = g_strdup (action_namespace);
-
-  gtk_menu_tracker_add_items (tracker, section, &section->items, offset, model, 0, g_menu_model_get_n_items (model));
-  section->handler = g_signal_connect (model, "items-changed", G_CALLBACK (gtk_menu_tracker_model_changed), tracker);
-
-  return section;
-}
-
-/*< private >
- * gtk_menu_tracker_new:
- * @model: the model to flatten
- * @with_separators: if the toplevel should have separators (ie: TRUE
- *   for menus, FALSE for menubars)
- * @action_namespace: the passed-in action namespace
- * @insert_func: insert callback
- * @remove_func: remove callback
- * @user_data user data for callbacks
- *
- * Creates a GtkMenuTracker for @model, holding a ref on @model for as
- * long as the tracker is alive.
- *
- * This flattens out the model, merging sections and inserting
- * separators where appropriate.  It monitors for changes and performs
- * updates on the fly.  It also handles action_namespace for subsections
- * (but you will need to handle it yourself for submenus).
- *
- * When the tracker is first created, @insert_func will be called many
- * times to populate the menu with the initial contents of @model
- * (unless it is empty), before gtk_menu_tracker_new() returns.  For
- * this reason, the menu that is using the tracker ought to be empty
- * when it creates the tracker.
- *
- * Future changes to @model will result in more calls to @insert_func
- * and @remove_func.
- *
- * The position argument to both functions is the linear 0-based
- * position in the menu at which the item in question should be inserted
- * or removed.
- *
- * For @insert_func, @model and @item_index are used to get the
- * information about the menu item to insert.  @action_namespace is the
- * action namespace that actions referred to from that item should place
- * themselves in.  Note that if the item is a submenu and the
- * "action-namespace" attribute is defined on the item, it will _not_ be
- * applied to the @action_namespace argument as it is meant for the
- * items inside of the submenu, not the submenu item itself.
- *
- * @is_separator is set to %TRUE in case the item being added is a
- * separator.  @model and @item_index will still be meaningfully set in
- * this case -- to the section menu item corresponding to the separator.
- * This is useful if the section specifies a label, for example.  If
- * there is an "action-namespace" attribute on this menu item then it
- * should be ignored by the consumer because #GtkMenuTracker has already
- * handled it.
- *
- * When using #GtkMenuTracker there is no need to hold onto @model or
- * monitor it for changes.  The model will be unreffed when
- * gtk_menu_tracker_free() is called.
- */
-GtkMenuTracker *
-gtk_menu_tracker_new (GtkActionObservable      *observable,
-                      GMenuModel               *model,
-                      gboolean                  with_separators,
-                      const gchar              *action_namespace,
-                      GtkMenuTrackerInsertFunc  insert_func,
-                      GtkMenuTrackerRemoveFunc  remove_func,
-                      gpointer                  user_data)
-{
-  GtkMenuTracker *tracker;
-
-  tracker = g_slice_new (GtkMenuTracker);
-  tracker->observable = g_object_ref (observable);
-  tracker->insert_func = insert_func;
-  tracker->remove_func = remove_func;
-  tracker->user_data = user_data;
-
-  tracker->toplevel = gtk_menu_tracker_section_new (tracker, model, with_separators, 0, action_namespace);
-  gtk_menu_tracker_section_sync_separators (tracker->toplevel, tracker, 0, FALSE, NULL, 0);
-
-  return tracker;
-}
-
-GtkMenuTracker *
-gtk_menu_tracker_new_for_item_submenu (GtkMenuTrackerItem       *item,
-                                       GtkMenuTrackerInsertFunc  insert_func,
-                                       GtkMenuTrackerRemoveFunc  remove_func,
-                                       gpointer                  user_data)
-{
-  return gtk_menu_tracker_new (_gtk_menu_tracker_item_get_observable (item),
-                               _gtk_menu_tracker_item_get_submenu (item),
-                               TRUE,
-                               _gtk_menu_tracker_item_get_submenu_namespace (item),
-                               insert_func, remove_func, user_data);
-}
-
-/*< private >
- * gtk_menu_tracker_free:
- * @tracker: a #GtkMenuTracker
- *
- * Frees the tracker, ...
- */
-void
-gtk_menu_tracker_free (GtkMenuTracker *tracker)
-{
-  gtk_menu_tracker_section_free (tracker->toplevel);
-  g_object_unref (tracker->observable);
-  g_slice_free (GtkMenuTracker, tracker);
-}
--- a/src/gtkmenutracker.h
+++ b/src/gtkmenutracker.h
@ -1,52 +0,0 @@
-/*
- * Copyright © 2013 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MENU_TRACKER_H__
-#define __GTK_MENU_TRACKER_H__
-
-#include "gtkmenutrackeritem.h"
-
-typedef struct _GtkMenuTracker GtkMenuTracker;
-
-typedef void         (* GtkMenuTrackerInsertFunc)                       (GtkMenuTrackerItem       *item,
-                                                                         gint                      position,
-                                                                         gpointer                  user_data);
-
-typedef void         (* GtkMenuTrackerRemoveFunc)                       (gint                      position,
-                                                                         gpointer                  user_data);
-
-
-GtkMenuTracker *        gtk_menu_tracker_new                            (GtkActionObservable      *observer,
-                                                                         GMenuModel               *model,
-                                                                         gboolean                  with_separators,
-                                                                         const gchar              *action_namespace,
-                                                                         GtkMenuTrackerInsertFunc  insert_func,
-                                                                         GtkMenuTrackerRemoveFunc  remove_func,
-                                                                         gpointer                  user_data);
-
-GtkMenuTracker *        gtk_menu_tracker_new_for_item_submenu           (GtkMenuTrackerItem       *item,
-                                                                         GtkMenuTrackerInsertFunc  insert_func,
-                                                                         GtkMenuTrackerRemoveFunc  remove_func,
-                                                                         gpointer                  user_data);
-
-void                    gtk_menu_tracker_free                           (GtkMenuTracker           *tracker);
-
-#endif /* __GTK_MENU_TRACKER_H__ */
--- a/src/gtkmenutrackeritem.c
+++ b/src/gtkmenutrackeritem.c
@ -1,788 +0,0 @@
-/*
- * Copyright © 2013 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#include "config.h"
-
-#include "gtkmenutrackeritem.h"
-
-/**
- * SECTION:gtkmenutrackeritem
- * @Title: GtkMenuTrackerItem
- * @Short_description: Small helper for model menu items
- *
- * A #GtkMenuTrackerItem is a small helper class used by #GtkMenuTracker to
- * represent menu items. It has one of three classes: normal item, separator,
- * or submenu.
- *
- * If an item is one of the non-normal classes (submenu, separator), only the
- * label of the item needs to be respected. Otherwise, all the properties
- * of the item contribute to the item's appearance and state.
- *
- * Implementing the appearance of the menu item is up to toolkits, and certain
- * toolkits may choose to ignore certain properties, like icon or accel. The
- * role of the item determines its accessibility role, along with its
- * decoration if the GtkMenuTrackerItem::toggled property is true. As an
- * example, if the item has the role %GTK_MENU_TRACKER_ITEM_ROLE_CHECK and
- * GtkMenuTrackerItem::toggled is %FALSE, its accessible role should be that of
- * a check menu item, and no decoration should be drawn. But if
- * GtkMenuTrackerItem::toggled is %TRUE, a checkmark should be drawn.
- *
- * All properties except for the two class-determining properties,
- * GtkMenuTrackerItem::is-separator and GtkMenuTrackerItem::has-submenu are
- * allowed to change, so listen to the notify signals to update your item's
- * appearance. When using a GObject library, this can conveniently be done
- * with g_object_bind_property() and #GBinding, and this is how this is
- * implemented in GTK+; the appearance side is implemented in #GtkModelMenuItem.
- *
- * When an item is clicked, simply call gtk_menu_tracker_item_activated() in
- * response. The #GtkMenuTrackerItem will take care of everything related to
- * activating the item and will itself update the state of all items in
- * response.
- *
- * Submenus are a special case of menu item. When an item is a submenu, you
- * should create a submenu for it with gtk_menu_tracker_new_item_for_submenu(),
- * and apply the same menu tracking logic you would for a toplevel menu.
- * Applications using submenus may want to lazily build their submenus in
- * response to the user clicking on it, as building a submenu may be expensive.
- *
- * Thus, the submenu has two special controls -- the submenu's visibility
- * should be controlled by the GtkMenuTrackerItem::submenu-shown property,
- * and if a user clicks on the submenu, do not immediately show the menu,
- * but call gtk_menu_tracker_item_request_submenu_shown() and wait for the
- * GtkMenuTrackerItem::submenu-shown property to update. If the user navigates,
- * the application may want to be notified so it can cancel the expensive
- * operation that it was using to build the submenu. Thus,
- * gtk_menu_tracker_item_request_submenu_shown() takes a boolean parameter.
- * Use %TRUE when the user wants to open the submenu, and %FALSE when the
- * user wants to close the submenu.
- */
-
-typedef GObjectClass GtkMenuTrackerItemClass;
-
-struct _GtkMenuTrackerItem
-{
-  GObject parent_instance;
-
-  GtkActionObservable *observable;
-  gchar *action_namespace;
-  GMenuItem *item;
-  GtkMenuTrackerItemRole role : 4;
-  guint is_separator : 1;
-  guint can_activate : 1;
-  guint sensitive : 1;
-  guint toggled : 1;
-  guint submenu_shown : 1;
-  guint submenu_requested : 1;
-};
-
-enum {
-  PROP_0,
-  PROP_IS_SEPARATOR,
-  PROP_HAS_SUBMENU,
-  PROP_LABEL,
-  PROP_ICON,
-  PROP_SENSITIVE,
-  PROP_VISIBLE,
-  PROP_ROLE,
-  PROP_TOGGLED,
-  PROP_ACCEL,
-  PROP_SUBMENU_SHOWN,
-  N_PROPS
-};
-
-static GParamSpec *gtk_menu_tracker_item_pspecs[N_PROPS];
-
-static void gtk_menu_tracker_item_init_observer_iface (GtkActionObserverInterface *iface);
-G_DEFINE_TYPE_WITH_CODE (GtkMenuTrackerItem, gtk_menu_tracker_item, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTION_OBSERVER, gtk_menu_tracker_item_init_observer_iface))
-
-GType
-gtk_menu_tracker_item_role_get_type (void)
-{
-  static gsize gtk_menu_tracker_item_role_type;
-
-  if (g_once_init_enter (&gtk_menu_tracker_item_role_type))
-    {
-      static const GEnumValue values[] = {
-        { GTK_MENU_TRACKER_ITEM_ROLE_NORMAL, "GTK_MENU_TRACKER_ITEM_ROLE_NORMAL", "normal" },
-        { GTK_MENU_TRACKER_ITEM_ROLE_CHECK, "GTK_MENU_TRACKER_ITEM_ROLE_CHECK", "check" },
-        { GTK_MENU_TRACKER_ITEM_ROLE_RADIO, "GTK_MENU_TRACKER_ITEM_ROLE_RADIO", "radio" },
-        { 0, NULL, NULL }
-      };
-      GType type;
-
-      type = g_enum_register_static ("GtkMenuTrackerItemRole", values);
-
-      g_once_init_leave (&gtk_menu_tracker_item_role_type, type);
-    }
-
-  return gtk_menu_tracker_item_role_type;
-}
-
-static void
-gtk_menu_tracker_item_get_property (GObject    *object,
-                                    guint       prop_id,
-                                    GValue     *value,
-                                    GParamSpec *pspec)
-{
-  GtkMenuTrackerItem *self = GTK_MENU_TRACKER_ITEM (object);
-
-  switch (prop_id)
-    {
-    case PROP_IS_SEPARATOR:
-      g_value_set_boolean (value, gtk_menu_tracker_item_get_is_separator (self));
-      break;
-    case PROP_HAS_SUBMENU:
-      g_value_set_boolean (value, gtk_menu_tracker_item_get_has_submenu (self));
-      break;
-    case PROP_LABEL:
-      g_value_set_string (value, gtk_menu_tracker_item_get_label (self));
-      break;
-    case PROP_ICON:
-      g_value_set_object (value, gtk_menu_tracker_item_get_icon (self));
-      break;
-    case PROP_SENSITIVE:
-      g_value_set_boolean (value, gtk_menu_tracker_item_get_sensitive (self));
-      break;
-    case PROP_VISIBLE:
-      g_value_set_boolean (value, gtk_menu_tracker_item_get_visible (self));
-      break;
-    case PROP_ROLE:
-      g_value_set_enum (value, gtk_menu_tracker_item_get_role (self));
-      break;
-    case PROP_TOGGLED:
-      g_value_set_boolean (value, gtk_menu_tracker_item_get_toggled (self));
-      break;
-    case PROP_ACCEL:
-      g_value_set_string (value, gtk_menu_tracker_item_get_accel (self));
-      break;
-    case PROP_SUBMENU_SHOWN:
-      g_value_set_boolean (value, gtk_menu_tracker_item_get_submenu_shown (self));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gtk_menu_tracker_item_finalize (GObject *object)
-{
-  GtkMenuTrackerItem *self = GTK_MENU_TRACKER_ITEM (object);
-
-  g_free (self->action_namespace);
-
-  if (self->observable)
-    g_object_unref (self->observable);
-
-  g_object_unref (self->item);
-
-  G_OBJECT_CLASS (gtk_menu_tracker_item_parent_class)->finalize (object);
-}
-
-static void
-gtk_menu_tracker_item_init (GtkMenuTrackerItem * self)
-{
-}
-
-static void
-gtk_menu_tracker_item_class_init (GtkMenuTrackerItemClass *class)
-{
-  class->get_property = gtk_menu_tracker_item_get_property;
-  class->finalize = gtk_menu_tracker_item_finalize;
-
-  gtk_menu_tracker_item_pspecs[PROP_IS_SEPARATOR] =
-    g_param_spec_boolean ("is-separator", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
-  gtk_menu_tracker_item_pspecs[PROP_HAS_SUBMENU] =
-    g_param_spec_boolean ("has-submenu", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
-  gtk_menu_tracker_item_pspecs[PROP_LABEL] =
-    g_param_spec_string ("label", "", "", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
-  gtk_menu_tracker_item_pspecs[PROP_ICON] =
-    g_param_spec_object ("icon", "", "", G_TYPE_ICON, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
-  gtk_menu_tracker_item_pspecs[PROP_SENSITIVE] =
-    g_param_spec_boolean ("sensitive", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
-  gtk_menu_tracker_item_pspecs[PROP_VISIBLE] =
-    g_param_spec_boolean ("visible", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
-  gtk_menu_tracker_item_pspecs[PROP_ROLE] =
-    g_param_spec_enum ("role", "", "",
-                       GTK_TYPE_MENU_TRACKER_ITEM_ROLE, GTK_MENU_TRACKER_ITEM_ROLE_NORMAL,
-                       G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
-  gtk_menu_tracker_item_pspecs[PROP_TOGGLED] =
-    g_param_spec_boolean ("toggled", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
-  gtk_menu_tracker_item_pspecs[PROP_ACCEL] =
-    g_param_spec_string ("accel", "", "", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
-  gtk_menu_tracker_item_pspecs[PROP_SUBMENU_SHOWN] =
-    g_param_spec_boolean ("submenu-shown", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
-
-  g_object_class_install_properties (class, N_PROPS, gtk_menu_tracker_item_pspecs);
-}
-
-static void
-gtk_menu_tracker_item_action_added (GtkActionObserver   *observer,
-                                    GtkActionObservable *observable,
-                                    const gchar         *action_name,
-                                    const GVariantType  *parameter_type,
-                                    gboolean             enabled,
-                                    GVariant            *state)
-{
-  GtkMenuTrackerItem *self = GTK_MENU_TRACKER_ITEM (observer);
-  GVariant *action_target;
-
-  action_target = g_menu_item_get_attribute_value (self->item, G_MENU_ATTRIBUTE_TARGET, NULL);
-
-  self->can_activate = (action_target == NULL && parameter_type == NULL) ||
-                        (action_target != NULL && parameter_type != NULL &&
-                        g_variant_is_of_type (action_target, parameter_type));
-
-  if (!self->can_activate)
-    {
-      if (action_target)
-        g_variant_unref (action_target);
-      return;
-    }
-
-  self->sensitive = enabled;
-
-  if (action_target != NULL && state != NULL)
-    {
-      self->toggled = g_variant_equal (state, action_target);
-      self->role = GTK_MENU_TRACKER_ITEM_ROLE_RADIO;
-    }
-
-  else if (state != NULL && g_variant_is_of_type (state, G_VARIANT_TYPE_BOOLEAN))
-    {
-      self->toggled = g_variant_get_boolean (state);
-      self->role = GTK_MENU_TRACKER_ITEM_ROLE_CHECK;
-    }
-
-  g_object_freeze_notify (G_OBJECT (self));
-
-  if (self->sensitive)
-    g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_SENSITIVE]);
-
-  if (self->toggled)
-    g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_TOGGLED]);
-
-  if (self->role != GTK_MENU_TRACKER_ITEM_ROLE_NORMAL)
-    g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_ROLE]);
-
-  g_object_thaw_notify (G_OBJECT (self));
-
-  if (action_target)
-    g_variant_unref (action_target);
-}
-
-static void
-gtk_menu_tracker_item_action_enabled_changed (GtkActionObserver   *observer,
-                                              GtkActionObservable *observable,
-                                              const gchar         *action_name,
-                                              gboolean             enabled)
-{
-  GtkMenuTrackerItem *self = GTK_MENU_TRACKER_ITEM (observer);
-
-  if (!self->can_activate)
-    return;
-
-  if (self->sensitive == enabled)
-    return;
-
-  self->sensitive = enabled;
-
-  g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_SENSITIVE]);
-}
-
-static void
-gtk_menu_tracker_item_action_state_changed (GtkActionObserver   *observer,
-                                            GtkActionObservable *observable,
-                                            const gchar         *action_name,
-                                            GVariant            *state)
-{
-  GtkMenuTrackerItem *self = GTK_MENU_TRACKER_ITEM (observer);
-  GVariant *action_target;
-  gboolean was_toggled;
-
-  if (!self->can_activate)
-    return;
-
-  action_target = g_menu_item_get_attribute_value (self->item, G_MENU_ATTRIBUTE_TARGET, NULL);
-  was_toggled = self->toggled;
-
-  if (action_target)
-    {
-      self->toggled = g_variant_equal (state, action_target);
-      g_variant_unref (action_target);
-    }
-
-  else if (g_variant_is_of_type (state, G_VARIANT_TYPE_BOOLEAN))
-    self->toggled = g_variant_get_boolean (state);
-
-  else
-    self->toggled = FALSE;
-
-  if (self->toggled != was_toggled)
-    g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_TOGGLED]);
-}
-
-static void
-gtk_menu_tracker_item_action_removed (GtkActionObserver   *observer,
-                                      GtkActionObservable *observable,
-                                      const gchar         *action_name)
-{
-  GtkMenuTrackerItem *self = GTK_MENU_TRACKER_ITEM (observer);
-
-  if (!self->can_activate)
-    return;
-
-  g_object_freeze_notify (G_OBJECT (self));
-
-  if (self->sensitive)
-    {
-      self->sensitive = FALSE;
-      g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_SENSITIVE]);
-    }
-
-  if (self->toggled)
-    {
-      self->toggled = FALSE;
-      g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_TOGGLED]);
-    }
-
-  if (self->role != GTK_MENU_TRACKER_ITEM_ROLE_NORMAL)
-    {
-      self->role = GTK_MENU_TRACKER_ITEM_ROLE_NORMAL;
-      g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_ROLE]);
-    }
-
-  g_object_thaw_notify (G_OBJECT (self));
-}
-
-static void
-gtk_menu_tracker_item_init_observer_iface (GtkActionObserverInterface *iface)
-{
-  iface->action_added = gtk_menu_tracker_item_action_added;
-  iface->action_enabled_changed = gtk_menu_tracker_item_action_enabled_changed;
-  iface->action_state_changed = gtk_menu_tracker_item_action_state_changed;
-  iface->action_removed = gtk_menu_tracker_item_action_removed;
-}
-
-GtkMenuTrackerItem *
-_gtk_menu_tracker_item_new (GtkActionObservable *observable,
-                            GMenuModel          *model,
-                            gint                 item_index,
-                            const gchar         *action_namespace,
-                            gboolean             is_separator)
-{
-  GtkMenuTrackerItem *self;
-  const gchar *action_name;
-
-  g_return_val_if_fail (GTK_IS_ACTION_OBSERVABLE (observable), NULL);
-  g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
-
-  self = g_object_new (GTK_TYPE_MENU_TRACKER_ITEM, NULL);
-  self->item = g_menu_item_new_from_model (model, item_index);
-  self->action_namespace = g_strdup (action_namespace);
-  self->observable = g_object_ref (observable);
-  self->is_separator = is_separator;
-
-  if (!is_separator && g_menu_item_get_attribute (self->item, "action", "&s", &action_name))
-    {
-      GActionGroup *group = G_ACTION_GROUP (observable);
-      const GVariantType *parameter_type;
-      gboolean enabled;
-      GVariant *state;
-      gboolean found;
-
-      state = NULL;
-
-      if (action_namespace)
-        {
-          gchar *full_action;
-
-          full_action = g_strjoin (".", action_namespace, action_name, NULL);
-          gtk_action_observable_register_observer (self->observable, full_action, GTK_ACTION_OBSERVER (self));
-          found = g_action_group_query_action (group, full_action, &enabled, &parameter_type, NULL, NULL, &state);
-          g_free (full_action);
-        }
-      else
-        {
-          gtk_action_observable_register_observer (self->observable, action_name, GTK_ACTION_OBSERVER (self));
-          found = g_action_group_query_action (group, action_name, &enabled, &parameter_type, NULL, NULL, &state);
-        }
-
-      if (found)
-        gtk_menu_tracker_item_action_added (GTK_ACTION_OBSERVER (self), observable, NULL, parameter_type, enabled, state);
-      else
-        gtk_menu_tracker_item_action_removed (GTK_ACTION_OBSERVER (self), observable, NULL);
-
-      if (state)
-        g_variant_unref (state);
-    }
-  else
-    self->sensitive = TRUE;
-
-  return self;
-}
-
-GtkActionObservable *
-_gtk_menu_tracker_item_get_observable (GtkMenuTrackerItem *self)
-{
-  return self->observable;
-}
-
-/**
- * gtk_menu_tracker_item_get_is_separator:
- * @self: A #GtkMenuTrackerItem instance
- *
- * Returns whether the menu item is a separator. If so, only
- * certain properties may need to be obeyed. See the documentation
- * for #GtkMenuTrackerItem.
- */
-gboolean
-gtk_menu_tracker_item_get_is_separator (GtkMenuTrackerItem *self)
-{
-  return self->is_separator;
-}
-
-/**
- * gtk_menu_tracker_item_get_has_submenu:
- * @self: A #GtkMenuTrackerItem instance
- *
- * Returns whether the menu item has a submenu. If so, only
- * certain properties may need to be obeyed. See the documentation
- * for #GtkMenuTrackerItem.
- */
-gboolean
-gtk_menu_tracker_item_get_has_submenu (GtkMenuTrackerItem *self)
-{
-  GMenuModel *link;
-
-  link = g_menu_item_get_link (self->item, G_MENU_LINK_SUBMENU);
-
-  if (link)
-    {
-      g_object_unref (link);
-      return TRUE;
-    }
-  else
-    return FALSE;
-}
-
-const gchar *
-gtk_menu_tracker_item_get_label (GtkMenuTrackerItem *self)
-{
-  const gchar *label = NULL;
-
-  g_menu_item_get_attribute (self->item, G_MENU_ATTRIBUTE_LABEL, "&s", &label);
-
-  return label;
-}
-
-/**
- * gtk_menu_tracker_item_get_icon:
- *
- * Returns: (transfer full):
- */
-GIcon *
-gtk_menu_tracker_item_get_icon (GtkMenuTrackerItem *self)
-{
-  GVariant *icon_data;
-  GIcon *icon;
-
-  icon_data = g_menu_item_get_attribute_value (self->item, "icon", NULL);
-
-  if (icon_data == NULL)
-    return NULL;
-
-  icon = g_icon_deserialize (icon_data);
-  g_variant_unref (icon_data);
-
-  return icon;
-}
-
-gboolean
-gtk_menu_tracker_item_get_sensitive (GtkMenuTrackerItem *self)
-{
-  return self->sensitive;
-}
-
-gboolean
-gtk_menu_tracker_item_get_visible (GtkMenuTrackerItem *self)
-{
-  return TRUE;
-}
-
-GtkMenuTrackerItemRole
-gtk_menu_tracker_item_get_role (GtkMenuTrackerItem *self)
-{
-  return self->role;
-}
-
-gboolean
-gtk_menu_tracker_item_get_toggled (GtkMenuTrackerItem *self)
-{
-  return self->toggled;
-}
-
-const gchar *
-gtk_menu_tracker_item_get_accel (GtkMenuTrackerItem *self)
-{
-  const gchar *accel = NULL;
-
-  g_menu_item_get_attribute (self->item, "accel", "&s", &accel);
-
-  return accel;
-}
-
-GMenuModel *
-_gtk_menu_tracker_item_get_submenu (GtkMenuTrackerItem *self)
-{
-  return g_menu_item_get_link (self->item, "submenu");
-}
-
-gchar *
-_gtk_menu_tracker_item_get_submenu_namespace (GtkMenuTrackerItem *self)
-{
-  const gchar *namespace;
-
-  if (g_menu_item_get_attribute (self->item, "action-namespace", "&s", &namespace))
-    {
-      if (self->action_namespace)
-        return g_strjoin (".", self->action_namespace, namespace, NULL);
-      else
-        return g_strdup (namespace);
-    }
-  else
-    return g_strdup (self->action_namespace);
-}
-
-gboolean
-gtk_menu_tracker_item_get_should_request_show (GtkMenuTrackerItem *self)
-{
-  return g_menu_item_get_attribute (self->item, "submenu-action", "&s", NULL);
-}
-
-gboolean
-gtk_menu_tracker_item_get_submenu_shown (GtkMenuTrackerItem *self)
-{
-  return self->submenu_shown;
-}
-
-static void
-gtk_menu_tracker_item_set_submenu_shown (GtkMenuTrackerItem *self,
-                                         gboolean            submenu_shown)
-{
-  if (submenu_shown == self->submenu_shown)
-    return;
-
-  self->submenu_shown = submenu_shown;
-  g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_SUBMENU_SHOWN]);
-}
-
-void
-gtk_menu_tracker_item_activated (GtkMenuTrackerItem *self)
-{
-  const gchar *action_name;
-  GVariant *action_target;
-
-  g_return_if_fail (GTK_IS_MENU_TRACKER_ITEM (self));
-
-  if (!self->can_activate)
-    return;
-
-  g_menu_item_get_attribute (self->item, G_MENU_ATTRIBUTE_ACTION, "&s", &action_name);
-  action_target = g_menu_item_get_attribute_value (self->item, G_MENU_ATTRIBUTE_TARGET, NULL);
-
-  if (self->action_namespace)
-    {
-      gchar *full_action;
-
-      full_action = g_strjoin (".", self->action_namespace, action_name, NULL);
-      g_action_group_activate_action (G_ACTION_GROUP (self->observable), full_action, action_target);
-      g_free (full_action);
-    }
-  else
-    g_action_group_activate_action (G_ACTION_GROUP (self->observable), action_name, action_target);
-
-  if (action_target)
-    g_variant_unref (action_target);
-}
-
-typedef struct
-{
-  GtkMenuTrackerItem *item;
-  gchar              *submenu_action;
-  gboolean            first_time;
-} GtkMenuTrackerOpener;
-
-static void
-gtk_menu_tracker_opener_update (GtkMenuTrackerOpener *opener)
-{
-  GActionGroup *group = G_ACTION_GROUP (opener->item->observable);
-  gboolean is_open = TRUE;
-
-  /* We consider the menu as being "open" if the action does not exist
-   * or if there is another problem (no state, wrong state type, etc.).
-   * If the action exists, with the correct state then we consider it
-   * open if we have ever seen this state equal to TRUE.
-   *
-   * In the event that we see the state equal to FALSE, we force it back
-   * to TRUE.  We do not signal that the menu was closed because this is
-   * likely to create UI thrashing.
-   *
-   * The only way the menu can have a true-to-false submenu-shown
-   * transition is if the user calls _request_submenu_shown (FALSE).
-   * That is handled in _free() below.
-   */
-
-  if (g_action_group_has_action (group, opener->submenu_action))
-    {
-      GVariant *state = g_action_group_get_action_state (group, opener->submenu_action);
-
-      if (state)
-        {
-          if (g_variant_is_of_type (state, G_VARIANT_TYPE_BOOLEAN))
-            is_open = g_variant_get_boolean (state);
-          g_variant_unref (state);
-        }
-    }
-
-  /* If it is already open, signal that.
-   *
-   * If it is not open, ask it to open.
-   */
-  if (is_open)
-    gtk_menu_tracker_item_set_submenu_shown (opener->item, TRUE);
-
-  if (!is_open || opener->first_time)
-    {
-      g_action_group_change_action_state (group, opener->submenu_action, g_variant_new_boolean (TRUE));
-      opener->first_time = FALSE;
-    }
-}
-
-static void
-gtk_menu_tracker_opener_added (GActionGroup *group,
-                               const gchar  *action_name,
-                               gpointer      user_data)
-{
-  GtkMenuTrackerOpener *opener = user_data;
-
-  if (g_str_equal (action_name, opener->submenu_action))
-    gtk_menu_tracker_opener_update (opener);
-}
-
-static void
-gtk_menu_tracker_opener_removed (GActionGroup *action_group,
-                                 const gchar  *action_name,
-                                 gpointer      user_data)
-{
-  GtkMenuTrackerOpener *opener = user_data;
-
-  if (g_str_equal (action_name, opener->submenu_action))
-    gtk_menu_tracker_opener_update (opener);
-}
-
-static void
-gtk_menu_tracker_opener_changed (GActionGroup *action_group,
-                                 const gchar  *action_name,
-                                 GVariant     *new_state,
-                                 gpointer      user_data)
-{
-  GtkMenuTrackerOpener *opener = user_data;
-
-  if (g_str_equal (action_name, opener->submenu_action))
-    gtk_menu_tracker_opener_update (opener);
-}
-
-static void
-gtk_menu_tracker_opener_free (gpointer data)
-{
-  GtkMenuTrackerOpener *opener = data;
-
-  g_signal_handlers_disconnect_by_func (opener->item->observable, gtk_menu_tracker_opener_added, opener);
-  g_signal_handlers_disconnect_by_func (opener->item->observable, gtk_menu_tracker_opener_removed, opener);
-  g_signal_handlers_disconnect_by_func (opener->item->observable, gtk_menu_tracker_opener_changed, opener);
-
-  g_action_group_change_action_state (G_ACTION_GROUP (opener->item->observable),
-                                      opener->submenu_action,
-                                      g_variant_new_boolean (FALSE));
-
-  gtk_menu_tracker_item_set_submenu_shown (opener->item, FALSE);
-
-  g_free (opener->submenu_action);
-
-  g_slice_free (GtkMenuTrackerOpener, opener);
-}
-
-static GtkMenuTrackerOpener *
-gtk_menu_tracker_opener_new (GtkMenuTrackerItem *item,
-                             const gchar        *submenu_action)
-{
-  GtkMenuTrackerOpener *opener;
-
-  opener = g_slice_new (GtkMenuTrackerOpener);
-  opener->first_time = TRUE;
-  opener->item = item;
-
-  if (item->action_namespace)
-    opener->submenu_action = g_strjoin (".", item->action_namespace, submenu_action, NULL);
-  else
-    opener->submenu_action = g_strdup (submenu_action);
-
-  g_signal_connect (item->observable, "action-added", G_CALLBACK (gtk_menu_tracker_opener_added), opener);
-  g_signal_connect (item->observable, "action-removed", G_CALLBACK (gtk_menu_tracker_opener_removed), opener);
-  g_signal_connect (item->observable, "action-state-changed", G_CALLBACK (gtk_menu_tracker_opener_changed), opener);
-
-  gtk_menu_tracker_opener_update (opener);
-
-  return opener;
-}
-
-void
-gtk_menu_tracker_item_request_submenu_shown (GtkMenuTrackerItem *self,
-                                             gboolean            shown)
-{
-  const gchar *submenu_action;
-  gboolean has_submenu_action;
-
-  if (shown == self->submenu_requested)
-    return;
-
-  has_submenu_action = g_menu_item_get_attribute (self->item, "submenu-action", "&s", &submenu_action);
-
-  self->submenu_requested = shown;
-
-  /* If we have a submenu action, start a submenu opener and wait
-   * for the reply from the client. Otherwise, simply open the
-   * submenu immediately.
-   */
-  if (has_submenu_action)
-    {
-      if (shown)
-        g_object_set_data_full (G_OBJECT (self), "submenu-opener",
-                                gtk_menu_tracker_opener_new (self, submenu_action),
-                                gtk_menu_tracker_opener_free);
-      else
-        g_object_set_data (G_OBJECT (self), "submenu-opener", NULL);
-    }
-  else
-    gtk_menu_tracker_item_set_submenu_shown (self, shown);
-}
--- a/src/gtkmenutrackeritem.h
+++ b/src/gtkmenutrackeritem.h
@ -1,84 +0,0 @@
-/*
- * Copyright © 2011, 2013 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MENU_TRACKER_ITEM_H__
-#define __GTK_MENU_TRACKER_ITEM_H__
-
-#include "gtkactionobservable.h"
-
-#define GTK_TYPE_MENU_TRACKER_ITEM                          (gtk_menu_tracker_item_get_type ())
-#define GTK_MENU_TRACKER_ITEM(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-                                                             GTK_TYPE_MENU_TRACKER_ITEM, GtkMenuTrackerItem))
-#define GTK_IS_MENU_TRACKER_ITEM(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
-                                                             GTK_TYPE_MENU_TRACKER_ITEM))
-
-typedef struct _GtkMenuTrackerItem GtkMenuTrackerItem;
-
-#define GTK_TYPE_MENU_TRACKER_ITEM_ROLE                     (gtk_menu_tracker_item_role_get_type ())
-
-typedef enum  {
-  GTK_MENU_TRACKER_ITEM_ROLE_NORMAL,
-  GTK_MENU_TRACKER_ITEM_ROLE_CHECK,
-  GTK_MENU_TRACKER_ITEM_ROLE_RADIO,
-} GtkMenuTrackerItemRole;
-
-GType                   gtk_menu_tracker_item_get_type                  (void) G_GNUC_CONST;
-
-GType                   gtk_menu_tracker_item_role_get_type             (void) G_GNUC_CONST;
-
-GtkMenuTrackerItem *   _gtk_menu_tracker_item_new                       (GtkActionObservable *observable,
-                                                                         GMenuModel          *model,
-                                                                         gint                 item_index,
-                                                                         const gchar         *action_namespace,
-                                                                         gboolean             is_separator);
-
-GtkActionObservable *  _gtk_menu_tracker_item_get_observable            (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_is_separator          (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_has_submenu           (GtkMenuTrackerItem *self);
-
-const gchar *           gtk_menu_tracker_item_get_label                 (GtkMenuTrackerItem *self);
-
-GIcon *                 gtk_menu_tracker_item_get_icon                  (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_sensitive             (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_visible               (GtkMenuTrackerItem *self);
-
-GtkMenuTrackerItemRole  gtk_menu_tracker_item_get_role                  (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_toggled               (GtkMenuTrackerItem *self);
-
-const gchar *           gtk_menu_tracker_item_get_accel                 (GtkMenuTrackerItem *self);
-
-GMenuModel *           _gtk_menu_tracker_item_get_submenu               (GtkMenuTrackerItem *self);
-
-gchar *                _gtk_menu_tracker_item_get_submenu_namespace     (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_should_request_show   (GtkMenuTrackerItem *self);
-
-void                    gtk_menu_tracker_item_activated                 (GtkMenuTrackerItem *self);
-
-void                    gtk_menu_tracker_item_request_submenu_shown     (GtkMenuTrackerItem *self,
-                                                                         gboolean            shown);
-
-gboolean                gtk_menu_tracker_item_get_submenu_shown         (GtkMenuTrackerItem *self);
-
-#endif
--- a/src/gvc
+++ b/src/gvc
--- a/src/main.c
+++ b/src/main.c
@ -47,11 +47,6 @@ static char *session_mode = NULL;
 #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER 1
 #define DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER 4

-enum {
-  SHELL_DEBUG_BACKTRACE_WARNINGS = 1,
-};
-static int _shell_debug;
-
 static void
 shell_dbus_acquire_name (GDBusProxy *bus,
                         guint32     request_name_flags,
@ -274,17 +269,6 @@ shell_a11y_init (void)
    }
 }

-static void
-shell_init_debug (const char *debug_env)
-{
-  static const GDebugKey keys[] = {
-    { "backtrace-warnings", SHELL_DEBUG_BACKTRACE_WARNINGS }
-  };
-
-  _shell_debug = g_parse_debug_string (debug_env, keys,
-                                       G_N_ELEMENTS (keys));
-}
-
 static void
 default_log_handler (const char     *log_domain,
                     GLogLevelFlags  log_level,
@ -302,15 +286,6 @@ default_log_handler (const char     *log_domain,
   * with those. */
  if (!log_domain || !g_str_has_prefix (log_domain, "tp-glib"))
    g_log_default_handler (log_domain, log_level, message, data);
-
-  /* Filter out Gjs logs, those already have the stack */
-  if (log_domain && strcmp (log_domain, "Gjs") == 0)
-    return;
-
-  if ((_shell_debug & SHELL_DEBUG_BACKTRACE_WARNINGS) &&
-      ((log_level & G_LOG_LEVEL_CRITICAL) ||
-       (log_level & G_LOG_LEVEL_WARNING)))
-    gjs_dumpstack ();
 }

 static void
@ -431,8 +406,6 @@ main (int argc, char **argv)
  g_setenv ("GJS_DEBUG_OUTPUT", "stderr", TRUE);
  g_setenv ("GJS_DEBUG_TOPICS", "JS ERROR;JS LOG", TRUE);

-  shell_init_debug (g_getenv ("SHELL_DEBUG"));
-
  shell_dbus_init (meta_get_replace_current_wm ());
  shell_a11y_init ();
  shell_perf_log_init ();
@ -446,7 +419,6 @@ main (int argc, char **argv)
  tp_debug_set_flags ("all");

  sender = tp_debug_sender_dup ();
-
  g_log_set_default_handler (default_log_handler, sender);

  /* Initialize the global object */
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@ -293,6 +293,8 @@ on_apps_tree_changed_cb (GMenuTree *tree,
  GHashTable *new_apps;
  GHashTableIter iter;
  gpointer key, value;
+  GSList *removed_apps = NULL;
+  GSList *removed_node;

  g_assert (tree == self->priv->apps_tree);

@ -374,9 +376,15 @@ on_apps_tree_changed_cb (GMenuTree *tree,
      const char *id = key;
      
      if (!g_hash_table_lookup (new_apps, id))
-        g_hash_table_iter_remove (&iter);
+        removed_apps = g_slist_prepend (removed_apps, (char*)id);
    }
-
+  for (removed_node = removed_apps; removed_node; removed_node = removed_node->next)
+    {
+      const char *id = removed_node->data;
+      g_hash_table_remove (self->priv->id_to_app, id);
+    }
+  g_slist_free (removed_apps);
+      
  g_hash_table_destroy (new_apps);

  g_signal_emit (self, signals[INSTALLED_CHANGED], 0);
@ -471,7 +479,7 @@ shell_app_system_lookup_app_for_path (ShellAppSystem   *system,
  if (!app)
    return NULL;

-  app_path = g_desktop_app_info_get_filename (shell_app_get_app_info (app));
+  app_path = gmenu_tree_entry_get_desktop_file_path (shell_app_get_tree_entry (app));
  if (strcmp (desktop_path, app_path) != 0)
    return NULL;

@ -664,7 +672,9 @@ search_tree (ShellAppSystem *self,
  g_hash_table_iter_init (&iter, apps);
  while (g_hash_table_iter_next (&iter, &key, &value))
    {
+      const char *id = key;
      ShellApp *app = value;
+      (void)id;
      _shell_app_do_match (app, normalized_terms,
                           &prefix_results,
                           &substring_results);
--- a/src/shell-app-usage.c
+++ b/src/shell-app-usage.c
@ -39,8 +39,7 @@
 * minutes to signify idle.
 */

-#define PRIVACY_SCHEMA "org.gnome.desktop.privacy"
-#define ENABLE_MONITORING_KEY "remember-app-usage"
+#define ENABLE_MONITORING_KEY "enable-app-monitoring"

 #define FOCUS_TIME_MIN_SECONDS 7 /* Need 7 continuous seconds of focus */

@ -83,10 +82,10 @@ struct _ShellAppUsage
  GFile *configfile;
  GDBusProxy *session_proxy;
  GdkDisplay *display;
-  GSettings *privacy_settings;
  gulong last_idle;
  guint idle_focus_change_id;
  guint save_id;
+  guint settings_notify;
  gboolean currently_idle;
  gboolean enable_monitoring;

@ -427,23 +426,25 @@ shell_app_usage_init (ShellAppUsage *self)
  restore_from_file (self);


-  self->privacy_settings = g_settings_new(PRIVACY_SCHEMA);
-  g_signal_connect (self->privacy_settings,
-                    "changed::" ENABLE_MONITORING_KEY,
-                    G_CALLBACK (on_enable_monitoring_key_changed),
-                    self);
+  self->settings_notify = g_signal_connect (shell_global_get_settings (global),
+                                            "changed::" ENABLE_MONITORING_KEY,
+                                            G_CALLBACK (on_enable_monitoring_key_changed),
+                                            self);
  update_enable_monitoring (self);
 }

 static void
 shell_app_usage_finalize (GObject *object)
 {
+  ShellGlobal *global;
  ShellAppUsage *self = SHELL_APP_USAGE (object);

  if (self->save_id > 0)
    g_source_remove (self->save_id);

-  g_object_unref (self->privacy_settings);
+  global = shell_global_get ();
+  g_signal_handler_disconnect (shell_global_get_settings (global),
+                               self->settings_notify);

  g_object_unref (self->configfile);

@ -955,9 +956,11 @@ out:
 static void
 update_enable_monitoring (ShellAppUsage *self)
 {
+  ShellGlobal *global;
  gboolean enable;

-  enable = g_settings_get_boolean (self->privacy_settings,
+  global = shell_global_get ();
+  enable = g_settings_get_boolean (shell_global_get_settings (global),
                                   ENABLE_MONITORING_KEY);

  /* Be sure not to start the timers if they were already set */
--- a/src/shell-app.c
+++ b/src/shell-app.c
@ -15,7 +15,7 @@
 #include "shell-app-system-private.h"
 #include "shell-window-tracker-private.h"
 #include "st.h"
-#include "gtkactionmuxer.h"
+#include "gactionmuxer.h"

 typedef enum {
  MATCH_NONE,
@ -39,14 +39,10 @@ typedef struct {
  /* Whether or not we need to resort the windows; this is done on demand */
  gboolean window_sort_stale : 1;

-  /* DBus property notification subscription */
-  guint properties_changed_id : 1;
-
  /* See GApplication documentation */
  GDBusMenuModel   *remote_menu;
-  GtkActionMuxer   *muxer;
-  char             *unique_bus_name;
-  GDBusConnection  *session;
+  GActionMuxer     *muxer;
+  char * unique_bus_name;
 } ShellAppRunningState;

 /**
@ -558,16 +554,16 @@ shell_app_update_window_actions (ShellApp *app, MetaWindow *window)
      actions = g_object_get_data (G_OBJECT (window), "actions");
      if (actions == NULL)
        {
-          actions = G_ACTION_GROUP (g_dbus_action_group_get (app->running_state->session,
+          actions = G_ACTION_GROUP (g_dbus_action_group_get (g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL),
                                                             meta_window_get_gtk_unique_bus_name (window),
                                                             object_path));
          g_object_set_data_full (G_OBJECT (window), "actions", actions, g_object_unref);
        }

      if (!app->running_state->muxer)
-        app->running_state->muxer = gtk_action_muxer_new ();
+        app->running_state->muxer = g_action_muxer_new ();

-      gtk_action_muxer_insert (app->running_state->muxer, "win", actions);
+      g_action_muxer_insert (app->running_state->muxer, "win", actions);
      g_object_notify (G_OBJECT (app), "action-group");
    }
 }
@ -962,84 +958,6 @@ shell_app_on_ws_switch (MetaScreen         *screen,
  g_signal_emit (app, shell_app_signals[WINDOWS_CHANGED], 0);
 }

-static void
-application_properties_changed (GDBusConnection *connection,
-                                const gchar     *sender_name,
-                                const gchar     *object_path,
-                                const gchar     *interface_name,
-                                const gchar     *signal_name,
-                                GVariant        *parameters,
-                                gpointer         user_data)
-{
-  ShellApp *app = user_data;
-  GVariant *changed_properties;
-  GVariantIter iter;
-  gboolean busy = FALSE;
-  const gchar *key, *interface_name_for_signal;
-  GVariant *value;
-
-  g_variant_get (parameters,
-                 "(&s@a{sv}as)",
-                 &interface_name_for_signal,
-                 &changed_properties,
-                 NULL);
-
-  if (g_strcmp0 (interface_name_for_signal, "org.gtk.Application") != 0)
-    return;
-
-  g_variant_iter_init (&iter, changed_properties);
-  while (g_variant_iter_next (&iter, "{&sv}", &key, &value))
-    {
-      if (g_strcmp0 (key, "Busy") != 0)
-        {
-          g_variant_unref (value);
-          continue;
-        }
-
-      busy = g_variant_get_boolean (value);
-      g_variant_unref (value);
-      break;
-    }
-
-  if (busy)
-    shell_app_state_transition (app, SHELL_APP_STATE_BUSY);
-  else
-    shell_app_state_transition (app, SHELL_APP_STATE_RUNNING);
-
-  if (changed_properties != NULL)
-    g_variant_unref (changed_properties);
-}
-
-static void
-shell_app_ensure_busy_watch (ShellApp *app)
-{
-  ShellAppRunningState *running_state = app->running_state;
-  MetaWindow *window;
-  const gchar *object_path;
-
-  if (running_state->properties_changed_id != 0)
-    return;
-
-  if (running_state->unique_bus_name == NULL)
-    return;
-
-  window = g_slist_nth_data (running_state->windows, 0);
-  object_path = meta_window_get_gtk_application_object_path (window);
-
-  if (object_path == NULL)
-    return;
-
-  running_state->properties_changed_id =
-    g_dbus_connection_signal_subscribe (running_state->session,
-                                        running_state->unique_bus_name,
-                                        "org.freedesktop.DBus.Properties",
-                                        "PropertiesChanged",
-                                        object_path,
-                                        "org.gtk.Application",
-                                        G_DBUS_SIGNAL_FLAGS_NONE,
-                                        application_properties_changed, app, NULL);
-}
-
 void
 _shell_app_add_window (ShellApp        *app,
                       MetaWindow      *window)
@ -1058,7 +976,6 @@ _shell_app_add_window (ShellApp        *app,
  g_signal_connect (window, "notify::user-time", G_CALLBACK(shell_app_on_user_time_changed), app);

  shell_app_update_app_menu (app, window);
-  shell_app_ensure_busy_watch (app);

  if (app->state != SHELL_APP_STATE_STARTING)
    shell_app_state_transition (app, SHELL_APP_STATE_RUNNING);
@ -1301,9 +1218,7 @@ create_running_state (ShellApp *app)
  app->running_state->workspace_switch_id =
    g_signal_connect (screen, "workspace-switched", G_CALLBACK(shell_app_on_ws_switch), app);

-  app->running_state->session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-  g_assert (app->running_state->session != NULL);
-  app->running_state->muxer = gtk_action_muxer_new ();
+  app->running_state->muxer = g_action_muxer_new ();
 }

 void
@ -1329,6 +1244,7 @@ shell_app_update_app_menu (ShellApp   *app,
    {
      const gchar *application_object_path;
      const gchar *app_menu_object_path;
+      GDBusConnection *session;
      GDBusActionGroup *actions;

      application_object_path = meta_window_get_gtk_application_object_path (window);
@ -1337,13 +1253,16 @@ shell_app_update_app_menu (ShellApp   *app,
      if (application_object_path == NULL || app_menu_object_path == NULL || unique_bus_name == NULL)
        return;

+      session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
+      g_assert (session != NULL);
      g_clear_pointer (&app->running_state->unique_bus_name, g_free);
      app->running_state->unique_bus_name = g_strdup (unique_bus_name);
      g_clear_object (&app->running_state->remote_menu);
-      app->running_state->remote_menu = g_dbus_menu_model_get (app->running_state->session, unique_bus_name, app_menu_object_path);
-      actions = g_dbus_action_group_get (app->running_state->session, unique_bus_name, application_object_path);
-      gtk_action_muxer_insert (app->running_state->muxer, "app", G_ACTION_GROUP (actions));
+      app->running_state->remote_menu = g_dbus_menu_model_get (session, unique_bus_name, app_menu_object_path);
+      actions = g_dbus_action_group_get (session, unique_bus_name, application_object_path);
+      g_action_muxer_insert (app->running_state->muxer, "app", G_ACTION_GROUP (actions));
      g_object_unref (actions);
+      g_object_unref (session);
    }
 }

@ -1361,12 +1280,8 @@ unref_running_state (ShellAppRunningState *state)
  screen = shell_global_get_screen (shell_global_get ());
  g_signal_handler_disconnect (screen, state->workspace_switch_id);

-  if (state->properties_changed_id != 0)
-    g_dbus_connection_signal_unsubscribe (state->session, state->properties_changed_id);
-
  g_clear_object (&state->remote_menu);
  g_clear_object (&state->muxer);
-  g_clear_object (&state->session);
  g_clear_pointer (&state->unique_bus_name, g_free);
  g_clear_pointer (&state->remote_menu, g_free);

--- a/src/shell-app.h
+++ b/src/shell-app.h
@ -31,8 +31,7 @@ struct _ShellAppClass
 typedef enum {
  SHELL_APP_STATE_STOPPED,
  SHELL_APP_STATE_STARTING,
-  SHELL_APP_STATE_RUNNING,
-  SHELL_APP_STATE_BUSY
+  SHELL_APP_STATE_RUNNING
 } ShellAppState;

 GType shell_app_get_type (void) G_GNUC_CONST;
--- a/src/shell-global.c
+++ b/src/shell-global.c
@ -82,8 +82,6 @@ struct _ShellGlobal {
  const char *userdatadir;
  StFocusManager *focus_manager;

-  GFile *runtime_state_path;
-
  guint work_count;
  GSList *leisure_closures;
  guint leisure_function_id;
@ -100,6 +98,7 @@ enum {
  PROP_0,

  PROP_SESSION_MODE,
+  PROP_OVERLAY_GROUP,
  PROP_SCREEN,
  PROP_GDK_SCREEN,
  PROP_DISPLAY,
@ -167,6 +166,9 @@ shell_global_get_property(GObject         *object,
    case PROP_SESSION_MODE:
      g_value_set_string (value, shell_global_get_session_mode (global));
      break;
+    case PROP_OVERLAY_GROUP:
+      g_value_set_object (value, meta_get_overlay_group_for_screen (global->meta_screen));
+      break;
    case PROP_SCREEN:
      g_value_set_object (value, global->meta_screen);
      break;
@ -234,8 +236,6 @@ shell_global_init (ShellGlobal *global)
  const char *datadir = g_getenv ("GNOME_SHELL_DATADIR");
  const char *shell_js = g_getenv("GNOME_SHELL_JS");
  char *imagedir, **search_path;
-  char *path;
-  const char *byteorder_string;

  if (!datadir)
    datadir = GNOME_SHELL_DATADIR;
@ -258,20 +258,6 @@ shell_global_init (ShellGlobal *global)
  global->userdatadir = g_build_filename (g_get_user_data_dir (), "gnome-shell", NULL);
  g_mkdir_with_parents (global->userdatadir, 0700);

-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-  byteorder_string = "LE";
-#else
-  byteorder_string = "BE";
-#endif
-
-  /* And the runtime state */
-  path = g_strdup_printf ("%s/gnome-shell/runtime-state-%s.%s",
-                          g_get_user_runtime_dir (),
-                          byteorder_string,
-                          XDisplayName (NULL));
-  (void) g_mkdir_with_parents (path, 0700);
-  global->runtime_state_path = g_file_new_for_path (path);
-
  global->settings = g_settings_new ("org.gnome.shell");
  
  global->grab_notifier = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL));
@ -313,8 +299,6 @@ shell_global_finalize (GObject *object)

  the_object = NULL;

-  g_clear_object (&global->runtime_state_path);
-
  G_OBJECT_CLASS(shell_global_parent_class)->finalize (object);
 }

@ -371,6 +355,13 @@ shell_global_class_init (ShellGlobalClass *klass)
                                                        "The session mode to use",
                                                        "user",
                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (gobject_class,
+                                   PROP_OVERLAY_GROUP,
+                                   g_param_spec_object ("overlay-group",
+                                                        "Overlay Group",
+                                                        "Actor holding objects that appear above the desktop contents",
+                                                        CLUTTER_TYPE_ACTOR,
+                                                        G_PARAM_READABLE));
  g_object_class_install_property (gobject_class,
                                   PROP_SCREEN,
                                   g_param_spec_object ("screen",
@ -541,16 +532,27 @@ focus_window_changed (MetaDisplay *display,
    shell_global_set_stage_input_mode (global, SHELL_STAGE_INPUT_MODE_NORMAL);
 }

+static void
+shell_global_focus_stage (ShellGlobal *global)
+{
+  XSetInputFocus (global->xdisplay, global->stage_xwindow,
+                  RevertToPointerRoot,
+                  shell_global_get_current_time (global));
+}
+
 /**
 * shell_global_set_stage_input_mode:
 * @global: the #ShellGlobal
 * @mode: the stage input mode
 *
 * Sets the input mode of the stage; when @mode is
- * %SHELL_STAGE_INPUT_MODE_NORMAL, then the stage accepts clicks in
- * the region defined by shell_global_set_stage_input_region() but
- * passes through clicks outside that region. When it is
- * %SHELL_STAGE_INPUT_MODE_FULLSCREEN, the stage absorbs all input.
+ * %SHELL_STAGE_INPUT_MODE_NONREACTIVE, then the stage does not absorb
+ * any clicks, but just passes them through to underlying windows.
+ * When it is %SHELL_STAGE_INPUT_MODE_NORMAL, then the stage accepts
+ * clicks in the region defined by
+ * shell_global_set_stage_input_region() but passes through clicks
+ * outside that region. When it is %SHELL_STAGE_INPUT_MODE_FULLSCREEN,
+ * the stage absorbs all input.
 *
 * When the input mode is %SHELL_STAGE_INPUT_MODE_FOCUSED, the pointer
 * is handled as with %SHELL_STAGE_INPUT_MODE_NORMAL, but additionally
@ -559,8 +561,9 @@ focus_window_changed (MetaDisplay *display,
 * will revert to %SHELL_STAGE_INPUT_MODE_NORMAL.
 *
 * Note that whenever a mutter-internal Gtk widget has a pointer grab,
- * the shell goes unresponsive and passes things to the underlying GTK+
- * widget to ensure that the widget gets any clicks it is expecting.
+ * the shell behaves as though it was in
+ * %SHELL_STAGE_INPUT_MODE_NONREACTIVE, to ensure that the widget gets
+ * any clicks it is expecting.
 */
 void
 shell_global_set_stage_input_mode (ShellGlobal         *global,
@ -572,7 +575,7 @@ shell_global_set_stage_input_mode (ShellGlobal         *global,

  screen = meta_plugin_get_screen (global->plugin);

-  if (global->gtk_grab_active)
+  if (mode == SHELL_STAGE_INPUT_MODE_NONREACTIVE || global->gtk_grab_active)
    meta_empty_stage_input_region (screen);
  else if (mode == SHELL_STAGE_INPUT_MODE_FULLSCREEN || !global->input_region)
    meta_set_stage_input_region (screen, None);
@ -580,8 +583,7 @@ shell_global_set_stage_input_mode (ShellGlobal         *global,
    meta_set_stage_input_region (screen, global->input_region);

  if (mode == SHELL_STAGE_INPUT_MODE_FOCUSED)
-    meta_focus_stage_window (global->meta_screen,
-                             shell_global_get_current_time (global));
+    shell_global_focus_stage (global);

  if (mode != global->input_mode)
    {
@ -1007,13 +1009,6 @@ shell_global_end_modal (ShellGlobal *global,
  meta_plugin_end_modal (global->plugin, timestamp);
 }

-void
-shell_global_freeze_keyboard (ShellGlobal *global,
-                              guint32      timestamp)
-{
-  meta_display_freeze_keyboard (global->meta_display, global->stage_xwindow, timestamp);
-}
-
 /* Code to close all file descriptors before we exec; copied from gspawn.c in GLib.
 *
 * Authors: Padraig O'Briain, Matthias Clasen, Lennart Poettering
@ -1784,83 +1779,3 @@ shell_global_get_session_mode (ShellGlobal *global)

  return global->session_mode;
 }
-
-static GFile *
-get_runtime_state_path (ShellGlobal  *global,
-                        const char   *property_name)
-{
-  return g_file_get_child (global->runtime_state_path, property_name);
-}
-
-/**
- * shell_global_set_runtime_state:
- * @global: a #ShellGlobal
- * @property_name: Name of the property
- * @variant: (allow-none): A #GVariant, or %NULL to unset
- *
- * Change the value of serialized runtime state.
- */
-void
-shell_global_set_runtime_state (ShellGlobal  *global,
-                                const char   *property_name,
-                                GVariant     *variant)
-{
-  GFile *path;
-
-  path = get_runtime_state_path (global, property_name);
-
-  if (variant == NULL)
-    (void) g_file_delete (path, NULL, NULL);
-  else
-    {
-      gsize size = g_variant_get_size (variant);
-      g_file_replace_contents (path, g_variant_get_data (variant), size,
-                               NULL, FALSE, G_FILE_CREATE_REPLACE_DESTINATION,
-                               NULL, NULL, NULL);
-    }
-}
-
-/**
- * shell_global_get_runtime_state:
- * @global: a #ShellGlobal
- * @property_type: Expected data type
- * @property_name: Name of the property
- *
- * The shell maintains "runtime" state which does not persist across
- * logout or reboot.
- *
- * Returns: The value of a serialized property, or %NULL if none stored
- */
-GVariant *
-shell_global_get_runtime_state (ShellGlobal  *global,
-                                const char   *property_type,
-                                const char   *property_name)
-{
-  GVariant *res = NULL;
-  GMappedFile *mfile;
-  GFile *path;
-  char *pathstr;
-  GError *local_error = NULL;
-
-  path = get_runtime_state_path (global, property_name);
-  pathstr = g_file_get_path (path);
-  mfile = g_mapped_file_new (pathstr, FALSE, &local_error);
-  if (!mfile)
-    {
-      if (!g_error_matches (local_error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
-        {
-          g_warning ("Failed to open runtime state: %s", local_error->message);
-        }
-      g_clear_error (&local_error);
-    }
-  else
-    {
-      GBytes *bytes = g_mapped_file_get_bytes (mfile);
-      res = g_variant_new_from_bytes ((GVariantType*)property_type, bytes, TRUE);
-      g_bytes_unref (bytes);
-      g_mapped_file_unref (mfile);
-    }
-
- out:
-  return res;
-}
--- a/src/shell-global.h
+++ b/src/shell-global.h
@ -44,10 +44,9 @@ gboolean shell_global_begin_modal            (ShellGlobal         *global,
                                              MetaModalOptions    options);
 void     shell_global_end_modal              (ShellGlobal         *global,
                                              guint32              timestamp);
-void     shell_global_freeze_keyboard        (ShellGlobal         *global,
-                                              guint32              timestamp);

 typedef enum {
+  SHELL_STAGE_INPUT_MODE_NONREACTIVE,
  SHELL_STAGE_INPUT_MODE_NORMAL,
  SHELL_STAGE_INPUT_MODE_FOCUSED,
  SHELL_STAGE_INPUT_MODE_FULLSCREEN
@ -151,14 +150,6 @@ void     shell_global_reexec_self               (ShellGlobal  *global);

 const char *     shell_global_get_session_mode  (ShellGlobal  *global);

-void     shell_global_set_runtime_state      (ShellGlobal  *global,
-                                              const char   *property_name,
-                                              GVariant     *variant);
-GVariant * shell_global_get_runtime_state       (ShellGlobal  *global,
-                                                 const char   *property_type,
-                                                 const char   *property_name);
-
-
 G_END_DECLS

 #endif /* __SHELL_GLOBAL_H__ */
--- a/src/shell-js.c
+++ b/src/shell-js.c
@ -54,11 +54,14 @@ shell_js_add_extension_importer (const char  *target_object_script,
                         0,
                         &target_object))
    {
-      gjs_log_exception(context);
+      char *message;
+      gjs_log_exception(context,
+                        &message);
      g_set_error(error,
                  G_IO_ERROR,
                  G_IO_ERROR_FAILED,
-                  "Unable to import %s", target_object_script);
+                  "%s", message ? message : "(unknown)");
+      g_free(message);
      goto out;
    }

--- a/src/shell-menu-tracker.c
+++ b/src/shell-menu-tracker.c
@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2013 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by:
- *     Jasper St. Pierre <jstpierre@mecheye.net>
- */
-
-#include "config.h"
-
-#include "shell-menu-tracker.h"
-#include "gtkmenutracker.h"
-
-/**
- * SECTION:shell-menu-tracker
- * @short_description: a simple wrapper around #GtkMenuTracker
- *                     to make it bindable.
- */
-
-struct _ShellMenuTracker
-{
-  guint ref_count;
-
-  GtkMenuTracker *tracker;
-
-  ShellMenuTrackerInsertFunc insert_func;
-  gpointer insert_user_data;
-  GDestroyNotify insert_notify;
-  ShellMenuTrackerRemoveFunc remove_func;
-  gpointer remove_user_data;
-  GDestroyNotify remove_notify;
-};
-
-static void
-shell_menu_tracker_insert_func (GtkMenuTrackerItem *item,
-                                gint position,
-                                gpointer user_data)
-{
-  ShellMenuTracker *tracker = (ShellMenuTracker *) user_data;
-  tracker->insert_func (item, position, tracker->insert_user_data);
-}
-
-static void
-shell_menu_tracker_remove_func (gint position,
-                                gpointer user_data)
-{
-  ShellMenuTracker *tracker = (ShellMenuTracker *) user_data;
-  tracker->remove_func (position, tracker->remove_user_data);
-}
-
-/**
- * shell_menu_tracker_new:
- * @observable:
- * @model:
- * @action_namespace: (allow-none):
- * @insert_func:
- * @insert_user_data:
- * @insert_notify:
- * @remove_func:
- * @remove_user_data:
- * @remove_notify:
- */
-ShellMenuTracker *
-shell_menu_tracker_new (GtkActionObservable        *observable,
-                        GMenuModel                 *model,
-                        const gchar                *action_namespace,
-                        ShellMenuTrackerInsertFunc  insert_func,
-                        gpointer                    insert_user_data,
-                        GDestroyNotify              insert_notify,
-                        ShellMenuTrackerRemoveFunc  remove_func,
-                        gpointer                    remove_user_data,
-                        GDestroyNotify              remove_notify)
-{
-  ShellMenuTracker *tracker = g_slice_new0 (ShellMenuTracker);
-
-  tracker->ref_count = 1;
-  tracker->insert_func = insert_func;
-  tracker->insert_user_data = insert_user_data;
-  tracker->insert_notify = insert_notify;
-  tracker->remove_func = remove_func;
-  tracker->remove_user_data = remove_user_data;
-  tracker->remove_notify = remove_notify;
-
-  tracker->tracker = gtk_menu_tracker_new (observable,
-                                           model,
-                                           TRUE, /* with separators */
-                                           action_namespace,
-                                           shell_menu_tracker_insert_func,
-                                           shell_menu_tracker_remove_func,
-                                           tracker);
-
-  return tracker;
-}
-
-ShellMenuTracker *
-shell_menu_tracker_new_for_item_submenu (GtkMenuTrackerItem         *item,
-                                         ShellMenuTrackerInsertFunc  insert_func,
-                                         gpointer                    insert_user_data,
-                                         GDestroyNotify              insert_notify,
-                                         ShellMenuTrackerRemoveFunc  remove_func,
-                                         gpointer                    remove_user_data,
-                                         GDestroyNotify              remove_notify)
-{
-  ShellMenuTracker *tracker = g_slice_new0 (ShellMenuTracker);
-
-  tracker->ref_count = 1;
-  tracker->insert_func = insert_func;
-  tracker->insert_user_data = insert_user_data;
-  tracker->insert_notify = insert_notify;
-  tracker->remove_func = remove_func;
-  tracker->remove_user_data = remove_user_data;
-  tracker->remove_notify = remove_notify;
-
-  tracker->tracker = gtk_menu_tracker_new_for_item_submenu (item,
-                                                            shell_menu_tracker_insert_func,
-                                                            shell_menu_tracker_remove_func,
-                                                            tracker);
-
-  return tracker;
-}
-
-ShellMenuTracker *
-shell_menu_tracker_ref (ShellMenuTracker *tracker)
-{
-  tracker->ref_count++;
-  return tracker;
-}
-
-void
-shell_menu_tracker_unref (ShellMenuTracker *tracker)
-{
-  if (tracker->ref_count-- <= 0)
-    {
-      shell_menu_tracker_destroy (tracker);
-      g_slice_free (ShellMenuTracker, tracker);
-    }
-}
-
-void
-shell_menu_tracker_destroy (ShellMenuTracker *tracker)
-{
-  if (tracker->tracker != NULL)
-    {
-      gtk_menu_tracker_free (tracker->tracker);
-      tracker->tracker = NULL;
-      tracker->insert_notify (tracker->insert_user_data);
-      tracker->remove_notify (tracker->remove_user_data);
-    }
-}
-
-G_DEFINE_BOXED_TYPE(ShellMenuTracker,
-                    shell_menu_tracker,
-                    shell_menu_tracker_ref,
-                    shell_menu_tracker_unref)
--- a/src/shell-menu-tracker.h
+++ b/src/shell-menu-tracker.h
@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2013 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by:
- *     Jasper St. Pierre <jstpierre@mecheye.net>
- */
-
-#ifndef __SHELL_MENU_TRACKER_H__
-#define __SHELL_MENU_TRACKER_H__
-
-#include <gio/gio.h>
-
-#include "gtkmenutrackeritem.h"
-
-typedef struct _ShellMenuTracker ShellMenuTracker;
-
-GType shell_menu_tracker_get_type (void) G_GNUC_CONST;
-
-typedef void         (* ShellMenuTrackerInsertFunc)       (GtkMenuTrackerItem       *item,
-                                                           gint                      position,
-                                                           gpointer                  user_data);
-
-typedef void         (* ShellMenuTrackerRemoveFunc)       (gint                      position,
-                                                           gpointer                  user_data);
-
-ShellMenuTracker * shell_menu_tracker_new (GtkActionObservable        *observable,
-                                           GMenuModel                 *model,
-                                           const gchar                *action_namespace,
-                                           ShellMenuTrackerInsertFunc  insert_func,
-                                           gpointer                    insert_user_data,
-                                           GDestroyNotify              insert_notify,
-                                           ShellMenuTrackerRemoveFunc  remove_func,
-                                           gpointer                    remove_user_data,
-                                           GDestroyNotify              remove_notify);
-ShellMenuTracker * shell_menu_tracker_new_for_item_submenu (GtkMenuTrackerItem         *item,
-                                                            ShellMenuTrackerInsertFunc  insert_func,
-                                                            gpointer                    insert_user_data,
-                                                            GDestroyNotify              insert_notify,
-                                                            ShellMenuTrackerRemoveFunc  remove_func,
-                                                            gpointer                    remove_user_data,
-                                                            GDestroyNotify              remove_notify);
-
-ShellMenuTracker * shell_menu_tracker_ref (ShellMenuTracker *tracker);
-void shell_menu_tracker_unref (ShellMenuTracker *tracker);
-void shell_menu_tracker_destroy (ShellMenuTracker *tracker);
-
-#endif /* __SHELL_MENU_TRACKER_H__ */
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@ -25,9 +25,6 @@
 /* This is also hard-coded in mutter and GDK */
 #define VIRTUAL_CORE_POINTER_ID 2

-#define A11Y_APPS_SCHEMA "org.gnome.desktop.a11y.applications"
-#define MAGNIFIER_ACTIVE_KEY "screen-magnifier-enabled"
-
 typedef enum {
  RECORDER_STATE_CLOSED,
  RECORDER_STATE_RECORDING
@ -71,7 +68,6 @@ struct _ShellRecorder {

  CoglHandle recording_icon; /* icon shown while playing */

-  GSettings *a11y_settings;
  gboolean draw_cursor;
  cairo_surface_t *cursor_image;
  int cursor_hot_x;
@ -281,8 +277,6 @@ shell_recorder_init (ShellRecorder *recorder)
  recorder->recording_icon = create_recording_icon ();
  recorder->memory_target = get_memory_target();

-  recorder->a11y_settings = g_settings_new (A11Y_APPS_SCHEMA);
-
  recorder->state = RECORDER_STATE_CLOSED;
  recorder->framerate = DEFAULT_FRAMES_PER_SECOND;
  recorder->draw_cursor = TRUE;
@ -305,8 +299,6 @@ shell_recorder_finalize (GObject  *object)

  cogl_handle_unref (recorder->recording_icon);

-  g_clear_object (&recorder->a11y_settings);
-
  G_OBJECT_CLASS (shell_recorder_parent_class)->finalize (object);
 }

@ -485,7 +477,7 @@ recorder_draw_buffer_meter (ShellRecorder *recorder)
  GdkRectangle primary_monitor;
  float rects[16];

-  gdk_screen_get_monitor_workarea (recorder->gdk_screen,
+  gdk_screen_get_monitor_geometry (recorder->gdk_screen,
                                   gdk_screen_get_primary_monitor (recorder->gdk_screen),
                                   &primary_monitor);

@ -588,8 +580,7 @@ recorder_record_frame (ShellRecorder *recorder)

  GST_BUFFER_PTS(buffer) = now - recorder->start_time;

-  if (recorder->draw_cursor &&
-      !g_settings_get_boolean (recorder->a11y_settings, MAGNIFIER_ACTIVE_KEY))
+  if (recorder->draw_cursor)
    recorder_draw_cursor (recorder, buffer);

  shell_recorder_src_add_buffer (SHELL_RECORDER_SRC (recorder->current_pipeline->src), buffer);
@ -611,7 +602,7 @@ recorder_on_stage_paint (ClutterActor  *actor,
    {
      GdkRectangle primary_monitor;

-      gdk_screen_get_monitor_workarea (recorder->gdk_screen,
+      gdk_screen_get_monitor_geometry (recorder->gdk_screen,
                                       gdk_screen_get_primary_monitor (recorder->gdk_screen),
                                       &primary_monitor);
      if (!recorder->only_paint)
--- a/src/shell-screenshot.c
+++ b/src/shell-screenshot.c
@ -15,9 +15,6 @@
 #include "shell-global.h"
 #include "shell-screenshot.h"

-#define A11Y_APPS_SCHEMA "org.gnome.desktop.a11y.applications"
-#define MAGNIFIER_ACTIVE_KEY "screen-magnifier-enabled"
-
 struct _ShellScreenshotClass
 {
  GObjectClass parent_class;
@ -307,7 +304,6 @@ grab_screenshot (ClutterActor *stage,
  MetaScreen *screen = shell_global_get_screen (screenshot_data->screenshot->global);
  int width, height;
  GSimpleAsyncResult *result;
-  GSettings *settings;

  meta_screen_get_size (screen, &width, &height);

@ -356,11 +352,8 @@ grab_screenshot (ClutterActor *stage,
  screenshot_data->screenshot_area.width = width;
  screenshot_data->screenshot_area.height = height;

-  settings = g_settings_new (A11Y_APPS_SCHEMA);
-  if (screenshot_data->include_cursor &&
-      !g_settings_get_boolean (settings, MAGNIFIER_ACTIVE_KEY))
+  if (screenshot_data->include_cursor)
    _draw_cursor_image (screenshot_data->image, screenshot_data->screenshot_area);
-  g_object_unref (settings);

  g_signal_handlers_disconnect_by_func (stage, (void *)grab_screenshot, (gpointer)screenshot_data);

@ -483,7 +476,6 @@ shell_screenshot_screenshot_window (ShellScreenshot *screenshot,
                                    ShellScreenshotCallback callback)
 {
  GSimpleAsyncResult *result;
-  GSettings *settings;

  _screenshot_data *screenshot_data = g_new0 (_screenshot_data, 1);

@ -500,17 +492,6 @@ shell_screenshot_screenshot_window (ShellScreenshot *screenshot,
  screenshot_data->filename = g_strdup (filename);
  screenshot_data->callback = callback;

-  if (!window)
-    {
-      screenshot_data->filename_used = g_strdup ("");
-      result = g_simple_async_result_new (NULL, on_screenshot_written, (gpointer)screenshot_data, shell_screenshot_screenshot_window);
-      g_simple_async_result_set_op_res_gboolean (result, FALSE);
-      g_simple_async_result_complete (result);
-      g_object_unref (result);
-
-      return;
-    }
-
  window_actor = CLUTTER_ACTOR (meta_window_get_compositor_private (window));
  clutter_actor_get_position (window_actor, &actor_x, &actor_y);

@ -541,10 +522,8 @@ shell_screenshot_screenshot_window (ShellScreenshot *screenshot,
  stex = META_SHAPED_TEXTURE (meta_window_actor_get_texture (META_WINDOW_ACTOR (window_actor)));
  screenshot_data->image = meta_shaped_texture_get_image (stex, &clip);

-  settings = g_settings_new (A11Y_APPS_SCHEMA);
-  if (include_cursor && !g_settings_get_boolean (settings, MAGNIFIER_ACTIVE_KEY))
+  if (include_cursor)
    _draw_cursor_image (screenshot_data->image, screenshot_data->screenshot_area);
-  g_object_unref (settings);

  result = g_simple_async_result_new (NULL, on_screenshot_written, (gpointer)screenshot_data, shell_screenshot_screenshot_window);
  g_simple_async_result_run_in_thread (result, write_screenshot_thread, G_PRIORITY_DEFAULT, NULL);
--- a/src/st/st-bin.c
+++ b/src/st/st-bin.c
@ -187,15 +187,6 @@ st_bin_dispose (GObject *gobject)
  G_OBJECT_CLASS (st_bin_parent_class)->dispose (gobject);
 }

-static void
-st_bin_popup_menu (StWidget *widget)
-{
-  StBinPrivate *priv = ST_BIN (widget)->priv;
-
-  if (priv->child && ST_IS_WIDGET (priv->child))
-    st_widget_popup_menu (ST_WIDGET (priv->child));
-}
-
 static gboolean
 st_bin_navigate_focus (StWidget         *widget,
                       ClutterActor     *from,
@ -321,7 +312,6 @@ st_bin_class_init (StBinClass *klass)
  actor_class->get_preferred_height = st_bin_get_preferred_height;
  actor_class->allocate = st_bin_allocate;

-  widget_class->popup_menu = st_bin_popup_menu;
  widget_class->navigate_focus = st_bin_navigate_focus;

  /**
--- a/src/st/st-focus-manager.c
+++ b/src/st/st-focus-manager.c
@ -233,26 +233,3 @@ st_focus_manager_get_group (StFocusManager *manager,

  return ST_WIDGET (actor);
 }
-
-/**
- * st_focus_manager_navigate_from_event:
- * @manager: the #StFocusManager
- * @event: a #ClutterEvent
- *
- * Try to navigate from @event as if it bubbled all the way up to
- * the stage. This is useful in complex event handling situations
- * where you want key navigation, but a parent might be stopping
- * the key navigation event from bubbling all the way up to the stage.
- *
- * Returns: Whether a new actor was navigated to
- */
-gboolean
-st_focus_manager_navigate_from_event (StFocusManager *manager,
-                                      ClutterEvent   *event)
-{
-  if (event->type != CLUTTER_KEY_PRESS)
-    return FALSE;
-
-  ClutterActor *stage = CLUTTER_ACTOR (event->key.stage);
-  return st_focus_manager_stage_event (stage, event, manager);
-}
--- a/src/st/st-focus-manager.h
+++ b/src/st/st-focus-manager.h
@ -75,8 +75,6 @@ void            st_focus_manager_remove_group  (StFocusManager *manager,
                                                StWidget       *root);
 StWidget       *st_focus_manager_get_group     (StFocusManager *manager,
                                                StWidget       *widget);
-gboolean        st_focus_manager_navigate_from_event (StFocusManager *manager,
-                                                      ClutterEvent   *event);

 G_END_DECLS

--- a/src/st/st-icon.c
+++ b/src/st/st-icon.c
@ -539,8 +539,7 @@ st_icon_set_icon_name (StIcon      *icon,

  if (g_icon_equal (priv->gicon, gicon)) /* do nothing */
    {
-      if (gicon)
-        g_object_unref (gicon);
+      g_object_unref (gicon);
      return;
    }

--- a/src/st/st-theme-node-drawing.c
+++ b/src/st/st-theme-node-drawing.c
@ -250,8 +250,6 @@ over (const ClutterColor *source,
 /*
 * st_theme_node_reduce_border_radius:
 * @node: a #StThemeNode
- * @width: The width of the box
- * @height: The height of the box
 * @corners: (array length=4) (out): reduced corners
 *
 * Implements the corner overlap algorithm mentioned at
@ -259,8 +257,6 @@ over (const ClutterColor *source,
 */
 static void
 st_theme_node_reduce_border_radius (StThemeNode  *node,
-                                    float         width,
-                                    float         height,
                                    guint        *corners)
 {
  gfloat scale;
@ -273,28 +269,28 @@ st_theme_node_reduce_border_radius (StThemeNode  *node,
    + node->border_radius[ST_CORNER_TOPRIGHT];

  if (sum > 0)
-    scale = MIN (width / sum, scale);
+    scale = MIN (node->alloc_width / sum, scale);

  /* right */
  sum = node->border_radius[ST_CORNER_TOPRIGHT]
    + node->border_radius[ST_CORNER_BOTTOMRIGHT];

  if (sum > 0)
-    scale = MIN (height / sum, scale);
+    scale = MIN (node->alloc_height / sum, scale);

  /* bottom */
  sum = node->border_radius[ST_CORNER_BOTTOMLEFT]
    + node->border_radius[ST_CORNER_BOTTOMRIGHT];

  if (sum > 0)
-    scale = MIN (width / sum, scale);
+    scale = MIN (node->alloc_width / sum, scale);

  /* left */
  sum = node->border_radius[ST_CORNER_BOTTOMLEFT]
    + node->border_radius[ST_CORNER_TOPLEFT];

  if (sum > 0)
-    scale = MIN (height / sum, scale);
+    scale = MIN (node->alloc_height / sum, scale);

  corners[ST_CORNER_TOPLEFT]     = node->border_radius[ST_CORNER_TOPLEFT]     * scale;
  corners[ST_CORNER_TOPRIGHT]    = node->border_radius[ST_CORNER_TOPRIGHT]    * scale;
@ -339,8 +335,6 @@ st_theme_node_get_corner_border_widths (StThemeNode *node,

 static CoglHandle
 st_theme_node_lookup_corner (StThemeNode    *node,
-                             float           width,
-                             float           height,
                             StCorner        corner_id)
 {
  CoglHandle texture, material;
@ -351,7 +345,7 @@ st_theme_node_lookup_corner (StThemeNode    *node,

  cache = st_texture_cache_get_default ();

-  st_theme_node_reduce_border_radius (node, width, height, radius);
+  st_theme_node_reduce_border_radius (node, radius);

  if (radius[corner_id] == 0)
    return COGL_INVALID_HANDLE;
@ -554,9 +548,7 @@ st_theme_node_has_visible_outline (StThemeNode *node)
 }

 static cairo_pattern_t *
-create_cairo_pattern_of_background_gradient (StThemeNode *node,
-                                             float        width,
-                                             float        height)
+create_cairo_pattern_of_background_gradient (StThemeNode *node)
 {
  cairo_pattern_t *pattern;

@ -564,15 +556,15 @@ create_cairo_pattern_of_background_gradient (StThemeNode *node,
                        NULL);

  if (node->background_gradient_type == ST_GRADIENT_VERTICAL)
-    pattern = cairo_pattern_create_linear (0, 0, 0, height);
+    pattern = cairo_pattern_create_linear (0, 0, 0, node->alloc_height);
  else if (node->background_gradient_type == ST_GRADIENT_HORIZONTAL)
-    pattern = cairo_pattern_create_linear (0, 0, width, 0);
+    pattern = cairo_pattern_create_linear (0, 0, node->alloc_width, 0);
  else
    {
      gdouble cx, cy;

-      cx = width / 2.;
-      cy = height / 2.;
+      cx = node->alloc_width / 2.;
+      cy = node->alloc_height / 2.;
      pattern = cairo_pattern_create_radial (cx, cy, 0, cx, cy, MIN (cx, cy));
    }

@ -591,8 +583,6 @@ create_cairo_pattern_of_background_gradient (StThemeNode *node,

 static cairo_pattern_t *
 create_cairo_pattern_of_background_image (StThemeNode *node,
-                                          float        width,
-                                          float        height,
                                          gboolean    *needs_background_fill)
 {
  cairo_surface_t *surface;
@ -629,7 +619,7 @@ create_cairo_pattern_of_background_image (StThemeNode *node,
  cairo_matrix_init_identity (&matrix);

  get_background_scale (node,
-                        width, height,
+                        node->alloc_width, node->alloc_height,
                        background_image_width, background_image_height,
                        &scale_w, &scale_h);
  if ((scale_w != 1) || (scale_h != 1))
@ -638,7 +628,7 @@ create_cairo_pattern_of_background_image (StThemeNode *node,
  background_image_height *= scale_h;

  get_background_coordinates (node,
-                              width, height,
+                              node->alloc_width, node->alloc_height,
                              background_image_width, background_image_height,
                              &x, &y);
  cairo_matrix_translate (&matrix, -x, -y);
@ -654,8 +644,8 @@ create_cairo_pattern_of_background_image (StThemeNode *node,
      if (node->background_repeat ||
          (x >= 0 &&
           y >= 0 &&
-           background_image_width - x >= width &&
-           background_image_height -y >= height))
+           background_image_width - x >= node->alloc_width &&
+           background_image_height -y >= node->alloc_height))
        *needs_background_fill = FALSE;
    }

@ -935,9 +925,7 @@ paint_inset_box_shadow_to_cairo_context (StThemeNode     *node,
 * cases (gradients, background images, etc).
 */
 static CoglHandle
-st_theme_node_prerender_background (StThemeNode *node,
-                                    float        actor_width,
-                                    float        actor_height)
+st_theme_node_prerender_background (StThemeNode *node)
 {
  StBorderImage *border_image;
  CoglHandle texture;
@ -961,7 +949,6 @@ st_theme_node_prerender_background (StThemeNode *node,
  ClutterActorBox actor_box;
  ClutterActorBox paint_box;
  cairo_path_t *interior_path = NULL;
-  float width, height;

  border_image = st_theme_node_get_border_image (node);

@ -969,9 +956,9 @@ st_theme_node_prerender_background (StThemeNode *node,
  box_shadow_spec = st_theme_node_get_box_shadow (node);

  actor_box.x1 = 0;
-  actor_box.x2 = actor_width;
+  actor_box.x2 = node->alloc_width;
  actor_box.y1 = 0;
-  actor_box.y2 = actor_height;
+  actor_box.y2 = node->alloc_height;

  /* If there's a background image shadow, we
   * may need to create an image bigger than the nodes
@ -986,11 +973,14 @@ st_theme_node_prerender_background (StThemeNode *node,
  actor_box.y1 += - paint_box.y1;
  actor_box.y2 += - paint_box.y1;

-  width = paint_box.x2 - paint_box.x1;
-  height = paint_box.y2 - paint_box.y1;
+  paint_box.x2 += - paint_box.x1;
+  paint_box.x1 += - paint_box.x1;
+  paint_box.y2 += - paint_box.y1;
+  paint_box.y1 += - paint_box.y1;

-  rowstride = cairo_format_stride_for_width (CAIRO_FORMAT_ARGB32, width);
-  data = g_new0 (guchar, height * rowstride);
+  rowstride = cairo_format_stride_for_width (CAIRO_FORMAT_ARGB32,
+                                             paint_box.x2 - paint_box.x1);
+  data = g_new0 (guchar, (paint_box.y2 - paint_box.y1) * rowstride);

  /* We zero initialize the destination memory, so it's fully transparent
   * by default.
@ -999,14 +989,15 @@ st_theme_node_prerender_background (StThemeNode *node,

  surface = cairo_image_surface_create_for_data (data,
                                                 CAIRO_FORMAT_ARGB32,
-                                                 width, height,
+                                                 paint_box.x2 - paint_box.x1,
+                                                 paint_box.y2 - paint_box.y1,
                                                 rowstride);
  cr = cairo_create (surface);

  /* TODO - support non-uniform border colors */
  get_arbitrary_border_color (node, &border_color);

-  st_theme_node_reduce_border_radius (node, width, height, radius);
+  st_theme_node_reduce_border_radius (node, radius);

  for (i = 0; i < 4; i++)
    border_width[i] = st_theme_node_get_border_width (node, i);
@ -1016,7 +1007,7 @@ st_theme_node_prerender_background (StThemeNode *node,
   */
  if (node->background_gradient_type != ST_GRADIENT_NONE)
    {
-      pattern = create_cairo_pattern_of_background_gradient (node, width, height);
+      pattern = create_cairo_pattern_of_background_gradient (node);
      draw_solid_background = FALSE;

      /* If the gradient has any translucent areas, we need to
@ -1038,7 +1029,7 @@ st_theme_node_prerender_background (StThemeNode *node,

      if (background_image != NULL)
        {
-          pattern = create_cairo_pattern_of_background_image (node, width, height,
+          pattern = create_cairo_pattern_of_background_image (node,
                                                              &draw_solid_background);
          if (shadow_spec && pattern != NULL)
            draw_background_image_shadow = TRUE;
@ -1226,7 +1217,8 @@ st_theme_node_prerender_background (StThemeNode *node,
                                                      has_visible_outline?  outline_path : NULL,
                                                      actor_box.x1,
                                                      actor_box.y1,
-                                                      width, height);
+                                                      paint_box.x2 - paint_box.x1,
+                                                      paint_box.y2 - paint_box.y1);
      cairo_append_path (cr, outline_path);
    }

@ -1254,7 +1246,8 @@ st_theme_node_prerender_background (StThemeNode *node,
  if (interior_path != NULL)
    cairo_path_destroy (interior_path);

-  texture = cogl_texture_new_from_data (width, height,
+  texture = cogl_texture_new_from_data (paint_box.x2 - paint_box.x1,
+                                        paint_box.y2 - paint_box.y1,
                                        COGL_TEXTURE_NONE,
                                        CLUTTER_CAIRO_FORMAT_ARGB32,
                                        COGL_PIXEL_FORMAT_ANY,
@ -1268,130 +1261,84 @@ st_theme_node_prerender_background (StThemeNode *node,
  return texture;
 }

+void
+_st_theme_node_free_drawing_state (StThemeNode  *node)
+{
+  int corner_id;
+
+  if (node->background_texture != COGL_INVALID_HANDLE)
+    cogl_handle_unref (node->background_texture);
+  if (node->background_material != COGL_INVALID_HANDLE)
+    cogl_handle_unref (node->background_material);
+  if (node->background_shadow_material != COGL_INVALID_HANDLE)
+    cogl_handle_unref (node->background_shadow_material);
+  if (node->border_slices_texture != COGL_INVALID_HANDLE)
+    cogl_handle_unref (node->border_slices_texture);
+  if (node->border_slices_material != COGL_INVALID_HANDLE)
+    cogl_handle_unref (node->border_slices_material);
+  if (node->prerendered_texture != COGL_INVALID_HANDLE)
+    cogl_handle_unref (node->prerendered_texture);
+  if (node->prerendered_material != COGL_INVALID_HANDLE)
+    cogl_handle_unref (node->prerendered_material);
+  if (node->box_shadow_material != COGL_INVALID_HANDLE)
+    cogl_handle_unref (node->box_shadow_material);
+
+  for (corner_id = 0; corner_id < 4; corner_id++)
+    if (node->corner_material[corner_id] != COGL_INVALID_HANDLE)
+      cogl_handle_unref (node->corner_material[corner_id]);
+
+  _st_theme_node_init_drawing_state (node);
+}
+
+void
+_st_theme_node_init_drawing_state (StThemeNode *node)
+{
+  int corner_id;
+
+  node->background_texture = COGL_INVALID_HANDLE;
+  node->background_material = COGL_INVALID_HANDLE;
+  node->background_shadow_material = COGL_INVALID_HANDLE;
+  node->box_shadow_material = COGL_INVALID_HANDLE;
+  node->border_slices_texture = COGL_INVALID_HANDLE;
+  node->border_slices_material = COGL_INVALID_HANDLE;
+  node->prerendered_texture = COGL_INVALID_HANDLE;
+  node->prerendered_material = COGL_INVALID_HANDLE;
+
+  for (corner_id = 0; corner_id < 4; corner_id++)
+    node->corner_material[corner_id] = COGL_INVALID_HANDLE;
+}
+
 static void st_theme_node_paint_borders (StThemeNode           *node,
-                                         StThemeNodePaintState *state,
                                         const ClutterActorBox *box,
                                         guint8                 paint_opacity);

-void
-st_theme_node_invalidate_border_image (StThemeNode *node)
-{
-  if (node->border_slices_texture != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (node->border_slices_texture);
-      node->border_slices_texture = COGL_INVALID_HANDLE;
-    }
-
-  if (node->border_slices_material != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (node->border_slices_material);
-      node->border_slices_material = COGL_INVALID_HANDLE;
-    }
-}
-
-static gboolean
-st_theme_node_load_border_image (StThemeNode *node)
-{
-  if (node->border_slices_texture == COGL_INVALID_HANDLE)
-    {
-      StBorderImage *border_image;
-
-      border_image = st_theme_node_get_border_image (node);
-      if (border_image == NULL)
-        goto out;
-
-      const char *filename;
-      filename = st_border_image_get_filename (border_image);
-      node->border_slices_texture = st_texture_cache_load_file_to_cogl_texture (st_texture_cache_get_default (),
-                                                                                filename);
-      if (node->border_slices_texture == COGL_INVALID_HANDLE)
-        goto out;
-
-      node->border_slices_material = _st_create_texture_material (node->border_slices_texture);
-    }
-
- out:
-  return node->border_slices_texture != COGL_INVALID_HANDLE;
-}
-
-void
-st_theme_node_invalidate_background_image (StThemeNode *node)
-{
-  if (node->background_texture != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (node->background_texture);
-      node->background_texture = COGL_INVALID_HANDLE;
-    }
-
-  if (node->background_material != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (node->background_material);
-      node->background_material = COGL_INVALID_HANDLE;
-    }
-
-  if (node->background_shadow_material != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (node->background_shadow_material);
-      node->background_shadow_material = COGL_INVALID_HANDLE;
-    }
-}
-
-static gboolean
-st_theme_node_load_background_image (StThemeNode *node)
-{
-  if (node->background_texture == COGL_INVALID_HANDLE)
-    {
-      const char *background_image;
-      StShadow *background_image_shadow_spec;
-
-      background_image = st_theme_node_get_background_image (node);
-      if (background_image == NULL)
-        goto out;
-
-      background_image_shadow_spec = st_theme_node_get_background_image_shadow (node);
-      node->background_texture = st_texture_cache_load_file_to_cogl_texture (st_texture_cache_get_default (),
-                                                                             background_image);
-      if (node->background_texture == COGL_INVALID_HANDLE)
-        goto out;
-
-      node->background_material = _st_create_texture_material (node->background_texture);
-
-      if (node->background_repeat)
-        cogl_material_set_layer_wrap_mode (node->background_material, 0, COGL_MATERIAL_WRAP_MODE_REPEAT);
-
-      if (background_image_shadow_spec)
-        {
-          node->background_shadow_material = _st_create_shadow_material (background_image_shadow_spec,
-                                                                         node->background_texture);
-        }
-    }
-
- out:
-  return node->background_texture != COGL_INVALID_HANDLE;
-}
-
 static void
-st_theme_node_render_resources (StThemeNode           *node,
-                                StThemeNodePaintState *state,
-                                float                  width,
-                                float                  height)
+st_theme_node_render_resources (StThemeNode   *node,
+                                float          width,
+                                float          height)
 {
+  StTextureCache *texture_cache;
+  StBorderImage *border_image;
  gboolean has_border;
  gboolean has_border_radius;
  gboolean has_inset_box_shadow;
  gboolean has_large_corners;
  StShadow *box_shadow_spec;
+  StShadow *background_image_shadow_spec;
+  const char *background_image;

  g_return_if_fail (width > 0 && height > 0);

+  texture_cache = st_texture_cache_get_default ();
+
  /* FIXME - need to separate this into things that need to be recomputed on
   * geometry change versus things that can be cached regardless, such as
   * a background image.
   */
-  st_theme_node_paint_state_free (state);
+  _st_theme_node_free_drawing_state (node);

-  state->alloc_width = width;
-  state->alloc_height = height;
+  node->alloc_width = width;
+  node->alloc_height = height;

  _st_theme_node_ensure_background (node);
  _st_theme_node_ensure_geometry (node);
@ -1425,7 +1372,7 @@ st_theme_node_render_resources (StThemeNode           *node,
    guint border_radius[4];
    int corner;

-    st_theme_node_reduce_border_radius (node, width, height, border_radius);
+    st_theme_node_reduce_border_radius (node, border_radius);

    for (corner = 0; corner < 4; corner ++) {
      if (border_radius[corner] * 2 > height ||
@ -1436,14 +1383,32 @@ st_theme_node_render_resources (StThemeNode           *node,
    }
  }

-  state->corner_material[ST_CORNER_TOPLEFT] =
-    st_theme_node_lookup_corner (node, width, height, ST_CORNER_TOPLEFT);
-  state->corner_material[ST_CORNER_TOPRIGHT] =
-    st_theme_node_lookup_corner (node, width, height, ST_CORNER_TOPRIGHT);
-  state->corner_material[ST_CORNER_BOTTOMRIGHT] =
-    st_theme_node_lookup_corner (node, width, height, ST_CORNER_BOTTOMRIGHT);
-  state->corner_material[ST_CORNER_BOTTOMLEFT] =
-    st_theme_node_lookup_corner (node, width, height, ST_CORNER_BOTTOMLEFT);
+  /* Load referenced images from disk and draw anything we need with cairo now */
+  background_image = st_theme_node_get_background_image (node);
+  border_image = st_theme_node_get_border_image (node);
+
+  if (border_image)
+    {
+      const char *filename;
+
+      filename = st_border_image_get_filename (border_image);
+
+      node->border_slices_texture = st_texture_cache_load_file_to_cogl_texture (texture_cache, filename);
+    }
+
+  if (node->border_slices_texture)
+    node->border_slices_material = _st_create_texture_material (node->border_slices_texture);
+  else
+    node->border_slices_material = COGL_INVALID_HANDLE;
+
+  node->corner_material[ST_CORNER_TOPLEFT] =
+    st_theme_node_lookup_corner (node, ST_CORNER_TOPLEFT);
+  node->corner_material[ST_CORNER_TOPRIGHT] =
+    st_theme_node_lookup_corner (node, ST_CORNER_TOPRIGHT);
+  node->corner_material[ST_CORNER_BOTTOMRIGHT] =
+    st_theme_node_lookup_corner (node, ST_CORNER_BOTTOMRIGHT);
+  node->corner_material[ST_CORNER_BOTTOMLEFT] =
+    st_theme_node_lookup_corner (node, ST_CORNER_BOTTOMLEFT);

  /* Use cairo to prerender the node if there is a gradient, or
   * background image with borders and/or rounded corners,
@ -1456,23 +1421,23 @@ st_theme_node_render_resources (StThemeNode           *node,
   */
  if ((node->background_gradient_type != ST_GRADIENT_NONE)
      || (has_inset_box_shadow && (has_border || node->background_color.alpha > 0))
-      || (st_theme_node_get_background_image (node) && (has_border || has_border_radius))
+      || (background_image && (has_border || has_border_radius))
      || has_large_corners)
-    state->prerendered_texture = st_theme_node_prerender_background (node, width, height);
+    node->prerendered_texture = st_theme_node_prerender_background (node);

-  if (state->prerendered_texture)
-    state->prerendered_material = _st_create_texture_material (state->prerendered_texture);
+  if (node->prerendered_texture)
+    node->prerendered_material = _st_create_texture_material (node->prerendered_texture);
  else
-    state->prerendered_material = COGL_INVALID_HANDLE;
+    node->prerendered_material = COGL_INVALID_HANDLE;

  if (box_shadow_spec && !has_inset_box_shadow)
    {
-      if (st_theme_node_load_border_image (node))
-        state->box_shadow_material = _st_create_shadow_material (box_shadow_spec,
-                                                                 node->border_slices_texture);
-      else if (state->prerendered_texture != COGL_INVALID_HANDLE)
-        state->box_shadow_material = _st_create_shadow_material (box_shadow_spec,
-                                                                 state->prerendered_texture);
+      if (node->border_slices_texture != COGL_INVALID_HANDLE)
+        node->box_shadow_material = _st_create_shadow_material (box_shadow_spec,
+                                                                node->border_slices_texture);
+      else if (node->prerendered_texture != COGL_INVALID_HANDLE)
+        node->box_shadow_material = _st_create_shadow_material (box_shadow_spec,
+                                                                node->prerendered_texture);
      else if (node->background_color.alpha > 0 || has_border)
        {
          CoglHandle buffer, offscreen;
@ -1496,16 +1461,32 @@ st_theme_node_render_resources (StThemeNode           *node,
              cogl_color_set_from_4ub (&clear_color, 0, 0, 0, 0);
              cogl_clear (&clear_color, COGL_BUFFER_BIT_COLOR);

-              st_theme_node_paint_borders (node, state, &box, 0xFF);
+              st_theme_node_paint_borders (node, &box, 0xFF);
              cogl_pop_framebuffer ();
              cogl_handle_unref (offscreen);

-              state->box_shadow_material = _st_create_shadow_material (box_shadow_spec,
-                                                                       buffer);
+              node->box_shadow_material = _st_create_shadow_material (box_shadow_spec,
+                                                                      buffer);
            }
          cogl_handle_unref (buffer);
        }
    }
+
+  background_image_shadow_spec = st_theme_node_get_background_image_shadow (node);
+  if (background_image != NULL && !has_border && !has_border_radius)
+    {
+      node->background_texture = st_texture_cache_load_file_to_cogl_texture (texture_cache, background_image);
+      node->background_material = _st_create_texture_material (node->background_texture);
+
+      if (node->background_repeat)
+        cogl_material_set_layer_wrap_mode (node->background_material, 0, COGL_MATERIAL_WRAP_MODE_REPEAT);
+
+      if (background_image_shadow_spec)
+        {
+          node->background_shadow_material = _st_create_shadow_material (background_image_shadow_spec,
+                                                                         node->background_texture);
+        }
+    }
 }

 static void
@ -1528,7 +1509,6 @@ paint_material_with_opacity (CoglHandle       material,

 static void
 st_theme_node_paint_borders (StThemeNode           *node,
-                             StThemeNodePaintState *state,
                             const ClutterActorBox *box,
                             guint8                 paint_opacity)
 {
@ -1550,7 +1530,7 @@ st_theme_node_paint_borders (StThemeNode           *node,
  for (side_id = 0; side_id < 4; side_id++)
    border_width[side_id] = st_theme_node_get_border_width(node, side_id);

-  st_theme_node_reduce_border_radius (node, width, height, border_radius);
+  st_theme_node_reduce_border_radius (node, border_radius);

  for (corner_id = 0; corner_id < 4; corner_id++)
    {
@ -1635,13 +1615,13 @@ st_theme_node_paint_borders (StThemeNode           *node,
    {
      for (corner_id = 0; corner_id < 4; corner_id++)
        {
-          if (state->corner_material[corner_id] == COGL_INVALID_HANDLE)
+          if (node->corner_material[corner_id] == COGL_INVALID_HANDLE)
            continue;

-          cogl_material_set_color4ub (state->corner_material[corner_id],
+          cogl_material_set_color4ub (node->corner_material[corner_id],
                                      paint_opacity, paint_opacity,
                                      paint_opacity, paint_opacity);
-          cogl_set_source (state->corner_material[corner_id]);
+          cogl_set_source (node->corner_material[corner_id]);

          switch (corner_id)
            {
@ -1794,8 +1774,7 @@ st_theme_node_paint_borders (StThemeNode           *node,

 static void
 st_theme_node_paint_sliced_border_image (StThemeNode           *node,
-                                         float                  width,
-                                         float                  height,
+                                         const ClutterActorBox *box,
                                         guint8                 paint_opacity)
 {
  gfloat ex, ey;
@ -1819,11 +1798,11 @@ st_theme_node_paint_sliced_border_image (StThemeNode           *node,
  ty1 = border_top / img_height;
  ty2 = (img_height - border_bottom) / img_height;

-  ex = width - border_right;
+  ex = node->alloc_width - border_right;
  if (ex < 0)
    ex = border_right;           /* FIXME ? */

-  ey = height - border_bottom;
+  ey = node->alloc_height - border_bottom;
  if (ey < 0)
    ey = border_bottom;          /* FIXME ? */

@ -1847,7 +1826,7 @@ st_theme_node_paint_sliced_border_image (StThemeNode           *node,
      tx2, ty1,

      /* top right */
-      ex, 0, width, border_top,
+      ex, 0, node->alloc_width, border_top,
      tx2, 0.0,
      1.0, ty1,

@ -1862,22 +1841,22 @@ st_theme_node_paint_sliced_border_image (StThemeNode           *node,
      tx2, ty2,

      /* mid right */
-      ex, border_top, width, ey,
+      ex, border_top, node->alloc_width, ey,
      tx2, ty1,
      1.0, ty2,

      /* bottom left */
-      0, ey, border_left, height,
+      0, ey, border_left, node->alloc_height,
      0.0, ty2,
      tx1, 1.0,

      /* bottom center */
-      border_left, ey, ex, height,
+      border_left, ey, ex, node->alloc_height,
      tx1, ty2,
      tx2, 1.0,

      /* bottom right */
-      ex, ey, width, height,
+      ex, ey, node->alloc_width, node->alloc_height,
      tx2, ty2,
      1.0, 1.0
    };
@ -1947,7 +1926,6 @@ st_theme_node_paint_outline (StThemeNode           *node,

 void
 st_theme_node_paint (StThemeNode           *node,
-                     StThemeNodePaintState *state,
                     const ClutterActorBox *box,
                     guint8                 paint_opacity)
 {
@ -1964,11 +1942,8 @@ st_theme_node_paint (StThemeNode           *node,
  if (width <= 0 || height <= 0)
    return;

-  if (state->alloc_width != width || state->alloc_height != height)
-    {
-      state->node = node;
-      st_theme_node_render_resources (node, state, width, height);
-    }
+  if (node->alloc_width != width || node->alloc_height != height)
+    st_theme_node_render_resources (node, width, height);

  /* Rough notes about the relationship of borders and backgrounds in CSS3;
   * see http://www.w3.org/TR/css3-background/ for more accurate details.
@ -1996,16 +1971,16 @@ st_theme_node_paint (StThemeNode           *node,
   *    such that it's aligned to the outside edges)
   */

-  if (state->box_shadow_material)
+  if (node->box_shadow_material)
    _st_paint_shadow_with_opacity (node->box_shadow,
-                                   state->box_shadow_material,
+                                   node->box_shadow_material,
                                   &allocation,
                                   paint_opacity);

-  if (state->prerendered_material != COGL_INVALID_HANDLE ||
-      st_theme_node_load_border_image (node))
+  if (node->prerendered_material != COGL_INVALID_HANDLE ||
+      node->border_slices_material != COGL_INVALID_HANDLE)
    {
-      if (state->prerendered_material != COGL_INVALID_HANDLE)
+      if (node->prerendered_material != COGL_INVALID_HANDLE)
        {
          ClutterActorBox paint_box;

@ -2013,24 +1988,23 @@ st_theme_node_paint (StThemeNode           *node,
                                                  &allocation,
                                                  &paint_box);

-          paint_material_with_opacity (state->prerendered_material,
+          paint_material_with_opacity (node->prerendered_material,
                                       &paint_box,
                                       NULL,
                                       paint_opacity);
        }

      if (node->border_slices_material != COGL_INVALID_HANDLE)
-        st_theme_node_paint_sliced_border_image (node, width, height, paint_opacity);
+        st_theme_node_paint_sliced_border_image (node, &allocation, paint_opacity);
    }
  else
    {
-      st_theme_node_paint_borders (node, state, box, paint_opacity);
+      st_theme_node_paint_borders (node, box, paint_opacity);
    }

  st_theme_node_paint_outline (node, box, paint_opacity);

-  if (state->prerendered_material == COGL_INVALID_HANDLE &&
-      st_theme_node_load_background_image (node))
+  if (node->background_texture != COGL_INVALID_HANDLE)
    {
      ClutterActorBox background_box;
      ClutterActorBox texture_coords;
@ -2076,69 +2050,60 @@ st_theme_node_paint (StThemeNode           *node,
    }
 }

+/**
+ * st_theme_node_copy_cached_paint_state:
+ * @node: a #StThemeNode
+ * @other: a different #StThemeNode
+ *
+ * Copy cached painting state from @other to @node. This function can be used to
+ * optimize redrawing cached background images when the style on an element changess
+ * in a way that doesn't affect background drawing. This function must only be called
+ * if st_theme_node_paint_equal (node, other) returns %TRUE.
+ */
 void
-st_theme_node_paint_state_free (StThemeNodePaintState *state)
+st_theme_node_copy_cached_paint_state (StThemeNode *node,
+                                       StThemeNode *other)
 {
  int corner_id;

-  if (state->prerendered_texture != COGL_INVALID_HANDLE)
-    cogl_handle_unref (state->prerendered_texture);
-  if (state->prerendered_material != COGL_INVALID_HANDLE)
-    cogl_handle_unref (state->prerendered_material);
-  if (state->box_shadow_material != COGL_INVALID_HANDLE)
-    cogl_handle_unref (state->box_shadow_material);
+  g_return_if_fail (ST_IS_THEME_NODE (node));
+  g_return_if_fail (ST_IS_THEME_NODE (other));

-  for (corner_id = 0; corner_id < 4; corner_id++)
-    if (state->corner_material[corner_id] != COGL_INVALID_HANDLE)
-      cogl_handle_unref (state->corner_material[corner_id]);
-
-  st_theme_node_paint_state_init (state);
-}
-
-void
-st_theme_node_paint_state_init (StThemeNodePaintState *state)
-{
-  int corner_id;
-
-  state->node = NULL;
-  state->box_shadow_material = COGL_INVALID_HANDLE;
-  state->prerendered_texture = COGL_INVALID_HANDLE;
-  state->prerendered_material = COGL_INVALID_HANDLE;
-
-  for (corner_id = 0; corner_id < 4; corner_id++)
-    state->corner_material[corner_id] = COGL_INVALID_HANDLE;
-}
-
-void
-st_theme_node_paint_state_copy (StThemeNodePaintState *state,
-                                StThemeNodePaintState *other)
-{
-  int corner_id;
-
-  if (state == other)
+  if (node == other)
    return;

-  st_theme_node_paint_state_free (state);
+  /* Check omitted for speed: */
+  /* g_return_if_fail (st_theme_node_paint_equal (node, other)); */

-  state->node = other->node;
+  _st_theme_node_free_drawing_state (node);

-  state->alloc_width = other->alloc_width;
-  state->alloc_height = other->alloc_height;
+  node->alloc_width = other->alloc_width;
+  node->alloc_height = other->alloc_height;

+  if (other->background_shadow_material)
+    node->background_shadow_material = cogl_handle_ref (other->background_shadow_material);
  if (other->box_shadow_material)
-    state->box_shadow_material = cogl_handle_ref (other->box_shadow_material);
+    node->box_shadow_material = cogl_handle_ref (other->box_shadow_material);
+  if (other->background_texture)
+    node->background_texture = cogl_handle_ref (other->background_texture);
+  if (other->background_material)
+    node->background_material = cogl_handle_ref (other->background_material);
+  if (other->border_slices_texture)
+    node->border_slices_texture = cogl_handle_ref (other->border_slices_texture);
+  if (other->border_slices_material)
+    node->border_slices_material = cogl_handle_ref (other->border_slices_material);
  if (other->prerendered_texture)
-    state->prerendered_texture = cogl_handle_ref (other->prerendered_texture);
+    node->prerendered_texture = cogl_handle_ref (other->prerendered_texture);
  if (other->prerendered_material)
-    state->prerendered_material = cogl_handle_ref (other->prerendered_material);
+    node->prerendered_material = cogl_handle_ref (other->prerendered_material);
  for (corner_id = 0; corner_id < 4; corner_id++)
    if (other->corner_material[corner_id])
-      state->corner_material[corner_id] = cogl_handle_ref (other->corner_material[corner_id]);
+      node->corner_material[corner_id] = cogl_handle_ref (other->corner_material[corner_id]);
 }

 void
-st_theme_node_paint_state_invalidate (StThemeNodePaintState *state)
+st_theme_node_invalidate_paint_state (StThemeNode *node)
 {
-  state->alloc_width = 0;
-  state->alloc_height = 0;
+  node->alloc_width = 0;
+  node->alloc_height = 0;
 }
--- a/src/st/st-theme-node-private.h
+++ b/src/st/st-theme-node-private.h
@ -100,11 +100,19 @@ struct _StThemeNode {
  guint text_shadow_computed : 1;
  guint link_type : 2;

-  CoglHandle border_slices_texture;
-  CoglHandle border_slices_material;
+  /* Graphics state */
+  float alloc_width;
+  float alloc_height;
+
+  CoglHandle background_shadow_material;
+  CoglHandle box_shadow_material;
  CoglHandle background_texture;
  CoglHandle background_material;
-  CoglHandle background_shadow_material;
+  CoglHandle border_slices_texture;
+  CoglHandle border_slices_material;
+  CoglHandle prerendered_texture;
+  CoglHandle prerendered_material;
+  CoglHandle corner_material[4];
 };

 struct _StThemeNodeClass {
@ -115,6 +123,9 @@ struct _StThemeNodeClass {
 void _st_theme_node_ensure_background (StThemeNode *node);
 void _st_theme_node_ensure_geometry (StThemeNode *node);

+void _st_theme_node_init_drawing_state (StThemeNode *node);
+void _st_theme_node_free_drawing_state (StThemeNode *node);
+
 G_END_DECLS

 #endif /* __ST_THEME_NODE_PRIVATE_H__ */
--- a/src/st/st-theme-node-transition.c
+++ b/src/st/st-theme-node-transition.c
@ -33,9 +33,6 @@ struct _StThemeNodeTransitionPrivate {
  StThemeNode *old_theme_node;
  StThemeNode *new_theme_node;

-  StThemeNodePaintState old_paint_state;
-  StThemeNodePaintState new_paint_state;
-
  CoglHandle old_texture;
  CoglHandle new_texture;

@ -78,7 +75,6 @@ on_timeline_new_frame (ClutterTimeline       *timeline,
 StThemeNodeTransition *
 st_theme_node_transition_new (StThemeNode *from_node,
                              StThemeNode *to_node,
-                              StThemeNodePaintState *old_paint_state,
                              guint        duration)
 {
  StThemeNodeTransition *transition;
@ -94,9 +90,6 @@ st_theme_node_transition_new (StThemeNode *from_node,
  transition->priv->old_theme_node = g_object_ref (from_node);
  transition->priv->new_theme_node = g_object_ref (to_node);

-  st_theme_node_paint_state_copy (&transition->priv->old_paint_state,
-                                  old_paint_state);
-
  transition->priv->timeline = clutter_timeline_new (duration);

  transition->priv->timeline_completed_id =
@ -113,12 +106,6 @@ st_theme_node_transition_new (StThemeNode *from_node,
  return transition;
 }

-StThemeNodePaintState *
-st_theme_node_transition_get_new_paint_state (StThemeNodeTransition *transition)
-{
-  return &transition->priv->new_paint_state;
-}
-
 void
 st_theme_node_transition_update (StThemeNodeTransition *transition,
                                 StThemeNode           *new_node)
@ -147,12 +134,6 @@ st_theme_node_transition_update (StThemeNodeTransition *transition,
   */
  if (st_theme_node_equal (new_node, old_node))
    {
-      {
-        StThemeNodePaintState tmp = priv->old_paint_state;
-        priv->old_paint_state = priv->new_paint_state;
-        priv->new_paint_state = tmp;
-      }
-
      if (clutter_timeline_get_elapsed_time (priv->timeline) > 0)
        {
          if (direction == CLUTTER_TIMELINE_FORWARD)
@ -181,10 +162,15 @@ st_theme_node_transition_update (StThemeNodeTransition *transition,

          clutter_timeline_set_duration (priv->timeline, new_duration);

+          /* If the change doesn't affect painting, we don't need to redraw,
+           * but we still need to replace the node so that we properly share
+           * caching with the painting that happens after the transition finishes.
+           */
+          if (!st_theme_node_paint_equal (priv->new_theme_node, new_node))
+              priv->needs_setup = TRUE;
+
          g_object_unref (priv->new_theme_node);
          priv->new_theme_node = g_object_ref (new_node);
-
-          st_theme_node_paint_state_invalidate (&priv->new_paint_state);
        }
    }
 }
@ -299,7 +285,7 @@ setup_framebuffers (StThemeNodeTransition *transition,
  cogl_ortho (priv->offscreen_box.x1, priv->offscreen_box.x2,
              priv->offscreen_box.y2, priv->offscreen_box.y1,
              0.0, 1.0);
-  st_theme_node_paint (priv->old_theme_node, &priv->old_paint_state, allocation, 255);
+  st_theme_node_paint (priv->old_theme_node, allocation, 255);
  cogl_pop_framebuffer ();

  cogl_push_framebuffer (priv->new_offscreen);
@ -307,7 +293,7 @@ setup_framebuffers (StThemeNodeTransition *transition,
  cogl_ortho (priv->offscreen_box.x1, priv->offscreen_box.x2,
              priv->offscreen_box.y2, priv->offscreen_box.y1,
              0.0, 1.0);
-  st_theme_node_paint (priv->new_theme_node, &priv->new_paint_state, allocation, 255);
+  st_theme_node_paint (priv->new_theme_node, allocation, 255);
  cogl_pop_framebuffer ();

  return TRUE;
@ -422,9 +408,6 @@ st_theme_node_transition_dispose (GObject *object)
  priv->timeline_completed_id = 0;
  priv->timeline_new_frame_id = 0;

-  st_theme_node_paint_state_free (&priv->old_paint_state);
-  st_theme_node_paint_state_free (&priv->new_paint_state);
-
  G_OBJECT_CLASS (st_theme_node_transition_parent_class)->dispose (object);
 }

@ -442,9 +425,6 @@ st_theme_node_transition_init (StThemeNodeTransition *transition)
  transition->priv->old_offscreen = NULL;
  transition->priv->new_offscreen = NULL;

-  st_theme_node_paint_state_init (&transition->priv->old_paint_state);
-  st_theme_node_paint_state_init (&transition->priv->new_paint_state);
-
  transition->priv->needs_setup = TRUE;
 }

--- a/src/st/st-theme-node-transition.h
+++ b/src/st/st-theme-node-transition.h
@ -56,7 +56,6 @@ GType st_theme_node_transition_get_type (void) G_GNUC_CONST;

 StThemeNodeTransition *st_theme_node_transition_new (StThemeNode *from_node,
                                                     StThemeNode *to_node,
-                                                     StThemeNodePaintState *old_paint_state,
                                                     guint        duration);

 void  st_theme_node_transition_update   (StThemeNodeTransition *transition,
@ -70,8 +69,6 @@ void  st_theme_node_transition_get_paint_box (StThemeNodeTransition *transition,
                                              const ClutterActorBox *allocation,
                                              ClutterActorBox       *paint_box);

-StThemeNodePaintState * st_theme_node_transition_get_new_paint_state (StThemeNodeTransition *transition);
-
 G_END_DECLS

 #endif
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@ -49,11 +49,7 @@ static void
 st_theme_node_init (StThemeNode *node)
 {
  node->transition_duration = -1;
-  node->background_texture = COGL_INVALID_HANDLE;
-  node->background_material = COGL_INVALID_HANDLE;
-  node->background_shadow_material = COGL_INVALID_HANDLE;
-  node->border_slices_texture = COGL_INVALID_HANDLE;
-  node->border_slices_material = COGL_INVALID_HANDLE;
+  _st_theme_node_init_drawing_state (node);
 }

 static void
@ -156,16 +152,7 @@ st_theme_node_finalize (GObject *object)
  if (node->background_image)
    g_free (node->background_image);

-  if (node->background_texture != COGL_INVALID_HANDLE)
-    cogl_handle_unref (node->background_texture);
-  if (node->background_material != COGL_INVALID_HANDLE)
-    cogl_handle_unref (node->background_material);
-  if (node->background_shadow_material != COGL_INVALID_HANDLE)
-    cogl_handle_unref (node->background_shadow_material);
-  if (node->border_slices_texture != COGL_INVALID_HANDLE)
-    cogl_handle_unref (node->border_slices_texture);
-  if (node->border_slices_material != COGL_INVALID_HANDLE)
-    cogl_handle_unref (node->border_slices_material);
+  _st_theme_node_free_drawing_state (node);

  G_OBJECT_CLASS (st_theme_node_parent_class)->finalize (object);
 }
@ -3801,8 +3788,8 @@ st_theme_node_geometry_equal (StThemeNode *node,

 /**
 * st_theme_node_paint_equal:
- * @node: (allow-none): a #StThemeNode
- * @other: (allow-none): a different #StThemeNode
+ * @node: a #StThemeNode
+ * @other: a different #StThemeNode
 *
 * Check if st_theme_node_paint() will paint identically for @node as it does
 * for @other. Note that in some cases this function may return %TRUE even
@ -3819,13 +3806,13 @@ st_theme_node_paint_equal (StThemeNode *node,
  StShadow *shadow, *other_shadow;
  int i;

-  /* Make sure NULL != NULL */
-  if (node == NULL || other == NULL)
-    return FALSE;
+  g_return_val_if_fail (ST_IS_THEME_NODE (node), FALSE);

  if (node == other)
    return TRUE;

+  g_return_val_if_fail (ST_IS_THEME_NODE (other), FALSE);
+
  _st_theme_node_ensure_background (node);
  _st_theme_node_ensure_background (other);

@ -3894,30 +3881,3 @@ st_theme_node_paint_equal (StThemeNode *node,

  return TRUE;
 }
-
-gchar *
-st_theme_node_to_string (StThemeNode *node)
-{
-  GString *desc;
-  gchar **it;
-
-  if (!node)
-    return g_strdup ("[null]");
-
-  desc = g_string_new (NULL);
-  g_string_append_printf (desc,
-                          "[%p %s#%s",
-                          node,
-                          g_type_name (node->element_type),
-                          node->element_id);
-
-  for (it = node->element_classes; it && *it; it++)
-    g_string_append_printf (desc, ".%s", *it);
-
-  for (it = node->pseudo_classes; it && *it; it++)
-    g_string_append_printf (desc, ":%s", *it);
-
-  g_string_append_c (desc, ']');
-
-  return g_string_free (desc, FALSE);
-}
--- a/src/st/st-theme-node.h
+++ b/src/st/st-theme-node.h
@ -94,20 +94,6 @@ typedef enum {
  ST_GRADIENT_RADIAL
 } StGradientType;

-typedef struct _StThemeNodePaintState StThemeNodePaintState;
-
-struct _StThemeNodePaintState {
-  StThemeNode *node;
-
-  float alloc_width;
-  float alloc_height;
-
-  CoglHandle box_shadow_material;
-  CoglHandle prerendered_texture;
-  CoglHandle prerendered_material;
-  CoglHandle corner_material[4];
-};
-
 GType st_theme_node_get_type (void) G_GNUC_CONST;

 StThemeNode *st_theme_node_new (StThemeContext *context,
@ -264,20 +250,12 @@ gboolean st_theme_node_paint_equal    (StThemeNode *node,
                                       StThemeNode *other);

 void st_theme_node_paint (StThemeNode            *node,
-                          StThemeNodePaintState  *state,
                          const ClutterActorBox  *box,
                          guint8                  paint_opacity);

-void st_theme_node_invalidate_background_image (StThemeNode *node);
-void st_theme_node_invalidate_border_image (StThemeNode *node);
-
-gchar * st_theme_node_to_string (StThemeNode *node);
-
-void st_theme_node_paint_state_init (StThemeNodePaintState *state);
-void st_theme_node_paint_state_free (StThemeNodePaintState *state);
-void st_theme_node_paint_state_copy (StThemeNodePaintState *state,
-                                     StThemeNodePaintState *other);
-void st_theme_node_paint_state_invalidate (StThemeNodePaintState *state);
+void st_theme_node_copy_cached_paint_state (StThemeNode *node,
+                                            StThemeNode *other);
+void st_theme_node_invalidate_paint_state  (StThemeNode *node);

 G_END_DECLS

--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@ -79,9 +79,6 @@ struct _StWidgetPrivate
   * that we can remove the pseudo classes on them. */
  StWidget *prev_last_child;
  StWidget *prev_first_child;
-
-  StThemeNodePaintState paint_states[2];
-  int current_paint_state : 2;
 };

 /**
@ -272,18 +269,6 @@ st_widget_remove_transition (StWidget *widget)
    }
 }

-static void
-next_paint_state (StWidget *widget)
-{
-  widget->priv->current_paint_state = (widget->priv->current_paint_state + 1) % G_N_ELEMENTS (widget->priv->paint_states);
-}
-
-static StThemeNodePaintState *
-current_paint_state (StWidget *widget)
-{
-  return &widget->priv->paint_states[widget->priv->current_paint_state];
-}
-
 static void
 st_widget_texture_cache_changed (StTextureCache *cache,
                                 const char     *uri,
@ -291,43 +276,30 @@ st_widget_texture_cache_changed (StTextureCache *cache,
 {
  StWidget *actor = ST_WIDGET (user_data);
  StThemeNode *node = actor->priv->theme_node;
+  StBorderImage *border_image;
  char *path;
-  gboolean changed = FALSE;
+  gboolean changed;

  if (node == NULL)
    return;

  path = g_filename_from_uri (uri, NULL, NULL);

-  if (g_strcmp0 (st_theme_node_get_background_image (node), path) == 0)
-    {
-      st_theme_node_invalidate_background_image (node);
-      changed = TRUE;
-    }
+  changed = g_strcmp0 (st_theme_node_get_background_image (node), path) == 0;

-  if (g_strcmp0 (st_border_image_get_filename (st_theme_node_get_border_image (node)), path) == 0)
-    {
-      st_theme_node_invalidate_border_image (node);
-      changed = TRUE;
-    }
-
-  if (changed)
-    {
-      /* If we prerender the background / border, we need to update
-       * the paint state. We should probably implement a method to
-       * the theme node to determine this, but for now, just wipe
-       * the entire paint state.
-       *
-       * Use the existing state instead of a new one because it's
-       * assumed the rest of the state will stay the same.
-       */
-      st_theme_node_paint_state_invalidate (current_paint_state (actor));
-
-      if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (actor)))
-        clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
-    }
+  border_image = st_theme_node_get_border_image (node);
+  if (!changed && border_image)
+    changed = strcmp (st_border_image_get_filename (border_image), path) == 0;

  g_free (path);
+
+  if (!changed)
+    return;
+
+  st_theme_node_invalidate_paint_state (node);
+
+  if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (actor)))
+    clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
 }

 static void
@ -376,7 +348,6 @@ static void
 st_widget_finalize (GObject *gobject)
 {
  StWidgetPrivate *priv = ST_WIDGET (gobject)->priv;
-  int i;

  g_free (priv->style_class);
  g_free (priv->pseudo_class);
@ -384,9 +355,6 @@ st_widget_finalize (GObject *gobject)
  g_free (priv->accessible_name);
  g_free (priv->inline_style);

-  for (i = 0; i < G_N_ELEMENTS (priv->paint_states); i++)
-    st_theme_node_paint_state_init (&priv->paint_states[i]);
-
  G_OBJECT_CLASS (st_widget_parent_class)->finalize (gobject);
 }

@ -473,10 +441,7 @@ st_widget_paint_background (StWidget *widget)
                                    &allocation,
                                    opacity);
  else
-    st_theme_node_paint (theme_node,
-                         current_paint_state (widget),
-                         &allocation,
-                         opacity);
+    st_theme_node_paint (theme_node, &allocation, opacity);
 }

 static void
@ -775,7 +740,7 @@ st_widget_key_press_event (ClutterActor    *actor,
      (event->keyval == CLUTTER_KEY_F10 &&
       (event->modifier_state & CLUTTER_SHIFT_MASK)))
    {
-      st_widget_popup_menu (ST_WIDGET (actor));
+      g_signal_emit (actor, signals[POPUP_MENU], 0);
      return TRUE;
    }

@ -1538,7 +1503,6 @@ static void
 st_widget_init (StWidget *actor)
 {
  StWidgetPrivate *priv;
-  int i;

  actor->priv = priv = ST_WIDGET_GET_PRIVATE (actor);
  priv->is_stylable = TRUE;
@ -1553,20 +1517,12 @@ st_widget_init (StWidget *actor)
  g_signal_connect (actor, "notify::last-child", G_CALLBACK (st_widget_last_child_notify), NULL);
  g_signal_connect (st_texture_cache_get_default (), "texture-file-changed",
                    G_CALLBACK (st_widget_texture_cache_changed), actor);
-
-  for (i = 0; i < G_N_ELEMENTS (priv->paint_states); i++)
-    st_theme_node_paint_state_init (&priv->paint_states[i]);
 }

 static void
 on_transition_completed (StThemeNodeTransition *transition,
                         StWidget              *widget)
 {
-  next_paint_state (widget);
-
-  st_theme_node_paint_state_copy (current_paint_state (widget),
-                                  st_theme_node_transition_get_new_paint_state (transition));
-
  st_widget_remove_transition (widget);
 }

@ -1577,7 +1533,6 @@ st_widget_recompute_style (StWidget    *widget,
  StThemeNode *new_theme_node = st_widget_get_theme_node (widget);
  int transition_duration;
  gboolean paint_equal;
-  gboolean animations_enabled;

  if (new_theme_node == old_theme_node)
    {
@ -1591,13 +1546,12 @@ st_widget_recompute_style (StWidget    *widget,

  transition_duration = st_theme_node_get_transition_duration (new_theme_node);

-  paint_equal = st_theme_node_paint_equal (old_theme_node, new_theme_node);
+  paint_equal = old_theme_node && st_theme_node_paint_equal (old_theme_node, new_theme_node);

-  g_object_get (gtk_settings_get_default (),
-                "gtk-enable-animations", &animations_enabled,
-                NULL);
+  if (paint_equal)
+    st_theme_node_copy_cached_paint_state (new_theme_node, old_theme_node);

-  if (animations_enabled && transition_duration > 0)
+  if (transition_duration > 0)
    {
      if (widget->priv->transition_animation != NULL)
        {
@ -1615,7 +1569,6 @@ st_widget_recompute_style (StWidget    *widget,
          widget->priv->transition_animation =
            st_theme_node_transition_new (old_theme_node,
                                          new_theme_node,
-                                          current_paint_state (widget),
                                          transition_duration);

          g_signal_connect (widget->priv->transition_animation, "completed",
@ -1631,14 +1584,6 @@ st_widget_recompute_style (StWidget    *widget,
      st_widget_remove_transition (widget);
    }

-  if (!paint_equal)
-    {
-      next_paint_state (widget);
-
-      if (!st_theme_node_paint_equal (new_theme_node, current_paint_state (widget)->node))
-        st_theme_node_paint_state_invalidate (current_paint_state (widget));
-    }
-
  g_signal_emit (widget, signals[STYLE_CHANGED], 0);
  widget->priv->is_style_dirty = FALSE;
 }
@ -1834,18 +1779,6 @@ st_widget_get_can_focus (StWidget *widget)
  return widget->priv->can_focus;
 }

-/**
- * st_widget_popup_menu:
- * @self: A #StWidget
- *
- * Asks the widget to pop-up a context menu.
- */
-void
-st_widget_popup_menu (StWidget *self)
-{
-  g_signal_emit (self, signals[POPUP_MENU], 0);
-}
-
 /* filter @children to contain only only actors that overlap @rbox
 * when moving in @direction. (Assuming no transformations.)
 */
--- a/src/st/st-widget.h
+++ b/src/st/st-widget.h
@ -127,7 +127,6 @@ void                  st_widget_set_hover                 (StWidget        *widg
                                                           gboolean         hover);
 void                  st_widget_sync_hover                (StWidget        *widget);
 gboolean              st_widget_get_hover                 (StWidget        *widget);
-void                  st_widget_popup_menu                (StWidget        *self);

 void                  st_widget_ensure_style              (StWidget        *widget);
Author	SHA1	Message	Date
Florian Müllner	fab02ae82f	Bump version to 3.8.2 Update NEWS.	2013-05-14 01:33:19 +02:00
Rui Matos	d43c5ec27a	shellEntry: Set the input-purpose property for password entries This way input methods can disable themselves automatically for entries holding passwords. https://bugzilla.gnome.org/show_bug.cgi?id=700043	2013-05-14 00:40:27 +02:00
Daiki Ueno	f7de35b852	st-entry: add input purpose and hints Add input-purpose and input-hints properties to StEntry, and pass these on to StIMText. https://bugzilla.gnome.org/show_bug.cgi?id=691392	2013-05-14 00:40:18 +02:00
Daiki Ueno	cde0045851	st-im-text: add input purpose and hints Add input-purpose and input-hints properties to StIMText, and pass these on to GtkIMContext. https://bugzilla.gnome.org/show_bug.cgi?id=691392	2013-05-14 00:40:15 +02:00
Daiki Ueno	f844613292	st-im-text: remove undefined st_im_text_set_autoshow_im decl https://bugzilla.gnome.org/show_bug.cgi?id=691392	2013-05-14 00:40:11 +02:00
Rui Matos	ff2e44de53	status/keyboard: Stop destroying the IBusBus object This is a singleton object inside libibus which means that if we destroy it (e.g. because ibus-daemon got restarted) then, other library users, like the ibus gtk+ IM module that we also use in-process, will break. https://bugzilla.gnome.org/show_bug.cgi?id=699189	2013-05-14 00:34:55 +02:00
Stef Walter	17aa8e0488	polkitAgent: Allow retrying mistyped passwords Don't hide the polkit agent window when someone mistypes their password. Allow them to try again. The user can cancel at any point. https://bugzilla.gnome.org/show_bug.cgi?id=684431	2013-05-13 20:08:34 +02:00
Florian Müllner	a33df9b046	appDisplay: Implement folder keynav and shortcuts When opening an application folder, it should take key focus to allow for keynav; also, Escape closing both folder and app picker is unexpected, it should only close the popup. https://bugzilla.gnome.org/show_bug.cgi?id=695314	2013-05-13 19:46:16 +02:00
Kjartan Maraas	c25f399f7c	Updated Norwegian bokmål translation	2013-05-13 09:48:12 +02:00
Giovanni Campagna	bd47d07fbc	ScreenShield: clear the lock screen early when deactivating Upon popMode, MessageTray will try readding all notifications to their rightful parent, so we must tell NotificationBox to relinquish them before st_bin_set_child() fails (leaving a dangling child pointer and crashing at the next allocation) https://bugzilla.gnome.org/show_bug.cgi?id=698812	2013-05-12 20:20:36 +02:00
Florian Müllner	72282237e1	data: Fix typo in Screencast docs	2013-05-10 23:44:14 +02:00
Florian Müllner	dfb44aa51d	Expose screencast functionality via DBus Like screenshots, the screen recorder can be a useful tool in other cases than being triggered by a keyboard shortcut. To account for that, export a Screencast DBus API similar to the existing Screenshot interface. https://bugzilla.gnome.org/show_bug.cgi?id=696247	2013-05-10 19:49:41 +02:00
Florian Müllner	5516cad087	sessionMode: Add 'allowScreencast' property Our built-in screen recorder is implemented as a component, so it will just be disabled when the session mode doesn't allow screencasting. However we will expose screencasting functionality on DBus as well, and while it makes sense to restrict its availablity to the same modes as the existing recorder, exporting/unexporting the service depending on the session mode is not very consumer friendly. For that reason, add an additional 'allowScreencast' property that for now mirrors the availability of the 'recorder' component. https://bugzilla.gnome.org/show_bug.cgi?id=696247	2013-05-10 19:49:41 +02:00
Florian Müllner	ab60c31629	shell-recorder: Make drawing the cursor optional As with screenshots, showing the cursor in a recording may not be desirable, so add a property to control whether the cursor is drawn or not. https://bugzilla.gnome.org/show_bug.cgi?id=696247	2013-05-10 19:49:41 +02:00
Florian Müllner	52dd030087	shell-recorder: Support specifying the recorded area Currently we will always record the entire screen. It has been requested to support recording a specified area analogous to the screenshot API as well, so add a set_area() method which allows this. https://bugzilla.gnome.org/show_bug.cgi?id=696247	2013-05-10 19:49:41 +02:00
Florian Müllner	98240c2857	shell-recorder: Optionally return the filename of the recording It is currently not always possible to predict the actual output filename of a recording - the file-template does not necessarily use an absolute path and may contain %d and %t escape sequences. This is OK for fire-and-forget uses like the existing keyboard shortcut, but we will soon expose the functionality on DBus and consumers of that API might very well need to access the file after the recording. So do the same as our screenshot API and add an optional (out) parameter to record(). https://bugzilla.gnome.org/show_bug.cgi?id=696247	2013-05-10 19:49:41 +02:00
Simon McVittie	65bfd6c6d2	Don't put non-Shell windows in Ctrl+Alt+Tab if they wouldn't be visible Metacity's Ctrl+Alt+Tab would include X11 windows with hints like GDK_WINDOW_TYPE_HINT_DOCK and GDK_WINDOW_TYPE_HINT_DESKTOP (there are more conditions, but that's a good start). If we're in normal mode, those are visible and it's OK to display those in the Ctrl+Alt+Tab order, but if we're in the lock screen or the unlock dialog, they're not visible and it doesn't make sense to focus them. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=699862 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Florian Müllner <fmuellner@gnome.org>	2013-05-09 19:31:08 +01:00
Stef Walter	1034e33c35	modalDialog: Show spinner when working Use the same UI concept from the login screen to show spinners when the polkit or keyring dialogs are working https://bugzilla.gnome.org/show_bug.cgi?id=684438	2013-05-09 06:41:07 +02:00
Stef Walter	d7528b878c	components: Allow cancelling of dialog between prompts Some callers of the keyring prompt keep the dialog up while processing the prompt. Allow the user to cancel the prompt while in this state. This is propagated to the caller, who can cancel the operation in question when this occurs. https://bugzilla.gnome.org/show_bug.cgi?id=682830	2013-05-09 05:55:15 +02:00
Giovanni Campagna	eb2e66c539	network: don't use active connections that are in invalid states Only ACTIVE or ACTIVATING connections are important when deciding what icon to show, don't fallback on any, possibly invalid or deactivating, active connection object. https://bugzilla.gnome.org/show_bug.cgi?id=676285	2013-05-09 00:05:36 +02:00
Stef Walter	30e9a2a7d0	keyring: Fix button disabled when prompting for confirmation https://bugzilla.gnome.org/show_bug.cgi?id=696304	2013-05-08 22:13:56 +02:00
Lionel Landwerlin	e842694316	st-shadow: Fix offset shadow offscreen rendering The shadows are currently rendered by painting the actor we want to apply shadow on, in an offscreen buffer. The problem is that when this actor has an allocation padding (ie allocation that isn't at 0x0 relatively to its parent), this padding is added within the offscreen buffer and as a result the shadow rendering is truncated because the offscreen buffer size is the size of the allocation box, not the allocation box + padding. This patch reposition the actor at 0x0 with rendering it by changing the initial transformation matrix when rendering the actor offscreen. https://bugzilla.gnome.org/show_bug.cgi?id=698301	2013-05-08 16:16:07 +01:00
Florian Müllner	b33d87a762	loginDialog: Adjust logoBin to modalDialog changes With modalDialogs' backgroundStack using a BinLayout now, we need to set approriate expand flags on the iconBin. https://bugzilla.gnome.org/show_bug.cgi?id=699877	2013-05-08 00:09:53 +02:00
Florian Müllner	0ff3599d91	modalDialog: Replace Shell.Stack with layout manager Commit `e98eb57e3e` added flags to expand the dialog's background stack, which works fine with the current clutter-1.16 branch, but breaks on clutter-1.14 (as shipped with GNOME 3.8). Using an St.Widget with a Clutter.BinLayout fixes this, and is more modern Clutter usage. https://bugzilla.gnome.org/show_bug.cgi?id=699877	2013-05-08 00:09:53 +02:00
Marta Milakovic	28d79a1235	osdWindow: Allow popup to grow if necessary The popup currently has a fixed size based on monitor size. As a result, the popup's content may overflow if its minimum size is larger than the popup size. To prevent this, use min-width/min-height for the popup size so that the popup can grow if necessary. https://bugzilla.gnome.org/show_bug.cgi?id=696523	2013-05-07 21:35:47 +02:00
Florian Müllner	522d21154b	loginDialog: Remove logo in upper left corner With optional branding now being shown below the user list, we can remove the unloved instance in the upper left corner ... https://bugzilla.gnome.org/show_bug.cgi?id=694912	2013-05-07 20:52:04 +02:00
Florian Müllner	7c231916c1	loginDialog: (Optionally) show logo below user list The optional logo on the login screen is currently shown in the top bar, which is not only a rather unprominent position, it also gives the wrong suggestion of a clickable element. Newer designs call for the logo to be shown horizontally centered at the bottom of the screen, so implement that instead. https://bugzilla.gnome.org/show_bug.cgi?id=694912	2013-05-07 20:52:04 +02:00
Florian Müllner	a40bb67fc6	modalDialog: Always use a stack for the background Currently a system modal dialog's actor hierarchy depends on whether events should be blocked while the dialog is shown or not. Change it to always contain a stack, to allow subclasses to add additional background elements. https://bugzilla.gnome.org/show_bug.cgi?id=694912	2013-05-07 20:52:04 +02:00
Lionel Landwerlin	4c350b90c7	dateMenu: do not show "Open Calendar" button with no installed calendar application https://bugzilla.gnome.org/show_bug.cgi?id=697725	2013-05-06 15:59:17 +01:00
Stef Walter	47dee22b05	gdm: Fix regression where domain login hint not shown Also only keep around realmd while we're actually using it, allow it to quit if no other clients are active. https://bugzilla.gnome.org/show_bug.cgi?id=698200	2013-05-03 21:55:45 +02:00
Matthias Clasen	13c0e575f6	ctrlAltTab: Use a symbolic icon for desktop windows The nautilus icon sticks out pretty badly among the symbolic icons we use for other desktop components. This commit finds windows of type DESKTOP, and uses the video-display-symbolic icon for them. https://bugzilla.gnome.org/show_bug.cgi?id=697914	2013-05-03 10:27:01 -04:00
Tim Lunn	ea8736b13a	AppMenuButton: Improve handling of signals If for some reason an extension needs to destroy the AppMenu object, currently it is not possible to do this cleanly due to these signals remaining connected. https://bugzilla.gnome.org/show_bug.cgi?id=698531	2013-05-01 18:33:31 +10:00
Giovanni Campagna	303d53e7f5	StIcon: use g_signal_connect_object() for safety Prevent a crash in case an icon is destroyed before the texture finishes loading, and something else is keeping the texture alive for any reason. https://bugzilla.gnome.org/show_bug.cgi?id=696720	2013-04-29 00:26:51 +02:00
Žygimantas Beručka	31295dfe83	Updated Lithuanian translation	2013-04-28 13:36:38 +03:00
Tim Lunn	69ea4553cb	dateMenu: append .desktop to evolution strings Since that is what the actual app_id's are.	2013-04-27 08:32:23 +10:00
Florian Müllner	0d8d77356e	PopupMenuManager: Close active menu when another one opens We already do this when navigating between menus via mouse or keynav, but miss cases where a menu is opened by other means, for instance via a keyboard shortcut. https://bugzilla.gnome.org/show_bug.cgi?id=686756	2013-04-26 18:16:14 +02:00
Florian Müllner	8b78032248	panel: Change openAppMenu() to a toggle action It makes sense to allow closing the app menu with the same shortcut that is used to open it, so make it a toggle action and allow it TOPBAR_POPUP mode. https://bugzilla.gnome.org/show_bug.cgi?id=686756	2013-04-26 18:16:13 +02:00
Florian Müllner	ad277a563c	panel: Add keybinding mode for top bar popups and use it Allow some keybindings to still work while a top bar menu is open by assigning it a keybinding mode. https://bugzilla.gnome.org/show_bug.cgi?id=698938	2013-04-26 18:16:13 +02:00
Florian Müllner	db26fb201e	popupMenu: Allow setting grabHelper params for PopupMenuManager Currently all keybindings are disabled while some popup menu is open. However some keybindings may still be useful in some cases, so expose GrabHelper's modal params parameter to allow specifying a keybinding mode for particular menus. https://bugzilla.gnome.org/show_bug.cgi?id=698938	2013-04-26 18:16:13 +02:00
Florian Müllner	9f00be50d6	shellDBus: Fix Eval() return value when disabled Eval() is expected to return a boolean success value and a string result. However when the function is disabled (via the development-tools setting), we return null for the latter which is not a valid string value. Return an empty string instead. https://bugzilla.gnome.org/show_bug.cgi?id=698959	2013-04-26 18:16:12 +02:00
Jasper St. Pierre	77d21e53d0	backgroundMenu: Ignore releases when using long-press Otherwise, a release from the long-press will be seen as a button event that should close the menu. https://bugzilla.gnome.org/show_bug.cgi?id=697203	2013-04-26 11:24:30 -04:00
Jasper St. Pierre	ba0b4ba590	layout: Correct hot corner barriers in RTL layouts https://bugzilla.gnome.org/show_bug.cgi?id=698884	2013-04-26 11:24:25 -04:00
Nik Kalach	b9fc7a3050	[l10n] Add Interlingua translation	2013-04-24 15:52:53 +02:00
Muhammet Kara	aa053a906d	[l10n] Updated Turkish translation	2013-04-20 00:48:22 +03:00