Handle global keybindings in the shell

Handling global keybindings, such as volume and brightness keys
but also custom keybindings, directly in the compositor is the only way
to deal with grabs and modal operations that could be active (primarily
the overview, for which special policy was introduced in the last
commit)

https://bugzilla.gnome.org/show_bug.cgi?id=613543

.gitignore

@@ -45,6 +45,7 @@ intltool-merge.in
 intltool-update.in
 libtool
 m4/
+man/gnome-shell.1
 omf.make
 po/*.gmo
 po/gnome-shell.pot

Makefile.am

@@ -1,7 +1,11 @@
 # Point to our macro directory and pick up user flags from the environment
 ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = data js src browser-plugin tests po man docs
+SUBDIRS = data js src browser-plugin tests po docs
+
+if ENABLE_MAN
+SUBDIRS += man
+endif
 
 EXTRA_DIST =		\
 	.project	\
@@ -21,4 +25,4 @@ distcheck-hook:
 	@echo "Checking disted files against files in git"
 	@$(srcdir)/tools/check-for-missing.py $(srcdir) $(distdir) $(DIST_EXCLUDE)
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man

configure.ac

@@ -36,6 +36,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 
 PKG_PROG_PKG_CONFIG([0.22])
 
+AC_PATH_PROG([XSLTPROC], [xsltproc])
+
 GLIB_GSETTINGS
 
 # Get a value to substitute into gnome-shell.in
@@ -207,6 +209,18 @@ AC_SUBST(TYPELIBDIR)
 
 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 
+AC_ARG_ENABLE(man,
+              [AS_HELP_STRING([--enable-man],
+                              [generate man pages [default=yes]])],,
+              enable_man=yes)
+if test "$enable_man" != no; then
+  AC_PATH_PROG([XSLTPROC], [xsltproc])
+  if test -z "$XSLTPROC"; then
+    AC_MSG_ERROR([xsltproc is required for --enable-man])
+  fi
+fi
+AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+
 # Stay command-line compatible with the gnome-common configure option. Here
 # minimum/yes/maximum are the same, however.
 AC_ARG_ENABLE(compile_warnings,

data/50-gnome-shell-system.xml.in

@@ -8,6 +8,9 @@
 	<KeyListEntry name="toggle-message-tray"
                       _description="Show the message tray"/>
 
+	<KeyListEntry name="focus-active-notification"
+                      _description="Focus the active notification"/>
+
 	<KeyListEntry name="toggle-application-view"
                       _description="Show all applications"/>
 

data/org.gnome.shell.gschema.xml.in.in

@@ -106,6 +106,13 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
         Keybinding to toggle the visibility of the message tray.
       </_description>
     </key>
+    <key name="focus-active-notification" type="as">
+      <default>["&lt;Super&gt;n"]</default>
+      <_summary>Keybinding to focus the active notification</_summary>
+      <_description>
+        Keybinding to focus the active notification.
+      </_description>
+    </key>
     <key name="toggle-recording" type="as">
       <default><![CDATA[['<Control><Shift><Alt>r']]]></default>
       <_summary>Keybinding to toggle the screen recorder</_summary>

data/theme/gnome-shell.css

@@ -1432,6 +1432,10 @@ StScrollBar StButton#vhandle:active {
     padding-right: 4px;
 }
 
+.chat-notification-scrollview{
+	max-height: 22em;
+}
+
 .subscription-message {
     font-style: italic;
 }
@@ -2321,3 +2325,17 @@ StScrollBar StButton#vhandle:active {
     padding-bottom: 0px;
 }
 
+.osd-window {
+    color: #ededed;
+    background-color: rgba(33, 37, 38, 0.80);
+    border-radius: 15px;
+    text-shadow: 0 1px rgba(0, 0, 0, 0.75);
+
+    padding: 40px;
+    spacing: 5px;
+}
+
+.osd-progress-bar {
+    height: 0.8em;
+    border: 1px solid;
+}

js/Makefile.am

@@ -100,6 +100,7 @@ nobase_dist_js_DATA = 	\
 	ui/components/__init__.js		\
 	ui/components/autorunManager.js		\
 	ui/components/automountManager.js	\
+	ui/components/mediaKeysManager.js	\
 	ui/components/networkAgent.js		\
 	ui/components/polkitAgent.js		\
 	ui/components/recorder.js		\

js/gdm/loginDialog.js

@@ -684,9 +684,10 @@ const LoginDialog = new Lang.Class({
         this._userVerifier = new GdmUtil.ShellUserVerifier(this._greeterClient);
         this._userVerifier.connect('ask-question', Lang.bind(this, this._askQuestion));
         this._userVerifier.connect('show-message', Lang.bind(this, this._showMessage));
-        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
+        this._userVerifier.connect('reset', Lang.bind(this, this._reset));
         this._userVerifier.connect('show-login-hint', Lang.bind(this, this._showLoginHint));
         this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._hideLoginHint));
+        this._verifyingUser = false;
 
         this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
 
@@ -694,6 +695,8 @@ const LoginDialog = new Lang.Class({
                                Lang.bind(this, this._updateBanner));
         this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,
                                Lang.bind(this, this._updateBanner));
+        this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,
+                               Lang.bind(this, this._updateDisableUserList));
 
         this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
                                            text: '' });
@@ -701,7 +704,8 @@ const LoginDialog = new Lang.Class({
         this._updateBanner();
 
         this._titleLabel = new St.Label({ style_class: 'login-dialog-title',
-                                          text: C_("title", "Sign In") });
+                                          text: C_("title", "Sign In"),
+                                          visible: false });
 
         this.contentLayout.add(this._titleLabel,
                               { y_fill: false,
@@ -731,6 +735,7 @@ const LoginDialog = new Lang.Class({
                               x_align: St.Align.START });
         this._promptEntry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
                                            can_focus: true });
+        this._promptEntryTextChangedId = 0;
         this._promptBox.add(this._promptEntry,
                             { expand: true,
                               x_fill: true,
@@ -769,7 +774,7 @@ const LoginDialog = new Lang.Class({
                                                 x_align: St.Align.START,
                                                 x_fill: true });
 
-        this._notListedButton.connect('clicked', Lang.bind(this, this._onNotListedClicked));
+        this._notListedButton.connect('clicked', Lang.bind(this, this._hideUserListAndLogIn));
 
         this.contentLayout.add(this._notListedButton,
                                { expand: false,
@@ -795,6 +800,21 @@ const LoginDialog = new Lang.Class({
 
    },
 
+    _updateDisableUserList: function() {
+        let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY);
+
+        // If this is the first time around, set initial focus
+        if (this._disableUserList == undefined && disableUserList)
+            this.setInitialKeyFocus(this._promptEntry);
+
+        if (disableUserList != this._disableUserList) {
+            this._disableUserList = disableUserList;
+
+            if (!this._verifyingUser)
+                this._reset();
+        }
+    },
+
     _updateBanner: function() {
         let enabled = this._settings.get_boolean(GdmUtil.BANNER_MESSAGE_KEY);
         let text = this._settings.get_string(GdmUtil.BANNER_MESSAGE_TEXT_KEY);
@@ -807,31 +827,15 @@ const LoginDialog = new Lang.Class({
         }
     },
 
-    _onReset: function(client, serviceName) {
+    _reset: function() {
         this._promptMessage.hide();
-
-        let tasks = [this._hidePrompt,
-
-                     new Batch.ConcurrentBatch(this, [this._fadeInTitleLabel,
-                                                      this._fadeInNotListedButton]),
-
-                     function() {
-                         this._sessionList.close();
-                         this._promptLoginHint.hide();
-                         this._userList.actor.show();
-                         this._userList.actor.opacity = 255;
-                         return this._userList.showItems();
-                     },
-
-                     function() {
-                         this._userList.actor.reactive = true;
-                         this._userList.actor.grab_key_focus();
-                     }];
-
         this._user = null;
+        this._verifyingUser = false;
 
-        let batch = new Batch.ConsecutiveBatch(this, tasks);
-        batch.run();
+        if (this._disableUserList)
+            this._hideUserListAndLogIn();
+        else
+            this._showUserList();
     },
 
     _onDefaultSessionChanged: function(client, sessionId) {
@@ -886,6 +890,9 @@ const LoginDialog = new Lang.Class({
                          if (this._user && this._user.is_logged_in())
                              return null;
 
+                         if (!this._verifyingUser)
+                             return null;
+
                          return GdmUtil.fadeInActor(this._sessionList.actor);
                      },
 
@@ -898,17 +905,21 @@ const LoginDialog = new Lang.Class({
         return batch.run();
     },
 
-    _showPrompt: function() {
+    _showPrompt: function(forSecret) {
         let hold = new Batch.Hold();
 
-        let buttons = [{ action: Lang.bind(this, this.cancel),
-                         label: _("Cancel"),
-                         key: Clutter.Escape },
-                       { action: Lang.bind(this, function() {
-                                     hold.release();
-                                 }),
-                         label: C_("button", "Sign In"),
-                         default: true }];
+        let cancelButtonInfo = { action: Lang.bind(this, this.cancel),
+                                 label: _("Cancel"),
+                                 key: Clutter.Escape };
+        let okButtonInfo = { action: Lang.bind(this, function() {
+                                         hold.release();
+                                     }),
+                             label: forSecret ? C_("button", "Sign In") : _("Next"),
+                             default: true };
+        let buttons = [];
+        if (!this._disableUserList || this._verifyingUser)
+            buttons.push(cancelButtonInfo);
+        buttons.push(okButtonInfo);
 
         let tasks = [function() {
                          return this._fadeInPrompt();
@@ -916,6 +927,16 @@ const LoginDialog = new Lang.Class({
 
                      function() {
                          this.setButtons(buttons);
+
+                         let updateOkButtonEnabled = Lang.bind(this, function() {
+                             let sensitive = this._promptEntry.text.length > 0;
+                             okButtonInfo.button.reactive = sensitive;
+                             okButtonInfo.button.can_focus = sensitive;
+                         });
+
+                         updateOkButtonEnabled();
+
+                         this._promptEntryTextChangedId = this._promptEntry.clutter_text.connect('text-changed', updateOkButtonEnabled);
                      },
 
                      hold];
@@ -928,6 +949,11 @@ const LoginDialog = new Lang.Class({
     _hidePrompt: function() {
         this.setButtons([]);
 
+        if (this._promptEntryTextChangedId > 0) {
+            this._promptEntry.clutter_text.disconnect(this._promptEntryTextChangedId);
+            this._promptEntryTextChangedId = 0;
+        }
+
         let tasks = [function() {
                          return GdmUtil.fadeOutActor(this._promptBox);
                      },
@@ -949,7 +975,9 @@ const LoginDialog = new Lang.Class({
         this._promptEntry.set_text('');
         this._promptEntry.clutter_text.set_password_char(passwordChar);
 
-        let tasks = [this._showPrompt,
+        let tasks = [function() {
+                         return this._showPrompt(!!passwordChar);
+                     },
 
                      function() {
                          let _text = this._promptEntry.get_text();
@@ -961,6 +989,23 @@ const LoginDialog = new Lang.Class({
         return batch.run();
     },
 
+    _askForUsernameAndLogIn: function() {
+        this._promptLabel.set_text(_("Username: "));
+        this._promptEntry.set_text('');
+        this._promptEntry.clutter_text.set_password_char('');
+
+        let tasks = [this._showPrompt,
+
+                     function() {
+                         let userName = this._promptEntry.get_text();
+                         this._promptEntry.reactive = false;
+                         return this._beginVerificationForUser(userName);
+                     }];
+
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        return batch.run();
+    },
+
     _onSessionOpened: function(client, serviceName) {
         this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
     },
@@ -1089,7 +1134,7 @@ const LoginDialog = new Lang.Class({
                              }));
     },
 
-    _onNotListedClicked: function() {
+    _hideUserListAndLogIn: function() {
         let tasks = [function() {
                          return this._userList.hideItems();
                      },
@@ -1106,10 +1151,30 @@ const LoginDialog = new Lang.Class({
                                                       this._fadeOutNotListedButton]),
 
                      function() {
-                         let hold = new Batch.Hold();
+                         return this._askForUsernameAndLogIn();
+                     }];
 
-                         this._userVerifier.begin(null, hold);
-                         return hold;
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        batch.run();
+    },
+
+    _showUserList: function() {
+        let tasks = [this._hidePrompt,
+
+                     new Batch.ConcurrentBatch(this, [this._fadeInTitleLabel,
+                                                      this._fadeInNotListedButton]),
+
+                     function() {
+                         this._sessionList.close();
+                         this._promptLoginHint.hide();
+                         this._userList.actor.show();
+                         this._userList.actor.opacity = 255;
+                         return this._userList.showItems();
+                     },
+
+                     function() {
+                         this._userList.actor.reactive = true;
+                         this._userList.actor.grab_key_focus();
                      }];
 
         let batch = new Batch.ConsecutiveBatch(this, tasks);
@@ -1144,6 +1209,7 @@ const LoginDialog = new Lang.Class({
         let hold = new Batch.Hold();
 
         this._userVerifier.begin(userName, hold);
+        this._verifyingUser = true;
         return hold;
     },
 
@@ -1196,6 +1262,8 @@ const LoginDialog = new Lang.Class({
             this._userList.addUser(users[i]);
         }
 
+        this._updateDisableUserList();
+
         this._userManager.connect('user-added',
                                   Lang.bind(this, function(userManager, user) {
                                       this._userList.addUser(user);

js/gdm/util.js

@@ -23,6 +23,7 @@ const BANNER_MESSAGE_TEXT_KEY = 'banner-message-text';
 const ALLOWED_FAILURES_KEY = 'allowed-failures';
 
 const LOGO_KEY = 'logo';
+const DISABLE_USER_LIST_KEY = 'disable-user-list';
 
 function fadeInActor(actor) {
     if (actor.opacity == 255 && actor.visible)

js/misc/loginManager.js

@@ -17,6 +17,9 @@ const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager
 <method name='Suspend'>
     <arg type='b' direction='in'/>
 </method>
+<method name='Hibernate'>
+    <arg type='b' direction='in'/>
+</method>
 <method name='CanPowerOff'>
     <arg type='s' direction='out'/>
 </method>
@@ -26,6 +29,9 @@ const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager
 <method name='CanSuspend'>
     <arg type='s' direction='out'/>
 </method>
+<method name='CanHibernate'>
+    <arg type='s' direction='out'/>
+</method>
 </interface>;
 
 const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session'>
@@ -140,6 +146,15 @@ const LoginManagerSystemd = new Lang.Class({
         });
     },
 
+    canHibernate: function(asyncCallback) {
+        this._proxy.CanSuspendRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0] != 'no');
+        });
+    },
+
     powerOff: function() {
         this._proxy.PowerOffRemote(true);
     },
@@ -150,6 +165,10 @@ const LoginManagerSystemd = new Lang.Class({
 
     suspend: function() {
         this._proxy.SuspendRemote(true);
+    },
+
+    hibernate: function() {
+        this._proxy.HibernateRemote(true);
     }
 });
 
@@ -215,6 +234,13 @@ const LoginManagerConsoleKit = new Lang.Class({
         }));
     },
 
+    canHibernate: function(asyncCallback) {
+        Mainloop.idle_add(Lang.bind(this, function() {
+            asyncCallback(this._upClient.get_can_hibernate());
+            return false;
+        }));
+    },
+
     powerOff: function() {
         this._proxy.StopRemote();
     },
@@ -225,5 +251,9 @@ const LoginManagerConsoleKit = new Lang.Class({
 
     suspend: function() {
         this._upClient.suspend_sync(null);
+    },
+
+    hibernate: function() {
+        this._upClient.hibernate_sync(null);
     }
 });

js/misc/modemManager.js

@@ -46,8 +46,70 @@ let _providersTable;
 function _getProvidersTable() {
     if (_providersTable)
         return _providersTable;
-    let [providers, countryCodes] = Shell.mobile_providers_parse();
-    return _providersTable = providers;
+    return _providersTable = Shell.mobile_providers_parse(null,null);
+}
+
+function findProviderForMCCMNC(table, needle) {
+    let needlemcc = needle.substring(0, 3);
+    let needlemnc = needle.substring(3, needle.length);
+
+    let name2, name3;
+    for (let iter in table) {
+        let country = table[iter];
+        let providers = country.get_providers();
+
+        // Search through each country's providers
+        for (let i = 0; i < providers.length; i++) {
+            let provider = providers[i];
+
+            // Search through MCC/MNC list
+            let list = provider.get_gsm_mcc_mnc();
+            for (let j = 0; j < list.length; j++) {
+                let mccmnc = list[j];
+
+                // Match both 2-digit and 3-digit MNC; prefer a
+                // 3-digit match if found, otherwise a 2-digit one.
+                if (mccmnc.mcc != needlemcc)
+                    continue;  // MCC was wrong
+
+                if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
+                    name3 = provider.name;
+
+                if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
+                    name2 = provider.name;
+
+                if (name2 && name3)
+                    break;
+            }
+        }
+    }
+
+    return name3 || name2 || null;
+}
+
+function findProviderForSid(table, sid) {
+    if (sid == 0)
+        return null;
+
+    // Search through each country
+    for (let iter in table) {
+        let country = table[iter];
+        let providers = country.get_providers();
+
+        // Search through each country's providers
+        for (let i = 0; i < providers.length; i++) {
+            let provider = providers[i];
+            let cdma_sid = provider.get_cdma_sid();
+
+            // Search through CDMA SID list
+            for (let j = 0; j < cdma_sid.length; j++) {
+                if (cdma_sid[j] == sid)
+                    return provider.name;
+            }
+        }
+    }
+
+    return null;
 }
 
 const ModemGsm = new Lang.Class({
@@ -91,64 +153,29 @@ const ModemGsm = new Lang.Class({
     },
 
     _findOperatorName: function(name, opCode) {
-        if (name.length != 0 && (name.length > 6 || name.length < 5)) {
-            // this looks like a valid name, i.e. not an MCCMNC (that some
-            // devices return when not yet connected
-            return name;
-        }
-        if (isNaN(parseInt(name))) {
-            // name is definitely not a MCCMNC, so it may be a name
-            // after all; return that
-            return name;
+        if (name) {
+            if (name && name.length != 0 && (name.length > 6 || name.length < 5)) {
+                // this looks like a valid name, i.e. not an MCCMNC (that some
+                // devices return when not yet connected
+                return name;
+            }
+            if (isNaN(parseInt(name))) {
+                // name is definitely not a MCCMNC, so it may be a name
+                // after all; return that
+                return name;
+            }
         }
 
         let needle;
-        if (name.length == 0 && opCode)
+        if ((name == null || name.length == 0) && opCode)
             needle = opCode;
         else if (name.length == 6 || name.length == 5)
             needle = name;
         else // nothing to search
             return null;
 
-        return this._findProviderForMCCMNC(needle);
-    },
-
-    _findProviderForMCCMNC: function(needle) {
         let table = _getProvidersTable();
-        let needlemcc = needle.substring(0, 3);
-        let needlemnc = needle.substring(3, needle.length);
-
-        let name2, name3;
-        for (let iter in table) {
-            let providers = table[iter];
-
-            // Search through each country's providers
-            for (let i = 0; i < providers.length; i++) {
-                let provider = providers[i];
-
-                // Search through MCC/MNC list
-                let list = provider.get_gsm_mcc_mnc();
-                for (let j = 0; j < list.length; j++) {
-                    let mccmnc = list[j];
-
-                    // Match both 2-digit and 3-digit MNC; prefer a
-                    // 3-digit match if found, otherwise a 2-digit one.
-                    if (mccmnc.mcc != needlemcc)
-                        continue;  // MCC was wrong
-
-                    if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
-                        name3 = provider.name;
-
-                    if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
-                        name2 = provider.name;
-
-                    if (name2 && name3)
-                        break;
-                }
-            }
-        }
-
-        return name3 || name2 || null;
+        return findProviderForMCCMNC(table, needle);
     }
 });
 Signals.addSignalMethods(ModemGsm.prototype);
@@ -189,39 +216,14 @@ const ModemCdma = new Lang.Class({
                 this.operator_name = null;
             } else {
                 let [bandClass, band, id] = result;
-                if (name.length > 0)
-                    this.operator_name = this._findProviderForSid(id);
-                else
+                if (name.length > 0) {
+                    let table = _getProvidersTable();
+                    this.operator_name = findProviderForSid(table, id);
+                } else
                     this.operator_name = null;
             }
             this.emit('notify::operator-name');
         }));
-    },
-
-    _findProviderForSid: function(sid) {
-        if (sid == 0)
-            return null;
-
-        let table = _getProvidersTable();
-
-        // Search through each country
-        for (let iter in table) {
-            let providers = table[iter];
-
-            // Search through each country's providers
-            for (let i = 0; i < providers.length; i++) {
-                let provider = providers[i];
-                let cdma_sid = provider.get_cdma_sid();
-
-                // Search through CDMA SID list
-                for (let j = 0; j < cdma_sid.length; j++) {
-                    if (cdma_sid[j] == sid)
-                        return provider.name;
-                }
-            }
-        }
-
-        return null;
     }
 });
 Signals.addSignalMethods(ModemCdma.prototype);

js/misc/util.js

@@ -288,3 +288,31 @@ function insertSorted(array, val, cmp) {
 
     return pos;
 }
+
+/**
+ * wrapKeybinding:
+ *
+ * Wrap a keybinding handler so that
+ * it ignores an invocation if the shell is modal, but
+ * not when the overview is active, or when global
+ * keybindings are allowed by session mode.
+ * This function is only useful for keybindings installed
+ * with Meta.KeybindingFlags.HANDLE_WHEN_GRABBED
+ */
+function wrapKeybinding(handler, onlyInOverview) {
+    return function() {
+        let handle;
+
+        if (onlyInOverview) {
+            handle = Main.sessionMode.allowKeybindingsWhenModal ||
+                Main.modalCount == (Main.overview.visible ? 1 : 0);
+        } else {
+            handle = true;
+        }
+
+        if (handle)
+            return handler.apply(this, arguments);
+        else
+            return false;
+    }
+}

