Added Occitan translation

[l10n] Update Catalan translation
Updated Serbian translation
2016-03-21 18:55:13 +00:00 · 2014-02-21 23:11:12 +01:00 · 2014-01-13 09:39:15 +01:00 · 2014-01-13 09:34:28 +01:00 · 2014-01-13 09:19:57 +01:00 · 2013-11-03 08:58:01 +01:00
141 changed files with 12223 additions and 10937 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -23,8 +23,6 @@ data/gnome-shell-extension-prefs.desktop.in
 data/gschemas.compiled
 data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
-data/org.gnome.shell.evolution.calendar.gschema.xml
-data/org.gnome.shell.evolution.calendar.gschema.valid
 docs/reference/*/*.args
 docs/reference/*/*.bak
 docs/reference/*/*.hierarchy
@@ -70,7 +68,6 @@ src/gnome-shell-extension-prefs
 src/gnome-shell-hotplug-sniffer
 src/gnome-shell-jhbuild
 src/gnome-shell-perf-helper
-src/gnome-shell-perf-tool
 src/gnome-shell-real
 src/hotplug-sniffer/org.gnome.Shell.HotplugSniffer.service
 src/run-js-test
--- a/120
+++ b/120
@@ -1,116 +1,22 @@
-3.5.3
+3.4.2
 =====
-* calendar: Adapt to Evolution-Data-Server API changes [Matthew; #677402]
-* messageTray: Don't show non urgent notifications while in fullscreen
-  [Adel; #677590]
-* modalDialog: show dialogs on monitor with the mouse pointer [Tim; #642591]
-* extensionSystem: Prepare for extension updating system [Jasper; #677586]
-* appDisplay: Don't show apps in NoDisplay categories in the All view
-  [Jasper; #658176]
-* st: Trigger theme updates on resolution changes [Florian; #677975]
-* Always enable a11y [Bastien; #678095]
-* telepathyClient: ignore invalidated channels [Guillaume; #677457]
-* shell-app: Update app menu if necessary [Florian; #676238]
-* Enable the Screen Reader menu item [Matthias; #663256]
-* Disable unredirection when a modal operation is active [Giovanni]
-* Make folks optional [Colin]
-* Improve mount-operation support [Cosimo]
-  - Fix exception when showing password entry [#678428]
-  - Close the password entry on operation abort [#673787]
-  - autorun: Don't allow autorun for things we mount on startup [#660595]
-  - Turn passphrase prompt into a dialog [#674962]
-  - Implement org.Gtk.MountOperationHandler [#678516]
-* Network menu improvements
-  - Sort Wifi networks by strength [Giovanni; #658946]
-  - Prefer wifi/3g over VPN in the panel [Cosimo; #672591]
-* clock: Switch to using GnomeWallClock [Colin; #657074]
-* remoteSearch: Allow to reference .desktop file for Title/Icon
-  [Florian; #678816]
-* Fix memory leaks [Jasper, Pavel; #678079, #678406, #678737]
-* Misc fixes [Florian, Giovanni, Guillaume, Jasper, Kjartan, Piotr, Rui;
-  #658955, #677497, #678396, #678502]
-* Misc cleanups [Bastien, Florian, Jasper; #677426, #677515, #678096, #678416]
-
-Contributors:
- Matthew Barnes, Giovanni Campagna, Cosimo Cecchi, Matthias Clasen,
- Guillaume Desmottes, Piotr Drąg, Adel Gadllah, Tim L, Kjartan Maraas,
- Rui Matos, Florian Müllner, Bastien Nocera, Jasper St. Pierre, Colin Walters
-
-Translations:
- Matej Urbančič [sl], Yuri Kozlov [ru], Tom Tryfonidis [el],
- Kjartan Maraas [nb], Žygimantas Beručka [lt], Luca Ferretti [it],
- Khaled Hosny [ar], Daniel Mustieles [es], Fran Diéguez [gl], A S Alam [pa]
-
-3.5.2
-=====
-* main: Move 'toggle-recording' binding into the shell [Florian; #674377]
-* popupMenu: make sure to break the grab when the slider is not visible
-  [Stefano; #672713]
-* st-theme-node-drawing: Don't use GL types [Neil; #672711]
 * Mirror Evolution calendar settings into our own schema [Owen; #674424]
-* shell-network-agent: don't crash if a request isn't found [Dan; #674961]
-* notificationDaemon: Match app based on WM_CLASS [Jasper; #673761]
-* NetworkMenu: use network-offline while loading [Giovanni; #674426]
-* lookingGlass: Remove the Errors tab [Jasper; #675104]
-* searchDisplay: Reset keyboard focus after displaying async results
-  [Rui; #675078]
-* gdm: don't fail if fprintd is unavailable [Ray; #675006]
-* messageTray: Fix scrolling up [Jasper; #661615]
-* main: Close the recorder instead of pausing it [Rui; #675128]
-* Accessibility [Alejandro]
-  - Use the proper label_actor for date menu on top panel [#675307]
-  - Set the proper role/label_actor for SearchResult.content [#672242]
-  - do not expose a label text if 'hidden' style class is used [#675341]
-* Magnifier: Add brightness and contrast functionality [Joseph; #639851]
-* theme: use a smaller border-radius for top bar [Jakub; #672430]
-* placeDisplay: use new bookmark file location [Matthias; #675443]
-* port all synchronous search providers to the async API [Jasper, Rui; #675328]
-* NetworkAgent: disallow multiple requests for the same connection/setting
-  [Giovanni; #674961]
-* userMenu: Update to latest mockups [Florian; #675802]
-* util: Don't double-fork when spawning from Alt-F2 [Colin; #675789]
-* messageTray: Make Source usable without subclassing [Jasper; #661236]
-* panel: Check for appMenu button's reactivity before opening [Florian; #676316]
-* Fix formatting of bluetooth passkey [Florian; #651251]
-* notificationDaemon: Filter out file-transfer notifications [Jasper; #676175]
-* Don't use global.log() [Jasper; #675790]
-* Fix broken extension loading in some distributions [Owen, Alexandre; #670477]
-* shell-app: Raise windows in reverse order to preserve the stacking
-  [Rui; #676371]
-* Generalize gdm-mode [Florian; #676156]
-* Switch string formatting to the one inside gjs [Jasper; #675479]
-* extensionUtils: Support subdirectories in getCurrentExtension
-  [Jasper; #677001]
-* panel: Refuse to add (legacy) status icons not part of the session mode
-  [Florian; #677058]
-* Add an initial-setup mode [Matthias; #676697]
-* status/keyboard: Port to the new input sources settings [Rui; #641531]
-* NetworkMenu: show notifications for failed VPN connections [Giovanni; #676330]
-* userMenu: Indicate progress on status changes [Florian; #659067]
-* recorder: Honor "disable-save-to-disk" lockdown key [Rūdolfs; #673630]
-* searchDisplay: Use the rowLimit we pass to the IconGrid [Christian; #675527]
-* endSessionDialog: Factor out _updateDescription from _updateContent
-  [Alejandro; #674210]
-* Fix empathy's appMenu freezing the shell [Alban; #676447]
-* Code cleanups [Florian, Giovanni, Jasper; #672807, #672413, #676837, #676850,
-  #672272]
-* Misc bug fixes [Alban, Florian, Giovanni, Guillaume, Jasper, Piotr, Rico,
-  Ron, Rui, Stefano; #659968, #672192, #673177, #673198, #674323, #675301,
-  #675370, #676347, #676806, #677097]
+* gdm: don't fail if fprintd unavailable [Ray; #675006]
+* Fix broken extension loading [Owen, Alexandre; #670477]
+* Fix filtering of Empathy notifications [Guillaume; #675370]
+* telepathyClient: Ignore invalidated channels [Guillaume; #677457]
+* popupMenu: Fix freeze when appMenu is not populated in one go [Alban; #676447]
+* mount-operation: fix exceptions when showing password entry [Cosimo; #678428]
+* Misc. fixes [Guillaume, Jasper, Rico; #677441, #676175]

 Contributors:
- Alban Browaeys, Giovanni Campagna, Matthias Clasen, Guillaume Desmottes,
- Piotr Drąg, Stefano Facchini, Rui Matos, Rūdolfs Mazurs, Florian Müllner,
- Alejandro Piñeiro, Neil Roberts, Alexandre Rostovtsev, Joseph Scheuhammer,
- Jakub Steiner, Jasper St. Pierre, Ray Strode, Owen Taylor, Rico Tzschichholz,
- Colin Walters, Dan Winship, Ron Yorston
+ Alban Browaeys, Cosimo Cecchi, Guillaume Desmottes, Alexandre Rostovtsev,
+ Jasper St. Pierre, Ray Strode, Owen Taylor, Rico Tzschichholz

 Translations:
- OKANO Takayoshi [ja], Daniel Mustieles [es], Changwoo Ryu [ko],
- Yaron Shahrabani [he], Fran Diéguez [gl], Jonh Wendell [pt_BR],
- Kjartan Maraas [nb], Luca Ferretti [it], Tom Tryfonidis [el],
- Sandeep Sheshrao Shedmake [mr], Takanori MATSUURA [ja], Dirgita [id],
- Mantas Kriaučiūnas [lt], Matej Urbančič [sl], Jiro Matsuzawa [ja]
+  OKANO Takayoshi [ja], Changwoo Ryu [ko], Jonh Wendell [pt_BR],
+  Luca Ferretti [it], Sandeep Sheshrao Shedmake [mr], Takanori MATSUURA [ja],
+  Andika Triwidada [id], Mantas Kriaučiūnas [lt], Nilamdyuti Goswami [as]

 3.4.1
 =====
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@@ -41,7 +41,7 @@
      "It can be used only by extensions.gnome.org"
 #define PLUGIN_MIME_STRING "application/x-gnome-shell-integration::Gnome Shell Integration Dummy Content-Type";

-#define PLUGIN_API_VERSION 4
+#define PLUGIN_API_VERSION 3

 typedef struct {
  GDBusProxy *proxy;
@@ -163,7 +163,6 @@ NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin)
  plugin->newp = NPP_New;
  plugin->destroy = NPP_Destroy;
  plugin->getvalue = NPP_GetValue;
-  plugin->setwindow = NPP_SetWindow;

  return NPERR_NO_ERROR;
 }
@@ -268,7 +267,6 @@ typedef struct {
  NPObject     parent;
  NPP          instance;
  GDBusProxy  *proxy;
-  GSettings   *settings;
  NPObject    *listener;
  NPObject    *restart_listener;
  gint         signal_id;
@@ -325,9 +323,6 @@ on_shell_appeared (GDBusConnection *connection,
    }
 }

-#define SHELL_SCHEMA "org.gnome.shell"
-#define ENABLED_EXTENSIONS_KEY "enabled-extensions"
-
 static NPObject *
 plugin_object_allocate (NPP      instance,
                        NPClass *klass)
@@ -337,7 +332,6 @@ plugin_object_allocate (NPP      instance,

  obj->instance = instance;
  obj->proxy = g_object_ref (data->proxy);
-  obj->settings = g_settings_new (SHELL_SCHEMA);
  obj->signal_id = g_signal_connect (obj->proxy, "g-signal",
                                     G_CALLBACK (on_shell_signal), obj);

@@ -498,61 +492,7 @@ plugin_enable_extension (PluginObject *obj,
                         NPString      uuid,
                         gboolean      enabled)
 {
-  gboolean ret;
  gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
-  gsize length;
-  gchar **uuids;
-  const gchar **new_uuids;
-
-  if (!uuid_is_valid (uuid_str))
-    {
-      g_free (uuid_str);
-      return FALSE;
-    }
-
-  uuids = g_settings_get_strv (obj->settings, ENABLED_EXTENSIONS_KEY);
-  length = g_strv_length (uuids);
-
-  if (enabled)
-    {
-      new_uuids = g_new (const gchar *, length + 2); /* New key, NULL */
-      memcpy (new_uuids, uuids, length * sizeof (*new_uuids));
-      new_uuids[length] = uuid_str;
-      new_uuids[length + 1] = NULL;
-    }
-  else
-    {
-      gsize i = 0, j = 0;
-      new_uuids = g_new (const gchar *, length);
-      for (i = 0; i < length; i ++)
-        {
-          if (g_str_equal (uuids[i], uuid_str))
-            continue;
-
-          new_uuids[j] = uuids[i];
-          j++;
-        }
-
-      new_uuids[j] = NULL;
-    }
-
-  ret = g_settings_set_strv (obj->settings,
-                             ENABLED_EXTENSIONS_KEY,
-                             new_uuids);
-
-  g_strfreev (uuids);
-  g_free (new_uuids);
-  g_free (uuid_str);
-
-  return ret;
-}
-
-static gboolean
-plugin_install_extension (PluginObject *obj,
-                          NPString      uuid)
-{
-  gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
-
  if (!uuid_is_valid (uuid_str))
    {
      g_free (uuid_str);
@@ -560,7 +500,7 @@ plugin_install_extension (PluginObject *obj,
    }

  g_dbus_proxy_call (obj->proxy,
-                     "InstallRemoteExtension",
+                     (enabled ? "EnableExtension" : "DisableExtension"),
                     g_variant_new ("(s)", uuid_str),
                     G_DBUS_CALL_FLAGS_NONE,
                     -1, /* timeout */
@@ -573,6 +513,40 @@ plugin_install_extension (PluginObject *obj,
  return TRUE;
 }

+static gboolean
+plugin_install_extension (PluginObject *obj,
+                          NPString      uuid,
+                          NPString      version_tag)
+{
+  gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
+  gchar *version_tag_str;
+
+  if (!uuid_is_valid (uuid_str))
+    {
+      g_free (uuid_str);
+      return FALSE;
+    }
+
+  version_tag_str = g_strndup (version_tag.UTF8Characters,
+                               version_tag.UTF8Length);
+
+  g_dbus_proxy_call (obj->proxy,
+                     "InstallRemoteExtension",
+                     g_variant_new ("(ss)",
+                                    uuid_str,
+                                    version_tag_str),
+                     G_DBUS_CALL_FLAGS_NONE,
+                     -1, /* timeout */
+                     NULL, /* cancellable */
+                     NULL, /* callback */
+                     NULL /* user_data */);
+
+  g_free (uuid_str);
+  g_free (version_tag_str);
+
+  return TRUE;
+}
+
 static gboolean
 plugin_uninstall_extension (PluginObject *obj,
                            NPString      uuid,
@@ -797,9 +771,11 @@ plugin_object_invoke (NPObject        *npobj,
  else if (name == install_extension_id)
    {
      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
+      if (!NPVARIANT_IS_STRING(args[1])) return FALSE;

      return plugin_install_extension (obj,
-                                       NPVARIANT_TO_STRING(args[0]));
+                                       NPVARIANT_TO_STRING(args[0]),
+                                       NPVARIANT_TO_STRING(args[1]));
    }
  else if (name == uninstall_extension_id)
    {
@@ -970,12 +946,3 @@ NPP_GetValue(NPP          instance,

  return NPERR_NO_ERROR;
 }
-
-/* Opera tries to call NPP_SetWindow without checking the
- * NULL pointer beforehand. */
-NPError
-NPP_SetWindow(NPP          instance,
-              NPWindow    *window)
-{
-  return NPERR_NO_ERROR;
-}
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.5.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.4.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -62,47 +62,28 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)

 CLUTTER_MIN_VERSION=1.9.16
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=1.33.2
-MUTTER_MIN_VERSION=3.5.3
+GJS_MIN_VERSION=1.29.18
+MUTTER_MIN_VERSION=3.4.1
 FOLKS_MIN_VERSION=0.5.2
 GTK_MIN_VERSION=3.3.9
 GIO_MIN_VERSION=2.31.6
-LIBECAL_MIN_VERSION=3.5.3
-LIBEDATASERVER_MIN_VERSION=3.5.3
-LIBEDATASERVERUI_MIN_VERSION=3.5.3
+LIBECAL_MIN_VERSION=2.32.0
+LIBEDATASERVER_MIN_VERSION=1.2.0
+LIBEDATASERVERUI_MIN_VERSION=2.91.6
 TELEPATHY_GLIB_MIN_VERSION=0.17.5
 TELEPATHY_LOGGER_MIN_VERSION=0.2.4
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
 GCR_MIN_VERSION=3.3.90
-GNOME_DESKTOP_REQUIRED_VERSION=3.5.1
-GNOME_MENUS_REQUIRED_VERSION=3.5.3
-
-AC_ARG_WITH(folks,
-            AS_HELP_STRING([--with-folks],
-                           [Enable folks support]),
-            [with_folks=$withval], [with_folks=yes])
-
-if test x${with_folks} = xyes; then
-  FOLKS_REQUIREMENT="folks >= $FOLKS_MIN_VERSION"
-  AC_DEFINE([HAVE_FOLKS], [1], [folks support])
-  AC_SUBST([HAVE_FOLKS],[1])
-else
-  FOLKS_REQUIREMENT=
-  AC_SUBST([HAVE_FOLKS],[0])
-fi
-AM_CONDITIONAL(BUILD_WITH_FOLKS, test x${with_folks} = xyes)

 # Collect more than 20 libraries for a prize!
 PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
 			       libxml-2.0
                               gtk+-3.0 >= $GTK_MIN_VERSION
-                               atk-bridge-2.0
-			       $FOLKS_REQUIREMENT
+                               folks >= $FOLKS_MIN_VERSION
                               libmutter >= $MUTTER_MIN_VERSION
                               gjs-internals-1.0 >= $GJS_MIN_VERSION
-			       libgnome-menu-3.0 >= $GNOME_MENUS_REQUIRED_VERSION
-                               $recorder_modules
+			       libgnome-menu-3.0 $recorder_modules
                               gdk-x11-3.0 libsoup-2.4
                               gl
 			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
@@ -114,8 +95,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
                               telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
                               libnm-glib libnm-util gnome-keyring-1
-                               gcr-3 >= $GCR_MIN_VERSION
-                               gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+                               gcr-3 >= $GCR_MIN_VERSION)

 PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)

@@ -123,7 +103,13 @@ PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)

 PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)

+GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
+AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
+AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
+
 GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
+JHBUILD_TYPELIBDIR="$INTROSPECTION_TYPELIBDIR"
+AC_SUBST(JHBUILD_TYPELIBDIR)

 saved_CFLAGS=$CFLAGS
 saved_LIBS=$LIBS
@@ -137,7 +123,7 @@ PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
 PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 x11)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.5.1)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)

 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
@@ -253,6 +239,31 @@ AC_ARG_ENABLE(jhbuild-wrapper-script,
  AS_HELP_STRING([--enable-jhbuild-wrapper-script],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
 AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes)

+AC_MSG_CHECKING([location of system Certificate Authority list])
+AC_ARG_WITH(ca-certificates,
+            [AC_HELP_STRING([--with-ca-certificates=@<:@path@:>@],
+                            [path to system Certificate Authority list])])
+
+if test "$with_ca_certificates" = "no"; then
+    AC_MSG_RESULT([disabled])
+else
+    if test -z "$with_ca_certificates"; then
+        for f in /etc/pki/tls/certs/ca-bundle.crt \
+                 /etc/ssl/certs/ca-certificates.crt; do
+             if test -f "$f"; then
+                with_ca_certificates="$f"
+             fi
+        done
+        if test -z "$with_ca_certificates"; then
+            AC_MSG_ERROR([could not find. Use --with-ca-certificates=path to set, or --without-ca-certificates to disable])
+        fi
+   fi
+
+   AC_MSG_RESULT($with_ca_certificates)
+   AC_DEFINE_UNQUOTED(SHELL_SYSTEM_CA_FILE, ["$with_ca_certificates"], [The system TLS CA list])
+fi
+AC_SUBST(SHELL_SYSTEM_CA_FILE,["$with_ca_certificates"])
+
 BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])

--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -53,14 +53,9 @@ dist_theme_DATA =				\
 	theme/ws-switch-arrow-up.svg		\
 	theme/ws-switch-arrow-down.svg

-gsettings_SCHEMAS = org.gnome.shell.gschema.xml
+gsettings_SCHEMAS = org.gnome.shell.gschema.xml org.gnome.shell.evolution.calendar.gschema.xml

@INTLTOOL_XML_NOMERGE_RULE@
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) sed -e 's|@GETTEXT_PACKAGE[@]|$(GETTEXT_PACKAGE)|g' \
-	$< > $@ || rm $@
-
@GSETTINGS_RULES@

 # We need to compile schemas at make time
@@ -85,13 +80,13 @@ EXTRA_DIST =						\
 	$(menu_DATA)					\
 	$(shaders_DATA)					\
 	$(convert_DATA)					\
-	org.gnome.shell.gschema.xml.in.in
+	org.gnome.shell.evolution.calendar.gschema.xml.in	\
+	org.gnome.shell.gschema.xml.in

 CLEANFILES =						\
 	gnome-shell.desktop.in				\
 	gnome-shell-extension-prefs.in			\
 	$(desktop_DATA)					\
 	$(gsettings_SCHEMAS)				\
-	gschemas.compiled				\
-	org.gnome.shell.gschema.valid			\
-	org.gnome.shell.gschema.xml.in
+	gschemas.compiled
+
--- a/data/org.gnome.shell.evolution.calendar.gschema.xml.in
+++ b/data/org.gnome.shell.evolution.calendar.gschema.xml.in
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- NOTE: This schema is a GNOME 3.4 workaround - it uses the same path
+     as org.gnome.evolution.calendar, but avoids us requiring Evolution
+     be installed. In GNOME 3.6 the selected state will become a flag
+     on the calendar. Because the translations are in Evolution,
+     this is untranslated and in POTFILES.skip.
+  -->
+<schemalist>
+  <schema path="/org/gnome/evolution/calendar/" id="org.gnome.shell.evolution.calendar" gettext-domain="evolution">
+    <key type="as" name="selected-calendars">
+      <default>[]</default>
+      <summary>List of selected calendars</summary>
+      <description>List of calendars to load</description>
+    </key>
+    <key type="as" name="selected-tasks">
+      <default>[]</default>
+      <summary>List of selected task lists</summary>
+      <description>List of task lists to load</description>
+    </key>
+  </schema>
+</schemalist>
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -61,6 +61,7 @@ value here is from the TpConnectionPresenceType enumeration.</_summary>
      <_summary>Internally used to store the last session presence status for the user. The
 value here is from the GsmPresenceStatus enumeration.</_summary>
    </key>
+    <child name="clock" schema="org.gnome.shell.clock"/>
    <child name="calendar" schema="org.gnome.shell.calendar"/>
    <child name="recorder" schema="org.gnome.shell.recorder"/>
    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
@@ -87,13 +88,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
        Keybinding to open the application menu.
      </_description>
    </key>
-    <key name="toggle-recording" type="as">
-      <default><![CDATA[['<Control><Shift><Alt>r']]]></default>
-      <_summary>Keybinding to toggle the screen recorder</_summary>
-      <_description>
-        Keybinding to start/stop the builtin screen recorder.
-      </_description>
-    </key>
  </schema>

  <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
@@ -107,6 +101,24 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
    </key>
  </schema>

+  <schema id="org.gnome.shell.clock" path="/org/gnome/shell/clock/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="show-seconds" type="b">
+      <default>false</default>
+      <_summary>Show time with seconds</_summary>
+      <_description>
+        If true, display seconds in time.
+      </_description>
+    </key>
+    <key name="show-date" type="b">
+      <default>false</default>
+      <_summary>Show date in clock</_summary>
+      <_description>
+        If true, display date in the clock, in addition to time.
+      </_description>
+    </key>
+  </schema>
+
  <schema id="org.gnome.shell.recorder" path="/org/gnome/shell/recorder/"
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="framerate" type="i">
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -328,11 +328,6 @@ StScrollBar StButton#vhandle:hover
    background-gradient-end: rgba(255, 255, 255, 0.2);
 }

-.notification-icon-button:insensitive,
-.notification-button:insensitive {
-    color: #9f9f9f;
-}
-
 /* Panel */

 #panel {
@@ -362,7 +357,7 @@ StScrollBar StButton#vhandle:hover
 }

 .panel-corner {
-    -panel-corner-radius: 6px;
+    -panel-corner-radius: 10px;
    -panel-corner-background-color: black;
    -panel-corner-border-width: 2px;
    -panel-corner-border-color: transparent;
@@ -414,7 +409,7 @@ StScrollBar StButton#vhandle:hover
 .panel-button:active,
 .panel-button:overview,
 .panel-button:focus {
-    border-image: url("panel-button-border.svg") 6 10 0 2;
+    border-image: url("panel-button-border.svg") 10 10 0 2;
    background-image: url("panel-button-highlight-wide.svg");
    color: white;
    text-shadow: black 0px 2px 2px;
@@ -436,10 +431,6 @@ StScrollBar StButton#vhandle:hover
    -boxpointer-gap: 4px
 }

-#networkMenu {
-    spacing: 4px;
-}
-
 /* User Menu */

 #panelUserMenu {
@@ -1212,8 +1203,7 @@ StScrollBar StButton#vhandle:hover
    height: 36px;
 }

-.notification {
-    font-size: 11pt;
+#notification {
    border-radius: 10px 10px 0px 0px;
    background: rgba(0,0,0,0.8);
    padding: 8px 8px 4px 8px;
@@ -1222,7 +1212,7 @@ StScrollBar StButton#vhandle:hover
    width: 34em;
 }

-.notification.multi-line-notification {
+#notification.multi-line-notification {
    padding-bottom: 8px;
 }

@@ -1244,7 +1234,7 @@ StScrollBar StButton#vhandle:hover
    color: white;
 }

-.summary-boxpointer .notification {
+.summary-boxpointer #notification {
    border-radius: 9px;
    background: rgba(0,0,0,0) !important;
    padding-bottom: 12px;
@@ -1261,6 +1251,10 @@ StScrollBar StButton#vhandle:hover
    padding-bottom: 6px;
 }

+#summary-notification-stack-scrollview > .top-shadow, #summary-notification-stack-scrollview > .bottom-shadow {
+    height: 1em;
+}
+
 #summary-notification-stack-scrollview:ltr {
    padding-right: 8px;
 }
@@ -1269,24 +1263,28 @@ StScrollBar StButton#vhandle:hover
    padding-left: 8px;
 }

-.notification-scrollview {
+#notification-scrollview {
    max-height: 10em;
    -st-vfade-offset: 24px;
 }

-.notification-scrollview:ltr > StScrollBar {
+#notification-scrollview > .top-shadow, #notification-scrollview > .bottom-shadow {
+    height: 1em;
+}
+
+#notification-scrollview:ltr > StScrollBar {
    padding-left: 6px;
 }

-.notification-scrollview:rtl > StScrollBar {
+#notification-scrollview:rtl > StScrollBar {
    padding-right: 6px;
 }

-.notification-body {
+#notification-body {
    spacing: 5px;
 }

-.notification-actions {
+#notification-actions {
    spacing: 10px;
 }

@@ -1413,7 +1411,7 @@ StScrollBar StButton#vhandle:hover
    font-style: italic;
 }

-.notification StEntry {
+#notification StEntry {
    padding: 4px;
    border-radius: 4px;
    color: #a8a8a8;
@@ -1429,7 +1427,7 @@ StScrollBar StButton#vhandle:hover
    caret-size: 1px;
 }

-.notification StEntry:focus {
+#notification StEntry:focus {
    border: 1px solid #8b8b8b;
    color: #333333;
    background-gradient-direction: vertical;
@@ -1952,12 +1950,10 @@ StScrollBar StButton#vhandle:hover
    padding-bottom: 8px;
 }

-.hidden {
-    color: rgba(0,0,0,0);
-}
-
+/* intentionally left transparent to avoid dialog changing size */
 .prompt-dialog-null-label {
    font-size: 10pt;
+    color: rgba(0,0,0,0);
    padding-bottom: 8px;
 }

--- a/data/theme/panel-button-border.svg
+++ b/data/theme/panel-button-border.svg
@@ -9,7 +9,7 @@
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="17"
+   width="21"
   height="10"
   id="svg2"
   version="1.1"
@@ -66,9 +66,9 @@
    <rect
       style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
       id="rect3796"
-       width="7"
+       width="3"
       height="2"
-       x="5"
+       x="9"
       y="8" />
  </g>
 </svg>
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -6,8 +6,9 @@ misc/config.js: misc/config.js.in Makefile
 	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
 	sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
 	    -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-	    -e "s|[@]HAVE_FOLKS@|$(HAVE_FOLKS)|g" \
+	    -e "s|[@]GJS_VERSION@|$(GJS_VERSION)|g" \
 	    -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
+	    -e "s|[@]SHELL_SYSTEM_CA_FILE@|$(SHELL_SYSTEM_CA_FILE)|g" \
 	    -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
 	    -e "s|[@]datadir@|$(datadir)|g" \
 	    -e "s|[@]libexecdir@|$(libexecdir)|g" \
@@ -27,6 +28,7 @@ nobase_dist_js_DATA = 	\
 	misc/config.js		\
 	misc/extensionUtils.js	\
 	misc/fileUtils.js	\
+	misc/format.js		\
 	misc/gnomeSession.js	\
 	misc/history.js		\
 	misc/jsParse.js		\
@@ -51,7 +53,6 @@ nobase_dist_js_DATA = 	\
 	ui/endSessionDialog.js	\
 	ui/environment.js	\
 	ui/extensionSystem.js	\
-	ui/extensionDownloader.js \
 	ui/flashspot.js		\
 	ui/iconGrid.js		\
 	ui/keyboard.js		\
@@ -66,7 +67,6 @@ nobase_dist_js_DATA = 	\
 	ui/messageTray.js	\
 	ui/modalDialog.js	\
 	ui/networkAgent.js	\
-	ui/sessionMode.js	\
 	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
 	ui/notificationDaemon.js \
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@@ -6,11 +6,11 @@ const GObject = imports.gi.GObject;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Pango = imports.gi.Pango;
-const Format = imports.format;

 const _ = Gettext.gettext;

 const Config = imports.misc.config;
+const Format = imports.misc.format;
 const ExtensionUtils = imports.misc.extensionUtils;


@@ -202,17 +202,23 @@ const Application = new Lang.Class({
    },

    _scanExtensions: function() {
-        let finder = new ExtensionUtils.ExtensionFinder();
-        finder.connect('extension-found', Lang.bind(this, this._extensionFound));
-        finder.scanExtensions();
-    },
+        ExtensionUtils.scanExtensions(Lang.bind(this, function(uuid, dir, type) {
+            if (ExtensionUtils.extensions[uuid] !== undefined)
+                return;

-    _extensionFound: function(signals, extension) {
-        let iter = this._model.append();
-        this._model.set(iter, [0, 1], [extension.uuid, extension.metadata.name]);
-        this._extensionIters[uuid] = iter;
-    },
+            let extension;
+            try {
+                extension = ExtensionUtils.createExtensionObject(uuid, dir, type);
+            } catch(e) {
+                global.logError('' + e);
+                return;
+            }

+            let iter = this._model.append();
+            this._model.set(iter, [0, 1], [uuid, extension.metadata.name]);
+            this._extensionIters[uuid] = iter;
+        }));
+    },

    _onActivate: function() {
        this._window.present();
@@ -251,7 +257,7 @@ function initEnvironment() {
        },

        logError: function(s) {
-            log('ERROR: ' + s);
+            global.log('ERROR: ' + s);
        },

        userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell'])
@@ -262,6 +268,7 @@ function initEnvironment() {

 function main(argv) {
    initEnvironment();
+    ExtensionUtils.init();

    Gettext.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
    Gettext.textdomain(Config.GETTEXT_PACKAGE);
--- a/js/gdm/powerMenu.js
+++ b/js/gdm/powerMenu.js
@@ -60,8 +60,10 @@ const PowerMenuButton = new Lang.Class({
    },

    _updateVisibility: function() {
-        let shouldBeVisible = (this._haveSuspend || this._haveShutdown || this._haveRestart);
-        this.actor.visible = shouldBeVisible;
+        if (!this._haveSuspend && !this._haveShutdown && !this._haveRestart)
+            this.actor.hide();
+        else
+            this.actor.show();
    },

    _updateHaveShutdown: function() {
@@ -74,7 +76,11 @@ const PowerMenuButton = new Lang.Class({
                    else
                        this._haveShutdown = false;

-                    this._powerOffItem.actor.visible = this._haveShutdown;
+                    if (this._haveShutdown)
+                        this._powerOffItem.actor.show();
+                    else
+                        this._powerOffItem.actor.hide();
+
                    this._updateVisibility();
                }));
        } else {
@@ -85,7 +91,12 @@ const PowerMenuButton = new Lang.Class({
                    else
                        this._haveShutdown = false;

-                    this._powerOffItem.actor.visible = this._haveShutdown;
+                    if (this._haveShutdown) {
+                        this._powerOffItem.actor.show();
+                    } else {
+                        this._powerOffItem.actor.hide();
+                    }
+
                    this._updateVisibility();
                }));
        }
@@ -101,7 +112,11 @@ const PowerMenuButton = new Lang.Class({
                    else
                        this._haveRestart = false;

-                    this._restartItem.actor.visible = this._haveRestart;
+                    if (this._haveRestart)
+                        this._restartItem.actor.show();
+                    else
+                        this._restartItem.actor.hide();
+
                    this._updateVisibility();
                }));
        } else {
@@ -112,7 +127,12 @@ const PowerMenuButton = new Lang.Class({
                    else
                        this._haveRestart = false;

-                    this._restartItem.actor.visible = this._haveRestart;
+                    if (this._haveRestart) {
+                        this._restartItem.actor.show();
+                    } else {
+                        this._restartItem.actor.hide();
+                    }
+
                    this._updateVisibility();
                }));
        }
@@ -120,7 +140,12 @@ const PowerMenuButton = new Lang.Class({

    _updateHaveSuspend: function() {
        this._haveSuspend = this._upClient.get_can_suspend();
-        this._suspendItem.actor.visible = this._haveSuspend;
+
+        if (this._haveSuspend)
+            this._suspendItem.actor.show();
+        else
+            this._suspendItem.actor.hide();
+
        this._updateVisibility();
    },

--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -4,10 +4,12 @@
 const PACKAGE_NAME = '@PACKAGE_NAME@';
 /* The version of this package */
 const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+/* The version of GJS we're linking to */
+const GJS_VERSION = '@GJS_VERSION@';
 /* 1 if gnome-bluetooth is available, 0 otherwise */
 const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-/* 1 if folks is available, 0 otherwise */
-const HAVE_FOLKS = @HAVE_FOLKS@;
+/* The system TLS CA list */
+const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
 /* gettext package */
 const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
 /* locale dir */
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -3,9 +3,6 @@
 // Common utils for the extension system and the extension
 // preferences tool

-const Lang = imports.lang;
-const Signals = imports.signals;
-
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const ShellJS = imports.gi.ShellJS;
@@ -17,6 +14,9 @@ const ExtensionType = {
    PER_USER: 2
 };

+// GFile for user extensions
+var userExtensionsDir = null;
+
 // Maps uuid -> metadata object
 const extensions = {};

@@ -40,18 +40,13 @@ function getCurrentExtension() {
        throw new Error('Could not find current extension');

    let path = match[1];
-    let file = Gio.File.new_for_path(path);
+    let uuid = GLib.path_get_basename(GLib.path_get_dirname(path));

-    // Walk up the directory tree, looking for an extesion with
-    // the same UUID as a directory name.
-    while (file != null) {
-        let extension = extensions[file.get_basename()];
-        if (extension !== undefined)
-            return extension;
-        file = file.get_parent();
-    }
+    let extension = extensions[uuid];
+    if (extension === undefined)
+        throw new Error('Could not find current extension');

-    throw new Error('Could not find current extension');
+    return extension;
 }

 /**
@@ -88,6 +83,9 @@ function isOutOfDate(extension) {
    if (!versionCheck(extension.metadata['shell-version'], Config.PACKAGE_VERSION))
        return true;

+    if (extension.metadata['js-version'] && !versionCheck(extension.metadata['js-version'], Config.GJS_VERSION))
+        return true;
+
    return false;
 }

@@ -122,7 +120,7 @@ function createExtensionObject(uuid, dir, type) {

    // Encourage people to add this
    if (!meta.url) {
-        log('Warning: Missing "url" property in %s/metadata.json'.format(uuid));
+        global.log('Warning: Missing "url" property in metadata.json');
    }

    if (uuid != meta.uuid) {
@@ -152,48 +150,45 @@ function installImporter(extension) {
    _extension = null;
 }

-const ExtensionFinder = new Lang.Class({
-    Name: 'ExtensionFinder',
-
-    _scanExtensionsInDirectory: function(dir, type) {
-        let fileEnum;
-        let file, info;
-        try {
-            fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
-        } catch(e) {
-            logError(e, 'Could not enumerate extensions directory');
-            return;
-        }
-
-        while ((info = fileEnum.next_file(null)) != null) {
-            let fileType = info.get_file_type();
-            if (fileType != Gio.FileType.DIRECTORY)
-                continue;
-            let uuid = info.get_name();
-            let extensionDir = dir.get_child(uuid);
-
-            let existing = extensions[uuid];
-            if (existing) {
-                log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
-                continue;
-            }
-            let extension = createExtensionObject(uuid, extensionDir, type);
-            this.emit('extension-found', extension);
-        }
-        fileEnum.close(null);
-    },
-
-    scanExtensions: function() {
-        let userExtensionsDir = Gio.File.new_for_path(GLib.build_filenamev([global.userdatadir, 'extensions']));
-        this._scanExtensionsInDirectory(userExtensionsDir, ExtensionType.PER_USER);
-
-        let systemDataDirs = GLib.get_system_data_dirs();
-        for (let i = 0; i < systemDataDirs.length; i++) {
-            let dirPath = GLib.build_filenamev([systemDataDirs[i], 'gnome-shell', 'extensions']);
-            let dir = Gio.file_new_for_path(dirPath);
-            if (dir.query_exists(null))
-                this._scanExtensionsInDirectory(dir, ExtensionType.SYSTEM);
-        }
+function init() {
+    let userExtensionsPath = GLib.build_filenamev([global.userdatadir, 'extensions']);
+    userExtensionsDir = Gio.file_new_for_path(userExtensionsPath);
+    try {
+        if (!userExtensionsDir.query_exists(null))
+            userExtensionsDir.make_directory_with_parents(null);
+    } catch (e) {
+        global.logError('' + e);
    }
-});
-Signals.addSignalMethods(ExtensionFinder.prototype);
+}
+
+function scanExtensionsInDirectory(callback, dir, type) {
+    let fileEnum;
+    let file, info;
+    try {
+        fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
+    } catch(e) {
+        global.logError('' + e);
+        return;
+    }
+
+    while ((info = fileEnum.next_file(null)) != null) {
+        let fileType = info.get_file_type();
+        if (fileType != Gio.FileType.DIRECTORY)
+            continue;
+        let uuid = info.get_name();
+        let extensionDir = dir.get_child(uuid);
+        callback(uuid, extensionDir, type);
+    }
+    fileEnum.close(null);
+}
+
+function scanExtensions(callback) {
+    let systemDataDirs = GLib.get_system_data_dirs();
+    scanExtensionsInDirectory(callback, userExtensionsDir, ExtensionType.PER_USER);
+    for (let i = 0; i < systemDataDirs.length; i++) {
+        let dirPath = GLib.build_filenamev([systemDataDirs[i], 'gnome-shell', 'extensions']);
+        let dir = Gio.file_new_for_path(dirPath);
+        if (dir.query_exists(null))
+            scanExtensionsInDirectory(callback, dir, ExtensionType.SYSTEM);
+    }
+}
--- a/js/misc/format.js
+++ b/js/misc/format.js
@@ -0,0 +1,71 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const ShellJS = imports.gi.ShellJS;
+
+/*
+ * This function is intended to extend the String object and provide
+ * an String.format API for string formatting.
+ * It has to be set up using String.prototype.format = Format.format;
+ * Usage:
+ * "somestring %s %d".format('hello', 5);
+ * It supports %s, %d, %x and %f, for %f it also support precisions like
+ * "%.2f".format(1.526). All specifiers can be prefixed with a minimum
+ * field width, e.g. "%5s".format("foo"). Unless the width is prefixed
+ * with '0', the formatted string will be padded with spaces.
+ */
+
+function format() {
+    let str = this;
+    let i = 0;
+    let args = arguments;
+
+    return str.replace(/%(I+)?([0-9]+)?(?:\.([0-9]+))?(.)/g, function (str, flagsGroup, widthGroup, precisionGroup, genericGroup) {
+
+                    if (precisionGroup != '' && genericGroup != 'f')
+                        throw new Error("Precision can only be specified for 'f'");
+
+                    let hasAlternativeIntFlag = (flagsGroup.indexOf('I') != -1);
+
+                    if (hasAlternativeIntFlag && genericGroup != 'd')
+                        throw new Error("Alternative output digits can only be specfied for 'd'");
+
+                    let fillChar = (widthGroup[0] == '0') ? '0' : ' ';
+                    let width = parseInt(widthGroup, 10) || 0;
+
+                    function fillWidth(s, c, w) {
+                        let fill = '';
+                        for (let i = 0; i < w; i++)
+                            fill += c;
+                        return fill.substr(s.length) + s;
+                    }
+
+                    let s = '';
+                    switch (genericGroup) {
+                        case '%':
+                            return '%';
+                            break;
+                        case 's':
+                            s = args[i++].toString();
+                            break;
+                        case 'd':
+                            let intV = parseInt(args[i++]);
+                            if (hasAlternativeIntFlag)
+                                s = ShellJS.format_int_alternative_output(intV);
+                            else
+                                s = intV.toString();
+                            break;
+                        case 'x':
+                            s = parseInt(args[i++]).toString(16);
+                            break;
+                        case 'f':
+                            if (precisionGroup == '')
+                                s = parseFloat(args[i++]).toString();
+                            else
+                                s = parseFloat(args[i++]).toFixed(parseInt(precisionGroup));
+                            break;
+                        default:
+                            throw new Error('Unsupported conversion character %' + genericGroup);
+                    }
+                    return fillWidth(s, fillChar, width);
+                });
+}
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -83,33 +83,24 @@ function spawnCommandLine(command_line) {
 // this will throw an error.
 function trySpawn(argv)
 {
-    var success, pid;
    try {
-        [success, pid] = GLib.spawn_async(null, argv, null,
-                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                          null, null);
+        GLib.spawn_async(null, argv, null,
+                         GLib.SpawnFlags.SEARCH_PATH,
+                         null, null);
    } catch (err) {
-        /* Rewrite the error in case of ENOENT */
-        if (err.matches(GLib.SpawnError, GLib.SpawnError.NOENT)) {
-            throw new GLib.SpawnError({ code: GLib.SpawnError.NOENT,
-                                        message: _("Command not found") });
-        } else if (err instanceof GLib.Error) {
+        if (err.code == GLib.SpawnError.G_SPAWN_ERROR_NOENT) {
+            err.message = _("Command not found");
+        } else {
            // The exception from gjs contains an error string like:
            //   Error invoking GLib.spawn_command_line_async: Failed to
            //   execute child process "foo" (No such file or directory)
            // We are only interested in the part in the parentheses. (And
            // we can't pattern match the text, since it gets localized.)
-            let message = err.message.replace(/.*\((.+)\)/, '$1');
-            throw new (err.constructor)({ code: err.code,
-                                          message: message });
-        } else {
-            throw err;
+            err.message = err.message.replace(/.*\((.+)\)/, '$1');
        }
+
+        throw err;
    }
-    // Dummy child watch; we don't want to double-fork internally
-    // because then we lose the parent-child relationship, which
-    // can break polkit.  See https://bugzilla.redhat.com//show_bug.cgi?id=819275
-    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function () {}, null);
 }

 // trySpawnCommandLine:
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -22,7 +22,6 @@ const Search = imports.ui.search;
 const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;
 const Params = imports.misc.params;
-const Util = imports.misc.util;

 const MAX_APPLICATION_WORK_MILLIS = 75;
 const MENU_POPUP_TIMEOUT = 600;
@@ -37,7 +36,6 @@ const AlphabeticalView = new Lang.Class({

        this._pendingAppLaterId = 0;
        this._appIcons = {}; // desktop file id
-        this._allApps = [];

        let box = new St.BoxLayout({ vertical: true });
        box.add(this._grid.actor, { y_align: St.Align.START, expand: true });
@@ -62,22 +60,16 @@ const AlphabeticalView = new Lang.Class({
            }));
    },

-    removeAll: function() {
+    _removeAll: function() {
        this._grid.removeAll();
        this._appIcons = {};
-        this._allApps = [];
    },

-    addApp: function(app) {
+    _addApp: function(app) {
        var id = app.get_id();
-        if (this._appIcons[id] !== undefined)
-            return;
-
        let appIcon = new AppWellIcon(app);
-        let pos = Util.insertSorted(this._allApps, app, function(a, b) {
-            return a.compare_by_name(b);
-        });
-        this._grid.addItem(appIcon.actor, pos);
+
+        this._grid.addItem(appIcon.actor);
        appIcon.actor.connect('key-focus-in', Lang.bind(this, this._ensureIconVisible));

        this._appIcons[id] = appIcon;
@@ -128,6 +120,14 @@ const AlphabeticalView = new Lang.Class({
                icon.actor.visible = true;
            }
        }
+    },
+
+    setAppList: function(apps) {
+        this._removeAll();
+        for (var i = 0; i < apps.length; i++) {
+            var app = apps[i];
+            this._addApp(app);
+         }
    }
 });

@@ -147,6 +147,7 @@ const ViewByCategories = new Lang.Class({
        // (used only before the actor is mapped the first time)
        this._currentCategory = -2;
        this._categories = [];
+        this._apps = null;

        this._categoryBox = new St.BoxLayout({ vertical: true,
                                               reactive: true,
@@ -203,19 +204,16 @@ const ViewByCategories = new Lang.Class({
            if (nextType == GMenu.TreeItemType.ENTRY) {
                var entry = iter.get_entry();
                var app = this._appSystem.lookup_app_by_tree_entry(entry);
-                if (!entry.get_app_info().get_nodisplay()) {
-                    this._view.addApp(app);
+                if (!entry.get_app_info().get_nodisplay())
                    appList.push(app);
-                }
            } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
-                var itemDir = iter.get_directory();
-                if (!itemDir.get_is_nodisplay())
-                    this._loadCategory(itemDir, appList);
+                if (!dir.get_is_nodisplay())
+                    this._loadCategory(iter.get_directory(), appList);
            }
        }
    },

-    _addCategory: function(name, index, dir) {
+    _addCategory: function(name, index, dir, allApps) {
        let button = new St.Button({ label: GLib.markup_escape_text (name, -1),
                                     style_class: 'app-filter',
                                     x_align: St.Align.START,
@@ -227,6 +225,7 @@ const ViewByCategories = new Lang.Class({

        var apps;
        if (dir == null) {
+            apps = allApps;
            this._allCategoryButton = button;
        } else {
            apps = [];
@@ -240,7 +239,6 @@ const ViewByCategories = new Lang.Class({
    },

    _removeAll: function() {
-        this._view.removeAll();
        this._categories = [];
        this._categoryBox.destroy_all_children();
    },
@@ -248,8 +246,13 @@ const ViewByCategories = new Lang.Class({
    refresh: function() {
        this._removeAll();

+        var allApps = Shell.AppSystem.get_default().get_all();
+        allApps.sort(function(a, b) {
+            return a.compare_by_name(b);
+        });
+
        /* Translators: Filter to display all applications */
-        this._addCategory(_("All"), -1, null);
+        this._addCategory(_("All"), -1, null, allApps);

        var tree = this._appSystem.get_tree();
        var root = tree.get_root_directory();
@@ -267,6 +270,7 @@ const ViewByCategories = new Lang.Class({
            }
        }

+        this._view.setAppList(allApps);
        this._selectCategory(-1);

        if (this._focusDummy) {
@@ -308,10 +312,11 @@ const AppSearchProvider = new Lang.Class({

    _init: function() {
        this.parent(_("APPLICATIONS"));
+
        this._appSys = Shell.AppSystem.get_default();
    },

-    getResultMetas: function(apps, callback) {
+    getResultMetas: function(apps) {
        let metas = [];
        for (let i = 0; i < apps.length; i++) {
            let app = apps[i];
@@ -322,15 +327,15 @@ const AppSearchProvider = new Lang.Class({
                         }
                       });
        }
-        callback(metas);
+        return metas;
    },

    getInitialResultSet: function(terms) {
-        this.searchSystem.pushResults(this, this._appSys.initial_search(terms));
+        return this._appSys.initial_search(terms);
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        this.searchSystem.pushResults(this, this._appSys.subsearch(previousResults, terms));
+        return this._appSys.subsearch(previousResults, terms);
    },

    activateResult: function(app, params) {
@@ -373,7 +378,7 @@ const SettingsSearchProvider = new Lang.Class({
        this._gnomecc = this._appSys.lookup_app('gnome-control-center.desktop');
    },

-    getResultMetas: function(prefs, callback) {
+    getResultMetas: function(prefs) {
        let metas = [];
        for (let i = 0; i < prefs.length; i++) {
            let pref = prefs[i];
@@ -384,15 +389,15 @@ const SettingsSearchProvider = new Lang.Class({
                         }
                       });
        }
-        callback(metas);
+        return metas;
    },

    getInitialResultSet: function(terms) {
-        this.searchSystem.pushResults(this, this._appSys.search_settings(terms));
+        return this._appSys.search_settings(terms);
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        this.searchSystem.pushResults(this, this._appSys.search_settings(terms));
+        return this._appSys.search_settings(terms);
    },

    activateResult: function(pref, params) {
--- a/js/ui/automountManager.js
+++ b/js/ui/automountManager.js
@@ -123,8 +123,7 @@ const AutomountManager = new Lang.Class({
        let volumes = this._volumeMonitor.get_volumes();
        volumes.forEach(Lang.bind(this, function(volume) {
            this._checkAndMountVolume(volume, { checkSession: false,
-                                                useMountOp: false,
-                                                allowAutorun: false });
+                                                useMountOp: false });
        }));

        return false;
@@ -202,8 +201,7 @@ const AutomountManager = new Lang.Class({

    _checkAndMountVolume: function(volume, params) {
        params = Params.parse(params, { checkSession: true,
-                                        useMountOp: true,
-                                        allowAutorun: true });
+                                        useMountOp: true });

        if (params.checkSession) {
            // if we're not in the current ConsoleKit session,
@@ -238,20 +236,15 @@ const AutomountManager = new Lang.Class({

        if (params.useMountOp) {
            let operation = new ShellMountOperation.ShellMountOperation(volume);
-            this._mountVolume(volume, operation, params.allowAutorun);
+            this._mountVolume(volume, operation.mountOp);
        } else {
-            this._mountVolume(volume, null, params.allowAutorun);
+            this._mountVolume(volume, null);
        }
    },

-    _mountVolume: function(volume, operation, allowAutorun) {
-        if (allowAutorun)
-            this._allowAutorun(volume);
-
-        let mountOp = operation ? operation.mountOp : null;
-        volume._operation = operation;
-
-        volume.mount(0, mountOp, null,
+    _mountVolume: function(volume, operation) {
+        this._allowAutorun(volume);
+        volume.mount(0, operation, null,
                     Lang.bind(this, this._onVolumeMounted));
    },

@@ -260,19 +253,15 @@ const AutomountManager = new Lang.Class({

        try {
            volume.mount_finish(res);
-            this._closeOperation(volume);
        } catch (e) {
-            // FIXME: we will always get G_IO_ERROR_FAILED from the gvfs udisks
-            // backend in this case, see 
-            // https://bugs.freedesktop.org/show_bug.cgi?id=51271
-            if (e.message.indexOf('No key available with this passphrase') != -1) {
-                this._reaskPassword(volume);
-            } else {
-                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                    log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
+            let string = e.toString();

-                this._closeOperation(volume);
-            }
+            // FIXME: needs proper error code handling instead of this
+            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+            if (string.indexOf('No key available with this passphrase') != -1)
+                this._reaskPassword(volume);
+            else
+                log('Unable to mount volume ' + volume.get_name() + ': ' + string);
        }
    },

@@ -284,16 +273,8 @@ const AutomountManager = new Lang.Class({
    },

    _reaskPassword: function(volume) {
-        let existingDialog = volume._operation ? volume._operation.borrowDialog() : null;
-        let operation = 
-            new ShellMountOperation.ShellMountOperation(volume,
-                                                        { existingDialog: existingDialog });
-        this._mountVolume(volume, operation);
-    },
-
-    _closeOperation: function(volume) {
-        if (volume._operation)
-            volume._operation.close();
+        let operation = new ShellMountOperation.ShellMountOperation(volume, { reaskPassword: true });
+        this._mountVolume(volume, operation.mountOp);        
    },

    _allowAutorun: function(volume) {
--- a/js/ui/autorunManager.js
+++ b/js/ui/autorunManager.js
@@ -23,14 +23,12 @@ const AutorunSetting = {
 };

 // misc utils
-function shouldAutorunMount(mount, forTransient) {
+function ignoreAutorunForMount(mount) {
    let root = mount.get_root();
    let volume = mount.get_volume();

-    if (!volume || (!volume.allowAutorun && forTransient))
-        return false;
-
-    if (!root.is_native() || isMountRootHidden(root))
+    if ((root.is_native() && !isMountRootHidden(root)) ||
+        (volume && volume.allowAutorun && volume.should_automount()))
        return false;

    return true;
@@ -226,9 +224,11 @@ const AutorunManager = new Lang.Class({
        try {
            mount.unmount_with_operation_finish(res);
        } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                log('Unable to eject the mount ' + mount.get_name() 
-                    + ': ' + e.toString());
+            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
+            // but we can't access the error code from JS.
+            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+            log('Unable to eject the mount ' + mount.get_name() 
+                + ': ' + e.toString());
        }
    },

@@ -236,9 +236,11 @@ const AutorunManager = new Lang.Class({
        try {
            source.eject_with_operation_finish(res);
        } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                log('Unable to eject the drive ' + source.get_name()
-                    + ': ' + e.toString());
+            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
+            // but we can't access the error code from JS.
+            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+            log('Unable to eject the drive ' + source.get_name() 
+                + ': ' + e.toString());
        }
    },

@@ -246,9 +248,11 @@ const AutorunManager = new Lang.Class({
        try {
            drive.stop_finish(res);
        } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                log('Unable to stop the drive ' + drive.get_name() 
-                    + ': ' + e.toString());
+            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
+            // but we can't access the error code from JS.
+            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+            log('Unable to stop the drive ' + drive.get_name() 
+                + ': ' + e.toString());
        }
    },
 });
@@ -258,15 +262,16 @@ const AutorunResidentSource = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function() {
-        this.parent(_("Removable Devices"), 'media-removable', St.IconType.FULLCOLOR);
+        this.parent(_("Removable Devices"));

        this._mounts = [];

        this._notification = new AutorunResidentNotification(this);
+        this._setSummaryIcon(this.createNotificationIcon());
    },

    addMount: function(mount, apps) {
-        if (!shouldAutorunMount(mount, false))
+        if (ignoreAutorunForMount(mount))
            return;

        let filtered = this._mounts.filter(function (element) {
@@ -305,6 +310,12 @@ const AutorunResidentSource = new Lang.Class({
            Main.messageTray.add(this);
            this.pushNotification(this._notification);
        }
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon ({ icon_name: 'media-removable',
+                              icon_type: St.IconType.FULLCOLOR,
+                              icon_size: this.ICON_SIZE });
    }
 });

@@ -444,7 +455,7 @@ const AutorunTransientDispatcher = new Lang.Class({
            return;

        // if the mount doesn't want to be autorun, return
-        if (!shouldAutorunMount(mount, true))
+        if (ignoreAutorunForMount(mount))
            return;

        let setting = this._getAutorunSettingForType(contentTypes[0]);
@@ -489,11 +500,11 @@ const AutorunTransientSource = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function(mount, apps) {
+        this.parent(mount.get_name());
+
        this.mount = mount;
        this.apps = apps;

-        this.parent(mount.get_name());
-
        this._notification = new AutorunTransientNotification(this);
        this._setSummaryIcon(this.createNotificationIcon());

--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -448,7 +448,7 @@ const Calendar = new Lang.Class({
        }

        // All the children after this are days, and get removed when we update the calendar
-        this._firstDayIndex = this.actor.get_n_children();
+        this._firstDayIndex = this.actor.get_children().length;
    },

    _onStyleChange: function(actor, event) {
--- a/js/ui/contactDisplay.js
+++ b/js/ui/contactDisplay.js
@@ -63,7 +63,7 @@ const Contact = new Lang.Class({
                        this.individual.full_name ||
                        this.individual.nickname  ||
                        email                     ||
-                        C_("contact", "Unknown");
+                        _("Unknown");
        let aliasLabel = new St.Label({ text: aliasText,
                                        style_class: 'contact-details-alias' });
        details.add(aliasLabel, { x_fill: true,
@@ -154,7 +154,7 @@ const ContactSearchProvider = new Lang.Class({
        this._contactSys = Shell.ContactSystem.get_default();
    },

-    getResultMetas: function(ids, callback) {
+    getResultMetas: function(ids) {
        let metas = [];
        for (let i = 0; i < ids.length; i++) {
            let contact = new Contact(ids[i]);
@@ -165,15 +165,15 @@ const ContactSearchProvider = new Lang.Class({
                         }
                       });
        }
-        callback(metas);
+        return metas;
    },

    getInitialResultSet: function(terms) {
-        this.searchSystem.pushResults(this, this._contactSys.initial_search(terms));
+        return this._contactSys.initial_search(terms);
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        this.searchSystem.pushResults(this, this._contactSys.subsearch(previousResults, terms));
+        return this._contactSys.subsearch(previousResults, terms);
    },

    createResultActor: function(resultMeta, terms) {
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -168,17 +168,7 @@ const DashItemContainer = new Lang.Class({
                         });
    },

-    destroy: function() {
-        if (this.label)
-            this.label.destroy();
-
-        this.actor.destroy();
-    },
-
    animateOutAndDestroy: function() {
-        if (this.label)
-            this.label.destroy();
-
        if (this.child == null) {
            this.actor.destroy();
            return;
@@ -701,7 +691,7 @@ const Dash = new Lang.Class({
            if (Main.overview.visible)
                item.animateOutAndDestroy();
            else
-                item.destroy();
+                item.actor.destroy();
        }

        this._adjustIconSize();
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -2,7 +2,6 @@

 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Cairo = imports.cairo;
@@ -17,6 +16,14 @@ const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Calendar = imports.ui.calendar;
+const UPowerGlib = imports.gi.UPowerGlib;
+
+// in org.gnome.desktop.interface
+const CLOCK_FORMAT_KEY        = 'clock-format';
+
+// in org.gnome.shell.clock
+const CLOCK_SHOW_DATE_KEY     = 'show-date';
+const CLOCK_SHOW_SECONDS_KEY  = 'show-seconds';

 function _onVertSepRepaint (area)
 {
@@ -38,7 +45,9 @@ const DateMenuButton = new Lang.Class({
    Name: 'DateMenuButton',
    Extends: PanelMenu.Button,

-    _init: function() {
+    _init: function(params) {
+        params = Params.parse(params, { showEvents: true });
+
        let item;
        let hbox;
        let vbox;
@@ -53,8 +62,8 @@ const DateMenuButton = new Lang.Class({
        // role ATK_ROLE_MENU like other elements of the panel.
        this.actor.accessible_role = Atk.Role.LABEL;

-        this._clockDisplay = new St.Label();
-        this.actor.add_actor(this._clockDisplay);
+        this._clock = new St.Label();
+        this.actor.add_actor(this._clock);

        hbox = new St.BoxLayout({name: 'calendarArea' });
        this.menu.addActor(hbox);
@@ -66,11 +75,11 @@ const DateMenuButton = new Lang.Class({

        // Date
        this._date = new St.Label();
-        this.actor.label_actor = this._clockDisplay;
+        this.actor.label_actor = this._date;
        this._date.style_class = 'datemenu-date-label';
        vbox.add(this._date);

-        if (Main.sessionMode.showCalendarEvents) {
+        if (params.showEvents) {
            this._eventSource = new Calendar.DBusEventSource();
            this._eventList = new Calendar.EventsList(this._eventSource);
        } else {
@@ -101,7 +110,7 @@ const DateMenuButton = new Lang.Class({
            item.actor.reparent(vbox);
        }

-        if (Main.sessionMode.showCalendarEvents) {
+        if (params.showEvents) {
            // Add vertical separator

            item = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
@@ -148,13 +157,68 @@ const DateMenuButton = new Lang.Class({

        // Done with hbox for calendar and event list

-        this._clock = new GnomeDesktop.WallClock();
-        this._clock.connect('notify::clock', Lang.bind(this, this._updateClockAndDate));
+        // Track changes to clock settings
+        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
+        this._clockSettings = new Gio.Settings({ schema: 'org.gnome.shell.clock' });
+        this._desktopSettings.connect('changed', Lang.bind(this, this._updateClockAndDate));
+        this._clockSettings.connect('changed', Lang.bind(this, this._updateClockAndDate));
+
+        // https://bugzilla.gnome.org/show_bug.cgi?id=655129
+        this._upClient = new UPowerGlib.Client();
+        this._upClient.connect('notify-resume', Lang.bind(this, this._updateClockAndDate));
+
+        // Start the clock
        this._updateClockAndDate();
    },

    _updateClockAndDate: function() {
-        this._clockDisplay.set_text(this._clock.clock);
+        let format = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
+        let showDate = this._clockSettings.get_boolean(CLOCK_SHOW_DATE_KEY);
+        let showSeconds = this._clockSettings.get_boolean(CLOCK_SHOW_SECONDS_KEY);
+
+        let clockFormat;
+        let dateFormat;
+
+        switch (format) {
+            case '24h':
+                if (showDate)
+                    /* Translators: This is the time format with date used
+                       in 24-hour mode. */
+                    clockFormat = showSeconds ? _("%a %b %e, %R:%S")
+                                              : _("%a %b %e, %R");
+                else
+                    /* Translators: This is the time format without date used
+                       in 24-hour mode. */
+                    clockFormat = showSeconds ? _("%a %R:%S")
+                                              : _("%a %R");
+                break;
+            case '12h':
+            default:
+                if (showDate)
+                    /* Translators: This is a time format with date used
+                       for AM/PM. */
+                    clockFormat = showSeconds ? _("%a %b %e, %l:%M:%S %p")
+                                              : _("%a %b %e, %l:%M %p");
+                else
+                    /* Translators: This is a time format without date used
+                       for AM/PM. */
+                    clockFormat = showSeconds ? _("%a %l:%M:%S %p")
+                                              : _("%a %l:%M %p");
+                break;
+        }
+
+        let displayDate = new Date();
+
+        this._clock.set_text(displayDate.toLocaleFormat(clockFormat));
+
+        /* 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").
+         */
+        dateFormat = _("%A %B %e, %Y");
+        this._date.set_text(displayDate.toLocaleFormat(dateFormat));
+
+        Mainloop.timeout_add_seconds(1, Lang.bind(this, this._updateClockAndDate));
+        return false;
    },

    _onOpenCalendarActivate: function() {
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -31,6 +31,7 @@ const St = imports.gi.St;
 const Shell = imports.gi.Shell;

 const GnomeSession = imports.misc.gnomeSession;
+const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
@@ -287,13 +288,13 @@ const EndSessionDialog = new Lang.Class({

        this._applicationList.connect('actor-added',
                                      Lang.bind(this, function() {
-                                          if (this._applicationList.get_n_children() == 1)
+                                          if (this._applicationList.get_children().length == 1)
                                              scrollView.show();
                                      }));

        this._applicationList.connect('actor-removed',
                                      Lang.bind(this, function() {
-                                          if (this._applicationList.get_n_children() == 0)
+                                          if (this._applicationList.get_children().length == 0)
                                              scrollView.hide();
                                      }));

@@ -341,7 +342,7 @@ const EndSessionDialog = new Lang.Class({
        }
    },

-    _updateDescription: function() {
+    _updateContent: function() {
        if (this.state != ModalDialog.State.OPENING &&
            this.state != ModalDialog.State.OPENED)
            return;
@@ -351,6 +352,17 @@ const EndSessionDialog = new Lang.Class({
        let subject = dialogContent.subject;
        let description;

+        if (this._user.is_loaded && !dialogContent.iconName) {
+            let iconFile = this._user.get_icon_file();
+            if (GLib.file_test(iconFile, GLib.FileTest.EXISTS))
+                this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
+            else
+                this._setIconFromName('avatar-default', dialogContent.iconStyleClass);
+        } else if (dialogContent.iconName) {
+            this._setIconFromName(dialogContent.iconName,
+                                  dialogContent.iconStyleClass);
+        }
+
        if (this._inhibitors.length > 0) {
            this._stopTimer();
            description = dialogContent.inhibitedDescription;
@@ -383,27 +395,6 @@ const EndSessionDialog = new Lang.Class({
        _setLabelText(this._descriptionLabel, description);
    },

-    _updateContent: function() {
-        if (this.state != ModalDialog.State.OPENING &&
-            this.state != ModalDialog.State.OPENED)
-            return;
-
-        let dialogContent = DialogContent[this._type];
-
-        if (this._user.is_loaded && !dialogContent.iconName) {
-            let iconFile = this._user.get_icon_file();
-            if (GLib.file_test(iconFile, GLib.FileTest.EXISTS))
-                this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
-            else
-                this._setIconFromName('avatar-default', dialogContent.iconStyleClass);
-        } else if (dialogContent.iconName) {
-            this._setIconFromName(dialogContent.iconName,
-                                  dialogContent.iconStyleClass);
-        }
-
-        this._updateDescription();
-    },
-
    _updateButtons: function() {
        let dialogContent = DialogContent[this._type];
        let buttons = [{ action: Lang.bind(this, this.cancel),
@@ -450,7 +441,7 @@ const EndSessionDialog = new Lang.Class({
                         { _secondsLeft: 0,
                           time: this._secondsLeft,
                           transition: 'linear',
-                           onUpdate: Lang.bind(this, this._updateDescription),
+                           onUpdate: Lang.bind(this, this._updateContent),
                           onComplete: Lang.bind(this, function() {
                                           let dialogContent = DialogContent[this._type];
                                           let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -39,19 +39,11 @@ function _patchContainerClass(containerClass) {
    };
 }

-function _makeLoggingFunc(func) {
-    return function() {
-        return func([].join.call(arguments, ', '));
-    };
-}
-
 function init() {
    // Add some bindings to the global JS namespace; (gjs keeps the web
    // browser convention of having that namespace be called 'window'.)
    window.global = Shell.Global.get();

-    window.log = _makeLoggingFunc(window.log);
-
    window._ = Gettext.gettext;
    window.C_ = Gettext.pgettext;
    window.ngettext = Gettext.ngettext;
@@ -90,7 +82,7 @@ function init() {
    }

    // OK, now things are initialized enough that we can import shell JS
-    const Format = imports.format;
+    const Format = imports.misc.format;
    const Tweener = imports.ui.tweener;

    Tweener.init();
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -1,170 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Soup = imports.gi.Soup;
-const St = imports.gi.St;
-
-const Config = imports.misc.config;
-const ExtensionUtils = imports.misc.extensionUtils;
-const ExtensionSystem = imports.ui.extensionSystem;
-const FileUtils = imports.misc.fileUtils;
-const ModalDialog = imports.ui.modalDialog;
-
-const _signals = ExtensionSystem._signals;
-
-const REPOSITORY_URL_BASE = 'https://extensions.gnome.org';
-const REPOSITORY_URL_DOWNLOAD = REPOSITORY_URL_BASE + '/download-extension/%s.shell-extension.zip';
-const REPOSITORY_URL_INFO =     REPOSITORY_URL_BASE + '/extension-info/';
-
-let _httpSession;
-
-function installExtensionFromUUID(uuid) {
-    let params = { uuid: uuid,
-                   shell_version: Config.PACKAGE_VERSION };
-
-    let message = Soup.form_request_new_from_hash('GET', REPOSITORY_URL_INFO, params);
-
-    _httpSession.queue_message(message,
-                               function(session, message) {
-                                   let info = JSON.parse(message.response_body.data);
-                                   let dialog = new InstallExtensionDialog(uuid, info);
-                                   dialog.open(global.get_current_time());
-                               });
-}
-
-function uninstallExtensionFromUUID(uuid) {
-    let extension = ExtensionUtils.extensions[uuid];
-    if (!extension)
-        return false;
-
-    // Don't try to uninstall system extensions
-    if (extension.type != ExtensionUtils.ExtensionType.PER_USER)
-        return false;
-
-    if (!ExtensionSystem.unloadExtension(uuid))
-        return false;
-
-    FileUtils.recursivelyDeleteDir(extension.dir);
-    return true;
-}
-
-function gotExtensionZipFile(session, message, uuid) {
-    if (message.status_code != Soup.KnownStatusCode.OK) {
-        logExtensionError(uuid, 'downloading extension: ' + message.status_code);
-        return;
-    }
-
-    let dir = Gio.File.new_for_path(GLib.build_filenamev([global.userdatadir, 'extensions', uuid]));
-    try {
-        if (!dir.query_exists(null))
-            dir.make_directory_with_parents(null);
-    } catch (e) {
-        logExtensionError('Could not create extension directory');
-    }
-
-    let [file, stream] = Gio.File.new_tmp('XXXXXX.shell-extension.zip');
-    let contents = message.response_body.flatten().as_bytes();
-    stream.output_stream.write_bytes(contents, null);
-    stream.close(null);
-    let [success, pid] = GLib.spawn_async(null,
-                                          ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
-                                          null,
-                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                          null);
-
-    if (!success) {
-        logExtensionError(uuid, 'extract: could not extract');
-        return;
-    }
-
-    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function(pid, status) {
-        GLib.spawn_close_pid(pid);
-
-        // Add extension to 'enabled-extensions' for the user, always...
-        let enabledExtensions = global.settings.get_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY);
-        if (enabledExtensions.indexOf(uuid) == -1) {
-            enabledExtensions.push(uuid);
-            global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions);
-        }
-
-        ExtensionSystem.loadExtension(dir, ExtensionUtils.ExtensionType.PER_USER, true);
-    });
-}
-
-const InstallExtensionDialog = new Lang.Class({
-    Name: 'InstallExtensionDialog',
-    Extends: ModalDialog.ModalDialog,
-
-    _init: function(uuid, info) {
-        this.parent({ styleClass: 'extension-dialog' });
-
-        this._uuid = uuid;
-        this._info = info;
-
-        this.setButtons([{ label: _("Cancel"),
-                           action: Lang.bind(this, this._onCancelButtonPressed),
-                           key:    Clutter.Escape
-                         },
-                         { label:  _("Install"),
-                           action: Lang.bind(this, this._onInstallButtonPressed)
-                         }]);
-
-        let message = _("Download and install '%s' from extensions.gnome.org?").format(info.name);
-
-        let box = new St.BoxLayout();
-        this.contentLayout.add(box);
-
-        let gicon = new Gio.FileIcon({ file: Gio.File.new_for_uri(REPOSITORY_URL_BASE + info.icon) })
-        let icon = new St.Icon({ gicon: gicon });
-        box.add(icon);
-
-        let label = new St.Label({ text: message });
-        box.add(label);
-    },
-
-    _onCancelButtonPressed: function(button, event) {
-        this.close(global.get_current_time());
-
-        // Even though the extension is already "uninstalled", send through
-        // a state-changed signal for any users who want to know if the install
-        // went through correctly -- using proper async DBus would block more
-        // traditional clients like the plugin
-        let meta = { uuid: this._uuid,
-                     state: ExtensionSystem.ExtensionState.UNINSTALLED,
-                     error: '' };
-
-        _signals.emit('extension-state-changed', meta);
-    },
-
-    _onInstallButtonPressed: function(button, event) {
-        let state = { uuid: this._uuid,
-                      state: ExtensionSystem.ExtensionState.DOWNLOADING,
-                      error: '' };
-
-        _signals.emit('extension-state-changed', state);
-
-        let params = { shell_version: Config.PACKAGE_VERSION };
-
-        let url = REPOSITORY_URL_DOWNLOAD.format(this._uuid);
-        let message = Soup.form_request_new_from_hash('GET', url, params);
-
-        _httpSession.queue_message(message,
-                                   Lang.bind(this, function(session, message) {
-                                       gotExtensionZipFile(session, message, this._uuid);
-                                   }));
-
-        this.close(global.get_current_time());
-    }
-});
-
-function init() {
-    _httpSession = new Soup.SessionAsync({ ssl_use_system_ca_file: true });
-
-    // See: https://bugzilla.gnome.org/show_bug.cgi?id=655189 for context.
-    // _httpSession.add_feature(new Soup.ProxyResolverDefault());
-    Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefault());
-}
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -3,11 +3,19 @@
 const Lang = imports.lang;
 const Signals = imports.signals;

+const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+const Soup = imports.gi.Soup;

+const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
+const FileUtils = imports.misc.fileUtils;
+const ModalDialog = imports.ui.modalDialog;
+
+const API_VERSION = 1;

 const ExtensionState = {
    ENABLED: 1,
@@ -22,6 +30,29 @@ const ExtensionState = {
    UNINSTALLED: 99
 };

+const REPOSITORY_URL_BASE = 'https://extensions.gnome.org';
+const REPOSITORY_URL_DOWNLOAD = REPOSITORY_URL_BASE + '/download-extension/%s.shell-extension.zip';
+const REPOSITORY_URL_INFO =     REPOSITORY_URL_BASE + '/extension-info/';
+
+const _httpSession = new Soup.SessionAsync();
+
+// The unfortunate state of gjs, gobject-introspection and libsoup
+// means that I have to do a hack to add a feature.
+// See: https://bugzilla.gnome.org/show_bug.cgi?id=655189 for context.
+
+if (Soup.Session.prototype.add_feature != null)
+    Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefault());
+
+function _getCertFile() {
+    let localCert = GLib.build_filenamev([global.userdatadir, 'extensions.gnome.org.crt']);
+    if (GLib.file_test(localCert, GLib.FileTest.EXISTS))
+        return localCert;
+    else
+        return Config.SHELL_SYSTEM_CA_FILE;
+}
+
+_httpSession.ssl_ca_file = _getCertFile();
+
 // Arrays of uuids
 var enabledExtensions;
 // Contains the order that extensions were enabled in.
@@ -38,6 +69,90 @@ const disconnect = Lang.bind(_signals, _signals.disconnect);

 const ENABLED_EXTENSIONS_KEY = 'enabled-extensions';

+function installExtensionFromUUID(uuid, version_tag) {
+    let params = { uuid: uuid,
+                   version_tag: version_tag,
+                   shell_version: Config.PACKAGE_VERSION,
+                   api_version: API_VERSION.toString() };
+
+    let message = Soup.form_request_new_from_hash('GET', REPOSITORY_URL_INFO, params);
+
+    _httpSession.queue_message(message,
+                               function(session, message) {
+                                   let info = JSON.parse(message.response_body.data);
+                                   let dialog = new InstallExtensionDialog(uuid, version_tag, info.name);
+                                   dialog.open(global.get_current_time());
+                               });
+}
+
+function uninstallExtensionFromUUID(uuid) {
+    let extension = ExtensionUtils.extensions[uuid];
+    if (!extension)
+        return false;
+
+    // Try to disable it -- if it's ERROR'd, we can't guarantee that,
+    // but it will be removed on next reboot, and hopefully nothing
+    // broke too much.
+    disableExtension(uuid);
+
+    // Don't try to uninstall system extensions
+    if (extension.type != ExtensionUtils.ExtensionType.PER_USER)
+        return false;
+
+    extension.state = ExtensionState.UNINSTALLED;
+    _signals.emit('extension-state-changed', extension);
+
+    delete ExtensionUtils.extensions[uuid];
+
+    FileUtils.recursivelyDeleteDir(Gio.file_new_for_path(extension.path));
+
+    return true;
+}
+
+function gotExtensionZipFile(session, message, uuid) {
+    if (message.status_code != Soup.KnownStatusCode.OK) {
+        logExtensionError(uuid, 'downloading extension: ' + message.status_code);
+        return;
+    }
+
+    // FIXME: use a GFile mkstemp-type method once one exists
+    let fd, tmpzip;
+    try {
+        [fd, tmpzip] = GLib.file_open_tmp('XXXXXX.shell-extension.zip');
+    } catch (e) {
+        logExtensionError(uuid, 'tempfile: ' + e.toString());
+        return;
+    }
+
+    let stream = new Gio.UnixOutputStream({ fd: fd });
+    let dir = ExtensionUtils.userExtensionsDir.get_child(uuid);
+    Shell.write_soup_message_to_stream(stream, message);
+    stream.close(null);
+    let [success, pid] = GLib.spawn_async(null,
+                                          ['unzip', '-uod', dir.get_path(), '--', tmpzip],
+                                          null,
+                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+                                          null);
+
+    if (!success) {
+        logExtensionError(uuid, 'extract: could not extract');
+        return;
+    }
+
+    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function(pid, status) {
+        GLib.spawn_close_pid(pid);
+
+        // Add extension to 'enabled-extensions' for the user, always...
+        let enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
+        if (enabledExtensions.indexOf(uuid) == -1) {
+            enabledExtensions.push(uuid);
+            global.settings.set_strv(ENABLED_EXTENSIONS_KEY, enabledExtensions);
+        }
+
+        loadExtension(dir, ExtensionUtils.ExtensionType.PER_USER, true);
+    });
+}
+
 function disableExtension(uuid) {
    let extension = ExtensionUtils.extensions[uuid];
    if (!extension)
@@ -67,11 +182,6 @@ function disableExtension(uuid) {
        }
    }

-    if (extension.stylesheet) {
-        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-        theme.unload_stylesheet(extension.stylesheet.get_path());
-    }
-
    try {
        extension.stateObj.disable();
    } catch(e) {
@@ -114,17 +224,6 @@ function enableExtension(uuid) {
        return;
    }

-    let stylesheetFile = extension.dir.get_child('stylesheet.css');
-    if (stylesheetFile.query_exists(null)) {
-        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-        try {
-            theme.load_stylesheet(stylesheetFile.get_path());
-            extension.stylesheet = stylesheetFile;
-        } catch (e) {
-            logExtensionError(uuid, 'Stylesheet parse error: ' + e);
-        }
-    }
-
    extension.state = ExtensionState.ENABLED;
    _signals.emit('extension-state-changed', extension);
 }
@@ -138,50 +237,48 @@ function logExtensionError(uuid, message, state) {
        extension.errors = [];

    extension.errors.push(message);
-    log('Extension "%s" had error: %s'.format(uuid, message));
+    global.logError('Extension "%s" had error: %s'.format(uuid, message));
    state = state || ExtensionState.ERROR;
    _signals.emit('extension-state-changed', { uuid: uuid,
                                               error: message,
                                               state: state });
 }

-function loadExtension(extension) {
+function loadExtension(dir, type, enabled) {
+    let uuid = dir.get_basename();
+    let extension;
+
+    if (ExtensionUtils.extensions[uuid] != undefined) {
+        global.logError('Extension "%s" is already loaded'.format(uuid));
+        return;
+    }
+
+    try {
+        extension = ExtensionUtils.createExtensionObject(uuid, dir, type);
+    } catch(e) {
+        logExtensionError(uuid, e.message);
+        return;
+    }
+
    // Default to error, we set success as the last step
    extension.state = ExtensionState.ERROR;

    if (ExtensionUtils.isOutOfDate(extension)) {
-        logExtensionError(extension.uuid, 'extension is not compatible with current GNOME Shell and/or GJS version', ExtensionState.OUT_OF_DATE);
+        logExtensionError(uuid, 'extension is not compatible with current GNOME Shell and/or GJS version', ExtensionState.OUT_OF_DATE);
        extension.state = ExtensionState.OUT_OF_DATE;
        return;
    }

-    let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
    if (enabled) {
-        initExtension(extension.uuid);
+        initExtension(uuid);
        if (extension.state == ExtensionState.DISABLED)
-            enableExtension(extension.uuid);
+            enableExtension(uuid);
    } else {
        extension.state = ExtensionState.INITIALIZED;
    }

    _signals.emit('extension-state-changed', extension);
-}
-
-function unloadExtension(uuid) {
-    let extension = ExtensionUtils.extensions[uuid];
-    if (!extension)
-        return false;
-
-    // Try to disable it -- if it's ERROR'd, we can't guarantee that,
-    // but it will be removed on next reboot, and hopefully nothing
-    // broke too much.
-    disableExtension(uuid);
-
-    extension.state = ExtensionState.UNINSTALLED;
-    _signals.emit('extension-state-changed', extension);
-
-    delete ExtensionUtils.extensions[uuid];
-    return true;
+    global.log('Loaded extension ' + uuid);
 }

 function initExtension(uuid) {
@@ -196,6 +293,18 @@ function initExtension(uuid) {
        logExtensionError(uuid, 'Missing extension.js');
        return;
    }
+    let stylesheetPath = null;
+    let themeContext = St.ThemeContext.get_for_stage(global.stage);
+    let theme = themeContext.get_theme();
+    let stylesheetFile = dir.get_child('stylesheet.css');
+    if (stylesheetFile.query_exists(null)) {
+        try {
+            theme.load_stylesheet(stylesheetFile.get_path());
+        } catch (e) {
+            logExtensionError(uuid, 'Stylesheet parse error: ' + e);
+            return;
+        }
+    }

    let extensionModule;
    let extensionState = null;
@@ -203,17 +312,24 @@ function initExtension(uuid) {
        ExtensionUtils.installImporter(extension);
        extensionModule = extension.imports.extension;
    } catch (e) {
+        if (stylesheetPath != null)
+            theme.unload_stylesheet(stylesheetPath);
        logExtensionError(uuid, '' + e);
        return;
    }

-    if (extensionModule.init) {
-        try {
-            extensionState = extensionModule.init(extension);
-        } catch (e) {
-            logExtensionError(uuid, 'Failed to evaluate init function:' + e);
-            return;
-        }
+    if (!extensionModule.init) {
+        logExtensionError(uuid, 'missing \'init\' function');
+        return;
+    }
+
+    try {
+        extensionState = extensionModule.init(extension);
+    } catch (e) {
+        if (stylesheetPath != null)
+            theme.unload_stylesheet(stylesheetPath);
+        logExtensionError(uuid, 'Failed to evaluate init function:' + e);
+        return;
    }

    if (!extensionState)
@@ -256,13 +372,81 @@ function onEnabledExtensionsChanged() {
    enabledExtensions = newEnabledExtensions;
 }

-function loadExtensions() {
+function init() {
+    ExtensionUtils.init();
+
    global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
    enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
-
-    let finder = new ExtensionUtils.ExtensionFinder();
-    finder.connect('extension-found', function(signals, extension) {
-        loadExtension(extension);
-    });
-    finder.scanExtensions();
 }
+
+function loadExtensions() {
+    ExtensionUtils.scanExtensions(function(uuid, dir, type) {
+        let enabled = enabledExtensions.indexOf(uuid) != -1;
+        loadExtension(dir, type, enabled);
+    });
+}
+
+const InstallExtensionDialog = new Lang.Class({
+    Name: 'InstallExtensionDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init: function(uuid, version_tag, name) {
+        this.parent({ styleClass: 'extension-dialog' });
+
+        this._uuid = uuid;
+        this._version_tag = version_tag;
+        this._name = name;
+
+        this.setButtons([{ label: _("Cancel"),
+                           action: Lang.bind(this, this._onCancelButtonPressed),
+                           key:    Clutter.Escape
+                         },
+                         { label:  _("Install"),
+                           action: Lang.bind(this, this._onInstallButtonPressed)
+                         }]);
+
+        let message = _("Download and install '%s' from extensions.gnome.org?").format(name);
+
+        this._descriptionLabel = new St.Label({ text: message });
+
+        this.contentLayout.add(this._descriptionLabel,
+                               { y_fill:  true,
+                                 y_align: St.Align.START });
+    },
+
+    _onCancelButtonPressed: function(button, event) {
+        this.close(global.get_current_time());
+
+        // Even though the extension is already "uninstalled", send through
+        // a state-changed signal for any users who want to know if the install
+        // went through correctly -- using proper async DBus would block more
+        // traditional clients like the plugin
+        let meta = { uuid: this._uuid,
+                     state: ExtensionState.UNINSTALLED,
+                     error: '' };
+
+        _signals.emit('extension-state-changed', meta);
+    },
+
+    _onInstallButtonPressed: function(button, event) {
+        let state = { uuid: this._uuid,
+                      state: ExtensionState.DOWNLOADING,
+                      error: '' };
+
+        _signals.emit('extension-state-changed', state);
+
+        let params = { version_tag: this._version_tag,
+                       shell_version: Config.PACKAGE_VERSION,
+                       api_version: API_VERSION.toString() };
+
+        let url = REPOSITORY_URL_DOWNLOAD.format(this._uuid);
+        let message = Soup.form_request_new_from_hash('GET', url, params);
+
+        _httpSession.queue_message(message,
+                                   Lang.bind(this, function(session, message) {
+                                       gotExtensionZipFile(session, message, this._uuid);
+                                   }));
+
+        this.close(global.get_current_time());
+    }
+});
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -282,10 +282,6 @@ const IconGrid = new Lang.Class({
        return this._computeLayout(rowWidth)[0];
    },

-    getRowLimit: function() {
-        return this._rowLimit;
-    },
-
    _computeLayout: function (forWidth) {
        let nColumns = 0;
        let usedWidth = 0;
@@ -309,22 +305,21 @@ const IconGrid = new Lang.Class({
        this._grid.queue_relayout();
    },

-    removeAll: function() {
-        this._grid.destroy_all_children();
+    removeAll: function () {
+        this._grid.get_children().forEach(Lang.bind(this, function (child) {
+            child.destroy();
+        }));
    },

-    addItem: function(actor, index) {
-        if (index !== undefined)
-            this._grid.insert_child_at_index(actor, index);
-        else
-            this._grid.add_actor(actor);
+    addItem: function(actor) {
+        this._grid.add_actor(actor);
    },

    getItemAtIndex: function(index) {
-        return this._grid.get_child_at_index(index);
+        return this._grid.get_children()[index];
    },

    visibleItemsCount: function() {
-        return this._grid.get_n_children() - this._grid.get_n_skip_paint();
+        return this._grid.get_children().length - this._grid.get_n_skip_paint();
    }
 });
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -541,8 +541,16 @@ const KeyboardSource = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function(keyboard) {
+        this.parent(_("Keyboard"));
        this._keyboard = keyboard;
-        this.parent(_("Keyboard"), 'input-keyboard', St.IconType.SYMBOLIC);
+
+        this._setSummaryIcon(this.createNotificationIcon());
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ icon_name: 'input-keyboard',
+                             icon_type: St.IconType.SYMBOLIC,
+                             icon_size: this.ICON_SIZE });
    },

    handleSummaryClick: function() {
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -53,10 +53,6 @@ const LayoutManager = new Lang.Class({
        global.screen.connect('monitors-changed',
                              Lang.bind(this, this._monitorsChanged));
        this._monitorsChanged();
-
-        this._chrome.connect('primary-fullscreen-changed', Lang.bind(this, function(chrome, state) {
-            this.emit('primary-fullscreen-changed', state);
-        }));
    },

    // This is called by Main after everything else is constructed;
@@ -228,9 +224,26 @@ const LayoutManager = new Lang.Class({
        return false;
    },

-    get currentMonitor() {
-        let index = global.screen.get_current_monitor();
-        return Main.layoutManager.monitors[index];
+    get focusIndex() {
+        let focusWindow = global.display.focus_window;
+
+        if (focusWindow) {
+            let wrect = focusWindow.get_outer_rect();
+            for (let i = 0; i < this.monitors.length; i++) {
+                let monitor = this.monitors[i];
+
+                if (monitor.x <= wrect.x && monitor.y <= wrect.y &&
+                    monitor.x + monitor.width > wrect.x &&
+                    monitor.y + monitor.height > wrect.y)
+                    return i;
+            }
+        }
+
+        return this.primaryIndex;
+    },
+
+    get focusMonitor() {
+        return this.monitors[this.focusIndex];
    },

    _startupAnimation: function() {
@@ -839,8 +852,6 @@ const Chrome = new Lang.Class({
        for (let i = 0; i < this._monitors.length; i++)
            wasInFullscreen[i] = this._monitors[i].inFullscreen;

-        let primaryWasInFullscreen = this._primaryMonitor.inFullscreen;
-
        this._updateFullscreen();

        let changed = false;
@@ -850,15 +861,10 @@ const Chrome = new Lang.Class({
                break;
            }
        }
-
        if (changed) {
            this._updateVisibility();
            this._queueUpdateRegions();
        }
-
-        if (primaryWasInFullscreen != this._primaryMonitor.inFullscreen) {
-            this.emit('primary-fullscreen-changed', this._primaryMonitor.inFullscreen);
-        }
    },

    updateRegions: function() {
@@ -973,5 +979,3 @@ const Chrome = new Lang.Class({
        return false;
    }
 });
-
-Signals.addSignalMethods(Chrome.prototype);
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -38,7 +38,7 @@ var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                    'const stage = global.stage; ' +
                    'const color = function(pixel) { let c= new Clutter.Color(); c.from_pixel(pixel); return c; }; ' +
                    /* Special lookingGlass functions */
-                    'const it = Main.lookingGlass.getIt(); ' +
+                       'const it = Main.lookingGlass.getIt(); ' +
                    'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ';

 const HISTORY_KEY = 'looking-glass-history';
@@ -320,7 +320,7 @@ const WindowList = new Lang.Class({
    },

    _updateWindowList: function() {
-        this.actor.destroy_all_children();
+        this.actor.get_children().forEach(function (actor) { actor.destroy(); });
        let windows = global.get_window_actors();
        let tracker = Shell.WindowTracker.get_default();
        for (let i = 0; i < windows.length; i++) {
@@ -378,7 +378,7 @@ const ObjInspector = new Lang.Class({
            this._previousObj = null;
        this._obj = obj;

-        this._container.destroy_all_children();
+        this._container.get_children().forEach(function (child) { child.destroy(); });

        let hbox = new St.BoxLayout({ style_class: 'lg-obj-inspector-title' });
        this._container.add_actor(hbox);
@@ -634,6 +634,45 @@ const Inspector = new Lang.Class({

 Signals.addSignalMethods(Inspector.prototype);

+const ErrorLog = new Lang.Class({
+    Name: 'ErrorLog',
+
+    _init: function() {
+        this.actor = new St.BoxLayout();
+        this.text = new St.Label();
+        this.actor.add(this.text);
+        // We need to override StLabel's default ellipsization when
+        // using line_wrap; otherwise ClutterText's layout is going
+        // to constrain both the width and height, which prevents
+        // scrolling.
+        this.text.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this.text.clutter_text.line_wrap = true;
+        this.actor.connect('notify::mapped', Lang.bind(this, this._renderText));
+    },
+
+    _formatTime: function(d){
+        function pad(n) { return n < 10 ? '0' + n : n; }
+        return d.getUTCFullYear()+'-'
+            + pad(d.getUTCMonth()+1)+'-'
+            + pad(d.getUTCDate())+'T'
+            + pad(d.getUTCHours())+':'
+            + pad(d.getUTCMinutes())+':'
+            + pad(d.getUTCSeconds())+'Z';
+    },
+
+    _renderText: function() {
+        if (!this.actor.mapped)
+            return;
+        let text = this.text.text;
+        let stack = Main._getAndClearErrorStack();
+        for (let i = 0; i < stack.length; i++) {
+            let logItem = stack[i];
+            text += logItem.category + ' t=' + this._formatTime(new Date(logItem.timestamp)) + ' ' + logItem.message + '\n';
+        }
+        this.text.text = text;
+    }
+});
+
 const Memory = new Lang.Class({
    Name: 'Memory',

@@ -908,6 +947,9 @@ const LookingGlass = new Lang.Class({
        }));
        notebook.appendPage('Windows', this._windowList.actor);

+        this._errorLog = new ErrorLog();
+        notebook.appendPage('Errors', this._errorLog.actor);
+
        this._memory = new Memory();
        notebook.appendPage('Memory', this._memory.actor);

--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -16,7 +16,6 @@ const Params = imports.misc.params;

 const MOUSE_POLL_FREQUENCY = 50;
 const CROSSHAIRS_CLIP_SIZE = [100, 100];
-const NO_CHANGE = 0.0;

 // Settings
 const APPLICATIONS_SCHEMA       = 'org.gnome.desktop.a11y.applications';
@@ -25,13 +24,6 @@ const SHOW_KEY                  = 'screen-magnifier-enabled';
 const MAGNIFIER_SCHEMA          = 'org.gnome.desktop.a11y.magnifier';
 const SCREEN_POSITION_KEY       = 'screen-position';
 const MAG_FACTOR_KEY            = 'mag-factor';
-const INVERT_LIGHTNESS_KEY      = 'invert-lightness';
-const BRIGHT_RED_KEY            = 'brightness-red';
-const BRIGHT_GREEN_KEY          = 'brightness-green';
-const BRIGHT_BLUE_KEY           = 'brightness-blue';
-const CONTRAST_RED_KEY          = 'contrast-red';
-const CONTRAST_GREEN_KEY        = 'contrast-green';
-const CONTRAST_BLUE_KEY         = 'contrast-blue';
 const LENS_MODE_KEY             = 'lens-mode';
 const CLAMP_MODE_KEY            = 'scroll-at-edges';
 const MOUSE_TRACKING_KEY        = 'mouse-tracking';
@@ -451,21 +443,6 @@ const Magnifier = new Lang.Class({
            aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
            if (aPref)
                zoomRegion.setMouseTrackingMode(aPref);
-
-            aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
-            if (aPref)
-                zoomRegion.setInvertLightness(aPref);
-
-            let bc = {};
-            bc.r = this._settings.get_double(BRIGHT_RED_KEY);
-            bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
-            bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
-            zoomRegion.setBrightness(bc);
-
-            bc.r = this._settings.get_double(CONTRAST_RED_KEY);
-            bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
-            bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
-            zoomRegion.setContrast(bc);
        }

        let showCrosshairs = this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY);
@@ -488,23 +465,6 @@ const Magnifier = new Lang.Class({
        this._settings.connect('changed::' + MOUSE_TRACKING_KEY,
                               Lang.bind(this, this._updateMouseTrackingMode));

-        this._settings.connect('changed::' + INVERT_LIGHTNESS_KEY,
-                               Lang.bind(this, this._updateInvertLightness));
-
-        this._settings.connect('changed::' + BRIGHT_RED_KEY,
-                               Lang.bind(this, this._updateBrightness));
-        this._settings.connect('changed::' + BRIGHT_GREEN_KEY,
-                               Lang.bind(this, this._updateBrightness));
-        this._settings.connect('changed::' + BRIGHT_BLUE_KEY,
-                               Lang.bind(this, this._updateBrightness));
-
-        this._settings.connect('changed::' + CONTRAST_RED_KEY,
-                               Lang.bind(this, this._updateContrast));
-        this._settings.connect('changed::' + CONTRAST_GREEN_KEY,
-                               Lang.bind(this, this._updateContrast));
-        this._settings.connect('changed::' + CONTRAST_BLUE_KEY,
-                               Lang.bind(this, this._updateContrast));
-
        this._settings.connect('changed::' + SHOW_CROSS_HAIRS_KEY,
                               Lang.bind(this, function() {
            this.setCrosshairsVisible(this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY));
@@ -580,38 +540,7 @@ const Magnifier = new Lang.Class({
                this._settings.get_enum(MOUSE_TRACKING_KEY)
            );
        }
-    },
-
-    _updateInvertLightness: function() {
-        // Applies only to the first zoom region.
-        if (this._zoomRegions.length) {
-            this._zoomRegions[0].setInvertLightness(
-                this._settings.get_boolean(INVERT_LIGHTNESS_KEY)
-            );
-        }
-    },
-
-    _updateBrightness: function() {
-        // Applies only to the first zoom region.
-        if (this._zoomRegions.length) {
-            let brightness = {};
-            brightness.r = this._settings.get_double(BRIGHT_RED_KEY);
-            brightness.g = this._settings.get_double(BRIGHT_GREEN_KEY);
-            brightness.b = this._settings.get_double(BRIGHT_BLUE_KEY);
-            this._zoomRegions[0].setBrightness(brightness);
-        }
-    },
-
-    _updateContrast: function() {
-        // Applies only to the first zoom region.
-        if (this._zoomRegions.length) {
-            let contrast = {};
-            contrast.r = this._settings.get_double(CONTRAST_RED_KEY);
-            contrast.g = this._settings.get_double(CONTRAST_GREEN_KEY);
-            contrast.b = this._settings.get_double(CONTRAST_BLUE_KEY);
-            this._zoomRegions[0].setContrast(contrast);
-        }
-    },
+    }
 });
 Signals.addSignalMethods(Magnifier.prototype);

@@ -625,9 +554,6 @@ const ZoomRegion = new Lang.Class({
        this._clampScrollingAtEdges = false;
        this._lensMode = false;
        this._screenPosition = GDesktopEnums.MagnifierScreenPosition.FULL_SCREEN;
-        this._invertLightness = false;
-        this._brightness = { r: NO_CHANGE, g: NO_CHANGE, b: NO_CHANGE };
-        this._contrast = { r: NO_CHANGE, g: NO_CHANGE, b: NO_CHANGE };

        this._magView = null;
        this._background = null;
@@ -953,86 +879,6 @@ const ZoomRegion = new Lang.Class({
        }
    },

-    /**
-     * setInvertLightness:
-     * Set whether to invert the lightness of the magnified view.
-     * @flag    Boolean to either invert brightness (true), or not (false).
-     */
-    setInvertLightness: function(flag) {
-        this._invertLightness = flag;
-        if (this._magShaderEffects)
-            this._magShaderEffects.setInvertLightness(this._invertLightness);
-    },
-
-    /**
-     * getInvertLightness:
-     * Retrieve whether the lightness is inverted.
-     * @return    Boolean indicating inversion (true), or not (false).
-     */
-    getInvertLightness: function() {
-        return this._invertLightness;
-    },
-
-    /**
-     * setBrightness:
-     * Alter the brightness of the magnified view.
-     * @brightness  Object containing the contrast for the red, green,
-     *              and blue channels.  Values of 0.0 represent "standard"
-     *              brightness (no change), whereas values less or greater than
-     *              0.0 indicate decreased or incresaed brightness, respectively.
-     */
-    setBrightness: function(brightness) {
-        this._brightness.r = brightness.r;
-        this._brightness.g = brightness.g;
-        this._brightness.b = brightness.b;
-        if (this._magShaderEffects)
-            this._magShaderEffects.setBrightness(this._brightness);
-    },
-
-    /**
-     * getBrightness:
-     * Retrive the current brightness of the Zoom Region.
-     * @return  Object containing the brightness change for the red, green,
-     *          and blue channels.
-     */
-    getBrightness: function() {
-        let brightness = {};
-        brightness.r = this._brightness.r;
-        brightness.g = this._brightness.g;
-        brightness.b = this._brightness.b;
-        return brightness;
-    },
-
-    /**
-     * setContrast:
-     * Alter the contrast of the magnified view.
-     * @contrast    Object containing the contrast for the red, green,
-     *              and blue channels.  Values of 0.0 represent "standard"
-     *              contrast (no change), whereas values less or greater than
-     *              0.0 indicate decreased or incresaed contrast, respectively.
-     */
-    setContrast: function(contrast) {
-        this._contrast.r = contrast.r;
-        this._contrast.g = contrast.g;
-        this._contrast.b = contrast.b;
-        if (this._magShaderEffects)
-            this._magShaderEffects.setContrast(this._contrast);
-    },
-
-    /**
-     * getContrast:
-     * Retreive the contrast of the magnified view.
-     * @return  Object containing the contrast for the red, green,
-     *          and blue channels.
-     */
-    getContrast: function() {
-        let contrast = {};
-        contrast.r = this._contrast.r;
-        contrast.g = this._contrast.g;
-        contrast.b = this._contrast.b;
-        return contrast;
-    },
-
    //// Private methods ////

    _createActors: function() {
@@ -1071,12 +917,6 @@ const ZoomRegion = new Lang.Class({
            this._crossHairsActor = this._crossHairs.addToZoomRegion(this, this._mouseActor);
        else
            this._crossHairsActor = null;
-
-        // Contrast and brightness effects.
-        this._magShaderEffects = new MagShaderEffects(this._uiGroupClone);
-        this._magShaderEffects.setInvertLightness(this._invertLightness);
-        this._magShaderEffects.setBrightness(this._brightness);
-        this._magShaderEffects.setContrast(this._contrast);
    },

    _destroyActors: function() {
@@ -1085,8 +925,6 @@ const ZoomRegion = new Lang.Class({
        if (this._crossHairs)
            this._crossHairs.removeFromParent(this._crossHairsActor);

-        this._magShaderEffects.destroyEffects();
-        this._magShaderEffects = null;
        this._magView.destroy();
        this._magView = null;
        this._background = null;
@@ -1390,7 +1228,10 @@ const Crosshairs = new Lang.Class({
                    crosshairsActor = new Clutter.Clone({ source: this._actor });
                    this._clones.push(crosshairsActor);
                }
-                crosshairsActor.visible = this._actor.visible;
+                if (this._actor.visible)
+                    crosshairsActor.show();
+                else
+                    crosshairsActor.hide();

                container.add_actor(crosshairsActor);
                container.raise_child(magnifiedMouse, crosshairsActor);
@@ -1595,133 +1436,3 @@ const Crosshairs = new Lang.Class({
        this._vertBottomHair.set_position((groupWidth - thickness) / 2, bottom);
    }
 });
-
-const MagShaderEffects = new Lang.Class({
-    Name: 'MagShaderEffects',
-
-    _init: function(uiGroupClone) {
-        this._inverse = new Shell.InvertLightnessEffect();
-        this._brightnessContrast = new Clutter.BrightnessContrastEffect();
-        this._inverse.set_enabled(false);
-        this._brightnessContrast.set_enabled(false);
-
-        this._magView = uiGroupClone;
-        this._magView.add_effect(this._inverse);
-        this._magView.add_effect(this._brightnessContrast);
-    },
-
-    /**
-     * destroyEffects:
-     * Remove contrast and brightness effects from the magnified view, and
-     * lose the reference to the actor they were applied to.  Don't use this
-     * object after calling this.
-     */
-    destroyEffects: function() {
-        this._magView.clear_effects();
-        this._brightnessContrast = null;
-        this._inverse = null;
-        this._magView = null;
-    },
-
-    /**
-     * setInvertLightness:
-     * Enable/disable invert lightness effect.
-     * @invertFlag:     Enabled flag.
-     */
-    setInvertLightness: function(invertFlag) {
-        this._inverse.set_enabled(invertFlag);
-    },
-
-    /**
-     * getInvertLightness:
-     * Report whether the inversion effect is enabled.
-     * @return:     Boolean.
-     */
-    getInvertLightness: function() {
-        return this._inverse.get_enabled();
-    },
-
-    /**
-     * setBrightness:
-     * Set the brightness of the magnified view.
-     * @brightness: Object containing the brightness for the red, green,
-     *              and blue channels.  Values of 0.0 represent "standard"
-     *              brightness (no change), whereas values less or greater than
-     *              0.0 indicate decreased or incresaed brightness,
-     *              respectively.
-     */
-    setBrightness: function(brightness) {
-        let bRed = brightness.r;
-        let bGreen = brightness.g;
-        let bBlue = brightness.b;
-        this._brightnessContrast.set_brightness_full(bRed, bGreen, bBlue);
-
-        // Enable the effect if the brightness OR contrast change are such that
-        // it modifies the brightness and/or contrast.
-        let [cRed, cGreen, cBlue] = this._brightnessContrast.get_contrast();
-        this._brightnessContrast.set_enabled(
-            (bRed != NO_CHANGE || bGreen != NO_CHANGE || bBlue != NO_CHANGE ||
-             cRed != NO_CHANGE || cGreen != NO_CHANGE || cBlue != NO_CHANGE)
-        );
-    },
-
-    /**
-     * getBrightness:
-     * Retrieve current brightness of the magnified view.
-     * @return: Object containing the brightness for the red, green,
-     *          and blue channels.  Values of 0.0 represent "standard" 
-     *          brightness (no change), whereas values less or greater than
-     *          0.0 indicate decreased or incresaed brightness, respectively.
-     */
-    getBrightness: function() {
-        let result = {};
-        let [bRed, bGreen, bBlue] = this._brightnessContrast.get_brightness();
-        result.r = bRed;
-        result.g = bGreen;
-        result.b = bBlue;
-
-        return result;
-    },
-
-    /**
-     * Set the contrast of the magnified view.
-     * @contrast:   Object containing the contrast for the red, green,
-     *              and blue channels.  Values of 0.0 represent "standard"
-     *              contrast (no change), whereas values less or greater than
-     *              0.0 indicate decreased or incresaed contrast, respectively.
-     */
-    setContrast: function(contrast) {
-        let cRed = contrast.r;
-        let cGreen = contrast.g;
-        let cBlue = contrast.b;
-
-        this._brightnessContrast.set_contrast_full(cRed, cGreen, cBlue);
-
-        // Enable the effect if the contrast OR brightness change are such that
-        // it modifies the brightness and/or contrast.
-        // should be able to use Clutter.color_equal(), but that complains of
-        // a null first argument.
-        let [bRed, bGreen, bBlue] = this._brightnessContrast.get_brightness();
-        this._brightnessContrast.set_enabled(
-             cRed != NO_CHANGE || cGreen != NO_CHANGE || cBlue != NO_CHANGE ||
-             bRed != NO_CHANGE || bGreen != NO_CHANGE || bBlue != NO_CHANGE
-        );
-    },
-
-    /**
-     * Retrieve current contrast of the magnified view.
-     * @return: Object containing the contrast for the red, green,
-     *          and blue channels.  Values of 0.0 represent "standard"
-     *          contrast (no change), whereas values less or greater than
-     *          0.0 indicate decreased or incresaed contrast, respectively.
-     */
-    getContrast: function() {
-        let resutl = {};
-        let [cRed, cGreen, cBlue] = this._brightnessContrast.get_contrast();
-        result.r = cRed;
-        result.g = cGreen;
-        result.b = cBlue;
-
-        return result;
-    }
-});
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -18,7 +18,6 @@ const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
 const KeyringPrompt = imports.ui.keyringPrompt;
 const Environment = imports.ui.environment;
 const ExtensionSystem = imports.ui.extensionSystem;
-const ExtensionDownloader = imports.ui.extensionDownloader;
 const Keyboard = imports.ui.keyboard;
 const MessageTray = imports.ui.messageTray;
 const Overview = imports.ui.overview;
@@ -31,9 +30,7 @@ const NetworkAgent = imports.ui.networkAgent;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
 const Scripting = imports.ui.scripting;
-const SessionMode = imports.ui.sessionMode;
 const ShellDBus = imports.ui.shellDBus;
-const ShellMountOperation = imports.ui.shellMountOperation;
 const TelepathyClient = imports.ui.telepathyClient;
 const WindowManager = imports.ui.windowManager;
 const Magnifier = imports.ui.magnifier;
@@ -49,6 +46,7 @@ let automountManager = null;
 let autorunManager = null;
 let panel = null;
 let hotCorners = [];
+let placesManager = null;
 let overview = null;
 let runDialog = null;
 let lookingGlass = null;
@@ -59,9 +57,7 @@ let windowAttentionHandler = null;
 let telepathyClient = null;
 let ctrlAltTabManager = null;
 let recorder = null;
-let sessionMode = null;
 let shellDBusService = null;
-let shellMountOpDBusService = null;
 let modalCount = 0;
 let modalActorFocusStack = [];
 let uiGroup = null;
@@ -71,27 +67,28 @@ let statusIconDispatcher = null;
 let keyboard = null;
 let layoutManager = null;
 let networkAgent = null;
+let _errorLogStack = [];
 let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
+let _gdmCssStylesheet = null;
 let _overridesSettings = null;

 let background = null;

-function createUserSession() {
+function _createUserSession() {
    // Load the calendar server. Note that we are careful about
    // not loading any events until the user presses the clock
    global.launch_calendar_server();

+    placesManager = new PlaceDisplay.PlacesManager();
    telepathyClient = new TelepathyClient.Client();
    automountManager = new AutomountManager.AutomountManager();
    autorunManager = new AutorunManager.AutorunManager();
    networkAgent = new NetworkAgent.NetworkAgent();
-
-    _initRecorder();
 }

-function createGDMSession() {
+function _createGDMSession() {
    // We do this this here instead of at the top to prevent GDM
    // related code from getting loaded in normal user sessions
    const LoginDialog = imports.gdm.loginDialog;
@@ -102,26 +99,18 @@ function createGDMSession() {
                        });
 }

-function createInitialSetupSession() {
-    networkAgent = new NetworkAgent.NetworkAgent();
-}
-
 function _initRecorder() {
    let recorderSettings = new Gio.Settings({ schema: 'org.gnome.shell.recorder' });
-    let desktopLockdownSettings = new Gio.Settings({ schema: 'org.gnome.desktop.lockdown' });
-    let bindingSettings = new Gio.Settings({ schema: 'org.gnome.shell.keybindings' });

-    global.display.add_keybinding('toggle-recording',
-                                  bindingSettings,
-                                  Meta.KeyBindingFlags.NONE, function() {
+    global.screen.connect('toggle-recording', function() {
        if (recorder == null) {
            recorder = new Shell.Recorder({ stage: global.stage });
        }

        if (recorder.is_recording()) {
-            recorder.close();
+            recorder.pause();
            Meta.enable_unredirect_for_screen(global.screen);
-        } else if (!desktopLockdownSettings.get_boolean('disable-save-to-disk')) {
+        } else {
            // read the parameters from GSettings always in case they have changed
            recorder.set_framerate(recorderSettings.get_int('framerate'));
            /* Translators: this is a filename used for screencast recording */
@@ -140,19 +129,39 @@ function _initRecorder() {
    });
 }

+function _initUserSession() {
+    _initRecorder();
+
+    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT, false, -1, 1);
+
+    ExtensionSystem.init();
+    ExtensionSystem.loadExtensions();
+
+    Meta.keybindings_set_custom_handler('panel-run-dialog', function() {
+       getRunDialog().open();
+    });
+
+    Meta.keybindings_set_custom_handler('panel-main-menu', function () {
+        overview.toggle();
+    });
+
+    global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));
+
+}
+
 function start() {
-    // These are here so we don't break compatibility.
-    global.logError = window.log;
-    global.log = window.log;
+    // Monkey patch utility functions into the global proxy;
+    // This is easier and faster than indirecting down into global
+    // if we want to call back up into JS.
+    global.logError = _logError;
+    global.log = _logDebug;

    // Chain up async errors reported from C
    global.connect('notify-error', function (global, msg, detail) { notifyError(msg, detail); });

    Gio.DesktopAppInfo.set_desktop_env('GNOME');

-    sessionMode = new SessionMode.SessionMode();
    shellDBusService = new ShellDBus.GnomeShell();
-    shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();

    // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
    // also initialize ShellAppSystem first.  ShellAppSystem
@@ -174,6 +183,7 @@ function start() {
    global.stage.no_clear_hint = true;

    _defaultCssStylesheet = global.datadir + '/theme/gnome-shell.css';
+    _gdmCssStylesheet = global.datadir + '/theme/gdm.css';
    loadTheme();

    // Set up stage hierarchy to group all UI actors under one container.
@@ -201,7 +211,8 @@ function start() {
    layoutManager = new Layout.LayoutManager();
    xdndHandler = new XdndHandler.XdndHandler();
    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
-    overview = new Overview.Overview();
+    // This overview object is just a stub for non-user sessions
+    overview = new Overview.Overview({ isDummy: global.session_type != Shell.SessionType.USER });
    magnifier = new Magnifier.Magnifier();
    statusIconDispatcher = new StatusIconDispatcher.StatusIconDispatcher();
    panel = new Panel.Panel();
@@ -211,7 +222,10 @@ function start() {
    notificationDaemon = new NotificationDaemon.NotificationDaemon();
    windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();

-    sessionMode.createSession();
+    if (global.session_type == Shell.SessionType.USER)
+        _createUserSession();
+    else if (global.session_type == Shell.SessionType.GDM)
+        _createGDMSession();

    panel.startStatusArea();

@@ -219,30 +233,8 @@ function start() {
    keyboard.init();
    overview.init();

-    if (sessionMode.hasWorkspaces)
-        global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
-                                                false, -1, 1);
-
-    if (sessionMode.allowExtensions) {
-        ExtensionDownloader.init();
-        ExtensionSystem.loadExtensions();
-    }
-
-    if (sessionMode.hasRunDialog) {
-        Meta.keybindings_set_custom_handler('panel-run-dialog', function() {
-           getRunDialog().open();
-        });
-    }
-
-    if (sessionMode.hasOverview) {
-        Meta.keybindings_set_custom_handler('panel-main-menu', function () {
-            overview.toggle();
-        });
-
-        global.display.connect('overlay-key',
-                               Lang.bind(overview, overview.toggle));
-    }
-
+    if (global.session_type == Shell.SessionType.USER)
+        _initUserSession();
    statusIconDispatcher.start(messageTray.actor);

    // Provide the bus object for gnome-session to
@@ -259,6 +251,7 @@ function start() {

    global.stage.connect('captured-event', _globalKeyPressHandler);

+    _log('info', 'loaded at ' + _startDate);
    log('GNOME Shell started at ' + _startDate);

    let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
@@ -501,8 +494,8 @@ function loadTheme() {

    let theme = new St.Theme ({ application_stylesheet: cssStylesheet });

-    if (sessionMode.extraStylesheet)
-        theme.load_stylesheet(sessionMode.extraStylesheet);
+    if (global.session_type == Shell.SessionType.GDM)
+        theme.load_stylesheet(_gdmCssStylesheet);

    if (previousTheme) {
        let customStylesheets = previousTheme.get_custom_stylesheets();
@@ -544,6 +537,59 @@ function notifyError(msg, details) {
    notify(msg, details);
 }

+/**
+ * _log:
+ * @category: string message type ('info', 'error')
+ * @msg: A message string
+ * ...: Any further arguments are converted into JSON notation,
+ *      and appended to the log message, separated by spaces.
+ *
+ * Log a message into the LookingGlass error
+ * stream.  This is primarily intended for use by the
+ * extension system as well as debugging.
+ */
+function _log(category, msg) {
+    let text = msg;
+    if (arguments.length > 2) {
+        text += ': ';
+        for (let i = 2; i < arguments.length; i++) {
+            text += JSON.stringify(arguments[i]);
+            if (i < arguments.length - 1)
+                text += ' ';
+        }
+    }
+    _errorLogStack.push({timestamp: new Date().getTime(),
+                         category: category,
+                         message: text });
+}
+
+function _logError(msg) {
+    return _log('error', msg);
+}
+
+function _logDebug(msg) {
+    return _log('debug', msg);
+}
+
+// Used by the error display in lookingGlass.js
+function _getAndClearErrorStack() {
+    let errors = _errorLogStack;
+    _errorLogStack = [];
+    return errors;
+}
+
+function logStackTrace(msg) {
+    try {
+        throw new Error();
+    } catch (e) {
+        // e.stack must have at least two lines, with the first being
+        // logStackTrace() (which we strip off), and the second being
+        // our caller.
+        let trace = e.stack.substr(e.stack.indexOf('\n') + 1);
+        log(msg ? (msg + '\n' + trace) : trace);
+    }
+}
+
 function isWindowActorDisplayedOnWorkspace(win, workspaceIndex) {
    return win.get_workspace() == workspaceIndex ||
        (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
@@ -566,11 +612,6 @@ function _globalKeyPressHandler(actor, event) {
    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();
@@ -579,6 +620,11 @@ function _globalKeyPressHandler(actor, event) {
    // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
    let action = global.display.get_keybinding_action(keyCode, modifierState);

+    // Other bindings are only available to the user session when the overview is up and
+    // no modal dialog is present.
+    if (global.session_type == Shell.SessionType.USER && (!overview.visible || modalCount > 1))
+        return false;
+
    // This isn't a Meta.KeyBindingAction yet
    if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
        overview.hide();
@@ -591,39 +637,28 @@ function _globalKeyPressHandler(actor, event) {
        return true;
    }

+    // None of the other bindings are relevant outside of the user's session
+    if (global.session_type != Shell.SessionType.USER)
+        return false;
+
    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.actionMoveWorkspaceUp();
            return true;
        case Meta.KeyBindingAction.WORKSPACE_DOWN:
-            if (!sessionMode.hasWorkspaces)
-                return false;
-
            wm.actionMoveWorkspaceDown();
            return true;
        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
        case Meta.KeyBindingAction.COMMAND_2:
-            if (!sessionMode.hasRunDialog)
-                return false;
-
            getRunDialog().open();
            return true;
        case Meta.KeyBindingAction.PANEL_MAIN_MENU:
@@ -674,7 +709,6 @@ function pushModal(actor, timestamp, options) {
            log('pushModal: invocation of begin_modal failed');
            return false;
        }
-        Meta.disable_unredirect_for_screen(global.screen);
    }

    global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);
@@ -755,7 +789,6 @@ function popModal(actor, timestamp) {

    global.end_modal(timestamp);
    global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
-    Meta.enable_unredirect_for_screen(global.screen);
 }

 function createLookingGlass() {
@@ -898,8 +931,7 @@ function initializeDeferredWork(actor, callback, props) {
 function queueDeferredWork(workId) {
    let data = _deferredWorkData[workId];
    if (!data) {
-        let message = 'Invalid work id %d'.format(workId);
-        logError(new Error(message), message);
+        global.logError('invalid work id ', workId);
        return;
    }
    if (_deferredWorkQueue.indexOf(workId) < 0)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -441,7 +441,7 @@ const Notification = new Lang.Class({
        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

-        this._table = new St.Table({ style_class: 'notification',
+        this._table = new St.Table({ name: 'notification',
                                     reactive: true });
        this._table.connect('style-changed', Lang.bind(this, this._styleChanged));
        this.actor.set_child(this._table);
@@ -586,21 +586,19 @@ const Notification = new Lang.Class({

    enableScrolling: function(enableScrolling) {
        this._scrollPolicy = enableScrolling ? Gtk.PolicyType.AUTOMATIC : Gtk.PolicyType.NEVER;
-        if (this._scrollArea) {
+        if (this._scrollArea)
            this._scrollArea.vscrollbar_policy = this._scrollPolicy;
-            this._scrollArea.enable_mouse_scrolling = enableScrolling;
-        }
    },

    _createScrollArea: function() {
        this._table.add_style_class_name('multi-line-notification');
-        this._scrollArea = new St.ScrollView({ style_class: 'notification-scrollview',
+        this._scrollArea = new St.ScrollView({ name: 'notification-scrollview',
                                               vscrollbar_policy: this._scrollPolicy,
                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
        this._table.add(this._scrollArea, { row: 1,
                                            col: 2 });
        this._updateLastColumnSettings();
-        this._contentArea = new St.BoxLayout({ style_class: 'notification-body',
+        this._contentArea = new St.BoxLayout({ name: 'notification-body',
                                               vertical: true });
        this._scrollArea.add_actor(this._contentArea);
        // If we know the notification will be expandable, we need to add
@@ -736,7 +734,7 @@ const Notification = new Lang.Class({
    addButton: function(id, label) {
        if (!this._buttonBox) {

-            let box = new St.BoxLayout({ style_class: 'notification-actions' });
+            let box = new St.BoxLayout({ name: 'notification-actions' });
            this.setActionArea(box, { x_expand: false,
                                      y_expand: false,
                                      x_fill: false,
@@ -746,7 +744,6 @@ const Notification = new Lang.Class({
        }

        let button = new St.Button({ can_focus: true });
-        button._actionId = id;

        if (this._useActionIcons && Gtk.IconTheme.get_default().has_icon(id)) {
            button.add_style_class_name('notification-icon-button');
@@ -756,7 +753,7 @@ const Notification = new Lang.Class({
            button.label = label;
        }

-        if (this._buttonBox.get_n_children() > 0)
+        if (this._buttonBox.get_children().length > 0)
            this._buttonFocusManager.remove_group(this._buttonBox);

        this._buttonBox.add(button);
@@ -766,31 +763,6 @@ const Notification = new Lang.Class({
        this.updated();
    },

-    // setButtonSensitive:
-    // @id: the action ID
-    // @sensitive: whether the button should be sensitive
-    //
-    // If the notification contains a button with action ID @id,
-    // its sensitivity will be set to @sensitive. Insensitive
-    // buttons cannot be clicked.
-    setButtonSensitive: function(id, sensitive) {
-        if (!this._buttonBox)
-            return;
-
-        let button = this._buttonBox.get_children().filter(function(b) {
-            return b._actionId == id;
-        })[0];
-
-        if (!button || button.reactive == sensitive)
-            return;
-
-        button.reactive = sensitive;
-        if (sensitive)
-            button.remove_style_pseudo_class('insensitive');
-        else
-            button.add_style_pseudo_class('insensitive');
-    },
-
    setUrgency: function(urgency) {
        this.urgency = urgency;
    },
@@ -986,10 +958,8 @@ const Source = new Lang.Class({

    ICON_SIZE: 24,

-    _init: function(title, iconName, iconType) {
+    _init: function(title) {
        this.title = title;
-        this.iconName = iconName;
-        this.iconType = iconType;

        this.actor = new Shell.GenericContainer();
        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
@@ -1019,8 +989,6 @@ const Source = new Lang.Class({
        this.isMuted = false;

        this.notifications = [];
-
-        this._setSummaryIcon(this.createNotificationIcon());
    },

    _getPreferredWidth: function (actor, forHeight, alloc) {
@@ -1091,12 +1059,10 @@ const Source = new Lang.Class({
    },

    // Called to create a new icon actor (of size this.ICON_SIZE).
-    // Provides a sane default implementation, override if you need
-    // something more fancy.
+    // Must be overridden by the subclass if you do not pass icons
+    // explicitly to the Notification() constructor.
    createNotificationIcon: function() {
-        return new St.Icon({ icon_name: this.iconName,
-                             icon_type: this.iconType,
-                             icon_size: this.ICON_SIZE });
+        throw new Error('no implementation of createNotificationIcon in ' + this);
    },

    // Unlike createNotificationIcon, this always returns the same actor;
@@ -1147,14 +1113,16 @@ const Source = new Lang.Class({
    },

    //// Protected methods ////
+
+    // The subclass must call this at least once to set the summary icon.
    _setSummaryIcon: function(icon) {
        if (this._iconBin.child)
            this._iconBin.child.destroy();
        this._iconBin.child = icon;
    },

+    // Default implementation is to do nothing, but subclasses can override
    open: function(notification) {
-        this.emit('opened', notification);
    },

    destroyNonResidentNotifications: function() {
@@ -1284,7 +1252,7 @@ const SummaryItem = new Lang.Class({
    },

    prepareNotificationStackForShowing: function() {
-        if (this.notificationStack.get_n_children() > 0)
+        if (this.notificationStack.get_children().length > 0)
            return;

        for (let i = 0; i < this.source.notifications.length; i++) {
@@ -1293,6 +1261,7 @@ const SummaryItem = new Lang.Class({
    },

    doneShowingNotificationStack: function() {
+        let notificationActors = this.notificationStack.get_children();
        for (let i = 0; i < this._stackedNotifications.length; i++) {
            let stackedNotification = this._stackedNotifications[i];
            let notification = stackedNotification.notification;
@@ -1322,7 +1291,7 @@ const SummaryItem = new Lang.Class({
        this._stackedNotifications.push(stackedNotification);
        if (!this.source.isChat)
            notification.enableScrolling(false);
-        if (this.notificationStack.get_n_children() > 0)
+        if (this.notificationStack.get_children().length > 0)
            notification.setIconVisible(false);
        this.notificationStack.add(notification.actor);
        notification.expand(false);
@@ -1468,7 +1437,6 @@ const MessageTray = new Lang.Class({
        this._overviewVisible = Main.overview.visible;
        this._notificationRemoved = false;
        this._reNotifyAfterHideNotification = null;
-        this._inFullscreen = false;

        this._corner = new Clutter.Rectangle({ width: 1,
                                               height: 1,
@@ -1484,7 +1452,6 @@ const MessageTray = new Lang.Class({
        Main.layoutManager.trackChrome(this._notificationBin);

        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._setSizePosition));
-        Main.layoutManager.connect('primary-fullscreen-changed', Lang.bind(this, this._onFullscreenChanged));

        this._setSizePosition();

@@ -1958,11 +1925,6 @@ const MessageTray = new Lang.Class({
        this._updateState();
    },

-    _onFullscreenChanged: function(obj, state) {
-        this._inFullscreen = state;
-        this._updateState();
-    },
-
    _onStatusChanged: function(status) {
        if (status == GnomeSession.PresenceStatus.BUSY) {
            // remove notification and allow the summary to be closed now
@@ -2020,7 +1982,7 @@ const MessageTray = new Lang.Class({
    _updateState: function() {
        // Notifications
        let notificationUrgent = this._notificationQueue.length > 0 && this._notificationQueue[0].urgency == Urgency.CRITICAL;
-        let notificationsPending = this._notificationQueue.length > 0 && ((!this._busy && !this._inFullscreen) || notificationUrgent);
+        let notificationsPending = this._notificationQueue.length > 0 && (!this._busy || notificationUrgent);
        let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
        let notificationExpanded = this._notificationBin.y < 0;
        let notificationExpired = (this._notificationTimeoutId == 0 && !(this._notification && this._notification.urgency == Urgency.CRITICAL) && !this._pointerInTray && !this._locked && !(this._pointerInKeyboard && notificationExpanded)) || this._notificationRemoved;
@@ -2056,7 +2018,7 @@ const MessageTray = new Lang.Class({
        if (this._summaryState == State.HIDDEN && !mustHideSummary) {
            if (summarySummoned) {
                this._showSummary(0);
-            } else if (notificationsDone && !this._busy && !this._inFullscreen) {
+            } else if (notificationsDone && !this._busy) {
                if (this._backFromAway && this._unseenNotifications.length > 0)
                    this._showSummary(LONGER_SUMMARY_TIMEOUT);
                else if (this._newSummaryItems.length > 0)
@@ -2435,7 +2397,7 @@ const MessageTray = new Lang.Class({
    },

    _onSummaryBoxPointerContentUpdated: function() {
-        if (this._summaryBoxPointerItem.notificationStack.get_n_children() == 0)
+        if (this._summaryBoxPointerItem.notificationStack.get_children().length == 0)
            this._hideSummaryBoxPointer();
        this._adjustSummaryBoxPointerPosition();

@@ -2469,7 +2431,7 @@ const MessageTray = new Lang.Class({
        // We should be sure to hide the box pointer if all notifications in it are destroyed while
        // it is hiding, so that we don't show an an animation of an empty blob being hidden.
        if (this._summaryBoxPointerState == State.HIDING &&
-            this._summaryBoxPointerItem.notificationStack.get_n_children() == 0) {
+            this._summaryBoxPointerItem.notificationStack.get_children().length == 0) {
            this._summaryBoxPointer.actor.hide();
            return;
        }
@@ -2525,7 +2487,15 @@ const SystemNotificationSource = new Lang.Class({
    Extends: Source,

    _init: function() {
-        this.parent(_("System Information"), 'dialog-information', St.IconType.SYMBOLIC);
+        this.parent(_("System Information"));
+
+        this._setSummaryIcon(this.createNotificationIcon());
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ icon_name: 'dialog-information',
+                             icon_type: St.IconType.SYMBOLIC,
+                             icon_size: this.ICON_SIZE });
    },

    open: function() {
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -180,7 +180,7 @@ const ModalDialog = new Lang.Class({
    },

    _fadeOpen: function() {
-        let monitor = Main.layoutManager.currentMonitor;
+        let monitor = Main.layoutManager.focusMonitor;

        this._backgroundBin.set_position(monitor.x, monitor.y);
        this._backgroundBin.set_size(monitor.width, monitor.height);
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -483,7 +483,7 @@ const NotificationDaemon = new Lang.Class({
    },

    _onTrayIconAdded: function(o, icon) {
-        let source = this._getSource(icon.title || icon.wm_class || C_("program", "Unknown"), icon.pid, null, null, icon);
+        let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null, icon);
    },

    _onTrayIconRemoved: function(o, icon) {
@@ -578,27 +578,11 @@ const Source = new Lang.Class({
        return true;
    },

-    _getApp: function() {
-        let app;
-
-        app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid);
-        if (app != null)
-            return app;
-
-        if (this.trayIcon) {
-            app = Shell.AppSystem.get_default().lookup_wmclass(this.trayIcon.wmclass);
-            if (app != null)
-                return app;
-        }
-
-        return null;
-    },
-
    _setApp: function() {
        if (this.app)
            return;

-        this.app = this._getApp();
+        this.app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid);
        if (!this.app)
            return;

@@ -638,10 +622,5 @@ const Source = new Lang.Class({
        }

        this.parent();
-    },
-
-    createNotificationIcon: function() {
-        // We set the summary icon ourselves.
-        return null;
    }
 });
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
-const Config = imports.misc.config;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const Mainloop = imports.mainloop;
@@ -12,9 +11,10 @@ const Shell = imports.gi.Shell;
 const Gdk = imports.gi.Gdk;

 const AppDisplay = imports.ui.appDisplay;
-const ContactDisplay = Config.HAVE_FOLKS ? imports.ui.contactDisplay : null;
+const ContactDisplay = imports.ui.contactDisplay;
 const Dash = imports.ui.dash;
 const DND = imports.ui.dnd;
+const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const Panel = imports.ui.panel;
@@ -99,8 +99,10 @@ const ShellInfo = new Lang.Class({
 const Overview = new Lang.Class({
    Name: 'Overview',

-    _init : function() {
-        this.isDummy = !Main.sessionMode.hasOverview;
+    _init : function(params) {
+        params = Params.parse(params, { isDummy: false });
+
+        this.isDummy = params.isDummy;

        // We only have an overview in user sessions, so
        // create a dummy overview in other cases
@@ -208,8 +210,7 @@ const Overview = new Lang.Class({
        this.addSearchProvider(new AppDisplay.AppSearchProvider());
        this.addSearchProvider(new AppDisplay.SettingsSearchProvider());
        this.addSearchProvider(new PlaceDisplay.PlaceSearchProvider());
-        if (ContactDisplay != null)
-            this.addSearchProvider(new ContactDisplay.ContactSearchProvider());
+        this.addSearchProvider(new ContactDisplay.ContactSearchProvider());

        // Load remote search providers provided by applications
        RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -14,6 +14,7 @@ const St = imports.gi.St;
 const Signals = imports.signals;
 const Atk = imports.gi.Atk;

+const Config = imports.misc.config;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const DND = imports.ui.dnd;
 const Layout = imports.ui.layout;
@@ -31,6 +32,33 @@ const BUTTON_DND_ACTIVATION_TIMEOUT = 250;
 const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const SPINNER_ANIMATION_TIME = 0.2;

+const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'network', 'battery', 'userMenu'];
+const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = {
+    'a11y': imports.ui.status.accessibility.ATIndicator,
+    'volume': imports.ui.status.volume.Indicator,
+    'battery': imports.ui.status.power.Indicator,
+    'keyboard': imports.ui.status.keyboard.XKBIndicator,
+    'userMenu': imports.ui.userMenu.UserMenuButton
+};
+
+if (Config.HAVE_BLUETOOTH)
+    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
+
+try {
+    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
+} catch(e) {
+    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+}
+
+const GDM_STATUS_AREA_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'battery', 'powerMenu'];
+const GDM_STATUS_AREA_SHELL_IMPLEMENTATION = {
+    'a11y': imports.ui.status.accessibility.ATIndicator,
+    'volume': imports.ui.status.volume.Indicator,
+    'battery': imports.ui.status.power.Indicator,
+    'keyboard': imports.ui.status.keyboard.XKBIndicator,
+    'powerMenu': imports.gdm.powerMenu.PowerMenuButton
+};
+
 // To make sure the panel corners blend nicely with the panel,
 // we draw background and borders the same way, e.g. drawing
 // them as filled shapes from the outside inwards instead of
@@ -934,7 +962,7 @@ const Panel = new Lang.Class({
        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));

        /* Button on the left side of the panel. */
-        if (Main.sessionMode.hasOverview) {
+        if (global.session_type == Shell.SessionType.USER) {
            this._activitiesButton = new ActivitiesButton();
            this._activities = this._activitiesButton.actor;
            this._leftBox.add(this._activities);
@@ -942,19 +970,28 @@ const Panel = new Lang.Class({
            // The activities button has a pretend menu, so as to integrate
            // more cleanly with the rest of the panel
            this._menus.addMenu(this._activitiesButton.menu);
-        }

-        if (Main.sessionMode.hasAppMenu) {
            this._appMenu = new AppMenuButton(this._menus);
            this._leftBox.add(this._appMenu.actor);
        }

        /* center */
-        this._dateMenu = new DateMenu.DateMenuButton();
+        if (global.session_type == Shell.SessionType.USER)
+            this._dateMenu = new DateMenu.DateMenuButton({ showEvents: true });
+        else
+            this._dateMenu = new DateMenu.DateMenuButton({ showEvents: false });
        this._centerBox.add(this._dateMenu.actor, { y_fill: true });
        this._menus.addMenu(this._dateMenu.menu);

        /* right */
+        if (global.session_type == Shell.SessionType.GDM) {
+            this._status_area_order = GDM_STATUS_AREA_ORDER;
+            this._status_area_shell_implementation = GDM_STATUS_AREA_SHELL_IMPLEMENTATION;
+        } else {
+            this._status_area_order = STANDARD_STATUS_AREA_ORDER;
+            this._status_area_shell_implementation = STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION;
+        }
+
        Main.statusIconDispatcher.connect('status-icon-added', Lang.bind(this, this._onTrayIconAdded));
        Main.statusIconDispatcher.connect('status-icon-removed', Lang.bind(this, this._onTrayIconRemoved));

@@ -1078,17 +1115,17 @@ const Panel = new Lang.Class({

    openAppMenu: function() {
        let menu = this._appMenu.menu;
-        if (!this._appMenu.actor.reactive || menu.isOpen)
-            return;
+        if (Main.overview.visible || menu.isOpen)
+          return;

        menu.open();
        menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
    },

    startStatusArea: function() {
-        for (let i = 0; i < Main.sessionMode.statusArea.order.length; i++) {
-            let role = Main.sessionMode.statusArea.order[i];
-            let constructor = Main.sessionMode.statusArea.implementation[role];
+        for (let i = 0; i < this._status_area_order.length; i++) {
+            let role = this._status_area_order[i];
+            let constructor = this._status_area_shell_implementation[role];
            if (!constructor) {
                // This icon is not implemented (this is a bug)
                continue;
@@ -1138,21 +1175,18 @@ const Panel = new Lang.Class({
    },

    _onTrayIconAdded: function(o, icon, role) {
-        if (Main.sessionMode.statusArea.implementation[role]) {
+        if (this._status_area_shell_implementation[role]) {
            // This icon is legacy, and replaced by a Shell version
            // Hide it
            return;
        }

-        if (Main.sessionMode.statusArea.order.indexOf(role) == -1)
-            return;
-
        icon.height = PANEL_ICON_SIZE;
        let buttonBox = new PanelMenu.ButtonBox();
        let box = buttonBox.actor;
        box.add_actor(icon);

-        this._insertStatusItem(box, Main.sessionMode.statusArea.order.indexOf(role));
+        this._insertStatusItem(box, this._status_area_order.indexOf(role));
    },

    _onTrayIconRemoved: function(o, icon) {
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@@ -189,7 +189,7 @@ const PlacesManager = new Lang.Class({
        this._volumeMonitor.connect('drive-changed', Lang.bind(this, this._updateDevices));
        this._updateDevices();

-        this._bookmarksPath = GLib.build_filenamev([GLib.get_user_config_dir(), 'gtk-3.0', 'bookmarks']);
+        this._bookmarksPath = GLib.build_filenamev([GLib.get_home_dir(), '.gtk-bookmarks']);
        this._bookmarksFile = Gio.file_new_for_path(this._bookmarksPath);
        this._monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
        this._bookmarkTimeoutId = 0;
@@ -365,13 +365,12 @@ const PlaceSearchProvider = new Lang.Class({

    _init: function() {
        this.parent(_("PLACES & DEVICES"));
-        this.placesManager = new PlacesManager();
    },

-    getResultMetas: function(resultIds, callback) {
+    getResultMetas: function(resultIds) {
        let metas = [];
        for (let i = 0; i < resultIds.length; i++) {
-            let placeInfo = this.placesManager.lookupPlaceById(resultIds[i]);
+            let placeInfo = Main.placesManager.lookupPlaceById(resultIds[i]);
            if (!placeInfo)
                metas.push(null);
            else
@@ -382,22 +381,24 @@ const PlaceSearchProvider = new Lang.Class({
                             }
                           });
        }
-        callback(metas);
+        return metas;
    },

    activateResult: function(id, params) {
-        let placeInfo = this.placesManager.lookupPlaceById(id);
+        let placeInfo = Main.placesManager.lookupPlaceById(id);
        placeInfo.launch(params);
    },

    _compareResultMeta: function (idA, idB) {
-        let infoA = this.placesManager.lookupPlaceById(idA);
-        let infoB = this.placesManager.lookupPlaceById(idB);
+        let infoA = Main.placesManager.lookupPlaceById(idA);
+        let infoB = Main.placesManager.lookupPlaceById(idB);
        return infoA.name.localeCompare(infoB.name);
    },

    _searchPlaces: function(places, terms) {
+        let multiplePrefixResults = [];
        let prefixResults = [];
+        let multipleSubstringResults = [];
        let substringResults = [];

        terms = terms.map(String.toLowerCase);
@@ -405,26 +406,29 @@ const PlaceSearchProvider = new Lang.Class({
        for (let i = 0; i < places.length; i++) {
            let place = places[i];
            let mtype = place.matchTerms(terms);
-            if (mtype == Search.MatchType.PREFIX)
+            if (mtype == Search.MatchType.MULTIPLE_PREFIX)
+                multiplePrefixResults.push(place.id);
+            else if (mtype == Search.MatchType.PREFIX)
                prefixResults.push(place.id);
+            else if (mtype == Search.MatchType.MULTIPLE_SUBSTRING)
+                multipleSubstringResults.push(place.id);
            else if (mtype == Search.MatchType.SUBSTRING)
                substringResults.push(place.id);
        }
-        prefixResults.sort(Lang.bind(this, this._compareResultMeta));
-        substringResults.sort(Lang.bind(this, this._compareResultMeta));
-
-        this.searchSystem.pushResults(this, prefixResults.concat(substringResults));
+        multiplePrefixResults.sort(this._compareResultMeta);
+        prefixResults.sort(this._compareResultMeta);
+        multipleSubstringResults.sort(this._compareResultMeta);
+        substringResults.sort(this._compareResultMeta);
+        return multiplePrefixResults.concat(prefixResults.concat(multipleSubstringResults.concat(substringResults)));
    },

    getInitialResultSet: function(terms) {
-        let places = this.placesManager.getAllPlaces();
-        this._searchPlaces(places, terms);
+        let places = Main.placesManager.getAllPlaces();
+        return this._searchPlaces(places, terms);
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        let places = previousResults.map(Lang.bind(this, function(id) {
-            return this.placesManager.lookupPlaceById(id);
-        }));
-        this._searchPlaces(places, terms);
+        let places = previousResults.map(function (id) { return Main.placesManager.lookupPlaceById(id); });
+        return this._searchPlaces(places, terms);
    }
 });
--- a/js/ui/polkitAuthenticationAgent.js
+++ b/js/ui/polkitAuthenticationAgent.js
@@ -167,7 +167,6 @@ const AuthenticationDialog = new Lang.Class({
         */
        this._nullMessageLabel = new St.Label({ style_class: 'prompt-dialog-null-label',
                                                text: 'abc'});
-        this._nullMessageLabel.add_style_class_name('hidden');
        this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
        this._nullMessageLabel.clutter_text.line_wrap = true;
        messageBox.add(this._nullMessageLabel);
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -546,10 +546,6 @@ const PopupSliderMenuItem = new Lang.Class({
        this._slider.connect('repaint', Lang.bind(this, this._sliderRepaint));
        this.actor.connect('button-press-event', Lang.bind(this, this._startDragging));
        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
-        this.actor.connect('notify::mapped', Lang.bind(this, function() {
-            if (!this.actor.mapped)
-                this._endDragging();
-        }));

        this._releaseId = this._motionId = 0;
        this._dragging = false;
@@ -888,7 +884,8 @@ const PopupMenuBase = new Lang.Class({
    },

    addSettingsAction: function(title, desktopFile) {
-        if (!Main.sessionMode.allowSettings)
+        // Don't allow user settings to get edited unless we're in a user session
+        if (global.session_type != Shell.SessionType.USER)
            return null;

        let menuItem = this.addAction(title, function() {
@@ -906,7 +903,7 @@ const PopupMenuBase = new Lang.Class({
    },

    isEmpty: function() {
-        return this.box.get_n_children() == 0;
+        return this.box.get_children().length == 0;
    },

    isChildMenu: function(menu) {
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -62,25 +62,10 @@ function loadRemoteSearchProvidersFromDir(dir, addProviderCallback) {
            let remoteProvider, title;
            try {
                let group = KEY_FILE_GROUP;
+                let icon = keyfile.get_string(group, 'Icon');
                let busName = keyfile.get_string(group, 'BusName');
                let objectPath = keyfile.get_string(group, 'ObjectPath');
-
-                let appInfo = null;
-                try {
-                    let desktopId = keyfile.get_string(group, 'DesktopId');
-                    appInfo = Gio.DesktopAppInfo.new(desktopId);
-                } catch (e) {
-                }
-
-                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);
-                }
+                title = keyfile.get_locale_string(group, 'Title', null);

                remoteProvider = new RemoteSearchProvider(title,
                                                          icon,
@@ -106,6 +91,7 @@ const RemoteSearchProvider = new Lang.Class({
                                              dbusName, dbusPath);

        this.parent(title.toUpperCase());
+        this.async = true;
        this._cancellable = new Gio.Cancellable();
    },

@@ -134,7 +120,7 @@ const RemoteSearchProvider = new Lang.Class({
        this.searchSystem.pushResults(this, results[0]);
    },

-    getInitialResultSet: function(terms) {
+    getInitialResultSetAsync: function(terms) {
        this._cancellable.cancel();
        this._cancellable.reset();
        try {
@@ -147,7 +133,7 @@ const RemoteSearchProvider = new Lang.Class({
        }
    },

-    getSubsearchResultSet: function(previousResults, newTerms) {
+    getSubsearchResultSetAsync: function(previousResults, newTerms) {
        this._cancellable.cancel();
        this._cancellable.reset();
        try {
@@ -178,7 +164,7 @@ const RemoteSearchProvider = new Lang.Class({
        callback(resultMetas);
    },

-    getResultMetas: function(ids, callback) {
+    getResultMetasAsync: function(ids, callback) {
        this._cancellable.cancel();
        this._cancellable.reset();
        try {
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -18,7 +18,9 @@ const DISABLED_OPEN_SEARCH_PROVIDERS_KEY = 'disabled-open-search-providers';
 const MatchType = {
    NONE: 0,
    SUBSTRING: 1,
-    PREFIX: 2
+    MULTIPLE_SUBSTRING: 2,
+    PREFIX: 3,
+    MULTIPLE_PREFIX: 4
 };

 const SearchResultDisplay = new Lang.Class({
@@ -51,7 +53,7 @@ const SearchResultDisplay = new Lang.Class({
     * Remove all results from this display.
     */
    clear: function() {
-        this.actor.destroy_all_children();
+        this.actor.get_children().forEach(function (actor) { actor.destroy(); });
    },

    /**
@@ -70,8 +72,11 @@ const SearchResultDisplay = new Lang.Class({
 * Subclass this object to add a new result type
 * to the search system, then call registerProvider()
 * in SearchSystem with an instance.
- * Search is asynchronous and uses the
+ * By default, search is synchronous and uses the
 * getInitialResultSet()/getSubsearchResultSet() methods.
+ * For asynchronous search, set the async property to true
+ * and implement getInitialResultSetAsync()/getSubsearchResultSetAsync()
+ * instead.
 */
 const SearchProvider = new Lang.Class({
    Name: 'SearchProvider',
@@ -79,6 +84,7 @@ const SearchProvider = new Lang.Class({
    _init: function(title) {
        this.title = title;
        this.searchSystem = null;
+        this.async = false;
    },

    /**
@@ -89,7 +95,7 @@ const SearchProvider = new Lang.Class({
     * therefore a single term of length one or two), or when
     * a new term is added.
     *
-     * Should "return" an array of result identifier strings representing
+     * Should return an array of result identifier strings representing
     * items which match the given search terms.  This
     * is expected to be a substring match on the metadata for a given
     * item.  Ordering of returned results is up to the discretion of the provider,
@@ -99,9 +105,6 @@ const SearchProvider = new Lang.Class({
     *    description) before single matches
     *  * Put items which match on a prefix before non-prefix substring matches
     *
-     * We say "return" above, but in order to make the query asynchronous, use
-     * this.searchSystem.pushResults();. The return value should be ignored.
-     *
     * This function should be fast; do not perform unindexed full-text searches
     * or network queries.
     */
@@ -109,6 +112,18 @@ const SearchProvider = new Lang.Class({
        throw new Error('Not implemented');
    },

+    /**
+     * getInitialResultSetAsync:
+     * @terms: Array of search terms, treated as logical AND
+     *
+     * Like getInitialResultSet(), but the method should return immediately
+     * without a return value - use SearchSystem.pushResults() when the
+     * corresponding results are ready.
+     */
+    getInitialResultSetAsync: function(terms) {
+        throw new Error('Not implemented');
+    },
+
    /**
     * getSubsearchResultSet:
     * @previousResults: Array of item identifiers
@@ -121,23 +136,46 @@ const SearchProvider = new Lang.Class({
     *
     * This allows search providers to only search through the previous
     * result set, rather than possibly performing a full re-query.
-     *
-     * Similar to getInitialResultSet, the return value for this will
-     * be ignored; use this.searchSystem.pushResults();.
     */
    getSubsearchResultSet: function(previousResults, newTerms) {
        throw new Error('Not implemented');
    },

+    /**
+     * getSubsearchResultSetAsync:
+     * @previousResults: Array of item identifiers
+     * @newTerms: Updated search terms
+     *
+     * Like getSubsearchResultSet(), but the method should return immediately
+     * without a return value - use SearchSystem.pushResults() when the
+     * corresponding results are ready.
+     */
+    getSubsearchResultSetAsync: function(previousResults, newTerms) {
+        throw new Error('Not implemented');
+    },
+
    /**
     * getResultMetas:
     * @ids: Result identifier strings
     *
-     * Call callback with array of objects with 'id', 'name', (both strings) and
+     * Return an array of objects with 'id', 'name', (both strings) and
     * 'createIcon' (function(size) returning a Clutter.Texture) properties
     * with the same number of members as @ids
     */
-    getResultMetas: function(ids, callback) {
+    getResultMetas: function(ids) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * getResultMetasAsync:
+     * @ids: Result identifier strings
+     * @callback: callback to pass the results to when ready
+     *
+     * Like getResultMetas(), but the method should return immediately
+     * without a return value - pass the results to the provided @callback
+     * when ready.
+     */
+    getResultMetasAsync: function(ids, callback) {
        throw new Error('Not implemented');
    },

@@ -341,33 +379,42 @@ const SearchSystem = new Lang.Class({
            }
        }

-        let previousResultsArr = this._previousResults;
-
        let results = [];
-        this._previousTerms = terms;
-        this._previousResults = results;
-
        if (isSubSearch) {
            for (let i = 0; i < this._providers.length; i++) {
-                let [provider, previousResults] = previousResultsArr[i];
+                let [provider, previousResults] = this._previousResults[i];
                try {
-                    results.push([provider, []]);
-                    provider.getSubsearchResultSet(previousResults, terms);
+                    if (provider.async) {
+                        provider.getSubsearchResultSetAsync(previousResults, terms);
+                        results.push([provider, []]);
+                    } else {
+                        let providerResults = provider.getSubsearchResultSet(previousResults, terms);
+                        results.push([provider, providerResults]);
+                    }
                } catch (error) {
-                    log('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
+                    global.log ('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
                }
            }
        } else {
            for (let i = 0; i < this._providers.length; i++) {
                let provider = this._providers[i];
                try {
-                    results.push([provider, []]);
-                    provider.getInitialResultSet(terms);
+                    if (provider.async) {
+                        provider.getInitialResultSetAsync(terms);
+                        results.push([provider, []]);
+                    } else {
+                        let providerResults = provider.getInitialResultSet(terms);
+                        results.push([provider, providerResults]);
+                    }
                } catch (error) {
-                    log('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
+                    global.log ('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
                }
            }
        }
+
+        this._previousTerms = terms;
+        this._previousResults = results;
+        this.emit('search-completed', results);
    },
 });
 Signals.addSignalMethods(SearchSystem.prototype);
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -5,7 +5,6 @@ const Lang = imports.lang;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
-const Atk = imports.gi.Atk;

 const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
@@ -34,13 +33,12 @@ const SearchResult = new Lang.Class({
            content = new St.Bin({ style_class: 'search-result-content',
                                   reactive: true,
                                   can_focus: true,
-                                   track_hover: true,
-                                   accessible_role: Atk.Role.PUSH_BUTTON });
+                                   track_hover: true });
            let icon = new IconGrid.BaseIcon(this.metaInfo['name'],
                                             { createIcon: this.metaInfo['createIcon'] });
            content.set_child(icon.actor);
            this._dragActorSource = icon.icon;
-            content.label_actor = icon.label;
+            this.actor.label_actor = icon.label;
        } else {
            if (content._delegate && content._delegate.getDragActorSource)
                this._dragActorSource = content._delegate.getDragActorSource();
@@ -121,7 +119,13 @@ const GridSearchResults = new Lang.Class({
                if (results.length == 0)
                    return;

-                provider.getResultMetas(results, Lang.bind(this, this.renderResults));
+                if (provider.async) {
+                    provider.getResultMetasAsync(results,
+                                                 Lang.bind(this, this.renderResults));
+                } else {
+                    let metas = provider.getResultMetas(results);
+                    this.renderResults(metas);
+                }
            }));
        }));
        this._notDisplayedResult = [];
@@ -131,7 +135,7 @@ const GridSearchResults = new Lang.Class({

    getResultsForDisplay: function() {
        let alreadyVisible = this._pendingClear ? 0 : this._grid.visibleItemsCount();
-        let canDisplay = this._grid.childrenInRow(this._width) * this._grid.getRowLimit()
+        let canDisplay = this._grid.childrenInRow(this._width) * MAX_SEARCH_RESULTS_ROWS
                         - alreadyVisible;

        let numResults = Math.min(this._notDisplayedResult.length, canDisplay);
@@ -175,7 +179,8 @@ const SearchResults = new Lang.Class({

    _init: function(searchSystem, openSearchSystem) {
        this._searchSystem = searchSystem;
-        this._searchSystem.connect('search-updated', Lang.bind(this, this._updateResults));
+        this._searchSystem.connect('search-updated', Lang.bind(this, this._updateCurrentResults));
+        this._searchSystem.connect('search-completed', Lang.bind(this, this._updateResults));
        this._openSearchSystem = openSearchSystem;

        this.actor = new St.BoxLayout({ name: 'searchResults',
@@ -209,8 +214,10 @@ const SearchResults = new Lang.Class({
        this._content.add(this._statusText);
        this._providers = this._searchSystem.getProviders();
        this._providerMeta = [];
+        this._providerMetaResults = {};
        for (let i = 0; i < this._providers.length; i++) {
            this.createProviderMeta(this._providers[i]);
+            this._providerMetaResults[this.providers[i].title] = [];
        }
        this._searchProvidersBox = new St.BoxLayout({ style_class: 'search-providers-box' });
        this.actor.add(this._searchProvidersBox);
@@ -283,7 +290,8 @@ const SearchResults = new Lang.Class({

        this._providerMeta.push({ provider: provider,
                                  actor: providerBox,
-                                  resultDisplay: resultDisplay });
+                                  resultDisplay: resultDisplay,
+                                  hasPendingResults: false });
        this._content.add(providerBox);
    },

@@ -299,6 +307,7 @@ const SearchResults = new Lang.Class({
    },

    _clearDisplay: function() {
+        this._visibleResultsCount = 0;
        for (let i = 0; i < this._providerMeta.length; i++) {
            let meta = this._providerMeta[i];
            meta.resultDisplay.clear();
@@ -326,8 +335,6 @@ const SearchResults = new Lang.Class({

    doSearch: function (searchString) {
        this._searchSystem.updateSearch(searchString);
-        let terms = this._searchSystem.getTerms();
-        this._openSearchSystem.setSearchTerms(terms);
    },

    _metaForProvider: function(provider) {
@@ -339,6 +346,8 @@ const SearchResults = new Lang.Class({

        for (let i = 0; i < this._providerMeta.length; i++) {
            let meta = this._providerMeta[i];
+            if (meta.hasPendingResults)
+                return;

            if (!meta.actor.visible)
                continue;
@@ -363,57 +372,71 @@ const SearchResults = new Lang.Class({
        }
    },

-    _updateStatusText: function () {
-        let haveResults = false;
+    _updateCurrentResults: function(searchSystem, results) {
+        let terms = searchSystem.getTerms();
+        let [provider, providerResults] = results;
+        let meta = this._metaForProvider(provider);
+        meta.hasPendingResults = false;
+        this._updateProviderResults(provider, providerResults, terms);
+    },

-        for (let i = 0; i < this._providerMeta.length; ++i)
-            if (this._providerMeta[i].resultDisplay.getFirstResult()) {
-                haveResults = true;
-                break;
+    _updateProviderResults: function(provider, providerResults, terms) {
+        let meta = this._metaForProvider(provider);
+        if (providerResults.length == 0) {
+            this._clearDisplayForProvider(provider);
+            meta.resultDisplay.setResults([], []);
+        } else {
+            this._providerMetaResults[provider.title] = providerResults;
+            meta.resultDisplay.setResults(providerResults, terms);
+            let results = meta.resultDisplay.getResultsForDisplay();
+
+            if (provider.async) {
+                provider.getResultMetasAsync(results, Lang.bind(this,
+                    function(metas) {
+                        this._clearDisplayForProvider(provider);
+                        meta.actor.show();
+                        this._content.hide();
+                        meta.resultDisplay.renderResults(metas);
+                        this._maybeSetInitialSelection();
+                        this._content.show();
+                    }));
+            } else {
+                let metas = provider.getResultMetas(results);
+                this._clearDisplayForProvider(provider);
+                meta.actor.show();
+                meta.resultDisplay.renderResults(metas);
            }
+        }
+        this._maybeSetInitialSelection();
+    },

-        if (!haveResults) {
+    _updateResults: function(searchSystem, results) {
+        if (results.length == 0) {
            this._statusText.set_text(_("No matching results."));
            this._statusText.show();
        } else {
            this._statusText.hide();
        }
-    },

-    _updateResults: function(searchSystem, results) {
        let terms = searchSystem.getTerms();
-        let [provider, providerResults] = results;
-        let meta = this._metaForProvider(provider);
+        this._openSearchSystem.setSearchTerms(terms);

-        if (providerResults.length == 0) {
-            this._clearDisplayForProvider(provider);
-            meta.resultDisplay.setResults([], []);
-            this._maybeSetInitialSelection();
-            this._updateStatusText();
-        } else {
-            meta.resultDisplay.setResults(providerResults, terms);
-            let results = meta.resultDisplay.getResultsForDisplay();
+        // To avoid CSS transitions causing flickering when the first search
+        // result stays the same, we hide the content while filling in the
+        // results.
+        this._content.hide();

-            provider.getResultMetas(results, Lang.bind(this, function(metas) {
-                this._clearDisplayForProvider(provider);
-                meta.actor.show();
-
-                // Hiding drops the key focus if we have it
-                let focus = global.stage.get_key_focus();
-                // To avoid CSS transitions causing flickering when
-                // the first search result stays the same, we hide the
-                // content while filling in the results.
-                this._content.hide();
-
-                meta.resultDisplay.renderResults(metas);
-                this._maybeSetInitialSelection();
-                this._updateStatusText();
-
-                this._content.show();
-                if (this._content.contains(focus))
-                    global.stage.set_key_focus(focus);
-            }));
+        for (let i = 0; i < results.length; i++) {
+            let [provider, providerResults] = results[i];
+            let meta = this._metaForProvider(provider);
+            meta.hasPendingResults = provider.async;
+            if (!meta.hasPendingResults)
+                this._updateProviderResults(provider, providerResults, terms);
        }
+
+        this._content.show();
+
+        return true;
    },

    activateDefault: function() {
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -1,124 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-
-const Config = imports.misc.config;
-const Main = imports.ui.main;
-const Params = imports.misc.params;
-
-
-const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = {
-    'a11y': imports.ui.status.accessibility.ATIndicator,
-    'volume': imports.ui.status.volume.Indicator,
-    'battery': imports.ui.status.power.Indicator,
-    'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
-    'userMenu': imports.ui.userMenu.UserMenuButton
-};
-
-if (Config.HAVE_BLUETOOTH)
-    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] =
-        imports.ui.status.bluetooth.Indicator;
-
-try {
-    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] =
-        imports.ui.status.network.NMApplet;
-} catch(e) {
-    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
-}
-
-
-const DEFAULT_MODE = 'user';
-
-const _modes = {
-    'gdm': { hasOverview: false,
-             hasAppMenu: false,
-             showCalendarEvents: false,
-             allowSettings: false,
-             allowExtensions: false,
-             allowKeybindingsWhenModal: true,
-             hasRunDialog: false,
-             hasWorkspaces: false,
-             createSession: Main.createGDMSession,
-             extraStylesheet: global.datadir + '/theme/gdm.css',
-             statusArea: {
-                 order: [
-                     'a11y', 'display', 'keyboard',
-                     'volume', 'battery', 'powerMenu'
-                 ],
-                 implementation: {
-                     'a11y': imports.ui.status.accessibility.ATIndicator,
-                     'volume': imports.ui.status.volume.Indicator,
-                     'battery': imports.ui.status.power.Indicator,
-                     'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
-                     'powerMenu': imports.gdm.powerMenu.PowerMenuButton
-                 }
-             }
-           },
-
-    'initial-setup': { hasOverview: false,
-                       hasAppMenu: false,
-                       showCalendarEvents: false,
-                       allowSettings: false,
-                       allowExtensions: false,
-                       allowKeybindingsWhenModal: false,
-                       hasRunDialog: false,
-                       hasWorkspaces: false,
-                       createSession: Main.createInitialSetupSession,
-                       extraStylesheet: null,
-                       statusArea: {
-                           order: [
-                               'a11y', 'keyboard', 'volume'
-                           ],
-                           implementation: {
-                               'a11y': imports.ui.status.accessibility.ATIndicator,
-                               'keyboard': imports.ui.status.keyboard.XKBIndicator,
-                               'volume': imports.ui.status.volume.Indicator
-                        }
-                }
-           },
-
-    'user': { hasOverview: true,
-              hasAppMenu: true,
-              showCalendarEvents: true,
-              allowSettings: true,
-              allowExtensions: true,
-              allowKeybindingsWhenModal: false,
-              hasRunDialog: true,
-              hasWorkspaces: true,
-              createSession: Main.createUserSession,
-              extraStylesheet: null,
-              statusArea: {
-                  order: [
-                      'input-method', 'a11y', 'keyboard', 'volume', 'bluetooth',
-                      'network', 'battery', 'userMenu'
-                  ],
-                  implementation: STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION
-              }
-            }
-};
-
-function listModes() {
-    let modes = Object.getOwnPropertyNames(_modes);
-    for (let i = 0; i < modes.length; i++)
-        print(modes[i]);
-}
-
-const SessionMode = new Lang.Class({
-    Name: 'SessionMode',
-
-    _init: function() {
-        let params = _modes[global.session_mode];
-
-        params = Params.parse(params, _modes[DEFAULT_MODE]);
-
-        this._createSession = params.createSession;
-        delete params.createSession;
-
-        Lang.copyProperties(params, this);
-    },
-
-    createSession: function() {
-        if (this._createSession)
-            this._createSession();
-    }
-});
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -7,7 +7,6 @@ const Shell = imports.gi.Shell;

 const Config = imports.misc.config;
 const ExtensionSystem = imports.ui.extensionSystem;
-const ExtensionDownloader = imports.ui.extensionDownloader;
 const ExtensionUtils = imports.misc.extensionUtils;
 const Flashspot = imports.ui.flashspot;
 const Main = imports.ui.main;
@@ -57,8 +56,15 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
    <arg type="i" direction="in" name="width"/>
    <arg type="i" direction="in" name="height"/>
 </method>
+<method name="EnableExtension">
+    <arg type="s" direction="in" name="uuid"/>
+</method>
+<method name="DisableExtension">
+    <arg type="s" direction="in" name="uuid"/>
+</method>
 <method name="InstallRemoteExtension">
    <arg type="s" direction="in" name="uuid"/>
+    <arg type="s" direction="in" name="version"/>
 </method>
 <method name="UninstallExtension">
    <arg type="s" direction="in" name="uuid"/>
@@ -67,9 +73,6 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
 <method name="LaunchExtensionPrefs">
    <arg type="s" direction="in" name="uuid"/>
 </method>
-<method name="ReloadExtension">
-    <arg type="s" direction="in" name="uuid"/>
-</method>
 <property name="OverviewActive" type="b" access="readwrite" />
 <property name="ApiVersion" type="i" access="read" />
 <property name="ShellVersion" type="s" access="read" />
@@ -257,12 +260,26 @@ const GnomeShell = new Lang.Class({
        return extension.errors;
    },

-    InstallRemoteExtension: function(uuid) {
-        ExtensionDownloader.installExtensionFromUUID(uuid);
+    EnableExtension: function(uuid) {
+        let enabledExtensions = global.settings.get_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY);
+        if (enabledExtensions.indexOf(uuid) == -1)
+            enabledExtensions.push(uuid);
+        global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions);
+    },
+
+    DisableExtension: function(uuid) {
+        let enabledExtensions = global.settings.get_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY);
+        while (enabledExtensions.indexOf(uuid) != -1)
+            enabledExtensions.splice(enabledExtensions.indexOf(uuid), 1);
+        global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions);
+    },
+
+    InstallRemoteExtension: function(uuid, version_tag) {
+        ExtensionSystem.installExtensionFromUUID(uuid, version_tag);
    },

    UninstallExtension: function(uuid) {
-        return ExtensionDownloader.uninstallExtensionFromUUID(uuid);
+        return ExtensionSystem.uninstallExtensionFromUUID(uuid);
    },

    LaunchExtensionPrefs: function(uuid) {
@@ -272,11 +289,6 @@ const GnomeShell = new Lang.Class({
                   ['extension:///' + uuid], -1, null);
    },

-    ReloadExtension: function(uuid) {
-        ExtensionSystem.unloadExtension(uuid);
-        ExtensionSystem.loadExtension(uuid);
-    },
-
    get OverviewActive() {
        return Main.overview.visible;
    },
@@ -288,6 +300,8 @@ const GnomeShell = new Lang.Class({
            Main.overview.hide();
    },

+    ApiVersion: ExtensionSystem.API_VERSION,
+
    ShellVersion: Config.PACKAGE_VERSION,

    _extensionStateChanged: function(_, newState) {
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -1,21 +1,17 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const Pango = imports.gi.Pango;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;

-const CheckBox = imports.ui.checkBox;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const ModalDialog = imports.ui.modalDialog;
 const Params = imports.misc.params;
-const ShellEntry = imports.ui.shellEntry;

 const LIST_ITEM_ICON_SIZE = 48;

@@ -100,11 +96,11 @@ const ShellMountOperation = new Lang.Class({
    Name: 'ShellMountOperation',

    _init: function(source, params) {
-        params = Params.parse(params, { existingDialog: null });
+        params = Params.parse(params, { reaskPassword: false });
+
+        this._reaskPassword = params.reaskPassword;

        this._dialog = null;
-        this._dialogId = 0;
-        this._existingDialog = params.existingDialog;
        this._processesDialog = null;

        this.mountOp = new Shell.MountOperation();
@@ -116,73 +112,59 @@ const ShellMountOperation = new Lang.Class({
        this.mountOp.connect('show-processes-2',
                             Lang.bind(this, this._onShowProcesses2));
        this.mountOp.connect('aborted',
-                             Lang.bind(this, this.close));
+                             Lang.bind(this, this._onAborted));

        this._gicon = source.get_icon();
    },

-    _closeExistingDialog: function() {
-        if (!this._existingDialog)
-            return;
-
-        this._existingDialog.close();
-        this._existingDialog = null;
-    },
-
    _onAskQuestion: function(op, message, choices) {
-        this._closeExistingDialog();
        this._dialog = new ShellMountQuestionDialog(this._gicon);

-        this._dialogId = this._dialog.connect('response', Lang.bind(this,
-            function(object, choice) {
-                this.mountOp.set_choice(choice);
-                this.mountOp.reply(Gio.MountOperationResult.HANDLED);
+        this._dialog.connect('response',
+                               Lang.bind(this, function(object, choice) {
+                                   this.mountOp.set_choice(choice);
+                                   this.mountOp.reply(Gio.MountOperationResult.HANDLED);

-                this.close();
-            }));
+                                   this._dialog.close(global.get_current_time());
+                                   this._dialog = null;
+                               }));

        this._dialog.update(message, choices);
-        this._dialog.open();
+        this._dialog.open(global.get_current_time());
    },

-    _onAskPassword: function(op, message, defaultUser, defaultDomain, flags) {
-        if (this._existingDialog) {
-            this._dialog = this._existingDialog;
-            this._dialog.reaskPassword();
-        } else {
-            this._dialog = new ShellMountPasswordDialog(message, this._gicon, flags);
-        }
+    _onAskPassword: function(op, message) {
+        this._notificationShowing = true;
+        this._source = new ShellMountPasswordSource(message, this._gicon, this._reaskPassword);

-        this._dialogId = this._dialog.connect('response', Lang.bind(this,
-            function(object, choice, password, remember) {
-                if (choice == -1) {
-                    this.mountOp.reply(Gio.MountOperationResult.ABORTED);
-                } else {
-                    if (remember)
-                        this.mountOp.set_password_save(Gio.PasswordSave.PERMANENTLY);
-                    else
-                        this.mountOp.set_password_save(Gio.PasswordSave.NEVER);
+        this._source.connect('password-ready',
+                             Lang.bind(this, function(source, password) {
+                                 this.mountOp.set_password(password);
+                                 this.mountOp.reply(Gio.MountOperationResult.HANDLED);

-                    this.mountOp.set_password(password);
-                    this.mountOp.reply(Gio.MountOperationResult.HANDLED);
-                }
-            }));
-        this._dialog.open();
+                                 this._notificationShowing = false;
+                                 this._source.destroy();
+                             }));
+
+        this._source.connect('destroy',
+                             Lang.bind(this, function() {
+                                 if (!this._notificationShowing)
+                                     return;
+
+                                 this._notificationShowing = false;
+                                 this.mountOp.reply(Gio.MountOperationResult.ABORTED);
+                             }));
    },

-    close: function(op) {
-        this._closeExistingDialog();
-        this._processesDialog = null;
+    _onAborted: function(op) {
+        if (!this._dialog)
+            return;

-        if (this._dialog) {
-            this._dialog.close();
-            this._dialog = null;
-        }
+        this._dialog.close(global.get_current_time());
+        this._dialog = null;
    },

    _onShowProcesses2: function(op) {
-        this._closeExistingDialog();
-
        let processes = op.get_show_processes_pids();
        let choices = op.get_show_processes_choices();
        let message = op.get_show_processes_message();
@@ -191,31 +173,23 @@ const ShellMountOperation = new Lang.Class({
            this._processesDialog = new ShellProcessesDialog(this._gicon);
            this._dialog = this._processesDialog;

-            this._dialogId = this._processesDialog.connect('response', Lang.bind(this,
-                function(object, choice) {
-                    if (choice == -1) {
-                        this.mountOp.reply(Gio.MountOperationResult.ABORTED);
-                    } else {
-                        this.mountOp.set_choice(choice);
-                        this.mountOp.reply(Gio.MountOperationResult.HANDLED);
-                    }
+            this._processesDialog.connect('response', 
+                                          Lang.bind(this, function(object, choice) {
+                                              if (choice == -1) {
+                                                  this.mountOp.reply(Gio.MountOperationResult.ABORTED);
+                                              } else {
+                                                  this.mountOp.set_choice(choice);
+                                                  this.mountOp.reply(Gio.MountOperationResult.HANDLED);
+                                              }

-                    this.close();
-                }));
-            this._processesDialog.open();
+                                              this._processesDialog.close(global.get_current_time());
+                                              this._dialog = null;
+                                          }));
+            this._processesDialog.open(global.get_current_time());
        }

        this._processesDialog.update(message, processes, choices);
    },
-
-    borrowDialog: function() {
-        if (this._dialogId != 0) {
-            this._dialog.disconnect(this._dialogId);
-            this._dialogId = 0;
-        }
-
-        return this._dialog;
-    }
 });

 const ShellMountQuestionDialog = new Lang.Class({
@@ -264,107 +238,67 @@ const ShellMountQuestionDialog = new Lang.Class({
 });
 Signals.addSignalMethods(ShellMountQuestionDialog.prototype);

-const ShellMountPasswordDialog = new Lang.Class({
-    Name: 'ShellMountPasswordDialog',
-    Extends: ModalDialog.ModalDialog,
+const ShellMountPasswordSource = new Lang.Class({
+    Name: 'ShellMountPasswordSource',
+    Extends: MessageTray.Source,
+
+    _init: function(message, gicon, reaskPassword) {
+        this._gicon = gicon;

-    _init: function(message, gicon, flags) {
        let strings = message.split('\n');
-        this.parent({ styleClass: 'prompt-dialog' });
+        this.parent(strings[0]);
+        this._notification = new ShellMountPasswordNotification(this, strings, reaskPassword);

-        let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
-                                                vertical: false });
-        this.contentLayout.add(mainContentBox);
+        // add ourselves as a source, and popup the notification
+        Main.messageTray.add(this);
+        this.notify(this._notification);
+    },

-        let icon = _createIcon(gicon);
-        mainContentBox.add(icon,
-                           { x_fill:  true,
-                             y_fill:  false,
-                             x_align: St.Align.END,
-                             y_align: St.Align.START });
+    createNotificationIcon: function() {
+        return _createIcon(this._gicon);
+    },
+});
+Signals.addSignalMethods(ShellMountPasswordSource.prototype);

-        this._messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
-                                              vertical: true });
-        mainContentBox.add(this._messageBox,
-                           { y_align: St.Align.START, expand: true, x_fill: true, y_fill: true });
+const ShellMountPasswordNotification = new Lang.Class({
+    Name: 'ShellMountPasswordNotification',
+    Extends: MessageTray.Notification,

-        let subject = new St.Label({ style_class: 'prompt-dialog-headline' });
-        this._messageBox.add(subject,
-                             { y_fill:  false,
-                               y_align: St.Align.START });
-        if (strings[0])
-            subject.set_text(strings[0]);
+    _init: function(source, strings, reaskPassword) {
+        this.parent(source, strings[0], null, { customContent: true });
+
+        // set the notification to transient and urgent, so that it
+        // expands out
+        this.setTransient(true);
+        this.setUrgency(MessageTray.Urgency.CRITICAL);

-        let description = new St.Label({ style_class: 'prompt-dialog-description' });
-        description.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        description.clutter_text.line_wrap = true;
-        this._messageBox.add(description,
-                            { y_fill:  true,
-                              y_align: St.Align.START });
        if (strings[1])
-            description.set_text(strings[1]);
+            this.addBody(strings[1]);

-        this._passwordBox = new St.BoxLayout({ vertical: false });
-        this._messageBox.add(this._passwordBox);
+        if (reaskPassword) {
+            let label = new St.Label({ style_class: 'mount-password-reask',
+                                       text: _("Wrong password, please try again") });

-        this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label',
-                                              text: _("Passphrase") }));
-        this._passwordBox.add(this._passwordLabel);
-
-        this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
-                                             text: "",
-                                             can_focus: true});
-        ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
-        this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivate));
-        this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
-        this._passwordBox.add(this._passwordEntry, {expand: true });
-        this.setInitialKeyFocus(this._passwordEntry);
-
-        this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label',
-                                                 text: _("Sorry, that didn\'t work. Please try again.") });
-        this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._errorMessageLabel.clutter_text.line_wrap = true;
-        this._errorMessageLabel.hide();
-        this._messageBox.add(this._errorMessageLabel);
-
-        if (flags & Gio.AskPasswordFlags.SAVING_SUPPORTED) {
-            this._rememberChoice = new CheckBox.CheckBox();
-            this._rememberChoice.getLabelActor().text = _("Remember Passphrase");
-            this._rememberChoice.actor.checked = true;
-            this._messageBox.add(this._rememberChoice.actor);
-        } else {
-            this._rememberChoice = null;
+            this.addActor(label);
        }

-        let buttons = [{ label: _("Cancel"),
-                         action: Lang.bind(this, this._onCancelButton),
-                         key:    Clutter.Escape
-                       },
-                       { label: _("Unlock"),
-                         action: Lang.bind(this, this._onUnlockButton)
-                       }];
+        this._responseEntry = new St.Entry({ style_class: 'mount-password-entry',
+                                             can_focus: true });
+        this.setActionArea(this._responseEntry);

-        this.setButtons(buttons);
+        this._responseEntry.clutter_text.connect('activate',
+                                                 Lang.bind(this, this._onEntryActivated));
+        this._responseEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
+
+        this._responseEntry.grab_key_focus();
    },

-    reaskPassword: function() {
-        this._passwordEntry.set_text('');
-        this._errorMessageLabel.show();
-    },
+    _onEntryActivated: function() {
+        let text = this._responseEntry.get_text();
+        if (text == '')
+            return;

-    _onCancelButton: function() {
-        this.emit('response', -1, '', false);
-    },
-
-    _onUnlockButton: function() {
-        this._onEntryActivate();
-    },
-
-    _onEntryActivate: function() {
-        this.emit('response', 1,
-            this._passwordEntry.get_text(),
-            this._rememberChoice &&
-            this._rememberChoice.actor.checked);
+        this.source.emit('password-ready', text);
    }
 });

@@ -421,13 +355,13 @@ const ShellProcessesDialog = new Lang.Class({

        this._applicationList.connect('actor-added',
                                      Lang.bind(this, function() {
-                                          if (this._applicationList.get_n_children() == 1)
+                                          if (this._applicationList.get_children().length == 1)
                                              scrollView.show();
                                      }));

        this._applicationList.connect('actor-removed',
                                      Lang.bind(this, function() {
-                                          if (this._applicationList.get_n_children() == 0)
+                                          if (this._applicationList.get_children().length == 0)
                                              scrollView.hide();
                                      }));
    },
@@ -461,253 +395,3 @@ const ShellProcessesDialog = new Lang.Class({
    }
 });
 Signals.addSignalMethods(ShellProcessesDialog.prototype);
-
-const GnomeShellMountOpIface = <interface name="org.Gtk.MountOperationHandler">
-<method name="AskPassword">
-    <arg type="s" direction="in" name="object_id"/>
-    <arg type="s" direction="in" name="message"/>
-    <arg type="s" direction="in" name="icon_name"/>
-    <arg type="s" direction="in" name="default_user"/>
-    <arg type="s" direction="in" name="default_domain"/>
-    <arg type="u" direction="in" name="flags"/>
-    <arg type="u" direction="out" name="response"/>
-    <arg type="a{sv}" direction="out" name="response_details"/>
-</method>
-<method name="AskQuestion">
-    <arg type="s" direction="in" name="object_id"/>
-    <arg type="s" direction="in" name="message"/>
-    <arg type="s" direction="in" name="icon_name"/>
-    <arg type="as" direction="in" name="choices"/>
-    <arg type="u" direction="out" name="response"/>
-    <arg type="a{sv}" direction="out" name="response_details"/>
-</method>
-<method name="ShowProcesses">
-    <arg type="s" direction="in" name="object_id"/>
-    <arg type="s" direction="in" name="message"/>
-    <arg type="s" direction="in" name="icon_name"/>
-    <arg type="ai" direction="in" name="application_pids"/>
-    <arg type="as" direction="in" name="choices"/>
-    <arg type="u" direction="out" name="response"/>
-    <arg type="a{sv}" direction="out" name="response_details"/>
-</method>
-<method name="Close"/>
-</interface>;
-
-const ShellMountOperationType = {
-    NONE: 0,
-    ASK_PASSWORD: 1,
-    ASK_QUESTION: 2,
-    SHOW_PROCESSES: 3
-};
-
-const GnomeShellMountOpHandler = new Lang.Class({
-    Name: 'GnomeShellMountOpHandler',
-
-    _init: function() {
-        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellMountOpIface, this);
-        this._dbusImpl.export(Gio.DBus.session, '/org/gtk/MountOperationHandler');
-        Gio.bus_own_name_on_connection(Gio.DBus.session, 'org.gtk.MountOperationHandler',
-                                       Gio.BusNameOwnerFlags.REPLACE, null, null);
-
-        this._dialog = null;
-        this._volumeMonitor = Gio.VolumeMonitor.get();
-
-        this._ensureEmptyRequest();
-    },
-
-    _ensureEmptyRequest: function() {
-        this._currentId = null;
-        this._currentInvocation = null;
-        this._currentType = ShellMountOperationType.NONE;
-    },
-
-    _clearCurrentRequest: function(response, details) {
-        if (this._currentInvocation) {
-            this._currentInvocation.return_value(
-                GLib.Variant.new('(ua{sv})', [response, details]));
-        }
-
-        this._ensureEmptyRequest();
-    },
-
-    _setCurrentRequest: function(invocation, id, type) {
-        let oldId = this._currentId;
-        let oldType = this._currentType;
-        let requestId = id + '@' + invocation.get_sender();
-
-        this._clearCurrentRequest(Gio.MountOperationResult.UNHANDLED, {});
-
-        this._currentInvocation = invocation;
-        this._currentId = requestId;
-        this._currentType = type;
-
-        if (this._dialog && (oldId == requestId) && (oldType == type))
-            return true;
-
-        return false;
-    },
-
-    _closeDialog: function() {
-        if (this._dialog) {
-            this._dialog.close();
-            this._dialog = null;
-        }
-    },
-
-    _createGIcon: function(iconName) {
-        let realIconName = iconName ? iconName : 'drive-harddisk';
-        return new Gio.ThemedIcon({ name: realIconName,
-                                    use_default_fallbacks: true });
-    },
-
-    /**
-     * AskPassword:
-     * @id: an opaque ID identifying the object for which the operation is requested
-     *      The ID must be unique in the context of the calling process.
-     * @message: the message to display
-     * @icon_name: the name of an icon to display
-     * @default_user: the default username for display
-     * @default_domain: the default domain for display
-     * @flags: a set of GAskPasswordFlags
-     * @response: a GMountOperationResult
-     * @response_details: a dictionary containing the response details as
-     * entered by the user. The dictionary MAY contain the following properties:
-     *   - "password" -> (s): a password to be used to complete the mount operation
-     *   - "password_save" -> (u): a GPasswordSave
-     *
-     * The dialog will stay visible until clients call the Close() method, or
-     * another dialog becomes visible.
-     * Calling AskPassword again for the same id will have the effect to clear
-     * the existing dialog and update it with a message indicating the previous
-     * attempt went wrong.
-     */
-    AskPasswordAsync: function(params, invocation) {
-        let [id, message, iconName, defaultUser, defaultDomain, flags] = params;
-
-        if (this._setCurrentRequest(invocation, id, ShellMountOperationType.ASK_PASSWORD)) {
-            this._dialog.reaskPassword();
-            return;
-        }
-
-        this._closeDialog();
-
-        this._dialog = new ShellMountPasswordDialog(message, this._createGIcon(iconName), flags);
-        this._dialog.connect('response', Lang.bind(this,
-            function(object, choice, password, remember) {
-                let details = {};
-                let response;
-
-                if (choice == -1) {
-                    response = Gio.MountOperationResult.ABORTED;
-                } else {
-                    response = Gio.MountOperationResult.HANDLED;
-
-                    let passSave = remember ? Gio.PasswordSave.PERMANENTLY : Gio.PasswordSave.NEVER;
-                    details['password_save'] = GLib.Variant.new('u', passSave);
-                    details['password'] = GLib.Variant.new('s', password);
-                }
-
-                this._clearCurrentRequest(response, details);
-            }));
-        this._dialog.open();
-    },
-
-    /**
-     * AskQuestion:
-     * @id: an opaque ID identifying the object for which the operation is requested
-     *      The ID must be unique in the context of the calling process.
-     * @message: the message to display
-     * @icon_name: the name of an icon to display
-     * @choices: an array of choice strings
-     * GetResponse:
-     * @response: a GMountOperationResult
-     * @response_details: a dictionary containing the response details as
-     * entered by the user. The dictionary MAY contain the following properties:
-     *   - "choice" -> (i): the chosen answer among the array of strings passed in
-     *
-     * The dialog will stay visible until clients call the Close() method, or
-     * another dialog becomes visible.
-     * Calling AskQuestion again for the same id will have the effect to clear
-     * update the dialog with the new question.
-     */
-    AskQuestionAsync: function(params, invocation) {
-        let [id, message, iconName, choices] = params;
-
-        if (this._setCurrentRequest(invocation, id, ShellMountOperationType.ASK_QUESTION)) {
-            this._dialog.update(message, choices);
-            return;
-        }
-
-        this._closeDialog();
-
-        this._dialog = new ShellMountQuestionDialog(this._createGIcon(iconName), message);
-        this._dialog.connect('response', Lang.bind(this,
-            function(object, choice) {
-                this._clearCurrentRequest(Gio.MountOperationResult.HANDLED,
-                                          { choice: GLib.Variant.new('i', choice) });
-            }));
-
-        this._dialog.update(message, choices);
-        this._dialog.open();
-    },
-
-    /**
-     * ShowProcesses:
-     * @id: an opaque ID identifying the object for which the operation is requested
-     *      The ID must be unique in the context of the calling process.
-     * @message: the message to display
-     * @icon_name: the name of an icon to display
-     * @application_pids: the PIDs of the applications to display
-     * @choices: an array of choice strings
-     * @response: a GMountOperationResult
-     * @response_details: a dictionary containing the response details as
-     * entered by the user. The dictionary MAY contain the following properties:
-     *   - "choice" -> (i): the chosen answer among the array of strings passed in
-     *
-     * The dialog will stay visible until clients call the Close() method, or
-     * another dialog becomes visible.
-     * Calling ShowProcesses again for the same id will have the effect to clear
-     * the existing dialog and update it with the new message and the new list
-     * of processes.
-     */
-    ShowProcessesAsync: function(params, invocation) {
-        let [id, message, iconName, applicationPids, choices] = params;
-
-        if (this._setCurrentRequest(invocation, id, ShellMountOperationType.SHOW_PROCESSES)) {
-            this._dialog.update(message, applicationPids, choices);
-            return;
-        }
-
-        this._closeDialog();
-
-        this._dialog = new ShellProcessesDialog(this._createGIcon(iconName));
-        this._dialog.connect('response', Lang.bind(this,
-            function(object, choice) {
-                let response;
-                let details = {};
-
-                if (choice == -1) {
-                    response = Gio.MountOperationResult.ABORTED;
-                } else {
-                    response = Gio.MountOperationResult.HANDLED;
-                    details['choice'] = GLib.Variant.new('i', choice);
-                }
-
-                this._clearCurrentRequest(response, details);
-            }));
-
-        this._dialog.update(message, applicationPids, choices);
-        this._dialog.open();
-    },
-
-    /**
-     * Close:
-     *
-     * Closes a dialog previously opened by AskPassword, AskQuestion or ShowProcesses.
-     * If no dialog is open, does nothing.
-     */
-    Close: function(params, invocation) {
-        this._clearCurrentRequest(Gio.MountOperationResult.UNHANDLED, {});
-        this._closeDialog();
-    }
-});
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -56,9 +56,9 @@ const ATIndicator = new Lang.Class({
        let textZoom = this._buildFontItem();
        this.menu.addMenuItem(textZoom);

-        let screenReader = this._buildItem(_("Screen Reader"), APPLICATIONS_SCHEMA,
-                                                               'screen-reader-enabled');
-        this.menu.addMenuItem(screenReader);
+//        let screenReader = this._buildItem(_("Screen Reader"), APPLICATIONS_SCHEMA,
+//                                                               'screen-reader-enabled');
+//        this.menu.addMenuItem(screenReader);

        let screenKeyboard = this._buildItem(_("Screen Keyboard"), APPLICATIONS_SCHEMA,
                                                                   'screen-keyboard-enabled');
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -106,7 +106,10 @@ const Indicator = new Lang.Class({
            /* TRANSLATORS: this means that bluetooth was disabled by hardware rfkill */
            this._killswitch.setStatus(_("hardware disabled"));

-        this.actor.visible = has_adapter;
+        if (has_adapter)
+            this.actor.show();
+        else
+            this.actor.hide();

        if (on) {
            this._discoverable.actor.show();
@@ -305,7 +308,7 @@ const Indicator = new Lang.Class({

    _ensureSource: function() {
        if (!this._source) {
-            this._source = new MessageTray.Source(_("Bluetooth"), 'bluetooth-active', St.IconType.SYMBOLIC);
+            this._source = new Source();
            Main.messageTray.add(this._source);
        }
    },
@@ -330,6 +333,35 @@ const Indicator = new Lang.Class({
    }
 });

+const Source = new Lang.Class({
+    Name: 'BluetoothSource',
+    Extends: MessageTray.Source,
+
+    _init: function() {
+        this.parent(_("Bluetooth"));
+
+        this._setSummaryIcon(this.createNotificationIcon());
+    },
+
+    notify: function(notification) {
+        this._private_destroyId = notification.connect('destroy', Lang.bind(this, function(notification) {
+            if (this.notification == notification) {
+                // the destroyed notification is the last for this source
+                this.notification.disconnect(this._private_destroyId);
+                this.destroy();
+            }
+        }));
+
+        this.parent(notification);
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ icon_name: 'bluetooth-active',
+                             icon_type: St.IconType.SYMBOLIC,
+                             icon_size: this.ICON_SIZE });
+    }
+});
+
 const AuthNotification = new Lang.Class({
    Name: 'AuthNotification',
    Extends: MessageTray.Notification,
@@ -380,7 +412,7 @@ const ConfirmNotification = new Lang.Class({
        this._applet = applet;
        this._devicePath = device_path;
        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
-        this.addBody(_("Please confirm whether the PIN '%06d' matches the one on the device.").format(pin));
+        this.addBody(_("Please confirm whether the PIN '%s' matches the one on the device.").format(pin));

        this.addButton('matches', _("Matches"));
        this.addButton('does-not-match', _("Does not match"));
@@ -416,8 +448,7 @@ const PinNotification = new Lang.Class({
        this._entry.connect('key-release-event', Lang.bind(this, function(entry, event) {
            let key = event.get_key_symbol();
            if (key == Clutter.KEY_Return) {
-                if (this._canActivateOkButton())
-                    this.emit('action-invoked', 'ok');
+                this.emit('action-invoked', 'ok');
                return true;
            } else if (key == Clutter.KEY_Escape) {
                this.emit('action-invoked', 'cancel');
@@ -430,12 +461,6 @@ const PinNotification = new Lang.Class({
        this.addButton('ok', _("OK"));
        this.addButton('cancel', _("Cancel"));

-        this.setButtonSensitive('ok', this._canActivateOkButton());
-        this._entry.clutter_text.connect('text-changed', Lang.bind(this,
-            function() {
-                this.setButtonSensitive('ok', this._canActivateOkButton());
-            }));
-
        this.connect('action-invoked', Lang.bind(this, function(self, action) {
            if (action == 'ok') {
                if (this._numeric) {
@@ -458,11 +483,6 @@ const PinNotification = new Lang.Class({
        }));
    },

-    _canActivateOkButton: function() {
-        // PINs have a fixed length of 6
-        return this._entry.clutter_text.text.length == 6;
-    },
-
    grabFocus: function(lockTray) {
        this.parent(lockTray);
        global.stage.set_key_focus(this._entry);
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -2,9 +2,9 @@

 const Clutter = imports.gi.Clutter;
 const GdkPixbuf = imports.gi.GdkPixbuf;
+const Gkbd = imports.gi.Gkbd;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
@@ -14,28 +14,30 @@ const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
 const Util = imports.misc.util;

-const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
-const KEY_CURRENT_INPUT_SOURCE = 'current';
-const KEY_INPUT_SOURCES = 'sources';
-
-const INPUT_SOURCE_TYPE_XKB = 'xkb';
-
 const LayoutMenuItem = new Lang.Class({
    Name: 'LayoutMenuItem',
    Extends: PopupMenu.PopupBaseMenuItem,

-    _init: function(displayName, shortName) {
+    _init: function(config, id, indicator, long_name) {
        this.parent();

-        this.label = new St.Label({ text: displayName });
-        this.indicator = new St.Label({ text: shortName });
+        this._config = config;
+        this._id = id;
+        this.label = new St.Label({ text: long_name });
+        this.indicator = indicator;
        this.addActor(this.label);
        this.addActor(this.indicator);
+    },
+
+    activate: function(event) {
+        this.parent(event);
+
+        this._config.lock_group(this._id);
    }
 });

-const InputSourceIndicator = new Lang.Class({
-    Name: 'InputSourceIndicator',
+const XKBIndicator = new Lang.Class({
+    Name: 'XKBIndicator',
    Extends: PanelMenu.Button,

    _init: function() {
@@ -48,144 +50,122 @@ const InputSourceIndicator = new Lang.Class({
        this.actor.add_actor(this._container);
        this.actor.add_style_class_name('panel-status-button');

-        this._labelActors = {};
-        this._layoutItems = {};
+        this._iconActor = new St.Icon({ icon_name: 'keyboard', icon_type: St.IconType.SYMBOLIC, style_class: 'system-status-icon' });
+        this._container.add_actor(this._iconActor);
+        this._labelActors = [ ];
+        this._layoutItems = [ ];

-        this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA });
-        this._settings.connect('changed::' + KEY_CURRENT_INPUT_SOURCE, Lang.bind(this, this._currentInputSourceChanged));
-        this._settings.connect('changed::' + KEY_INPUT_SOURCES, Lang.bind(this, this._inputSourcesChanged));
+        this._showFlags = false;
+        this._config = Gkbd.Configuration.get();
+        this._config.connect('changed', Lang.bind(this, this._syncConfig));
+        this._config.connect('group-changed', Lang.bind(this, this._syncGroup));
+        this._config.start_listen();

-        this._currentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
-        this._xkbInfo = new GnomeDesktop.XkbInfo();
+        this._syncConfig();

-        this._inputSourcesChanged();
-
-        // re-using "allowSettings" for the keyboard layout is a bit shady,
-        // but at least for now it is used as "allow popping up windows
-        // from shell menus"; we can always add a separate sessionMode
-        // option if need arises.
-        if (Main.sessionMode.allowSettings) {
+        if (global.session_type == Shell.SessionType.USER) {
            this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-            this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, this._showLayout));
+            this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
+                Main.overview.hide();
+                Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
+            }));
        }
        this.menu.addSettingsAction(_("Region and Language Settings"), 'gnome-region-panel.desktop');
    },

-    _currentInputSourceChanged: function() {
-        let nVisibleSources = Object.keys(this._layoutItems).length;
-        if (nVisibleSources < 2)
-            return;
+    _adjustGroupNames: function(names) {
+        // Disambiguate duplicate names with a subscript
+        // This is O(N^2) to avoid sorting names
+        // but N <= 4 so who cares?

-        let nSources = this._settings.get_value(KEY_INPUT_SOURCES).n_children();
-        let newCurrentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
-        if (newCurrentSourceIndex >= nSources)
-            return;
-
-        if (!this._layoutItems[newCurrentSourceIndex]) {
-            // This source index is invalid as we weren't able to
-            // build a menu item for it, so we hide ourselves since we
-            // can't fix it here. *shrug*
-            this.menu.close();
-            this.actor.hide();
-            return;
-        } else {
-            this.actor.show();
+        for (let i = 0; i < names.length; i++) {
+            let name = names[i];
+            let cnt = 0;
+            for (let j = i + 1; j < names.length; j++) {
+                if (names[j] == name) {
+                    cnt++;
+                    // U+2081 SUBSCRIPT ONE
+                    names[j] = name + String.fromCharCode(0x2081 + cnt);
+                }
+            }
+            if (cnt != 0)
+                names[i] = name + '\u2081';
        }

-        if (this._layoutItems[this._currentSourceIndex]) {
-            this._layoutItems[this._currentSourceIndex].setShowDot(false);
-            this._container.set_skip_paint(this._labelActors[this._currentSourceIndex], true);
-        }
-
-        this._layoutItems[newCurrentSourceIndex].setShowDot(true);
-        this._container.set_skip_paint(this._labelActors[newCurrentSourceIndex], false);
-
-        this._currentSourceIndex = newCurrentSourceIndex;
+        return names;
    },

-    _inputSourcesChanged: function() {
-        let sources = this._settings.get_value(KEY_INPUT_SOURCES);
-        let nSources = sources.n_children();
-
-        for (let i in this._layoutItems)
-            this._layoutItems[i].destroy();
-
-        for (let i in this._labelActors)
-            this._labelActors[i].destroy();
-
-        this._layoutItems = {};
-        this._labelActors = {};
-
-        let infos = [];
-        let infosByShortName = {};
-
-        for (let i = 0; i < nSources; i++) {
-            let [type, id] = sources.get_child_value(i).deep_unpack();
-            if (type != INPUT_SOURCE_TYPE_XKB)
-                continue;
-
-            let info = {};
-            [info.exists, info.displayName, info.shortName, , ] =
-                this._xkbInfo.get_layout_info(id);
-
-            if (!info.exists)
-                continue;
-
-            info.sourceIndex = i;
-
-            if (!(info.shortName in infosByShortName))
-                infosByShortName[info.shortName] = [];
-            infosByShortName[info.shortName].push(info);
-            infos.push(info);
+    _syncConfig: function() {
+        this._showFlags = this._config.if_flags_shown();
+        if (this._showFlags) {
+            this._container.set_skip_paint(this._iconActor, false);
+        } else {
+            this._container.set_skip_paint(this._iconActor, true);
        }

-        if (infos.length > 1) {
+        let groups = this._config.get_group_names();
+        if (groups.length > 1) {
            this.actor.show();
        } else {
            this.menu.close();
            this.actor.hide();
        }

-        for (let i = 0; i < infos.length; i++) {
-            let info = infos[i];
-            if (infosByShortName[info.shortName].length > 1) {
-                let sub = infosByShortName[info.shortName].indexOf(info) + 1;
-                info.shortName += String.fromCharCode(0x2080 + sub);
-            }
+        for (let i = 0; i < this._layoutItems.length; i++)
+            this._layoutItems[i].destroy();

-            let item = new LayoutMenuItem(info.displayName, info.shortName);
-            this._layoutItems[info.sourceIndex] = item;
+        for (let i = 0; i < this._labelActors.length; i++)
+            this._labelActors[i].destroy();
+
+        let short_names = this._adjustGroupNames(this._config.get_short_group_names());
+
+        this._selectedLayout = null;
+        this._layoutItems = [ ];
+        this._selectedLabel = null;
+        this._labelActors = [ ];
+        for (let i = 0; i < groups.length; i++) {
+            let icon_name = this._config.get_group_name(i);
+            let actor;
+            if (this._showFlags)
+                actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.SYMBOLIC, style_class: 'popup-menu-icon' });
+            else
+                actor = new St.Label({ text: short_names[i] });
+            let item = new LayoutMenuItem(this._config, i, actor, groups[i]);
+            item._short_group_name = short_names[i];
+            item._icon_name = icon_name;
+            this._layoutItems.push(item);
            this.menu.addMenuItem(item, i);
-            item.connect('activate', Lang.bind(this, function() {
-                this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
-                                         GLib.Variant.new_uint32(info.sourceIndex));
-            }));

-            let shortLabel = new St.Label({ text: info.shortName });
-            this._labelActors[info.sourceIndex] = shortLabel;
+            let shortLabel = new St.Label({ text: short_names[i] });
+            this._labelActors.push(shortLabel);
            this._container.add_actor(shortLabel);
            this._container.set_skip_paint(shortLabel, true);
        }

-        this._currentInputSourceChanged();
+        this._syncGroup();
    },

-    _showLayout: function() {
-        Main.overview.hide();
+    _syncGroup: function() {
+        let selected = this._config.get_current_group();

-        let sources = this._settings.get_value(KEY_INPUT_SOURCES);
-        let current = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
-        let id = sources.get_child_value(current).deep_unpack()[1];
-        let [, , , xkbLayout, xkbVariant] = this._xkbInfo.get_layout_info(id);
+        if (this._selectedLayout) {
+            this._selectedLayout.setShowDot(false);
+            this._selectedLayout = null;
+        }

-        if (!xkbLayout || xkbLayout.length == 0)
-            return;
+        if (this._selectedLabel) {
+            this._container.set_skip_paint(this._selectedLabel, true);
+            this._selectedLabel = null;
+        }

-        let description = xkbLayout;
-        if (xkbVariant.length > 0)
-            description = description + '\t' + xkbVariant;
+        let item = this._layoutItems[selected];
+        item.setShowDot(true);

-        Util.spawn(['gkbd-keyboard-display', '-l', description]);
+        this._iconActor.icon_name = item._icon_name;
+        this._selectedLabel = this._labelActors[selected];
+        this._container.set_skip_paint(this._selectedLabel, this._showFlags);
+
+        this._selectedLayout = item;
    },

    _containerGetPreferredWidth: function(container, for_height, alloc) {
@@ -193,11 +173,15 @@ const InputSourceIndicator = new Lang.Class({
        // for the height of all children, but we ignore the results
        // for those we don't actually display.
        let max_min_width = 0, max_natural_width = 0;
+        if (this._showFlags)
+            [max_min_width, max_natural_width] = this._iconActor.get_preferred_width(for_height);

-        for (let i in this._labelActors) {
+        for (let i = 0; i < this._labelActors.length; i++) {
            let [min_width, natural_width] = this._labelActors[i].get_preferred_width(for_height);
-            max_min_width = Math.max(max_min_width, min_width);
-            max_natural_width = Math.max(max_natural_width, natural_width);
+            if (!this._showFlags) {
+                max_min_width = Math.max(max_min_width, min_width);
+                max_natural_width = Math.max(max_natural_width, natural_width);
+            }
        }

        alloc.min_size = max_min_width;
@@ -206,11 +190,15 @@ const InputSourceIndicator = new Lang.Class({

    _containerGetPreferredHeight: function(container, for_width, alloc) {
        let max_min_height = 0, max_natural_height = 0;
-
-        for (let i in this._labelActors) {
+        if (this._showFlags)
+            [max_min_height, max_natural_height] = this._iconActor.get_preferred_height(for_width);
+        
+        for (let i = 0; i < this._labelActors.length; i++) {
            let [min_height, natural_height] = this._labelActors[i].get_preferred_height(for_width);
-            max_min_height = Math.max(max_min_height, min_height);
-            max_natural_height = Math.max(max_natural_height, natural_height);
+            if (!this._showFlags) {
+                max_min_height = Math.max(max_min_height, min_height);
+                max_natural_height = Math.max(max_natural_height, natural_height);
+            }
        }

        alloc.min_size = max_min_height;
@@ -224,7 +212,8 @@ const InputSourceIndicator = new Lang.Class({
        box.y2 -= box.y1;
        box.y1 = 0;

-        for (let i in this._labelActors)
+        this._iconActor.allocate_align_fill(box, 0.5, 0, false, false, flags);
+        for (let i = 0; i < this._labelActors.length; i++)
            this._labelActors[i].allocate_align_fill(box, 0.5, 0, false, false, flags);
    }
 });
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -101,10 +101,11 @@ const NMNetworkMenuItem = new Lang.Class({
    Name: 'NMNetworkMenuItem',
    Extends: PopupMenu.PopupBaseMenuItem,

-    _init: function(bestAP, title, params) {
+    _init: function(accessPoints, title, params) {
        this.parent(params);

-        this.bestAP = bestAP;
+        accessPoints = sortAccessPoints(accessPoints);
+        this.bestAP = accessPoints[0];

        if (!title) {
            let ssid = this.bestAP.get_ssid();
@@ -126,10 +127,24 @@ const NMNetworkMenuItem = new Lang.Class({
            this.bestAP._secType != NMAccessPointSecurity.NONE)
            this._secureIcon.icon_name = 'network-wireless-encrypted';
        this._icons.add_actor(this._secureIcon);
+
+        this._accessPoints = [ ];
+        for (let i = 0; i < accessPoints.length; i++) {
+            let ap = accessPoints[i];
+            // need a wrapper object here, because the access points can be shared
+            // between many NMNetworkMenuItems
+            let apObj = {
+                ap: ap,
+                updateId: ap.connect('notify::strength', Lang.bind(this, this._updated))
+            };
+            this._accessPoints.push(apObj);
+        }
    },

-    updateBestAP: function(ap) {
-        this.bestAP = ap;
+    _updated: function(ap) {
+        if (ap.strength > this.bestAP.strength)
+            this.bestAP = ap;
+
        this._signalIcon.icon_name = this._getIcon();
    },

@@ -138,6 +153,36 @@ const NMNetworkMenuItem = new Lang.Class({
            return 'network-workgroup';
        else
            return 'network-wireless-signal-' + signalToIcon(this.bestAP.strength);
+    },
+
+    updateAccessPoints: function(accessPoints) {
+        for (let i = 0; i < this._accessPoints.length; i++) {
+            let apObj = this._accessPoints[i];
+            apObj.ap.disconnect(apObj.updateId);
+            apObj.updateId = 0;
+        }
+
+        accessPoints = sortAccessPoints(accessPoints);
+        this.bestAP = accessPoints[0];
+        this._accessPoints = [ ];
+        for (let i = 0; i < accessPoints; i++) {
+            let ap = accessPoints[i];
+            let apObj = {
+                ap: ap,
+                updateId: ap.connect('notify::strength', Lang.bind(this, this._updated))
+            };
+            this._accessPoints.push(apObj);
+        }
+    },
+
+    destroy: function() {
+        for (let i = 0; i < this._accessPoints.length; i++) {
+            let apObj = this._accessPoints[i];
+            apObj.ap.disconnect(apObj.updateId);
+            apObj.updateId = 0;
+        }
+
+        this.parent();
    }
 });

@@ -252,17 +297,16 @@ const NMDevice = new Lang.Class({
        this._client = client;
        this._connections = [ ];
        for (let i = 0; i < connections.length; i++) {
-            if (!connections[i].get_uuid())
+            if (!connections[i]._uuid)
                continue;
            if (!this.connectionValid(connections[i]))
                continue;
            // record the connection
            let obj = {
                connection: connections[i],
-                name: connections[i].get_id(),
-                uuid: connections[i].get_uuid(),
+                name: connections[i]._name,
+                uuid: connections[i]._uuid,
                timestamp: connections[i]._timestamp,
-                item: null,
            };
            this._connections.push(obj);
        }
@@ -357,46 +401,48 @@ const NMDevice = new Lang.Class({
    },

    checkConnection: function(connection) {
-        let pos = this._findConnection(connection.get_uuid());
+        let pos = this._findConnection(connection._uuid);
        let exists = pos != -1;
        let valid = this.connectionValid(connection);
-        let similar = false;
-        if (exists) {
-            let existing = this._connections[pos];

-            // Check if connection changed name or id
-            similar = existing.name == connection.get_id() &&
-                existing.timestamp == connection._timestamp;
-        }
-
-        if (exists && valid && similar) {
-            // Nothing to do
-            return;
-        }
-
-        if (exists)
+        if (exists && !valid)
            this.removeConnection(connection);
-        if (valid)
+        else if (!exists && valid)
            this.addConnection(connection);
+        else if (exists && valid) {
+            // propagate changes and update the UI
+
+            if (this._connections[pos].timestamp != connection._timestamp) {
+                this._connections[pos].timestamp = connection._timestamp;
+                this._connections.sort(this._connectionSortFunction);
+
+                this._clearSection();
+                this._queueCreateSection();
+            }
+        }
    },

    addConnection: function(connection) {
        // record the connection
        let obj = {
            connection: connection,
-            name: connection.get_id(),
-            uuid: connection.get_uuid(),
+            name: connection._name,
+            uuid: connection._uuid,
            timestamp: connection._timestamp,
-            item: null,
        };
-        Util.insertSorted(this._connections, obj, this._connectionSortFunction);
+        this._connections.push(obj);
+        this._connections.sort(this._connectionSortFunction);

        this._clearSection();
        this._queueCreateSection();
    },

    removeConnection: function(connection) {
-        let pos = this._findConnection(connection.get_uuid());
+        if (!connection._uuid) {
+            log('Cannot remove a connection without an UUID');
+            return;
+        }
+        let pos = this._findConnection(connection._uuid);
        if (pos == -1) {
            // this connection was never added, nothing to do here
            return;
@@ -568,7 +614,7 @@ const NMDevice = new Lang.Class({
        let title;
        let active = this._activeConnection._connection;
        if (active) {
-            title = active.get_id();
+            title = active._name;
        } else {
            /* TRANSLATORS: this is the indication that a connection for another logged in user is active,
               and we cannot access its settings (including the name) */
@@ -661,15 +707,18 @@ const NMDeviceWired = new Lang.Class({
        // the device
        // we can do it here because addConnection and removeConnection
        // both call _createSection at some point
-        this.section.actor.visible = this._connections.length > 1;
+        if (this._connections.length <= 1)
+            this.section.actor.hide();
+        else
+            this.section.actor.show();
    },

    _createAutomaticConnection: function() {
        let connection = new NetworkManager.Connection();
-        let uuid = NetworkManager.utils_uuid_generate();
+        connection._uuid = NetworkManager.utils_uuid_generate();
        connection.add_setting(new NetworkManager.SettingWired());
        connection.add_setting(new NetworkManager.SettingConnection({
-            uuid: uuid,
+            uuid: connection._uuid,
            id: this._autoConnectionName,
            type: NetworkManager.SETTING_WIRED_SETTING_NAME,
            autoconnect: true
@@ -813,10 +862,10 @@ const NMDeviceBluetooth = new Lang.Class({

    _createAutomaticConnection: function() {
        let connection = new NetworkManager.Connection;
-        let uuid = NetworkManager.utils_uuid_generate();
+        connection._uuid = NetworkManager.utils_uuid_generate();
        connection.add_setting(new NetworkManager.SettingBluetooth);
        connection.add_setting(new NetworkManager.SettingConnection({
-            uuid: uuid,
+            uuid: connection._uuid,
            id: this._autoConnectionName,
            type: NetworkManager.SETTING_BLUETOOTH_SETTING_NAME,
            autoconnect: false
@@ -851,12 +900,12 @@ const NMDeviceVPN = new Lang.Class({
    Name: 'NMDeviceVPN',
    Extends: NMDevice,

-    _init: function(client, device, connections) {
+    _init: function(client) {
        // Disable autoconnections
        this._autoConnectionName = null;
        this.category = NMConnectionCategory.VPN;

-        this.parent(client, null, connections);
+        this.parent(client, null, [ ]);
    },

    connectionValid: function(connection) {
@@ -868,24 +917,13 @@ const NMDeviceVPN = new Lang.Class({
    },

    get connected() {
-        if (!this._activeConnection)
-            return false;
-
-        return this._activeConnection.vpn_state == NetworkManager.VPNConnectionState.ACTIVATED;
+        return !!this._activeConnection;
    },

    setActiveConnection: function(activeConnection) {
-        if (this._stateChangeId)
-            this._activeConnection.disconnect(this._stateChangeId);
-        this._stateChangeId = 0;
-
        this.parent(activeConnection);

-        if (this._activeConnection)
-            this._stateChangeId = this._activeConnection.connect('vpn-state-changed',
-                                                                 Lang.bind(this, this._connectionStateChanged));
-
-        this.emit('state-changed');
+        this.emit('active-connection-changed');
    },

    _shouldShowConnectionList: function() {
@@ -898,39 +936,7 @@ const NMDeviceVPN = new Lang.Class({
    },

    getStatusLabel: function() {
-        if (!this._activeConnection) // Same as DISCONNECTED
-            return null;
-
-        switch(this._activeConnection.vpn_state) {
-        case NetworkManager.VPNConnectionState.DISCONNECTED:
-        case NetworkManager.VPNConnectionState.ACTIVATED:
-            return null;
-        case NetworkManager.VPNConnectionState.PREPARE:
-        case NetworkManager.VPNConnectionState.CONNECT:
-        case NetworkManager.VPNConnectionState.IP_CONFIG_GET:
-            return _("connecting...");
-        case NetworkManager.VPNConnectionState.NEED_AUTH:
-            /* Translators: this is for network connections that require some kind of key or password */
-            return _("authentication required");
-        case NetworkManager.VPNConnectionState.FAILED:
-            return _("connection failed");
-        default:
-            log('VPN connection state invalid, is %d'.format(this.device.state));
-            return 'invalid';
-        }
-    },
-
-    _connectionStateChanged: function(connection, newstate, reason) {
-        if (newstate == NetworkManager.VPNConnectionState.FAILED) {
-            // FIXME: if we ever want to show something based on reason,
-            // we need to convert from NetworkManager.VPNConnectionStateReason
-            // to NetworkManager.DeviceStateReason
-            this.emit('activation-failed', reason);
-        }
-
-        // Differently from real NMDevices, there is no need to queue
-        // an update of the menu section, contents wouldn't change anyway
-        this.emit('state-changed');
+        return null;
    }
 });

@@ -981,7 +987,6 @@ const NMDeviceWireless = new Lang.Class({
                obj.ssidText = ssidToLabel(obj.ssid);
                this._networks.push(obj);
            }
-            ap._updateId = ap.connect('notify::strength', Lang.bind(this, this._onApStrengthChanged));

            // Check if some connection is valid for this AP
            for (let j = 0; j < validConnections.length; j++) {
@@ -993,10 +998,6 @@ const NMDeviceWireless = new Lang.Class({
            }
        }

-        // Sort APs within each network by strength
-        for (let i = 0; i < this._networks.length; i++)
-            sortAccessPoints(this._networks[i].accessPoints);
-
        if (this.device.active_access_point) {
            let networkPos = this._findNetwork(this.device.active_access_point);

@@ -1037,8 +1038,13 @@ const NMDeviceWireless = new Lang.Class({
    },

    setEnabled: function(enabled) {
-        this.statusItem.actor.visible = enabled;
-        this.section.actor.visible = enabled;
+        if (enabled) {
+            this.statusItem.actor.show();
+            this.section.actor.show();
+        } else {
+            this.statusItem.actor.hide();
+            this.section.actor.hide();
+        }
    },

    activate: function() {
@@ -1079,7 +1085,7 @@ const NMDeviceWireless = new Lang.Class({
        // the user toggles the switch and has more than one wireless device)
        if (this._networks.length > 0) {
            let connection = this._createAutomaticConnection(this._networks[0]);
-            let accessPoints = this._networks[0].accessPoints;
+            let accessPoints = sortAccessPoints(this._networks[0].accessPoints);
            this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null);
        }
    },
@@ -1149,13 +1155,6 @@ const NMDeviceWireless = new Lang.Class({
        else if (!oneHasConnection && twoHasConnection)
            return 1;

-        let oneStrength = one.accessPoints[0].strength;
-        let twoStrength = two.accessPoints[0].strength;
-
-        // place stronger connections first
-        if (oneStrength != twoStrength)
-            return oneStrength < twoStrength ? 1 : -1;
-
        let oneHasSecurity = one.security != NMAccessPointSecurity.NONE;
        let twoHasSecurity = two.security != NMAccessPointSecurity.NONE;

@@ -1205,28 +1204,6 @@ const NMDeviceWireless = new Lang.Class({
        return -1;
    },

-    _onApStrengthChanged: function(ap) {
-        let res = this._findExistingNetwork(ap);
-        if (res == null) {
-            // Uhm... stale signal?
-            return;
-        }
-
-        let network = this._networks[res.network];
-        network.accessPoints.splice(res.ap, 1);
-        Util.insertSorted(network.accessPoints, ap, function(one, two) {
-            return two.strength - one.strength;
-        });
-
-        this._networks.splice(res.network, 1);
-        let newPos = Util.insertSorted(this._networks, network, Lang.bind(this, this._networkSortFunction));
-
-        if (newPos != res.network) {
-            this._clearSection();
-            this._queueCreateSection();
-        }
-    },
-
    _accessPointAdded: function(device, accessPoint) {
        if (accessPoint.get_ssid() == null) {
            // This access point is not visible yet
@@ -1246,11 +1223,9 @@ const NMDeviceWireless = new Lang.Class({
                return;
            }

-            Util.insertSorted(apObj.accessPoints, accessPoint, function(one, two) {
-                return two.strength - one.strength;
-            });
+            apObj.accessPoints.push(accessPoint);
            if (apObj.item)
-                apObj.item.updateBestAP(apObj.accessPoints[0]);
+                apObj.item.updateAccessPoints(apObj.accessPoints);
        } else {
            apObj = { ssid: accessPoint.get_ssid(),
                      mode: accessPoint.mode,
@@ -1261,7 +1236,6 @@ const NMDeviceWireless = new Lang.Class({
                    };
            apObj.ssidText = ssidToLabel(apObj.ssid);
        }
-        accessPoint._updateId = accessPoint.connect('notify::strength', Lang.bind(this, this._onApStrengthChanged));

        // check if this enables new connections for this group
        for (let i = 0; i < this._connections.length; i++) {
@@ -1269,26 +1243,23 @@ const NMDeviceWireless = new Lang.Class({
            if (accessPoint.connection_valid(connection) &&
                apObj.connections.indexOf(connection) == -1) {
                apObj.connections.push(connection);
+
+                // this potentially changes the order
+                needsupdate = true;
            }
        }

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

-        // Queue an update of the UI if we changed the order
-        if (newPos != pos) {
            this._clearSection();
            this._queueCreateSection();
        }
    },

    _accessPointRemoved: function(device, accessPoint) {
-        if (accessPoint._updateId) {
-            accessPoint.disconnect(accessPoint._updateId);
-            accessPoint._updateId = 0;
-        }
-
        let res = this._findExistingNetwork(accessPoint);

        if (res == null) {
@@ -1330,30 +1301,17 @@ const NMDeviceWireless = new Lang.Class({
                    this._overflowItem = null;
                }
            }
-
            this._networks.splice(res.network, 1);
-        } else {
-            let okPrev = true, okNext = true;

-            if (res.network > 0)
-                okPrev = this._networkSortFunction(this._networks[res.network - 1], apObj) >= 0;
-            if (res.network < this._networks.length-1)
-                okNext = this._networkSortFunction(this._networks[res.network + 1], apObj) <= 0;
-
-            if (!okPrev || !okNext) {
-                this._clearSection();
-                this._queueCreateSection();
-            } else if (apObj.item) {
-                apObj.item.updateBestAP(apObj.accessPoints[0]);
-            }
-        }
+        } else if (apObj.item)
+            apObj.item.updateAccessPoints(apObj.accessPoints);
    },

    _createAPItem: function(connection, accessPointObj, useConnectionName) {
-        let item = new NMNetworkMenuItem(accessPointObj.accessPoints[0], useConnectionName ? connection.get_id() : undefined);
+        let item = new NMNetworkMenuItem(accessPointObj.accessPoints, useConnectionName ? connection._name : undefined);
        item._connection = connection;
        item.connect('activate', Lang.bind(this, function() {
-            let accessPoints = accessPointObj.accessPoints;
+            let accessPoints = sortAccessPoints(accessPointObj.accessPoints);
            for (let i = 0; i < accessPoints.length; i++) {
                if (accessPoints[i].connection_valid(connection)) {
                    this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
@@ -1373,7 +1331,9 @@ const NMDeviceWireless = new Lang.Class({
    },

    removeConnection: function(connection) {
-        let pos = this._findConnection(connection.get_uuid());
+        if (!connection._uuid)
+            return;
+        let pos = this._findConnection(connection._uuid);
        if (pos == -1) {
            // removing connection that was never added
            return;
@@ -1387,7 +1347,7 @@ const NMDeviceWireless = new Lang.Class({
            let apObj = this._networks[i];
            let connections = apObj.connections;
            for (let k = 0; k < connections.length; k++) {
-                if (connections[k].get_uuid() == connection.get_uuid()) {
+                if (connections[k]._uuid == connection._uuid) {
                    // remove the connection from the access point group
                    connections.splice(k);
                    forceupdate = forceupdate || connections.length == 0;
@@ -1403,7 +1363,7 @@ const NMDeviceWireless = new Lang.Class({
                                forceupdate = true;
                            } else {
                                for (let j = 0; j < items.length; j++) {
-                                    if (items[j]._connection.get_uuid() == connection.get_uuid()) {
+                                    if (items[j]._connection._uuid == connection._uuid) {
                                        items[j].destroy();
                                        break;
                                    }
@@ -1430,8 +1390,8 @@ const NMDeviceWireless = new Lang.Class({
        // record the connection
        let obj = {
            connection: connection,
-            name: connection.get_id(),
-            uuid: connection.get_uuid(),
+            name: connection._name,
+            uuid: connection._uuid,
        };
        this._connections.push(obj);

@@ -1460,19 +1420,27 @@ const NMDeviceWireless = new Lang.Class({
    },

    _createActiveConnectionItem: function() {
-        let title;
-        if (this._activeConnection && this._activeConnection._connection)
-            title = this._activeConnection._connection.get_id();
-        else
-            title = _("Connected (private)");
-
-        if (this._activeNetwork)
-            this._activeConnectionItem = new NMNetworkMenuItem(this.device.active_access_point, undefined,
-                                                               { reactive: false });
-        else
-            this._activeConnectionItem = new PopupMenu.PopupImageMenuItem(title,
-                                                                          'network-wireless-connected',
-                                                                          { reactive: false });
+        let icon, title;
+        if (this._activeConnection && this._activeConnection._connection) {
+            let connection = this._activeConnection._connection;
+            if (this._activeNetwork)
+                this._activeConnectionItem = new NMNetworkMenuItem(this._activeNetwork.accessPoints, undefined,
+                                                                   { reactive: false });
+            else
+                this._activeConnectionItem = new PopupMenu.PopupImageMenuItem(connection._name,
+                                                                              'network-wireless-connected',
+                                                                              { reactive: false });
+        } else {
+            // We cannot read the connection (due to ACL, or API incompatibility), but we still show signal if we have it
+            let menuItem;
+            if (this._activeNetwork)
+                this._activeConnectionItem = new NMNetworkMenuItem(this._activeNetwork.accessPoints, undefined,
+                                                                   { reactive: false });
+            else
+                this._activeConnectionItem = new PopupMenu.PopupImageMenuItem(_("Connected (private)"),
+                                                                              'network-wireless-connected',
+                                                                              { reactive: false });
+        }
        this._activeConnectionItem.setShowDot(true);
    },

@@ -1512,9 +1480,9 @@ const NMDeviceWireless = new Lang.Class({
                    apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true));
            }
        } else {
-            apObj.item = new NMNetworkMenuItem(apObj.accessPoints[0]);
+            apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
            apObj.item.connect('activate', Lang.bind(this, function() {
-                let accessPoints = apObj.accessPoints;
+                let accessPoints = sortAccessPoints(apObj.accessPoints);
                if (   (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)
                    || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
                    // 802.1x-enabled APs require further configuration, so they're
@@ -1567,25 +1535,10 @@ const NMDeviceWireless = new Lang.Class({

 const NMApplet = new Lang.Class({
    Name: 'NMApplet',
-    Extends: PanelMenu.Button,
+    Extends: PanelMenu.SystemStatusButton,

    _init: function() {
-        this.parent(0.0, _('Network'));
-
-        this._box = new St.BoxLayout({ name: 'networkMenu' });
-        this.actor.add_actor (this._box);
-        this.actor.add_style_class_name('panel-status-button');
-
-        this._primaryIcon = new St.Icon({ icon_name: 'network-offline',
-                                          icon_type: St.IconType.SYMBOLIC,
-                                          style_class: 'system-status-icon' });
-        this._box.add_actor(this._primaryIcon);
-
-        this._secondaryIcon = new St.Icon({ icon_name: 'network-vpn',
-                                            icon_type: St.IconType.SYMBOLIC,
-                                            style_class: 'system-status-icon',
-                                            visible: false });
-        this._box.add_actor(this._secondaryIcon);
+        this.parent('network-error', _("Network"));

        this._client = NMClient.Client.new();

@@ -1599,16 +1552,6 @@ const NMApplet = new Lang.Class({
        this.menu.addMenuItem(this._statusSection);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

-        this._activeConnections = [ ];
-        this._connections = [ ];
-
-        this._mainConnection = null;
-        this._vpnConnection = null;
-        this._activeAccessPointUpdateId = 0;
-        this._activeAccessPoint = null;
-        this._mobileUpdateId = 0;
-        this._mobileUpdateDevice = null;
-
        this._devices = { };

        this._devices.wired = {
@@ -1644,9 +1587,13 @@ const NMApplet = new Lang.Class({

        this._devices.vpn = {
            section: new PopupMenu.PopupMenuSection(),
-            device: this._makeWrapperDevice(NMDeviceVPN, null),
+            device: new NMDeviceVPN(this._client),
            item: new NMWiredSectionTitleMenuItem(_("VPN Connections"))
        };
+        this._devices.vpn.device.connect('active-connection-changed', Lang.bind(this, function() {
+            this._devices.vpn.item.updateForDevice(this._devices.vpn.device);
+        }));
+        this._devices.vpn.item.updateForDevice(this._devices.vpn.device);
        this._devices.vpn.section.addMenuItem(this._devices.vpn.item);
        this._devices.vpn.section.addMenuItem(this._devices.vpn.device.section);
        this._devices.vpn.section.actor.hide();
@@ -1654,6 +1601,15 @@ const NMApplet = new Lang.Class({
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');

+        this._activeConnections = [ ];
+        this._connections = [ ];
+
+        this._mainConnection = null;
+        this._activeAccessPointUpdateId = 0;
+        this._activeAccessPoint = null;
+        this._mobileUpdateId = 0;
+        this._mobileUpdateDevice = null;
+
        // Device types
        this._dtypes = { };
        this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
@@ -1694,16 +1650,9 @@ const NMApplet = new Lang.Class({
        }));
    },

-    setIcon: function(iconName) {
-        this._primaryIcon.icon_name = iconName;
-    },
-
    _ensureSource: function() {
        if (!this._source) {
-            this._source = new MessageTray.Source(_("Network Manager"),
-                                                  'network-transmit-receive',
-                                                  St.IconType.SYMBOLIC);
-
+            this._source = new NMMessageTraySource();
            this._source.connect('destroy', Lang.bind(this, function() {
                this._source = null;
            }));
@@ -1724,18 +1673,6 @@ const NMApplet = new Lang.Class({
    },

    _syncSectionTitle: function(category) {
-        if (category == NMConnectionCategory.VPN) {
-            // Special case VPN: it's only one device (and a fake one
-            // actually), and we don't show it if empty
-            let device = this._devices.vpn.device;
-            let section = this._devices.vpn.section;
-            let item = this._devices.vpn.item;
-
-            section.actor.visible = !device.empty;
-            item.updateForDevice(device);
-            return;
-        }
-
        let devices = this._devices[category].devices;
        let item = this._devices[category].item;
        let section = this._devices[category].section;
@@ -1786,29 +1723,6 @@ const NMApplet = new Lang.Class({
        this._source.notify(device._notification);
    },

-    _makeWrapperDevice: function(wrapperClass, device) {
-        let wrapper = new wrapperClass(this._client, device, this._connections);
-
-        wrapper._activationFailedId = wrapper.connect('activation-failed', Lang.bind(this, function(device, reason) {
-            // XXX: nm-applet has no special text depending on reason
-            // but I'm not sure of this generic message
-            this._notifyForDevice(device, 'network-error',
-                                  _("Connection failed"),
-                                  _("Activation of network connection failed"),
-                                  MessageTray.Urgency.HIGH);
-        }));
-        wrapper._deviceStateChangedId = wrapper.connect('state-changed', Lang.bind(this, function(dev) {
-            this._syncSectionTitle(dev.category);
-        }));
-        wrapper._destroyId = wrapper.connect('destroy', function(wrapper) {
-            wrapper.disconnect(wrapper._activationFailedId);
-            wrapper.disconnect(wrapper._deviceStateChangedId);
-            wrapper.disconnect(wrapper._destroyId);
-        });
-
-        return wrapper;
-    },
-
    _deviceAdded: function(client, device) {
        if (device._delegate) {
            // already seen, not adding again
@@ -1816,8 +1730,24 @@ const NMApplet = new Lang.Class({
        }
        let wrapperClass = this._dtypes[device.get_device_type()];
        if (wrapperClass) {
-            let wrapper = this._makeWrapperDevice(wrapperClass, device);
+            let wrapper = new wrapperClass(this._client, device, this._connections);

+            wrapper._activationFailedId = wrapper.connect('activation-failed', Lang.bind(this, function(device, reason) {
+                // XXX: nm-applet has no special text depending on reason
+                // but I'm not sure of this generic message
+                this._notifyForDevice(device, 'network-error',
+                                      _("Connection failed"),
+                                      _("Activation of network connection failed"),
+                                     MessageTray.Urgency.HIGH);
+            }));
+            wrapper._deviceStateChangedId = wrapper.connect('state-changed', Lang.bind(this, function(dev) {
+                this._syncSectionTitle(dev.category);
+            }));
+            wrapper._destroyId = wrapper.connect('destroy', function(wrapper) {
+                wrapper.disconnect(wrapper._activationFailedId);
+                wrapper.disconnect(wrapper._deviceStateChangedId);
+                wrapper.disconnect(wrapper._destroyId);
+            });
            let section = this._devices[wrapper.category].section;
            let devices = this._devices[wrapper.category].devices;

@@ -1871,8 +1801,6 @@ const NMApplet = new Lang.Class({

        this._activeConnections = newActiveConnections;
        this._mainConnection = null;
-        this._vpnConnection = null;
-
        let activating = null;
        let default_ip4 = null;
        let default_ip6 = null;
@@ -1906,10 +1834,10 @@ const NMApplet = new Lang.Class({
                default_ip4 = a;
            if (a.default6)
                default_ip6 = a;
-
            if (a._type == 'vpn')
                active_vpn = a;
-            else if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING)
+
+            if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING)
                activating = a;

            if (!a._primaryDevice) {
@@ -1938,8 +1866,7 @@ const NMApplet = new Lang.Class({
            }
        }

-        this._mainConnection = activating || default_ip4 || default_ip6 || this._activeConnections[0] || null;
-        this._vpnConnection = active_vpn;
+        this._mainConnection = activating || active_vpn || default_ip4 || default_ip6 || this._activeConnections[0] || null;
    },

    _notifyActivated: function(activeConnection) {
@@ -1956,7 +1883,7 @@ const NMApplet = new Lang.Class({
        let connections = this._settings.list_connections();
        for (let i = 0; i < connections.length; i++) {
            let connection = connections[i];
-            if (connection._updatedId) {
+            if (connection._uuid) {
                // connection was already seen (for example because NetworkManager was restarted)
                continue;
            }
@@ -1969,7 +1896,7 @@ const NMApplet = new Lang.Class({
    },

    _newConnection: function(settings, connection) {
-        if (connection._updatedId) {
+        if (connection._uuid) {
            // connection was already seen
            return;
        }
@@ -1992,31 +1919,35 @@ const NMApplet = new Lang.Class({

        if (section == NMConnectionCategory.VPN) {
            this._devices.vpn.device.removeConnection(connection);
-            this._syncSectionTitle(section);
+            if (this._devices.vpn.device.empty)
+                this._devices.vpn.section.actor.hide();
        } else if (section != NMConnectionCategory.INVALID) {
            let devices = this._devices[section].devices;
            for (let i = 0; i < devices.length; i++)
                devices[i].removeConnection(connection);
        }

+        connection._uuid = null;
        connection.disconnect(connection._removedId);
        connection.disconnect(connection._updatedId);
-        connection._removedId = connection._updatedId = 0;
    },

    _updateConnection: function(connection) {
        let connectionSettings = connection.get_setting_by_name(NetworkManager.SETTING_CONNECTION_SETTING_NAME);
        connection._type = connectionSettings.type;
+
        connection._section = this._ctypes[connection._type] || NMConnectionCategory.INVALID;
+        connection._name = connectionSettings.id;
+        connection._uuid = connectionSettings.uuid;
        connection._timestamp = connectionSettings.timestamp;

        let section = connection._section;

-        if (section == NMConnectionCategory.INVALID)
+        if (connection._section == NMConnectionCategory.INVALID)
            return;
        if (section == NMConnectionCategory.VPN) {
            this._devices.vpn.device.checkConnection(connection);
-            this._syncSectionTitle(section);
+            this._devices.vpn.section.actor.show();
        } else {
            let devices = this._devices[section].devices;
            for (let i = 0; i < devices.length; i++) {
@@ -2039,10 +1970,12 @@ const NMApplet = new Lang.Class({

        this._statusSection.actor.hide();

-        this._syncSectionTitle(NMConnectionCategory.WIRED);
-        this._syncSectionTitle(NMConnectionCategory.WIRELESS);
-        this._syncSectionTitle(NMConnectionCategory.WWAN);
-        this._syncSectionTitle(NMConnectionCategory.VPN);
+        this._syncSectionTitle('wired');
+        this._syncSectionTitle('wireless');
+        this._syncSectionTitle('wwan');
+
+        if (!this._devices.vpn.device.empty)
+            this._devices.vpn.section.actor.show();
    },

    _syncNMState: function() {
@@ -2085,6 +2018,9 @@ const NMApplet = new Lang.Class({
            case NMConnectionCategory.WIRED:
                this.setIcon('network-wired-acquiring');
                break;
+            case NMConnectionCategory.VPN:
+                this.setIcon('network-vpn-acquiring');
+                break;
            default:
                // fallback to a generic connected icon
                // (it could be a private connection of some other user)
@@ -2147,6 +2083,9 @@ const NMApplet = new Lang.Class({
                this.setIcon('network-cellular-signal-' + signalToIcon(dev.mobileDevice.signal_quality));
                hasMobileIcon = true;
                break;
+            case NMConnectionCategory.VPN:
+                this.setIcon('network-vpn');
+                break;
            default:
                // fallback to a generic connected icon
                // (it could be a private connection of some other user)
@@ -2155,25 +2094,6 @@ const NMApplet = new Lang.Class({
            }
        }

-        // update VPN indicator
-        if (this._vpnConnection) {
-            let vpnIconName = 'network-vpn';
-            if (this._vpnConnection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
-                vpnIconName = 'network-vpn-acquiring';
-
-            // only show a separate icon when we're using a wireless/3g connection
-            if (mc._section == NMConnectionCategory.WIRELESS || 
-                mc._section == NMConnectionCategory.WWAN) {
-                this._secondaryIcon.icon_name = vpnIconName;
-                this._secondaryIcon.visible = true;
-            } else {
-                this.setIcon(vpnIconName);
-                this._secondaryIcon.visible = false;
-            }
-        } else {
-            this._secondaryIcon.visible = false;
-        }
-
        // cleanup stale signal connections

        if (!hasApIcon && this._activeAccessPointUpdateId) {
@@ -2188,3 +2108,18 @@ const NMApplet = new Lang.Class({
        }
    }
 });
+
+const NMMessageTraySource = new Lang.Class({
+    Name: 'NMMessageTraySource',
+    Extends: MessageTray.Source,
+
+    _init: function() {
+        this.parent(_("Network Manager"));
+
+        let icon = new St.Icon({ icon_name: 'network-transmit-receive',
+                                 icon_type: St.IconType.SYMBOLIC,
+                                 icon_size: this.ICON_SIZE
+                               });
+        this._setSummaryIcon(icon);
+    }
+});
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -212,7 +212,7 @@ const DeviceItem = new Lang.Class({
        case UPDeviceType.COMPUTER:
            return _("Computer");
        default:
-            return C_("device", "Unknown");
+            return _("Unknown");
        }
    }
 });
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -149,9 +149,13 @@ const Indicator = new Lang.Class({
                }
            }
        }
-
-        this._inputTitle.actor.visible = showInput;
-        this._inputSlider.actor.visible = showInput;
+        if (showInput) {
+            this._inputTitle.actor.show();
+            this._inputSlider.actor.show();
+        } else {
+            this._inputTitle.actor.hide();
+            this._inputSlider.actor.hide();
+        }
    },

    _volumeToIcon: function(volume) {
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -378,9 +378,8 @@ const Client = new Lang.Class({

    _ensureSubscriptionSource: function() {
        if (this._subscriptionSource == null) {
-            this._subscriptionSource = new MessageTray.Source(_("Subscription request"),
-                                                              'gtk-dialog-question',
-                                                              St.IconType.FULLCOLOR);
+            this._subscriptionSource = new MultiNotificationSource(
+                _("Subscription request"), 'gtk-dialog-question');
            Main.messageTray.add(this._subscriptionSource);
            this._subscriptionSource.connect('destroy', Lang.bind(this, function () {
                this._subscriptionSource = null;
@@ -415,9 +414,8 @@ const Client = new Lang.Class({

    _ensureAccountSource: function() {
        if (this._accountSource == null) {
-            this._accountSource = new MessageTray.Source(_("Connection error"),
-                                                         'gtk-dialog-error',
-                                                         St.IconType.FULLCOLOR);
+            this._accountSource = new MultiNotificationSource(
+                _("Connection error"), 'gtk-dialog-error');
            Main.messageTray.add(this._accountSource);
            this._accountSource.connect('destroy', Lang.bind(this, function () {
                this._accountSource = null;
@@ -433,13 +431,14 @@ const ChatSource = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function(account, conn, channel, contact, client) {
+        this.parent(contact.get_alias());
+
+        this.isChat = true;
+
        this._account = account;
        this._contact = contact;
        this._client = client;

-        this.parent(contact.get_alias());
-
-        this.isChat = true;
        this._pendingMessages = [];

        this._conn = conn;
@@ -460,6 +459,8 @@ const ChatSource = new Lang.Class({
        this._receivedId = this._channel.connect('message-received', Lang.bind(this, this._messageReceived));
        this._pendingId = this._channel.connect('pending-message-removed', Lang.bind(this, this._pendingRemoved));

+        this._setSummaryIcon(this.createNotificationIcon());
+
        this._notifyAliasId = this._contact.connect('notify::alias', Lang.bind(this, this._updateAlias));
        this._notifyAvatarId = this._contact.connect('notify::avatar-file', Lang.bind(this, this._updateAvatarIcon));
        this._presenceChangedId = this._contact.connect('presence-changed', Lang.bind(this, this._presenceChanged));
@@ -522,10 +523,10 @@ const ChatSource = new Lang.Class({
    _getLogMessages: function() {
        let logManager = Tpl.LogManager.dup_singleton();
        let entity = Tpl.Entity.new_from_tp_contact(this._contact, Tpl.EntityType.CONTACT);
-
-        logManager.get_filtered_events_async(this._account, entity,
-                                             Tpl.EventTypeMask.TEXT, SCROLLBACK_HISTORY_LINES,
-                                             null, Lang.bind(this, this._displayPendingMessages));
+        Shell.get_contact_events(logManager,
+                                 this._account, entity,
+                                 SCROLLBACK_HISTORY_LINES,
+                                 Lang.bind(this, this._displayPendingMessages));
    },

    _displayPendingMessages: function(logManager, result) {
@@ -815,7 +816,7 @@ const ChatNotification = new Lang.Class({
        let groups = this._contentArea.get_children();
        for (let i = 0; i < groups.length; i++) {
            let group = groups[i];
-            if (group.get_n_children() == 0)
+            if (group.get_children().length == 0)
                group.destroy();
        }
    },
@@ -1014,10 +1015,11 @@ const ApproverSource = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function(dispatchOp, text, gicon) {
-        this._gicon = gicon;
-
        this.parent(text);

+        this._gicon = gicon;
+        this._setSummaryIcon(this.createNotificationIcon());
+
        this._dispatchOp = dispatchOp;

        // Destroy the source if the channel dispatch operation is invalidated
@@ -1039,6 +1041,7 @@ const ApproverSource = new Lang.Class({

    createNotificationIcon: function() {
        return new St.Icon({ gicon: this._gicon,
+                             icon_type: St.IconType.FULLCOLOR,
                             icon_size: this.ICON_SIZE });
    }
 });
@@ -1161,6 +1164,40 @@ const FileTransferNotification = new Lang.Class({
    }
 });

+// A notification source that can embed multiple notifications
+const MultiNotificationSource = new Lang.Class({
+    Name: 'MultiNotificationSource',
+    Extends: MessageTray.Source,
+
+    _init: function(title, icon) {
+        this.parent(title);
+
+        this._icon = icon;
+        this._setSummaryIcon(this.createNotificationIcon());
+        this._nbNotifications = 0;
+    },
+
+    notify: function(notification) {
+        this.parent(notification);
+
+        this._nbNotifications += 1;
+
+        // Display the source while there is at least one notification
+        notification.connect('destroy', Lang.bind(this, function () {
+            this._nbNotifications -= 1;
+
+            if (this._nbNotifications == 0)
+                this.destroy();
+        }));
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ gicon: Gio.icon_new_for_string(this._icon),
+                             icon_type: St.IconType.FULLCOLOR,
+                             icon_size: this.ICON_SIZE });
+    }
+});
+
 // Subscription request
 const SubscriptionRequestNotification = new Lang.Class({
    Name: 'SubscriptionRequestNotification',
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const AccountsService = imports.gi.AccountsService;
-const GdmGreeter = imports.gi.GdmGreeter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
@@ -133,7 +132,7 @@ const IMStatusChooserItem = new Lang.Class({
        item = new IMStatusItem(_("Busy"), 'user-busy');
        this._combo.addMenuItem(item, IMStatus.BUSY);

-        item = new IMStatusItem(_("Invisible"), 'user-invisible');
+        item = new IMStatusItem(_("Hidden"), 'user-invisible');
        this._combo.addMenuItem(item, IMStatus.HIDDEN);

        item = new IMStatusItem(_("Away"), 'user-away');
@@ -474,22 +473,13 @@ const UserMenuButton = new Lang.Class({
                                       style_class: 'popup-menu-icon' });
        this._idleIcon = new St.Icon({ icon_name: 'user-idle',
                                       style_class: 'popup-menu-icon' });
-        this._pendingIcon = new St.Icon({ icon_name: 'user-status-pending',
-                                          style_class: 'popup-menu-icon' });

        this._accountMgr.connect('most-available-presence-changed',
                                  Lang.bind(this, this._updatePresenceIcon));
-        this._accountMgr.connect('account-enabled',
-                                  Lang.bind(this, this._onAccountEnabled));
-        this._accountMgr.connect('account-disabled',
-                                 Lang.bind(this, this._onAccountDisabled));
-        this._accountMgr.connect('account-removed',
-                                  Lang.bind(this, this._onAccountDisabled));
        this._accountMgr.prepare_async(null, Lang.bind(this,
            function(mgr) {
                let [presence, s, msg] = mgr.get_most_available_presence();
                this._updatePresenceIcon(mgr, presence, s, msg);
-                this._setupAccounts();
            }));

        this._name = new St.Label();
@@ -507,13 +497,13 @@ const UserMenuButton = new Lang.Class({
        }));

        this._userManager.connect('notify::is-loaded',
-                                  Lang.bind(this, this._updateMultiUser));
+                                  Lang.bind(this, this._updateSwitchUser));
        this._userManager.connect('notify::has-multiple-users',
-                                  Lang.bind(this, this._updateMultiUser));
+                                  Lang.bind(this, this._updateSwitchUser));
        this._userManager.connect('user-added',
-                                  Lang.bind(this, this._updateMultiUser));
+                                  Lang.bind(this, this._updateSwitchUser));
        this._userManager.connect('user-removed',
-                                  Lang.bind(this, this._updateMultiUser));
+                                  Lang.bind(this, this._updateSwitchUser));
        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
                                       Lang.bind(this, this._updateSwitchUser));
        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
@@ -552,32 +542,30 @@ const UserMenuButton = new Lang.Class({
            this._name.set_text("");
    },

-    _updateMultiUser: function() {
-        this._updateSwitchUser();
-        this._updateLogout();
-    },
-
    _updateSwitchUser: function() {
        let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
-        let multiUser = this._userManager.can_switch() && this._userManager.has_multiple_users;
-        let multiSession = GdmGreeter.get_session_ids().length > 1;
-
-        this._loginScreenItem.label.set_text(multiUser ? _("Switch User")
-                                                       : _("Switch Session"));
-        this._loginScreenItem.actor.visible = allowSwitch && (multiUser || multiSession);
+        if (allowSwitch &&
+            this._userManager.can_switch() &&
+            this._userManager.has_multiple_users)
+            this._loginScreenItem.actor.show();
+        else
+            this._loginScreenItem.actor.hide();
    },

    _updateLogout: function() {
        let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
-        let multiUser = this._userManager.has_multiple_users;
-        let multiSession = GdmGreeter.get_session_ids().length > 1;
-
-        this._logoutItem.actor.visible = allowLogout && (multiUser || multiSession);
+        if (allowLogout)
+            this._logoutItem.actor.show();
+        else
+            this._logoutItem.actor.hide();
    },

    _updateLockScreen: function() {
        let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
-        this._lockScreenItem.actor.visible = allowLockScreen;
+        if (allowLockScreen)
+            this._lockScreenItem.actor.show();
+        else
+            this._lockScreenItem.actor.hide();
    },

    _updateHaveShutdown: function() {
@@ -596,16 +584,19 @@ const UserMenuButton = new Lang.Class({
        if (!this._suspendOrPowerOffItem)
            return;

-        this._suspendOrPowerOffItem.actor.visible = this._haveShutdown || this._haveSuspend;
+        if (!this._haveShutdown && !this._haveSuspend)
+            this._suspendOrPowerOffItem.actor.hide();
+        else
+            this._suspendOrPowerOffItem.actor.show();

-        // If we can't power off show Suspend instead
+        // If we can't suspend show Power Off... instead
        // and disable the alt key
-        if (!this._haveShutdown) {
+        if (!this._haveSuspend) {
+            this._suspendOrPowerOffItem.updateText(_("Power Off..."), null);
+        } else if (!this._haveShutdown) {
            this._suspendOrPowerOffItem.updateText(_("Suspend"), null);
-        } else if (!this._haveSuspend) {
-            this._suspendOrPowerOffItem.updateText(_("Power Off"), null);
        } else {
-            this._suspendOrPowerOffItem.updateText(_("Power Off"), _("Suspend"));
+            this._suspendOrPowerOffItem.updateText(_("Suspend"), _("Power Off..."));
        }
    },

@@ -629,52 +620,11 @@ const UserMenuButton = new Lang.Class({
            this._iconBox.child = this._offlineIcon;
    },

-    _setupAccounts: function() {
-        let accounts = this._accountMgr.get_valid_accounts();
-        for (let i = 0; i < accounts.length; i++) {
-            accounts[i]._changingId = accounts[i].connect('notify::connection-status',
-                                                          Lang.bind(this, this._updateChangingPresence));
-        }
-        this._updateChangingPresence();
-    },
-
-    _onAccountEnabled: function(accountMgr, account) {
-        if (!account._changingId)
-            account._changingId = account.connect('notify::connection-status',
-                                                  Lang.bind(this, this._updateChangingPresence));
-        this._updateChangingPresence();
-    },
-
-    _onAccountDisabled: function(accountMgr, account) {
-        account.disconnect(account._changingId);
-        account._changingId = 0;
-        this._updateChangingPresence();
-    },
-
-    _updateChangingPresence: function() {
-        let accounts = this._accountMgr.get_valid_accounts();
-        let changing = false;
-        for (let i = 0; i < accounts.length; i++) {
-            if (accounts[i].connection_status == Tp.ConnectionStatus.CONNECTING) {
-                changing = true;
-                break;
-            }
-        }
-
-        if (changing) {
-            this._iconBox.child = this._pendingIcon;
-        } else {
-            let [presence, s, msg] = this._accountMgr.get_most_available_presence();
-            this._updatePresenceIcon(this._accountMgr, presence, s, msg);
-        }
-    },
-
    _createSubMenu: function() {
        let item;

        item = new IMStatusChooserItem();
-        if (Main.sessionMode.allowSettings)
-            item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
+        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
        this.menu.addMenuItem(item);
        this._statusChooser = item;

@@ -686,28 +636,28 @@ const UserMenuButton = new Lang.Class({
        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);

-        if (Main.sessionMode.allowSettings) {
-            item = new PopupMenu.PopupMenuItem(_("System Settings"));
-            item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-            this.menu.addMenuItem(item);
-        }
-
-        item = new PopupMenu.PopupAlternatingMenuItem(_("Power Off"),
-                                                      _("Suspend"));
+        item = new PopupMenu.PopupMenuItem(_("Online Accounts"));
+        item.connect('activate', Lang.bind(this, this._onOnlineAccountsActivate));
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupMenuItem(_("System Settings"));
+        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
        this.menu.addMenuItem(item);
-        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
-        this._suspendOrPowerOffItem = item;
-        this._updateSuspendOrPowerOff();

        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);

+        item = new PopupMenu.PopupMenuItem(_("Lock Screen"));
+        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
+        this.menu.addMenuItem(item);
+        this._lockScreenItem = item;
+
        item = new PopupMenu.PopupMenuItem(_("Switch User"));
        item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
        this.menu.addMenuItem(item);
        this._loginScreenItem = item;

-        item = new PopupMenu.PopupMenuItem(_("Log Out"));
+        item = new PopupMenu.PopupMenuItem(_("Log Out..."));
        item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
        this.menu.addMenuItem(item);
        this._logoutItem = item;
@@ -715,10 +665,12 @@ const UserMenuButton = new Lang.Class({
        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);

-        item = new PopupMenu.PopupMenuItem(_("Lock"));
-        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
+        item = new PopupMenu.PopupAlternatingMenuItem(_("Suspend"),
+                                                      _("Power Off..."));
        this.menu.addMenuItem(item);
-        this._lockScreenItem = item;
+        this._suspendOrPowerOffItem = item;
+        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
+        this._updateSuspendOrPowerOff();
    },

    _updatePresenceStatus: function(item, event) {
@@ -746,6 +698,12 @@ const UserMenuButton = new Lang.Class({
        app.activate();
    },

+    _onOnlineAccountsActivate: function() {
+        Main.overview.hide();
+        let app = Shell.AppSystem.get_default().lookup_setting('gnome-online-accounts-panel.desktop');
+        app.activate(-1);
+    },
+
    _onPreferencesActivate: function() {
        Main.overview.hide();
        let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
@@ -774,14 +732,14 @@ const UserMenuButton = new Lang.Class({
    _onSuspendOrPowerOffActivate: function() {
        Main.overview.hide();

-        if (this._haveShutdown &&
+        if (this._haveSuspend &&
            this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
-            this._session.ShutdownRemote();
-        } else {
            // Ensure we only suspend after locking the screen
            this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
                this._upClient.suspend_sync(null);
            }));
+        } else {
+            this._session.ShutdownRemote();
        }
    }
 });
--- a/js/ui/wanda.js
+++ b/js/ui/wanda.js
@@ -168,35 +168,34 @@ const WandaSearchProvider = new Lang.Class({
        this.parent(_("Your favorite Easter Egg"));
    },

-    getResultMetas: function(fish, callback) {
-        callback([{ 'id': fish[0], // there may be many fish in the sea, but
-                    // only one which speaks the truth!
-                    'name': capitalize(fish[0]),
-                    'createIcon': function(iconSize) {
-                        // for DND only (maybe could be improved)
-                        // DON'T use St.Icon here, it crashes the shell
-                        // (dnd.js code assumes it can query the actor size
-                        // without parenting it, while StWidget accesses
-                        // StThemeNode in get_preferred_width/height, which
-                        // triggers an assertion failure)
-                        return St.TextureCache.get_default().load_icon_name(null,
-                                                                            'face-smile',
-                                                                            St.IconType.FULLCOLOR,
-                                                                            iconSize);
-                    }
-                  }]);
+    getResultMetas: function(fish) {
+        return [{ 'id': fish[0], // there may be many fish in the sea, but
+                                 // only one which speaks the truth!
+                  'name': capitalize(fish[0]),
+                  'createIcon': function(iconSize) {
+                      // for DND only (maybe could be improved)
+                      // DON'T use St.Icon here, it crashes the shell
+                      // (dnd.js code assumes it can query the actor size
+                      // without parenting it, while StWidget accesses
+                      // StThemeNode in get_preferred_width/height, which
+                      // triggers an assertion failure)
+                      return St.TextureCache.get_default().load_icon_name(null,
+                                                                          'face-smile',
+                                                                          St.IconType.FULLCOLOR,
+                                                                          iconSize);
+                  }
+                }];
    },

    getInitialResultSet: function(terms) {
        if (terms.join(' ') == MAGIC_FISH_KEY) {
-            this.searchSystem.pushResults(this, [ FISH_NAME ]);
-        } else {
-            this.searchSystem.pushResults(this, []);
+            return [ FISH_NAME ];
        }
+        return [];
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        this.getInitialResultSet(terms);
+        return this.getInitialResultSet(terms);
    },

    activateResult: function(fish, params) {
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@@ -53,10 +53,10 @@ const Source = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function(app, window) {
+        this.parent(app.get_name());
        this._window = window;
        this._app = app;
-
-        this.parent(app.get_name());
+        this._setSummaryIcon(this.createNotificationIcon());

        this.signalIDs = [];
        this.signalIDs.push(this._window.connect('notify::demands-attention', Lang.bind(this, function() { this.destroy(); })));
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1121,6 +1121,26 @@ const Workspace = new Lang.Class({
        }
    },

+    _showAllOverlays: function() {
+        let currentWorkspace = global.screen.get_active_workspace();
+        for (let i = 0; i < this._windows.length; i++) {
+            let clone = this._windows[i];
+            let overlay = this._windowOverlays[i];
+            this._showWindowOverlay(clone, overlay,
+                                    this.metaWorkspace == null || this.metaWorkspace == currentWorkspace);
+        }
+    },
+
+    _hideAllOverlays: function() {
+        for (let i = 0; i < this._windows.length; i++) {
+            let clone = this._windows[i];
+            Tweener.removeTweens(clone.actor);
+            let overlay = this._windowOverlays[i];
+            if (overlay)
+                overlay.hide();
+        }
+    },
+
    _delayedWindowRepositioning: function() {
        if (this._windowIsZooming)
            return true;
@@ -1232,7 +1252,7 @@ const Workspace = new Lang.Class({
        if (!this._isMyWindow(win) || !this._isOverviewWindow(win))
            return;

-        let [clone, overlay] = this._addWindowClone(win);
+        let clone = this._addWindowClone(win);

        if (win._overviewHint) {
            let x = win._overviewHint.x - this.actor.x;
@@ -1242,7 +1262,6 @@ const Workspace = new Lang.Class({

            clone.actor.set_position (x, y);
            clone.actor.set_scale (scale, scale);
-            this._updateWindowOverlayPositions(clone, overlay, x, y, scale, false);
        } else {
            // Position new windows at the top corner of the workspace rather
            // than where they were placed for real to avoid the window
@@ -1302,10 +1321,7 @@ const Workspace = new Lang.Class({

        this.leavingOverview = true;

-        for (let i = 0; i < this._windows.length; i++) {
-            let clone = this._windows[i];
-            Tweener.removeTweens(clone.actor);
-        }
+        this._hideAllOverlays();

        if (this._repositionWindowsId > 0) {
            Mainloop.source_remove(this._repositionWindowsId);
@@ -1320,10 +1336,6 @@ const Workspace = new Lang.Class({
        // Position and scale the windows.
        for (let i = 0; i < this._windows.length; i++) {
            let clone = this._windows[i];
-            let overlay = this._windowOverlays[i];
-
-            if (overlay)
-                overlay.hide();

            clone.zoomFromOverview();

@@ -1348,6 +1360,7 @@ const Workspace = new Lang.Class({
                                 });
            }
        }
+
    },

    destroy : function() {
@@ -1438,7 +1451,7 @@ const Workspace = new Lang.Class({
        this._windows.push(clone);
        this._windowOverlays.push(overlay);

-        return [clone, overlay];
+        return clone;
    },

    _onShowOverlayClose: function (windowOverlay) {
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -529,11 +529,9 @@ const WorkspacesDisplay = new Lang.Class({
            this._updateAlwaysZoom();
        }));

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

+        this._nWorkspacesChangedId = 0;
        this._itemDragBeginId = 0;
        this._itemDragCancelledId = 0;
        this._itemDragEndId = 0;
@@ -572,6 +570,9 @@ const WorkspacesDisplay = new Lang.Class({
            global.screen.connect('restacked',
                                  Lang.bind(this, this._onRestacked));

+        if (this._nWorkspacesChangedId == 0)
+            this._nWorkspacesChangedId = global.screen.connect('notify::n-workspaces',
+                                                               Lang.bind(this, this._workspacesChanged));
        if (this._itemDragBeginId == 0)
            this._itemDragBeginId = Main.overview.connect('item-drag-begin',
                                                          Lang.bind(this, this._dragBegin));
@@ -843,7 +844,10 @@ const WorkspacesDisplay = new Lang.Class({
                        if (!primaryView)
                            return;
                        primaryView.actor.opacity = opacity;
-                        primaryView.actor.visible = opacity != 0;
+                        if (opacity == 0)
+                            primaryView.actor.hide();
+                        else
+                            primaryView.actor.show();
                    }));
        }));
    },
@@ -924,16 +928,19 @@ const WorkspacesDisplay = new Lang.Class({
    },

    _workspacesChanged: function() {
+        let oldNumWorkspaces = this._workspaces[0].length;
+        let newNumWorkspaces = global.screen.n_workspaces;
+        let active = global.screen.get_active_workspace_index();
+
+        if (oldNumWorkspaces == newNumWorkspaces)
+            return;
+
        this._updateAlwaysZoom();
        this._updateZoom();

        if (this._workspacesViews == null)
            return;

-        let oldNumWorkspaces = this._workspaces[0].length;
-        let newNumWorkspaces = global.screen.n_workspaces;
-        let active = global.screen.get_active_workspace_index();
-
        let lostWorkspaces = [];
        if (newNumWorkspaces > oldNumWorkspaces) {
            let monitors = Main.layoutManager.monitors;
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -43,6 +43,7 @@ ms
 nb
 nl
 nn
+oc
 or
 pa
 pl
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 data/gnome-shell.desktop.in.in
 data/gnome-shell-extension-prefs.desktop.in.in
-data/org.gnome.shell.gschema.xml.in.in
+data/org.gnome.shell.gschema.xml.in
 js/extensionPrefs/main.js
 js/gdm/loginDialog.js
 js/gdm/powerMenu.js
@@ -13,7 +13,6 @@ js/ui/contactDisplay.js
 js/ui/dash.js
 js/ui/dateMenu.js
 js/ui/endSessionDialog.js
-js/ui/extensionDownloader.js
 js/ui/extensionSystem.js
 js/ui/keyboard.js
 js/ui/keyringPrompt.js
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
@@ -9,8 +9,8 @@ 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-03-19 14:09+0000\n"
-"PO-Revision-Date: 2012-03-19 20:17+0530\n"
+"POT-Creation-Date: 2012-04-19 21:14+0000\n"
+"PO-Revision-Date: 2012-07-05 20:28+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr "GNOME শ্বেল সম্প্ৰসাৰনসমূহ সং
 #: ../data/org.gnome.shell.gschema.xml.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
-"Alt-F2 -ৰ পৰা উন্নয়নকাৰী আৰু পৰীক্ষকসমূহৰ কাৰণে লাভদায়ক অভ্যন্তৰীক সঁজুলিসমূহ "
+"Alt-F2 ৰ পৰা উন্নয়নকাৰী আৰু পৰীক্ষকসমূহৰ কাৰণে লাভদায়ক অভ্যন্তৰীক সঁজুলিসমূহ "
 "সামৰ্থবান কৰক"

 #: ../data/org.gnome.shell.gschema.xml.in.h:2
@@ -61,7 +61,7 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
-"GNOME শ্বেল সম্প্ৰসাৰণসমূহৰ এটা uuid বৈশিষ্ট আছে; এই চাবিয়ে ল'ড হব লগিয়া "
+"GNOME শ্বেল সম্প্ৰসাৰণসমূহৰ এটা uuid বৈশিষ্ট আছে; এই কি'য়ে ল'ড হব লগিয়া "
 "সমপ্ৰসাৰণসমূহ তালিকাভুক্ত কৰে। যিকোনো সম্প্ৰসাৰন যি ল'ড হব বিচাৰে এই তালিকাত থাকিব "
 "লাগিব। আপুনি এই তালিকাক org.gnome.Shell ত EnableExtension আৰু DisableExtension "
 "DBus পদ্ধতিসমূহৰ সৈতে সলনি কৰিব পাৰিব।"
@@ -77,7 +77,7 @@ msgid ""
 "want to disable this for privacy reasons. Please note that doing so won't "
 "remove already saved data."
 msgstr ""
-"শ্বেলে সাধাৰনত সক্ৰিয় অনুপ্ৰয়োগসমূহ মনিটৰ কৰে যাতে সকলোতকৈ অধিক ব্যৱহৃতসমূহ "
+"শ্বেলে সাধাৰণত সক্ৰিয় অনুপ্ৰয়োগসমূহ মনিটৰ কৰে যাতে সকলোতকৈ অধিক ব্যৱহৃতসমূহ "
 "(উদাহৰনস্বৰুপে লঞ্চাৰসমূহত) ক দেখুৱাব পাৰে। যত এই তথ্য গোপন ৰখা হব, আপুনি ইয়াক "
 "গোপনীয়তা কাৰণসমূহৰ কাৰণে অসামৰ্থবান কৰিব পাৰে। অনুগ্ৰহ কৰি মন কৰিব যে এনেকুৱা "
 "কৰাত ইতিমধ্যে সংৰক্ষীত তথ্য আতৰি নাযায়।"
@@ -129,46 +129,54 @@ msgid "If true, display the ISO week date in the calendar."
 msgstr "যদি সত্য, ISO সপ্তাহ তাৰিখক কেলেণ্ডাৰত দেখুৱাওক।"

 #: ../data/org.gnome.shell.gschema.xml.in.h:16
+msgid "Keybinding to open the application menu"
+msgstr "অনুপ্ৰয়োগ মেনু খোলিবলে Keybinding"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
+msgid "Keybinding to open the application menu."
+msgstr "অনুপ্ৰয়োগ মেনু খোলিবলে Keybinding।"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid "Which keyboard to use"
 msgstr "কোনটো কিবৰ্ড ব্যৱহাৰ কৰা হব"

-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid "The type of keyboard to use."
 msgstr "ব্যৱহাৰ কৰিব লগিয়া কিবৰ্ডৰ ধৰণ।"

-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Show time with seconds"
 msgstr "সময়ক ছেকেণ্ডসমূহৰ সৈতে দেখুৱাওক"

-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "If true, display seconds in time."
 msgstr "যদি সত্য, ছেকেণ্ডসমূহ সময়ত দেখুৱাওক।"

-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "Show date in clock"
 msgstr "ঘড়িত তাৰিখ দেখুৱাওক"

-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid "If true, display date in the clock, in addition to time."
 msgstr "যদি সত্য, ঘড়িত তাৰিখ প্ৰদৰ্শন কৰক, সময়ৰ অতিৰিক্তভাৱে।"

-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:24
 msgid "Framerate used for recording screencasts."
 msgstr "screencasts ৰেকৰ্ড কৰাৰ কাৰণে ব্যৱহৃত Framerate"

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:25
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
 msgstr ""
 "GNOME শ্বেলৰ screencast ৰেকৰ্ডাৰে ফ্ৰেইম-প্ৰতি ছেকেণ্ডত ৰেকৰ্ড কৰা পৰিণাম "
-"screencast -ৰ framerate।"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:24
-msgid "The gstreamer pipeline used to encode the screencast"
-msgstr "screencast এনকোড কৰিবলে ব্যৱহাৰ কৰা gstreamer পাইপলাইন"
+"screencast ৰ framerate।"

 #: ../data/org.gnome.shell.gschema.xml.in.h:26
+msgid "The gstreamer pipeline used to encode the screencast"
+msgstr "screencast এনক'ড কৰিবলে ব্যৱহাৰ কৰা gstreamer পাইপলাইন"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:28
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -182,29 +190,29 @@ msgid ""
 "using the VP8 codec. %T is used as a placeholder for a guess at the optimal "
 "thread count on the system."
 msgstr ""
-"ৰেকৰ্ডিংসমূহ এনকোড কৰোতে ব্যৱহৃত GStreamer পাইপলাইন সংহতি কৰে। ই gst-launch -ৰ "
+"ৰেকৰ্ডিংসমূহ এনক'ড কৰোতে ব্যৱহৃত GStreamer পাইপলাইন সংহতি কৰে। ই gst-launch ৰ "
 "কাৰণে ব্যৱহৃত বাক্যবিন্যাস অনুকৰন কৰে। পাইপলাইনৰ এটা অসংযোগিত চিঙ্ক পেড থাকিব লাগে "
-"যত ৰেকৰ্ড কৰা ভিডিঅ' ৰেকৰ্ড কৰা হয়। ইয়াৰ সাধাৰনত এটা অসংযোগিত উৎস পেড থাকিব; "
+"যত ৰেকৰ্ড কৰা ভিডিঅ' ৰেকৰ্ড কৰা হয়। ইয়াৰ সাধাৰণত এটা অসংযোগিত উৎস পেড থাকিব; "
 "সেই পেডৰ পৰা আউটপুট এটা আউটপুট নথিপত্ৰলে লিখা হব। যি কি নহওক পাইপলাইনে নিজৰ "
 "আউটপুটৰ যত্ন লব পাৰে - ইয়াৰ হওতো আউটপুটক shout2send অথবা সমসাময়িকৰে এটা icecast "
 "চাৰ্ভাৰত পঠাবলে ব্যৱহাৰ হব পাৰে। যেতিয়া এটা ৰিক্ত মানলে অসংহিত বা সংহিত, "
 "অবিকল্পিত পাইপলাইন ব্যৱহাৰ কৰা হব। এইটো বৰ্তমানত 'vp8enc quality=8 speed=6 "
-"threads=%T ! queue ! webmmux' আৰু VP8 কডেক ব্যৱহাৰ কৰি WEBM -ত ৰেকৰ্ড কৰে। %T -"
+"threads=%T ! queue ! webmmux' আৰু VP8 কডেক ব্যৱহাৰ কৰি WEBM ত ৰেকৰ্ড কৰে। %T -"
 "ক চিস্টেমত অনুকূলিত থ্ৰেড কাওন্টত এটা অনুমানৰ প্লেইচহল্ডাৰ হিচাপে ব্যৱহাৰ কৰা হয়। "

-#: ../data/org.gnome.shell.gschema.xml.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.h:29
 msgid "File extension used for storing the screencast"
 msgstr "screencast সংৰক্ষণ কৰাৰ কাৰণে লথিপত্ৰ সম্প্ৰসাৰন"

-#: ../data/org.gnome.shell.gschema.xml.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.h:30
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
 "a different container format."
 msgstr ""
-"ৰেকৰ্ড কৰা screencasts -ৰ কাৰণে নথিপত্ৰ নাম বৰ্তমান তাৰিখৰ উপৰত ভিত্তি কৰি এটা "
+"ৰেকৰ্ড কৰা screencasts ৰ কাৰণে নথিপত্ৰ নাম বৰ্তমান তাৰিখৰ উপৰত ভিত্তি কৰি এটা "
 "অবিকল্প নথিপত্ৰ নাম হব, আৰু এই সম্প্ৰসাৰন ব্যৱহাৰ কৰিব। ইয়াক এটা ভিন্ন অন্তৰ্ভুক্তক "
-"বিন্যাসত কেকৰ্ড কৰোতে পৰিৱৰ্তন কৰিব লাগিব।"
+"বিন্যাসত ৰেকৰ্ড কৰোতে পৰিৱৰ্তন কৰিব লাগিব।"

 #: ../js/extensionPrefs/main.js:125
 #, c-format
@@ -219,40 +227,40 @@ msgstr "<b>সম্প্ৰসাৰন</b>"
 msgid "Select an extension to configure using the combobox above."
 msgstr "উপৰত দিয়া কম্বোবাকচ ব্যৱহাৰ কৰি সংৰূপণ কৰিবলে এটা সম্প্ৰসাৰন বাছক।"

-#: ../js/gdm/loginDialog.js:624
+#: ../js/gdm/loginDialog.js:627
 msgid "Session..."
 msgstr "অধিবেশন..."

-#: ../js/gdm/loginDialog.js:786
+#: ../js/gdm/loginDialog.js:789
 msgctxt "title"
 msgid "Sign In"
 msgstr "ছাইন ইন কৰক"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/loginDialog.js:831
+#: ../js/gdm/loginDialog.js:834
 msgid "(or swipe finger)"
 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:852
+#: ../js/gdm/loginDialog.js:855
 msgid "Not listed?"
 msgstr "তালিকাভুক্ত নহয়?"

-#: ../js/gdm/loginDialog.js:1020 ../js/ui/endSessionDialog.js:401
-#: ../js/ui/extensionSystem.js:399 ../js/ui/networkAgent.js:153
+#: ../js/gdm/loginDialog.js:1023 ../js/ui/endSessionDialog.js:401
+#: ../js/ui/extensionSystem.js:400 ../js/ui/networkAgent.js:153
 #: ../js/ui/polkitAuthenticationAgent.js:175 ../js/ui/status/bluetooth.js:462
 msgid "Cancel"
 msgstr "বাতিল কৰক"

-#: ../js/gdm/loginDialog.js:1025
+#: ../js/gdm/loginDialog.js:1028
 msgctxt "button"
 msgid "Sign In"
 msgstr "ছাইন ইন কৰক"

-#: ../js/gdm/loginDialog.js:1377
+#: ../js/gdm/loginDialog.js:1380
 msgid "Login Window"
 msgstr "লগিন উইন্ডো"

@@ -282,7 +290,7 @@ msgstr "কমান্ড বিশ্লেষন কৰিব নোৱাৰ
 #: ../js/misc/util.js:127
 #, c-format
 msgid "Execution of '%s' failed:"
-msgstr "'%s' -ৰ প্ৰেৰণ ব্যৰ্থ হল:"
+msgstr "'%s' ৰ প্ৰেৰণ ব্যৰ্থ হল:"

 #. Translators: Filter to display all applications
 #: ../js/ui/appDisplay.js:255
@@ -312,12 +320,12 @@ msgstr "পছন্দলে যোগ কৰক"
 #: ../js/ui/appFavorites.js:87
 #, c-format
 msgid "%s has been added to your favorites."
-msgstr "%s -ক আপোনাৰ পছন্দলে যোগ কৰা হৈছে।"
+msgstr "%s ক আপোনাৰ পছন্দলে যোগ কৰা হৈছে।"

 #: ../js/ui/appFavorites.js:118
 #, c-format
 msgid "%s has been removed from your favorites."
-msgstr "%s -ক আপোনাৰ পছন্দৰ পৰা আতৰোৱা হৈছে।"
+msgstr "%s ক আপোনাৰ পছন্দৰ পৰা আতৰোৱা হৈছে।"

 #: ../js/ui/autorunManager.js:265
 msgid "Removable Devices"
@@ -326,7 +334,7 @@ msgstr "আতৰাব পৰা ডিভাইচসমূহ"
 #: ../js/ui/autorunManager.js:560
 #, c-format
 msgid "Open with %s"
-msgstr "%s -ৰ সৈতে খোলক"
+msgstr "%s ৰ সৈতে খোলক"

 #: ../js/ui/autorunManager.js:586
 msgid "Eject"
@@ -588,8 +596,8 @@ msgstr[1] "%s স্বচালিতভাৱে %d ছেকেণ্ডৰ
 #, c-format
 msgid "You will be logged out automatically in %d second."
 msgid_plural "You will be logged out automatically in %d seconds."
-msgstr[0] "আপুনি স্বচালিতভাৱে %d ছেকেণ্ডসমূহৰ পিছত লগ আউট হৈ যাব।"
-msgstr[1] "আপুনি স্বচালিতভাৱে %d ছেকেণ্ড পিছত লগ আউট হৈ যাব।"
+msgstr[0] "আপুনি স্বচালিতভাৱে %d ছেকেণ্ডৰ পিছত লগ আউট হৈ যাব।"
+msgstr[1] "আপুনি স্বচালিতভাৱে %d ছেকেণ্ডৰ পিছত লগ আউট হৈ যাব।"

 #: ../js/ui/endSessionDialog.js:74
 msgid "Logging out of the system."
@@ -613,7 +621,7 @@ msgstr "এই অনুপ্ৰয়োগসমূহক প্ৰস্থা
 #, c-format
 msgid "The system will power off automatically in %d second."
 msgid_plural "The system will power off automatically in %d seconds."
-msgstr[0] "চিস্টেম %d ছেকেণ্ডসমূহৰ পিছত স্বচালিতভাৱে পাৱাৰ অফ হব। "
+msgstr[0] "চিস্টেম %d ছেকেণ্ড পিছত স্বচালিতভাৱে পাৱাৰ অফ হব। "
 msgstr[1] "চিস্টেম %d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে বন্ধ হব। "

 #: ../js/ui/endSessionDialog.js:88
@@ -643,27 +651,28 @@ msgstr "এই অনুপ্ৰয়োগসমূহক প্ৰস্থা
 #, c-format
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
-msgstr[0] "চিস্টেম %d ছেকেণ্ডসমূহত স্বচালিতভাৱে পুনৰাম্ভ হব।"
+msgstr[0] "চিস্টেম %d ছেকেণ্ডত স্বচালিতভাৱে পুনৰাম্ভ হব।"
 msgstr[1] "চিস্টেম %d ছেকেণ্ডত স্বচালিতভাৱে পুনৰাম্ভ হব।"

 #: ../js/ui/endSessionDialog.js:105
 msgid "Restarting the system."
 msgstr "চিস্টেম পুনৰাম্ভ কৰা হৈ আছে।"

-#: ../js/ui/extensionSystem.js:403
+#: ../js/ui/extensionSystem.js:404
 msgid "Install"
 msgstr "ইনস্টল কৰক"

-#: ../js/ui/extensionSystem.js:407
+#: ../js/ui/extensionSystem.js:408
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
-msgstr "extensions.gnome.org -ৰ পৰা  '%s' -ক ডাউনল'ড আৰু ইনস্টল কৰিব নে?"
+msgstr "extensions.gnome.org ৰ পৰা  '%s' ক ডাউনল'ড আৰু ইনস্টল কৰিব নে?"

 #: ../js/ui/keyboard.js:327
 msgid "tray"
 msgstr "ট্ৰে"

-#: ../js/ui/keyboard.js:544 ../js/ui/status/power.js:203
+#: ../js/ui/keyboard.js:544 ../js/ui/status/keyboard.js:44
+#: ../js/ui/status/power.js:203
 msgid "Keyboard"
 msgstr "কিবৰ্ড"

@@ -675,51 +684,51 @@ msgstr "পাছৱাৰ্ড:"
 msgid "Type again:"
 msgstr "আকৌ টাইপ কৰক:"

-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:732
 msgid "No extensions installed"
 msgstr "কোনো সম্প্ৰসাৰন ইনস্টল কৰা হোৱা নাই"

 #. Translators: argument is an extension UUID.
-#: ../js/ui/lookingGlass.js:779
+#: ../js/ui/lookingGlass.js:786
 #, c-format
 msgid "%s has not emitted any errors."
 msgstr "%s এ কোনো ত্ৰুটি প্ৰেৰণ কৰা নাই।"

-#: ../js/ui/lookingGlass.js:785
+#: ../js/ui/lookingGlass.js:792
 msgid "Hide Errors"
 msgstr "ত্ৰুটিসমূহ লুকুৱাওক"

-#: ../js/ui/lookingGlass.js:789 ../js/ui/lookingGlass.js:840
+#: ../js/ui/lookingGlass.js:796 ../js/ui/lookingGlass.js:847
 msgid "Show Errors"
 msgstr "ত্ৰুটিসমূহ দেখুৱাওক"

-#: ../js/ui/lookingGlass.js:798
+#: ../js/ui/lookingGlass.js:805
 msgid "Enabled"
 msgstr "সামৰ্থবান কৰা আছে"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:801 ../src/gvc/gvc-mixer-control.c:1093
+#: ../js/ui/lookingGlass.js:808 ../src/gvc/gvc-mixer-control.c:1082
 msgid "Disabled"
 msgstr "অসামৰ্থবান কৰা আছে"

-#: ../js/ui/lookingGlass.js:803
+#: ../js/ui/lookingGlass.js:810
 msgid "Error"
 msgstr "ত্ৰুটি"

-#: ../js/ui/lookingGlass.js:805
+#: ../js/ui/lookingGlass.js:812
 msgid "Out of date"
 msgstr "পুৰনি"

-#: ../js/ui/lookingGlass.js:807
+#: ../js/ui/lookingGlass.js:814
 msgid "Downloading"
-msgstr "ডাউনলোড কৰা হৈ আছে"
+msgstr "ডাউনল'ড কৰা হৈ আছে"

-#: ../js/ui/lookingGlass.js:828
+#: ../js/ui/lookingGlass.js:835
 msgid "View Source"
 msgstr "উৎস দৰ্শন কৰক"

-#: ../js/ui/lookingGlass.js:834
+#: ../js/ui/lookingGlass.js:841
 msgid "Web Page"
 msgstr "ৱেব পৃষ্ঠা"

@@ -759,7 +768,7 @@ msgstr "পাছৱাৰ্ড: "
 #. static WEP
 #: ../js/ui/networkAgent.js:248
 msgid "Key: "
-msgstr "চাবি: "
+msgstr "কি': "

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
@@ -774,7 +783,7 @@ msgstr "পৰিচয়: "

 #: ../js/ui/networkAgent.js:288
 msgid "Private key password: "
-msgstr "ব্যক্তিগত চাবি পাছৱাৰ্ড: "
+msgstr "ব্যক্তিগত কি' পাছৱাৰ্ড: "

 #: ../js/ui/networkAgent.js:300
 msgid "Service: "
@@ -790,7 +799,7 @@ msgid ""
 "Passwords or encryption keys are required to access the wireless network '%"
 "s'."
 msgstr ""
-"বেতাঁৰ নেটৱাৰ্ক '%s' অভিগম কৰিবলে পাছৱাৰ্ডসমূহ অথবা ইনক্ৰিপষণ চাবিসমূহৰ প্ৰয়োজন।"
+"বেতাঁৰ নেটৱাৰ্ক '%s' অভিগম কৰিবলে পাছৱাৰ্ডসমূহ অথবা ইনক্ৰিপষণ কি'সমূহৰ প্ৰয়োজন।"

 #: ../js/ui/networkAgent.js:334
 msgid "Wired 802.1X authentication"
@@ -806,11 +815,11 @@ msgstr "DSL প্ৰমাণীকৰণ"

 #: ../js/ui/networkAgent.js:348
 msgid "PIN code required"
-msgstr "PIN কোডৰ প্ৰয়োজন"
+msgstr "PIN ক'ডৰ প্ৰয়োজন"

 #: ../js/ui/networkAgent.js:349
 msgid "PIN code is needed for the mobile broadband device"
-msgstr "মবাইল ব্ৰডবেণ্ড সেৱাৰ বাবে PIN কোডৰ প্ৰয়োজন"
+msgstr "মবাইল ব্ৰডবেণ্ড সেৱাৰ বাবে PIN ক'ডৰ প্ৰয়োজন"

 #: ../js/ui/networkAgent.js:350
 msgid "PIN: "
@@ -823,7 +832,7 @@ msgstr "মবাইল ব্ৰডবেণ্ড নেটৱাৰ্ক প
 #: ../js/ui/networkAgent.js:357
 #, c-format
 msgid "A password is required to connect to '%s'."
-msgstr "'%s' -লে সংযোগ কৰিবলে এটা পাছৱাৰ্ডৰ প্ৰয়োজন।"
+msgstr "'%s' লে সংযোগ কৰিবলে এটা পাছৱাৰ্ডৰ প্ৰয়োজন।"

 #: ../js/ui/overview.js:90
 msgid "Undo"
@@ -847,17 +856,17 @@ msgstr "অনুপ্ৰয়োগসমূহ"
 msgid "Dash"
 msgstr "ডেশ"

-#: ../js/ui/panel.js:591
+#: ../js/ui/panel.js:592
 msgid "Quit"
 msgstr "প্ৰস্থান কৰক"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:623
+#: ../js/ui/panel.js:624
 msgid "Activities"
 msgstr "কাৰ্য্যসমূহ"

-#: ../js/ui/panel.js:998
+#: ../js/ui/panel.js:999
 msgid "Top Bar"
 msgstr "উপৰৰ বাৰ"

@@ -872,7 +881,7 @@ msgstr "পুনৰ চেষ্টা কৰক"

 #: ../js/ui/placeDisplay.js:156
 msgid "Connect to..."
-msgstr "-লে সংযোগ কৰক..."
+msgstr "লে সংযোগ কৰক..."

 #: ../js/ui/placeDisplay.js:367
 msgid "PLACES & DEVICES"
@@ -909,13 +918,13 @@ msgstr "toggle-switch-us"

 #: ../js/ui/runDialog.js:205
 msgid "Please enter a command:"
-msgstr "অনুগ্ৰহ কৰি এটা কমান্ড সোমাওক:"
+msgstr "অনুগ্ৰহ কৰি এটা কমান্ড সুমুৱাওক:"

-#: ../js/ui/searchDisplay.js:331
+#: ../js/ui/searchDisplay.js:332
 msgid "Searching..."
-msgstr "বিচৰা হৈ আছে..."
+msgstr "সন্ধান কৰা হৈছে..."

-#: ../js/ui/searchDisplay.js:413
+#: ../js/ui/searchDisplay.js:415
 msgid "No matching results."
 msgstr "কোনো মিল থকা ফলাফল নাই।"

@@ -960,19 +969,19 @@ msgstr "চক্ষ সতৰ্কবাৰ্তাসমূহ"

 #: ../js/ui/status/accessibility.js:70
 msgid "Sticky Keys"
-msgstr "স্টিকি চাবিসমূহ"
+msgstr "স্টিকি কি'সমূহ"

 #: ../js/ui/status/accessibility.js:73
 msgid "Slow Keys"
-msgstr "মন্থৰ চাবিসমূহ"
+msgstr "মন্থৰ কি'সমূহ"

 #: ../js/ui/status/accessibility.js:76
 msgid "Bounce Keys"
-msgstr "বাউঞ্চ চাবিসমূহ"
+msgstr "বাউঞ্চ কি'সমূহ"

 #: ../js/ui/status/accessibility.js:79
 msgid "Mouse Keys"
-msgstr "মাউচ চাবিসমূহ"
+msgstr "মাউছ কি'সমূহ"

 #: ../js/ui/status/accessibility.js:83
 msgid "Universal Access Settings"
@@ -1049,7 +1058,7 @@ msgstr "কিবৰ্ড সংহতিসমূহ"

 #: ../js/ui/status/bluetooth.js:271
 msgid "Mouse Settings"
-msgstr "মাউচ আৰু টাচপেড সংহতিসমূহ"
+msgstr "মাউছ আৰু টাচপেড সংহতিসমূহ"

 #: ../js/ui/status/bluetooth.js:276 ../js/ui/status/volume.js:59
 msgid "Sound Settings"
@@ -1058,12 +1067,12 @@ msgstr "শব্দ সংহতিসমূহ"
 #: ../js/ui/status/bluetooth.js:372
 #, c-format
 msgid "Authorization request from %s"
-msgstr "%s -ৰ পৰা প্ৰমাণীকৰণ অনুৰোধ"
+msgstr "%s ৰ পৰা প্ৰমাণীকৰণ অনুৰোধ"

 #: ../js/ui/status/bluetooth.js:378
 #, c-format
 msgid "Device %s wants access to the service '%s'"
-msgstr "ডিভাইচ %s -এ সেৱা '%s' -লে অভিগম বিচাৰে"
+msgstr "ডিভাইচ %s এ সেৱা '%s' লে অভিগম বিচাৰে"

 #: ../js/ui/status/bluetooth.js:380
 msgid "Always grant access"
@@ -1073,24 +1082,24 @@ msgstr "সদায় অভিগম প্ৰদান কৰক"
 msgid "Grant this time only"
 msgstr "কেৱল এইবাৰৰ কাৰণে প্ৰদান কৰক"

-#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1091
+#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1093
 msgid "Reject"
 msgstr "নাকচ কৰক"

 #: ../js/ui/status/bluetooth.js:408
 #, c-format
 msgid "Pairing confirmation for %s"
-msgstr "%s -ৰ কাৰণে যোৰ প্ৰতিশ্ৰুতি"
+msgstr "%s ৰ কাৰণে যোৰ প্ৰতিশ্ৰুতি"

 #: ../js/ui/status/bluetooth.js:414 ../js/ui/status/bluetooth.js:444
 #, c-format
 msgid "Device %s wants to pair with this computer"
-msgstr "ডিভাইচ %s -এ এই কমপিউটাৰৰ লগত সংযোগ কৰিব বিচাৰে"
+msgstr "ডিভাইচ %s এ এই কমপিউটাৰৰ লগত সংযোগ কৰিব বিচাৰে"

 #: ../js/ui/status/bluetooth.js:415
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
-msgstr "অনুগ্ৰহ কৰি সুনিশ্চিত কৰক যে PIN '%s' ডিভাইচত থকাটোৰ লগত মিল খায়।"
+msgstr "অনুগ্ৰহ কৰি সুনিশ্চিত কৰক যে PIN '%s' ডিভাইচত থকাটোৰ সৈতে মিল খায়।"

 #: ../js/ui/status/bluetooth.js:417
 msgid "Matches"
@@ -1103,11 +1112,11 @@ msgstr "মিল নাখায়"
 #: ../js/ui/status/bluetooth.js:437
 #, c-format
 msgid "Pairing request for %s"
-msgstr "%s -ৰ কাৰণে যোৰ অনুৰোধ"
+msgstr "%s ৰ কাৰণে যোৰ অনুৰোধ"

 #: ../js/ui/status/bluetooth.js:445
 msgid "Please enter the PIN mentioned on the device."
-msgstr "অনুগ্ৰহ কৰি ডিভাইচত উল্লেখ কৰা PIN সোমাওক।"
+msgstr "অনুগ্ৰহ কৰি ডিভাইচত উল্লেখ কৰা PIN সুমুৱাওক।"

 #: ../js/ui/status/bluetooth.js:461
 msgid "OK"
@@ -1261,7 +1270,7 @@ msgstr "অনুমান কৰা হৈ আছে..."
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
 msgstr[0] "%d ঘন্টা অৱশিষ্ট"
-msgstr[1] "%d ঘন্টাসমূহ অৱশিষ্ট"
+msgstr[1] "%d ঘন্টা অৱশিষ্ট"

 #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
 #: ../js/ui/status/power.js:108
@@ -1273,20 +1282,20 @@ msgstr "%d %s %d %s অৱশিষ্ট"
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ঘন্টা"
-msgstr[1] "ঘন্টাসমূহ"
+msgstr[1] "ঘন্টা"

 #: ../js/ui/status/power.js:110
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "মিনিট"
-msgstr[1] "মিনিটসমূহ"
+msgstr[1] "মিনিট"

 #: ../js/ui/status/power.js:113
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "%d মিনিট অৱশিষ্ট"
-msgstr[1] "%d মিনিটসমূহ অৱশিষ্ট"
+msgstr[1] "%d মিনিট অৱশিষ্ট"

 #: ../js/ui/status/power.js:116 ../js/ui/status/power.js:186
 #, c-format
@@ -1337,7 +1346,7 @@ msgstr "কমপিউটাৰ"
 #. Translators: This is the label for audio volume
 #: ../js/ui/status/volume.js:25 ../js/ui/status/volume.js:39
 msgid "Volume"
-msgstr "আয়তন"
+msgstr "ভলিউম"

 #: ../js/ui/status/volume.js:51
 msgid "Microphone"
@@ -1390,71 +1399,71 @@ msgstr "%s ব্যস্ত আছে।"
 #. 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/telepathyClient.js:887
+#: ../js/ui/telepathyClient.js:889
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
-msgstr "<b>%X</b> on <b>%A</b> -ত পঠোৱা হৈছে"
+msgstr "<b>%X</b> on <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/telepathyClient.js:893
+#: ../js/ui/telepathyClient.js:895
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
-msgstr "<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/telepathyClient.js:898
+#: ../js/ui/telepathyClient.js:900
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
-msgstr "<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/telepathyClient.js:940
+#: ../js/ui/telepathyClient.js:942
 #, 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/telepathyClient.js:1042
+#: ../js/ui/telepathyClient.js:1044
 #, c-format
 msgid "Invitation to %s"
-msgstr "%s -লে নিমন্ত্ৰণ"
+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/telepathyClient.js:1050
+#: ../js/ui/telepathyClient.js:1052
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "%s -এ আপোনাক %s -ত অংশগ্ৰহণ কৰিবলে আমন্ত্ৰণ জনাইছে"
+msgstr "%s এ আপোনাক %s ত অংশগ্ৰহণ কৰিবলে আমন্ত্ৰণ জনাইছে"

-#: ../js/ui/telepathyClient.js:1052 ../js/ui/telepathyClient.js:1131
-#: ../js/ui/telepathyClient.js:1229
+#: ../js/ui/telepathyClient.js:1054 ../js/ui/telepathyClient.js:1133
+#: ../js/ui/telepathyClient.js:1231
 msgid "Decline"
 msgstr "নাকচ কৰক"

-#: ../js/ui/telepathyClient.js:1053 ../js/ui/telepathyClient.js:1132
-#: ../js/ui/telepathyClient.js:1230
+#: ../js/ui/telepathyClient.js:1055 ../js/ui/telepathyClient.js:1134
+#: ../js/ui/telepathyClient.js:1232
 msgid "Accept"
 msgstr "গ্ৰহন কৰক"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1083
+#: ../js/ui/telepathyClient.js:1085
 #, c-format
 msgid "Video call from %s"
-msgstr "%s -ৰ পৰা ভিডিঅ' কল"
+msgstr "%s ৰ পৰা ভিডিঅ' কল"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1086
+#: ../js/ui/telepathyClient.js:1088
 #, c-format
 msgid "Call from %s"
 msgstr "%s - পৰা কল"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/telepathyClient.js:1093
+#: ../js/ui/telepathyClient.js:1095
 msgid "Answer"
 msgstr "উত্তৰ"

@@ -1463,107 +1472,107 @@ msgstr "উত্তৰ"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/telepathyClient.js:1125
+#: ../js/ui/telepathyClient.js:1127
 #, c-format
 msgid "%s is sending you %s"
-msgstr "%s -এ আপোনাক %s পঠাই আছে"
+msgstr "%s এ আপোনাক %s পঠাই আছে"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/telepathyClient.js:1194
+#: ../js/ui/telepathyClient.js:1196
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr "আপুনি কেতিয়া অনলাইন আছে চাবলে %s -এ অনুমতি বিচাৰিব"
+msgstr "আপুনি কেতিয়া অনলাইন আছে চাবলে %s এ অনুমতি বিচাৰিব"

-#: ../js/ui/telepathyClient.js:1287
+#: ../js/ui/telepathyClient.js:1289
 msgid "Network error"
 msgstr "নেটৱাৰ্ক ত্ৰুটি"

-#: ../js/ui/telepathyClient.js:1289
+#: ../js/ui/telepathyClient.js:1291
 msgid "Authentication failed"
 msgstr "প্ৰমাণীকৰণ ব্যৰ্থ"

-#: ../js/ui/telepathyClient.js:1291
+#: ../js/ui/telepathyClient.js:1293
 msgid "Encryption error"
 msgstr "ইনক্ৰিপষণ ত্ৰুটি"

-#: ../js/ui/telepathyClient.js:1293
+#: ../js/ui/telepathyClient.js:1295
 msgid "Certificate not provided"
 msgstr "প্ৰমাণপত্ৰ প্ৰদান কৰা হোৱা নাই"

-#: ../js/ui/telepathyClient.js:1295
+#: ../js/ui/telepathyClient.js:1297
 msgid "Certificate untrusted"
 msgstr "প্ৰমাণপত্ৰক ভৰষা কৰিব নোৱাৰি"

-#: ../js/ui/telepathyClient.js:1297
+#: ../js/ui/telepathyClient.js:1299
 msgid "Certificate expired"
 msgstr "প্ৰমাণপত্ৰৰ অৱসান ঘটিছে"

-#: ../js/ui/telepathyClient.js:1299
+#: ../js/ui/telepathyClient.js:1301
 msgid "Certificate not activated"
 msgstr "প্ৰমাণপত্ৰ সক্ৰিয় কৰা হোৱা নাই"

-#: ../js/ui/telepathyClient.js:1301
+#: ../js/ui/telepathyClient.js:1303
 msgid "Certificate hostname mismatch"
 msgstr "প্ৰমাণপত্ৰ হস্টনাম অমিল"

-#: ../js/ui/telepathyClient.js:1303
-msgid "Certificate fingerprint mismatch"
-msgstr "প্ৰমাণপত্ৰ ফিন্গাৰপ্ৰিন্ট অমিল"
-
 #: ../js/ui/telepathyClient.js:1305
-msgid "Certificate self-signed"
-msgstr "প্ৰমাণপত্ৰ স্বস্বাক্ষৰীত"
+msgid "Certificate fingerprint mismatch"
+msgstr "প্ৰমাণপত্ৰ ফিংগাৰপ্ৰিন্ট অমিল"

 #: ../js/ui/telepathyClient.js:1307
+msgid "Certificate self-signed"
+msgstr "প্ৰমাণপত্ৰ স্ব-স্বাক্ষৰীত"
+
+#: ../js/ui/telepathyClient.js:1309
 msgid "Status is set to offline"
 msgstr "অৱস্থা অফলাইনলে সংহতি কৰা হৈছে"

-#: ../js/ui/telepathyClient.js:1309
+#: ../js/ui/telepathyClient.js:1311
 msgid "Encryption is not available"
 msgstr "ইনক্ৰিপষণ উপলব্ধ নহয়"

-#: ../js/ui/telepathyClient.js:1311
+#: ../js/ui/telepathyClient.js:1313
 msgid "Certificate is invalid"
 msgstr "প্ৰমাণপত্ৰ অবৈধ"

-#: ../js/ui/telepathyClient.js:1313
+#: ../js/ui/telepathyClient.js:1315
 msgid "Connection has been refused"
 msgstr "সংযোগ নাকচ কৰা হৈছে"

-#: ../js/ui/telepathyClient.js:1315
+#: ../js/ui/telepathyClient.js:1317
 msgid "Connection can't be established"
 msgstr "সংযোগ স্থাপন কৰিব নোৱাৰি"

-#: ../js/ui/telepathyClient.js:1317
+#: ../js/ui/telepathyClient.js:1319
 msgid "Connection has been lost"
 msgstr "সংযোগ হেৰাইছে"

-#: ../js/ui/telepathyClient.js:1319
+#: ../js/ui/telepathyClient.js:1321
 msgid "This account is already connected to the server"
 msgstr "এই একাওন্ট ইতিমধ্যে চাৰ্ভাৰৰ সৈতে সংযোগিত"

-#: ../js/ui/telepathyClient.js:1321
+#: ../js/ui/telepathyClient.js:1323
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "সংযোগক একে সম্পদ ব্যৱহাৰ কৰি এটা নতুন সংযোগৰে প্ৰতিস্থাপন কৰা হৈছে"

-#: ../js/ui/telepathyClient.js:1323
+#: ../js/ui/telepathyClient.js:1325
 msgid "The account already exists on the server"
 msgstr "একাওন্ট ইতিমধ্যে চাৰ্ভাৰত উপস্থিত"

-#: ../js/ui/telepathyClient.js:1325
+#: ../js/ui/telepathyClient.js:1327
 msgid "Server is currently too busy to handle the connection"
 msgstr "চাৰ্ভাৰ সংযোগ ব্যৱস্থাপনা কৰিবলে বৰ্তমানে অতি ব্যস্ত"

-#: ../js/ui/telepathyClient.js:1327
+#: ../js/ui/telepathyClient.js:1329
 msgid "Certificate has been revoked"
 msgstr "প্ৰমাণপত্ৰ প্ৰত্যাহাৰ কৰা হৈছে"

-#: ../js/ui/telepathyClient.js:1329
+#: ../js/ui/telepathyClient.js:1331
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "প্ৰমাণপত্ৰয় এটা অসুৰক্ষিত চিফাৰ এলগৰিথম ব্যৱহাৰ কৰে অথবা ক্ৰিপ্টোগ্ৰাফিয়ভাৱে দুৰ্বল"

-#: ../js/ui/telepathyClient.js:1331
+#: ../js/ui/telepathyClient.js:1333
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -1571,26 +1580,26 @@ msgstr ""
 "চাৰ্ভাৰ প্ৰমাণপত্ৰৰ দৈৰ্ঘ, অথবা চাৰ্ভাৰ প্ৰমাণপত্ৰ শৃংখলৰ গভীৰতা, ক্ৰিপ্টোগ্ৰাফী "
 "লাইব্ৰেৰীয়ে প্ৰণয়ন কৰা সীমাসমূহত অতিক্ৰম কৰে"

-#: ../js/ui/telepathyClient.js:1333
+#: ../js/ui/telepathyClient.js:1335
 msgid "Internal error"
 msgstr "অভ্যন্তৰীক ত্ৰুটি"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1343
+#: ../js/ui/telepathyClient.js:1345
 #, c-format
 msgid "Connection to %s failed"
-msgstr "%s -লে সংযোগ ব্যৰ্থ"
+msgstr "%s লে সংযোগ ব্যৰ্থ"

-#: ../js/ui/telepathyClient.js:1352
+#: ../js/ui/telepathyClient.js:1354
 msgid "Reconnect"
 msgstr "পুনৰ সংযোগ কৰক"

-#: ../js/ui/telepathyClient.js:1353
+#: ../js/ui/telepathyClient.js:1355
 msgid "Edit account"
 msgstr "একাওন্ট সম্পাদন কৰক"

-#: ../js/ui/telepathyClient.js:1399
+#: ../js/ui/telepathyClient.js:1401
 msgid "Unknown reason"
 msgstr "অজ্ঞাত কাৰণ"

@@ -1608,7 +1617,7 @@ msgstr "উপলব্ধ নাই"

 #: ../js/ui/userMenu.js:595 ../js/ui/userMenu.js:599 ../js/ui/userMenu.js:669
 msgid "Power Off..."
-msgstr "১"
+msgstr "পাৱাৰ অফ"

 #: ../js/ui/userMenu.js:631
 msgid "Notifications"
@@ -1628,11 +1637,11 @@ msgstr "পৰ্দা লক কৰক"

 #: ../js/ui/userMenu.js:655
 msgid "Switch User"
-msgstr "ব্যৱহাৰকাৰী অদল বদল কৰক"
+msgstr "ব্যৱহাৰকাৰী পৰিবৰ্তন কৰক"

 #: ../js/ui/userMenu.js:660
 msgid "Log Out..."
-msgstr "লগ আউট..."
+msgstr "লগ আউট কৰক..."

 #: ../js/ui/userMenu.js:688
 msgid "Your chat status will be set to busy"
@@ -1653,7 +1662,7 @@ msgstr ""
 #. characters.
 #: ../js/ui/viewSelector.js:113
 msgid "Type to search..."
-msgstr "বিচাৰিবলে টাইপ কৰক..."
+msgstr "সন্ধান কৰিবলে টাইপ কৰক..."

 #: ../js/ui/viewSelector.js:131 ../src/shell-util.c:252
 msgid "Search"
@@ -1684,7 +1693,7 @@ msgstr "'%s' প্ৰস্তুত"

 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1100
+#: ../src/gvc/gvc-mixer-control.c:1089
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1693,14 +1702,14 @@ msgstr[1] "%u আউটপুটসমূহ"

 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1110
+#: ../src/gvc/gvc-mixer-control.c:1099
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u ইনপুট"
 msgstr[1] "%u ইনপুটসমূহ"

-#: ../src/gvc/gvc-mixer-control.c:1408
+#: ../src/gvc/gvc-mixer-control.c:1397
 msgid "System Sounds"
 msgstr "চিস্টেম শব্দসমূহ"

@@ -1766,7 +1775,7 @@ msgstr "%1$s: %2$s"
 #~ msgstr "পাছৱাৰ্ড দেখুৱাওক"

 #~ msgid "%s has finished starting"
-#~ msgstr "%s -এ আৰম্ভ কৰা সমাপ্ত কৰিছে"
+#~ msgstr "%s এ আৰম্ভ কৰা সমাপ্ত কৰিছে"

 #~ msgid "Home Folder"
 #~ msgstr "ঘৰ ফোল্ডাৰ"
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/da.po
+++ b/po/da.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-22 15:47+0100\n"
-"PO-Revision-Date: 2012-03-22 13:02+0100\n"
+"POT-Creation-Date: 2013-10-07 22:45+0200\n"
+"PO-Revision-Date: 2013-10-06 15:29+0200\n"
 "Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -137,34 +137,42 @@ msgid "If true, display the ISO week date in the calendar."
 msgstr "Hvis sand vises ISO-ugenummeret i kalenderen."

 #: ../data/org.gnome.shell.gschema.xml.in.h:16
+msgid "Keybinding to open the application menu"
+msgstr "Tastebinding til at åbne programmenuen"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
+msgid "Keybinding to open the application menu."
+msgstr "Tastebinding til at åbne programmenuen."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid "Which keyboard to use"
 msgstr "Hvilket tastatur bruges"

-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid "The type of keyboard to use."
 msgstr "Tastaturtypen som bruges."

-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Show time with seconds"
 msgstr "Vis tid med sekunder"

-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "If true, display seconds in time."
 msgstr "Hvis sand vises sekunder i klokkeslæt."

-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "Show date in clock"
 msgstr "Vis dato i uret"

-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid "If true, display date in the clock, in addition to time."
 msgstr "Hvis sand vises datoen i uret, som tillæg til tiden."

-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:24
 msgid "Framerate used for recording screencasts."
 msgstr "Billedfrekvens brugt til skærmoptagelser."

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:25
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -172,11 +180,11 @@ msgstr ""
 "Billedfrekvensen på den endelige skærmoptagelse, optaget af GNOME-Shells "
 "skærmoptager i billeder-per-sekund."

-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:26
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Datakanalen for Gstreamer bruges til indkodning af skærmoptagelsen"

-#: ../data/org.gnome.shell.gschema.xml.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.h:28
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -201,11 +209,11 @@ msgstr ""
 "webmmux\" og optager i WEBM-formatet med VP8-codec'et. %T bruges som "
 "pladsholder for et gæt om det optimale trådantal på systemet."

-#: ../data/org.gnome.shell.gschema.xml.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.h:29
 msgid "File extension used for storing the screencast"
 msgstr "Filendelse til at gemme skærmoptagelser"

-#: ../data/org.gnome.shell.gschema.xml.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.h:30
 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 "
@@ -229,40 +237,40 @@ msgid "Select an extension to configure using the combobox above."
 msgstr ""
 "Vælg en udvidelse at konfigurere ved hjælp af kombinationsboksen ovenfor."

-#: ../js/gdm/loginDialog.js:624
+#: ../js/gdm/loginDialog.js:627
 msgid "Session..."
 msgstr "Session..."

-#: ../js/gdm/loginDialog.js:786
+#: ../js/gdm/loginDialog.js:789
 msgctxt "title"
 msgid "Sign In"
 msgstr "Log ind"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/loginDialog.js:831
+#: ../js/gdm/loginDialog.js:834
 msgid "(or swipe finger)"
 msgstr "(eller indlæs fingeraftryk)"

 #. 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:852
+#: ../js/gdm/loginDialog.js:855
 msgid "Not listed?"
 msgstr "Ikke listet?"

-#: ../js/gdm/loginDialog.js:1020 ../js/ui/endSessionDialog.js:401
-#: ../js/ui/extensionSystem.js:399 ../js/ui/networkAgent.js:153
+#: ../js/gdm/loginDialog.js:1023 ../js/ui/endSessionDialog.js:401
+#: ../js/ui/extensionSystem.js:400 ../js/ui/networkAgent.js:153
 #: ../js/ui/polkitAuthenticationAgent.js:175 ../js/ui/status/bluetooth.js:462
 msgid "Cancel"
 msgstr "Annullér"

-#: ../js/gdm/loginDialog.js:1025
+#: ../js/gdm/loginDialog.js:1028
 msgctxt "button"
 msgid "Sign In"
 msgstr "Log ind"

-#: ../js/gdm/loginDialog.js:1377
+#: ../js/gdm/loginDialog.js:1380
 msgid "Login Window"
 msgstr "Indlogningsvindue"

@@ -660,11 +668,11 @@ msgstr[1] "Systemet vil genstarte automatisk om %d sekunder."
 msgid "Restarting the system."
 msgstr "Genstarter systemet."

-#: ../js/ui/extensionSystem.js:403
+#: ../js/ui/extensionSystem.js:404
 msgid "Install"
 msgstr "Installér"

-#: ../js/ui/extensionSystem.js:407
+#: ../js/ui/extensionSystem.js:408
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Hent og installér \"%s\" fra extensions.gnome.org?"
@@ -673,7 +681,8 @@ msgstr "Hent og installér \"%s\" fra extensions.gnome.org?"
 msgid "tray"
 msgstr "statusfelt"

-#: ../js/ui/keyboard.js:544 ../js/ui/status/power.js:203
+#: ../js/ui/keyboard.js:544 ../js/ui/status/keyboard.js:44
+#: ../js/ui/status/power.js:203
 msgid "Keyboard"
 msgstr "Tastatur"

@@ -685,51 +694,51 @@ msgstr "Adgangskode:"
 msgid "Type again:"
 msgstr "Indtast igen:"

-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:732
 msgid "No extensions installed"
 msgstr "Ingen udvidelser er installeret"

 #. Translators: argument is an extension UUID.
-#: ../js/ui/lookingGlass.js:779
+#: ../js/ui/lookingGlass.js:786
 #, c-format
 msgid "%s has not emitted any errors."
 msgstr "%s er ikke kommet med nogen fejl."

-#: ../js/ui/lookingGlass.js:785
+#: ../js/ui/lookingGlass.js:792
 msgid "Hide Errors"
 msgstr "Skjul fejl"

-#: ../js/ui/lookingGlass.js:789 ../js/ui/lookingGlass.js:840
+#: ../js/ui/lookingGlass.js:796 ../js/ui/lookingGlass.js:847
 msgid "Show Errors"
 msgstr "Vis fejl"

-#: ../js/ui/lookingGlass.js:798
+#: ../js/ui/lookingGlass.js:805
 msgid "Enabled"
 msgstr "Aktiveret"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:801 ../src/gvc/gvc-mixer-control.c:1093
+#: ../js/ui/lookingGlass.js:808 ../src/gvc/gvc-mixer-control.c:1082
 msgid "Disabled"
 msgstr "Deaktiveret"

-#: ../js/ui/lookingGlass.js:803
+#: ../js/ui/lookingGlass.js:810
 msgid "Error"
 msgstr "Fejl"

-#: ../js/ui/lookingGlass.js:805
+#: ../js/ui/lookingGlass.js:812
 msgid "Out of date"
 msgstr "Udløbet"

-#: ../js/ui/lookingGlass.js:807
+#: ../js/ui/lookingGlass.js:814
 msgid "Downloading"
 msgstr "Henter"

-#: ../js/ui/lookingGlass.js:828
+#: ../js/ui/lookingGlass.js:835
 msgid "View Source"
 msgstr "Vis kilde"

-#: ../js/ui/lookingGlass.js:834
+#: ../js/ui/lookingGlass.js:841
 msgid "Web Page"
 msgstr "Webside"

@@ -858,17 +867,17 @@ msgstr "Programmer"
 msgid "Dash"
 msgstr "Favoritområde"

-#: ../js/ui/panel.js:591
+#: ../js/ui/panel.js:592
 msgid "Quit"
 msgstr "Afslut"

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

-#: ../js/ui/panel.js:998
+#: ../js/ui/panel.js:999
 msgid "Top Bar"
 msgstr "Toppanel"

@@ -926,7 +935,7 @@ msgstr "Indtast en kommando:"
 msgid "Searching..."
 msgstr "Søger..."

-#: ../js/ui/searchDisplay.js:414
+#: ../js/ui/searchDisplay.js:415
 msgid "No matching results."
 msgstr "Ingen resultater fundet."

@@ -946,7 +955,7 @@ msgstr "Vis tekst"
 msgid "Hide Text"
 msgstr "Skjul tekst"

-#: ../js/ui/shellMountOperation.js:271
+#: ../js/ui/shellMountOperation.js:280
 msgid "Wrong password, please try again"
 msgstr "Forkert adgangskode, forsøg venligst igen"

@@ -1084,7 +1093,7 @@ msgstr "Giv altid adgang"
 msgid "Grant this time only"
 msgstr "Giv kun lov denne gang"

-#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1091
+#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1106
 msgid "Reject"
 msgstr "Afvis"

@@ -1356,44 +1365,44 @@ msgstr "Mikrofon"

 #. FIXME: We don't have a 'chat room' icon (bgo #653737) use
 #. system-users for now as Empathy does.
-#: ../js/ui/telepathyClient.js:220
+#: ../js/ui/telepathyClient.js:226
 msgid "Invitation"
 msgstr "Invitation"

 #. We got the TpContact
-#: ../js/ui/telepathyClient.js:271
+#: ../js/ui/telepathyClient.js:284
 msgid "Call"
 msgstr "Opkald"

 #. We got the TpContact
-#: ../js/ui/telepathyClient.js:287
+#: ../js/ui/telepathyClient.js:300
 msgid "File Transfer"
 msgstr "Filoverførsel"

-#: ../js/ui/telepathyClient.js:369
+#: ../js/ui/telepathyClient.js:382
 msgid "Subscription request"
 msgstr "Godkendelsesforespørgsel"

-#: ../js/ui/telepathyClient.js:405
+#: ../js/ui/telepathyClient.js:418
 msgid "Connection error"
 msgstr "Forbindelsesfejl"

-#: ../js/ui/telepathyClient.js:663
+#: ../js/ui/telepathyClient.js:676
 #, c-format
 msgid "%s is online."
 msgstr "%s er online."

-#: ../js/ui/telepathyClient.js:667
+#: ../js/ui/telepathyClient.js:680
 #, c-format
 msgid "%s is offline."
 msgstr "%s er offline."

-#: ../js/ui/telepathyClient.js:671
+#: ../js/ui/telepathyClient.js:684
 #, c-format
 msgid "%s is away."
 msgstr "%s er ikke til stede."

-#: ../js/ui/telepathyClient.js:674
+#: ../js/ui/telepathyClient.js:687
 #, c-format
 msgid "%s is busy."
 msgstr "%s er optaget."
@@ -1401,35 +1410,35 @@ msgstr "%s er optaget."
 #. 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/telepathyClient.js:887
+#: ../js/ui/telepathyClient.js:902
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Sendt <b>%A</b> kl. <b>%H:%M</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/telepathyClient.js:893
+#: ../js/ui/telepathyClient.js:908
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Sendt <b>%A</b> den <b>%e. %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/telepathyClient.js:898
+#: ../js/ui/telepathyClient.js:913
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Sendt <b>%A</b> den <b>%e. %B</b>, %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/telepathyClient.js:940
+#: ../js/ui/telepathyClient.js:955
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s kalder sig nu %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1042
+#: ../js/ui/telepathyClient.js:1057
 #, c-format
 msgid "Invitation to %s"
 msgstr "Invitation til %s"
@@ -1437,35 +1446,35 @@ msgstr "Invitation 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/telepathyClient.js:1050
+#: ../js/ui/telepathyClient.js:1065
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer dig til at deltage i %s"

-#: ../js/ui/telepathyClient.js:1052 ../js/ui/telepathyClient.js:1131
-#: ../js/ui/telepathyClient.js:1229
+#: ../js/ui/telepathyClient.js:1067 ../js/ui/telepathyClient.js:1146
+#: ../js/ui/telepathyClient.js:1244
 msgid "Decline"
 msgstr "Afvis"

-#: ../js/ui/telepathyClient.js:1053 ../js/ui/telepathyClient.js:1132
-#: ../js/ui/telepathyClient.js:1230
+#: ../js/ui/telepathyClient.js:1068 ../js/ui/telepathyClient.js:1147
+#: ../js/ui/telepathyClient.js:1245
 msgid "Accept"
 msgstr "Acceptér"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1083
+#: ../js/ui/telepathyClient.js:1098
 #, c-format
 msgid "Video call from %s"
 msgstr "Videoopkald fra %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1086
+#: ../js/ui/telepathyClient.js:1101
 #, c-format
 msgid "Call from %s"
 msgstr "Opkald fra %s"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/telepathyClient.js:1093
+#: ../js/ui/telepathyClient.js:1108
 msgid "Answer"
 msgstr "Svar"

@@ -1474,111 +1483,111 @@ msgstr "Svar"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/telepathyClient.js:1125
+#: ../js/ui/telepathyClient.js:1140
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s sender dig %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/telepathyClient.js:1194
+#: ../js/ui/telepathyClient.js:1209
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vil gerne have tilladelse til at se, når du er online"

-#: ../js/ui/telepathyClient.js:1287
+#: ../js/ui/telepathyClient.js:1302
 msgid "Network error"
 msgstr "Netværksfejl"

-#: ../js/ui/telepathyClient.js:1289
+#: ../js/ui/telepathyClient.js:1304
 msgid "Authentication failed"
 msgstr "Godkendelse mislykkedes"

-#: ../js/ui/telepathyClient.js:1291
+#: ../js/ui/telepathyClient.js:1306
 msgid "Encryption error"
 msgstr "Krypteringsfejl"

-#: ../js/ui/telepathyClient.js:1293
+#: ../js/ui/telepathyClient.js:1308
 msgid "Certificate not provided"
 msgstr "Certifikat ikke angivet"

-#: ../js/ui/telepathyClient.js:1295
+#: ../js/ui/telepathyClient.js:1310
 msgid "Certificate untrusted"
 msgstr "Utroværdigt certifikat"

-#: ../js/ui/telepathyClient.js:1297
+#: ../js/ui/telepathyClient.js:1312
 msgid "Certificate expired"
 msgstr "Certifikat udløbet"

-#: ../js/ui/telepathyClient.js:1299
+#: ../js/ui/telepathyClient.js:1314
 msgid "Certificate not activated"
 msgstr "Certifikat ikke aktiveret"

-#: ../js/ui/telepathyClient.js:1301
+#: ../js/ui/telepathyClient.js:1316
 msgid "Certificate hostname mismatch"
 msgstr "Certifikat-værtsnavn stemmer ikke"

-#: ../js/ui/telepathyClient.js:1303
+#: ../js/ui/telepathyClient.js:1318
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikat-fingeraftryk stemmer ikke"

-#: ../js/ui/telepathyClient.js:1305
+#: ../js/ui/telepathyClient.js:1320
 msgid "Certificate self-signed"
 msgstr "Certifikat selv-underskrevet"

-#: ../js/ui/telepathyClient.js:1307
+#: ../js/ui/telepathyClient.js:1322
 msgid "Status is set to offline"
 msgstr "Status er angivet til offline"

-#: ../js/ui/telepathyClient.js:1309
+#: ../js/ui/telepathyClient.js:1324
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgængelig"

-#: ../js/ui/telepathyClient.js:1311
+#: ../js/ui/telepathyClient.js:1326
 msgid "Certificate is invalid"
 msgstr "Ugyldigt certifikat"

-#: ../js/ui/telepathyClient.js:1313
+#: ../js/ui/telepathyClient.js:1328
 msgid "Connection has been refused"
 msgstr "Forbindelse er blevet afvist"

-#: ../js/ui/telepathyClient.js:1315
+#: ../js/ui/telepathyClient.js:1330
 msgid "Connection can't be established"
 msgstr "Forbindelse kan ikke oprettes"

-#: ../js/ui/telepathyClient.js:1317
+#: ../js/ui/telepathyClient.js:1332
 msgid "Connection has been lost"
 msgstr "Forbindelse er mistet"

-#: ../js/ui/telepathyClient.js:1319
+#: ../js/ui/telepathyClient.js:1334
 msgid "This account is already connected to the server"
 msgstr "Denne konto er allerede forbundet til serveren"

-#: ../js/ui/telepathyClient.js:1321
+#: ../js/ui/telepathyClient.js:1336
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Forbindelsen er blevet erstattet af en ny forbindelse, som bruger samme "
 "ressource"

-#: ../js/ui/telepathyClient.js:1323
+#: ../js/ui/telepathyClient.js:1338
 msgid "The account already exists on the server"
 msgstr "Kontoen findes allerede på serveren"

-#: ../js/ui/telepathyClient.js:1325
+#: ../js/ui/telepathyClient.js:1340
 msgid "Server is currently too busy to handle the connection"
 msgstr "Serveren er i øjeblikket for travl til at behandle forbindelsen"

-#: ../js/ui/telepathyClient.js:1327
+#: ../js/ui/telepathyClient.js:1342
 msgid "Certificate has been revoked"
 msgstr "Certifikat er blevet påberåbt"

-#: ../js/ui/telepathyClient.js:1329
+#: ../js/ui/telepathyClient.js:1344
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikat bruger en usikker cipher-algoritme eller er kryptografisk svag"

-#: ../js/ui/telepathyClient.js:1331
+#: ../js/ui/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"
@@ -1586,26 +1595,26 @@ msgstr ""
 "Længden på servercertifikatet, eller dybden af servercertifikat-kæden, "
 "overskrider grænsen, som er fastsat af det kryptografiske-programbibliotek"

-#: ../js/ui/telepathyClient.js:1333
+#: ../js/ui/telepathyClient.js:1348
 msgid "Internal error"
 msgstr "Intern fejl"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1343
+#: ../js/ui/telepathyClient.js:1358
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Forbindelse til %s mislykkedes"

-#: ../js/ui/telepathyClient.js:1352
+#: ../js/ui/telepathyClient.js:1367
 msgid "Reconnect"
 msgstr "Forbind igen"

-#: ../js/ui/telepathyClient.js:1353
+#: ../js/ui/telepathyClient.js:1368
 msgid "Edit account"
 msgstr "Redigér konto"

-#: ../js/ui/telepathyClient.js:1399
+#: ../js/ui/telepathyClient.js:1414
 msgid "Unknown reason"
 msgstr "Ukendt årsag"

@@ -1699,7 +1708,7 @@ msgstr "\"%s\" er klar"

 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1100
+#: ../src/gvc/gvc-mixer-control.c:1089
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1708,22 +1717,22 @@ msgstr[1] "%u outputs"

 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1110
+#: ../src/gvc/gvc-mixer-control.c:1099
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u input"
 msgstr[1] "%u inputs"

-#: ../src/gvc/gvc-mixer-control.c:1408
+#: ../src/gvc/gvc-mixer-control.c:1397
 msgid "System Sounds"
 msgstr "Systemlyde"

-#: ../src/main.c:255
+#: ../src/main.c:256
 msgid "Print version"
 msgstr "Udskriv version"

-#: ../src/main.c:261
+#: ../src/main.c:262
 msgid "Mode used by GDM for login screen"
 msgstr "Tilstand brugt af GDM til indlogningskærm"

@@ -1774,6 +1783,9 @@ msgstr "Filsystem"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

+#~ msgid "calendar:MY"
+#~ msgstr "calendar:MY"
+
 #~ msgid "RECENT ITEMS"
 #~ msgstr "SENESTE ELEMENTER"

--- a/po/el.po
+++ b/po/el.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/lt.po
+++ b/po/lt.po
@@ -1705,11 +1705,11 @@ msgstr ""
 #: ../js/ui/wanda.js:128
 #, c-format
 msgid "%s the Oracle says"
-msgstr "Orakulė %s sako"
+msgstr "Orakulė sako %s"

 #: ../js/ui/wanda.js:168
 msgid "Your favorite Easter Egg"
-msgstr "Jūsų mėgstamiausias velykinis kiaušinis"
+msgstr "Jūsų mėgstamiausias Velykinis kiaušinis"

 #: ../js/ui/windowAttentionHandler.js:19
 #, c-format
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: mr\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-04-24 15:39+0000\n"
-"PO-Revision-Date: 2012-05-10 09:57+0530\n"
+"POT-Creation-Date: 2012-03-30 17:59+0000\n"
+"PO-Revision-Date: 2012-04-02 11:33+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -47,6 +47,7 @@ msgid ""
 msgstr "आंतरिक डिबगिंग व Alt-F2 संवादचा वापर करून निंयत्रणकरीता प्रवेश देतो."

 #: ../data/org.gnome.shell.gschema.xml.in.h:3
+#| msgid "Uuids of extensions to disable"
 msgid "Uuids of extensions to enable"
 msgstr "सुरू करण्याजोगी एक्सटेंशन्स्चे Uuids"

@@ -58,10 +59,10 @@ msgid ""
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
 "GNOME शेल एक्सटेंशन्सकडे uuid गुणधर्म असते; हि कि एक्सटेंशन्स् दाखवते ज्यास "
-"लोड करणे आवश्यक "
-"आहे. लोड करण्याजोगी कोणत्याहि एक्सटेंशला सूचीत असणे आवश्यक आहे. org.gnome."
-"Shell वरील "
-"EnableExtension व DisableExtension DBus मेथडससह या सूचीत बदल करणे शक्य आहे."
+"लोड करणे आवश्यक आहे. "
+"लोड करण्याजोगी कोणत्याहि एक्सटेंशला सूचीत असणे आवश्यक आहे. "
+"org.gnome.Shell वरील EnableExtension व DisableExtension DBus मेथडससह या सूचीत "
+"बदल करणे शक्य आहे."

 #: ../data/org.gnome.shell.gschema.xml.in.h:5
 msgid "Whether to collect stats about applications usage"
@@ -109,8 +110,7 @@ msgid ""
 "The value here is from the TpConnectionPresenceType enumeration."
 msgstr ""
 "वापरकर्तातर्फे ठरवलेले शेवटचे IM हाजेरी साठवण्याकरीता आंतरिकपणे वापरले जाते. "
-"येथील मूल्य "
-"TpConnectionPresenceType एन्युमरेशनपासूनचे आहे."
+"येथील मूल्य TpConnectionPresenceType एन्युमरेशनपासूनचे आहे."

 #: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid ""
@@ -118,8 +118,8 @@ msgid ""
 "value here is from the GsmPresenceStatus enumeration."
 msgstr ""
 "वापरकर्तातर्फे ठरवलेले शेवटचे सत्र हाजेरी साठवण्याकरीता आंतरिकपणे वापरले जाते."
-" येथील मूल्य "
-"GsmPresenceStatus एन्युमरेशनपासूनचे आहे."
+" "
+"येथील मूल्य GsmPresenceStatus एन्युमरेशनपासूनचे आहे."

 #: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show the week date in the calendar"
@@ -138,44 +138,34 @@ msgid "Keybinding to open the application menu."
 msgstr "ॲप्लिकेशन मेन्यु उघडण्यासाठी किबाइंडिंग."

 #: ../data/org.gnome.shell.gschema.xml.in.h:18
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to toggle the screen recorder"
-msgstr "स्क्रीन रेकॉर्डरमधील बदलसाठी किबाइंडिंग"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
-#| msgid "Keybinding to open the application menu."
-msgid "Keybinding to start/stop the builtin screen recorder."
-msgstr "बिल्टइन स्क्रीन रेकॉर्डर सुरू किंवा थांबवण्यासाठी किबाइंडिंग."
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Which keyboard to use"
 msgstr "कुठले किबोर्ड वापरायचे"

-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid "The type of keyboard to use."
 msgstr "वापरण्याजोगी किबोर्डचे प्रकार."

-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Show time with seconds"
 msgstr "सेकंदात वेळ दाखवा"

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "If true, display seconds in time."
 msgstr "खरे असल्यास, वेळेत सेकंद दाखवा."

-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "Show date in clock"
 msgstr "घड्याळात दिनांक दाखवा"

-#: ../data/org.gnome.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid "If true, display date in the clock, in addition to time."
 msgstr "खरे असल्यास,वेळेबरोबर तारीख पण घड्याळात दाखवा."

-#: ../data/org.gnome.shell.gschema.xml.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.h:24
 msgid "Framerate used for recording screencasts."
 msgstr "स्क्रिनकास्ट्स् रेकॉर्ड करण्यासाठी वापरलेले फ्रेमरेट."

-#: ../data/org.gnome.shell.gschema.xml.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.h:25
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -184,12 +174,24 @@ msgstr ""
 "केलेल्या परिणामक "
 "सक्रीनकास्टचा फ्रेमरेट."

-#: ../data/org.gnome.shell.gschema.xml.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.h:26
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "स्क्रीनकास्ट एंकोड करण्यासाठी वापरलेले gstreamer पाइपलाइन"

-#: ../data/org.gnome.shell.gschema.xml.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.h:28
 #, no-c-format
+#| msgid ""
+#| "Sets the GStreamer pipeline used to encode recordings. It follows the "
+#| "syntax used for gst-launch. The pipeline should have an unconnected sink "
+#| "pad where the recorded video is recorded. It will normally have a "
+#| "unconnected source pad; output from that pad will be written into the "
+#| "output file. However the pipeline can also take care of its own output - "
+#| "this might be used to send the output to an icecast server via shout2send "
+#| "or similar. When unset or set to an empty value, the default pipeline "
+#| "will be used. This is currently 'videorate ! vp8enc quality=10 speed=2 "
+#| "threads=%T ! queue ! webmmux' and records to WEBM using the VP8 codec. %T "
+#| "is used as a placeholder for a guess at the optimal thread count on the "
+#| "system."
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
 "used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -203,26 +205,21 @@ msgid ""
 "thread count on the system."
 msgstr ""
 "रेकॉर्डिंग्स् एंकोड करण्यासाठी GStreamer पाइपलाइन ठरवतो. gst-launch सुरू "
-"करण्यासाठी "
-"मांडणीचा वापर करतो. पाइपलाइनमध्ये जोडणी अशक्य सिंक पॅड असायला हवे जेथे "
-"रेकॉर्डेड व्हिडीओ "
-"रेकॉर्ड केले जाते. सहसा जोडणी अशक्य स्रोत पॅड असते; पॅडपासूनचे आऊटपुट, आऊटपुट "
-"फाइलमध्ये लिहले "
-"जाते. तरी पाइपलाइन स्वतःच्या आऊटपुटची काळजी घेतो - याचा वापर shout2send किंवा "
-"समानतर्फे icecast सर्व्हरकरीता आऊटपुट पाठवण्याकरीता केला जातो. रिकामे "
-"मूल्यकरीता सेट "
-"अशक्य किंवा शक्य केल्यावर, मूळ पाइपलाइनचा वापर केला जातो. हे सध्या 'vp8enc "
-"quality=8 "
-"speed=6 threads=%T ! queue ! webmmux' आहे व VP8 कोडेकचा वापर करून WEBM करीता "
-"रेकॉर्डिंग करतो. %T चा वापर प्रणालीवरील कमाल थ्रेड गणणा ओळखण्यासाठी "
-"प्लेसहोल्डर म्हणून "
-"केला जातो."
+"करण्यासाठी मांडणीचा वापर करतो. पाइपलाइनमध्ये जोडणी अशक्य सिंक पॅड असायला हवे "
+"जेथे रेकॉर्डेड व्हिडीओ रेकॉर्ड केले जाते. सहसा जोडणी अशक्य स्रोत पॅड असते; "
+"पॅडपासूनचे आऊटपुट, आऊटपुट फाइलमध्ये लिहले जाते. तरी पाइपलाइन स्वतःच्या "
+"आऊटपुटची काळजी घेतो - याचा वापर shout2send किंवा समानतर्फे icecast "
+"सर्व्हरकरीता आऊटपुट पाठवण्याकरीता केला जातो. रिकामे मूल्यकरीता सेट अशक्य "
+"किंवा शक्य केल्यावर, मूळ पाइपलाइनचा वापर केला जातो. हे सध्या 'vp8enc "
+"quality=8 speed=6 threads=%T ! queue ! webmmux' आहे व VP8 कोडेकचा वापर करून "
+"WEBM करीता रेकॉर्डिंग करतो. %T चा वापर प्रणालीवरील कमाल थ्रेड गणणा "
+"ओळखण्यासाठी प्लेसहोल्डर म्हणून केला जातो."

-#: ../data/org.gnome.shell.gschema.xml.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.h:29
 msgid "File extension used for storing the screencast"
 msgstr "स्क्रिनकास्ट साठवण्याकरीता वापरलेले फाइल एक्सटेंशन"

-#: ../data/org.gnome.shell.gschema.xml.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.h:30
 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 "
@@ -246,40 +243,42 @@ msgstr "<b>एक्सटेंशन</b>"
 msgid "Select an extension to configure using the combobox above."
 msgstr "वरील कॉम्बोबॉक्सचा वापर करून संरचनाकरीता एक्सटेंशनचा वापर करा."

-#: ../js/gdm/loginDialog.js:627
+#: ../js/gdm/loginDialog.js:624
+#| msgid "Searching..."
 msgid "Session..."
 msgstr "सत्र..."

-#: ../js/gdm/loginDialog.js:789
+#: ../js/gdm/loginDialog.js:786
 msgctxt "title"
 msgid "Sign In"
 msgstr "प्रवेश करा"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/loginDialog.js:834
+#: ../js/gdm/loginDialog.js:831
 msgid "(or swipe finger)"
 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:855
+#: ../js/gdm/loginDialog.js:852
 msgid "Not listed?"
 msgstr "सूचीत नाही?"

-#: ../js/gdm/loginDialog.js:1023 ../js/ui/endSessionDialog.js:401
-#: ../js/ui/extensionSystem.js:400 ../js/ui/networkAgent.js:153
+#: ../js/gdm/loginDialog.js:1020 ../js/ui/endSessionDialog.js:401
+#: ../js/ui/extensionSystem.js:399 ../js/ui/networkAgent.js:153
 #: ../js/ui/polkitAuthenticationAgent.js:175 ../js/ui/status/bluetooth.js:462
 msgid "Cancel"
 msgstr "रद्द करा"

-#: ../js/gdm/loginDialog.js:1028
+#: ../js/gdm/loginDialog.js:1025
 msgctxt "button"
 msgid "Sign In"
 msgstr "प्रवेश करा"

-#: ../js/gdm/loginDialog.js:1380
+#: ../js/gdm/loginDialog.js:1377
+#| msgid "New Window"
 msgid "Login Window"
 msgstr "प्रवेश पटल"

@@ -356,6 +355,7 @@ msgid "Open with %s"
 msgstr "%s सह उघडा"

 #: ../js/ui/autorunManager.js:586
+#| msgid "Reject"
 msgid "Eject"
 msgstr "बाहेर काढा"

@@ -591,11 +591,13 @@ msgstr "%A %B %e, %Y"

 #: ../js/ui/endSessionDialog.js:61
 #, c-format
+#| msgid "Log Out %s"
 msgctxt "title"
 msgid "Log Out %s"
 msgstr "%s पासून बाहेर पडा"

 #: ../js/ui/endSessionDialog.js:62
+#| msgid "Log Out"
 msgctxt "title"
 msgid "Log Out"
 msgstr "बाहेर पडा"
@@ -607,6 +609,7 @@ msgstr ""

 #: ../js/ui/endSessionDialog.js:65
 #, c-format
+#| msgid "%s will be logged out automatically in %d seconds."
 msgid "%s will be logged out automatically in %d second."
 msgid_plural "%s will be logged out automatically in %d seconds."
 msgstr[0] "%s स्वयं, %d सेकंदात बाहेर पडेल."
@@ -614,6 +617,7 @@ msgstr[1] "%s स्वयं, %d सेकंदात बाहेर पड

 #: ../js/ui/endSessionDialog.js:70
 #, c-format
+#| msgid "You will be logged out automatically in %d seconds."
 msgid "You will be logged out automatically in %d second."
 msgid_plural "You will be logged out automatically in %d seconds."
 msgstr[0] "%d सेकंदात तुम्ही स्वयं बाहेर पडाल."
@@ -624,11 +628,13 @@ msgid "Logging out of the system."
 msgstr "प्रणालीतून बाहेर पडत आहे."

 #: ../js/ui/endSessionDialog.js:76
+#| msgid "Log Out"
 msgctxt "button"
 msgid "Log Out"
 msgstr "बाहेर पडा"

 #: ../js/ui/endSessionDialog.js:81
+#| msgid "Power Off"
 msgctxt "title"
 msgid "Power Off"
 msgstr "बंद करा"
@@ -639,6 +645,7 @@ msgstr "ॲप्लिकेशन्स् बंद करण्यासा

 #: ../js/ui/endSessionDialog.js:84
 #, c-format
+#| msgid "The system will power off automatically in %d seconds."
 msgid "The system will power off automatically in %d second."
 msgid_plural "The system will power off automatically in %d seconds."
 msgstr[0] "प्रणाली स्वयं %d सेकंदात बंद होईल."
@@ -649,16 +656,19 @@ msgid "Powering off the system."
 msgstr "प्रणाली बंद करत आहे."

 #: ../js/ui/endSessionDialog.js:90 ../js/ui/endSessionDialog.js:107
+#| msgid "Restart"
 msgctxt "button"
 msgid "Restart"
 msgstr "पुनः सुरू करा"

 #: ../js/ui/endSessionDialog.js:92
+#| msgid "Power Off"
 msgctxt "button"
 msgid "Power Off"
 msgstr "बंद करा"

 #: ../js/ui/endSessionDialog.js:98
+#| msgid "Restart"
 msgctxt "title"
 msgid "Restart"
 msgstr "पुनः सुरू करा"
@@ -670,6 +680,7 @@ msgstr ""

 #: ../js/ui/endSessionDialog.js:101
 #, c-format
+#| msgid "The system will restart automatically in %d seconds."
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
 msgstr[0] "प्रणाली स्वयं %d सेकंदात पुनः सुरू होईल."
@@ -679,21 +690,21 @@ msgstr[1] "प्रणाली स्वयं %d सेकंदामध्
 msgid "Restarting the system."
 msgstr "प्रणाली पुनःसुरू करत आहे."

-#: ../js/ui/extensionSystem.js:404
+#: ../js/ui/extensionSystem.js:403
 msgid "Install"
 msgstr "प्रतिष्ठापीत करा"

-#: ../js/ui/extensionSystem.js:408
+#: ../js/ui/extensionSystem.js:407
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr " extensions.gnome.org पासून '%s' डाऊनलोड व प्रतिष्ठापीत करा?"

 #: ../js/ui/keyboard.js:327
+#| msgid "Retry"
 msgid "tray"
 msgstr "ट्रे"

-#: ../js/ui/keyboard.js:544 ../js/ui/status/keyboard.js:44
-#: ../js/ui/status/power.js:203
+#: ../js/ui/keyboard.js:544 ../js/ui/status/power.js:203
 msgid "Keyboard"
 msgstr "कळफलक"

@@ -716,10 +727,12 @@ msgid "%s has not emitted any errors."
 msgstr "%s ने कोणत्याहि त्रुटी दाखवले नाही."

 #: ../js/ui/lookingGlass.js:792
+#| msgid "Error"
 msgid "Hide Errors"
 msgstr "त्रुटी लपवा"

 #: ../js/ui/lookingGlass.js:796 ../js/ui/lookingGlass.js:847
+#| msgid "Error"
 msgid "Show Errors"
 msgstr "त्रुटी दाखवा"

@@ -729,7 +742,7 @@ msgstr "सुरू केले"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:808 ../src/gvc/gvc-mixer-control.c:1082
+#: ../js/ui/lookingGlass.js:808 ../src/gvc/gvc-mixer-control.c:1093
 msgid "Disabled"
 msgstr "बंद केले"

@@ -754,7 +767,7 @@ msgid "Web Page"
 msgstr "वेब पृष्ठ"

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/main.js:121
+#: ../js/ui/main.js:118
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "%d %t पासून स्क्रीनकास्ट"
@@ -764,10 +777,13 @@ msgid "Open"
 msgstr "उघडा"

 #: ../js/ui/messageTray.js:1217
+#| msgid "minute"
+#| msgid_plural "minutes"
 msgid "Unmute"
 msgstr "बंद करणे अशक्य करा"

 #: ../js/ui/messageTray.js:1217
+#| msgid "Mouse"
 msgid "Mute"
 msgstr "बंद करा"

@@ -776,6 +792,7 @@ msgid "System Information"
 msgstr "प्रणाली माहिती"

 #: ../js/ui/networkAgent.js:148
+#| msgid "Connection"
 msgid "Connect"
 msgstr "जोडणी करा"

@@ -783,6 +800,7 @@ msgstr "जोडणी करा"
 #: ../js/ui/networkAgent.js:243 ../js/ui/networkAgent.js:255
 #: ../js/ui/networkAgent.js:282 ../js/ui/networkAgent.js:302
 #: ../js/ui/networkAgent.js:312
+#| msgid "Password:"
 msgid "Password: "
 msgstr "पासवर्ड: "

@@ -811,6 +829,7 @@ msgid "Service: "
 msgstr "सर्व्हिस: "

 #: ../js/ui/networkAgent.js:329
+#| msgid "Authentication Required"
 msgid "Authentication required by wireless network"
 msgstr "वायरलेस नेटवर्कतर्फे आवश्यक ओळखपटवणे"

@@ -826,10 +845,12 @@ msgid "Wired 802.1X authentication"
 msgstr "वायर्ड 802.1X ओळखपटवणे"

 #: ../js/ui/networkAgent.js:336
+#| msgid "Network Manager"
 msgid "Network name: "
 msgstr "नेटवर्क नाव: "

 #: ../js/ui/networkAgent.js:341
+#| msgid "authentication required"
 msgid "DSL authentication"
 msgstr "DSL ओळख पटवणे"

@@ -846,11 +867,13 @@ msgid "PIN: "
 msgstr "PIN: "

 #: ../js/ui/networkAgent.js:356
+#| msgid "Mobile broadband"
 msgid "Mobile broadband network password"
 msgstr "मोबाईल ब्रॉडबँड नेटवर्क पासवर्ड"

 #: ../js/ui/networkAgent.js:357
 #, c-format
+#| msgid "You're now connected to '%s'"
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' सह जोडणीकरीता पासवर्ड आवश्यक आहे."

@@ -877,6 +900,7 @@ msgid "Dash"
 msgstr "डॅश"

 #: ../js/ui/panel.js:592
+#| msgid "Quit %s"
 msgid "Quit"
 msgstr "बाहेर पडा"

@@ -944,7 +968,7 @@ msgstr "कृपया आदेश द्या:"
 msgid "Searching..."
 msgstr "शोधत आहे..."

-#: ../js/ui/searchDisplay.js:415
+#: ../js/ui/searchDisplay.js:414
 msgid "No matching results."
 msgstr "जुळवण्याजोगी परिणाम आढळले नाही."

@@ -961,6 +985,7 @@ msgid "Show Text"
 msgstr "मजकूर दाखवा"

 #: ../js/ui/shellEntry.js:79
+#| msgid "Large Text"
 msgid "Hide Text"
 msgstr "मजकूर लपवा"

@@ -969,6 +994,7 @@ msgid "Wrong password, please try again"
 msgstr "चुकिचा पासवर्ड, कृपया पुनः प्रयत्न करा"

 #: ../js/ui/status/accessibility.js:47
+#| msgid "Visibility"
 msgid "Accessibility"
 msgstr "ॲक्सेसिबिलिटि"

@@ -980,6 +1006,7 @@ msgstr "झूम"
 #. 'screen-reader-enabled');
 #. this.menu.addMenuItem(screenReader);
 #: ../js/ui/status/accessibility.js:63
+#| msgid "Keyboard"
 msgid "Screen Keyboard"
 msgstr "स्क्रीन किबोर्ड"

@@ -1031,6 +1058,7 @@ msgid "Send Files to Device..."
 msgstr "फाइल्स्ना साधनावर पाठवा..."

 #: ../js/ui/status/bluetooth.js:63
+#| msgid "Setup a New Device..."
 msgid "Set up a New Device..."
 msgstr "नविन साधनची मांडणी करा..."

@@ -1040,6 +1068,7 @@ msgstr "ब्ल्यूटूथ सेटिंग्स्"

 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
 #: ../js/ui/status/bluetooth.js:107 ../js/ui/status/network.js:256
+#| msgid "disabled"
 msgid "hardware disabled"
 msgstr "हार्डवेअर बंद केले"

@@ -1048,6 +1077,7 @@ msgid "Connection"
 msgstr "जोडणी"

 #: ../js/ui/status/bluetooth.js:214 ../js/ui/status/network.js:491
+#| msgid "connecting..."
 msgid "disconnecting..."
 msgstr "जोडणी खंडीत करत आहे..."

@@ -1102,7 +1132,7 @@ msgstr "नेहमी प्रवेश द्या"
 msgid "Grant this time only"
 msgstr "फक्त याचवेळी मान्य करा"

-#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1093
+#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1091
 msgid "Reject"
 msgstr "नकारा"

@@ -1143,10 +1173,12 @@ msgid "OK"
 msgstr "ठीक आहे"

 #: ../js/ui/status/keyboard.js:68
+#| msgid "Show Keyboard Layout..."
 msgid "Show Keyboard Layout"
 msgstr "किबोर्ड लेआऊट दाखवा"

 #: ../js/ui/status/keyboard.js:73
+#| msgid "Date and Time Settings"
 msgid "Region and Language Settings"
 msgstr "क्षेत्र व भाषा सेटिंग्स्"

@@ -1228,6 +1260,7 @@ msgid "Auto wireless"
 msgstr "स्वयं वायरलेस्"

 #: ../js/ui/status/network.js:1541
+#| msgid "Network Manager"
 msgid "Network"
 msgstr "नेटवर्क"

@@ -1256,10 +1289,12 @@ msgid "Network Settings"
 msgstr "जाळं संयोजना"

 #: ../js/ui/status/network.js:1739
+#| msgid "connection failed"
 msgid "Connection failed"
 msgstr "जोडणी अपयशी"

 #: ../js/ui/status/network.js:1740
+#| msgid "connection failed"
 msgid "Activation of network connection failed"
 msgstr "नेटवर्क जोडणी सुरू करणे अपयशी"

@@ -1380,6 +1415,7 @@ msgstr "आमंत्रण"

 #. We got the TpContact
 #: ../js/ui/telepathyClient.js:271
+#| msgid "Cancel"
 msgid "Call"
 msgstr "कॉल"

@@ -1389,10 +1425,12 @@ msgid "File Transfer"
 msgstr "फाइल स्थानांतरन"

 #: ../js/ui/telepathyClient.js:369
+#| msgid "Authorization request from %s"
 msgid "Subscription request"
 msgstr "सबस्क्रिप्शन विनंती"

 #: ../js/ui/telepathyClient.js:405
+#| msgid "Connection"
 msgid "Connection error"
 msgstr "जोडणी त्रुटी"

@@ -1419,35 +1457,36 @@ msgstr "%s व्यग्र आहे."
 #. 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/telepathyClient.js:889
+#: ../js/ui/telepathyClient.js:887
 #, no-c-format
+#| msgid "Sent at %X on %A"
 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/telepathyClient.js:895
+#: ../js/ui/telepathyClient.js:893
 #, 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/telepathyClient.js:900
+#: ../js/ui/telepathyClient.js:898
 #, 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/telepathyClient.js:942
+#: ../js/ui/telepathyClient.js:940
 #, 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/telepathyClient.js:1044
+#: ../js/ui/telepathyClient.js:1042
 #, c-format
 msgid "Invitation to %s"
 msgstr "%s करीता आमंत्रण"
@@ -1455,35 +1494,35 @@ 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/telepathyClient.js:1052
+#: ../js/ui/telepathyClient.js:1050
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s तुम्हाला %s सह जोडणीकरीता आमंत्रण देत आहे"

-#: ../js/ui/telepathyClient.js:1054 ../js/ui/telepathyClient.js:1133
-#: ../js/ui/telepathyClient.js:1231
+#: ../js/ui/telepathyClient.js:1052 ../js/ui/telepathyClient.js:1131
+#: ../js/ui/telepathyClient.js:1229
 msgid "Decline"
 msgstr "नकारा"

-#: ../js/ui/telepathyClient.js:1055 ../js/ui/telepathyClient.js:1134
-#: ../js/ui/telepathyClient.js:1232
+#: ../js/ui/telepathyClient.js:1053 ../js/ui/telepathyClient.js:1132
+#: ../js/ui/telepathyClient.js:1230
 msgid "Accept"
 msgstr "स्वीकारा"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1085
+#: ../js/ui/telepathyClient.js:1083
 #, c-format
 msgid "Video call from %s"
 msgstr "%s पासून व्हिडीओ कॉल्स्"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1088
+#: ../js/ui/telepathyClient.js:1086
 #, c-format
 msgid "Call from %s"
 msgstr "%s पासून कॉल"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/telepathyClient.js:1095
+#: ../js/ui/telepathyClient.js:1093
 msgid "Answer"
 msgstr "उत्तर"

@@ -1492,138 +1531,147 @@ msgstr "उत्तर"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/telepathyClient.js:1127
+#: ../js/ui/telepathyClient.js:1125
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s तुम्हाला %s पाठवत आहे"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/telepathyClient.js:1196
+#: ../js/ui/telepathyClient.js:1194
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "ऑनलाइन असल्यावर %s परवानगी दृष्यास्पद करायची"

-#: ../js/ui/telepathyClient.js:1289
+#: ../js/ui/telepathyClient.js:1287
+#| msgid "Network Manager"
 msgid "Network error"
 msgstr "नेटवर्क त्रुटी"

-#: ../js/ui/telepathyClient.js:1291
+#: ../js/ui/telepathyClient.js:1289
+#| msgid "Authentication Required"
 msgid "Authentication failed"
 msgstr "ओळख पटवणे अपयशी"

-#: ../js/ui/telepathyClient.js:1293
+#: ../js/ui/telepathyClient.js:1291
 msgid "Encryption error"
 msgstr "एंक्रिप्शन त्रुटी"

-#: ../js/ui/telepathyClient.js:1295
+#: ../js/ui/telepathyClient.js:1293
 msgid "Certificate not provided"
 msgstr "प्रमाणपत्र पुरवले नाही"

-#: ../js/ui/telepathyClient.js:1297
+#: ../js/ui/telepathyClient.js:1295
 msgid "Certificate untrusted"
 msgstr "प्रमाणपत्र अविश्वासर्ह आहे"

-#: ../js/ui/telepathyClient.js:1299
+#: ../js/ui/telepathyClient.js:1297
 msgid "Certificate expired"
 msgstr "प्रमाणपत्राची वेळसमाप्ति"

-#: ../js/ui/telepathyClient.js:1301
+#: ../js/ui/telepathyClient.js:1299
 msgid "Certificate not activated"
 msgstr "प्रमाणपत्र सुरू केले नाही"

-#: ../js/ui/telepathyClient.js:1303
+#: ../js/ui/telepathyClient.js:1301
 msgid "Certificate hostname mismatch"
 msgstr "प्रमाणपत्र यजमाननाव जुळत नाही"

-#: ../js/ui/telepathyClient.js:1305
+#: ../js/ui/telepathyClient.js:1303
 msgid "Certificate fingerprint mismatch"
 msgstr "प्रमाणपत्र फिंग्ररप्रिंट जुळत नाही"

-#: ../js/ui/telepathyClient.js:1307
+#: ../js/ui/telepathyClient.js:1305
 msgid "Certificate self-signed"
 msgstr "प्रमाणपत्र स्वयं स्वाक्षरि"

-#: ../js/ui/telepathyClient.js:1309
+#: ../js/ui/telepathyClient.js:1307
+#| msgid "%s is offline."
 msgid "Status is set to offline"
 msgstr "स्थिती ऑफलाइनकरीता ठरवली आहे"

-#: ../js/ui/telepathyClient.js:1311
+#: ../js/ui/telepathyClient.js:1309
 msgid "Encryption is not available"
 msgstr "एंक्रिप्शन अनुपलब्ध"

-#: ../js/ui/telepathyClient.js:1313
+#: ../js/ui/telepathyClient.js:1311
 msgid "Certificate is invalid"
 msgstr "प्रमाणपत्र अवैध आहे"

-#: ../js/ui/telepathyClient.js:1315
+#: ../js/ui/telepathyClient.js:1313
+#| msgid "Connection established"
 msgid "Connection has been refused"
 msgstr "जोडणी नकारली गेली"

-#: ../js/ui/telepathyClient.js:1317
+#: ../js/ui/telepathyClient.js:1315
+#| msgid "Connection established"
 msgid "Connection can't be established"
 msgstr "जोडणी स्थापीत करणे अशक्य"

-#: ../js/ui/telepathyClient.js:1319
+#: ../js/ui/telepathyClient.js:1317
+#| msgid "Connection established"
 msgid "Connection has been lost"
 msgstr "जोडणी खंडीत झाली"

-#: ../js/ui/telepathyClient.js:1321
+#: ../js/ui/telepathyClient.js:1319
 msgid "This account is already connected to the server"
 msgstr "हे खाते आधिपासूनच सर्व्हरसह जुळले आहे"

-#: ../js/ui/telepathyClient.js:1323
+#: ../js/ui/telepathyClient.js:1321
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "समान स्रोतचा वापर करून जोडणीला नविन जोडणीसह बदलाबदल केले आहे"

-#: ../js/ui/telepathyClient.js:1325
+#: ../js/ui/telepathyClient.js:1323
 msgid "The account already exists on the server"
 msgstr "खाते आधिपासूनच सर्व्हरवर अस्तित्वात आहे"

-#: ../js/ui/telepathyClient.js:1327
+#: ../js/ui/telepathyClient.js:1325
 msgid "Server is currently too busy to handle the connection"
 msgstr "जोडणी हाताळण्यासाठी सर्व्हर सध्या खूप व्यस्थ आहे"

-#: ../js/ui/telepathyClient.js:1329
+#: ../js/ui/telepathyClient.js:1327
 msgid "Certificate has been revoked"
 msgstr "प्रमाणपत्र रद्द केले"

-#: ../js/ui/telepathyClient.js:1331
+#: ../js/ui/telepathyClient.js:1329
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "प्रमाणपत्र असुरक्षित सिफर अल्गोरिदमचा वापर करते किंवा क्रिप्टोग्राफिकरित्या "
 "खूप कमजोर आहे"

-#: ../js/ui/telepathyClient.js:1333
+#: ../js/ui/telepathyClient.js:1331
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 "सर्व्हर प्रमाणपत्राची लांबी, किंवा सर्व्हर प्रमाणपत्र चैनचे गांभीर्य, "
-"क्रिप्टोग्राफि "
-"लाइब्ररितर्फे लादलेल्या मर्यादापेक्षा जास्त आहे"
+"क्रिप्टोग्राफि लाइब्ररितर्फे लादलेल्या मर्यादापेक्षा जास्त आहे"

-#: ../js/ui/telepathyClient.js:1335
+#: ../js/ui/telepathyClient.js:1333
 msgid "Internal error"
 msgstr "आंतरिक त्रुटी"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1345
+#: ../js/ui/telepathyClient.js:1343
 #, c-format
+#| msgid "connection failed"
 msgid "Connection to %s failed"
 msgstr "%s सह जोडणी अपयशी"

-#: ../js/ui/telepathyClient.js:1354
+#: ../js/ui/telepathyClient.js:1352
+#| msgid "Reject"
 msgid "Reconnect"
 msgstr "पुनःजोडणी करा"

-#: ../js/ui/telepathyClient.js:1355
+#: ../js/ui/telepathyClient.js:1353
+#| msgid "My Account"
 msgid "Edit account"
 msgstr "खाते संपादित करा"

-#: ../js/ui/telepathyClient.js:1401
+#: ../js/ui/telepathyClient.js:1399
+#| msgid "Unknown"
 msgid "Unknown reason"
 msgstr "अपरिचीत कारण"

@@ -1636,6 +1684,7 @@ msgid "Idle"
 msgstr "रिकामे"

 #: ../js/ui/userMenu.js:144
+#| msgid "unavailable"
 msgid "Unavailable"
 msgstr "अनुपलब्ध"

@@ -1644,10 +1693,12 @@ msgid "Power Off..."
 msgstr "बंद करा..."

 #: ../js/ui/userMenu.js:631
+#| msgid "Applications"
 msgid "Notifications"
 msgstr "सूचना"

 #: ../js/ui/userMenu.js:639
+#| msgid "My Account"
 msgid "Online Accounts"
 msgstr "ऑनलाइन खाते"

@@ -1677,8 +1728,7 @@ msgid ""
 "has been adjusted to let others know that you might not see their messages."
 msgstr ""
 "सूचना आता बंद केले आहे, चॅट संदेश समाविष्टीत. इतरांना तुमचे संदेश दिसणार नाही "
-"हे कळवण्यासाठी "
-"ऑनलाइन स्थिती सुस्थीत केली आहे."
+"हे कळवण्यासाठी ऑनलाइन स्थिती सुस्थीत केली आहे."

 #. Translators: this is the text displayed
 #. in the search entry when no search is
@@ -1717,7 +1767,7 @@ msgstr "'%s' सज्ज आहे"

 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1089
+#: ../src/gvc/gvc-mixer-control.c:1100
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1726,14 +1776,14 @@ msgstr[1] "%u आऊटपुट"

 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1099
+#: ../src/gvc/gvc-mixer-control.c:1110
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u इंपुट"
 msgstr[1] "%u इंपुट"

-#: ../src/gvc/gvc-mixer-control.c:1397
+#: ../src/gvc/gvc-mixer-control.c:1408
 msgid "System Sounds"
 msgstr "प्रणाली आवाज"

@@ -1751,6 +1801,7 @@ msgid "Failed to launch '%s'"
 msgstr "'%s' सुरू करण्यास अपयशी"

 #: ../src/shell-keyring-prompt.c:708
+#| msgid "Does not match"
 msgid "Passwords do not match."
 msgstr "पासवर्डस् जुळत नाही."

@@ -1773,6 +1824,7 @@ msgstr "ओळख पटवा संवाद वापरकर्त्या
 #. Translators: this is the same string as the one found in
 #. * nautilus
 #: ../src/shell-util.c:97
+#| msgid "Volume"
 msgid "Home"
 msgstr "होम"

--- a/po/nb.po
+++ b/po/nb.po
--- a/po/oc.po
+++ b/po/oc.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,10 +27,8 @@ CLEANFILES += $(service_DATA)

 CLEANFILES += $(gir_DATA) $(typelib_DATA)

-bin_SCRIPTS += gnome-shell-extension-tool gnome-shell-extension-prefs \
-	       gnome-shell-perf-tool
-EXTRA_DIST += gnome-shell-extension-tool.in gnome-shell-extension-prefs.in \
-	      gnome-shell-perf-tool.in
+bin_SCRIPTS += gnome-shell-extension-tool gnome-shell-extension-prefs
+EXTRA_DIST += gnome-shell-extension-tool.in gnome-shell-extension-prefs.in
 bin_PROGRAMS = gnome-shell-real

 if USE_JHBUILD_WRAPPER_SCRIPT
@@ -55,6 +53,7 @@ generated_script_substitutions = \
 	    -e "s|@libexecdir[@]|$(libexecdir)|g" \
 	    -e "s|@libdir[@]|$(libdir)|g" \
 	    -e "s|@pkglibdir[@]|$(pkglibdir)|g" \
+	    -e "s|@JHBUILD_TYPELIBDIR[@]|$(JHBUILD_TYPELIBDIR)|g" \
 	    -e "s|@pkgdatadir[@]|$(pkgdatadir)|g" \
 	    -e "s|@PYTHON[@]|$(PYTHON)|g" \
 	    -e "s|@VERSION[@]|$(VERSION)|g" \
@@ -72,9 +71,6 @@ gnome-shell-extension-tool: gnome-shell-extension-tool.in Makefile
 gnome-shell-extension-prefs: gnome-shell-extension-prefs.in Makefile
 	$(AM_V_GEN) sed $(generated_script_substitutions) $< > $@.tmp && mv $@.tmp $@ && chmod a+x $@

-gnome-shell-perf-tool: gnome-shell-perf-tool.in Makefile
-	$(AM_V_GEN) sed $(generated_script_substitutions) $< > $@.tmp && mv $@.tmp $@ && chmod a+x $@
-
 CLEANFILES += gnome-shell $(bin_SCRIPTS)

 include Makefile-st.am
@@ -93,8 +89,7 @@ gnome_shell_cflags =				\
 	-DGNOME_SHELL_LIBEXECDIR=\"$(libexecdir)\"	\
 	-DGNOME_SHELL_DATADIR=\"$(pkgdatadir)\"	\
 	-DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\" \
-	-DJSDIR=\"$(pkgdatadir)/js\"		\
-	-DMUTTER_TYPELIB_DIR=\"$(MUTTER_TYPELIB_DIR)\"
+	-DJSDIR=\"$(pkgdatadir)/js\"

 privlibdir = $(pkglibdir)
 privlib_LTLIBRARIES = libgnome-shell.la libgnome-shell-js.la
@@ -109,12 +104,12 @@ shell_public_headers_h =		\
 	shell-app.h			\
 	shell-app-system.h		\
 	shell-app-usage.h		\
+	shell-contact-system.h	\
 	shell-embedded-window.h		\
 	shell-generic-container.h	\
 	shell-gtk-embed.h		\
 	shell-global.h			\
 	shell-idle-monitor.h		\
-	shell-invert-lightness-effect.h	\
 	shell-mobile-providers.h	\
 	shell-mount-operation.h		\
 	shell-network-agent.h		\
@@ -131,10 +126,6 @@ shell_public_headers_h =		\
 	shell-wm.h			\
 	shell-xfixes-cursor.h

-if BUILD_WITH_FOLKS
-shell_public_headers_h += shell-contact-system.h
-endif
-
 shell_private_sources = \
 	gactionmuxer.h			\
 	gactionmuxer.c			\
@@ -156,14 +147,16 @@ libgnome_shell_la_SOURCES =		\
 	shell-wm-private.h		\
 	gnome-shell-plugin.c		\
 	shell-app.c			\
+	shell-a11y.h			\
+	shell-a11y.c			\
 	shell-app-system.c		\
 	shell-app-usage.c		\
+	shell-contact-system.c	\
 	shell-embedded-window.c		\
 	shell-generic-container.c	\
 	shell-gtk-embed.c		\
 	shell-global.c			\
 	shell-idle-monitor.c		\
-	shell-invert-lightness-effect.c	\
 	shell-keyring-prompt.h		\
 	shell-keyring-prompt.c		\
 	shell-mobile-providers.c	\
@@ -187,9 +180,6 @@ libgnome_shell_la_SOURCES =		\
 	shell-xfixes-cursor.c		\
 	$(NULL)

-if BUILD_WITH_FOLKS
-libgnome_shell_la_SOURCES += shell-contact-system.c
-endif

 libgnome_shell_la_gir_sources = \
 	$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
@@ -306,10 +296,7 @@ libgnome_shell_la_LIBADD =		\
 libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)

 Shell-0.1.gir: libgnome-shell.la St-1.0.gir
-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
-if BUILD_WITH_FOLKS
-Shell_0_1_gir_INCLUDES += Folks-0.6
-endif
+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
 Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
 Shell_0_1_gir_LIBS = libgnome-shell.la
 Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
--- a/src/calendar-server/calendar-sources.c
+++ b/src/calendar-server/calendar-sources.c
@@ -29,9 +29,11 @@

 #include <libintl.h>
 #include <string.h>
+#include <gconf/gconf-client.h>
 #define HANDLE_LIBICAL_MEMORY
-#include <libecal/libecal.h>
-#include <libedataserverui/libedataserverui.h>
+#include <libecal/e-cal-client.h>
+#include <libedataserver/e-source-list.h>
+#include <libedataserverui/e-client-utils.h>

 #undef CALENDAR_ENABLE_DEBUG
 #include "calendar-debug.h"
@@ -46,14 +48,18 @@

 #define CALENDAR_SOURCES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CALENDAR_TYPE_SOURCES, CalendarSourcesPrivate))

-typedef struct _ClientData ClientData;
-typedef struct _CalendarSourceData CalendarSourceData;
+#define CALENDAR_SOURCES_EVO_DIR                          "/apps/evolution"
+#define CALENDAR_SOURCES_APPOINTMENT_SOURCES_KEY          CALENDAR_SOURCES_EVO_DIR "/calendar/sources"
+#define CALENDAR_SOURCES_TASK_SOURCES_KEY                 CALENDAR_SOURCES_EVO_DIR "/tasks/sources"

-struct _ClientData
-{
-  ECalClient *client;
-  gulong backend_died_id;
-};
+/* org.gnome.shell.evolution.calendar has the same data behind it
+ * as org.gnome.evolution.calendar, but is a small schema we install
+ * ourselves */
+#define CALENDAR_SELECTED_SOURCES_SCHEMA                  "org.gnome.shell.evolution.calendar"
+#define CALENDAR_SOURCES_SELECTED_APPOINTMENT_SOURCES_KEY "selected-calendars"
+#define CALENDAR_SOURCES_SELECTED_TASK_SOURCES_KEY        "selected-tasks"
+
+typedef struct _CalendarSourceData CalendarSourceData;

 struct _CalendarSourceData
 {
@@ -61,8 +67,11 @@ struct _CalendarSourceData
  CalendarSources *sources;
  guint            changed_signal;

-  /* ESource -> EClient */
-  GHashTable      *clients;
+  GSList          *clients;
+  char           **selected_sources;
+  ESourceList     *esource_list;
+
+  guint            selected_sources_handler_id;

  guint            timeout_id;

@@ -71,13 +80,11 @@ struct _CalendarSourceData

 struct _CalendarSourcesPrivate
 {
-  ESourceRegistry    *registry;
-  gulong              source_added_id;
-  gulong              source_changed_id;
-  gulong              source_removed_id;
-
  CalendarSourceData  appointment_sources;
  CalendarSourceData  task_sources;
+
+  GConfClient        *gconf_client;
+  GSettings          *settings;
 };

 static void calendar_sources_class_init (CalendarSourcesClass *klass);
@@ -85,12 +92,8 @@ static void calendar_sources_init       (CalendarSources      *sources);
 static void calendar_sources_finalize   (GObject             *object);

 static void backend_died_cb (EClient *client, CalendarSourceData *source_data);
-static void calendar_sources_registry_source_changed_cb (ESourceRegistry *registry,
-                                                         ESource         *source,
-                                                         CalendarSources *sources);
-static void calendar_sources_registry_source_removed_cb (ESourceRegistry *registry,
-                                                         ESource         *source,
-                                                         CalendarSources *sources);
+static void calendar_sources_esource_list_changed (ESourceList        *source_list,
+                                                   CalendarSourceData *source_data);

 enum
 {
@@ -103,14 +106,6 @@ static guint signals [LAST_SIGNAL] = { 0, };
 static GObjectClass    *parent_class = NULL;
 static CalendarSources *calendar_sources_singleton = NULL;

-static void
-client_data_free (ClientData *data)
-{
-  g_signal_handler_disconnect (data->client, data->backend_died_id);
-  g_object_unref (data->client);
-  g_slice_free (ClientData, data);
-}
-
 GType
 calendar_sources_get_type (void)
 {
@@ -178,49 +173,20 @@ calendar_sources_class_init (CalendarSourcesClass *klass)
 static void
 calendar_sources_init (CalendarSources *sources)
 {
-  GError *error = NULL;
-
  sources->priv = CALENDAR_SOURCES_GET_PRIVATE (sources);

-  /* XXX Not sure what to do if this fails.
-   *     Should this class implement GInitable or pass the
-   *     registry in as a G_PARAM_CONSTRUCT_ONLY property? */
-  sources->priv->registry = e_source_registry_new_sync (NULL, &error);
-  if (error != NULL)
-    {
-      g_error ("%s: %s", G_STRFUNC, error->message);
-    }
-
-  sources->priv->source_added_id   = g_signal_connect (sources->priv->registry,
-                                                       "source-added",
-                                                       G_CALLBACK (calendar_sources_registry_source_changed_cb),
-                                                       sources);
-  sources->priv->source_changed_id = g_signal_connect (sources->priv->registry,
-                                                       "source-changed",
-                                                       G_CALLBACK (calendar_sources_registry_source_changed_cb),
-                                                       sources);
-  sources->priv->source_removed_id = g_signal_connect (sources->priv->registry,
-                                                       "source-removed",
-                                                       G_CALLBACK (calendar_sources_registry_source_removed_cb),
-                                                       sources);
-
  sources->priv->appointment_sources.source_type    = E_CAL_CLIENT_SOURCE_TYPE_EVENTS;
  sources->priv->appointment_sources.sources        = sources;
  sources->priv->appointment_sources.changed_signal = signals [APPOINTMENT_SOURCES_CHANGED];
-  sources->priv->appointment_sources.clients        = g_hash_table_new_full ((GHashFunc) e_source_hash,
-                                                                             (GEqualFunc) e_source_equal,
-                                                                             (GDestroyNotify) g_object_unref,
-                                                                             (GDestroyNotify) client_data_free);
  sources->priv->appointment_sources.timeout_id     = 0;

  sources->priv->task_sources.source_type    = E_CAL_CLIENT_SOURCE_TYPE_TASKS;
  sources->priv->task_sources.sources        = sources;
  sources->priv->task_sources.changed_signal = signals [TASK_SOURCES_CHANGED];
-  sources->priv->task_sources.clients        = g_hash_table_new_full ((GHashFunc) e_source_hash,
-                                                                      (GEqualFunc) e_source_equal,
-                                                                      (GDestroyNotify) g_object_unref,
-                                                                      (GDestroyNotify) client_data_free);
  sources->priv->task_sources.timeout_id     = 0;
+
+  sources->priv->gconf_client = gconf_client_get_default ();
+  sources->priv->settings = g_settings_new (CALENDAR_SELECTED_SOURCES_SCHEMA);
 }

 static void
@@ -229,9 +195,37 @@ calendar_sources_finalize_source_data (CalendarSources    *sources,
 {
  if (source_data->loaded)
    {
-      g_hash_table_destroy (source_data->clients);
+      GSList *l;
+
+      if (source_data->selected_sources_handler_id)
+	{
+          g_signal_handler_disconnect (sources->priv->settings,
+                                       source_data->selected_sources_handler_id);
+	  source_data->selected_sources_handler_id = 0;
+	}
+
+      for (l = source_data->clients; l; l = l->next)
+        {
+          g_signal_handlers_disconnect_by_func (G_OBJECT (l->data),
+                                                G_CALLBACK (backend_died_cb),
+                                                source_data);
+          g_object_unref (l->data);
+        }
+      g_slist_free (source_data->clients);
      source_data->clients = NULL;

+      if (source_data->esource_list)
+        {
+          g_signal_handlers_disconnect_by_func (source_data->esource_list,
+                                                G_CALLBACK (calendar_sources_esource_list_changed),
+                                                source_data);
+          g_object_unref (source_data->esource_list);
+	}
+      source_data->esource_list = NULL;
+
+      g_strfreev (source_data->selected_sources);
+      source_data->selected_sources = NULL;
+
      if (source_data->timeout_id != 0)
        {
          g_source_remove (source_data->timeout_id);
@@ -247,21 +241,17 @@ calendar_sources_finalize (GObject *object)
 {
  CalendarSources *sources = CALENDAR_SOURCES (object);

-  if (sources->priv->registry)
-    {
-      g_signal_handler_disconnect (sources->priv->registry,
-                                   sources->priv->source_added_id);
-      g_signal_handler_disconnect (sources->priv->registry,
-                                   sources->priv->source_changed_id);
-      g_signal_handler_disconnect (sources->priv->registry,
-                                   sources->priv->source_removed_id);
-      g_object_unref (sources->priv->registry);
-    }
-  sources->priv->registry = NULL;
-
  calendar_sources_finalize_source_data (sources, &sources->priv->appointment_sources);
  calendar_sources_finalize_source_data (sources, &sources->priv->task_sources);

+  if (sources->priv->gconf_client)
+    g_object_unref (sources->priv->gconf_client);
+  sources->priv->gconf_client = NULL;
+
+  if (sources->priv->settings)
+    g_object_unref (sources->priv->settings);
+  sources->priv->settings = NULL;
+
  if (G_OBJECT_CLASS (parent_class)->finalize)
    G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -281,72 +271,133 @@ calendar_sources_get (void)
  return calendar_sources_singleton;
 }

-/* The clients are just created here but not loaded */
-static void
-create_client_for_source (ESource              *source,
-		          ECalClientSourceType  source_type,
-		          CalendarSourceData   *source_data)
+static gboolean
+is_source_selected (ESource *esource,
+                    char  **selected_sources)
 {
-  ClientData *data;
-  ECalClient *client;
-  GError *error = NULL;
+  const char *uid;
+  char      **source;

-  client = g_hash_table_lookup (source_data->clients, source);
-  g_return_if_fail (client == NULL);
+  uid = e_source_peek_uid (esource);

-  client = e_cal_client_new (source, source_type, &error);
-  if (!client)
+  for (source = selected_sources; *source; source++)
    {
-      g_warning ("Could not load source '%s': %s",
-		 e_source_get_uid (source),
-		 error->message);
-      g_clear_error(&error);
-      return;
+      if (!strcmp (*source, uid))
+	return TRUE;
    }

-  data = g_slice_new0 (ClientData);
-  data->client = client;  /* takes ownership */
-  data->backend_died_id = g_signal_connect (client,
-                                            "backend-died",
-                                            G_CALLBACK (backend_died_cb),
-                                            source_data);
+  return FALSE;
+}

-  g_hash_table_insert (source_data->clients, g_object_ref (source), data);
+/* The clients are just created here but not loaded */
+static ECalClient *
+get_ecal_from_source (ESource              *esource,
+		      ECalClientSourceType  source_type,
+		      GSList               *existing_clients)
+{
+  ECalClient *retval;
+  GError *error = NULL;
+
+  if (existing_clients)
+    {
+      GSList *l;
+
+      for (l = existing_clients; l; l = l->next)
+	{
+	  EClient *client = E_CLIENT (l->data);
+
+	  if (e_source_equal (esource, e_client_get_source (client)))
+	    {
+	      dprintf ("        load_esource: found existing source ... returning that\n");
+
+	      return g_object_ref (client);
+	    }
+	}
+    }
+
+  retval = e_cal_client_new (esource, source_type, &error);
+  if (!retval)
+    {
+      g_warning ("Could not load source '%s' from '%s': %s",
+		 e_source_peek_name (esource),
+		 e_source_peek_relative_uri (esource),
+		 error->message);
+      g_clear_error(&error);
+      return NULL;
+    }
+
+  g_signal_connect (retval, "authenticate",
+		    G_CALLBACK (e_client_utils_authenticate_handler), NULL);
+
+  return retval;
+}
+
+/* - Order doesn't matter
+ * - Can just compare object pointers since we
+ *   re-use client connections
+ */
+static gboolean
+compare_ecal_lists (GSList *a,
+		    GSList *b)
+{
+  GSList *l;
+
+  if (g_slist_length (a) != g_slist_length (b))
+    return FALSE;
+
+  for (l = a; l; l = l->next)
+    {
+      if (!g_slist_find (b, l->data))
+	return FALSE;
+    }
+
+  return TRUE;
 }

 static inline void
-debug_dump_ecal_list (GHashTable *clients)
+debug_dump_selected_sources (char **selected_sources)
 {
 #ifdef CALENDAR_ENABLE_DEBUG
-  GList *list, *link;
+  char **source;
+
+  dprintf ("Selected sources:\n");
+  for (source = selected_sources; *source; source++)
+    {
+      dprintf ("  %s\n", *source);
+    }
+  dprintf ("\n");
+#endif
+}
+
+static inline void
+debug_dump_ecal_list (GSList *ecal_list)
+{
+#ifdef CALENDAR_ENABLE_DEBUG
+  GSList *l;

  dprintf ("Loaded clients:\n");
-  list = g_hash_table_get_keys (clients);
-  for (link = list; link != NULL; link = g_list_next (link))
+  for (l = ecal_list; l; l = l->next)
    {
-      ESource *source = E_SOURCE (link->data);
+      EClient *client = l->data;
+      ESource *source = e_client_get_source (client);

-      dprintf ("  %s %s\n",
-	       e_source_get_uid (source),
-	       e_source_get_display_name (source));
+      dprintf ("  %s %s %s\n",
+	       e_source_peek_uid (source),
+	       e_source_peek_name (source),
+	       e_client_get_uri (client));
    }
-  g_list_free (list);
 #endif
 }

 static void
-calendar_sources_load_esource_list (ESourceRegistry *registry,
-                                    CalendarSourceData *source_data);
+calendar_sources_load_esource_list (CalendarSourceData *source_data);

 static gboolean
 backend_restart (gpointer data)
 {
  CalendarSourceData *source_data = data;
-  ESourceRegistry *registry;

-  registry = source_data->sources->priv->registry;
-  calendar_sources_load_esource_list (registry, source_data);
-  g_signal_emit (source_data->sources, source_data->changed_signal, 0);
+  calendar_sources_load_esource_list (source_data);

  source_data->timeout_id = 0;
    
@@ -356,13 +407,16 @@ backend_restart (gpointer data)
 static void
 backend_died_cb (EClient *client, CalendarSourceData *source_data)
 {
-  ESource *source;
-  const char *display_name;
+  const char *uristr;

-  source = e_client_get_source (client);
-  display_name = e_source_get_display_name (source);
-  g_warning ("The calendar backend for '%s' has crashed.", display_name);
-  g_hash_table_remove (source_data->clients, source);
+  source_data->clients = g_slist_remove (source_data->clients, client);
+  if (g_slist_length (source_data->clients) < 1) 
+    {
+      g_slist_free (source_data->clients);
+      source_data->clients = NULL;
+    }
+  uristr = e_client_get_uri (client);
+  g_warning ("The calendar backend for %s has crashed.", uristr);

  if (source_data->timeout_id != 0)
    {
@@ -375,162 +429,169 @@ backend_died_cb (EClient *client, CalendarSourceData *source_data)
 }

 static void
-calendar_sources_load_esource_list (ESourceRegistry *registry,
-                                    CalendarSourceData *source_data)
+calendar_sources_load_esource_list (CalendarSourceData *source_data)
 {
-  GList   *list, *link;
-  const gchar *extension_name;
+  GSList  *clients = NULL;
+  GSList  *groups, *l;
+  gboolean emit_signal = FALSE;

-  switch (source_data->source_type)
+  g_return_if_fail (source_data->esource_list != NULL);
+
+  debug_dump_selected_sources (source_data->selected_sources);
+
+  dprintf ("Source groups:\n");
+  groups = e_source_list_peek_groups (source_data->esource_list);
+  for (l = groups; l; l = l->next)
    {
-      case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
-        extension_name = E_SOURCE_EXTENSION_CALENDAR;
-        break;
-      case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
-        extension_name = E_SOURCE_EXTENSION_TASK_LIST;
-        break;
-      default:
-        g_return_if_reached ();
+      GSList *esources, *s;
+
+      dprintf ("  %s\n", e_source_group_peek_uid (l->data));
+      dprintf ("    sources:\n");
+
+      esources = e_source_group_peek_sources (l->data);
+      for (s = esources; s; s = s->next)
+	{
+	  ESource    *esource = E_SOURCE (s->data);
+	  ECalClient *client;
+
+	  dprintf ("      type = '%s' uid = '%s', name = '%s', relative uri = '%s': \n",
+                   source_data->source_type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS ? "appointment" : "task",
+		   e_source_peek_uid (esource),
+		   e_source_peek_name (esource),
+		   e_source_peek_relative_uri (esource));
+
+	  if (is_source_selected (esource, source_data->selected_sources) &&
+	      (client = get_ecal_from_source (esource, source_data->source_type, source_data->clients)))
+	    {
+	      clients = g_slist_prepend (clients, client);
+	    }
+	}
+    }
+  dprintf ("\n");
+
+  if (source_data->loaded && 
+      !compare_ecal_lists (source_data->clients, clients))
+    emit_signal = TRUE;
+
+  for (l = source_data->clients; l; l = l->next)
+    {
+      g_signal_handlers_disconnect_by_func (G_OBJECT (l->data),
+                                            G_CALLBACK (backend_died_cb),
+                                            source_data);
+
+      g_object_unref (l->data);
+    }
+  g_slist_free (source_data->clients);
+  source_data->clients = g_slist_reverse (clients);
+
+  /* connect to backend_died after we disconnected the previous signal
+   * handlers. If we do it before, we'll lose some handlers (for clients that
+   * were already there before) */
+  for (l = source_data->clients; l; l = l->next)
+    {
+      g_signal_connect (G_OBJECT (l->data), "backend-died",
+                        G_CALLBACK (backend_died_cb), source_data);
    }

-  list = e_source_registry_list_sources (registry, extension_name);
-
-  for (link = list; link != NULL; link = g_list_next (link))
+  if (emit_signal) 
    {
-      ESource *source = E_SOURCE (link->data);
-      ESourceSelectable *extension;
-      gboolean show_source;
-
-      extension = e_source_get_extension (source, extension_name);
-      show_source = e_source_get_enabled (source) && e_source_selectable_get_selected (extension);
-
-      if (show_source)
-        create_client_for_source (source, source_data->source_type, source_data);
+      dprintf ("Emitting %s-sources-changed signal\n",
+	       source_data->source_type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS ? "appointment" : "task");
+      g_signal_emit (source_data->sources, source_data->changed_signal, 0);
    }

  debug_dump_ecal_list (source_data->clients);
-
-  g_list_free_full (list, g_object_unref);
 }

 static void
-calendar_sources_registry_source_changed_cb (ESourceRegistry *registry,
-                                             ESource         *source,
-                                             CalendarSources *sources)
+calendar_sources_esource_list_changed (ESourceList        *source_list,
+				       CalendarSourceData *source_data)
+				       
 {
-  if (e_source_has_extension (source, E_SOURCE_EXTENSION_CALENDAR))
-    {
-      CalendarSourceData *source_data;
-      ESourceSelectable *extension;
-      gboolean have_client;
-      gboolean show_source;
+  dprintf ("ESourceList changed, reloading\n");

-      source_data = &sources->priv->appointment_sources;
-      extension = e_source_get_extension (source, E_SOURCE_EXTENSION_CALENDAR);
-      have_client = (g_hash_table_lookup (source_data->clients, source) != NULL);
-      show_source = e_source_get_enabled (source) && e_source_selectable_get_selected (extension);
-
-      if (!show_source && have_client)
-        {
-          g_hash_table_remove (source_data->clients, source);
-          g_signal_emit (sources, source_data->changed_signal, 0);
-        }
-      if (show_source && !have_client)
-        {
-          create_client_for_source (source, source_data->source_type, source_data);
-          g_signal_emit (sources, source_data->changed_signal, 0);
-        }
-    }
-
-  if (e_source_has_extension (source, E_SOURCE_EXTENSION_TASK_LIST))
-    {
-      CalendarSourceData *source_data;
-      ESourceSelectable *extension;
-      gboolean have_client;
-      gboolean show_source;
-
-      source_data = &sources->priv->task_sources;
-      extension = e_source_get_extension (source, E_SOURCE_EXTENSION_TASK_LIST);
-      have_client = (g_hash_table_lookup (source_data->clients, source) != NULL);
-      show_source = e_source_get_enabled (source) && e_source_selectable_get_selected (extension);
-
-      if (!show_source && have_client)
-        {
-          g_hash_table_remove (source_data->clients, source);
-          g_signal_emit (sources, source_data->changed_signal, 0);
-        }
-      if (show_source && !have_client)
-        {
-          create_client_for_source (source, source_data->source_type, source_data);
-          g_signal_emit (sources, source_data->changed_signal, 0);
-        }
-    }
+  calendar_sources_load_esource_list (source_data);
 }

 static void
-calendar_sources_registry_source_removed_cb (ESourceRegistry *registry,
-                                             ESource         *source,
-                                             CalendarSources *sources)
+calendar_sources_selected_sources_notify (GSettings          *settings,
+                                          const gchar        *key,
+					  CalendarSourceData *source_data)
 {
-  if (e_source_has_extension (source, E_SOURCE_EXTENSION_CALENDAR))
-    {
-      CalendarSourceData *source_data;
+  dprintf ("Selected sources key (%s) changed, reloading\n", key);

-      source_data = &sources->priv->appointment_sources;
-      g_hash_table_remove (source_data->clients, source);
-      g_signal_emit (sources, source_data->changed_signal, 0);
-    }
+  g_strfreev (source_data->selected_sources);
+  source_data->selected_sources = g_settings_get_strv (settings, key);

-  if (e_source_has_extension (source, E_SOURCE_EXTENSION_TASK_LIST))
-    {
-      CalendarSourceData *source_data;
-
-      source_data = &sources->priv->task_sources;
-      g_hash_table_remove (source_data->clients, source);
-      g_signal_emit (sources, source_data->changed_signal, 0);
-    }
+  calendar_sources_load_esource_list (source_data);
 }

-GList *
-calendar_sources_get_appointment_clients (CalendarSources *sources)
+static void
+calendar_sources_load_sources (CalendarSources    *sources,
+			       CalendarSourceData *source_data,
+			       const char         *sources_key,
+			       const char         *selected_sources_key)
 {
-  GList *list, *link;
+  GConfClient *gconf_client;
+  GSettings   *settings;
+  char        *signal_name;

+  dprintf ("---------------------------\n");
+  dprintf ("Loading sources:\n");
+  dprintf ("  sources_key: %s\n", sources_key);
+  dprintf ("  selected_sources_key: %s\n", selected_sources_key);
+
+  gconf_client = sources->priv->gconf_client;
+  settings = sources->priv->settings;
+
+  source_data->selected_sources = g_settings_get_strv (settings, selected_sources_key);
+
+  signal_name = g_strconcat ("changed::", selected_sources_key, NULL);
+  source_data->selected_sources_handler_id =
+    g_signal_connect (settings, signal_name,
+                      G_CALLBACK (calendar_sources_selected_sources_notify), source_data);
+  g_free (signal_name);
+
+  source_data->esource_list = e_source_list_new_for_gconf (gconf_client, sources_key);
+  g_signal_connect (source_data->esource_list, "changed",
+		    G_CALLBACK (calendar_sources_esource_list_changed),
+		    source_data);
+
+  calendar_sources_load_esource_list (source_data);
+
+  source_data->loaded = TRUE;
+
+  dprintf ("---------------------------\n");
+}
+
+GSList *
+calendar_sources_get_appointment_sources (CalendarSources *sources)
+{
  g_return_val_if_fail (CALENDAR_IS_SOURCES (sources), NULL);

  if (!sources->priv->appointment_sources.loaded)
    {
-      calendar_sources_load_esource_list (sources->priv->registry,
-                                          &sources->priv->appointment_sources);
-      sources->priv->appointment_sources.loaded = TRUE;
+      calendar_sources_load_sources (sources,
+				     &sources->priv->appointment_sources,
+				     CALENDAR_SOURCES_APPOINTMENT_SOURCES_KEY,
+				     CALENDAR_SOURCES_SELECTED_APPOINTMENT_SOURCES_KEY);
    }
-
-  list = g_hash_table_get_values (sources->priv->appointment_sources.clients);
-
-  for (link = list; link != NULL; link = g_list_next (link))
-    link->data = ((ClientData *) link->data)->client;
-
-  return list;
+  
+  return sources->priv->appointment_sources.clients;
 }

-GList *
-calendar_sources_get_task_clients (CalendarSources *sources)
+GSList *
+calendar_sources_get_task_sources (CalendarSources *sources)
 {
-  GList *list, *link;
-
  g_return_val_if_fail (CALENDAR_IS_SOURCES (sources), NULL);

  if (!sources->priv->task_sources.loaded)
    {
-      calendar_sources_load_esource_list (sources->priv->registry,
-                                          &sources->priv->task_sources);
-      sources->priv->task_sources.loaded = TRUE;
+      calendar_sources_load_sources (sources,
+				     &sources->priv->task_sources,
+				     CALENDAR_SOURCES_TASK_SOURCES_KEY,
+				     CALENDAR_SOURCES_SELECTED_TASK_SOURCES_KEY);
    }

-  list = g_hash_table_get_values (sources->priv->task_sources.clients);
-
-  for (link = list; link != NULL; link = g_list_next (link))
-    link->data = ((ClientData *) link->data)->client;
-
-  return list;
+  return sources->priv->task_sources.clients;
 }
--- a/src/calendar-server/calendar-sources.h
+++ b/src/calendar-server/calendar-sources.h
@@ -58,8 +58,8 @@ struct _CalendarSourcesClass

 GType            calendar_sources_get_type                (void) G_GNUC_CONST;
 CalendarSources *calendar_sources_get                     (void);
-GList           *calendar_sources_get_appointment_clients (CalendarSources *sources);
-GList           *calendar_sources_get_task_clients        (CalendarSources *sources);
+GSList          *calendar_sources_get_appointment_sources (CalendarSources *sources);
+GSList          *calendar_sources_get_task_sources        (CalendarSources *sources);

 G_END_DECLS

--- a/src/calendar-server/gnome-shell-calendar-server.c
+++ b/src/calendar-server/gnome-shell-calendar-server.c
@@ -37,7 +37,13 @@
 #include <gtk/gtk.h>

 #define HANDLE_LIBICAL_MEMORY
-#include <libecal/libecal.h>
+#include <libecal/e-cal-client.h>
+#include <libecal/e-cal-time-util.h>
+#include <libecal/e-cal-recur.h>
+#include <libecal/e-cal-system-timezone.h>
+
+#define CALENDAR_CONFIG_PREFIX   "/apps/evolution/calendar"
+#define CALENDAR_CONFIG_TIMEZONE CALENDAR_CONFIG_PREFIX "/display/timezone"

 #include "calendar-sources.h"

@@ -84,7 +90,7 @@ typedef struct
 {
  char   *uid;
  char   *rid;
-  char   *backend_name;
+  char   *uri;
  char   *summary;
  char   *description;
  char   *color_string;
@@ -247,60 +253,37 @@ static char *
 get_source_color (ECalClient *esource)
 {
  ESource *source;
-  ECalClientSourceType source_type;
-  ESourceSelectable *extension;
-  const gchar *extension_name;

  g_return_val_if_fail (E_IS_CAL_CLIENT (esource), NULL);

  source = e_client_get_source (E_CLIENT (esource));
-  source_type = e_cal_client_get_source_type (esource);

-  switch (source_type)
-    {
-      case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
-        extension_name = E_SOURCE_EXTENSION_CALENDAR;
-        break;
-      case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
-        extension_name = E_SOURCE_EXTENSION_TASK_LIST;
-        break;
-      default:
-        g_return_val_if_reached (NULL);
-    }
-
-  extension = e_source_get_extension (source, extension_name);
-
-  return e_source_selectable_dup_color (extension);
+  return g_strdup (e_source_peek_color_spec (source));
 }

 static gchar *
-get_source_backend_name (ECalClient *esource)
+get_source_uri (ECalClient *esource)
 {
-  ESource *source;
-  ECalClientSourceType source_type;
-  ESourceBackend *extension;
-  const gchar *extension_name;
+    ESource *source;
+    gchar   *string;
+    gchar  **list;

-  g_return_val_if_fail (E_IS_CAL_CLIENT (esource), NULL);
+    g_return_val_if_fail (E_IS_CAL_CLIENT (esource), NULL);

-  source = e_client_get_source (E_CLIENT (esource));
-  source_type = e_cal_client_get_source_type (esource);
+    source = e_client_get_source (E_CLIENT (esource));
+    string = g_strdup (e_source_get_uri (source));
+    if (string) {
+        list = g_strsplit (string, ":", 2);
+        g_free (string);

-  switch (source_type)
-    {
-      case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
-        extension_name = E_SOURCE_EXTENSION_CALENDAR;
-        break;
-      case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
-        extension_name = E_SOURCE_EXTENSION_TASK_LIST;
-        break;
-      default:
-        g_return_val_if_reached (NULL);
+        if (list[0]) {
+            string = g_strdup (list[0]);
+            g_strfreev (list);
+            return string;
+        }
+        g_strfreev (list);
    }
-
-  extension = e_source_get_extension (source, extension_name);
-
-  return e_source_backend_dup_backend_name (extension);
+    return NULL;
 }

 static inline int
@@ -331,7 +314,7 @@ calendar_appointment_equal (CalendarAppointment *a,

  return
    null_safe_strcmp (a->uid,          b->uid)          == 0 &&
-    null_safe_strcmp (a->backend_name, b->backend_name) == 0 &&
+    null_safe_strcmp (a->uri,          b->uri)          == 0 &&
    null_safe_strcmp (a->summary,      b->summary)      == 0 &&
    null_safe_strcmp (a->description,  b->description)  == 0 &&
    null_safe_strcmp (a->color_string, b->color_string) == 0 &&
@@ -356,8 +339,8 @@ calendar_appointment_free (CalendarAppointment *appointment)
  g_free (appointment->rid);
  appointment->rid = NULL;

-  g_free (appointment->backend_name);
-  appointment->backend_name = NULL;
+  g_free (appointment->uri);
+  appointment->uri = NULL;

  g_free (appointment->summary);
  appointment->summary = NULL;
@@ -380,7 +363,7 @@ calendar_appointment_init (CalendarAppointment  *appointment,
 {
  appointment->uid          = get_ical_uid (ical);
  appointment->rid          = get_ical_rid (ical);
-  appointment->backend_name = get_source_backend_name (cal);
+  appointment->uri          = get_source_uri (cal);
  appointment->summary      = get_ical_summary (ical);
  appointment->description  = get_ical_description (ical);
  appointment->color_string = get_source_color (cal);
@@ -484,6 +467,9 @@ struct _App
  CalendarSources *sources;
  gulong sources_signal_id;

+  guint                zone_listener;
+  GConfClient         *gconf_client;
+
  /* hash from uid to CalendarAppointment objects */
  GHashTable *appointments;

@@ -599,8 +585,8 @@ on_objects_removed (ECalClientView *view,
 static void
 app_load_events (App *app)
 {
-  GList *clients;
-  GList *l;
+  GSList *sources;
+  GSList *l;
  GList *ll;
  gchar *since_iso8601;
  gchar *until_iso8601;
@@ -630,8 +616,8 @@ app_load_events (App *app)
               since_iso8601,
               until_iso8601);

-  clients = calendar_sources_get_appointment_clients (app->sources);
-  for (l = clients; l != NULL; l = l->next)
+  sources = calendar_sources_get_appointment_sources (app->sources);
+  for (l = sources; l != NULL; l = l->next)
    {
      ECalClient *cal = E_CAL_CLIENT (l->data);
      GError *error;
@@ -644,9 +630,8 @@ app_load_events (App *app)
      error = NULL;
      if (!e_client_open_sync (E_CLIENT (cal), TRUE, NULL, &error))
        {
-          ESource *source = e_client_get_source (E_CLIENT (cal));
          g_warning ("Error opening calendar %s: %s\n",
-		     e_source_get_uid (source), error->message);
+		     e_client_get_uri (E_CLIENT (cal)), error->message);
          g_error_free (error);
          continue;
        }
@@ -663,9 +648,8 @@ app_load_events (App *app)
 					      NULL, /* cancellable */
 					      &error))
        {
-          ESource *source = e_client_get_source (E_CLIENT (cal));
          g_warning ("Error querying calendar %s: %s\n",
-		     e_source_get_uid (source), error->message);
+		     e_client_get_uri (E_CLIENT (cal)), error->message);
          g_error_free (error);
          g_free (query);
          continue;
@@ -721,7 +705,6 @@ app_load_events (App *app)

      g_free (query);
    }
-  g_list_free (clients);
  g_free (since_iso8601);
  g_free (until_iso8601);
  app->cache_invalid = FALSE;
--- a/src/gactionmuxer.c
+++ b/src/gactionmuxer.c
@@ -94,20 +94,8 @@ static gchar **
 g_action_muxer_list_actions (GActionGroup *action_group)
 {
  GActionMuxer *muxer = G_ACTION_MUXER (action_group);
-  GHashTableIter iter;
-  gchar *key;
-  gchar **keys;
-  gsize i;

-  keys = g_new (gchar *, g_hash_table_size (muxer->actions) + 1);
-
-  i = 0;
-  g_hash_table_iter_init (&iter, muxer->actions);
-  while (g_hash_table_iter_next (&iter, (gpointer *) &key, NULL))
-    keys[i++] = g_strdup (key);
-  keys[i] = NULL;
-
-  return keys;
+  return (gchar **) muxer->groups;
 }

 static Group *
--- a/src/gnome-shell-jhbuild.in
+++ b/src/gnome-shell-jhbuild.in
@@ -1,13 +1,30 @@
 #!@PYTHON@
 # -*- mode: Python; indent-tabs-mode: nil; -*-

+import atexit
+import datetime
+import dbus
+from dbus.mainloop.glib import DBusGMainLoop
+import gobject
+try:
+    import json
+except ImportError:
+    try:
+        import simplejson as json
+    except ImportError:
+        json = None
 import optparse
 import os
+import random
 import re
+import shutil
 import signal
 import subprocess
 import sys
+import tempfile
 import termios
+import time
+import errno

 def show_version(option, opt_str, value, parser):
    print "GNOME Shell @VERSION@"
@@ -62,24 +79,168 @@ def get_running_session_environs():
                result[key] = environs[key]
        return result

-def start_shell():
+_bus = None
+_bus_iface = None
+_name_owner_changed_hook = None
+
+def on_name_owner_changed(name, prev_owner, new_owner):
+    if _name_owner_changed_hook:
+        _name_owner_changed_hook(name, prev_owner, new_owner)
+
+def get_bus():
+    global _bus
+    if _bus is None:
+        dbus_loop = DBusGMainLoop()
+        _bus = dbus.SessionBus(mainloop=dbus_loop)
+    return _bus
+
+def get_bus_iface():
+    global _bus_iface
+    if _bus_iface is None:
+        bus = get_bus()
+        bus_proxy = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
+        _bus_iface = dbus.Interface(bus_proxy, 'org.freedesktop.DBus')
+        _bus_iface.connect_to_signal('NameOwnerChanged', on_name_owner_changed)
+    return _bus_iface
+
+def wait_for_dbus_name(wait_name):
+    global _name_owner_changed_hook
+
+    bus_iface = get_bus_iface()
+    loop = gobject.MainLoop()
+
+    def on_name_owner_changed(name, prev_owner, new_owner):
+        if not (name == wait_name and new_owner != ''):
+            return
+        loop.quit()
+        return
+    _name_owner_changed_hook = on_name_owner_changed
+
+    def on_timeout():
+        print "\nFailed to start %s: timed out" % (wait_name,)
+        sys.exit(1)
+    gobject.timeout_add_seconds(7, on_timeout)
+
+    loop.run()
+    _name_owner_changed_hook = None
+
+def start_dconf_await_service():
+    DCONF_NAME = 'ca.desrt.dconf'
+
+    bus = get_bus()
+    get_bus_iface() # connect to NameOwnerChanged signal
+
+    # See if the service is already running or normal D-Bus activation works
+    need_manual_activate = False
+    try:
+        dconf_proxy = bus.get_object(DCONF_NAME, '/')
+        dconf_proxy.Ping(dbus_interface='org.freedesktop.DBus.Peer')
+    except dbus.exceptions.DBusException, e:
+        if e.get_dbus_name() == 'org.freedesktop.DBus.Error.ServiceUnknown':
+            need_manual_activate = True
+        else:
+            raise e
+
+    if not need_manual_activate:
+        return
+
+    # At this point, it looks like we just have a jhbuild install
+    # of dconf, not known to the session dbus-daemon, so we start
+    # it manually and wait for it to join the bus
+
+    print "Starting dconf-service... ",
+    sys.stdout.flush()
+
+    # dconf is linked without libtool, so unlike other GNOME modules,
+    # won't have an embedded rpath for its library directory.
+    env = dict(os.environ)
+    if 'LD_LIBRARY_PATH' in env and env['LD_LIBRARY_PATH']:
+        ld_library_path = '@libdir@:' + env['LD_LIBRARY_PATH']
+    else:
+        ld_library_path = '@libdir@'
+    env['LD_LIBRARY_PATH'] = ld_library_path
+
+    dconf_path = os.path.join('@libexecdir@', 'dconf-service')
+    try:
+        subprocess.Popen([dconf_path, '--keep-alive'], env=env)
+    except OSError, e:
+        print "\nFailed to start %s: %s" % (dconf_path, e)
+        sys.exit(1)
+
+    wait_for_dbus_name (DCONF_NAME)
+
+PERF_HELPER_NAME = "org.gnome.Shell.PerfHelper"
+PERF_HELPER_IFACE = "org.gnome.Shell.PerfHelper"
+PERF_HELPER_PATH = "/org/gnome/Shell/PerfHelper"
+
+def start_perf_helper():
+    get_bus_iface() # connect to NameOwnerChanged signal
+
    self_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
    running_from_source_tree = os.path.exists(os.path.join(self_dir, 'gnome-shell-jhbuild.in'))

+    if running_from_source_tree:
+        perf_helper_path = os.path.join(self_dir, "gnome-shell-perf-helper")
+    else:
+        perf_helper_path = "@libexecdir@/gnome-shell-perf-helper"
+
+    subprocess.Popen([perf_helper_path])
+    wait_for_dbus_name (PERF_HELPER_NAME)
+
+def stop_perf_helper():
+    bus = get_bus()
+    proxy = bus.get_object(PERF_HELPER_NAME, PERF_HELPER_PATH)
+    proxy.Exit(dbus_interface=PERF_HELPER_IFACE)
+
+def start_shell(perf_output=None):
+    self_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
+    if os.path.exists(os.path.join(self_dir, 'gnome-shell-jhbuild.in')):
+        running_from_source_tree = True
+        top_dir = os.path.dirname(self_dir)
+        typelib_dir = '@JHBUILD_TYPELIBDIR@:' + os.path.join(top_dir, "src")
+        js_dir = os.path.join(top_dir, "js")
+        data_dir = os.path.join(top_dir, "data")
+    else:
+        running_from_source_tree = False
+        js_dir = os.path.join('@pkgdatadir@', 'js')
+        typelib_dir = '@JHBUILD_TYPELIBDIR@'
+
+    if os.environ.has_key('GI_TYPELIB_PATH'):
+        typelib_dir = typelib_dir + ":" + os.environ.get('GI_TYPELIB_PATH')
+
    # Set up environment
    env = dict(os.environ)
+    # TODO: Fix this, since nothing prevents it from propagating to child
+    # processes.  Why is it even here?
+    env.update({'GNOME_DISABLE_CRASH_DIALOG' : '1'})
+    # This stuff should really should only happen when running
+    # uninstalled, i.e. it should be in the conditional
+    # below. Otherwise it's just a bad reimplementation of "jhbuild
+    # run".  See bug #642084
+    env.update({'GNOME_SHELL_JS'      : js_dir,
+                'PATH'                : '@bindir@:' + os.environ.get('PATH', ''),
+                'GI_TYPELIB_PATH'     : typelib_dir,
+                'XDG_CONFIG_DIRS'     : '@sysconfdir@/xdg:' + (os.environ.get('XDG_CONFIG_DIRS') or '/etc/xdg'),
+                'XDG_DATA_DIRS'       : '@datadir@:' + (os.environ.get('XDG_DATA_DIRS') or '/usr/local/share:/usr/share')})
    if running_from_source_tree:
-        top_dir = os.path.dirname(self_dir)
+        env.update({'GNOME_SHELL_BINDIR'   : self_dir,
+                    'GNOME_SHELL_DATADIR'  : data_dir,
+                    'GSETTINGS_SCHEMA_DIR' : data_dir })
+    else:
+        # This is just broken to set in the installed case; see bug #642084
+        env.update({'GSETTINGS_SCHEMA_DIR' : os.path.join('@datadir@', 'glib-2.0', 'schemas')})

-        typelib_dir = os.path.join(top_dir, "src")
-        if 'GI_TYPELIB_PATH' in os.environ:
-            typelib_dir += ':%s' % (os.environ['GI_TYPELIB_PATH'],)
+    # Also plain broken to set in the normal installed case
+    jhbuild_gconf_source = os.path.join('@sysconfdir@', 'gconf/2/path.jhbuild')
+    if os.path.exists(jhbuild_gconf_source):
+        env['GCONF_DEFAULT_SOURCE_PATH'] = jhbuild_gconf_source

-        env.update({'GNOME_SHELL_JS'       : os.path.join(top_dir, "js"),
-                    'GNOME_SHELL_BINDIR'   : self_dir,
-                    'GI_TYPELIB_PATH'      : typelib_dir,
-                    'GNOME_SHELL_DATADIR'  : os.path.join(top_dir, "data"),
-                    'GSETTINGS_SCHEMA_DIR' : os.path.join(top_dir, "data") })
+    if options.perf is not None:
+        env['SHELL_PERF_MODULE'] = options.perf
+        env['MUTTER_WM_CLASS_FILTER'] = 'Gnome-shell-perf-helper'
+
+    if perf_output is not None:
+        env['SHELL_PERF_OUTPUT'] = perf_output

    args = []
    if options.debug:
@@ -95,7 +256,22 @@ def start_shell():
        args.append('--sync')
    return subprocess.Popen(args, env=env)

-def run_shell():
+def _killall(processname):
+    subprocess.call(['pkill', '-u', '%d' % (os.getuid(), ),
+                     '-f', r'^([^ ]*/)?' + re.escape(processname) + '($| )'])
+
+def ensure_desktop_infrastructure_state():
+    # This is a collection of random hacks necessary to make sure
+    # that we can run in jhbuild scenarios or when dynamically
+    # replacing GNOME 2.
+
+    start_dconf_await_service()
+
+    # We need to terminate notification-daemon
+    _killall('notification-daemon')
+    _killall('notify-osd')
+
+def run_shell(perf_output=None):
    if options.debug:
        # Record initial terminal state so we can reset it to that
        # later, in case we kill gdb at a bad time
@@ -106,9 +282,8 @@ def run_shell():
    if options.verbose:
        print "Starting shell"

-    shell = None
    try:
-        shell = start_shell()
+        shell = start_shell(perf_output=perf_output)

        # Wait for shell to exit
        if options.verbose:
@@ -142,6 +317,248 @@ def run_shell():

    return normal_exit

+def upload_performance_report(report_text):
+    # Local imports to avoid impacting gnome-shell startup time
+    import base64
+    from ConfigParser import RawConfigParser
+    import hashlib
+    import hmac
+    import httplib
+    import urlparse
+    import urllib
+
+    try:
+        config_home = os.environ['XDG_CONFIG_HOME']
+    except KeyError:
+        config_home = None
+
+    if not config_home:
+        config_home = os.path.expanduser("~/.config")
+
+    config_file = os.path.join(config_home, "gnome-shell/perf.ini")
+
+    try:
+        config = RawConfigParser()
+        f = open(config_file)
+        config.readfp(f)
+        f.close()
+
+        base_url = config.get('upload', 'url')
+        system_name = config.get('upload', 'name')
+        secret_key = config.get('upload', 'key')
+    except Exception, e:
+        print "Can't read upload configuration from %s: %s" % (config_file, str(e))
+        sys.exit(1)
+
+    # Determine host, port and upload URL from provided data, we're
+    # a bit extra-careful about normalization since the URL is part
+    # of the signature.
+
+    split = urlparse.urlsplit(base_url)
+    scheme = split[0].lower()
+    netloc = split[1]
+    base_path = split[2]
+
+    m = re.match(r'^(.*?)(?::(\d+))?$', netloc)
+    if m.group(2):
+        host, port = m.group(1), int(m.group(2))
+    else:
+        host, port = m.group(1), None
+
+    if scheme != "http":
+        print "'%s' is not a HTTP URL" % base_url
+        sys.exit(1)
+
+    if port is None:
+        port = 80
+
+    if base_path.endswith('/'):
+        base_path = base_path[:-1]
+
+    if port == 80:
+        normalized_base = "%s://%s%s" % (scheme, host, base_path)
+    else:
+        normalized_base = "%s://%s:%d%s" % (scheme, host, port, base_path)
+
+    upload_url = normalized_base + '/system/%s/upload' % system_name
+    upload_path = urlparse.urlsplit(upload_url)[2] # path portion
+
+    # Create signature based on upload URL and the report data
+
+    signature_data = 'POST&' + upload_url + "&&"
+    h = hmac.new(secret_key, digestmod=hashlib.sha1)
+    h.update(signature_data)
+    h.update(report_text)
+    signature = urllib.quote(base64.b64encode(h.digest()), "~")
+
+    headers = {
+        'User-Agent': 'gnome-shell',
+        'Content-Type': 'application/json',
+        'X-Shell-Signature': 'HMAC-SHA1 ' + signature
+    };
+
+    connection = httplib.HTTPConnection(host, port)
+    connection.request('POST', upload_path, report_text, headers)
+    response = connection.getresponse()
+
+    if response.status == 200:
+        print "Performance report upload succeeded"
+    else:
+        print "Performance report upload failed with status %d" % response.status
+        print response.read()
+
+def run_performance_test():
+    iters = options.perf_iters
+    if options.perf_warmup:
+        iters += 1
+
+    logs = []
+    metric_summaries = {}
+
+    start_perf_helper()
+
+    for i in xrange(0, iters):
+        # We create an empty temporary file that the shell will overwrite
+        # with the contents.
+        handle, output_file = tempfile.mkstemp(".json", "gnome-shell-perf.")
+        os.close(handle)
+
+        # Run the performance test and collect the output as JSON
+        normal_exit = False
+        try:
+            normal_exit = run_shell(perf_output=output_file)
+        except:
+            stop_perf_helper()
+            raise
+        finally:
+            if not normal_exit:
+                os.remove(output_file)
+
+        if not normal_exit:
+            stop_perf_helper()
+            return False
+
+        try:
+            f = open(output_file)
+            output = json.load(f)
+            f.close()
+        except:
+            stop_perf_helper()
+            raise
+        finally:
+            os.remove(output_file)
+
+        # Grab the event definitions and monitor layout the first time around
+        if i == 0:
+            events = output['events']
+            monitors = output['monitors']
+
+        if options.perf_warmup and i == 0:
+            continue
+
+        for metric in output['metrics']:
+            name = metric['name']
+            if not name in metric_summaries:
+                summary = {}
+                summary['description'] = metric['description']
+                summary['units'] = metric['units']
+                summary['values'] = []
+                metric_summaries[name] = summary
+            else:
+                summary = metric_summaries[name]
+
+            summary['values'].append(metric['value'])
+
+        logs.append(output['log'])
+
+    stop_perf_helper()
+
+    if options.perf_output or options.perf_upload:
+        # Write a complete report, formatted as JSON. The Javascript/C code that
+        # generates the individual reports we are summarizing here is very careful
+        # to format them nicely, but we just dump out a compressed no-whitespace
+        # version here for simplicity. Using json.dump(indent=0) doesn't real
+        # improve the readability of the output much.
+        report = {
+            'date': datetime.datetime.utcnow().isoformat() + 'Z',
+            'events': events,
+            'monitors': monitors,
+            'metrics': metric_summaries,
+            'logs': logs
+        }
+
+        # Add the Git revision if available
+        self_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
+        if os.path.exists(os.path.join(self_dir, 'gnome-shell-jhbuild.in')):
+            top_dir = os.path.dirname(self_dir)
+            git_dir = os.path.join(top_dir, '.git')
+            if os.path.exists(git_dir):
+                env = dict(os.environ)
+                env['GIT_DIR'] = git_dir
+                revision = subprocess.Popen(['git', 'rev-parse', 'HEAD'],
+                                            env=env,
+                                            stdout=subprocess.PIPE).communicate()[0].strip()
+                report['revision'] = revision
+
+        if options.perf_output:
+            f = open(options.perf_output, 'w')
+            json.dump(report, f)
+            f.close()
+
+        if options.perf_upload:
+            upload_performance_report(json.dumps(report))
+    else:
+        # Write a human readable summary
+        print '------------------------------------------------------------';
+        for metric in sorted(metric_summaries.keys()):
+            summary = metric_summaries[metric]
+            print "#", summary['description']
+            print metric, ", ".join((str(x) for x in summary['values']))
+        print '------------------------------------------------------------';
+
+    return True
+
+def restore_gnome():
+    # Do imports lazily to save time and memory
+    import gio
+    import gconf
+
+    # We don't want to start the new gnome-panel in the current
+    # directory; $HOME is better for stuff launched from it
+    os.chdir(os.path.expanduser("~"))
+
+    def launch_component(gconf_path):
+        client = gconf.client_get_default()
+        component = client.get_string(gconf_path)
+
+        if component == None or component == "":
+            return False
+
+        # See gnome-session/gsm-util.c:gsm_util_find_desktop_file_for_app_name()
+        # The one difference is that we don't search the autostart directories,
+        # and just search normal application search path. (Gio doesnt' know
+        # how to search the autostart dirs, so we'd have to do that ourselves.)
+        appinfo = None
+        try:
+            appinfo = gio.unix.DesktopAppInfo(component + ".desktop")
+        except:
+            try:
+                appinfo = gio.unix.DesktopAppInfo("gnome-" + component + ".desktop")
+            except:
+                pass
+
+        if appinfo:
+            appinfo.launch()
+            return True
+        return False
+
+    # GNOME2 fallback
+    wm    = launch_component("/desktop/gnome/session/required_components/windowmanager")
+    panel = launch_component("/desktop/gnome/session/required_components/panel")
+
+    if not wm and not panel: # Probably GNOME3
+        subprocess.Popen(['gnome-shell'])
+
 # Main program

 parser = optparse.OptionParser()
@@ -153,6 +570,17 @@ parser.add_option("", "--debug-command", metavar="COMMAND",
                  help="Command to use for debugging (defaults to 'gdb --args')")
 parser.add_option("-v", "--verbose", action="store_true")
 parser.add_option("", "--sync", action="store_true")
+parser.add_option("", "--perf", metavar="PERF_MODULE",
+		  help="Specify the name of a performance module to run")
+parser.add_option("", "--perf-iters", type="int", metavar="ITERS",
+		  help="Numbers of iterations of performance module to run",
+                  default=1)
+parser.add_option("", "--perf-warmup", action="store_true",
+		  help="Run a dry run before performance tests")
+parser.add_option("", "--perf-output", metavar="OUTPUT_FILE",
+		  help="Output file to write performance report")
+parser.add_option("", "--perf-upload", action="store_true",
+		  help="Upload performance report to server")
 parser.add_option("", "--version", action="callback", callback=show_version,
                  help="Display version and exit")

@@ -162,6 +590,10 @@ if args:
    parser.print_usage()
    sys.exit(1)

+if options.perf and json is None:
+    print 'The Python simplejson module is required for performance tests'
+    sys.exit(1)
+
 # Handle ssh logins
 if 'DISPLAY' not in os.environ:
    running_env = get_running_session_environs()
@@ -172,7 +604,21 @@ if options.debug_command:
 elif options.debug:
    options.debug_command = "gdb --args"

-normal_exit = run_shell()
+# We only respawn the previous environment on abnormal exit;
+# for a clean exit, we assume that gnome-shell was replaced with
+# something else.
+normal_exit = False
+
+try:
+    if options.perf:
+        normal_exit = run_performance_test()
+    else:
+        ensure_desktop_infrastructure_state()
+        normal_exit = run_shell()
+finally:
+    if options.replace and (options.perf or not normal_exit):
+        restore_gnome()
+
 if normal_exit:
    sys.exit(0)
 else:
--- a/src/gnome-shell-perf-tool.in
+++ b/src/gnome-shell-perf-tool.in
@@ -1,310 +0,0 @@
-#!@PYTHON@
-# -*- mode: Python; indent-tabs-mode: nil; -*-
-
-import datetime
-from gi.repository import GLib, GObject, Gio
-try:
-    import json
-except ImportError:
-    import simplejson as json
-import optparse
-import os
-import re
-import subprocess
-import sys
-import tempfile
-import base64
-from ConfigParser import RawConfigParser
-import hashlib
-import hmac
-import httplib
-import urlparse
-import urllib
-
-def show_version(option, opt_str, value, parser):
-    print "GNOME Shell Performance Test @VERSION@"
-    sys.exit()
-
-def wait_for_dbus_name(wait_name):
-    loop = GLib.MainLoop()
-
-    def on_name_appeared(connection, name, name_owner, *args):
-        if not (name == wait_name and new_owner != ''):
-            return
-        loop.quit()
-        return
-
-    watch_id = Gio.bus_watch_name(Gio.BusType.SESSION,
-                                  wait_name,
-                                  Gio.BusNameWatcherFlags.NONE,
-                                  on_name_appeared,
-                                  None)
-
-    def on_timeout():
-        print "\nFailed to start %s: timed out" % (wait_name,)
-        sys.exit(1)
-    GLib.timeout_add_seconds(7, on_timeout)
-
-    loop.run()
-    Gio.bus_unwatch_name(watch_id)
-
-PERF_HELPER_NAME = "org.gnome.Shell.PerfHelper"
-PERF_HELPER_IFACE = "org.gnome.Shell.PerfHelper"
-PERF_HELPER_PATH = "/org/gnome/Shell/PerfHelper"
-
-def start_perf_helper():
-    self_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
-    perf_helper_path = "@libexecdir@/gnome-shell-perf-helper"
-
-    subprocess.Popen([perf_helper_path])
-    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)
-    proxy.Exit()
-
-def start_shell(extra_args, perf_output=None):
-    # Set up environment
-    env = dict(os.environ)
-    env['SHELL_PERF_MODULE'] = options.perf
-    env['MUTTER_WM_CLASS_FILTER'] = 'Gnome-shell-perf-helper'
-
-    if perf_output is not None:
-        env['SHELL_PERF_OUTPUT'] = perf_output
-
-    self_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
-    args.append(os.path.join(self_dir, 'gnome-shell'))
-    # pass on any additional arguments
-    args += extra_args
-
-    return subprocess.Popen(args, env=env)
-
-def run_shell(args, 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.wait()
-    return shell.returncode == 0
-
-def upload_performance_report(report_text):
-    try:
-        config_home = os.environ['XDG_CONFIG_HOME']
-    except KeyError:
-        config_home = None
-
-    if not config_home:
-        config_home = os.path.expanduser("~/.config")
-
-    config_file = os.path.join(config_home, "gnome-shell/perf.ini")
-
-    try:
-        config = RawConfigParser()
-        f = open(config_file)
-        config.readfp(f)
-        f.close()
-
-        base_url = config.get('upload', 'url')
-        system_name = config.get('upload', 'name')
-        secret_key = config.get('upload', 'key')
-    except Exception, e:
-        print "Can't read upload configuration from %s: %s" % (config_file, str(e))
-        sys.exit(1)
-
-    # Determine host, port and upload URL from provided data, we're
-    # a bit extra-careful about normalization since the URL is part
-    # of the signature.
-
-    split = urlparse.urlsplit(base_url)
-    scheme = split[0].lower()
-    netloc = split[1]
-    base_path = split[2]
-
-    m = re.match(r'^(.*?)(?::(\d+))?$', netloc)
-    if m.group(2):
-        host, port = m.group(1), int(m.group(2))
-    else:
-        host, port = m.group(1), None
-
-    if scheme != "http":
-        print "'%s' is not a HTTP URL" % base_url
-        sys.exit(1)
-
-    if port is None:
-        port = 80
-
-    if base_path.endswith('/'):
-        base_path = base_path[:-1]
-
-    if port == 80:
-        normalized_base = "%s://%s%s" % (scheme, host, base_path)
-    else:
-        normalized_base = "%s://%s:%d%s" % (scheme, host, port, base_path)
-
-    upload_url = normalized_base + '/system/%s/upload' % system_name
-    upload_path = urlparse.urlsplit(upload_url)[2] # path portion
-
-    # Create signature based on upload URL and the report data
-
-    signature_data = 'POST&' + upload_url + "&&"
-    h = hmac.new(secret_key, digestmod=hashlib.sha1)
-    h.update(signature_data)
-    h.update(report_text)
-    signature = urllib.quote(base64.b64encode(h.digest()), "~")
-
-    headers = {
-        'User-Agent': 'gnome-shell-performance-tool/@VERSION@',
-        'Content-Type': 'application/json',
-        'X-Shell-Signature': 'HMAC-SHA1 ' + signature
-    };
-
-    connection = httplib.HTTPConnection(host, port)
-    connection.request('POST', upload_path, report_text, headers)
-    response = connection.getresponse()
-
-    if response.status == 200:
-        print "Performance report upload succeeded"
-    else:
-        print "Performance report upload failed with status %d" % response.status
-        print response.read()
-
-def run_performance_test(args):
-    iters = options.perf_iters
-    if options.perf_warmup:
-        iters += 1
-
-    logs = []
-    metric_summaries = {}
-
-    start_perf_helper()
-
-    for i in xrange(0, iters):
-        # We create an empty temporary file that the shell will overwrite
-        # with the contents.
-        handle, output_file = tempfile.mkstemp(".json", "gnome-shell-perf.")
-        os.close(handle)
-
-        # Run the performance test and collect the output as JSON
-        normal_exit = False
-        try:
-            normal_exit = run_shell(args, perf_output=output_file)
-        except:
-            stop_perf_helper()
-            raise
-        finally:
-            if not normal_exit:
-                os.remove(output_file)
-
-        if not normal_exit:
-            stop_perf_helper()
-            return False
-
-        try:
-            f = open(output_file)
-            output = json.load(f)
-            f.close()
-        except:
-            stop_perf_helper()
-            raise
-        finally:
-            os.remove(output_file)
-
-        # Grab the event definitions and monitor layout the first time around
-        if i == 0:
-            events = output['events']
-            monitors = output['monitors']
-
-        if options.perf_warmup and i == 0:
-            continue
-
-        for metric in output['metrics']:
-            name = metric['name']
-            if not name in metric_summaries:
-                summary = {}
-                summary['description'] = metric['description']
-                summary['units'] = metric['units']
-                summary['values'] = []
-                metric_summaries[name] = summary
-            else:
-                summary = metric_summaries[name]
-
-            summary['values'].append(metric['value'])
-
-        logs.append(output['log'])
-
-    stop_perf_helper()
-
-    if options.perf_output or options.perf_upload:
-        # Write a complete report, formatted as JSON. The Javascript/C code that
-        # generates the individual reports we are summarizing here is very careful
-        # to format them nicely, but we just dump out a compressed no-whitespace
-        # version here for simplicity. Using json.dump(indent=0) doesn't real
-        # improve the readability of the output much.
-        report = {
-            'date': datetime.datetime.utcnow().isoformat() + 'Z',
-            'events': events,
-            'monitors': monitors,
-            'metrics': metric_summaries,
-            'logs': logs
-        }
-
-        # Add the Git revision if available
-        self_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
-        if os.path.exists(os.path.join(self_dir, 'gnome-shell-jhbuild.in')):
-            top_dir = os.path.dirname(self_dir)
-            git_dir = os.path.join(top_dir, '.git')
-            if os.path.exists(git_dir):
-                env = dict(os.environ)
-                env['GIT_DIR'] = git_dir
-                revision = subprocess.Popen(['git', 'rev-parse', 'HEAD'],
-                                            env=env,
-                                            stdout=subprocess.PIPE).communicate()[0].strip()
-                report['revision'] = revision
-
-        if options.perf_output:
-            f = open(options.perf_output, 'w')
-            json.dump(report, f)
-            f.close()
-
-        if options.perf_upload:
-            upload_performance_report(json.dumps(report))
-    else:
-        # Write a human readable summary
-        print '------------------------------------------------------------';
-        for metric in sorted(metric_summaries.keys()):
-            summary = metric_summaries[metric]
-            print "#", summary['description']
-            print metric, ", ".join((str(x) for x in summary['values']))
-        print '------------------------------------------------------------';
-
-    return True
-
-# Main program
-
-parser = optparse.OptionParser()
-parser.add_option("", "--perf", metavar="PERF_MODULE",
-		  help="Specify the name of a performance module to run")
-parser.add_option("", "--perf-iters", type="int", metavar="ITERS",
-		  help="Numbers of iterations of performance module to run",
-                  default=1)
-parser.add_option("", "--perf-warmup", action="store_true",
-		  help="Run a dry run before performance tests")
-parser.add_option("", "--perf-output", metavar="OUTPUT_FILE",
-		  help="Output file to write performance report")
-parser.add_option("", "--perf-upload", action="store_true",
-		  help="Upload performance report to server")
-parser.add_option("", "--version", action="callback", callback=show_version,
-                  help="Display version and exit")
-
-options, args = parser.parse_args()
-
-normal_exit = run_performance_test(args)
-if normal_exit:
-    sys.exit(0)
-else:
-    sys.exit(1)
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -40,6 +40,9 @@
 #include "shell-perf-log.h"
 #include "shell-wm-private.h"

+static void gnome_shell_plugin_dispose     (GObject *object);
+static void gnome_shell_plugin_finalize    (GObject *object);
+
 static void gnome_shell_plugin_start            (MetaPlugin          *plugin);
 static void gnome_shell_plugin_minimize         (MetaPlugin          *plugin,
                                                 MetaWindowActor     *actor);
@@ -112,8 +115,12 @@ G_DEFINE_TYPE (GnomeShellPlugin, gnome_shell_plugin, META_TYPE_PLUGIN)
 static void
 gnome_shell_plugin_class_init (GnomeShellPluginClass *klass)
 {
+  GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
  MetaPluginClass *plugin_class  = META_PLUGIN_CLASS (klass);

+  gobject_class->dispose         = gnome_shell_plugin_dispose;
+  gobject_class->finalize        = gnome_shell_plugin_finalize;
+
  plugin_class->start            = gnome_shell_plugin_start;
  plugin_class->map              = gnome_shell_plugin_map;
  plugin_class->minimize         = gnome_shell_plugin_minimize;
@@ -195,6 +202,18 @@ gnome_shell_plugin_start (MetaPlugin *plugin)
    }
 }

+static void
+gnome_shell_plugin_dispose (GObject *object)
+{
+  G_OBJECT_CLASS(gnome_shell_plugin_parent_class)->dispose (object);
+}
+
+static void
+gnome_shell_plugin_finalize (GObject *object)
+{
+  G_OBJECT_CLASS(gnome_shell_plugin_parent_class)->finalize (object);
+}
+
 static ShellWM *
 get_shell_wm (void)
 {
--- a/src/main.c
+++ b/src/main.c
@@ -18,18 +18,16 @@
 #include <meta/main.h>
 #include <meta/meta-plugin.h>
 #include <meta/prefs.h>
-#include <atk-bridge.h>
 #include <telepathy-glib/debug.h>
 #include <telepathy-glib/debug-sender.h>

+#include "shell-a11y.h"
 #include "shell-global.h"
 #include "shell-global-private.h"
 #include "shell-js.h"
 #include "shell-perf-log.h"
 #include "st.h"

-#include <jsapi.h>
-
 extern GType gnome_shell_plugin_get_type (void);

 #define SHELL_DBUS_SERVICE "org.gnome.Shell"
@@ -38,7 +36,6 @@ extern GType gnome_shell_plugin_get_type (void);
 #define OVERRIDES_SCHEMA "org.gnome.shell.overrides"

 static gboolean is_gdm_mode = FALSE;
-static char *session_mode = NULL;

 #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER 1
 #define DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER 4
@@ -177,18 +174,6 @@ shell_prefs_init (void)
                                         OVERRIDES_SCHEMA);
 }

-static void
-shell_introspection_init (void)
-{
-
-  g_irepository_prepend_search_path (MUTTER_TYPELIB_DIR);
-  g_irepository_prepend_search_path (GNOME_SHELL_PKGLIBDIR);
-#if HAVE_BLUETOOTH
-  g_irepository_prepend_search_path (BLUETOOTH_DIR);
-#endif
-
-}
-
 static void
 malloc_statistics_callback (ShellPerfLog *perf_log,
                            gpointer      data)
@@ -235,20 +220,6 @@ shell_perf_log_init (void)
                                          NULL, NULL);
 }

-static void
-shell_a11y_init (void)
-{
-  if (clutter_get_accessibility_enabled () == FALSE)
-    {
-      g_warning ("Accessibility: clutter has no accessibility enabled"
-                 " skipping the atk-bridge load");
-    }
-  else
-    {
-      atk_bridge_adaptor_init (NULL, NULL);
-    }
-}
-
 static void
 default_log_handler (const char     *log_domain,
                     GLogLevelFlags  log_level,
@@ -268,48 +239,6 @@ default_log_handler (const char     *log_domain,
    g_log_default_handler (log_domain, log_level, message, data);
 }

-static void
-shut_up (const char     *domain,
-         GLogLevelFlags  level,
-         const char     *message,
-         gpointer        user_data)
-{
-}
-
-static gboolean
-list_modes (const char  *option_name,
-            const char  *value,
-            gpointer     data,
-            GError     **error)
-{
-  ShellGlobal *global;
-  GjsContext *context;
-  const char *script;
-  int status;
-
-  /* Many of our imports require global to be set, so rather than
-   * tayloring our imports carefully here to avoid that dependency,
-   * we just set it.
-   * ShellGlobal has some GTK+ dependencies, so initialize GTK+; we
-   * don't really care if it fails though (e.g. when running from a tty),
-   * so we mute all warnings */
-  g_log_set_default_handler (shut_up, NULL);
-  gtk_init_check (NULL, NULL);
-
-  _shell_global_init (NULL);
-  global = shell_global_get ();
-  context = _shell_global_get_gjs_context (global);
-
-  shell_introspection_init ();
-
-  script = "imports.ui.environment.init();"
-           "imports.ui.sessionMode.listModes();";
-  if (!gjs_context_eval (context, script, -1, "<main>", &status, NULL))
-      g_message ("Retrieving list of available modes failed.");
-
-  exit (status);
-}
-
 static gboolean
 print_version (const gchar    *option_name,
               const gchar    *value,
@@ -328,23 +257,11 @@ GOptionEntry gnome_shell_options[] = {
    NULL
  },
  {
-    "gdm-mode", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE,
+    "gdm-mode", 0, 0, G_OPTION_ARG_NONE,
    &is_gdm_mode,
    N_("Mode used by GDM for login screen"),
    NULL
  },
-  {
-    "mode", 0, 0, G_OPTION_ARG_STRING,
-    &session_mode,
-    N_("Use a specific mode, e.g. \"gdm\" for login screen"),
-    "MODE"
-  },
-  {
-    "list-modes", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
-    list_modes,
-    N_("List possible modes"),
-    NULL
-  },
  { NULL }
 };

@@ -353,6 +270,7 @@ main (int argc, char **argv)
 {
  GOptionContext *ctx;
  GError *error = NULL;
+  ShellSessionType session_type;
  int ecode;
  TpDebugSender *sender;

@@ -372,11 +290,13 @@ main (int argc, char **argv)

  g_option_context_free (ctx);

-  meta_plugin_manager_set_plugin_type (gnome_shell_plugin_get_type ());
+  meta_plugin_type_register (gnome_shell_plugin_get_type ());

  /* Prevent meta_init() from causing gtk to load gail and at-bridge */
+  g_setenv ("NO_GAIL", "1", TRUE);
  g_setenv ("NO_AT_BRIDGE", "1", TRUE);
  meta_init ();
+  g_unsetenv ("NO_GAIL");
  g_unsetenv ("NO_AT_BRIDGE");

  /* FIXME: Add gjs API to set this stuff and don't depend on the
@@ -389,7 +309,11 @@ main (int argc, char **argv)
  shell_a11y_init ();
  shell_perf_log_init ();
  shell_prefs_init ();
-  shell_introspection_init ();
+
+  g_irepository_prepend_search_path (GNOME_SHELL_PKGLIBDIR);
+#if HAVE_BLUETOOTH
+  g_irepository_prepend_search_path (BLUETOOTH_DIR);
+#endif

  /* Turn on telepathy-glib debugging but filter it out in
   * default_log_handler. This handler also exposes all the logs over D-Bus
@@ -400,10 +324,12 @@ main (int argc, char **argv)
  g_log_set_default_handler (default_log_handler, sender);

  /* Initialize the global object */
-  if (session_mode == NULL)
-    session_mode = is_gdm_mode ? "gdm" : "user";
+  if (is_gdm_mode)
+      session_type = SHELL_SESSION_GDM;
+  else
+      session_type = SHELL_SESSION_USER;

-  _shell_global_init ("session-mode", session_mode, NULL);
+  _shell_global_init ("session-type", session_type, NULL);

  ecode = meta_run ();

@@ -424,6 +350,7 @@ main (int argc, char **argv)
   This function is never actually called.
   https://bugzilla.gnome.org/show_bug.cgi?id=670477
 */
+
 void _shell_link_to_shell_js (void);

 void
--- a/src/run-js-test.c
+++ b/src/run-js-test.c
@@ -144,9 +144,6 @@ main(int argc, char **argv)
    exit (1);
  }

-  gjs_context_gc (js_context);
-  gjs_context_gc (js_context);
-
  g_free (script);
  exit (code);
 }
--- a/src/shell-a11y.c
+++ b/src/shell-a11y.c
@@ -0,0 +1,164 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2010 Igalia, S.L.
+ *
+ * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include <string.h>
+#include <gmodule.h>
+#include <clutter/clutter.h>
+
+#include "shell-a11y.h"
+
+#define INIT_METHOD "gnome_accessibility_module_init"
+#define DESKTOP_SCHEMA "org.gnome.desktop.interface"
+#define ACCESSIBILITY_ENABLED_KEY "toolkit-accessibility"
+#define AT_SPI_SCHEMA "org.a11y.atspi"
+#define ATK_BRIDGE_LOCATION_KEY "atk-bridge-location"
+
+static gboolean
+should_enable_a11y (void)
+{
+  GSettings *desktop_settings = NULL;
+  gboolean value = FALSE;
+
+  desktop_settings = g_settings_new (DESKTOP_SCHEMA);
+  value = g_settings_get_boolean (desktop_settings, ACCESSIBILITY_ENABLED_KEY);
+
+  g_object_unref (desktop_settings);
+
+  return value;
+}
+
+static char*
+get_atk_bridge_path (void)
+{
+  GSettings *atspi_settings = NULL;
+  GVariant *variant = NULL;
+  char *value = NULL;
+  const char * const *schemas = NULL;
+  gboolean found = FALSE;
+  int i = 0;
+
+  schemas = g_settings_list_schemas ();
+
+  for (i = 0; schemas [i]; i++)
+    {
+      if (!strcmp (schemas[i], AT_SPI_SCHEMA))
+        {
+          found = TRUE;
+          break;
+        }
+    }
+
+  if (!found)
+    {
+      g_warning ("Accessibility: %s schema not found. Are you sure that at-spi or"
+                 " at-spi2 is installed on your system?", AT_SPI_SCHEMA);
+      return NULL;
+    }
+
+  atspi_settings = g_settings_new (AT_SPI_SCHEMA);
+  variant = g_settings_get_value (atspi_settings, ATK_BRIDGE_LOCATION_KEY);
+  value = g_variant_dup_bytestring (variant, NULL);
+  g_variant_unref (variant);
+  g_object_unref (atspi_settings);
+
+  return value;
+}
+
+static gboolean
+a11y_invoke_module (const char *module_path)
+{
+  GModule    *handle;
+  void      (*invoke_fn) (void);
+
+  if (!module_path)
+    {
+      g_warning ("Accessibility: invalid module path (NULL)");
+
+      return FALSE;
+    }
+
+  if (!(handle = g_module_open (module_path, 0)))
+    {
+      g_warning ("Accessibility: failed to load module '%s': '%s'",
+                 module_path, g_module_error ());
+
+      return FALSE;
+    }
+
+  if (!g_module_symbol (handle, INIT_METHOD, (gpointer *)&invoke_fn))
+    {
+      g_warning ("Accessibility: error library '%s' does not include "
+                 "method '%s' required for accessibility support",
+                 module_path, INIT_METHOD);
+      g_module_close (handle);
+
+      return FALSE;
+    }
+
+  invoke_fn ();
+
+  return TRUE;
+}
+
+/*
+ * It loads the atk-bridge if required. It checks:
+ *  * If the proper gsetting key is set
+ *  * If clutter has already enabled the accessibility
+ *
+ * You need to ensure that the atk-bridge was not loaded before this
+ * call, because in that case the application would be already
+ * registered on at-spi using the AtkUtil implementation on that
+ * moment (if any, although without anyone the application would
+ * crash). Anyway this is the reason of NO_AT_BRIDGE.
+ *
+ */
+void
+shell_a11y_init (void)
+{
+  char *bridge_path = NULL;
+
+  if (!should_enable_a11y ())
+    return;
+
+  if (clutter_get_accessibility_enabled () == FALSE)
+    {
+      g_warning ("Accessibility: clutter has no accessibility enabled"
+                 " skipping the atk-bridge load");
+      return;
+    }
+
+  bridge_path = get_atk_bridge_path ();
+
+  if (a11y_invoke_module (bridge_path) == FALSE)
+    {
+      g_warning ("Accessibility: error loading the atk-bridge. Although the"
+                 " accessibility on the system is enabled and clutter"
+                 " accessibility is also enabled, accessibility support on"
+                 " GNOME Shell will not work");
+    }
+
+  /* NOTE: We avoid to load gail module, as gail-cally interaction is
+   * not fully supported right now.
+   */
+
+  g_free (bridge_path);
+}
--- a/src/shell-a11y.h
+++ b/src/shell-a11y.h
@@ -0,0 +1,32 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2010 Igalia, S.L.
+ *
+ * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __SHELL_A11Y_H_
+#define __SHELL_A11Y_H_
+
+G_BEGIN_DECLS
+
+void shell_a11y_init (void);
+
+G_END_DECLS
+
+#endif /* __SHELL_A11Y_H_ */
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -7,13 +7,18 @@
 #include <string.h>

 #include <gio/gio.h>
+#include <gio/gdesktopappinfo.h>
+#include <gtk/gtk.h>
+#include <clutter/clutter.h>
 #include <glib/gi18n.h>
+#include <meta/display.h>

 #include "shell-app-private.h"
 #include "shell-window-tracker-private.h"
 #include "shell-app-system-private.h"
 #include "shell-global.h"
 #include "shell-util.h"
+#include "st.h"

 /* Vendor prefixes are something that can be preprended to a .desktop
 * file name.  Undo this.
@@ -41,7 +46,6 @@ struct _ShellAppSystemPrivate {
  GMenuTree *apps_tree;

  GHashTable *running_apps;
-  GHashTable *visible_id_to_app;
  GHashTable *id_to_app;

  GSList *known_vendor_prefixes;
@@ -93,16 +97,14 @@ shell_app_system_init (ShellAppSystem *self)
  priv->id_to_app = g_hash_table_new_full (g_str_hash, g_str_equal,
                                           NULL,
                                           (GDestroyNotify)g_object_unref);
-
-  /* All the objects in this hash table are owned by id_to_app */
-  priv->visible_id_to_app = g_hash_table_new (g_str_hash, g_str_equal);
-
  priv->setting_id_to_app = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                   NULL,
                                                   (GDestroyNotify)g_object_unref);

-  /* We want to track NoDisplay apps, so we add INCLUDE_NODISPLAY. We'll
-   * filter NoDisplay apps out when showing them to the user. */
+  /* For now, we want to pick up Evince, Nautilus, etc.  We'll
+   * handle NODISPLAY semantics at a higher level or investigate them
+   * case by case.
+   */
  priv->apps_tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
  g_signal_connect (priv->apps_tree, "changed", G_CALLBACK (on_apps_tree_changed_cb), self);

@@ -124,10 +126,10 @@ shell_app_system_finalize (GObject *object)

  g_hash_table_destroy (priv->running_apps);
  g_hash_table_destroy (priv->id_to_app);
-  g_hash_table_destroy (priv->visible_id_to_app);
  g_hash_table_destroy (priv->setting_id_to_app);

-  g_slist_free_full (priv->known_vendor_prefixes, g_free);
+  g_slist_foreach (priv->known_vendor_prefixes, (GFunc)g_free, NULL);
+  g_slist_free (priv->known_vendor_prefixes);
  priv->known_vendor_prefixes = NULL;

  G_OBJECT_CLASS (shell_app_system_parent_class)->finalize (object);
@@ -312,8 +314,8 @@ on_apps_tree_changed_cb (GMenuTree *tree,

  g_assert (tree == self->priv->apps_tree);

-  g_hash_table_remove_all (self->priv->visible_id_to_app);
-  g_slist_free_full (self->priv->known_vendor_prefixes, g_free);
+  g_slist_foreach (self->priv->known_vendor_prefixes, (GFunc)g_free, NULL);
+  g_slist_free (self->priv->known_vendor_prefixes);
  self->priv->known_vendor_prefixes = NULL;

  if (!gmenu_tree_load_sync (self->priv->apps_tree, &error))
@@ -374,8 +376,6 @@ on_apps_tree_changed_cb (GMenuTree *tree,
       * string is pointed to.
       */
      g_hash_table_replace (self->priv->id_to_app, (char*)id, app);
-      if (!gmenu_tree_entry_get_is_nodisplay_recurse (entry))
-        g_hash_table_replace (self->priv->visible_id_to_app, (char*)id, app);

      if (old_entry)
        gmenu_tree_item_unref (old_entry);
@@ -609,39 +609,27 @@ shell_app_system_lookup_heuristic_basename (ShellAppSystem *system,
 }

 /**
- * shell_app_system_lookup_wmclass:
- * @system: a #ShellAppSystem
- * @wmclass: A WM_CLASS value
+ * shell_app_system_get_all:
+ * @system:
 *
- * Find a valid application corresponding to a WM_CLASS value.
- *
- * Returns: (transfer none): A #ShellApp for @wmclass
+ * Returns: (transfer container) (element-type ShellApp): All installed applications
 */
-ShellApp *
-shell_app_system_lookup_wmclass (ShellAppSystem *system,
-                                 const char     *wmclass)
+GSList *
+shell_app_system_get_all (ShellAppSystem  *self)
 {
-  char *canonicalized;
-  char *desktop_file;
-  ShellApp *app;
+  GSList *result = NULL;
+  GHashTableIter iter;
+  gpointer key, value;

-  if (wmclass == NULL)
-    return NULL;
-
-  canonicalized = g_ascii_strdown (wmclass, -1);
-
-  /* This handles "Fedora Eclipse", probably others.
-   * Note g_strdelimit is modify-in-place. */
-  g_strdelimit (canonicalized, " ", '-');
-
-  desktop_file = g_strconcat (canonicalized, ".desktop", NULL);
-
-  app = shell_app_system_lookup_heuristic_basename (system, desktop_file);
-
-  g_free (canonicalized);
-  g_free (desktop_file);
-
-  return app;
+  g_hash_table_iter_init (&iter, self->priv->id_to_app);
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      ShellApp *app = value;
+      
+      if (!g_desktop_app_info_get_nodisplay (shell_app_get_app_info (app)))
+        result = g_slist_prepend (result, app);
+    }
+  return result;
 }

 void
@@ -766,7 +754,8 @@ search_tree (ShellAppSystem *self,
                           &prefix_results,
                           &substring_results);
    }
-  g_slist_free_full (normalized_terms, g_free);
+  g_slist_foreach (normalized_terms, (GFunc)g_free, NULL);
+  g_slist_free (normalized_terms);

  return sort_and_concat_results (self, prefix_results, substring_results);

@@ -785,7 +774,7 @@ GSList *
 shell_app_system_initial_search (ShellAppSystem  *self,
                                 GSList          *terms)
 {
-  return search_tree (self, terms, self->priv->visible_id_to_app);
+  return search_tree (self, terms, self->priv->id_to_app);
 }

 /**
@@ -819,7 +808,8 @@ shell_app_system_subsearch (ShellAppSystem   *system,
                           &prefix_results,
                           &substring_results);
    }
-  g_slist_free_full (normalized_terms, g_free);
+  g_slist_foreach (normalized_terms, (GFunc)g_free, NULL);
+  g_slist_free (normalized_terms);

  /* Note that a shorter term might have matched as a prefix, but
     when extended only as a substring, so we have to redo the
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@@ -49,8 +49,9 @@ ShellApp       *shell_app_system_lookup_app_for_path          (ShellAppSystem  *
                                                               const char      *desktop_path);
 ShellApp       *shell_app_system_lookup_heuristic_basename    (ShellAppSystem  *system,
                                                               const char      *id);
-ShellApp       *shell_app_system_lookup_wmclass               (ShellAppSystem *system,
-                                                               const char     *wmclass);
+
+
+GSList         *shell_app_system_get_all                   (ShellAppSystem  *system);

 GSList         *shell_app_system_get_running               (ShellAppSystem  *self);

--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -42,7 +42,6 @@ typedef struct {
  /* See GApplication documentation */
  GDBusMenuModel   *remote_menu;
  GActionMuxer     *muxer;
-  char * unique_bus_name;
 } ShellAppRunningState;

 /**
@@ -96,6 +95,7 @@ enum {
 static guint shell_app_signals[LAST_SIGNAL] = { 0 };

 static void create_running_state (ShellApp *app);
+static void setup_running_state (ShellApp *app, MetaWindow *window);
 static void unref_running_state (ShellAppRunningState *state);

 G_DEFINE_TYPE (ShellApp, shell_app, G_TYPE_OBJECT)
@@ -371,7 +371,7 @@ shell_app_get_name (ShellApp *app)

      name = meta_window_get_wm_class (window);
      if (!name)
-        name = C_("program", "Unknown");
+        name = _("Unknown");
      return name;
    }
 }
@@ -493,7 +493,7 @@ shell_app_activate_window (ShellApp     *app,
    return;
  else
    {
-      GSList *windows_reversed, *iter;
+      GSList *iter;
      ShellGlobal *global = shell_global_get ();
      MetaScreen *screen = shell_global_get_screen (global);
      MetaDisplay *display = meta_screen_get_display (screen);
@@ -511,16 +511,13 @@ shell_app_activate_window (ShellApp     *app,
      /* Now raise all the other windows for the app that are on
       * the same workspace, in reverse order to preserve the stacking.
       */
-      windows_reversed = g_slist_copy (windows);
-      windows_reversed = g_slist_reverse (windows_reversed);
-      for (iter = windows_reversed; iter; iter = iter->next)
+      for (iter = windows; iter; iter = iter->next)
        {
          MetaWindow *other_window = iter->data;

          if (other_window != window)
            meta_window_raise (other_window);
        }
-      g_slist_free (windows_reversed);

      /* If we have a transient that the user's interacted with more recently than
       * the window, pick that.
@@ -975,7 +972,7 @@ _shell_app_add_window (ShellApp        *app,
  g_signal_connect (window, "unmanaged", G_CALLBACK(shell_app_on_unmanaged), app);
  g_signal_connect (window, "notify::user-time", G_CALLBACK(shell_app_on_user_time_changed), app);

-  shell_app_update_app_menu (app, window);
+  setup_running_state (app, window);

  if (app->state != SHELL_APP_STATE_STARTING)
    shell_app_state_transition (app, SHELL_APP_STATE_RUNNING);
@@ -1221,14 +1218,12 @@ create_running_state (ShellApp *app)
  app->running_state->muxer = g_action_muxer_new ();
 }

-void
-shell_app_update_app_menu (ShellApp   *app,
-                           MetaWindow *window)
+static void
+setup_running_state (ShellApp   *app,
+                     MetaWindow *window)
 {
-  const gchar *unique_bus_name;
-
-  /* We assume that 'gtk-application-object-path' and
-   * 'gtk-app-menu-object-path' are the same for all windows which
+  /* We assume that 'gtk-unique-bus-name', gtk-application-object-path'
+   * and 'gtk-app-menu-object-path' are the same for all windows which
   * have it set.
   *
   * It could be possible, however, that the first window we see
@@ -1237,27 +1232,23 @@ shell_app_update_app_menu (ShellApp   *app,
   * all the rest (until the app is stopped and restarted).
   */

-  unique_bus_name = meta_window_get_gtk_unique_bus_name (window);
-
-  if (app->running_state->remote_menu == NULL ||
-      g_strcmp0 (app->running_state->unique_bus_name, unique_bus_name) != 0)
+  if (app->running_state->remote_menu == NULL)
    {
      const gchar *application_object_path;
      const gchar *app_menu_object_path;
+      const gchar *unique_bus_name;
      GDBusConnection *session;
      GDBusActionGroup *actions;

      application_object_path = meta_window_get_gtk_application_object_path (window);
      app_menu_object_path = meta_window_get_gtk_app_menu_object_path (window);
+      unique_bus_name = meta_window_get_gtk_unique_bus_name (window);

      if (application_object_path == NULL || app_menu_object_path == NULL || unique_bus_name == NULL)
        return;

      session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
      g_assert (session != NULL);
-      g_clear_pointer (&app->running_state->unique_bus_name, g_free);
-      app->running_state->unique_bus_name = g_strdup (unique_bus_name);
-      g_clear_object (&app->running_state->remote_menu);
      app->running_state->remote_menu = g_dbus_menu_model_get (session, unique_bus_name, app_menu_object_path);
      actions = g_dbus_action_group_get (session, unique_bus_name, application_object_path);
      g_action_muxer_insert (app->running_state->muxer, "app", G_ACTION_GROUP (actions));
--- a/src/shell-app.h
+++ b/src/shell-app.h
@@ -82,7 +82,6 @@ int shell_app_compare_by_name (ShellApp *app, ShellApp *other);
 int shell_app_compare (ShellApp *app, ShellApp *other);

 void shell_app_update_window_actions (ShellApp *app, MetaWindow *window);
-void shell_app_update_app_menu       (ShellApp *app, MetaWindow *window);

 G_END_DECLS

--- a/src/shell-contact-system.c
+++ b/src/shell-contact-system.c
@@ -297,7 +297,7 @@ sort_and_prepare_results (GSList *results)
      sorted_results = g_slist_prepend (sorted_results, id);
    }

-  g_slist_free_full (results, (GDestroyNotify) free_result);
+  g_slist_foreach (results, (GFunc) free_result, NULL);

  return sorted_results;
 }
@@ -463,9 +463,6 @@ shell_contact_system_initial_search (ShellContactSystem *self,
      g_object_unref (individual);
    }

-  g_object_unref (iter);
-  g_slist_free_full (normalized_terms, (GDestroyNotify) g_free);
-
  return sort_and_prepare_results (results);
 }

--- a/src/shell-global-private.h
+++ b/src/shell-global-private.h
@@ -16,4 +16,7 @@ GjsContext *_shell_global_get_gjs_context (ShellGlobal  *global);
 gboolean _shell_global_check_xdnd_event (ShellGlobal  *global,
                                         XEvent       *xev);

+void     _shell_global_set_session_type (ShellGlobal      *global,
+                                         ShellSessionType  session_type);
+
 #endif /* __SHELL_GLOBAL_PRIVATE_H__ */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Cédric Valmary	946d95b3e9	Added Occitan translation	2016-03-21 18:55:13 +00:00
Gil Forcada	4bc9cbaa0b	[l10n] Update Catalan translation	2014-02-21 23:11:12 +01:00
Мирослав Николић	9d5c04e2d8	Updated Serbian translation	2014-01-13 09:39:15 +01:00
Мирослав Николић	2881e4d7aa	Updated Serbian translation	2014-01-13 09:34:28 +01:00
Мирослав Николић	14d48f563b	Updated Serbian translation	2014-01-13 09:19:57 +01:00
Мирослав Николић	7306918531	Updated Serbian translation	2013-11-03 08:58:01 +01:00
Balázs Úr	1a93ebc3e2	Updated Hungarian translation	2013-10-13 13:36:15 +02:00
Kenneth Nielsen	03f53d1919	Updated Danish translation	2013-10-07 22:45:21 +02:00
Fran Diéguez	451d679b62	Updated Galician translations	2013-09-28 16:28:21 +02:00
Florian Müllner	36eb51b594	Bump version to 3.4.2 Updated NEWS	2012-07-20 20:03:44 +02:00
Nilamdyuti Goswami	04f03ee7d8	Assamese translation reviewed	2012-07-05 20:28:30 +05:30
Nilamdyuti Goswami	d144f5d7df	Assamese translation reviewed	2012-07-05 15:33:02 +05:30
Nilamdyuti Goswami	aec4c6a388	Assamese translation reviewed	2012-07-04 21:52:41 +05:30
Nilamdyuti Goswami	63f6800115	Assamese translation reviewed	2012-07-04 21:40:56 +05:30
Cosimo Cecchi	f52c5fc4fe	mount-operation: fix exceptions when showing password entry This is a fallout from some changes in MessageTray.Source, which now requires either defining the iconName/iconType properties on it, or implementing createNotificationIcon, and we're not doing any of those. Fix it by storing the gicon of the source object and using a helper method to create the icon actor on demand, to avoid any case when the same actor might be added twice to different containers. https://bugzilla.gnome.org/show_bug.cgi?id=678428	2012-06-20 10:13:18 -04:00
Alban Browaeys	717aedec5d	popupMenu: do not overflow the currentItems Do not overflow currentItems array. If the Menu section is filled via model items-changed callback the position in the model passed to the RemoteMenu _modelChanged can be a to be added asynchronously action-added. Thus the item does not yet exists in the currentItems. https://bugzilla.gnome.org/show_bug.cgi?id=676447	2012-06-18 10:05:18 +02:00
Alban Browaeys	66fa24c340	popupMenu: bypass changeSignal callback if action is already handled https://bugzilla.gnome.org/show_bug.cgi?id=676447	2012-06-18 10:05:18 +02:00
Guillaume Desmottes	7e73a52505	telepathyClient: ignore invalidated channels There is a race if a channel is invalidated during its preparation: the 'invalidated' signal is already emitted so the Shell will never notice. We fix this by simply checking if the channel is already invalidated when receiving it from telepathy-glib. In the approving case, we reject the full ChannelDispatchOperation as we only support approving one channel at the time. https://bugzilla.gnome.org/show_bug.cgi?id=677457	2012-06-18 09:47:18 +02:00
Guillaume Desmottes	42366ab025	telepathyClient: decline dispatch op when approving unsupported channel type It shouldn't happen in theory but best to be safe than sorry. https://bugzilla.gnome.org/show_bug.cgi?id=677457	2012-06-18 09:45:42 +02:00
Jasper St. Pierre	69a63f208e	notificationDaemon: Fix copy-paste typo Since this line was introduced in `7458d3e`, "Approve file transfer channels", it's quite obvious that the line was meant to filter out transfer channel notifications. https://bugzilla.gnome.org/show_bug.cgi?id=676175	2012-06-06 16:28:00 +02:00
Guillaume Desmottes	98c3f6b3bf	add missing _shell_link_to_shell_js() declaration Fix missing-prototypes warning. https://bugzilla.gnome.org/show_bug.cgi?id=677441	2012-06-05 09:38:35 +02:00
Guillaume Desmottes	406db1902c	notificationDaemon.js: convert the hints dict at the beginning of the function It's used right away to discard some Empathy notifications. This regression has been introduced during the 3.4 cycle when 'hints' has been turned to a GVariant. https://bugzilla.gnome.org/show_bug.cgi?id=675370	2012-05-31 11:30:24 +02:00
Mantas Kriaučiūnas	37c7c04efb	Updated Lithuanian translation	2012-05-26 23:13:38 +03:00
Changwoo Ryu	af0ec7e089	Updated Korean translation	2012-05-19 22:57:53 +09:00
Andika Triwidada	ae28bf7c25	[l10n] Really update Indonesian translation	2012-05-19 16:31:47 +07:00
Andika Triwidada	29c8add696	[l10n] Updated Indonesian translation	2012-05-19 16:20:51 +07:00
Alexandre Rostovtsev	ecb9c881be	Prevent the link to libgnome-shell-js.so from being removed Add a dummy call to shell_js_add_extension_importer() to ensure that the link to libgnome-shell-js.so is not removed when using -Wl,--as-needed, which is the default on many distros. https://bugzilla.gnome.org/show_bug.cgi?id=670477	2012-05-18 18:35:07 -04:00
Owen W. Taylor	4cf79088a5	Link the gnome-shell binary to libgnome-shell-js.so Depending on the exact linker options and versions, rpath's written into the binary may, or may not, be honored by dlopen(). Work around this by simply linking the gnome-shell binary to gnome-shell-js, since then dlopen() doesn't need to search paths. https://bugzilla.gnome.org/show_bug.cgi?id=670477	2012-05-18 18:35:07 -04:00
Takanori MATSUURA	05800773bc	Updated Japanese translation.	2012-05-15 00:52:42 +09:00
Sandeep Sheshrao Shedmake	2237f66c44	Updated Marathi Translations	2012-05-10 10:09:59 +05:30
Ray Strode	2c51d42acf	gdm: don't fail if fprintd unavailable fingerprint support is optional so we shouldn't try to start fprintd upfront and croak if it fails. https://bugzilla.gnome.org/show_bug.cgi?id=675006 (cherry picked from commit `e333263fd6`)	2012-05-07 15:09:54 -04:00
Luca Ferretti	49809d1e64	l10n: Updated Italian translation	2012-04-30 15:33:44 +02:00
Jonh Wendell	2605e49591	Updated Brazilian Portuguese translation	2012-04-28 10:46:14 -03:00
Rico Tzschichholz	40abd98840	data: Add Evolution calendar settings gschema to EXTRA_DIST `3d95e7bb11` forgot to add this gschema file to dist	2012-04-26 08:46:04 +02:00
Owen W. Taylor	a64c84395f	Mirror Evolution calendar settings into our own schema Right now, we are hard-depending on the presence of Evolution by using its settings schemas. This is likely to be unpopular, and also causes instability if someone happens not to have Evolution installed, so install a schema that has the same data path as the Evolution schema, but a different name and install that for the keys we need. To avoid a string-freeze break, we rely on the translations in Evolution - if Evolution isn't installed, the key descriptions will be untranslated in dconf-editor. https://bugzilla.gnome.org/show_bug.cgi?id=674424	2012-04-25 14:39:38 -04:00
Changwoo Ryu	39d2202521	Updated Korean translation	2012-04-26 01:06:12 +09:00
OKANO Takayoshi	4edd77cd1f	[l10n] Update Japanese translation Fix a typo	2012-04-21 22:41:26 +09:00