js/ui/altTab.js

@@ -199,7 +199,7 @@ const AltTabPopup = new Lang.Class({
         this.actor.get_allocation_box();
 
         // Make the initial selection
-        if (binding == 'switch-group') {
+        if (binding == 'internal-keybinding-switch-group') {
             if (backward) {
                 this._select(0, this._appIcons[0].cachedWindows.length - 1);
             } else {
@@ -208,9 +208,9 @@ const AltTabPopup = new Lang.Class({
                 else
                     this._select(0, 0);
             }
-        } else if (binding == 'switch-group-backward') {
+        } else if (binding == 'internal-keybinding-switch-group-backward') {
             this._select(0, this._appIcons[0].cachedWindows.length - 1);
-        } else if (binding == 'switch-windows-backward') {
+        } else if (binding == 'internal-keybinding-switch-windows-backward') {
             this._select(this._appIcons.length - 1);
         } else if (this._appIcons.length == 1) {
             this._select(0);

js/ui/appDisplay.js

@@ -479,7 +479,6 @@ const AppWellIcon = new Lang.Class({
                                                 Lang.bind(this,
                                                           this._onStateChanged));
         this._onStateChanged();
-        this.isMenuUp = false;
     },
 
     _onDestroy: function() {
@@ -561,7 +560,8 @@ const AppWellIcon = new Lang.Class({
             this._menuManager.addMenu(this._menu);
         }
 
-        this.isMenuUp = true;
+        this.emit('menu-state-changed', true);
+
         this.actor.set_hover(true);
         this._menu.popup();
 
@@ -578,7 +578,7 @@ const AppWellIcon = new Lang.Class({
 
     _onMenuPoppedDown: function() {
         this.actor.sync_hover();
-        this.isMenuUp = false;
+        this.emit('menu-state-changed', false);
     },
 
     _onActivate: function (event) {

js/ui/appFavorites.js

@@ -84,9 +84,12 @@ const AppFavorites = new Lang.Class({
 
         let app = Shell.AppSystem.get_default().lookup_app(appId);
 
-        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
-            this._removeFavorite(appId);
-        }));
+        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()),
+                                 { forFeedback: true,
+                                   undoCallback: Lang.bind(this, function () {
+                                                               this._removeFavorite(appId);
+                                                           })
+                                 });
     },
 
     addFavorite: function(appId) {
@@ -116,9 +119,11 @@ const AppFavorites = new Lang.Class({
             return;
 
         Main.overview.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
-                                 Lang.bind(this, function () {
-            this._addFavorite(appId, pos);
-        }));
+                                 { forFeedback: true,
+                                   undoCallback: Lang.bind(this, function () {
+                                                               this._addFavorite(appId, pos);
+                                                           })
+                                 });
     }
 });
 Signals.addSignalMethods(AppFavorites.prototype);

js/ui/components/mediaKeysManager.js

@@ -0,0 +1,647 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Clutter = imports.gi.Clutter;
+const Gdk = imports.gi.Gdk;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const Main = imports.ui.main;
+const MessageTray = imports.ui.messageTray;
+const ShellMountOperation  = imports.ui.shellMountOperation;
+const Tweener = imports.ui.tweener;
+const Util = imports.misc.util;
+
+const INTERFACE_SETTINGS = 'org.gnome.desktop.interface';
+const POWER_SETTINGS = 'org.gnome.settings-daemon.plugins.power';
+const XSETTINGS_SETTINGS = 'org.gnome.settings-daemon.plugins.xsettings';
+const TOUCHPAD_SETTINGS = 'org.gnome.settings-daemon.peripherals.touchpad';
+const KEYBINDING_SETTINGS = 'org.gnome.settings-daemon.plugins.media-keys';
+const CUSTOM_KEYBINDING_SETTINGS = 'org.gnome.settings-daemon.plugins.media-keys.custom-keybinding';
+const A11Y_SETTINGS = 'org.gnome.desktop.a11y.applications';
+const MAGNIFIER_SETTINGS = 'org.gnome.desktop.a11y.magnifier';
+const INPUT_SOURCE_SETTINGS = 'org.gnome.desktop.input-sources';
+
+const MediaKeysInterface = <interface name='org.gnome.SettingsDaemon.MediaKeys'>
+<method name='GrabMediaPlayerKeys'>
+    <arg name='application' direction='in' type='s'/>
+    <arg name='time' direction='in' type='u'/>
+</method>
+<method name='ReleaseMediaPlayerKeys'>
+    <arg name='application' direction='in' type='s'/>
+</method>
+<signal name='MediaPlayerKeyPressed'>
+    <arg name='application' type='s'/>
+    <arg name='key' type='s'/>
+</signal>
+</interface>;
+
+/* [ actionName, setting, hardcodedKeysym, overviewOnly, args ] */
+/* (overviewOnly means that the keybinding is handled when the shell is not
+   modal, or when the overview is active, but not when other modal operations
+   are active; otherwise the keybinding is always handled) */
+const DEFAULT_KEYBINDINGS = [
+    [ 'doTouchpadToggle', null, 'XF86TouchpadToggle', false ],
+    [ 'doTouchpadSet', null, 'XF86TouchpadOn', false, [ true ] ],
+    [ 'doTouchpadSet', null, 'XF86TouchpadOff', false, [ false ] ],
+    [ 'doMute', 'volume-mute', null, false, [ false ] ],
+    [ 'doVolumeAdjust', 'volume-down', null, false, [ Clutter.ScrollDirection.DOWN, false ] ],
+    [ 'doVolumeAdjust', 'volume-up', null, false, [ Clutter.ScrollDirection.UP, false ] ],
+    [ 'doMute', null, '<Alt>XF86AudioMute', false, [ true ] ],
+    [ 'doVolumeAdjust', null, '<Alt>XF86AudioLowerVolume', false, [ Clutter.ScrollDirection.DOWN, true ] ],
+    [ 'doVolumeAdjust', null, '<Alt>XF86AudioRaiseVolume', false, [ Clutter.ScrollDirection.UP, true ] ],
+    [ 'doLogout', 'logout', null, true ],
+    [ 'doEject', 'eject', null, false ],
+    [ 'doHome', 'home', null, true ],
+    [ 'doLaunchMimeHandler', 'media', null, true, [ 'application/x-vorbis+ogg' ] ],
+    [ 'doLaunchApp', 'calculator', null, true, [ 'gcalcltool.desktop' ] ],
+    [ 'doLaunchApp', 'search', null, true, [ 'tracker-needle.desktop' ] ],
+    [ 'doLaunchMimeHandler', 'email', null, true, [ 'x-scheme-handler/mailto' ] ],
+    [ 'doScreensaver', 'screensaver', null, true ],
+    [ 'doScreensaver', null, 'XF86ScreenSaver', true ],
+    [ 'doLaunchApp', 'help', null, true, [ 'yelp.desktop' ] ],
+    [ 'doSpawn', 'screenshot', null, true, [ ['gnome-screenshot'] ] ],
+    [ 'doSpawn', 'window-screenshot', null, true, [ ['gnome-screenshot', '--window'] ] ],
+    [ 'doSpawn', 'area-screenshot', null, true, [ ['gnome-screenshot', '--area'] ] ],
+    [ 'doSpawn', 'screenshot-clip', null, true, [ ['gnome-screenshot', '--clipboard'] ] ],
+    [ 'doSpawn', 'window-screenshot-clip', null, true, [ ['gnome-screenshot', '--window', '--clipboard'] ] ],
+    [ 'doSpawn', 'area-screenshot-clip', null, true, [ ['gnome-screenshot', '--area', '--clipboard'] ] ],
+    [ 'doLaunchMimeHandler', 'www', null, true, [ 'x-scheme-handler/http' ] ],
+    [ 'doMediaKey', 'play', null, true, [ 'Play' ] ],
+    [ 'doMediaKey', 'pause', null, true, [ 'Pause' ] ],
+    [ 'doMediaKey', 'stop', null, true, [ 'Stop' ] ],
+    [ 'doMediaKey', 'previous', null, true, [ 'Previous' ] ],
+    [ 'doMediaKey', 'next', null, true, [ 'Next' ] ],
+    [ 'doMediaKey', null, 'XF86AudioRewind', true, [ 'Rewind' ] ],
+    [ 'doMediaKey', null, 'XF86AudioForward', true, [ 'FastForward' ] ],
+    [ 'doMediaKey', null, 'XF86AudioRepeat', true, [ 'Repeat' ] ],
+    [ 'doMediaKey', null, 'XF86AudioRandomPlay', true, [ 'Shuffle' ] ],
+    [ 'doXRandRAction', null, '<Super>p', false, [ 'VideoModeSwitch' ] ],
+    /* Key code of the XF86Display key (Fn-F7 on Thinkpads, Fn-F4 on HP machines, etc.) */
+    [ 'doXRandRAction', null, 'XF86Display', false, [ 'VideoModeSwitch' ] ],
+    /* Key code of the XF86RotateWindows key (present on some tablets) */
+    [ 'doXRandRAction', null, 'XF86RotateWindows', false, [ 'Rotate' ] ],
+    [ 'doA11yAction', 'magnifier', null, true, [ 'screen-magnifier-enabled' ] ],
+    [ 'doA11yAction', 'screenreader', null, true, [ 'screen-reader-enabled' ] ],
+    [ 'doA11yAction', 'on-screen-keyboard', null, true, [ 'screen-keyboard-enabled' ] ],
+    [ 'doTextSize', 'increase-text-size', null, true, [ 1 ] ],
+    [ 'doTextSize', 'decrease-text-size', null, true, [ -1 ] ],
+    [ 'doToggleContrast', 'toggle-contrast', null, true ],
+    [ 'doMagnifierZoom', 'magnifier-zoom-in', null, true, [ 1 ] ],
+    [ 'doMagnifierZoom', 'magnifier-zoom-out', null, true, [ -1 ] ],
+    [ 'doPowerAction', null, 'XF86PowerOff', true, [ 'button-power' ] ],
+    /* the kernel / Xorg names really are like this... */
+    [ 'doPowerAction', null, 'XF86Suspend', false, [ 'button-sleep' ] ],
+    [ 'doPowerAction', null, 'XF86Sleep', false, [ 'button-suspend' ] ],
+    [ 'doPowerAction', null, 'XF86Hibernate', false, [ 'button-hibernate' ] ],
+    [ 'doBrightness', null, 'XF86MonBrightnessUp', false, [ 'Screen', 'StepUp' ] ],
+    [ 'doBrightness', null, 'XF86MonBrightnessDown', false, [ 'Screen', 'StepDown' ] ],
+    [ 'doBrightness', null, 'XF86KbdBrightnessUp', false, [ 'Keyboard', 'StepUp' ] ],
+    [ 'doBrightness', null, 'XF86KbdBrightnessDown', false, [ 'Keyboard', 'StepDown' ] ],
+    [ 'doBrightnessToggle', null, 'XF86KbdLightOnOff', false, ],
+    [ 'doInputSource', 'switch-input-source', null, false, [ +1 ] ],
+    [ 'doInputSource', 'switch-input-source-backward', null, false, [ -1 ] ],
+    [ 'doLaunchApp', null, 'XF86Battery', true, [ 'gnome-power-statistics.desktop' ] ]
+];
+
+var osdWin;
+const OSDWindow = new Lang.Class({
+    Name: 'OSDWindow',
+
+    FADE_TIMEOUT: 1500,
+    FADE_DURATION: 100,
+
+    _init: function(iconName, value) {
+        /* assume 130x130 on a 640x480 display and scale from there */
+        let monitor = Main.layoutManager.primaryMonitor;
+        let scalew = monitor.width / 640.0;
+        let scaleh = monitor.height / 480.0;
+        let scale = Math.min(scalew, scaleh);
+        let size = 130 * Math.max(1, scale);
+
+        this.actor = new St.BoxLayout({ style_class: 'osd-window',
+                                        vertical: true,
+                                        reactive: false,
+                                        visible: false,
+                                        width: size,
+                                        height: size,
+                                      });
+
+        this._icon = new St.Icon({ icon_name: iconName,
+                                   icon_size: size / 2,
+                                 });
+        this.actor.add(this._icon, { expand: true,
+                                     x_align: St.Align.MIDDLE,
+                                     y_align: St.Align.MIDDLE });
+
+        this._value = value;
+        this._progressBar = new St.DrawingArea({ style_class: 'osd-progress-bar' });
+        this._progressBar.connect('repaint', Lang.bind(this, this._drawProgress));
+        this.actor.add(this._progressBar, { expand: true, x_fill: true, y_fill: false });
+        this._progressBar.visible = value !== undefined;
+
+        Main.layoutManager.addChrome(this.actor);
+
+        /* Position in the middle of primary monitor */
+        let [width, height] = this.actor.get_size();
+        this.actor.x = ((monitor.width - width) / 2) + monitor.x;
+        this.actor.y = monitor.y + (monitor.height / 2) + (monitor.height / 2 - height) / 2;
+    },
+
+    show: function() {
+        this.actor.show();
+        Tweener.addTween(this.actor,
+                         { opacity: 255,
+                           time: this.FADE_DURATION / 1000,
+                           transition: 'easeInQuad' });
+
+        if (this._timeoutId)
+            GLib.source_remove(this._timeoutId);
+
+        this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, this.FADE_TIMEOUT, Lang.bind(this, this.hide));
+    },
+
+    hide: function() {
+        Tweener.addTween(this.actor,
+                         { opacity: 0,
+                           time: this.FADE_DURATION / 1000,
+                           transition: 'easeOutQuad',
+                           onComplete: function() {
+                               this.actor.destroy();
+                               this.actor = null;
+                               osdWin = null;
+                           },
+                           onCompleteScope: this });
+
+        return false;
+    },
+
+    setIcon: function(name) {
+        this._icon.icon_name = name;
+    },
+
+    setValue: function(value) {
+        if (value == this._value)
+            return;
+
+        this._value = value;
+        this._progressBar.visible = value !== undefined;
+        this._progressBar.queue_repaint();
+    },
+
+    _drawProgress: function(area) {
+        let cr = area.get_context();
+
+        let themeNode = this.actor.get_theme_node();
+        let color = themeNode.get_foreground_color();
+        Clutter.cairo_set_source_color(cr, color);
+
+        let [width, height] = area.get_surface_size();
+        width = width * this._value;
+
+        cr.moveTo(0,0);
+        cr.lineTo(width, 0);
+        cr.lineTo(width, height);
+        cr.lineTo(0, height);
+        cr.fill();
+    }
+});
+
+function showOSD(icon, value) {
+    if (osdWin) {
+        osdWin.setIcon(icon);
+        osdWin.setValue(value);
+    } else {
+        osdWin = new OSDWindow(icon, value);
+    }
+
+    osdWin.show();
+}
+
+const MediaKeysGrabber = new Lang.Class({
+    Name: 'MediaKeysGrabber',
+
+    _init: function() {
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(MediaKeysInterface, this);
+        this._apps = [];
+    },
+
+    enable: function() {
+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SettingsDaemon/MediaKeys');
+    },
+
+    disable: function() {
+        this._dbusImpl.unexport();
+    },
+
+    GrabMediaPlayerKeysAsync: function(parameters, invocation) {
+        let [appName, time] = parameters;
+
+        /* I'm not sure of this code, but it is in gnome-settings-daemon
+           (letting alone that the introspection is wrong in glib...)
+        */
+        if (time == Gdk.CURRENT_TIME) {
+            let tv = new GLib.TimeVal;
+            GLib.get_current_time(tv);
+            time = tv.tv_sec * 1000 + tv.tv_usec / 1000;
+        }
+
+        let pos = -1;
+        for (let i = 0; i < this._apps.length; i++) {
+            if (this._apps[i].appName == appName) {
+                pos = i;
+                break;
+            }
+        }
+
+        if (pos != -1)
+            this._freeMediaPlayer(pos);
+
+        let app = {
+            appName: appName,
+            name: invocation.get_sender(),
+            time: time,
+            watchId: Gio.DBus.session.watch_name(invocation.get_sender(),
+                                                 Gio.BusNameWatcherFlags.NONE,
+                                                 null,
+                                                 Lang.bind(this, this._onNameVanished)),
+        };
+        Util.insertSorted(this._apps, app, function(a, b) {
+            return b.time-a.time;
+        });
+
+        invocation.return_value(GLib.Variant.new('()', []));
+    },
+
+    ReleaseMediaPlayerAsync: function(parameters, invocation) {
+        let name = invocation.get_sender();
+        let [appName] = parameters;
+
+        let pos = -1;
+        for (let i = 0; i < this._apps.length; i++) {
+            if (this._apps[i].appName == appName) {
+                pos = i;
+                break;
+            }
+        }
+
+        if (pos == -1) {
+            for (let i = 0; i < this._apps.length; i++) {
+                if (this._apps[i].name == name) {
+                    pos = i;
+                    break;
+                }
+            }
+        }
+
+        if (pos != -1)
+            this._freeMediaPlayer(pos);
+
+        invocation.return_value(GLib.Variant.new('()', []));
+    },
+
+    _freeMediaPlayer: function(pos) {
+        let app = this._apps[pos];
+        Gio.bus_unwatch_name(app.watchId)
+
+        this._apps.splice(pos, 1);
+    },
+
+    mediaKeyPressed: function(key) {
+        if (this._apps.length == 0) {
+            showOSD('action-unavailable-symbolic');
+            return;
+        }
+
+        let app = this._apps[0];
+        Gio.DBus.session.emit_signal(app.name,
+                                     '/org/gnome/SettingsDaemon/MediaKeys',
+                                     'org.gnome.SettingsDaemon.MediaKeys',
+                                     'MediaPlayerKeyPressed',
+                                     GLib.Variant.new('(ss)', [app.appName || '',
+                                                               key]));
+    },
+});
+
+const MediaKeysManager = new Lang.Class({
+    Name: 'MediaKeysManager',
+
+    _init: function() {
+        this._a11yControl = Main.panel.statusArea.a11y;
+        this._volumeControl = Main.panel.statusArea.volume;
+        this._userMenu = Main.panel.statusArea.userMenu;
+        this._mediaPlayerKeys = new MediaKeysGrabber();
+
+        this._keybindingSettings = new Gio.Settings({ schema: KEYBINDING_SETTINGS });
+    },
+
+    enable: function() {
+        for (let i = 0; i < DEFAULT_KEYBINDINGS.length; i++) {
+            let [action, setting, keyval, overviewOnly, args] = DEFAULT_KEYBINDINGS[i];
+            let func = this[action];
+            if (!func) {
+                log('Keybinding action %s is missing'.format(action));
+                continue;
+            }
+
+            let name = setting ? setting : 'media-keys-keybindings-%d'.format(i);
+            let ok;
+            func = Util.wrapKeybinding(Lang.bind.apply(null, [this, func].concat(args)), overviewOnly);
+            if (setting)
+                ok = global.display.add_keybinding(setting, this._keybindingSettings,
+                                                   Meta.KeyBindingFlags.BUILTIN |
+                                                   Meta.KeyBindingFlags.IS_SINGLE |
+                                                   Meta.KeyBindingFlags.HANDLE_WHEN_GRABBED, func);
+            else
+                ok = global.display.add_grabbed_key(name, keyval,
+                                                    Meta.KeyBindingFlags.HANDLE_WHEN_GRABBED, func);
+
+            if (!ok)
+                log('Installing keybinding %s failed'.format(name));
+        }
+
+        this._customKeybindings = [];
+        this._changedId = this._keybindingSettings.connect('changed::custom-keybindings',
+                                                           Lang.bind(this, this._reloadCustomKeybindings));
+        this._reloadCustomKeybindings();
+
+        this._mediaPlayerKeys.enable();
+    },
+
+    disable: function() {
+        for (let i = 0; i < DEFAULT_KEYBINDINGS.length; i++) {
+            let [action, setting, keyval, overviewOnly, args] = DEFAULT_KEYBINDINGS[i];
+
+            let name = setting ? setting : 'media-keys-keybindings-%d'.format(i);
+            if (setting)
+                global.display.remove_keybinding(setting, this._keybindingSettings);
+            else
+                global.display.remove_grabbed_key(name);
+        }
+
+        this._clearCustomKeybindings();
+        this._keybindingSettings.disconnect(this._changedId);
+
+        this._mediaPlayerKeys.disable();
+    },
+
+    _clearCustomKeybindings: function() {
+        for (let i = 0; i < this._customKeybindings.length; i++)
+            global.display.remove_keybinding('binding', this._customKeybindings[i]);
+
+        this._customKeybindings = [];
+    },
+
+    _reloadCustomKeybindings: function() {
+        this._clearCustomKeybindings();
+
+        let paths = this._keybindingSettings.get_strv('custom-keybindings');
+        for (let i = 0; i < paths.length; i++) {
+            let setting = new Gio.Settings({ schema: CUSTOM_KEYBINDING_SETTINGS,
+                                             path: paths[i] });
+            let func = Util.wrapKeybinding(Lang.bind(this, this.doCustom, setting), true);
+
+            global.display.add_keybinding('binding', setting,
+                                          Meta.KeyBindingFlags.IS_SINGLE |
+                                          Meta.KeyBindingFlags.HANDLE_WHEN_GRABBED, func);
+            this._customKeybindings.push(setting);
+        }
+    },
+
+    doCustom: function(display, screen, window, binding, settings) {
+        let command = settings.get_string('command');
+        Util.spawnCommandLine(command);
+    },
+
+    doTouchpadToggle: function(display, screen, window, binding) {
+        let settings = new Gio.Settings({ schema: TOUCHPAD_SETTINGS });
+        let enabled = settings.get_boolean('touchpad-enabled');
+
+        this.doTouchpadSet(display, screen, window, binding, !enabled);
+        settings.set_boolean(!enabled);
+
+        return true;
+    },
+
+    doTouchpadSet: function(display, screen, window, binding, enabled) {
+        showOSD(enabled ? 'input-touchpad-symbolic' : 'touchpad-disabled-symbolic');
+        return true;
+    },
+
+    doMute: function(display, screen, window, binding, quiet) {
+        let [icon, value] = this._volumeControl.volumeMenu.toggleMute(quiet);
+        showOSD(icon, value);
+        return true;
+    },
+
+    doVolumeAdjust: function(display, screen, window, binding, direction, quiet) {
+        let [icon, value] = this._volumeControl.volumeMenu.scroll(direction, quiet);
+        showOSD(icon, value);
+        return true;
+    },
+
+    doLogout: function(display, screen, window, binding) {
+        this._userMenu.logOut();
+        return true;
+    },
+
+    doEject: function(display, screen, window, binding) {
+        let volumeMonitor = Gio.VolumeMonitor.get();
+
+        let drives = volumeMonitor.get_connected_drives();
+        let score = 0, drive;
+        for (let i = 0; i < drives.length; i++) {
+            if (!drives[i].can_eject())
+                continue;
+            if (!drives[i].is_media_removable())
+                continue;
+            if (score < 1) {
+                drive = drives[i];
+                score = 1;
+            }
+            if (!drives[i].has_media())
+                continue;
+            if (score < 2) {
+                drive = drives[i];
+                score = 2;
+                break;
+            }
+        }
+
+        showOSD('media-eject-custom-symbolic');
+
+        if (!drive)
+            return true;
+
+        let mountOp = new ShellMountOperation.ShellMountOperation(drive);
+        drive.eject_with_operation(Gio.MountUnmountFlags.FORCE,
+                                   mountOp.mountOp, null, null);
+
+        return true;
+    },
+
+    doHome: function() {
+        let homeFile = Gio.file_new_for_path (GLib.get_home_dir());
+        let homeUri = homeFile.get_uri();
+        Gio.app_info_launch_default_for_uri(homeUri, null);
+
+        return true;
+    },
+
+    doLaunchMimeHandler: function(display, screen, window, binding, mimeType) {
+        let gioApp = Gio.AppInfo.get_default_for_type(mimeType, false);
+        if (gioApp != null) {
+            let app = Shell.AppSystem.get_default().lookup_app(gioApp.get_id());
+            app.open_new_window(-1);
+        } else {
+            log('Could not find default application for \'%s\' mime-type'.format(mimeType));
+        }
+
+        return true;
+    },
+
+    doLaunchApp: function(display, screen, window, binding, appId) {
+        let app = Shell.AppSystem.get_default().lookup_app(appId);
+        app.open_new_window(-1);
+
+        return true;
+    },
+
+    doScreensaver: function() {
+        // FIXME: handled in house, to the screenshield!
+        return true;
+    },
+
+    doSpawn: function(display, screen, window, binding, argv) {
+        Util.spawn(argv);
+        return true;
+    },
+
+    doMediaKey: function(display, screen, window, binding, key) {
+        this._mediaPlayerKeys.mediaKeyPressed(key);
+    },
+
+    _onXRandRFinished: function(connection, result) {
+        connection.call_finish(result);
+        this._XRandRCancellable = null;
+    },
+
+    doXRandRAction: function(display, screen, window, binding, action) {
+        if (this._XRandRCancellable)
+            this._XRandRCancellable.cancel();
+
+        this._XRandRCancellable = new Gio.Cancellable();
+        Gio.DBus.session.call('org.gnome.SettingsDaemon',
+                              '/org/gnome/SettingsDaemon/XRANDR',
+                              'org.gnome.SettingsDaemon.XRANDR_2',
+                              action,
+                              GLib.Variant.new('(x)', [global.get_current_time()]),
+                              null, /* reply type */
+                              Gio.DBusCallFlags.NONE,
+                              -1,
+                              this._XRandRCancellable,
+                              Lang.bind(this, this._onXRandRFinished));
+    },
+
+    doA11yAction: function(display, screen, window, binding, key) {
+        let settings = new Gio.Settings({ schema: A11Y_SETTINGS });
+        let enabled = settings.get_boolean(key);
+        settings.set_boolean(key, !enabled);
+    },
+
+    doTextSize: function(display, screen, window, binding, multiplier) {
+        // Same values used in the Seeing tab of the Universal Access panel
+        const FACTORS = [ 0.75, 1.0, 1.25, 1.5 ];
+
+	// Figure out the current DPI scaling factor
+        let settings = new Gio.Settings({ schema: INTERFACE_SETTINGS });
+        let factor = settings.get_double('text-scaling-factor');
+        factor += multiplier * 0.25;
+
+        /* Try to find a matching value */
+        let distance = 1e6;
+        let best = 1.0;
+        for (let i = 0; i < FACTORS.length; i++) {
+            let d = Math.abs(factor - FACTORS[i]);
+            if (d < distance) {
+                best = factors[i];
+                distance = d;
+            }
+        }
+
+        if (best == 1.0)
+            settings.reset('text-scaling-factor');
+        else
+            settings.set_double('text-scaling-factor', best);
+    },
+
+    doToggleContrast: function(display, screen, window, binding) {
+        this._a11yControl.toggleHighContrast();
+    },
+
+    doMagnifierZoom: function(display, screen, window, binding, offset) {
+        let settings = new Gio.Settings({ schema: MAGNIFIER_SETTINGS });
+
+        let value = settings.get_value('mag-factor');
+        value = Math.round(value + offset);
+        settings.set_value('mag-factor', value);
+    },
+
+    doPowerAction: function(display, screen, window, binding, action) {
+        let settings = new Gio.Settings({ schema: POWER_SETTINGS });
+        switch (settings.get_string(action)) {
+        case 'suspend':
+            this._userMenu.suspend();
+            break;
+        case 'interactive':
+        case 'shutdown':
+            this._userMenu.shutdown();
+            break;
+        case 'hibernate':
+            this._userMenu.hibernate();
+            break;
+        case 'blank':
+        case 'default':
+        default:
+            break;
+        }
+    },
+
+    _onBrightnessFinished: function(connection, result, kind) {
+        let [percentage] = connection.call_finish(result).deep_unpack();
+
+        let icon = kind == 'Keyboard' ? 'keyboard-brightness-symbolic' : 'display-brightness-symbolic';
+        showOSD(icon, percentage / 100);
+    },
+
+    doBrightness: function(display, screen, window, binding, kind, action) {
+        let iface = 'org.gnome.SettingsDaemon.Power.' + kind;
+        let objectPath = '/org/gnome/SettingsDaemon/Power';
+
+        Gio.DBus.session.call('org.gnome.SettingsDaemon',
+                              objectPath, iface, action,
+                              null, null, /* parameters, reply type */
+                              Gio.DBusCallFlags.NONE, -1, null,
+                              Lang.bind(this, this._onBrightnessFinished, kind));
+    },
+
+    doInputSource: function(display, screen, window, binding, offset) {
+        let settings = new Gio.Settings({ schema: INPUT_SOURCE_SETTINGS });
+
+        let current = settings.get_uint('current');
+        let max = settings.get_strv('sources').length - 1;
+
+        current += offset;
+        if (current < 0)
+            current = 0;
+        else if (current > max)
+            current = max;
+
+        settings.set_uint('current', current);
+    },
+});
+
+const Component = MediaKeysManager;

js/ui/components/recorder.js

@@ -52,6 +52,8 @@ const Recorder = new Lang.Class({
             Meta.disable_unredirect_for_screen(global.screen);
             recorder.record();
         }
+
+        return true;
     }
 });
 

js/ui/components/telepathyClient.js

@@ -771,16 +771,19 @@ const ChatNotification = new Lang.Class({
             this.emit('unfocused');
         }));
 
-        this._oldMaxScrollAdjustment = 0;
         this._createScrollArea();
         this._lastGroup = null;
         this._lastGroupActor = null;
 
+        // Keep track of the bottom position for the current adjustment and
+        // force a scroll to the bottom if things change while we were at the
+        // bottom
+        this._oldMaxScrollValue = this._scrollArea.vscroll.adjustment.value;
+        this._scrollArea.add_style_class_name('chat-notification-scrollview');
         this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
-            let currentValue = adjustment.value + adjustment.page_size;
-            if (currentValue == this._oldMaxScrollAdjustment)
+            if (adjustment.value == this._oldMaxScrollValue)
                 this.scrollTo(St.Side.BOTTOM);
-            this._oldMaxScrollAdjustment = adjustment.upper;
+            this._oldMaxScrollValue = Math.max(adjustment.lower, adjustment.upper - adjustment.page_size);
         }));
 
         this._inputHistory = new History.HistoryManager({ entry: this._responseEntry.clutter_text });
@@ -1133,7 +1136,7 @@ const AudioVideoNotification = new Lang.Class({
         this.parent(source, title, null, { customContent: true });
         this.setResident(true);
 
-        this.addButton('reject', _("Reject"));
+        this.addButton('reject', _("Decline"));
         /* translators: this is a button label (verb), not a noun */
         this.addButton('answer', _("Answer"));
 

js/ui/dash.js

@@ -23,8 +23,7 @@ const DASH_ITEM_HOVER_TIMEOUT = 300;
 
 function getAppFromSource(source) {
     if (source instanceof AppDisplay.AppWellIcon) {
-        let appSystem = Shell.AppSystem.get_default();
-        return appSystem.lookup_app(source.getId());
+        return source.app;
     } else if (source.metaWindow) {
         let tracker = Shell.WindowTracker.get_default();
         return tracker.get_window_app(source.metaWindow);
@@ -142,6 +141,7 @@ const DashItemContainer = new Lang.Class({
 
     setLabelText: function(text) {
         this._labelText = text;
+        this.child.accessible_name = text;
     },
 
     hideLabel: function () {
@@ -259,7 +259,6 @@ const ShowAppsIcon = new Lang.Class({
 
         this.setChild(this.toggleButton);
         this.setDragApp(null);
-        this.toggleButton.label_actor = this.label;
     },
 
     _createIcon: function(size) {
@@ -492,32 +491,51 @@ const Dash = new Lang.Class({
     },
 
     _createAppItem: function(app) {
-        let display = new AppDisplay.AppWellIcon(app,
+        let appIcon = new AppDisplay.AppWellIcon(app,
                                                  { setSizeManually: true,
                                                    showLabel: false });
-        display._draggable.connect('drag-begin',
+        appIcon._draggable.connect('drag-begin',
                                    Lang.bind(this, function() {
-                                       display.actor.opacity = 50;
+                                       appIcon.actor.opacity = 50;
                                    }));
-        display._draggable.connect('drag-end',
+        appIcon._draggable.connect('drag-end',
                                    Lang.bind(this, function() {
-                                       display.actor.opacity = 255;
+                                       appIcon.actor.opacity = 255;
                                    }));
+        appIcon.connect('menu-state-changed',
+                        Lang.bind(this, function(appIcon, opened) {
+                            this._itemMenuStateChanged(item, opened);
+                        }));
 
         let item = new DashItemContainer();
-        item.setChild(display.actor);
+        item.setChild(appIcon.actor);
 
+        // Override default AppWellIcon label_actor, now the
+        // accessible_name is set at DashItemContainer.setLabelText
+        appIcon.actor.label_actor = null;
         item.setLabelText(app.get_name());
-        // Override default AppWellIcon label_actor
-        display.actor.label_actor = item.label;
-        display.icon.setIconSize(this.iconSize);
+
+        appIcon.icon.setIconSize(this.iconSize);
         this._hookUpLabel(item);
 
         return item;
     },
 
+    _itemMenuStateChanged: function(item, opened) {
+        // When the menu closes, it calls sync_hover, which means
+        // that the notify::hover handler does everything we need to.
+        if (opened) {
+            if (this._showLabelTimeoutId > 0) {
+                Mainloop.source_remove(this._showLabelTimeoutId);
+                this._showLabelTimeoutId = 0;
+            }
+
+            item.hideLabel();
+        }
+    },
+
     _onHover: function (item) {
-        if (item.child.get_hover() && !item.child._delegate.isMenuUp) {
+        if (item.child.get_hover()) {
             if (this._showLabelTimeoutId == 0) {
                 let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
                 this._showLabelTimeoutId = Mainloop.timeout_add(timeout,

js/ui/keyboard.js

@@ -20,25 +20,6 @@ const KEYBOARD_TYPE = 'keyboard-type';
 const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEYBOARD = 'screen-keyboard-enabled';
 
-// Key constants taken from Antler
-// FIXME: ought to be moved into libcaribou
-const PRETTY_KEYS = {
-    'BackSpace': '\u232b',
-    'space': ' ',
-    'Return': '\u23ce',
-    'Caribou_Prefs': '\u2328',
-    'Caribou_ShiftUp': '\u2b06',
-    'Caribou_ShiftDown': '\u2b07',
-    'Caribou_Emoticons': '\u263a',
-    'Caribou_Symbols': '123',
-    'Caribou_Symbols_More': '{#*',
-    'Caribou_Alpha': 'Abc',
-    'Tab': 'Tab',
-    'Escape': 'Esc',
-    'Control_L': 'Ctrl',
-    'Alt_L': 'Alt'
-};
-
 const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
 <method name='Show'>
     <arg type='u' direction='in' />
@@ -98,17 +79,7 @@ const Key = new Lang.Class({
     },
 
     _makeKey: function () {
-        let label = this._key.name;
-
-        if (label.length > 1) {
-            let pretty = PRETTY_KEYS[label];
-            if (pretty)
-                label = pretty;
-            else
-                label = this._getUnichar(this._key);
-        }
-
-        label = GLib.markup_escape_text(label, -1);
+        let label = GLib.markup_escape_text(this._key.label, -1);
         let button = new St.Button ({ label: label,
                                       style_class: 'keyboard-key' });
 

js/ui/layout.js

@@ -128,8 +128,6 @@ const LayoutManager = new Lang.Class({
         this.trayBox = new St.Widget({ name: 'trayBox',
                                        layout_manager: new Clutter.BinLayout() }); 
         this.addChrome(this.trayBox);
-        this.trayBox.connect('allocation-changed',
-                             Lang.bind(this, this._updateTrayBarrier));
 
         this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox',
                                               reactive: true,
@@ -280,22 +278,6 @@ const LayoutManager = new Lang.Class({
         }
     },
 
-    _updateTrayBarrier: function() {
-        let monitor = this.bottomMonitor;
-
-        if (this._trayBarrier)
-            global.destroy_pointer_barrier(this._trayBarrier);
-
-        if (Main.messageTray) {
-            this._trayBarrier =
-                global.create_pointer_barrier(monitor.x + monitor.width, monitor.y + monitor.height - Main.messageTray.actor.height,
-                                              monitor.x + monitor.width, monitor.y + monitor.height,
-                                              4 /* BarrierNegativeX */);
-        } else {
-            this._trayBarrier = 0;
-        }
-    },
-
     _monitorsChanged: function() {
         this._updateMonitors();
         this._updateBoxes();

js/ui/main.js

@@ -69,7 +69,7 @@ let _overridesSettings = null;
 let background = null;
 
 function _sessionUpdated() {
-    Meta.keybindings_set_custom_handler('panel-run-dialog', sessionMode.hasRunDialog ? openRunDialog : null);
+    Meta.keybindings_set_custom_handler('internal-keybinding-panel-run-dialog', sessionMode.hasRunDialog ? Util.wrapKeybinding(openRunDialog, true) : null);
     if (sessionMode.isGreeter)
         screenShield.showDialog();
 }
@@ -155,8 +155,14 @@ function start() {
 
     global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
                                             false, -1, 1);
-    Meta.keybindings_set_custom_handler('panel-main-menu', Lang.bind(overview, overview.toggle));
-    global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));
+    Meta.keybindings_set_custom_handler('internal-keybinding-panel-main-menu', Util.wrapKeybinding(Lang.bind(overview, function() {
+        this.toggle();
+        return true;
+    }), true));
+    global.display.connect('overlay-key', Util.wrapKeybinding(Lang.bind(overview, function() {
+        this.toggle();
+        return true;
+    }), true));
 
     sessionMode.connect('update', _sessionUpdated);
     _sessionUpdated();
@@ -167,8 +173,6 @@ function start() {
 
     _startDate = new Date();
 
-    global.stage.connect('captured-event', _globalKeyPressHandler);
-
     log('GNOME Shell started at ' + _startDate);
 
     let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
@@ -465,80 +469,6 @@ function getWindowActorsForWorkspace(workspaceIndex) {
     });
 }
 
-// This function encapsulates hacks to make certain global keybindings
-// work even when we are in one of our modes where global keybindings
-// are disabled with a global grab. (When there is a global grab, then
-// all key events will be delivered to the stage, so ::captured-event
-// on the stage can be used for global keybindings.)
-function _globalKeyPressHandler(actor, event) {
-    if (modalCount == 0)
-        return false;
-    if (event.type() != Clutter.EventType.KEY_PRESS)
-        return false;
-
-    if (!sessionMode.allowKeybindingsWhenModal) {
-        if (modalCount > (overview.visible ? 1 : 0))
-            return false;
-    }
-
-    let symbol = event.get_key_symbol();
-    let keyCode = event.get_key_code();
-    let ignoredModifiers = global.display.get_ignored_modifier_mask();
-    let modifierState = event.get_state() & ~ignoredModifiers;
-
-    // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
-    let action = global.display.get_keybinding_action(keyCode, modifierState);
-
-    if (action == Meta.KeyBindingAction.SWITCH_PANELS) {
-        ctrlAltTabManager.popup(modifierState & Clutter.ModifierType.SHIFT_MASK,
-                                modifierState);
-        return true;
-    }
-
-    switch (action) {
-        // left/right would effectively act as synonyms for up/down if we enabled them;
-        // but that could be considered confusing; we also disable them in the main view.
-        //
-        // case Meta.KeyBindingAction.WORKSPACE_LEFT:
-        //  if (!sessionMode.hasWorkspaces)
-        //      return false;
-        //
-        //     wm.actionMoveWorkspaceLeft();
-        //     return true;
-        // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
-        //  if (!sessionMode.hasWorkspaces)
-        //      return false;
-        //
-        //     wm.actionMoveWorkspaceRight();
-        //     return true;
-        case Meta.KeyBindingAction.WORKSPACE_UP:
-            if (!sessionMode.hasWorkspaces)
-                return false;
-
-            wm.actionMoveWorkspace(Meta.MotionDirection.UP);
-            return true;
-        case Meta.KeyBindingAction.WORKSPACE_DOWN:
-            if (!sessionMode.hasWorkspaces)
-                return false;
-
-            wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
-            return true;
-        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
-        case Meta.KeyBindingAction.COMMAND_2:
-            if (!sessionMode.hasRunDialog)
-                return false;
-
-            openRunDialog();
-            return true;
-        case Meta.KeyBindingAction.PANEL_MAIN_MENU:
-        case Meta.KeyBindingAction.OVERLAY_KEY:
-            overview.hide();
-            return true;
-    }
-
-    return false;
-}
-
 function _findModal(actor) {
     for (let i = 0; i < modalActorFocusStack.length; i++) {
         if (modalActorFocusStack[i].actor == actor)
@@ -679,6 +609,8 @@ function openRunDialog() {
         runDialog = new RunDialog.RunDialog();
     }
     runDialog.open();
+
+    return true;
 }
 
 /**

js/ui/messageTray.js

@@ -314,6 +314,7 @@ const Notification = new Lang.Class({
         this.resident = false;
         // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
         this.isTransient = false;
+        this.forFeedback = false;
         this.expanded = false;
         this.focused = false;
         this.acknowledged = false;
@@ -713,6 +714,10 @@ const Notification = new Lang.Class({
         this.isTransient = isTransient;
     },
 
+    setForFeedback: function(forFeedback) {
+        this.forFeedback = forFeedback;
+    },
+
     setUseActionIcons: function(useIcons) {
         this._useActionIcons = useIcons;
     },
@@ -1389,6 +1394,8 @@ const MessageTray = new Lang.Class({
                                                    y_expand: true,
                                                    x_expand: true,
                                                    layout_manager: new Clutter.BinLayout() });
+        this._notificationWidget.connect('key-release-event', Lang.bind(this, this._onNotificationKeyRelease));
+
         this.actor.add_actor(this._notificationWidget);
 
         this._notificationBin = new St.Bin({ y_expand: true });
@@ -1438,7 +1445,7 @@ const MessageTray = new Lang.Class({
 
         this._closeButton = makeCloseButton();
         this._closeButton.hide();
-        this._closeButton.connect('clicked', Lang.bind(this, this._onCloseClicked));
+        this._closeButton.connect('clicked', Lang.bind(this, this._closeNotification));
         this._notificationWidget.add_actor(this._closeButton);
 
         this._idleMonitorBecameActiveId = 0;
@@ -1514,6 +1521,10 @@ const MessageTray = new Lang.Class({
                                       new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                                       Meta.KeyBindingFlags.NONE,
                                       Lang.bind(this, this.toggleAndNavigate));
+        global.display.add_keybinding('focus-active-notification',
+                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                                      Meta.KeyBindingFlags.NONE,
+                                      Lang.bind(this, this._expandActiveNotification));
 
         this._summaryItems = [];
         this._chatSummaryItemsCount = 0;
@@ -1589,7 +1600,19 @@ const MessageTray = new Lang.Class({
         return false;
     },
 
-    _onCloseClicked: function() {
+    _onNotificationKeyRelease: function(actor, event) {
+        let ignoredModifiers = global.display.get_ignored_modifier_mask();
+        let modifierState = event.get_state() & ~ignoredModifiers;
+
+        if (event.get_key_symbol() == Clutter.KEY_Escape && modifierState == 0) {
+            this._closeNotification();
+            return true;
+        }
+
+        return false;
+    },
+
+    _closeNotification: function() {
         if (this._notificationState == State.SHOWN) {
             this._closeButton.hide();
             this._notificationClosed = true;
@@ -1949,8 +1972,9 @@ const MessageTray = new Lang.Class({
         // Notifications
         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 || this._inFullscreen;
-        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent) && Main.sessionMode.hasNotifications;
+        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent || notificationForFeedback) && Main.sessionMode.hasNotifications;
         let nextNotification = notificationQueue.length > 0 ? notificationQueue[0] : null;
         let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
         let notificationExpanded = this._notification && this._notification.expanded;
@@ -2332,6 +2356,13 @@ const MessageTray = new Lang.Class({
             notification.destroy(NotificationDestroyedReason.EXPIRED);
     },
 
+    _expandActiveNotification: function() {
+        if (!this._notification)
+            return;
+
+        this._expandNotification(false);
+    },
+
     _expandNotification: function(autoExpanding) {
         // Don't grab focus in notifications that are auto-expanded.
         if (!autoExpanding)

js/ui/overview.js

@@ -28,6 +28,24 @@ const DASH_MAX_WIDTH = 96;
 
 const DND_WINDOW_SWITCH_TIMEOUT = 1250;
 
+const GLSL_DIM_EFFECT_DECLARATIONS = '';
+const GLSL_DIM_EFFECT_CODE = '\
+   vec2 dist = cogl_tex_coord_in[0].xy - vec2(0.5, 0.5); \
+   float elipse_radius = 0.5; \
+   /* from https://bugzilla.gnome.org/show_bug.cgi?id=669798: \
+      the alpha on the gradient goes from 165 at its darkest to 98 at its most transparent. */ \
+   float y = 165.0 / 255.0; \
+   float x = 98.0 / 255.0; \
+   /* interpolate darkening value, based on distance from screen center */ \
+   float val = min(length(dist), elipse_radius); \
+   float a = mix(x, y, val / elipse_radius); \
+   /* dim_factor varies from [1.0 -> 0.5] when overview is showing \
+      We use it to smooth value, then we clamp it to valid color interval */ \
+   a = clamp(a - cogl_color_in.r + 0.5, 0.0, 1.0); \
+   /* We\'re blending between: color and black color (obviously omitted in the equation) */ \
+   cogl_color_out.xyz = cogl_color_out.xyz * (1.0 - a); \
+   cogl_color_out.a = 1.0;';
+
 const SwipeScrollDirection = {
     NONE: 0,
     HORIZONTAL: 1,
@@ -57,7 +75,14 @@ const ShellInfo = new Lang.Class({
             this._source.destroy();
     },
 
-    setMessage: function(text, undoCallback, undoLabel) {
+    setMessage: function(text, options) {
+        options = Params.parse(options, { undoCallback: null,
+                                          forFeedback: false
+                                        });
+
+        let undoCallback = options.undoCallback;
+        let forFeedback = options.forFeedback;
+
         if (this._source == null) {
             this._source = new MessageTray.SystemNotificationSource();
             this._source.connect('destroy', Lang.bind(this,
@@ -71,6 +96,7 @@ const ShellInfo = new Lang.Class({
         if (this._source.notifications.length == 0) {
             notification = new MessageTray.Notification(this._source, text, null);
             notification.setTransient(true);
+            notification.setForFeedback(forFeedback);
         } else {
             notification = this._source.notifications[0];
             notification.update(text, null, { clear: true });
@@ -78,10 +104,8 @@ const ShellInfo = new Lang.Class({
 
         this._undoCallback = undoCallback;
         if (undoCallback) {
-            notification.addButton('system-undo',
-                                   undoLabel ? undoLabel : _("Undo"));
-            notification.connect('action-invoked',
-                                 Lang.bind(this, this._onUndoClicked));
+            notification.addButton('system-undo', _("Undo"));
+            notification.connect('action-invoked', Lang.bind(this, this._onUndoClicked));
         }
 
         this._source.notify(notification);
@@ -113,6 +137,10 @@ const Overview = new Lang.Class({
         // scenes which allows us to show the background with different
         // rendering options without duplicating the texture data.
         this._background = Meta.BackgroundActor.new_for_screen(global.screen);
+        this._background.add_glsl_snippet(Meta.SnippetHook.FRAGMENT,
+                                          GLSL_DIM_EFFECT_DECLARATIONS,
+                                          GLSL_DIM_EFFECT_CODE,
+                                          false);
         this._background.hide();
         global.overlay_group.add_actor(this._background);
 
@@ -233,11 +261,16 @@ const Overview = new Lang.Class({
         this._viewSelector.removeSearchProvider(provider);
     },
 
-    setMessage: function(text, undoCallback, undoLabel) {
+    //
+    // options:
+    //  - undoCallback (function): the callback to be called if undo support is needed
+    //  - forFeedback (boolean): whether the message is for direct feedback of a user action
+    //
+    setMessage: function(text, options) {
         if (this.isDummy)
             return;
 
-        this._shellInfo.setMessage(text, undoCallback, undoLabel);
+        this._shellInfo.setMessage(text, options);
     },
 
     _onDragBegin: function() {
@@ -622,7 +655,7 @@ const Overview = new Lang.Class({
                          });
 
         Tweener.addTween(this._background,
-                         { dim_factor: 0.4,
+                         { dim_factor: 0.8,
                            time: ANIMATION_TIME,
                            transition: 'easeOutQuad'
                          });

js/ui/remoteSearch.js

@@ -38,9 +38,22 @@ function loadRemoteSearchProviders(addProviderCallback) {
     for (let i = 0; i < dataDirs.length; i++) {
         let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'search-providers']);
         let dir = Gio.file_new_for_path(path);
-        if (!dir.query_exists(null))
-            continue;
-        loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallback);
+
+        dir.query_info_async('standard:type', Gio.FileQueryInfoFlags.NONE,
+            GLib.PRIORITY_DEFAULT, null,
+                function(object, res) {
+                    let exists = false;
+                    try {
+                        object.query_info_finish(res);
+                        exists = true;
+                    } catch (e) {
+                    }
+
+                    if (!exists)
+                        return;
+
+                    loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallback);
+                });
     }
 };
 
@@ -60,7 +73,7 @@ function loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallb
             if (!keyfile.has_group(KEY_FILE_GROUP))
                 continue;
 
-            let remoteProvider, title;
+            let remoteProvider;
             try {
                 let group = KEY_FILE_GROUP;
                 let busName = keyfile.get_string(group, 'BusName');
@@ -74,25 +87,17 @@ function loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallb
                     let desktopId = keyfile.get_string(group, 'DesktopId');
                     appInfo = Gio.DesktopAppInfo.new(desktopId);
                 } catch (e) {
+                    log('Ignoring search provider ' + path + ': missing DesktopId');
+                    continue;
                 }
 
-                let icon;
-                if (appInfo) {
-                    icon = appInfo.get_icon();
-                    title = appInfo.get_name();
-                } else {
-                    let iconName = keyfile.get_string(group, 'Icon');
-                    icon = new Gio.ThemedIcon({ name: iconName });
-                    title = keyfile.get_locale_string(group, 'Title', null);
-                }
-
-                remoteProvider = new RemoteSearchProvider(title,
-                                                          icon,
+                remoteProvider = new RemoteSearchProvider(appInfo.get_name(),
+                                                          appInfo.get_icon(),
                                                           busName,
                                                           objectPath);
                 loadedProviders[objectPath] = remoteProvider;
             } catch(e) {
-                log('Failed to add search provider "%s": %s'.format(title, e.toString()));
+                log('Failed to add search provider %s: %s'.format(path, e.toString()));
                 continue;
             }
 
@@ -108,12 +113,16 @@ const RemoteSearchProvider = new Lang.Class({
 
     _init: function(title, icon, dbusName, dbusPath) {
         this._proxy = new SearchProviderProxy(Gio.DBus.session,
-                                              dbusName, dbusPath);
+            dbusName, dbusPath, Lang.bind(this, this._onProxyConstructed));
 
         this.parent(title.toUpperCase());
         this._cancellable = new Gio.Cancellable();
     },
 
+    _onProxyConstructed: function(proxy) {
+        // Do nothing
+    },
+
     createIcon: function(size, meta) {
         if (meta['gicon']) {
             return new St.Icon({ gicon: Gio.icon_new_for_string(meta['gicon']),

js/ui/screenShield.js

@@ -49,6 +49,38 @@ const SUMMARY_ICON_SIZE = 48;
 const STANDARD_FADE_TIME = 10;
 const SHORT_FADE_TIME = 0.3;
 
+function sample(offx, offy) {
+    return 'texel += texture2D (sampler, tex_coord.st + pixel_step * ' +
+        'vec2 (' + offx + ',' + offy + ') * 2.0);\n'
+}
+const GLSL_BLUR_EFFECT_DECLARATIONS = ' \
+uniform vec2 pixel_step;\n \
+vec4 apply_blur(in sampler2D sampler, in vec2 tex_coord) {\n \
+  vec4 texel;\n \
+  texel = texture2D (sampler, tex_coord.st);\n'
+  + sample(-1.0, -1.0)
+  + sample( 0.0, -1.0)
+  + sample(+1.0, -1.0)
+  + sample(-1.0,  0.0)
+  + sample( 0.0,  0.0)
+  + sample(+1.0,  0.0)
+  + sample(-1.0, +1.0)
+  + sample( 0.0, +1.0)
+  + sample(+1.0, +1.0) + ' \
+   texel /= 9.0;\n \
+   return texel;\n \
+}\n \
+vec3 desaturate (const vec3 color, const float desaturation)\n \
+{\n \
+   const vec3 gray_conv = vec3 (0.299, 0.587, 0.114);\n \
+   vec3 gray = vec3 (dot (gray_conv, color));\n \
+   return vec3 (mix (color.rgb, gray, desaturation));\n \
+}';
+const GLSL_BLUR_EFFECT_CODE = ' \
+cogl_texel = apply_blur(cogl_sampler, cogl_tex_coord.st);\n \
+cogl_texel.rgb = desaturate(cogl_texel.rgb, 0.6);\n';
+
+
 const Clock = new Lang.Class({
     Name: 'ScreenShieldClock',
 
@@ -335,6 +367,10 @@ const Arrow = new Lang.Class({
     }
 });
 
+function clamp(value, min, max) {
+    return Math.max(min, Math.min(max, value));
+}
+
 /**
  * To test screen shield, make sure to kill gnome-screensaver.
  *
@@ -367,8 +403,13 @@ const ScreenShield = new Lang.Class({
                                                    name: 'lockScreenContents' });
         this._lockScreenContents.add_constraint(new Layout.MonitorConstraint({ primary: true }));
 
+        let backgroundActor = Meta.BackgroundActor.new_for_screen(global.screen);
+        backgroundActor.add_glsl_snippet(Meta.SnippetHook.TEXTURE_LOOKUP,
+                                         GLSL_BLUR_EFFECT_DECLARATIONS,
+                                         GLSL_BLUR_EFFECT_CODE,
+                                         true);
         this._background = new St.Bin({ style_class: 'screen-shield-background',
-                                        child: Meta.BackgroundActor.new_for_screen(global.screen) });
+                                        child: backgroundActor });
         this._lockScreenGroup.add_actor(this._background);
         this._lockScreenGroup.add_actor(this._lockScreenContents);
 
@@ -387,14 +428,11 @@ const ScreenShield = new Lang.Class({
         }
         this._lockScreenContents.add_actor(this._arrowContainer);
 
-        let dragArea = new Clutter.Rect({ origin: new Clutter.Point({ x: 0, y: -global.screen_height, }),
-                                          size: new Clutter.Size({ width: global.screen_width,
-                                                                   height: global.screen_height }) });
-        let action = new Clutter.DragAction({ drag_axis: Clutter.DragAxis.Y_AXIS,
-                                              drag_area: dragArea });
-        action.connect('drag-begin', Lang.bind(this, this._onDragBegin));
-        action.connect('drag-end', Lang.bind(this, this._onDragEnd));
-        this._lockScreenGroup.add_action(action);
+        this._dragAction = new Clutter.GestureAction();
+        this._dragAction.connect('gesture-begin', Lang.bind(this, this._onDragBegin));
+        this._dragAction.connect('gesture-progress', Lang.bind(this, this._onDragMotion));
+        this._dragAction.connect('gesture-end', Lang.bind(this, this._onDragEnd));
+        this._lockScreenGroup.add_action(this._dragAction);
 
         this._lockDialogGroup = new St.Widget({ x_expand: true,
                                                 y_expand: true,
@@ -436,6 +474,8 @@ const ScreenShield = new Lang.Class({
                                                { inhibitEvents: true,
                                                  fadeInTime: STANDARD_FADE_TIME,
                                                  fadeFactor: 1 });
+
+        this.idleMonitor = new GnomeDesktop.IdleMonitor();
     },
 
     _onLockScreenKeyRelease: function(actor, event) {
@@ -456,7 +496,7 @@ const ScreenShield = new Lang.Class({
             symbol == Clutter.KEY_Return ||
             symbol == Clutter.KEY_KP_Enter) {
             this._ensureUnlockDialog(true);
-            this._hideLockScreen(true);
+            this._hideLockScreen(true, 0);
             return true;
         }
 
@@ -479,7 +519,7 @@ const ScreenShield = new Lang.Class({
         // 7 standard scrolls to lift up
         if (this._lockScreenScrollCounter > 35) {
             this._ensureUnlockDialog(false);
-            this._hideLockScreen(true);
+            this._hideLockScreen(true, 0);
         }
 
         return true;
@@ -511,12 +551,27 @@ const ScreenShield = new Lang.Class({
         Tweener.removeTweens(this._lockScreenGroup);
         this._lockScreenState = MessageTray.State.HIDING;
         this._ensureUnlockDialog(false);
+
+        return true;
+    },
+
+    _onDragMotion: function() {
+	let [origX, origY] = this._dragAction.get_press_coords(0);
+	let [currentX, currentY] = this._dragAction.get_motion_coords(0);
+
+	let newY = currentY - origY;
+	newY = clamp(newY, -global.stage.height, 0);
+
+	this._lockScreenGroup.y = newY;
+
+	return true;
     },
 
     _onDragEnd: function(action, actor, eventX, eventY, modifiers) {
         if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) {
             // Complete motion automatically
-            this._hideLockScreen(true);
+	    let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0);
+	    this._hideLockScreen(true, -velocityY);
         } else {
             // restore the lock screen to its original place
             // try to use the same speed as the normal animation
@@ -545,35 +600,43 @@ const ScreenShield = new Lang.Class({
     },
 
     _onStatusChanged: function(status) {
-        if (status == GnomeSession.PresenceStatus.IDLE) {
-            if (this._dialog) {
-                this._dialog.cancel();
-                if (!this._isGreeter) {
-                    this._dialog = null;
+        if (status != GnomeSession.PresenceStatus.IDLE)
+            return;
+
+        if (this._dialog) {
+            this._dialog.cancel();
+            if (!this._isGreeter) {
+                this._dialog = null;
+            }
+        }
+
+        if (!this._isModal) {
+            Main.pushModal(this.actor);
+            this._isModal = true;
+        }
+
+        if (!this._isActive) {
+            this._lightbox.show();
+
+            if (this._activationTime == 0)
+                this._activationTime = GLib.get_monotonic_time();
+
+            this._becameActiveId = this.idleMonitor.connect('became-active', Lang.bind(this, function() {
+                this.idleMonitor.disconnect(this._becameActiveId);
+
+                let lightboxWasShown = this._lightbox.shown;
+                this._lightbox.hide();
+
+                let shouldLock = lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY);
+                if (shouldLock || this._isLocked) {
+                    this.lock(false);
+                } else if (this._isActive) {
+                    this.unlock();
                 }
-            }
+            }));
 
-            if (!this._isModal) {
-                Main.pushModal(this.actor);
-                this._isModal = true;
-            }
-
-            if (!this._isActive) {
-                this._lightbox.show();
-
-                if (this._activationTime == 0)
-                    this._activationTime = GLib.get_monotonic_time();
-            }
-        } else {
-            let lightboxWasShown = this._lightbox.shown;
-            this._lightbox.hide();
-
-            let shouldLock = lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY);
-            if (shouldLock || this._isActive) {
-                this.lock(false);
-            } else if (this._isModal) {
-                this.unlock();
-            }
+            this._isActive = true;
+            this.emit('lock-status-changed');
         }
     },
 
@@ -592,7 +655,7 @@ const ScreenShield = new Lang.Class({
         this.actor.show();
         this._isGreeter = Main.sessionMode.isGreeter;
         this._ensureUnlockDialog(true);
-        this._hideLockScreen(false);
+        this._hideLockScreen(false, 0);
     },
 
     _bumpLockScreen: function() {
@@ -610,14 +673,21 @@ const ScreenShield = new Lang.Class({
                          });
     },
 
-    _hideLockScreen: function(animate) {
+    _hideLockScreen: function(animate, velocity) {
         this._lockScreenState = MessageTray.State.HIDING;
 
         if (animate) {
             // Tween the lock screen out of screen
-            // try to use the same speed regardless of original position
+            // if velocity is not specified (i.e. we come here from pressing ESC),
+            // use the same speed regardless of original position
+            // if velocity is specified, it's in pixels per milliseconds
             let h = global.stage.height;
-            let time = CURTAIN_SLIDE_TIME * (h + this._lockScreenGroup.y) / h;
+            let delta = (h + this._lockScreenGroup.y);
+            let min_velocity = global.stage.height / (CURTAIN_SLIDE_TIME * 1000);
+
+            velocity = Math.max(min_velocity, velocity);
+            let time = (delta / velocity) / 1000;
+
             Tweener.removeTweens(this._lockScreenGroup);
             Tweener.addTween(this._lockScreenGroup,
                              { y: -h,
@@ -634,6 +704,8 @@ const ScreenShield = new Lang.Class({
             this._lockScreenGroup.hide();
         }
 
+        global.stage.show_cursor();
+
         if (Main.sessionMode.currentMode == 'lock-screen')
             Main.sessionMode.popMode('lock-screen');
     },
@@ -722,6 +794,16 @@ const ScreenShield = new Lang.Class({
         this._arrowAnimationId = Mainloop.timeout_add(6000, Lang.bind(this, this._animateArrows));
         this._animateArrows();
 
+        let motionId = global.stage.connect('captured-event', function(stage, event) {
+            if (event.type() == Clutter.EventType.MOTION) {
+                global.stage.show_cursor();
+                global.stage.disconnect(motionId);
+            }
+
+            return false;
+        });
+        global.stage.hide_cursor();
+
         this._lockScreenState = MessageTray.State.SHOWN;
         this._lockScreenGroup.fixed_position_set = false;
         this._lockScreenScrollCounter = 0;
@@ -830,6 +912,7 @@ const ScreenShield = new Lang.Class({
 
         this._activationTime = 0;
         this._isActive = false;
+        this._isLocked = false;
         this.emit('lock-status-changed');
     },
 
@@ -854,6 +937,7 @@ const ScreenShield = new Lang.Class({
         this._resetLockScreen(animate, animate);
 
         this._isActive = true;
+        this._isLocked = true;
         this.emit('lock-status-changed');
     },
 });

js/ui/sessionMode.js

@@ -37,7 +37,7 @@ const _modes = {
         isGreeter: true,
         isPrimary: true,
         unlockDialog: imports.gdm.loginDialog.LoginDialog,
-        components: ['polkitAgent'],
+        components: ['polkitAgent', 'mediaKeysManager'],
         panel: {
             left: ['logo'],
             center: ['dateMenu'],
@@ -50,7 +50,7 @@ const _modes = {
         isLocked: true,
         isGreeter: undefined,
         unlockDialog: undefined,
-        components: ['polkitAgent', 'telepathyClient'],
+        components: ['polkitAgent', 'telepathyClient', 'mediaKeysManager'],
         panel: {
             left: ['userMenu'],
             center: [],
@@ -61,7 +61,7 @@ const _modes = {
     'unlock-dialog': {
         isLocked: true,
         unlockDialog: undefined,
-        components: ['polkitAgent', 'telepathyClient'],
+        components: ['polkitAgent', 'telepathyClient', 'mediaKeysManager'],
         panel: {
             left: ['userMenu'],
             center: [],
@@ -71,7 +71,7 @@ const _modes = {
 
     'initial-setup': {
         isPrimary: true,
-        components: ['keyring'],
+        components: ['keyring', 'mediaKeysManager'],
         panel: {
             left: [],
             center: ['dateMenu'],
@@ -91,8 +91,9 @@ const _modes = {
         isLocked: false,
         isPrimary: true,
         unlockDialog: imports.ui.unlockDialog.UnlockDialog,
-        components: ['networkAgent', 'polkitAgent', 'telepathyClient',
-                     'keyring', 'recorder', 'autorunManager', 'automountManager'],
+        components: ['networkAgent', 'polkitAgent', 'telepathyClient', 'keyring',
+                     'recorder', 'autorunManager', 'automountManager',
+                     'mediaKeysManager'],
         panel: {
             left: ['activities', 'appMenu'],
             center: ['dateMenu'],

js/ui/status/accessibility.js

@@ -38,8 +38,8 @@ const ATIndicator = new Lang.Class({
     _init: function() {
         this.parent('preferences-desktop-accessibility-symbolic', _("Accessibility"));
 
-        let highContrast = this._buildHCItem();
-        this.menu.addMenuItem(highContrast);
+        this._highContrast = this._buildHCItem();
+        this.menu.addMenuItem(this._highContrast);
 
         let magnifier = this._buildItem(_("Zoom"), APPLICATIONS_SCHEMA,
                                                    'screen-magnifier-enabled');
@@ -159,5 +159,9 @@ const ATIndicator = new Lang.Class({
             widget.setToggleState(active);
         });
         return widget;
-    }
+    },
+
+    toggleHighContrast: function() {
+        this._highContrast.toggle();
+    },
 });

js/ui/status/power.js

@@ -96,7 +96,7 @@ const Indicator = new Lang.Class({
                     let minutes = time % 60;
                     let hours = Math.floor(time / 60);
                     let timestring;
-                    if (time > 60) {
+                    if (time >= 60) {
                         if (minutes == 0) {
                             timestring = ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
                         } else {

js/ui/status/volume.js

@@ -66,7 +66,21 @@ const VolumeMenu = new Lang.Class({
         this._onControlStateChanged();
     },
 
-    scroll: function(direction) {
+    toggleMute: function(quiet) {
+        let muted = this._output.is_muted;
+        this._output.change_is_muted(!muted);
+
+        if (muted && !quiet)
+            this._notifyVolumeChange();
+
+        if (!muted)
+            return ['audio-volume-muted-symbolic', 0];
+        else
+            return [this._volumeToIcon(this._output.volume),
+                    this._output.volume / this._volumeMax];
+    },
+
+    scroll: function(direction, quiet) {
         let currentVolume = this._output.volume;
 
         if (direction == Clutter.ScrollDirection.DOWN) {
@@ -85,7 +99,14 @@ const VolumeMenu = new Lang.Class({
             this._output.push_volume();
         }
 
-        this._notifyVolumeChange();
+        if (!quiet)
+            this._notifyVolumeChange();
+
+        if (this._output.is_muted)
+            return ['audio-volume-muted-symbolic', 0];
+        else
+            return [this._volumeToIcon(this._output.volume),
+                    this._output.volume / this._volumeMax];
     },
 
     _onControlStateChanged: function() {
@@ -221,14 +242,14 @@ const Indicator = new Lang.Class({
         this.parent('audio-volume-muted-symbolic', _("Volume"));
 
         this._control = getMixerControl();
-        this._volumeMenu = new VolumeMenu(this._control);
-        this._volumeMenu.connect('icon-changed', Lang.bind(this, function(menu, icon) {
+        this.volumeMenu = new VolumeMenu(this._control);
+        this.volumeMenu.connect('icon-changed', Lang.bind(this, function(menu, icon) {
             this._hasPulseAudio = (icon != null);
             this.setIcon(icon);
             this._syncVisibility();
         }));
 
-        this.menu.addMenuItem(this._volumeMenu);
+        this.menu.addMenuItem(this.volumeMenu);
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this.menu.addSettingsAction(_("Sound Settings"), 'gnome-sound-panel.desktop');
@@ -242,6 +263,6 @@ const Indicator = new Lang.Class({
     },
 
     _onScrollEvent: function(actor, event) {
-        this._volumeMenu.scroll(event.get_scroll_direction());
-    }
+        this.volumeMenu.scroll(event.get_scroll_direction(), false);
+    },
 });

js/ui/unlockDialog.js

@@ -151,6 +151,9 @@ const UnlockDialog = new Lang.Class({
         ShellEntry.addContextMenu(this._promptEntry, { isPassword: true });
         this.setInitialKeyFocus(this._promptEntry);
         this._promptEntry.clutter_text.connect('activate', Lang.bind(this, this._doUnlock));
+        this._promptEntry.clutter_text.connect('text-changed', Lang.bind(this, function() {
+            this._updateOkButtonSensitivity(this._promptEntry.text.length > 0);
+        }));
 
         this._promptLayout.add(this._promptEntry,
                                { expand: true,
@@ -203,6 +206,10 @@ const UnlockDialog = new Lang.Class({
     _updateSensitivity: function(sensitive) {
         this._promptEntry.reactive = sensitive;
         this._promptEntry.clutter_text.editable = sensitive;
+        this._updateOkButtonSensitivity(sensitive && this._promptEntry.text.length > 0);
+    },
+
+    _updateOkButtonSensitivity: function(sensitive) {
         this._okButton.button.reactive = sensitive;
         this._okButton.button.can_focus = sensitive;
     },

js/ui/userMenu.js

@@ -572,6 +572,7 @@ const UserMenuButton = new Lang.Class({
 
                 this._updateHaveShutdown();
                 this._updateHaveSuspend();
+                this._updateHaveHibernate();
             }));
         this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
                                        Lang.bind(this, this._updateHaveShutdown));
@@ -655,6 +656,13 @@ const UserMenuButton = new Lang.Class({
         }));
     },
 
+    _updateHaveHibernate: function() {
+        this._loginManager.canHibernate(Lang.bind(this,
+            function(result) {
+                this._haveHibernate = result;
+        }));
+    },
+
     _updateSuspendOrPowerOff: function() {
         if (!this._suspendOrPowerOffItem)
             return;
@@ -752,7 +760,7 @@ const UserMenuButton = new Lang.Class({
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
 
-        item = new PopupMenu.PopupMenuItem(_("System Settings"));
+        item = new PopupMenu.PopupMenuItem(_("Settings"));
         item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
         this.menu.addMenuItem(item);
         this._systemSettings = item;
@@ -766,7 +774,7 @@ const UserMenuButton = new Lang.Class({
         this._loginScreenItem = item;
 
         item = new PopupMenu.PopupMenuItem(_("Log Out"));
-        item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
+        item.connect('activate', Lang.bind(this, this.logOut));
         this.menu.addMenuItem(item);
         this._logoutItem = item;
 
@@ -835,7 +843,7 @@ const UserMenuButton = new Lang.Class({
         Gdm.goto_login_session_sync(null);
     },
 
-    _onQuitSessionActivate: function() {
+    logOut: function() {
         Main.overview.hide();
         this._session.LogoutRemote(0);
     },
@@ -847,25 +855,60 @@ const UserMenuButton = new Lang.Class({
         this._session.RebootRemote();
     },
 
+    shutdown: function() {
+        this._session.ShutdownRemote();
+    },
+
+    suspend: function() {
+        if (!this._haveSuspend)
+            return false;
+
+        // Ensure we only suspend after locking the screen
+        if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY)) {
+            let tmpId = Main.screenShield.connect('lock-screen-shown', Lang.bind(this, function() {
+                Main.screenShield.disconnect(tmpId);
+
+                this._loginManager.suspend();
+            }));
+
+            this.menu.close(BoxPointer.PopupAnimation.NONE);
+            Main.screenShield.lock(true);
+        } else {
+            this._loginManager.suspend();
+        }
+
+        return true;
+    },
+
+    hibernate: function() {
+        if (!this._haveHibernate)
+            return false;
+
+        // Ensure we only suspend after locking the screen
+        if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY)) {
+            let tmpId = Main.screenShield.connect('lock-screen-shown', Lang.bind(this, function() {
+                Main.screenShield.disconnect(tmpId);
+
+                this._loginManager.hibernate();
+            }));
+
+            this.menu.close(BoxPointer.PopupAnimation.NONE);
+            Main.screenShield.lock(true);
+        } else {
+            this._loginManager.hibernate();
+        }
+
+        return true;
+    },
+
     _onSuspendOrPowerOffActivate: function() {
         Main.overview.hide();
 
         if (this._haveShutdown &&
             this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
-            this._session.ShutdownRemote();
+            this.shutdown();
         } else {
-            if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY)) {
-                let tmpId = Main.screenShield.connect('lock-screen-shown', Lang.bind(this, function() {
-                    Main.screenShield.disconnect(tmpId);
-
-                    this._loginManager.suspend();
-                }));
-
-                this.menu.close(BoxPointer.PopupAnimation.NONE);
-                Main.screenShield.lock(true);
-            } else {
-                this._loginManager.suspend();
-            }
+            this.suspend();
         }
     }
 });

js/ui/viewSelector.js

@@ -196,7 +196,7 @@ const ViewSelector = new Lang.Class({
                                                   })
                                             });;
         this._pageArea.add_actor(page);
-        return page
+        return page;
     },
 
     _showPage: function(page) {

js/ui/windowAttentionHandler.js

@@ -39,6 +39,8 @@ const WindowAttentionHandler = new Lang.Class({
         let [title, banner] = this._getTitleAndBanner(app, window);
 
         let notification = new MessageTray.Notification(source, title, banner);
+        notification.setForFeedback(true);
+
         source.notify(notification);
 
         source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function() {

js/ui/windowManager.js

@@ -12,6 +12,7 @@ const AltTab = imports.ui.altTab;
 const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
+const Util = imports.misc.util;
 
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 const WINDOW_ANIMATION_TIME = 0.25;
@@ -101,32 +102,32 @@ const WindowManager = new Lang.Class({
         this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
 
         this._workspaceSwitcherPopup = null;
-        Meta.keybindings_set_custom_handler('switch-to-workspace-left',
+        Meta.keybindings_set_custom_handler('internal-keybinding-switch-to-workspace-left',
+                                            Util.wrapKeybinding(Lang.bind(this, this._showWorkspaceSwitcher), true));
+        Meta.keybindings_set_custom_handler('internal-keybinding-switch-to-workspace-right',
+                                            Util.wrapKeybinding(Lang.bind(this, this._showWorkspaceSwitcher), true));
+        Meta.keybindings_set_custom_handler('internal-keybinding-switch-to-workspace-up',
+                                            Util.wrapKeybinding(Lang.bind(this, this._showWorkspaceSwitcher), true));
+        Meta.keybindings_set_custom_handler('internal-keybinding-switch-to-workspace-down',
+                                            Util.wrapKeybinding(Lang.bind(this, this._showWorkspaceSwitcher), true));
+        Meta.keybindings_set_custom_handler('internal-keybinding-move-to-workspace-left',
                                             Lang.bind(this, this._showWorkspaceSwitcher));
-        Meta.keybindings_set_custom_handler('switch-to-workspace-right',
+        Meta.keybindings_set_custom_handler('internal-keybinding-move-to-workspace-right',
                                             Lang.bind(this, this._showWorkspaceSwitcher));
-        Meta.keybindings_set_custom_handler('switch-to-workspace-up',
+        Meta.keybindings_set_custom_handler('internal-keybinding-move-to-workspace-up',
                                             Lang.bind(this, this._showWorkspaceSwitcher));
-        Meta.keybindings_set_custom_handler('switch-to-workspace-down',
+        Meta.keybindings_set_custom_handler('internal-keybinding-move-to-workspace-down',
                                             Lang.bind(this, this._showWorkspaceSwitcher));
-        Meta.keybindings_set_custom_handler('move-to-workspace-left',
-                                            Lang.bind(this, this._showWorkspaceSwitcher));
-        Meta.keybindings_set_custom_handler('move-to-workspace-right',
-                                            Lang.bind(this, this._showWorkspaceSwitcher));
-        Meta.keybindings_set_custom_handler('move-to-workspace-up',
-                                            Lang.bind(this, this._showWorkspaceSwitcher));
-        Meta.keybindings_set_custom_handler('move-to-workspace-down',
-                                            Lang.bind(this, this._showWorkspaceSwitcher));
-        Meta.keybindings_set_custom_handler('switch-windows',
+        Meta.keybindings_set_custom_handler('internal-keybinding-switch-windows',
                                             Lang.bind(this, this._startAppSwitcher));
-        Meta.keybindings_set_custom_handler('switch-group',
+        Meta.keybindings_set_custom_handler('internal-keybinding-switch-group',
                                             Lang.bind(this, this._startAppSwitcher));
-        Meta.keybindings_set_custom_handler('switch-windows-backward',
+        Meta.keybindings_set_custom_handler('internal-keybinding-switch-windows-backward',
                                             Lang.bind(this, this._startAppSwitcher));
-        Meta.keybindings_set_custom_handler('switch-group-backward',
+        Meta.keybindings_set_custom_handler('internal-keybinding-switch-group-backward',
                                             Lang.bind(this, this._startAppSwitcher));
-        Meta.keybindings_set_custom_handler('switch-panels',
-                                            Lang.bind(this, this._startA11ySwitcher));
+        Meta.keybindings_set_custom_handler('internal-keybinding-switch-panels',
+                                            Util.wrapKeybinding(Lang.bind(this, this._startA11ySwitcher), true));
         global.display.add_keybinding('open-application-menu',
                                       new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                                       Meta.KeyBindingFlags.NONE,
@@ -552,30 +553,32 @@ const WindowManager = new Lang.Class({
         let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
         if (!tabPopup.show(backwards, binding.get_name(), binding.get_mask()))
             tabPopup.destroy();
+        return true;
     },
 
     _startA11ySwitcher : function(display, screen, window, binding) {
         let modifiers = binding.get_modifiers();
         let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
         Main.ctrlAltTabManager.popup(backwards, binding.get_mask());
+        return true;
     },
 
     _openAppMenu : function(display, screen, window, event, binding) {
         Main.panel.openAppMenu();
+        return true;
     },
 
     _showWorkspaceSwitcher : function(display, screen, window, binding) {
         if (screen.n_workspaces == 1)
-            return;
+            return false;
 
-        let [action,,,direction] = binding.get_name().split('-');
+        let [,,action,,,direction] = binding.get_name().split('-');
         let direction = Meta.MotionDirection[direction.toUpperCase()];
         let newWs;
 
-
         if (direction != Meta.MotionDirection.UP &&
             direction != Meta.MotionDirection.DOWN)
-            return;
+            return false;
 
         if (action == 'switch')
             newWs = this.actionMoveWorkspace(direction);
@@ -591,6 +594,8 @@ const WindowManager = new Lang.Class({
             }
             this._workspaceSwitcherPopup.display(direction, newWs.index());
         }
+
+        return true;
     },
 
     actionMoveWorkspace: function(direction) {

man/Makefile.am

@@ -1 +1,19 @@
-dist_man_MANS = gnome-shell.1
+XSLTPROC_FLAGS = \
+        --nonet \
+        --stringparam man.output.quietly 1 \
+        --stringparam funcsynopsis.style ansi \
+        --stringparam man.th.extra1.suppress 1 \
+        --stringparam man.authors.section.enabled 0 \
+        --stringparam man.copyright.section.enabled 0
+
+.xml.1:
+	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+man_MANS = \
+	gnome-shell.1
+
+xml_files = $(man_MANS:.1=.xml)
+
+EXTRA_DIST = $(xml_files)
+
+DISTCLEANFILES = $(man_MANS)

man/gnome-shell.1

@@ -1,94 +0,0 @@
-.\" Copyright (c) 2009, Marcelo Jorge Vieira (metal) <metal@alucinados.com>
-.\"
-.\" This is free documentation; 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.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual 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 manual; if not, write to the Free
-.\" Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-.\" Boston, MA  02111-1301  USA.
-.TH GNOME-SHELL 1
-.SH NAME
-gnome-shell \- Graphical shell for the GNOME desktop
-
-.SH SYNOPSIS
-.B gnome-shell [options]
-
-.SH DESCRIPTION
-GNOME Shell provides core user interface functions for the GNOME 3
-desktop, like switching to windows and launching applications. GNOME
-Shell takes advantage of the capabilities of modern graphics hardware
-and introduces innovative user interface concepts to provide a
-visually attractive and easy to use experience.
-
-.SH OPTIONS
-
-.TP
-.B \-\-replace
-Replace the running window manager
-.br
-
-.TP
-.B \-\-sm-disable
-Disable connection to the session manager
-.br
-
-.TP
-.B \-\-sm-client-id=ID
-Specify session management ID
-.br
-
-.TP
-.B \-\-sm-save-file=FILE
-Initialize session from savefile
-.br
-
-.TP
-.B \-\-screen=SCREEN
-X screen to use
-.br
-
-.TP
-.B \-d, \-\-display=DISPLAY
-X display to use
-.br
-
-.TP
-.B \-\-sync
-Make X calls synchronous
-.br
-
-.TP
-.B \-\-version
-Print version and exit
-.br
-
-.TP
-.B \-\-help
-Display help and exit
-.br
-
-.SH BUGS
-The bug tracker can be reached by visiting the website
-\fIhttps://bugzilla.gnome.org/buglist.cgi?product=gnome-shell\fR
-
-Before sending a bug report, please verify that you have the latest
-version of gnome-shell. Many bugs (major and minor) are fixed at each
-release, and if yours is out of date, the problem may already have
-been solved.
-
-.SH ADDITIONAL INFORMATION
-
-For further information, visit the website \fIhttp://live.gnome.org/GnomeShell\fR

man/gnome-shell.xml

@@ -0,0 +1,159 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<refentry id="gnome-shell">
+
+        <refentryinfo>
+                <title>gnome-shell</title>
+                <productname>gnome-shell</productname>
+
+                <authorgroup>
+                        <author>
+                                <contrib>wrote the original gnome-shell man page</contrib>
+                                <firstname>Marcelo Jorge</firstname>
+                                <surname>Vieira</surname>
+                                <email>metal@alucinados.com</email>
+                        </author>
+                </authorgroup>
+
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>gnome-shell</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>gnome-shell</refname>
+                <refpurpose>Graphical shell for the GNOME desktop</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>gnome-shell <arg choice="opt" rep="repeat">OPTION</arg></command>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para>GNOME shell provides core user
+                interface functions for the GNOME 3 desktop, like switching
+                to windows and launching applications. GNOME shell takes
+                advantage of the capabilities of modern graphics hardware
+                and introduces innovative user interface concepts to provide
+                a visually attractive and easy to use experience.</para>
+
+                <para>gnome-shell is a required component of
+                the GNOME desktop, i.e. it is listed in the
+                RequiredComponents field of
+                <filename>/usr/share/gnome-session/sessions/gnome.session</filename>.
+                It is started in the window manager phase of the session.
+                </para>
+
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+
+                        <varlistentry>
+                                <term><option>-r</option>, <option>--replace</option></term>
+
+                                <listitem><para>Replace the running window manager</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sm-disable</option></term>
+
+                                <listitem><para>Disable connection to the session manager</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sm-client-id=<replaceable>ID</replaceable></option></term>
+
+                                <listitem><para>Specify session management <replaceable>ID</replaceable></para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sm-save-file=<replaceable>FILE</replaceable></option></term>
+
+                                <listitem><para>Initialize session from <replaceable>FILE</replaceable></para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--screen=<replaceable>SCREEN</replaceable></option></term>
+
+                                <listitem><para>X screen to use</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-d</option>, <option>--display=<replaceable>DISPLAY</replaceable></option></term>
+
+                                <listitem><para>X Display to use</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sync</option></term>
+
+                                <listitem><para>Make X calls synchronous</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--version</option></term>
+
+                                <listitem><para>Print version and exit</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Display help and exit</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--mode=<replaceable>MODE</replaceable></option></term>
+
+                                <listitem><para>Use a specific mode, e.g. "gdm" for login screen</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--list-modes</option></term>
+
+                                <listitem><para>List possible modes and exit</para></listitem>
+                        </varlistentry>
+
+                </variablelist>
+
+        </refsect1>
+
+        <refsect1>
+                <title>Files</title>
+
+                <para>
+                        <filename>/usr/share/gnome-session/sessions/gnome.session</filename>,
+                        <filename>/usr/share/applications/gnome-shell.desktop</filename>.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+
+                <para>The bug tracker can be reached by visiting the
+                website <ulink url="https://bugzilla.gnome.org/buglist.cgi?product=gnome-shell">https://bugzilla.gnome.org/buglist.cgi?product=gnome-shell</ulink>.
+                Before sending a bug report, please verify that you have
+                the latest version of gnome-shell. Many bugs (major and
+                minor) are fixed at each release, and if yours is out of
+                date, the problem may already have been solved.</para>
+
+        </refsect1>
+
+        <refsect1>
+                <title>Additional Information</title>
+
+                <para>For further information, visit the website
+                <ulink url="http://live.gnome.org/GnomeShell">http://live.gnome.org/GnomeShell</ulink>.</para>
+        </refsect1>
+
+</refentry>

po/de.po

@@ -19,9 +19,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: 2012-10-14 16:48+0000\n"
-"PO-Revision-Date: 2012-10-10 23:10+0100\n"
-"Last-Translator: Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>\n"
+"POT-Creation-Date: 2012-11-06 04:39+0000\n"
+"PO-Revision-Date: 2012-11-06 20:04+0100\n"
+"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -148,56 +148,68 @@ msgstr ""
 "Aufzählung entnommen."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Den Menüeintrag »Abmelden« immer im Benutzermenü anzeigen."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Dieser Schlüssel überschreibt das automatische Verbergen des Menüeintrags "
+"»Abmelden« in Einzelbenutzer, Einzelsitzungssituationen."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Wochentag im Kalender anzeigen"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr ""
 "Wenn dieser Wert gesetzt ist, wird der ISO-Wochentag im Kalender angezeigt."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Tastenkombination zum Öffnen des Anwendungsmenüs"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Tastenkombination zum Öffnen des Anwendungsmenüs."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr ""
 "Tastenkombination zum Umschalten der Sichtbarkeit des Benachrichtigungsfeldes"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr ""
 "Tastenkombination zum Umschalten der Sichtbarkeit des "
 "Benachrichtigungsfeldes."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Tastenkombination zum Umschalten des Bildschirmaufzeichners"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr ""
 "Tastenkombination zum Starten/Entfernen des eingebauten "
 "Bildschirmaufzeichners."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "Zu verwendende Tastatur"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "Der Typ der zu verwendenden Tastatur"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "Bildwiederholungsrate zur Aufnahme von Screencasts"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -206,11 +218,11 @@ msgstr ""
 "der GNOME-Shell aufgezeichnet werden soll, in Einzelbildern pro Sekunde."
 
 # hmm Enkodieren oder Kodieren?
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Die GStreamer-Weiterleitung zur Enkodierung des Screencasts"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -238,11 +250,11 @@ msgstr ""
 "aufzeichnet. %T wird als Platzhalter für die vermutete optimale Thread-"
 "Anzahl auf dem System verwendet."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "Die Dateiendung zum Speichern des Screencast"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 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 "
@@ -303,8 +315,8 @@ msgstr "Anmeldefenster"
 msgid "Power"
 msgstr "Ausschalten"
 
-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Bereitschaft"
 
@@ -312,8 +324,8 @@ msgstr "Bereitschaft"
 msgid "Restart"
 msgstr "Neu starten"
 
-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Ausschalten"
 
@@ -698,35 +710,35 @@ msgstr "Stumm"
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:952
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Gesendet am <b>%A</b> um <b>%X</b> "
 
 #. Translators: this is a time format in the style of "Wednesday, May 25",
 #. shown when you get a chat message in the same year.
-#: ../js/ui/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:958
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Gesendet am <b>%A</b>, <b>%d. %B</b>"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
 #. shown when you get a chat message in a different year.
-#: ../js/ui/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:963
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Gesendet am <b>%A</b>, <b>%d. %B</b> %Y"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:992
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1092
 #, c-format
 msgid "Invitation to %s"
 msgstr "Einladung zum Betreten von %s"
@@ -734,42 +746,42 @@ msgstr "Einladung zum Betreten von %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1100
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s lädt Sie ein, %s beizutreten"
 
-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1102
+#: ../js/ui/components/telepathyClient.js:1181
+#: ../js/ui/components/telepathyClient.js:1244
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1103
+#: ../js/ui/components/telepathyClient.js:1182
+#: ../js/ui/components/telepathyClient.js:1245
 msgid "Accept"
 msgstr "Annehmen"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1133
 #, c-format
 msgid "Video call from %s"
 msgstr "Video-Anruf von %s"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1136
 #, c-format
 msgid "Call from %s"
 msgstr "Anruf von %s"
 
-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1141
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Abweisen"
 
 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1143
 msgid "Answer"
 msgstr "Antworten"
 
@@ -778,113 +790,113 @@ msgstr "Antworten"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1175
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s sendet Ihnen %s"
 
 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s bittet um das Recht, Ihre Online-Verfügbarkeit sehen zu dürfen"
 
-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Network error"
 msgstr "Netzwerkfehler"
 
-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Authentication failed"
 msgstr "Legitimierung fehlgeschlagen"
 
-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Encryption error"
 msgstr "Verschlüsselungsfehler"
 
-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate not provided"
 msgstr "Zertifikat wurde nicht bereitgestellt"
 
-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate untrusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate expired"
 msgstr "Zertifikat abgelaufen"
 
-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate not activated"
 msgstr "Zertifikat nicht aktiviert"
 
-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate hostname mismatch"
 msgstr "Rechnername des Zertifikats stimmt nicht überein"
 
-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingerabdruck des Zertifikats stimmt nicht überein"
 
-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Certificate self-signed"
 msgstr "Selbstsigniertes Zertifikat"
 
-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Status is set to offline"
 msgstr "Der Status ist auf »Abgemeldet« gesetzt"
 
-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Encryption is not available"
 msgstr "Verschlüsselung ist nicht verfügbar"
 
-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Certificate is invalid"
 msgstr "Zertifikat ist ungültig"
 
-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection has been refused"
 msgstr "Verbindungsaufbau wurde verweigert"
 
-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection can't be established"
 msgstr "Verbindung kann nicht hergestellt werden"
 
-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "Connection has been lost"
 msgstr "Verbindung wurde unterbrochen"
 
-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1334
 msgid "This account is already connected to the server"
 msgstr "Dieses Konto ist bereits mit dem Server verbunden"
 
-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1336
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Die Verbindung wurde durch eine neue Verbindung mit der gleichen Ressource "
 "ersetzt"
 
-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "The account already exists on the server"
 msgstr "Dieses Konto ist bereits auf dem Server vorhanden"
 
-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Der Server ist derzeit überlastet und kann die Verbindung nicht annehmen"
 
-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Certificate has been revoked"
 msgstr "Zertifikat wurde zurückgezogen"
 
-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Das Zertifikat verwendet einen unsicheren Chiffrier-Algorithmus oder ist "
 "kryptografisch schwach"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1346
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -893,26 +905,26 @@ msgstr ""
 "überschreiten die durch die kryptografische Bibliothek gegebenen "
 "Beschränkungen"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Internal error"
 msgstr "Interner Fehler"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1358
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Verbindung zu %s ist fehlgeschlagen"
 
-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Reconnect"
 msgstr "Erneut verbinden"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Edit account"
 msgstr "Konto bearbeiten"
 
-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1413
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
@@ -1095,23 +1107,23 @@ msgstr "Quelle zeigen"
 msgid "Web Page"
 msgstr "Webseite"
 
-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Öffnen"
 
-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Benachrichtigungsfeld"
 
-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Systeminformationen"
 
-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -1171,18 +1183,18 @@ msgstr "Bitte geben Sie einen Befehl ein:"
 # %B - ausgeschriebener Name des Monats, abhängig von der gesetzten Umgebung
 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %d. %B"
 
-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"
 
-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@@ -1638,59 +1650,59 @@ msgstr "Mikrofon"
 msgid "Log in as another user"
 msgstr "Als anderer Benutzer anmelden"
 
-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Abwesend"
 
-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Untätig"
 
-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Nicht verfügbar"
 
-#: ../js/ui/userMenu.js:740
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../js/ui/userMenu.js:748
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Systemeinstellungen"
 
-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Benutzer wechseln"
 
-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Abmelden"
 
-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Sperren"
 
-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Aktualisierungen installieren und neustarten"
 
-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Ihr Anwesenheitsstatus wird auf »Beschäftigt« gesetzt"
 
-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:804
 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."
@@ -1777,7 +1789,7 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Die möglichen Modi auflisten"
 
-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "»%s« konnte nicht gestartet werden"

po/nb.po

@@ -6,10 +6,10 @@
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 3.5.x\n"
+"Project-Id-Version: gnome-shell 3.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-11 20:24+0200\n"
-"PO-Revision-Date: 2012-10-11 20:25+0200\n"
+"POT-Creation-Date: 2012-11-05 19:06+0100\n"
+"PO-Revision-Date: 2012-11-05 19:10+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -34,6 +34,14 @@ msgstr "System"
 msgid "Show the message tray"
 msgstr "Vis meldingstrau"
 
+#: ../data/50-gnome-shell-system.xml.in.h:3
+msgid "Show all applications"
+msgstr "Vis alle programmer"
+
+#: ../data/50-gnome-shell-system.xml.in.h:4
+msgid "Open the application menu"
+msgstr "Åpne programmenyen"
+
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
@@ -128,50 +136,71 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+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
 msgid "Show the week date in the calendar"
 msgstr "Vis dato for uken i kalender"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 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:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Tastaturbinding som åpner programmenyen"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Tastaturbinding som åpner programmenyen."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#, fuzzy
+msgid "Keybinding to open the \"Show Applications\" view"
+msgstr "Tastaturbinding som åpner programmenyen"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#, fuzzy
+msgid ""
+"Keybinding to open the \"Show Applications\" view of the Activities Overview."
+msgstr "Tastaturbinding som åpner programmenyen."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Tastaturbinding som slår av/på synlighet for meldingstrau"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Tastaturbinding som slår av/på synlighet for meldingstrauet."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Tastaturbinding som slår av/på skjermopptak"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "Tastaturbinding som starter/stopper innebygget opptak av skjerm."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Which keyboard to use"
 msgstr "Tastatur som skal brukes"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "The type of keyboard to use."
 msgstr "Type tastatur som skal brukes."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Framerate used for recording screencasts."
 msgstr "Bildefrekvens i bruk ved lagring av skjermvideoer."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -179,11 +208,11 @@ msgstr ""
 "Bildefrekvensen i den ferdige skjermvideoen tatt opp med GNOME Shells "
 "skjermvideoopptaker i bilder per sekund."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Gstreamer-kommandokø brukt til å kode skjermvideoen"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 #, fuzzy, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -200,11 +229,11 @@ msgstr ""
 "Setter GStreamer-rør som brukes til å kode opptak. Den følger syntaksen som "
 "brukes for gst-launch. Røret må ha en..."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "File extension used for storing the screencast"
 msgstr "Filendelse i bruk ved lagring av skjermvideo"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 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 "
@@ -214,6 +243,37 @@ msgstr ""
 "og bruke denne filendelsen. Den bør endres når du gjør opptak til et nytt "
 "oppbevaringsformat."
 
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+msgid "Attach modal dialog to the parent window"
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+msgid "Arrangement of buttons on the titlebar"
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+msgid ""
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+"GNOME Shell."
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+msgid "Workspaces are managed dynamically"
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+msgid "Workspaces only on primary monitor"
+msgstr ""
+
 #: ../js/extensionPrefs/main.js:124
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
@@ -227,11 +287,11 @@ msgstr "Utvidelse"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Velg en utvidelse som skal konfigureres med komboboksen over."
 
-#: ../js/gdm/loginDialog.js:529
+#: ../js/gdm/loginDialog.js:560
 msgid "Session..."
 msgstr "Økt …"
 
-#: ../js/gdm/loginDialog.js:677
+#: ../js/gdm/loginDialog.js:704
 msgctxt "title"
 msgid "Sign In"
 msgstr "Logg inn"
@@ -239,56 +299,56 @@ msgstr "Logg inn"
 #. 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:736
+#: ../js/gdm/loginDialog.js:764
 msgid "Not listed?"
 msgstr "Ikke listet?"
 
-#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:906 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:166
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:171
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../js/gdm/loginDialog.js:894
+#: ../js/gdm/loginDialog.js:911
 msgctxt "button"
 msgid "Sign In"
 msgstr "Logg inn"
 
-#: ../js/gdm/loginDialog.js:1215
+#: ../js/gdm/loginDialog.js:1237
 msgid "Login Window"
 msgstr "Innloggingsvindu"
 
 #. Translators: accessible name of the power menu in the login screen
-#: ../js/gdm/powerMenu.js:35
+#: ../js/gdm/powerMenu.js:36
 msgid "Power"
 msgstr "Strøm"
 
-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:667 ../js/ui/userMenu.js:671
+#: ../js/ui/userMenu.js:782
 msgid "Suspend"
 msgstr "Hvilemodus"
 
-#: ../js/gdm/powerMenu.js:94
+#: ../js/gdm/powerMenu.js:98
 msgid "Restart"
 msgstr "Start på nytt"
 
-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:669
+#: ../js/ui/userMenu.js:671 ../js/ui/userMenu.js:781
 msgid "Power Off"
 msgstr "Slå av"
 
-#: ../js/gdm/util.js:148
+#: ../js/gdm/util.js:151
 msgid "Authentication error"
 msgstr "Autentiseringsfeil"
 
 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:265
+#: ../js/gdm/util.js:268
 msgid "(or swipe finger)"
 msgstr "(eller dra finger)"
 
-#: ../js/gdm/util.js:290
+#: ../js/gdm/util.js:293
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(f.eks. bruker eller %s)"
@@ -338,7 +398,7 @@ msgstr "Legg til i favoritter"
 msgid "%s has been added to your favorites."
 msgstr "%s ble lagt til i dine favoritter."
 
-#: ../js/ui/appFavorites.js:118
+#: ../js/ui/appFavorites.js:121
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s ble fjernet fra dine favoritter."
@@ -457,48 +517,48 @@ msgid "S"
 msgstr "Lø"
 
 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:699
+#: ../js/ui/calendar.js:700
 msgid "Nothing Scheduled"
 msgstr "Ingenting planlagt"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:715
+#: ../js/ui/calendar.js:716
 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:718
+#: ../js/ui/calendar.js:719
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %B %d, %Y"
 
-#: ../js/ui/calendar.js:728
+#: ../js/ui/calendar.js:729
 msgid "Today"
 msgstr "I dag"
 
-#: ../js/ui/calendar.js:732
+#: ../js/ui/calendar.js:733
 msgid "Tomorrow"
 msgstr "I morgen"
 
-#: ../js/ui/calendar.js:743
+#: ../js/ui/calendar.js:744
 msgid "This week"
 msgstr "Denne uken"
 
-#: ../js/ui/calendar.js:751
+#: ../js/ui/calendar.js:752
 msgid "Next week"
 msgstr "Neste uke"
 
-#: ../js/ui/components/autorunManager.js:297
+#: ../js/ui/components/autorunManager.js:295
 msgid "Removable Devices"
 msgstr "Avtagbare enheter"
 
-#: ../js/ui/components/autorunManager.js:594
+#: ../js/ui/components/autorunManager.js:591
 #, c-format
 msgid "Open with %s"
 msgstr "Åpne med %s"
 
-#: ../js/ui/components/autorunManager.js:620
+#: ../js/ui/components/autorunManager.js:617
 msgid "Eject"
 msgstr "Løs ut"
 
@@ -652,38 +712,42 @@ msgstr "Fjern demping"
 msgid "Mute"
 msgstr "Demp"
 
-#. Translators: this is a time format string followed by a date.
-#. If applicable, replace %X with a strftime format valid for your
-#. locale, without seconds.
-#: ../js/ui/components/telepathyClient.js:948
+#. Translators: this is a time format string followed by the word "Yesterday". i.e. "14:30 on Yesterday"
+#: ../js/ui/components/telepathyClient.js:945
 #, no-c-format
-msgid "Sent at <b>%X</b> on <b>%A</b>"
-msgstr "Sendt <b>%X</b> på <b>%A</b>"
+msgid "<b>%H:%M</b> on Yesterday"
+msgstr "<b>%H.%M</b> i går"
 
-#. Translators: this is a time format in the style of "Wednesday, May 25",
-#. shown when you get a chat message in the same year.
-#: ../js/ui/components/telepathyClient.js:954
+#. Translators: this is a time format string followed by a week day name. i.e. "14:30 on Monday
+#: ../js/ui/components/telepathyClient.js:951
 #, no-c-format
-msgid "Sent on <b>%A</b>, <b>%B %d</b>"
-msgstr "Sendt  <b>%A</b>, <b>%B %d</b>"
+msgid "<b>%H:%M</b> on <b>%A</b>"
+msgstr "<b>%H.%M</b> på <b>%A</b>"
 
-#. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
-#. shown when you get a chat message in a different year.
-#: ../js/ui/components/telepathyClient.js:959
+#. Translators: this is a time format in the style of "14:30 on Wednesday, May 25",
+#. shown when you get a chat message in the same year
+#: ../js/ui/components/telepathyClient.js:957
 #, no-c-format
-msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
-msgstr "Sendt <b>%A</b>, <b>%B %d</b>, %Y"
+msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>"
+msgstr "<b>%H.%M</b>, <b>%A</b>, <b>%B</b> <b>%d</b>"
+
+#. Translators: this is a time format in the style of "14:30 on Wednesday, May 25, 2012",
+#. shown when you get a chat message in a different year
+#: ../js/ui/components/telepathyClient.js:962
+#, no-c-format
+msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>, %Y"
+msgstr "<b>%H.%M</b>, <b>%A</b>, <b>%B</b> <b>%d</b>, %Y"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1089
 #, c-format
 msgid "Invitation to %s"
 msgstr "Invitasjon til %s"
@@ -691,42 +755,42 @@ msgstr "Invitasjon til %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1097
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer deg til å bli med i %s"
 
-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
-msgid "Decline"
-msgstr "Avslå"
-
 #: ../js/ui/components/telepathyClient.js:1099
 #: ../js/ui/components/telepathyClient.js:1178
 #: ../js/ui/components/telepathyClient.js:1241
+msgid "Decline"
+msgstr "Avslå"
+
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Accept"
 msgstr "Godta"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1130
 #, c-format
 msgid "Video call from %s"
 msgstr "Videosamtale fra %s"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1133
 #, c-format
 msgid "Call from %s"
 msgstr "Samtale fra %s"
 
-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1138
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Avvis"
 
 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1140
 msgid "Answer"
 msgstr "Svar"
 
@@ -735,110 +799,110 @@ msgstr "Svar"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1172
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s sender deg %s"
 
 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1207
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vil ha rettigheter til å se når du er tilkoblet"
 
-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1299
 msgid "Network error"
 msgstr "Nettverksfeil"
 
-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1301
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1303
 msgid "Encryption error"
 msgstr "Feil ved kryptering"
 
-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1305
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"
 
-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1307
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikatet"
 
-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1309
 msgid "Certificate expired"
 msgstr "Sertifikatet er utløpt"
 
-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1311
 msgid "Certificate not activated"
 msgstr "Sertifikatet er ikke aktivert"
 
-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1313
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn for sertifikat"
 
-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1315
 msgid "Certificate fingerprint mismatch"
 msgstr "Feil fingeravtrykk for sertifikat"
 
-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1317
 msgid "Certificate self-signed"
 msgstr "Sertifikatet er selvsignert"
 
-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1319
 msgid "Status is set to offline"
 msgstr "Status er satt til frakoblet"
 
-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1321
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgjengelig"
 
-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1323
 msgid "Certificate is invalid"
 msgstr "Sertifikatet er ugyldig"
 
-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1325
 msgid "Connection has been refused"
 msgstr "Tilkobling ble nektet"
 
-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1327
 msgid "Connection can't be established"
 msgstr "Tilkobling kan ikke etableres"
 
-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1329
 msgid "Connection has been lost"
 msgstr "Tilkobling tapt"
 
-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1331
 msgid "This account is already connected to the server"
 msgstr "Denne kontoen er allerede koblet til tjeneren"
 
-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1333
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Tilkoblingen har blitt erstattet av en ny tilkobling som bruker samme ressurs"
 
-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1335
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"
 
-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1337
 msgid "Server is currently too busy to handle the connection"
 msgstr "Tjener er for opptatt til å håndtere tilkoblingen"
 
-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1339
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er tilbaketrukket"
 
-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1341
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikatet bruker en usikker sifferalgoritme eller er krytografisk svakt"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1343
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -846,26 +910,26 @@ msgstr ""
 "Lengden eller dybden på tjenersertifikatet oversteg grensen som er satt i "
 "kryptografibiblioteket"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1345
 msgid "Internal error"
 msgstr "Intern feil"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1355
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Tilkobling til %s feilet"
 
-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1364
 msgid "Reconnect"
 msgstr "Koble til på nytt"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Edit account"
 msgstr "Rediger konto"
 
-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1410
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
@@ -884,7 +948,7 @@ msgstr "Åpne kalender"
 #. 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:190
+#: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%a %e %B, %Y"
 
@@ -989,11 +1053,11 @@ 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:337
+#: ../js/ui/keyboard.js:308
 msgid "tray"
 msgstr "varslingsområde"
 
-#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
+#: ../js/ui/keyboard.js:555 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "Tastatur"
@@ -1046,32 +1110,32 @@ msgstr "Vis kildekode"
 msgid "Web Page"
 msgstr "Nettside"
 
-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1088
 msgid "Open"
 msgstr "Åpne"
 
-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1095
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:1539
 msgid "Message Tray"
 msgstr "Meldingstrau"
 
-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2563
 msgid "System Information"
 msgstr "Systeminformasjon"
 
-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:504 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../js/ui/overview.js:82
+#: ../js/ui/overview.js:89
 msgid "Undo"
 msgstr "Angre"
 
-#: ../js/ui/overview.js:127
+#: ../js/ui/overview.js:133
 msgid "Overview"
 msgstr "Oversikt"
 
@@ -1079,27 +1143,27 @@ msgstr "Oversikt"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:201
+#: ../js/ui/overview.js:207
 msgid "Type to search..."
 msgstr "Skriv for å søke …"
 
 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: ../js/ui/overview.js:222
+#: ../js/ui/overview.js:228
 msgid "Dash"
 msgstr "Favoritter"
 
-#: ../js/ui/panel.js:567
+#: ../js/ui/panel.js:581
 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:599
+#: ../js/ui/panel.js:613
 msgid "Activities"
 msgstr "Aktiviteter"
 
-#: ../js/ui/panel.js:965
+#: ../js/ui/panel.js:980
 msgid "Top Bar"
 msgstr "Topp-panel"
 
@@ -1113,23 +1177,27 @@ msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
 #: ../js/ui/runDialog.js:205
-msgid "Please enter a command:"
-msgstr "Oppgi en kommando:"
+msgid "Enter a Command"
+msgstr "Oppgi en kommando"
+
+#: ../js/ui/runDialog.js:241
+msgid "Close"
+msgstr "Lukk"
 
 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %B %d"
 
-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d ny melding"
 msgstr[1] "%d nye meldinger"
 
-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@@ -1168,7 +1236,7 @@ msgstr "Passord"
 msgid "Remember Password"
 msgstr "Husk passord"
 
-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:169
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:174
 msgid "Unlock"
 msgstr "Lås opp"
 
@@ -1223,7 +1291,7 @@ msgstr "Stor tekst"
 #: ../js/ui/status/bluetooth.js:27 ../js/ui/status/bluetooth.js:31
 #: ../js/ui/status/bluetooth.js:251 ../js/ui/status/bluetooth.js:304
 #: ../js/ui/status/bluetooth.js:335 ../js/ui/status/bluetooth.js:371
-#: ../js/ui/status/bluetooth.js:400 ../js/ui/status/network.js:867
+#: ../js/ui/status/bluetooth.js:400 ../js/ui/status/network.js:873
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -1252,12 +1320,12 @@ msgstr "maskinvare slått av"
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../js/ui/status/bluetooth.js:207 ../js/ui/status/network.js:458
+#: ../js/ui/status/bluetooth.js:207 ../js/ui/status/network.js:475
 msgid "disconnecting..."
 msgstr "kobler fra …"
 
-#: ../js/ui/status/bluetooth.js:220 ../js/ui/status/network.js:464
-#: ../js/ui/status/network.js:934
+#: ../js/ui/status/bluetooth.js:220 ../js/ui/status/network.js:481
+#: ../js/ui/status/network.js:1507
 msgid "connecting..."
 msgstr "kobler til …"
 
@@ -1367,109 +1435,106 @@ 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:456
+#: ../js/ui/status/network.js:473
 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:467 ../js/ui/status/network.js:937
+#: ../js/ui/status/network.js:484 ../js/ui/status/network.js:1510
 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:477
+#: ../js/ui/status/network.js:494
 msgid "firmware missing"
 msgstr "fastvare mangler"
 
 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:484
+#: ../js/ui/status/network.js:501
 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:489
+#: ../js/ui/status/network.js:506
 msgid "unavailable"
 msgstr "ikke tilgjengelig"
 
-#: ../js/ui/status/network.js:491 ../js/ui/status/network.js:939
+#: ../js/ui/status/network.js:508 ../js/ui/status/network.js:1512
 msgid "connection failed"
 msgstr "tilkobling feilet"
 
-#: ../js/ui/status/network.js:552 ../js/ui/status/network.js:1529
+#: ../js/ui/status/network.js:560 ../js/ui/status/network.js:1446
+#: ../js/ui/status/network.js:1588
 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:588 ../js/ui/status/network.js:1459
+#: ../js/ui/status/network.js:596 ../js/ui/status/network.js:1376
 msgid "Connected (private)"
 msgstr "Tilkoblet (privat)"
 
-#: ../js/ui/status/network.js:663
+#: ../js/ui/status/network.js:669
 msgid "Auto Ethernet"
 msgstr "Automatisk Ethernet"
 
-#: ../js/ui/status/network.js:721
+#: ../js/ui/status/network.js:727
 msgid "Auto broadband"
 msgstr "Automatisk bredbånd"
 
-#: ../js/ui/status/network.js:724
+#: ../js/ui/status/network.js:730
 msgid "Auto dial-up"
 msgstr "Automatisk oppringt"
 
 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:853 ../js/ui/status/network.js:1476
+#: ../js/ui/status/network.js:859 ../js/ui/status/network.js:1393
 #, c-format
 msgid "Auto %s"
 msgstr "Automatisk %s"
 
-#: ../js/ui/status/network.js:855
+#: ../js/ui/status/network.js:861
 msgid "Auto bluetooth"
 msgstr "Automatisk Bluetooth"
 
-#: ../js/ui/status/network.js:1478
+#: ../js/ui/status/network.js:1395
 msgid "Auto wireless"
 msgstr "Automatisk trådløst"
 
-#: ../js/ui/status/network.js:1575
+#: ../js/ui/status/network.js:1637
 msgid "Enable networking"
 msgstr "Slå på nettverk"
 
-#: ../js/ui/status/network.js:1597
+#: ../js/ui/status/network.js:1659
 msgid "Wired"
 msgstr "Kablet"
 
-#: ../js/ui/status/network.js:1608
+#: ../js/ui/status/network.js:1670
 msgid "Wireless"
 msgstr "Trådløst"
 
-#: ../js/ui/status/network.js:1618
+#: ../js/ui/status/network.js:1680
 msgid "Mobile broadband"
 msgstr "Mobilt bredbånd"
 
-#: ../js/ui/status/network.js:1628
-msgid "VPN Connections"
-msgstr "VPN-tilkoblinger"
-
-#: ../js/ui/status/network.js:1635
+#: ../js/ui/status/network.js:1691
 msgid "Network Settings"
 msgstr "Innstillinger for nettverk"
 
-#: ../js/ui/status/network.js:1679
+#: ../js/ui/status/network.js:1735
 msgid "Network Manager"
 msgstr "Nettverkshåndtering"
 
-#: ../js/ui/status/network.js:1769
+#: ../js/ui/status/network.js:1809
 msgid "Connection failed"
 msgstr "Tilkobling feilet"
 
-#: ../js/ui/status/network.js:1770
+#: ../js/ui/status/network.js:1810
 msgid "Activation of network connection failed"
 msgstr "Aktivering av nettverkstilkobling feilet"
 
-#: ../js/ui/status/network.js:2065
+#: ../js/ui/status/network.js:2108
 msgid "Networking is disabled"
 msgstr "Nettverk er slått av"
 
@@ -1579,63 +1644,63 @@ msgstr "Volum"
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:181
 msgid "Log in as another user"
 msgstr "Logg inn som en annen bruker"
 
-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:176
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:179
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:182
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:185
 msgid "Away"
 msgstr "Borte"
 
-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:188
 msgid "Idle"
 msgstr "Ledig"
 
-#: ../js/ui/userMenu.js:195
-msgid "Unavailable"
-msgstr "Ikke tilgjengelig"
+#: ../js/ui/userMenu.js:191
+msgid "Offline"
+msgstr "Frakoblet"
 
-#: ../js/ui/userMenu.js:740
+#: ../js/ui/userMenu.js:747
 msgid "Notifications"
 msgstr "Varslinger"
 
-#: ../js/ui/userMenu.js:748
+#: ../js/ui/userMenu.js:755
 msgid "System Settings"
 msgstr "Systeminnstillinger"
 
-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:763
 msgid "Switch User"
 msgstr "Bytt bruker"
 
-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:768
 msgid "Log Out"
 msgstr "Logg ut"
 
-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:773
 msgid "Lock"
 msgstr "Lås"
 
-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:788
 msgid "Install Updates & Restart"
 msgstr "Installer oppdateringer og start på nytt"
 
-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:806
 msgid "Your chat status will be set to busy"
 msgstr "Din pratestatus vil bli satt til opptatt"
 
-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:807
 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."
@@ -1644,15 +1709,15 @@ msgstr ""
 "tilkoblingsstatus er justert for å la andre vite at du kanskje ikke ser "
 "deres meldinger."
 
-#: ../js/ui/viewSelector.js:85
+#: ../js/ui/viewSelector.js:87
 msgid "Windows"
 msgstr "Vinduer"
 
-#: ../js/ui/viewSelector.js:89
+#: ../js/ui/viewSelector.js:91
 msgid "Applications"
 msgstr "Programmer"
 
-#: ../js/ui/viewSelector.js:93
+#: ../js/ui/viewSelector.js:95
 msgid "Search"
 msgstr "Søk"
 
@@ -1721,7 +1786,7 @@ msgstr "Bruk spesifikt modus, f.eks «gdm» for innloggingsskjerm"
 msgid "List possible modes"
 msgstr "Vis mulige modi"
 
-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Klarte ikke å starte «%s»"

po/ru.po

@@ -15,8 +15,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: 2012-09-25 00:06+0000\n"
-"PO-Revision-Date: 2012-09-27 16:38+0400\n"
+"POT-Creation-Date: 2012-10-31 16:48+0000\n"
+"PO-Revision-Date: 2012-11-04 20:48+0400\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@@ -141,51 +141,63 @@ msgstr ""
 "Данное значение берётся из перечисления GsmPresenceStatus."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Всегда показывать в меню пункт «Завершить сеанс»."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+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
 msgid "Show the week date in the calendar"
 msgstr "Показывать в часах дату недели"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Если установлено, календарь будет показывать неделю в формате ISO."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Комбинация клавиш для открытия меню приложения"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Комбинация клавиш для открытия меню приложения."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Комбинация клавиш для переключения видимости панели сообщений"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Комбинация клавиш для переключения видимости панели сообщений."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Комбинация клавиш для переключения записи экрана"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr ""
 "Комбинация клавиш для запуска/остановки встроенного средства записи экрана."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "Какую клавиатуру использовать"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "Тип используемой клавиатуры."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "Частота смены кадров для записи скринкастов."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -193,11 +205,11 @@ msgstr ""
 "Частота смены кадров в скринкасте, записанном с помощью GNOME Shell (кадров/"
 "сек)."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Конвейер gstreamer, используемый для кодирования скринкастов"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -224,11 +236,11 @@ msgstr ""
 "используется как заполнитель для определения оптимального количества потоков "
 "в системе."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "Расширение файла, использующееся для хранения скринкастов"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 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 "
@@ -251,11 +263,11 @@ msgstr "Расширение"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Выберите расширение из выпадающего списка."
 
-#: ../js/gdm/loginDialog.js:527
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "Сеанс…"
 
-#: ../js/gdm/loginDialog.js:675
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "Вход в систему"
@@ -263,34 +275,33 @@ 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:742
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "Нет в списке?"
 
-#: ../js/gdm/loginDialog.js:895 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:166
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../js/gdm/loginDialog.js:900
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "Войти"
 
-#: ../js/gdm/loginDialog.js:1239
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "Окно входа в систему"
 
 #. Translators: accessible name of the power menu in the login screen
 #: ../js/gdm/powerMenu.js:35
-#| msgid "Power Off"
 msgid "Power"
 msgstr "Питание"
 
-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:663 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:778
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Ждущий режим"
 
@@ -298,8 +309,8 @@ msgstr "Ждущий режим"
 msgid "Restart"
 msgstr "Перезапустить"
 
-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:665 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:777
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Выключить"
 
@@ -350,7 +361,7 @@ msgstr "НАСТРОЙКИ"
 msgid "New Window"
 msgstr "Новое окно"
 
-#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:271
+#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:290
 msgid "Remove from Favorites"
 msgstr "Удалить из избранного"
 
@@ -514,16 +525,16 @@ msgstr "Эта неделя"
 msgid "Next week"
 msgstr "Следующая неделя"
 
-#: ../js/ui/components/autorunManager.js:278
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "Cъёмные устройства"
 
-#: ../js/ui/components/autorunManager.js:575
+#: ../js/ui/components/autorunManager.js:594
 #, c-format
 msgid "Open with %s"
 msgstr "Открыть с помощью %s"
 
-#: ../js/ui/components/autorunManager.js:601
+#: ../js/ui/components/autorunManager.js:620
 msgid "Eject"
 msgstr "Извлечь"
 
@@ -679,35 +690,35 @@ msgstr "Приглушить звук"
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:950
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Отправлено в <b>%X</b> в <b>%A</b>"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25",
 #. shown when you get a chat message in the same year.
-#: ../js/ui/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:956
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Отправлено в <b>%A</b>, <b>%B %d</b>"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
 #. shown when you get a chat message in a different year.
-#: ../js/ui/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:961
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Отправлено в <b>%A</b>, <b>%B %d</b>, %Y"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
 
 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Приглашение в %s"
@@ -715,42 +726,42 @@ msgstr "Приглашение в %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s приглашает вас присоединиться к %s"
 
-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "Отказаться"
 
-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "Принять"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1131
 #, c-format
 msgid "Video call from %s"
 msgstr "Вас вызывает %s по видео"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "Вас вызывает %s"
 
-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Отклонить"
 
 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "Ответить"
 
@@ -759,111 +770,111 @@ msgstr "Ответить"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1173
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s отправляет вам %s"
 
 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1208
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s хотел бы получить разрешение видеть, когда вы в сети"
 
-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Ошибка сети"
 
-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Ошибка аутентификации"
 
-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Ошибка шифрования"
 
-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "Сертификат не предоставляется"
 
-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "Недоверенный сертификат"
 
-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "Срок действия сертификата истёк"
 
-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "Сертификат не активирован"
 
-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "Имя узла сертификата не совпадает"
 
-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "Отпечаток сертификата не совпадает"
 
-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Самоподписанный сертификат"
 
-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "Установлен статус «не в сети»"
 
-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "Шифрование недоступно"
 
-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "Недействительный сертификат"
 
-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "В соединении отказано"
 
-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "Соединение не может быть установлено"
 
-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "Соединение потеряно"
 
-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "Эта учётная запись уже подключена к серверу"
 
-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1334
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Соединение было заменено новым, используя тот же источник"
 
-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Учётная запись уже существует на сервере"
 
-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Сервер в настоящее время сильно перегружен, чтобы обработать соединение"
 
-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "Сертификат аннулирован"
 
-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Сертификат использует небезопасный алгоритм шифрования или он "
 "криптографически нестоек"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -871,30 +882,30 @@ msgstr ""
 "Длина сертификата сервера, или глубина цепочки сертификатов сервера, "
 "превышает пределы, установленные библиотекой криптографии"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Сбой подключения к %s"
 
-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Переподключиться"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Изменить учётную запись"
 
-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Неизвестная причина"
 
-#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
+#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "Показать приложения"
 
@@ -902,14 +913,14 @@ msgstr "Показать приложения"
 msgid "Date and Time Settings"
 msgstr "Настроить дату и время"
 
-#: ../js/ui/dateMenu.js:109
+#: ../js/ui/dateMenu.js:111
 msgid "Open Calendar"
 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:175
+#: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
@@ -1019,11 +1030,11 @@ msgstr "Установить"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Загрузить и установить расширение «%s» с extensions.gnome.org?"
 
-#: ../js/ui/keyboard.js:327
+#: ../js/ui/keyboard.js:337
 msgid "tray"
 msgstr "лоток"
 
-#: ../js/ui/keyboard.js:561 ../js/ui/status/keyboard.js:195
+#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "Клавиатура"
@@ -1076,23 +1087,23 @@ msgstr "Показать код"
 msgid "Web Page"
 msgstr "Веб-страница"
 
-#: ../js/ui/messageTray.js:1080
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Открыть"
 
-#: ../js/ui/messageTray.js:1087
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Удалить"
 
-#: ../js/ui/messageTray.js:2055
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Панель сообщений"
 
-#: ../js/ui/messageTray.js:2511
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Системная информация"
 
-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -1148,7 +1159,7 @@ msgstr "Введите команду:"
 
 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%d %B, %A"
 
@@ -1200,7 +1211,7 @@ msgstr "Пароль"
 msgid "Remember Password"
 msgstr "Запомнить пароль"
 
-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:169
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "Разблокировать"
 
@@ -1318,7 +1329,7 @@ msgstr "Настроить клавиатуру"
 msgid "Mouse Settings"
 msgstr "Настроить мышь"
 
-#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:236
+#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:234
 msgid "Sound Settings"
 msgstr "Настроить звук"
 
@@ -1607,7 +1618,7 @@ msgid "Unknown"
 msgstr "Неизвестно"
 
 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:223
+#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:221
 msgid "Volume"
 msgstr "Громкость"
 
@@ -1615,67 +1626,63 @@ msgstr "Громкость"
 msgid "Microphone"
 msgstr "Микрофон"
 
-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "Войти от имени другого пользователя"
 
-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Доступен"
 
-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Занят"
 
-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Невидим"
 
-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Отошёл"
 
-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Бездействует"
 
-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Недоступен"
 
-#: ../js/ui/userMenu.js:618 ../js/ui/userMenu.js:759
-msgid "Switch User"
-msgstr "Сменить пользователя"
-
-#: ../js/ui/userMenu.js:619
-msgid "Switch Session"
-msgstr "Переключить сеанс"
-
-#: ../js/ui/userMenu.js:743
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ../js/ui/userMenu.js:751
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Системные параметры"
 
-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "Сменить пользователя"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Выйти из системы"
 
-#: ../js/ui/userMenu.js:769
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Заблокировать"
 
-#: ../js/ui/userMenu.js:784
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Установить обновления и выполнить перезагрузку"
 
-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Будет установлен статус «не беспокоить»"
 
-#: ../js/ui/userMenu.js:803
+#: ../js/ui/userMenu.js:804
 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."
@@ -1695,7 +1702,7 @@ msgstr "Приложения"
 msgid "Search"
 msgstr "Поиск"
 
-#: ../js/ui/wanda.js:119
+#: ../js/ui/wanda.js:117
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@@ -1704,12 +1711,12 @@ msgstr ""
 "Извините, на сегодня нет никаких советов:\n"
 "%s"
 
-#: ../js/ui/wanda.js:123
+#: ../js/ui/wanda.js:121
 #, c-format
 msgid "%s the Oracle says"
 msgstr "Оракул говорит: «%s»"
 
-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "Ваше любимое «пасхальное яйцо»"
 
@@ -1746,24 +1753,24 @@ msgstr[2] "%u входов"
 msgid "System Sounds"
 msgstr "Системные звуки"
 
-#: ../src/main.c:330
+#: ../src/main.c:332
 msgid "Print version"
 msgstr "Показать номер версии"
 
-#: ../src/main.c:336
+#: ../src/main.c:338
 msgid "Mode used by GDM for login screen"
 msgstr "Режим, используемый GDM для окна входа в систему"
 
-#: ../src/main.c:342
+#: ../src/main.c:344
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr ""
 "Использовать для экрана входа в систему определённый режим, например «gdm»"
 
-#: ../src/main.c:348
+#: ../src/main.c:350
 msgid "List possible modes"
 msgstr "Список возможных режимов"
 
-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Не удалось запустить «%s»"
@@ -1788,6 +1795,9 @@ msgstr "По умолчанию"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Пользователь отклонил диалог аутентификации"
 
+#~ msgid "Switch Session"
+#~ msgstr "Переключить сеанс"
+
 #~ msgid "disabled OpenSearch providers"
 #~ msgstr "отключённые провайдеры OpenSearch"
 

src/gnome-shell-perf-tool.in

@@ -28,7 +28,7 @@ def show_version(option, opt_str, value, parser):
 def wait_for_dbus_name(wait_name):
     loop = GLib.MainLoop()
 
-    def on_name_appeared(connection, name, name_owner, *args):
+    def on_name_appeared(connection, name, new_owner, *args):
         if not (name == wait_name and new_owner != ''):
             return
         loop.quit()
@@ -60,13 +60,18 @@ def start_perf_helper():
     wait_for_dbus_name (PERF_HELPER_NAME)
 
 def stop_perf_helper():
-    proxy = Gio.DBusProxy(g_bus_type=Gio.BusType.SESSION,
-                          g_name=PERF_HELPER_NAME,
-                          g_interface=PERF_HELPER_IFACE,
-                          g_object_path=PERF_HELPER_PATH)
+    bus = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+
+    proxy = Gio.DBusProxy.new_sync(bus,
+                                   Gio.DBusProxyFlags.NONE,
+                                   None,
+                                   PERF_HELPER_NAME,
+                                   PERF_HELPER_PATH,
+                                   PERF_HELPER_IFACE,
+                                   None)
     proxy.Exit()
 
-def start_shell(extra_args, perf_output=None):
+def start_shell(perf_output=None):
     # Set up environment
     env = dict(os.environ)
     env['SHELL_PERF_MODULE'] = options.perf
@@ -76,19 +81,21 @@ def start_shell(extra_args, perf_output=None):
         env['SHELL_PERF_OUTPUT'] = perf_output
 
     self_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
+    args = []
     args.append(os.path.join(self_dir, 'gnome-shell'))
-    # pass on any additional arguments
-    args += extra_args
+
+    if options.replace:
+        args.append('--replace')
 
     return subprocess.Popen(args, env=env)
 
-def run_shell(args, perf_output=None):
+def run_shell(perf_output=None):
     # we do no additional supervision of gnome-shell,
     # beyond that of wait
     # in particular, we don't kill the shell upon
     # receving a KeyboardInterrupt, as we expect to be
     # in the same process group
-    shell = start_shell(extra_args, perf_output=perf_output)
+    shell = start_shell(perf_output=perf_output)
     shell.wait()
     return shell.returncode == 0
 
@@ -173,7 +180,7 @@ def upload_performance_report(report_text):
         print "Performance report upload failed with status %d" % response.status
         print response.read()
 
-def run_performance_test(args):
+def run_performance_test():
     iters = options.perf_iters
     if options.perf_warmup:
         iters += 1
@@ -192,7 +199,7 @@ def run_performance_test(args):
         # Run the performance test and collect the output as JSON
         normal_exit = False
         try:
-            normal_exit = run_shell(args, perf_output=output_file)
+            normal_exit = run_shell(perf_output=output_file)
         except:
             stop_perf_helper()
             raise
@@ -288,7 +295,8 @@ def run_performance_test(args):
 
 parser = optparse.OptionParser()
 parser.add_option("", "--perf", metavar="PERF_MODULE",
-		  help="Specify the name of a performance module to run")
+		  help="Specify the name of a performance module to run",
+                  default="core")
 parser.add_option("", "--perf-iters", type="int", metavar="ITERS",
 		  help="Numbers of iterations of performance module to run",
                   default=1)
@@ -301,9 +309,16 @@ parser.add_option("", "--perf-upload", action="store_true",
 parser.add_option("", "--version", action="callback", callback=show_version,
                   help="Display version and exit")
 
+parser.add_option("-r", "--replace", action="store_true",
+                  help="Replace the running window manager")
+
 options, args = parser.parse_args()
 
-normal_exit = run_performance_test(args)
+if args:
+    parser.print_usage()
+    sys.exit(1)
+
+normal_exit = run_performance_test()
 if normal_exit:
     sys.exit(0)
 else:

src/shell-mobile-providers.c

@@ -37,10 +37,11 @@
 
 #define ISO_3166_COUNTRY_CODES DATADIR "/zoneinfo/iso3166.tab"
 
-
+static ShellCountryMobileProvider *country_mobile_provider_new (const char *country_code,
+                                                                const gchar *country_name);
 
 static GHashTable *
-read_country_codes (void)
+read_country_codes (const gchar *country_codes)
 {
     GHashTable *table;
     GIOChannel *channel;
@@ -48,18 +49,21 @@ read_country_codes (void)
     GError *error = NULL;
     GIOStatus status;
 
-    channel = g_io_channel_new_file (ISO_3166_COUNTRY_CODES, "r", &error);
+    channel = g_io_channel_new_file (country_codes, "r", &error);
     if (!channel) {
         if (error) {
-            g_warning ("Could not read " ISO_3166_COUNTRY_CODES ": %s", error->message);
+            g_warning ("Could not read %s: %s", country_codes, error->message);
             g_error_free (error);
         } else
-            g_warning ("Could not read " ISO_3166_COUNTRY_CODES ": Unknown error");
+            g_warning ("Could not read %s: Unknown error", country_codes);
 
         return NULL;
     }
 
-    table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+    table = g_hash_table_new_full (g_str_hash,
+                                   g_str_equal,
+                                   g_free,
+                                   (GDestroyNotify)shell_country_mobile_provider_unref);
     buffer = g_string_sized_new (32);
 
     status = G_IO_STATUS_NORMAL;
@@ -69,6 +73,7 @@ read_country_codes (void)
         switch (status) {
         case G_IO_STATUS_NORMAL:
             if (buffer->str[0] != '#') {
+                ShellCountryMobileProvider *country_provider;
                 char **pieces;
 
                 pieces = g_strsplit (buffer->str, "\t", 2);
@@ -80,7 +85,8 @@ read_country_codes (void)
                     pieces[1] = g_strdup (_("United Kingdom"));
                 }
 
-                g_hash_table_insert (table, pieces[0], pieces[1]);
+                country_provider = country_mobile_provider_new (pieces[0], pieces[1]);
+                g_hash_table_insert (table, pieces[0], country_provider);
                 g_free (pieces);
             }
 
@@ -117,7 +123,6 @@ typedef enum {
 } MobileContextState;
 
 typedef struct {
-    GHashTable *country_codes;
     GHashTable *table;
 
     char *current_country;
@@ -276,6 +281,86 @@ shell_mobile_provider_get_type (void)
     return type;
 }
 
+static ShellCountryMobileProvider *
+country_mobile_provider_new (const char *country_code,
+                             const gchar *country_name)
+{
+    ShellCountryMobileProvider *country_provider;
+
+    country_provider = g_slice_new0 (ShellCountryMobileProvider);
+    country_provider->refs = 1;
+    country_provider->country_code = g_strdup (country_code);
+    country_provider->country_name = g_strdup (country_name);
+    return country_provider;
+}
+
+ShellCountryMobileProvider *
+shell_country_mobile_provider_ref (ShellCountryMobileProvider *country_provider)
+{
+    country_provider->refs++;
+
+    return country_provider;
+}
+
+void
+shell_country_mobile_provider_unref (ShellCountryMobileProvider *country_provider)
+{
+    if (--country_provider->refs == 0) {
+        g_free (country_provider->country_code);
+        g_free (country_provider->country_name);
+        g_slist_free_full (country_provider->providers,
+                           (GDestroyNotify) shell_mobile_provider_unref);
+        g_slice_free (ShellCountryMobileProvider, country_provider);
+    }
+}
+
+/**
+ * shell_country_mobile_provider_get_country_code:
+ *
+ * Returns: (transfer none): the code of the country.
+ */
+const gchar *
+shell_country_mobile_provider_get_country_code (ShellCountryMobileProvider *country_provider)
+{
+    return country_provider->country_code;
+}
+
+/**
+ * shell_country_mobile_provider_get_country_name:
+ *
+ * Returns: (transfer none): the name of the country.
+ */
+const gchar *
+shell_country_mobile_provider_get_country_name (ShellCountryMobileProvider *country_provider)
+{
+    return country_provider->country_name;
+}
+
+/**
+ * shell_country_mobile_provider_get_providers:
+ *
+ * Returns: (element-type Shell.MobileProvider) (transfer none): the
+ *   list of #ShellMobileProvider this country exposes.
+ */
+GSList *
+shell_country_mobile_provider_get_providers (ShellCountryMobileProvider *country_provider)
+{
+    return country_provider->providers;
+}
+
+GType
+shell_country_mobile_provider_get_type (void)
+{
+    static GType type = 0;
+
+    if (G_UNLIKELY (type == 0)) {
+        type = g_boxed_type_register_static ("ShellCountryMobileProvider",
+                                             (GBoxedCopyFunc) shell_country_mobile_provider_ref,
+                                             (GBoxedFreeFunc) shell_country_mobile_provider_unref);
+    }
+    return type;
+}
+
 static void
 provider_list_free (gpointer data)
 {
@@ -310,15 +395,17 @@ parser_toplevel_start (MobileParser *parser,
         for (i = 0; attribute_names && attribute_names[i]; i++) {
             if (!strcmp (attribute_names[i], "code")) {
                 char *country_code;
-                char *country;
+                ShellCountryMobileProvider *country_provider;
 
                 country_code = g_ascii_strup (attribute_values[i], -1);
-                country = g_hash_table_lookup (parser->country_codes, country_code);
-                if (country) {
-                    parser->current_country = g_strdup (country);
-                    g_free (country_code);
-                } else
-                    parser->current_country = country_code;
+                country_provider = g_hash_table_lookup (parser->table, country_code);
+                /* Ensure we have a country provider for this country code */
+                if (!country_provider) {
+                    g_warning ("%s: adding providers for unknown country '%s'", __func__, country_code);
+                    country_provider = country_mobile_provider_new (country_code, NULL);
+                    g_hash_table_insert (parser->table, country_code, country_provider);
+                }
+                parser->current_country = country_code;
 
                 parser->state = PARSER_COUNTRY;
                 break;
@@ -455,7 +542,13 @@ parser_country_end (MobileParser *parser,
                     const char *name)
 {
     if (!strcmp (name, "country")) {
-        g_hash_table_insert (parser->table, parser->current_country, parser->current_providers);
+        ShellCountryMobileProvider *country_provider;
+
+        country_provider = g_hash_table_lookup (parser->table, parser->current_country);
+        if (country_provider)
+            /* Store providers for this country */
+            country_provider->providers = parser->current_providers;
+
         parser->current_country = NULL;
         parser->current_providers = NULL;
         parser->text_buffer = NULL;
@@ -616,15 +709,16 @@ static const GMarkupParser mobile_parser = {
 
 /**
  * shell_mobile_providers_parse:
- * @out_ccs: (out) (allow-none): (element-type utf8 utf8): a #GHashTable containing
- *   country codes
+ * @country_codes: (allow-none) File with the list of country codes.
+ * @service_providers: (allow-none) File with the list of service providers.
  *
- * Returns: (element-type utf8 GList) (transfer container): a
- *   hash table where keys are country names #gchar, values are a #GSList
- *   of #ShellMobileProvider. Everything is destroyed with g_hash_table_destroy().
-*/
+ * Returns: (element-type utf8 Shell.CountryMobileProvider) (transfer full): a
+ *   hash table where keys are country names #gchar and values are #ShellCountryMobileProvider.
+ *   Everything is destroyed with g_hash_table_destroy().
+ */
 GHashTable *
-shell_mobile_providers_parse (GHashTable **out_ccs)
+shell_mobile_providers_parse (const gchar *country_codes,
+                              const gchar *service_providers)
 {
     GMarkupParseContext *ctx;
     GIOChannel *channel;
@@ -634,24 +728,29 @@ shell_mobile_providers_parse (GHashTable **out_ccs)
     GIOStatus status;
     gsize len = 0;
 
+    /* Use default paths if none given */
+    if (!country_codes)
+        country_codes = ISO_3166_COUNTRY_CODES;
+    if (!service_providers)
+        service_providers = MOBILE_BROADBAND_PROVIDER_INFO;
+
     memset (&parser, 0, sizeof (MobileParser));
 
-    parser.country_codes = read_country_codes ();
-    if (!parser.country_codes)
+    parser.table = read_country_codes (country_codes);
+    if (!parser.table)
         goto out;
 
-    channel = g_io_channel_new_file (MOBILE_BROADBAND_PROVIDER_INFO, "r", &error);
+    channel = g_io_channel_new_file (service_providers, "r", &error);
     if (!channel) {
         if (error) {
-            g_warning ("Could not read " MOBILE_BROADBAND_PROVIDER_INFO ": %s", error->message);
+            g_warning ("Could not read %s: %s", service_providers, error->message);
             g_error_free (error);
         } else
-            g_warning ("Could not read " MOBILE_BROADBAND_PROVIDER_INFO ": Unknown error");
+            g_warning ("Could not read %s: Unknown error", service_providers);
 
         goto out;
     }
 
-    parser.table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, provider_list_free);
     parser.state = PARSER_TOPLEVEL;
 
     ctx = g_markup_parse_context_new (&mobile_parser, 0, &parser, NULL);
@@ -696,13 +795,7 @@ shell_mobile_providers_parse (GHashTable **out_ccs)
     g_free (parser.current_country);
     g_free (parser.text_buffer);
 
- out:
-    if (parser.country_codes) {
-        if (out_ccs)
-            *out_ccs = parser.country_codes;
-        else
-            g_hash_table_destroy (parser.country_codes);
-    }
+out:
 
     return parser.table;
 }
@@ -744,12 +837,17 @@ dump_gsm (ShellMobileAccessMethod *method)
 static void
 dump_country (gpointer key, gpointer value, gpointer user_data)
 {
-    GSList *citer, *miter;
+    GSList *miter, *citer;
+    ShellCountryMobileProvider *country_provider = value;
 
-    for (citer = value; citer; citer = g_slist_next (citer)) {
+    g_print ("Country: %s (%s)\n",
+             country_provider->country_code,
+             country_provider->country_name);
+
+    for (citer = country_provider->providers; citer; citer = g_slist_next (citer)) {
         ShellMobileProvider *provider = citer->data;
 
-        g_print ("Provider: %s (%s)\n", provider->name, (const char *) key);
+        g_print ("    Provider: %s (%s)\n", provider->name, (const char *) key);
         for (miter = provider->methods; miter; miter = g_slist_next (miter)) {
             ShellMobileAccessMethod *method = miter->data;
             GSList *liter;
@@ -779,10 +877,10 @@ dump_country (gpointer key, gpointer value, gpointer user_data)
 }
 
 void
-shell_mobile_providers_dump (GHashTable *providers)
+shell_mobile_providers_dump (GHashTable *country_providers)
 {
-    g_return_if_fail (providers != NULL);
-    g_hash_table_foreach (providers, dump_country, NULL);
+    g_return_if_fail (country_providers != NULL);
+    g_hash_table_foreach (country_providers, dump_country, NULL);
 }
 
 /* All the following don't exist in nm-applet, because C doesn't need

src/shell-mobile-providers.h

@@ -76,10 +76,19 @@ typedef struct {
     gint refs;
 } ShellMobileProvider;
 
+typedef struct {
+    char *country_code;
+    char *country_name;
+    GSList *providers;
+
+    gint refs;
+} ShellCountryMobileProvider;
+
 
 GType shell_gsm_mcc_mnc_get_type (void); /* added in porting */
-GType shell_mobile_provider_get_type (void);
 GType shell_mobile_access_method_get_type (void);
+GType shell_mobile_provider_get_type (void);
+GType shell_country_mobile_provider_get_type (void);
 
 ShellMobileProvider *shell_mobile_provider_ref   (ShellMobileProvider *provider);
 void                 shell_mobile_provider_unref (ShellMobileProvider *provider);
@@ -89,8 +98,14 @@ GSList *             shell_mobile_provider_get_cdma_sid (ShellMobileProvider *pr
 ShellMobileAccessMethod *shell_mobile_access_method_ref   (ShellMobileAccessMethod *method);
 void                     shell_mobile_access_method_unref (ShellMobileAccessMethod *method);
 
-GHashTable *shell_mobile_providers_parse (GHashTable **out_ccs);
+ShellCountryMobileProvider *shell_country_mobile_provider_ref              (ShellCountryMobileProvider *country_provider);
+void                        shell_country_mobile_provider_unref            (ShellCountryMobileProvider *country_provider);
+const gchar                *shell_country_mobile_provider_get_country_code (ShellCountryMobileProvider *country_provider);
+const gchar                *shell_country_mobile_provider_get_country_name (ShellCountryMobileProvider *country_provider);
+GSList                     *shell_country_mobile_provider_get_providers    (ShellCountryMobileProvider *country_provider);
 
-void shell_mobile_providers_dump (GHashTable *providers);
+GHashTable *shell_mobile_providers_parse (const gchar *country_codes,
+                                          const gchar *service_providers);
+void        shell_mobile_providers_dump  (GHashTable *country_providers);
 
 #endif /* SHELL_MOBILE_PROVIDERS_H */

src/st/st-entry.c

@@ -65,6 +65,10 @@
 #include "st-clipboard.h"
 #include "st-private.h"
 
+#include <clutter/x11/clutter-x11.h>
+#include <X11/Xlib.h>
+#include <X11/cursorfont.h>
+
 #include "st-widget-accessible.h"
 
 #define HAS_FOCUS(actor) (clutter_actor_get_stage (actor) && clutter_stage_get_key_focus ((ClutterStage *) clutter_actor_get_stage (actor)) == actor)
@@ -613,6 +617,38 @@ st_entry_key_focus_in (ClutterActor *actor)
   clutter_actor_grab_key_focus (priv->entry);
 }
 
+static void
+st_entry_set_cursor (StEntry  *entry,
+                     gboolean  use_ibeam)
+{
+  Display *dpy;
+  ClutterActor *stage, *actor = CLUTTER_ACTOR (entry);
+  Window wid;
+  static Cursor ibeam = None;
+
+  dpy = clutter_x11_get_default_display ();
+  stage = clutter_actor_get_stage (actor);
+  wid = clutter_x11_get_stage_window (CLUTTER_STAGE (stage));
+
+  if (ibeam == None)
+    ibeam = XCreateFontCursor (dpy, XC_xterm);
+
+  if (use_ibeam)
+    XDefineCursor (dpy, wid, ibeam);
+  else
+    XUndefineCursor (dpy, wid);
+}
+
+static gboolean
+st_entry_crossing_event (ClutterActor         *actor,
+                         ClutterCrossingEvent *event)
+{
+  if (event->source == ST_ENTRY (actor)->priv->entry && event->related != NULL)
+    st_entry_set_cursor (ST_ENTRY (actor), (event->type == CLUTTER_ENTER));
+
+  return FALSE;
+}
+
 static void
 st_entry_class_init (StEntryClass *klass)
 {
@@ -635,6 +671,9 @@ st_entry_class_init (StEntryClass *klass)
   actor_class->key_press_event = st_entry_key_press_event;
   actor_class->key_focus_in = st_entry_key_focus_in;
 
+  actor_class->enter_event = st_entry_crossing_event;
+  actor_class->leave_event = st_entry_crossing_event;
+
   widget_class->style_changed = st_entry_style_changed;
   widget_class->navigate_focus = st_entry_navigate_focus;
   widget_class->get_accessible_type = st_entry_accessible_get_type;

src/st/st-theme.c

@@ -450,26 +450,26 @@ static gboolean
 string_in_list (GString    *stryng,
                 const char *list)
 {
-  const char *cur;
+  char *cur;
+  char *l = g_strdup (list);
+  char *temp;
+  gboolean found = FALSE;
 
-  for (cur = list; *cur;)
+  cur = strtok_r (l, " \t\f\r\n", &temp);
+  while (cur != NULL)
     {
-      while (*cur && cr_utils_is_white_space (*cur))
-        cur++;
-
-      if (strncmp (cur, stryng->str, stryng->len) == 0)
+      if (!strqcmp (cur, stryng->str, stryng->len))
         {
-          cur +=  stryng->len;
-          if ((!*cur) || cr_utils_is_white_space (*cur))
-            return TRUE;
+          found = TRUE;
+          goto out;
         }
 
-      /*  skip to next whitespace character  */
-      while (*cur && !cr_utils_is_white_space (*cur))
-        cur++;
+      cur = strtok_r (NULL, " \t\f\r\n", &temp);
     }
 
-  return FALSE;
+ out:
+  g_free (l);
+  return found;
 }
 
 static gboolean

tests/Makefile.am

@@ -18,6 +18,7 @@ TEST_JS =					\
 	interactive/scrolling.js		\
 	interactive/scroll-view-sizing.js	\
 	interactive/table.js			\
+	interactive/test-title.js		\
 	interactive/transitions.js		\
 	testcommon/100-200.svg			\
 	testcommon/200-100.svg			\
@@ -25,11 +26,14 @@ TEST_JS =					\
 	testcommon/border-image.png		\
 	testcommon/face-plain.png		\
 	testcommon/ui.js                        \
+	testcommon/iso3166-test.tab             \
+	testcommon/serviceproviders-test.xml    \
 	unit/format.js				\
 	unit/insertSorted.js			\
 	unit/markup.js				\
 	unit/jsParse.js				\
-	unit/url.js
+	unit/url.js                             \
+	unit/mobileProviders.js
 EXTRA_DIST += $(TEST_JS)
 
 TEST_MISC =					\

tests/testcommon/iso3166-test.tab

@@ -0,0 +1,3 @@
+# Test country list
+ES	Spain
+US	United States

tests/testcommon/serviceproviders-test.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+
+<!-- -*- Mode: XML; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2 -*- -->
+
+<!DOCTYPE serviceproviders SYSTEM "serviceproviders.2.dtd">
+
+<serviceproviders format="2.0">
+
+  <!-- United States -->
+  <country code="us">
+    <provider>
+      <name>AT&amp;T</name>
+      <gsm>
+	<network-id mcc="310" mnc="038"/>
+	<network-id mcc="310" mnc="090"/>
+	<network-id mcc="310" mnc="150"/>
+      </gsm>
+    </provider>
+    <provider>
+      <name>Verizon</name>
+      <gsm>
+	<network-id mcc="310" mnc="995"/>
+	<network-id mcc="311" mnc="480"/>
+      </gsm>
+      <cdma>
+	<sid value="2"/>
+	<sid value="4"/>
+	<sid value="5"/>
+      </cdma>
+    </provider>
+  </country>
+
+  <!-- Spain -->
+  <country code="es">
+    <provider>
+      <name>Movistar (Telefónica)</name>
+      <gsm>
+	<network-id mcc="214" mnc="05"/>
+	<network-id mcc="214" mnc="07"/>
+      </gsm>
+    </provider>
+  </country>
+
+</serviceproviders>

tests/unit/mobileProviders.js

@@ -0,0 +1,78 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const GLib = imports.gi.GLib;
+const Shell = imports.gi.Shell;
+const JsUnit = imports.jsUnit;
+const ModemManager = imports.misc.modemManager;
+const Environment = imports.ui.environment;
+
+Environment.init();
+
+// Load test providers table
+let countrycodesPath = GLib.getenv("GNOME_SHELL_TESTSDIR") + "/testcommon/iso3166-test.tab";
+let serviceprovidersPath = GLib.getenv("GNOME_SHELL_TESTSDIR") + "/testcommon/serviceproviders-test.xml";
+let providersTable = Shell.mobile_providers_parse(countrycodesPath, serviceprovidersPath);
+
+function assertCountryFound(country_code, expected_country_name) {
+    let country = providersTable[country_code];
+    JsUnit.assertNotUndefined(country);
+    JsUnit.assertEquals(country.get_country_name(), expected_country_name);
+}
+
+function assertCountryNotFound(country_code) {
+    let country = providersTable[country_code];
+    JsUnit.assertUndefined(country);
+}
+
+function assertProviderFoundForMCCMNC(mccmnc, expected_provider_name) {
+    let provider_name = ModemManager.findProviderForMCCMNC(providersTable, mccmnc);
+    JsUnit.assertEquals(provider_name, expected_provider_name);
+}
+
+function assertProviderNotFoundForMCCMNC(mccmnc) {
+    let provider_name = ModemManager.findProviderForMCCMNC(providersTable, mccmnc);
+    JsUnit.assertNull(provider_name);
+}
+
+function assertProviderFoundForSid(sid, expected_provider_name) {
+    let provider_name = ModemManager.findProviderForSid(providersTable, sid);
+    JsUnit.assertEquals(provider_name, expected_provider_name);
+}
+
+function assertProviderNotFoundForSid(sid) {
+    let provider_name = ModemManager.findProviderForSid(providersTable, sid);
+    JsUnit.assertNull(provider_name);
+}
+
+// TEST:
+// * Both 'US' and 'ES' country info should be loaded
+assertCountryFound("ES", "Spain");
+assertCountryFound("US", "United States");
+
+// TEST:
+// * Country info for 'FR' not given
+assertCountryNotFound("FR");
+
+// TEST:
+// * Ensure operator names are found for the given MCC/MNC codes
+assertProviderFoundForMCCMNC("21405", "Movistar (Telefónica)");
+assertProviderFoundForMCCMNC("21407", "Movistar (Telefónica)");
+assertProviderFoundForMCCMNC("310038", "AT&T");
+assertProviderFoundForMCCMNC("310090", "AT&T");
+assertProviderFoundForMCCMNC("310150", "AT&T");
+assertProviderFoundForMCCMNC("310995", "Verizon");
+assertProviderFoundForMCCMNC("311480", "Verizon");
+
+// TEST:
+// * Ensure NULL is given for unexpected MCC/MNC codes
+assertProviderNotFoundForMCCMNC("12345");
+
+// TEST:
+// * Ensure operator names are found for the given SID codes
+assertProviderFoundForSid(2, "Verizon");
+assertProviderFoundForSid(4, "Verizon");
+assertProviderFoundForSid(5, "Verizon");
+
+// TEST:
+// * Ensure NULL is given for unexpected SID codes
+assertProviderNotFoundForSid(1);