Bump version to 3.3.4

Update NEWS
Bump dependencies on gtk+ 3.3.9 and glib 2.31.6
2012-01-20 21:12:39 -05:00 · 2012-01-20 20:46:01 +01:00 · 2012-01-20 20:19:18 +01:00 · 2012-01-20 00:03:07 -05:00 · 2012-01-18 17:25:35 -05:00 · 2012-01-18 19:17:46 +00:00
142 changed files with 17531 additions and 10847 deletions
--- a/145
+++ b/145
@ -1,3 +1,148 @@
+3.3.4
+=====
+* https://live.gnome.org/EveryDetailMatters
+  - Add "browse" for labels for dash items - once a tooltip is
+    showing, switch to other items without a delay [Seif; #666170]
+  - Always scale down windows in the overview at least to 70% [Vit; #646704]
+  - Fix the new-workspace drop indicator sometimes getting stuck
+    [Stefano; #664201]
+  - Delay rearranging windows in the overview as long as the pointer
+    is over a window [Vit; #645325]
+* Add a GConf => DConf migration file for overriden Mutter settings
+  [Florian; #667636]
+* When a VPN connection is active, show that as the network icon
+  [Giovanni; #665115]
+* Handle the "ExtendedAway" IM status as away, not offline [Guillaume; #667813]
+* Improve the appearance of the labels in "Applications" [Alex; #642392]
+* Adjust for GTK+ and Mutter API changes for application menu [Ryan; #668118]
+* Add section label support to the application menu [Giovanni; #666681]
+* Fix screenshot methods to work again [Cosimo; #667662]
+* Fix several crashers related to updating workspace thumbnails [Owen; #667652]
+* Fix memory management error causing gnome-shell-hotplug-sniffer to crash
+  [Owen; #667378]
+* Build fixes [Emmanuele, Rico; #667864]
+* Code cleanups [Adel; #668087]
+* Misc bug fixes [Colin, Florian, Giovanni, Owen, Xavier; #633028, #658817,
+  #664138, #667881, #668048, #668050]
+
+Contributors:
+ Emmanuele Bassi, Giovanni Campagna, Cosimo Cecchi, Xavier Claessens,
+ Guillaume Desmottes, Stefano Facchini, Adel Gadllah, Alex Hultman,
+ Ryan Lortie, Seif Lotfy, Florian Müllner, Vit Stanislav, Owen Taylor,
+ Rico Tzschichholz, Colin Walters
+
+Translations:
+ Ihar Hrachyshka [be], Alexander Shopov [bg], Arash Mousavi [fa],
+ Jiri Grönroos, Timo Jyrinki [fi], Fran Diéguez [gl], Kjartan Maraas [nb],
+ Yuri Myasoedov [ru], Matej Urbančič [sl], Nguyễn Thái Ngọc Duy [vi]
+
+3.3.3
+=====
+* https://live.gnome.org/EveryDetailMatters
+  - Stop flashing the window labels on actions in overview [Zan; #644861]
+  - Improve the look of window captions in the overview [Marc; #664487]
+  - Move dash tooltips beside the icon [Seif, Stefano; #666166]
+* Support application menus exported from applications via new GLib API
+   and D-Bus protocol. [Giovanni, Colin, Matthias, Cosimo]
+* For removable device prompts, show "Open with Rhythmbox], rather
+  than "Open with Rhythmbox Music Player' [Florian; #664561]
+* Switch to activating the message tray only with a hot corner rather
+  than a full row of pixels, allowing mouse events to apps [Rui; #663366]
+* Fully handle the case where the workspaces-only-on-primary
+  GSetting is set to false [Florian; #652580]
+* Add support for background-size CSS property to St [Quentin; #633462]
+* Port to new GJS Lang.Class framework [Giovanni; #664436]
+* Finish port to GDBus [Giovanni; #664436]
+* Stop using the deprecated Clutter default stage [Florian, Jasper; #664052]
+* Fix bugs that kept browser plugin from working in WebKit-based browser
+  [Jasper; #666444]
+* Fix typo that made uninstalling extensions not work [Jasper]
+* Fix crash in browser plugin if shell is not run [Jürg]
+* Reintroduce piscine paschal ovum [Giovanni; #666606]
+* Network menu bug fixes
+  Giovanni; #664124, #665194, #665680, #666429, #666614]
+* Misc bug fixes [Florian, Jasper, Jonny, Marina, Ron; #647587, #659272,
+  #664138, #665261, #666020, #666243]
+* Build fixes [Owen]
+
+Contributors:
+ Jürg Billeter, Giovanni Campagna, Stefano Candori, Cosimo Cecchi,
+ Matthias Clasen, Zan Dobersek, Quentin Glidic, Jonny Lamb, Ryan Lortie,
+ Seif Lotfy, Rui Matos, Florian Müllner, Bastien Nocera, Jasper St. Pierre,
+ Marc Plano-Lesay, Owen Taylor, Colin Walters, Ron Yorsten,
+ Marina Zhurakhinskaya
+
+Translations:
+ Petr Kovar [cz], Kris Thomsen [dk], Daniel Mustieles [es],
+ Ville-Pekka Vainio [fi], Yaron Shahrabani [he], Luca Ferretti [it],
+ Hideki Yamane [ja], Žygimantas Beručka [lt], Jovan Naumovski [mk],
+ Kjartan Maraas [nb], "Andreas N" [nn], Lucian Adrian Grijincu [ro],
+ Matej Urbančič [sl], Praveen Illa [te], Muhammet Kara [tr],
+ Daniel Korostil [uk], Aron Xu [zh_CN]
+
+3.3.2
+=====
+* Port D-Bus usage in the shell to GDBus [Giovanni, Marc-Antoine, Florian,
+  Jasper, Matthias; #648651, #658078, #663902, #663941]
+* Message tray
+  - Add right-click option to chats to mute the conversation [Ana; #659962]
+  - Don't steal the focus when popping up under the pointer [Rui; #661358]
+* Looking Glass
+  - Add alt-Tab completion [Jason; #661054]
+  - Show errors from extensions in the extensions tab [Jasper; #660546]
+  - Allow switching tabs with <Control>PageUp/PageDown
+  - Theme consistently with the rest of the shell [Jason; 650900]
+* Extension system
+  - Don't try to load disabled extensions at all [Jasper; #661815, #662704]
+  - Enable and disable plugins in a consistent order [Jasper; #661815, #662704]
+  - Add options to enable/disable extensions to gnome-shell-extension-tool
+    [Jasper; #661815]
+* Adapt to Mutter change to GSettings [Florian, Matthias; #663429]
+* Allow creating a new workspace by dragging a window or launcher in the
+  middle of two existing ones [Jasper; #646409]
+* Allow using Alt-Tab while during drag-and-drop and other operations
+  that grab the pointer [Adel; #660457]
+* Do a better job of finding the right user to authenticate
+  as when showing a PolKit dialog [Matthias; #651547]
+* Control the D-Bus Eval() method by the developer-tools GSetting which
+  is used for looking glass and screen recorder. [Jasper; #662891]
+* Fix browser plugin to work under WebKit-based browser [Jasper; #663823]
+* Fix certain stacking issues with alt-Tab [Jasper; #660650]
+* Fixes for GLib deprecations [Jasper; #662011]p
+* Fixes for GTK+ deprecations [Florian, Rico; #662245]p
+* Fixes for Clutter deprecations [Jasper; #662627]
+* Visual improvements and UI tweaks [Florian, Jakub, Jasper;
+  #662800, #658096, #662226]
+* Hard-code "Home" as the name for the home dir, rather than looking
+  it up via GSettings; avoids schema dependency [Cosimo; #559895]
+* Don't show "Switch User" on single user machines [Florian; #657011]
+* Generate documentation for St toolkit [Florian]
+* Improve marking of strings for translation [Matthias, Piotr; #658664]
+* Networking menu bug fixes [Giovanni; #650007, #651378, #659277, #663278]
+* Code cleanups and leak fixes to StTextureCache
+  [Jasper, Florian; #660968, #662998]
+* Code cleanups [Adel, Florian, Jasper; #662238, #663584]
+* Build fixes [Adel, Colin, Florian, Ming Han]
+* Misc bug fixes [Adel, Florian, "Fry", Jasper, Giovanni, Ray, Rui, Stefan;
+  #660520, #661029, #661231, #661623, #661921, #662235, #662236, #662502,
+  #662394, #662799, #662969, #663175, #663277, #663815, #663891, #662967]
+
+Contributors:
+ Giovanni Campagna, Cosimo Cecchi, Matthias Clasen, Piotr Drąg, Adel Gadllah,
+ Rui Matos, Florian Müllner, Marc-Antoine Perennou, Ana Risteska,
+ Jason Siefken, Jakub Steiner, Ray Strode, Jasper St. Pierre, Ming Han Teh,
+ Rico Tzschichholz, Colin Walters, Stefan Zwanenburg
+
+Translation:
+ Alexander Shopov [bg], Marek Černocký [cs], Mario Blättermann [de],
+ Kostas Papadimas [el], Bruce Cowan [en_GB], Kristjan Schmidt [eo],
+ Jorge González, Daniel Mustieles, Benjamín Valero Espinosa [es],
+ Mattias Põldaru [et], Arash Mousavi [fa], Ville-Pekka Vainio [fi],
+ Fran Diéguez [gl], Yaron Shahrabani [he], Hideki Yamane [ja],
+ Algimantas Margevičius [lt], Kjartan Maraas [nb], Daniel Nylander [se],
+ Matej Urbančič [sl], Praveen Illa [te], Muhammet Kara [tr],
+ Nguyễn Thái Ngọc Duy [vi], Cheng-Chia Tseng [zh_HK, zh_TW]
+
 3.2.1
 =====
 * Restore the IM state on startup - if you were available in when you logged
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@ -455,7 +455,7 @@ plugin_enable_extension (PluginObject *obj,
                         NPString      uuid,
                         gboolean      enabled)
 {
-  const gchar *uuid_str = uuid.UTF8Characters;
+  gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
  if (!uuid_is_valid (uuid_str))
    return FALSE;

@ -468,6 +468,8 @@ plugin_enable_extension (PluginObject *obj,
                     NULL, /* callback */
                     NULL /* user_data */);

+  g_free (uuid_str);
+
  return TRUE;
 }

@ -476,21 +478,32 @@ plugin_install_extension (PluginObject *obj,
                          NPString      uuid,
                          NPString      version_tag)
 {
-  const gchar *uuid_str = uuid.UTF8Characters;
+  gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
+  gchar *version_tag_str;
+
  if (!uuid_is_valid (uuid_str))
-    return FALSE;
+    {
+      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.UTF8Characters),
+                                    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;
 }

@ -501,11 +514,14 @@ plugin_uninstall_extension (PluginObject *obj,
 {
  GError *error = NULL;
  GVariant *res;
-  const gchar *uuid_str;
+  gchar *uuid_str;

-  uuid_str = uuid.UTF8Characters;
+  uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
  if (!uuid_is_valid (uuid_str))
-    return FALSE;
+    {
+      g_free (uuid_str);
+      return FALSE;
+    }

  res = g_dbus_proxy_call_sync (obj->proxy,
                                "UninstallExtension",
@ -516,6 +532,8 @@ plugin_uninstall_extension (PluginObject *obj,
                                NULL, /* cancellable */
                                &error);

+  g_free (uuid_str);
+
  if (!res)
    {
      g_warning ("Failed to uninstall extension: %s", error->message);
@ -533,11 +551,14 @@ plugin_get_info (PluginObject *obj,
 {
  GError *error = NULL;
  GVariant *res;
-  const gchar *uuid_str;
+  gchar *uuid_str;

-  uuid_str = uuid.UTF8Characters;
+  uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
  if (!uuid_is_valid (uuid_str))
-    return FALSE;
+    {
+      g_free (uuid_str);
+      return FALSE;
+    }

  res = g_dbus_proxy_call_sync (obj->proxy,
                                "GetExtensionInfo",
@ -547,6 +568,8 @@ plugin_get_info (PluginObject *obj,
                                NULL, /* cancellable */
                                &error);

+  g_free (uuid_str);
+
  if (!res)
    {
      g_warning ("Failed to retrieve extension metadata: %s", error->message);
@ -564,11 +587,14 @@ plugin_get_errors (PluginObject *obj,
 {
  GError *error = NULL;
  GVariant *res;
-  const gchar *uuid_str;
+  gchar *uuid_str;

-  uuid_str = uuid.UTF8Characters;
+  uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
  if (!uuid_is_valid (uuid_str))
-    return FALSE;
+    {
+      g_free (uuid_str);
+      return FALSE;
+    }

  res = g_dbus_proxy_call_sync (obj->proxy,
                                "GetExtensionErrors",
@ -578,6 +604,8 @@ plugin_get_errors (PluginObject *obj,
                                NULL, /* cancellable */
                                &error);

+  g_free (uuid_str);
+
  if (!res)
    {
      g_warning ("Failed to retrieve errors: %s", error->message);
@ -633,7 +661,8 @@ plugin_get_shell_version (PluginObject  *obj,
  STRINGN_TO_NPVARIANT (buffer, length, *result);

 out:
-  g_variant_unref (res);
+  if (res)
+    g_variant_unref (res);
  return ret;
 }

--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.2.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.3.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -63,14 +63,14 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 CLUTTER_MIN_VERSION=1.7.5
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.29.18
-MUTTER_MIN_VERSION=3.2.1
+MUTTER_MIN_VERSION=3.3.3
 FOLKS_MIN_VERSION=0.5.2
-GTK_MIN_VERSION=3.0.0
-GIO_MIN_VERSION=2.31.0
+GTK_MIN_VERSION=3.3.9
+GIO_MIN_VERSION=2.31.6
 LIBECAL_MIN_VERSION=2.32.0
 LIBEDATASERVER_MIN_VERSION=1.2.0
 LIBEDATASERVERUI_MIN_VERSION=2.91.6
-TELEPATHY_GLIB_MIN_VERSION=0.15.5
+TELEPATHY_GLIB_MIN_VERSION=0.15.6
 TELEPATHY_LOGGER_MIN_VERSION=0.2.4
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
@ -82,8 +82,9 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
                               folks >= $FOLKS_MIN_VERSION
                               libmutter >= $MUTTER_MIN_VERSION
                               gjs-internals-1.0 >= $GJS_MIN_VERSION
-			       libgnome-menu-3.0 $recorder_modules gconf-2.0
+			       libgnome-menu-3.0 $recorder_modules
                               gdk-x11-3.0 libsoup-2.4
+                               gl
 			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
 			       clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
                               libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
@ -117,7 +118,6 @@ CFLAGS=$saved_CFLAGS
 LIBS=$saved_LIBS

 PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
-PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
 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 >= 0.1.7)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -59,6 +59,8 @@ gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)

 all-local: gschemas.compiled

+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = gnome-shell-overrides.convert

 shadersdir = $(pkgdatadir)/shaders
 shaders_DATA = \
@ -69,6 +71,7 @@ EXTRA_DIST =						\
 	gnome-shell.desktop.in.in			\
 	$(menu_DATA)					\
 	$(shaders_DATA)					\
+	$(convert_DATA)					\
 	org.gnome.shell.gschema.xml.in

 CLEANFILES =						\
--- a/data/gnome-shell-overrides.convert
+++ b/data/gnome-shell-overrides.convert
@ -0,0 +1,5 @@
+[org.gnome.shell.overrides]
+attach-modal-dialogs = /desktop/gnome/shell/windows/attach_modal_dialogs
+button-layout = /desktop/gnome/shell/windows/button_layout
+edge-tiling = /desktop/gnome/shell/windows/edge_tiling
+workspaces-only-on-primary = /desktop/gnome/shell/windows/workspaces_only_on_primary
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -60,6 +60,7 @@ StScrollBar StBin#trough {
 StScrollBar StButton#vhandle
 {
    background-image: url("scroll-vhandle.svg");
+    background-size: contain;
    background-color: #252525;
    border: 1px solid #080808;
    border-radius: 8px;
@ -68,6 +69,7 @@ StScrollBar StButton#vhandle
 StScrollBar StButton#hhandle
 {
    background-image: url("scroll-hhandle.svg");
+    background-size: contain;
    background-color: #252525;
    border: 1px solid #080808;
    border-radius: 8px;
@ -224,16 +226,20 @@ StTooltip StLabel {

 .toggle-switch-us {
    background-image: url("toggle-off-us.svg");
+    background-size: contain;
 }
 .toggle-switch-us:checked {
    background-image: url("toggle-on-us.svg");
+    background-size: contain;
 }

 .toggle-switch-intl {
    background-image: url("toggle-off-intl.svg");
+    background-size: contain;
 }
 .toggle-switch-intl:checked {
    background-image: url("toggle-on-intl.svg");
+    background-size: contain;
 }

 .nm-menu-item-icons {
@ -356,6 +362,7 @@ StTooltip StLabel {
 .panel-button:focus {
    border-image: url("panel-button-border.svg") 10 10 0 2;
    background-image: url("panel-button-highlight-wide.svg");
+    background-size: contain;
    color: white;
    text-shadow: black 0px 2px 2px;
 }
@ -364,6 +371,7 @@ StTooltip StLabel {
 .panel-status-button:checked,
 .panel-status-button:focus {
    background-image: url("panel-button-highlight-narrow.svg");
+    background-size: contain;
 }

 .panel-button:active > .system-status-icon,
@ -467,16 +475,17 @@ StTooltip StLabel {
 }

 .window-caption {
-    background: rgba(0,0,0,0.8);
-    border: 1px solid rgba(128,128,128,0.40);
-    border-radius: 10px;
+    background: rgba(0,0,0,0.5);
+    border-radius: 8px;
    font-size: 9pt;
-    padding: 2px 8px;
-    -shell-caption-spacing: 4px;
+    font-weight: bold;
+    padding: 6px 12px;
+    -shell-caption-spacing: 12px;
 }

 .window-close {
    background-image: url("close-window.svg");
+    background-size: 34px;
    height: 34px;
    width: 34px;
    -shell-close-overlap: 20px;
@ -511,6 +520,7 @@ StTooltip StLabel {

 .placeholder {
    background-image: url("dash-placeholder.svg");
+    background-size: contain;
    height: 24px;
 }

@ -645,6 +655,17 @@ StTooltip StLabel {
    font-size: 11pt;
 }

+.dash-label {
+    border-radius: 7px;
+    padding: 4px 12px;
+    background-color: rgba(0,0,0,0.5);
+    color: #ffffff;
+    font-size: 0.9em;
+    font-weight: bold;
+    text-align: center;
+    -x-offset: 8px;
+}
+
 /* Apps */

 .icon-grid {
@ -686,11 +707,13 @@ StTooltip StLabel {
 .app-filter:selected {
    color: #ffffff;
    background-image: url("filter-selected-ltr.svg");
+    background-size: contain;
    background-position: 190px 10px;
 }

 .app-filter:selected:rtl {
    background-image: url("filter-selected-rtl.svg");
+    background-size: contain;
    background-position: 10px 10px;
 }

@ -717,7 +740,8 @@ StTooltip StLabel {
    border-radius: 4px;
    padding: 3px;
    border: 1px rgba(0,0,0,0);
-    font-size: 7.5pt;
+    font-size: 8pt;
+    font-weight: bold;
    color: white;
    transition-duration: 100;
    text-align: center;
@ -771,6 +795,7 @@ StTooltip StLabel {
 .app-well-app.running > .overview-icon {
    text-shadow: black 0px 2px 2px;
    background-image: url("running-indicator.svg");
+    background-size: contain;
 }

 .contact:selected,
@ -1267,7 +1292,8 @@ StTooltip StLabel {
 }

 .notification-icon-button > StIcon {
-    icon-size: 36px;
+    icon-size: 16px;
+    padding: 8px;
 }

 .hotplug-transient-box {
@ -1431,6 +1457,7 @@ StTooltip StLabel {

 .summary-source-button:selected .summary-source {
    background-image: url("panel-button-highlight-narrow.svg");
+    background-size: contain;
    border-image: url("source-button-border.svg") 10 10 0 1;
 }

@ -1441,6 +1468,7 @@ StTooltip StLabel {

 .summary-source-button:expanded:selected {
    background-image: url("panel-button-highlight-wide.svg");
+    background-size: contain;
    border-image: url("source-button-border.svg") 10 10 0 1;
 }

@ -1554,6 +1582,7 @@ StTooltip StLabel {
    width: 52px;
    height: 52px;
    background-image: url("corner-ripple-ltr.png");
+    background-size: contain;
 }

 .ripple-box:rtl {
@ -1595,6 +1624,7 @@ StTooltip StLabel {
    border: 0px;
    background: rgba(255,255,255,0.5);
    background-image: url("ws-switch-arrow-up.svg");
+    background-size: contain;
    border-radius: 8px;
 }

@ -1603,6 +1633,7 @@ StTooltip StLabel {
    border: 0px;
    background: rgba(255,255,255,0.5);
    background-image: url("ws-switch-arrow-down.svg");
+    background-size: contain;
    border-radius: 8px;
 }

--- a/docs/reference/shell/Makefile.am
+++ b/docs/reference/shell/Makefile.am
@ -18,11 +18,10 @@ DOC_MODULE=shell
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml

-# Directories containing the source code, relative to $(srcdir).
+# Directories containing the source code
 # gtk-doc will search all .c and .h files beneath these paths
 # for inline comments documenting functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
-DOC_SOURCE_DIR=../../../src
+DOC_SOURCE_DIR=$(top_srcdir)/src

 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@ -58,7 +57,16 @@ EXTRA_HFILES=

 # Header files or dirs to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
-IGNORE_HFILES=calendar-server gvc hotplug-sniffer st tray
+IGNORE_HFILES=					\
+	calendar-server				\
+	gvc					\
+	hotplug-sniffer				\
+	st					\
+	tray					\
+	gactionmuxer.h				\
+	gactionobservable.h			\
+	gactionobserver.h			\
+	shell-recorder-src.h

 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
@ -79,7 +87,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS)
-GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell.la
+GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(BLUETOOTH_LIBS) $(top_builddir)/src/libgnome-shell.la

 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
--- a/docs/reference/st/Makefile.am
+++ b/docs/reference/st/Makefile.am
@ -18,11 +18,10 @@ DOC_MODULE=st
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml

-# Directories containing the source code, relative to $(srcdir).
+# Directories containing the source code
 # gtk-doc will search all .c and .h files beneath these paths
 # for inline comments documenting functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
-DOC_SOURCE_DIR=../../../src/st
+DOC_SOURCE_DIR=$(top_srcdir)/src/st

 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
--- a/js/Makefile.am
+++ b/js/Makefile.am
@ -72,6 +72,7 @@ nobase_dist_js_DATA = 	\
 	ui/tweener.js		\
 	ui/userMenu.js		\
 	ui/viewSelector.js	\
+	ui/wanda.js		\
 	ui/windowAttentionHandler.js	\
 	ui/windowManager.js	\
 	ui/workspace.js		\
--- a/js/gdm/batch.js
+++ b/js/gdm/batch.js
@ -21,11 +21,9 @@
 const Lang = imports.lang;
 const Signals = imports.signals;

-function Task() {
-    this._init.apply(this, arguments);
-}
+const Task = new Lang.Class({
+    Name: 'Task',

-Task.prototype = {
    _init: function(scope, handler) {
        if (scope)
            this.scope = scope;
@ -41,22 +39,17 @@ Task.prototype = {

        return null;
    },
-};
+});
 Signals.addSignalMethods(Task.prototype);

-function Hold() {
-    this._init.apply(this, arguments);
-}
-
-Hold.prototype = {
-    __proto__: Task.prototype,
+const Hold = new Lang.Class({
+    Name: 'Hold',
+    Extends: Task,

    _init: function() {
-        Task.prototype._init.call(this,
-                                  this,
-                                  function () {
-                                      return this;
-                                  });
+        this.parent(this, function () {
+            return this;
+        });

        this._acquisitions = 1;
    },
@ -88,18 +81,15 @@ Hold.prototype = {
    isAcquired: function() {
        return this._acquisitions > 0;
    }
-}
+});
 Signals.addSignalMethods(Hold.prototype);

-function Batch() {
-    this._init.apply(this, arguments);
-}
-
-Batch.prototype = {
-    __proto__: Task.prototype,
+const Batch = new Lang.Class({
+    Name: 'Batch',
+    Extends: Task,

    _init: function(scope, tasks) {
-        Task.prototype._init.call(this);
+        this.parent();

        this.tasks = [];

@ -166,20 +156,12 @@ Batch.prototype = {
    cancel: function() {
        this.tasks = this.tasks.splice(0, this._currentTaskIndex + 1);
    }
-
-};
+});
 Signals.addSignalMethods(Batch.prototype);

-function ConcurrentBatch() {
-    this._init.apply(this, arguments);
-}
-
-ConcurrentBatch.prototype = {
-    __proto__: Batch.prototype,
-
-    _init: function(scope, tasks) {
-        Batch.prototype._init.call(this, scope, tasks);
-    },
+const ConcurrentBatch = new Lang.Class({
+    Name: 'ConcurrentBatch',
+    Extends: Batch,

    process: function() {
       let hold = this.runTask();
@ -193,19 +175,12 @@ ConcurrentBatch.prototype = {
       // concurrently.
       this.nextTask();
    }
-};
+});
 Signals.addSignalMethods(ConcurrentBatch.prototype);

-function ConsecutiveBatch() {
-    this._init.apply(this, arguments);
-}
-
-ConsecutiveBatch.prototype = {
-    __proto__: Batch.prototype,
-
-    _init: function(scope, tasks) {
-        Batch.prototype._init.call(this, scope, tasks);
-    },
+const ConsecutiveBatch = new Lang.Class({
+    Name: 'ConsecutiveBatch',
+    Extends: Batch,

    process: function() {
       let hold = this.runTask();
@ -224,5 +199,5 @@ ConsecutiveBatch.prototype = {
           this.nextTask();
       }
    }
-};
+});
 Signals.addSignalMethods(ConsecutiveBatch.prototype);
--- a/js/gdm/consoleKit.js
+++ b/js/gdm/consoleKit.js
@ -1,32 +1,22 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const DBus = imports.dbus;
+const Gio = imports.gi.Gio;

-const ConsoleKitManagerIface = {
-    name: 'org.freedesktop.ConsoleKit.Manager',
-    methods: [{ name: 'CanRestart',
-                inSignature: '',
-                outSignature: 'b' },
-              { name: 'CanStop',
-                inSignature: '',
-                outSignature: 'b' },
-              { name: 'Restart',
-                inSignature: '',
-                outSignature: '' },
-              { name: 'Stop',
-                inSignature: '',
-                outSignature: '' }]
-};
+const ConsoleKitManagerIface = <interface name='org.freedesktop.ConsoleKit.Manager'>
+<method name='CanRestart'>
+    <arg type='b' direction='out'/>
+</method>
+<method name='CanStop'>
+    <arg type='b' direction='out'/>
+</method>
+<method name='Restart' />
+<method name='Stop' />
+</interface>;
+
+const ConsoleKitProxy = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);

 function ConsoleKitManager() {
-    this._init();
+    return new ConsoleKitProxy(Gio.DBus.system,
+                               'org.freedesktop.ConsoleKit',
+                               '/org/freedesktop/ConsoleKit/Manager');
 };
-
-ConsoleKitManager.prototype = {
-    _init: function() {
-        DBus.system.proxifyObject(this,
-                                  'org.freedesktop.ConsoleKit',
-                                  '/org/freedesktop/ConsoleKit/Manager');
-    }
-};
-DBus.proxifyPrototype(ConsoleKitManager.prototype, ConsoleKitManagerIface);
--- a/js/gdm/fingerprint.js
+++ b/js/gdm/fingerprint.js
@ -1,26 +1,20 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const DBus = imports.dbus;
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;

-const FprintManagerIface = {
-    name: 'net.reactivated.Fprint.Manager',
-    methods: [{ name: 'GetDefaultDevice',
-                inSignature: '',
-                outSignature: 'o' }]
-};
+const FprintManagerIface = <interface name='net.reactivated.Fprint.Manager'>
+<method name='GetDefaultDevice'>
+    <arg type='o' direction='out' />
+</method>
+</interface>;
+
+const FprintManagerProxy = Gio.DBusProxy.makeProxyWrapper(FprintManagerIface);

 function FprintManager() {
-    this._init();
+    return new FprintManagerProxy(Gio.DBus.system,
+                           'net.reactivated.Fprint',
+                           '/net/reactivated/Fprint/Manager');
 };
-
-FprintManager.prototype = {
-    _init: function() {
-        DBus.system.proxifyObject(this,
-                                  'net.reactivated.Fprint',
-                                  '/net/reactivated/Fprint/Manager');
-    }
-};
-DBus.proxifyPrototype(FprintManager.prototype, FprintManagerIface);
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -33,7 +33,6 @@ const St = imports.gi.St;
 const GdmGreeter = imports.gi.GdmGreeter;

 const Batch = imports.gdm.batch;
-const DBus = imports.dbus;
 const Fprint = imports.gdm.fingerprint;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
@ -141,11 +140,9 @@ function _smoothlyResizeActor(actor, width, height) {
    return hold;
 }

-function UserListItem(user, reason) {
-    this._init(user, reason);
-}
+const UserListItem = new Lang.Class({
+    Name: 'UserListItem',

-UserListItem.prototype = {
    _init: function(user) {
        this.user = user;
        this._userChangedId = this.user.connect('changed',
@ -208,7 +205,8 @@ UserListItem.prototype = {
            // We use background-image instead of, say, St.TextureCache
            // so the theme writers can add a rounded frame around the image
            // and so theme writers can pick the icon size.
-            this._iconBin.set_style('background-image: url("' + iconFile + '");');
+            this._iconBin.set_style('background-image: url("' + iconFile + '");' +
+                                    'background-size: contain;');
        } else {
            this._iconBin.hide();
        }
@ -274,15 +272,12 @@ UserListItem.prototype = {
                         });
        return hold;
    }
-
-};
+});
 Signals.addSignalMethods(UserListItem.prototype);

-function UserList() {
-    this._init.apply(this, arguments);
-}
+const UserList = new Lang.Class({
+    Name: 'UserList',

-UserList.prototype = {
    _init: function() {
        this.actor = new St.ScrollView({ style_class: 'login-dialog-user-list-view'});
        this.actor.set_policy(Gtk.PolicyType.NEVER,
@ -538,14 +533,12 @@ UserList.prototype = {
        item.actor.destroy();
        delete this._items[userName];
    }
-};
+});
 Signals.addSignalMethods(UserList.prototype);

-function SessionListItem(id, name) {
-    this._init(id, name);
-}
+const SessionListItem = new Lang.Class({
+    Name: 'SessionListItem',

-SessionListItem.prototype = {
    _init: function(id, name) {
        this.id = id;

@ -600,14 +593,12 @@ SessionListItem.prototype = {
    _onClicked: function() {
        this.emit('activate');
    }
-};
+});
 Signals.addSignalMethods(SessionListItem.prototype);

-function SessionList() {
-    this._init();
-}
+const SessionList = new Lang.Class({
+    Name: 'SessionList',

-SessionList.prototype = {
    _init: function() {
        this.actor = new St.Bin();

@ -738,24 +729,15 @@ SessionList.prototype = {
                         }));
        }
    }
-};
+});
 Signals.addSignalMethods(SessionList.prototype);

-function LoginDialog() {
-    if (_loginDialog == null) {
-        this._init();
-        _loginDialog = this;
-    }
-
-    return _loginDialog;
-}
-
-LoginDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
+const LoginDialog = new Lang.Class({
+    Name: 'LoginDialog',
+    Extends: ModalDialog.ModalDialog,

    _init: function() {
-        ModalDialog.ModalDialog.prototype._init.call(this, { shellReactive: true,
-                                                             styleClass: 'login-dialog' });
+        this.parent({ shellReactive: true, styleClass: 'login-dialog' });
        this.connect('destroy',
                     Lang.bind(this, this._onDestroy));
        this.connect('opened',
@ -908,7 +890,7 @@ LoginDialog.prototype = {
        if (!this._settings.get_boolean(_FINGERPRINT_AUTHENTICATION_KEY))
            return;

-        this._fprintManager.GetDefaultDeviceRemote(DBus.CALL_FLAG_START, Lang.bind(this,
+        this._fprintManager.GetDefaultDeviceRemote(Gio.DBusCallFlags.NONE, Lang.bind(this,
            function(device, error) {
                if (!error && device)
                    this._haveFingerprintReader = true;
@ -1399,8 +1381,8 @@ LoginDialog.prototype = {
    },

    close: function() {
-        ModalDialog.ModalDialog.prototype.close.call(this);
+        this.parent();

        Main.ctrlAltTabManager.removeGroup(this._group);
    }
-};
+});
--- a/js/gdm/powerMenu.js
+++ b/js/gdm/powerMenu.js
@ -25,15 +25,12 @@ const ConsoleKit = imports.gdm.consoleKit;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

-function PowerMenuButton() {
-    this._init();
-}
-
-PowerMenuButton.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
+const PowerMenuButton = new Lang.Class({
+    Name: 'PowerMenuButton',
+    Extends: PanelMenu.SystemStatusButton,

    _init: function() {
-        PanelMenu.SystemStatusButton.prototype._init.call(this, 'system-shutdown', null);
+        this.parent('system-shutdown', null);
        this._consoleKitManager = new ConsoleKit.ConsoleKitManager();
        this._upClient = new UPowerGlib.Client();

@ -143,4 +140,4 @@ PowerMenuButton.prototype = {
        if (this._haveShutdown)
            this._consoleKitManager.StopRemote();
    }
-};
+});
--- a/js/misc/docInfo.js
+++ b/js/misc/docInfo.js
@ -8,11 +8,9 @@ const Search = imports.ui.search;

 const THUMBNAIL_ICON_MARGIN = 2;

-function DocInfo(recentInfo) {
-    this._init(recentInfo);
-}
+const DocInfo = new Lang.Class({
+    Name: 'DocInfo',

-DocInfo.prototype = {
    _init : function(recentInfo) {
        this.recentInfo = recentInfo;
        // We actually used get_modified() instead of get_visited()
@ -49,7 +47,7 @@ DocInfo.prototype = {
        }
        return mtype;
    }
-};
+});

 var docManagerInstance = null;

@ -62,11 +60,9 @@ function getDocManager() {
 /**
 * DocManager wraps the DocSystem, primarily to expose DocInfo objects.
 */
-function DocManager() {
-    this._init();
-}
+const DocManager = new Lang.Class({
+    Name: 'DocManager',

-DocManager.prototype = {
    _init: function() {
        this._docSystem = Shell.DocSystem.get_default();
        this._infosByTimestamp = [];
@ -135,6 +131,6 @@ DocManager.prototype = {
                return this._infosByUri[url];
            })), terms);
    }
-};
+});

 Signals.addSignalMethods(DocManager.prototype);
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@ -38,7 +38,7 @@ function recursivelyDeleteDir(dir) {
        let child = dir.get_child(info.get_name());
        if (type == Gio.FileType.REGULAR)
            deleteGFile(child);
-        else if (type == Gio.TypeType.DIRECTORY)
+        else if (type == Gio.FileType.DIRECTORY)
            recursivelyDeleteDir(child);
    }

--- a/js/misc/history.js
+++ b/js/misc/history.js
@ -7,11 +7,9 @@ const Params = imports.misc.params;

 const DEFAULT_LIMIT = 512;

-function HistoryManager(params) {
-    this._init(params);
-}
+const HistoryManager = new Lang.Class({
+    Name: 'HistoryManager',

-HistoryManager.prototype = {
    _init: function(params) {
        params = Params.parse(params, { gsettingsKey: null,
                                        limit: DEFAULT_LIMIT,
@ -111,5 +109,5 @@ HistoryManager.prototype = {
        if (this._key)
            global.settings.set_strv(this._key, this._history);
    }
-};
+});
 Signals.addSignalMethods(HistoryManager.prototype);
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@ -54,11 +54,9 @@ function _getProvidersTable() {
    return _providersTable = providers;
 }

-function ModemGsm() {
-    this._init.apply(this, arguments);
-}
+const ModemGsm = new Lang.Class({
+    Name: 'ModemGsm',

-ModemGsm.prototype = {
    _init: function(path) {
        this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);

@ -156,14 +154,12 @@ ModemGsm.prototype = {

        return name3 || name2 || null;
    }
-}
+});
 Signals.addSignalMethods(ModemGsm.prototype);

-function ModemCdma() {
-    this._init.apply(this, arguments);
-}
+const ModemCdma = new Lang.Class({
+    Name: 'ModemCdma',

-ModemCdma.prototype = {
    _init: function(path) {
        this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);

@ -231,5 +227,5 @@ ModemCdma.prototype = {

        return null;
    }
-};
+});
 Signals.addSignalMethods(ModemCdma.prototype);
--- a/js/misc/util.js
+++ b/js/misc/util.js
@ -232,3 +232,53 @@ function fixupPCIDescription(desc) {

    return out.join(' ');
 }
+
+// lowerBound:
+// @array: an array or array-like object, already sorted
+//         according to @cmp
+// @val: the value to add
+// @cmp: a comparator (or undefined to compare as numbers)
+//
+// Returns the position of the first element that is not
+// lower than @val, according to @cmp.
+// That is, returns the first position at which it
+// is possible to insert @val without violating the
+// order.
+// This is quite like an ordinary binary search, except
+// that it doesn't stop at first element comparing equal.
+
+function lowerBound(array, val, cmp) {
+    let min, max, mid, v;
+    cmp = cmp || function(a, b) { return a - b; };
+
+    if (array.length == 0)
+        return 0;
+
+    min = 0; max = array.length;
+    while (min < (max - 1)) {
+        mid = Math.floor((min + max) / 2);
+        v = cmp(array[mid], val);
+
+        if (v < 0)
+            min = mid + 1;
+        else
+            max = mid;
+    }
+
+    return (min == max || cmp(array[min], val) < 0) ? max : min;
+}
+
+// insertSorted:
+// @array: an array sorted according to @cmp
+// @val: a value to insert
+// @cmp: the sorting function
+//
+// Inserts @val into @array, preserving the
+// sorting invariants.
+// Returns the position at which it was inserted
+function insertSorted(array, val, cmp) {
+    let pos = lowerBound(array, val, cmp);
+    array.splice(pos, 0, val);
+
+    return pos;
+}
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -43,11 +43,9 @@ function primaryModifier(mask) {
    return primary;
 }

-function AltTabPopup() {
-    this._init();
-}
+const AltTabPopup = new Lang.Class({
+    Name: 'AltTabPopup',

-AltTabPopup.prototype = {
    _init : function() {
        this.actor = new Shell.GenericContainer({ name: 'altTabPopup',
                                                  reactive: true,
@ -540,13 +538,11 @@ AltTabPopup.prototype = {
                           onComplete: Lang.bind(this, function () { this.thumbnailsVisible = true; })
                         });
    }
-};
+});

-function SwitcherList(squareItems) {
-    this._init(squareItems);
-}
+const SwitcherList = new Lang.Class({
+    Name: 'SwitcherList',

-SwitcherList.prototype = {
    _init : function(squareItems) {
        this.actor = new Shell.GenericContainer({ style_class: 'switcher-list' });
        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
@ -851,15 +847,13 @@ SwitcherList.prototype = {
        // Clip the area for scrolling
        this._clipBin.set_clip(0, -topPadding, (this.actor.allocation.x2 - this.actor.allocation.x1) - leftPadding - rightPadding, this.actor.height + bottomPadding);
    }
-};
+});

 Signals.addSignalMethods(SwitcherList.prototype);

-function AppIcon(app) {
-    this._init(app);
-}
+const AppIcon = new Lang.Class({
+    Name: 'AppIcon',

-AppIcon.prototype = {
    _init: function(app) {
        this.app = app;
        this.actor = new St.BoxLayout({ style_class: 'alt-tab-app',
@ -877,17 +871,14 @@ AppIcon.prototype = {
        this._iconBin.set_size(size, size);
        this._iconBin.child = this.icon;
    }
-};
+});

-function AppSwitcher() {
-    this._init.apply(this, arguments);
-}
-
-AppSwitcher.prototype = {
-    __proto__ : SwitcherList.prototype,
+const AppSwitcher = new Lang.Class({
+    Name: 'AppSwitcher',
+    Extends: SwitcherList,

    _init : function(localApps, otherApps, altTabPopup) {
-        SwitcherList.prototype._init.call(this, true);
+        this.parent(true);

        // Construct the AppIcons, add to the popup
        let activeWorkspace = global.screen.get_active_workspace();
@ -966,7 +957,7 @@ AppSwitcher.prototype = {

    _allocate: function (actor, box, flags) {
        // Allocate the main list items
-        SwitcherList.prototype._allocate.call(this, actor, box, flags);
+        this.parent(actor, box, flags);

        let arrowHeight = Math.floor(this.actor.get_theme_node().get_padding(St.Side.BOTTOM) / 3);
        let arrowWidth = arrowHeight * 2;
@ -1021,7 +1012,7 @@ AppSwitcher.prototype = {
                this._arrows[this._curApp].remove_style_pseudo_class('highlighted');
        }

-        SwitcherList.prototype.highlight.call(this, n, justOutline);
+        this.parent(n, justOutline);
        this._curApp = n;

        if (this._curApp != -1) {
@ -1045,17 +1036,14 @@ AppSwitcher.prototype = {
        if (appIcon.cachedWindows.length == 1)
            arrow.hide();
    }
-};
+});

-function ThumbnailList(windows) {
-    this._init(windows);
-}
-
-ThumbnailList.prototype = {
-    __proto__ : SwitcherList.prototype,
+const ThumbnailList = new Lang.Class({
+    Name: 'ThumbnailList',
+    Extends: SwitcherList,

    _init : function(windows) {
-        SwitcherList.prototype._init.call(this);
+        this.parent(false);

        let activeWorkspace = global.screen.get_active_workspace();

@ -1133,7 +1121,7 @@ ThumbnailList.prototype = {
        // Make sure we only do this once
        this._thumbnailBins = new Array();
    }
-};
+});

 function _drawArrow(area, side) {
    let themeNode = area.get_theme_node();
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -26,11 +26,9 @@ const MAX_APPLICATION_WORK_MILLIS = 75;
 const MENU_POPUP_TIMEOUT = 600;
 const SCROLL_TIME = 0.1;

-function AlphabeticalView() {
-    this._init();
-}
+const AlphabeticalView = new Lang.Class({
+    Name: 'AlphabeticalView',

-AlphabeticalView.prototype = {
    _init: function() {
        this._grid = new IconGrid.IconGrid({ xAlign: St.Align.START });
        this._appSystem = Shell.AppSystem.get_default();
@ -130,13 +128,11 @@ AlphabeticalView.prototype = {
            this._addApp(app);
         }
    }
-};
+});

-function ViewByCategories() {
-    this._init();
-}
+const ViewByCategories = new Lang.Class({
+    Name: 'ViewByCategories',

-ViewByCategories.prototype = {
    _init: function() {
        this._appSystem = Shell.AppSystem.get_default();
        this.actor = new St.BoxLayout({ style_class: 'all-app' });
@ -281,16 +277,14 @@ ViewByCategories.prototype = {
                this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
        }
    }
-};
+});

 /* This class represents a display containing a collection of application items.
 * The applications are sorted based on their name.
 */
-function AllAppDisplay() {
-    this._init();
-}
+const AllAppDisplay = new Lang.Class({
+    Name: 'AllAppDisplay',

-AllAppDisplay.prototype = {
    _init: function() {
        this._appSystem = Shell.AppSystem.get_default();
        this._appSystem.connect('installed-changed', Lang.bind(this, function() {
@ -306,17 +300,15 @@ AllAppDisplay.prototype = {
    _redisplay: function() {
        this._appView.refresh();
    }
-};
+});

-function AppSearchProvider() {
-    this._init();
-}
-
-AppSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
+const AppSearchProvider = new Lang.Class({
+    Name: 'AppSearchProvider',
+    Extends: Search.SearchProvider,

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

@ -364,17 +356,15 @@ AppSearchProvider.prototype = {
        let icon = new AppWellIcon(app);
        return icon.actor;
    }
-};
+});

-function SettingsSearchProvider() {
-    this._init();
-}
-
-SettingsSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
+const SettingsSearchProvider = new Lang.Class({
+    Name: 'SettingsSearchProvider',
+    Extends: Search.SearchProvider,

    _init: function() {
-        Search.SearchProvider.prototype._init.call(this, _("SETTINGS"));
+        this.parent(_("SETTINGS"));
+
        this._appSys = Shell.AppSystem.get_default();
        this._gnomecc = this._appSys.lookup_app('gnome-control-center.desktop');
    },
@ -412,35 +402,28 @@ SettingsSearchProvider.prototype = {
        let icon = new AppWellIcon(app);
        return icon.actor;
    }
-};
+});

-function AppIcon(app, params) {
-    this._init(app, params);
-}
-
-AppIcon.prototype = {
-    __proto__:  IconGrid.BaseIcon.prototype,
+const AppIcon = new Lang.Class({
+    Name: 'AppIcon',
+    Extends: IconGrid.BaseIcon,

    _init : function(app, params) {
        this.app = app;

        let label = this.app.get_name();

-        IconGrid.BaseIcon.prototype._init.call(this,
-                                               label,
-                                               params);
+        this.parent(label, params);
    },

    createIcon: function(iconSize) {
        return this.app.create_icon_texture(iconSize);
    }
-};
+});

-function AppWellIcon(app, iconParams, onActivateOverride) {
-    this._init(app, iconParams, onActivateOverride);
-}
+const AppWellIcon = new Lang.Class({
+    Name: 'AppWellIcon',

-AppWellIcon.prototype = {
    _init : function(app, iconParams, onActivateOverride) {
        this.app = app;
        this.actor = new St.Button({ style_class: 'app-well-app',
@ -487,6 +470,7 @@ AppWellIcon.prototype = {
                                                Lang.bind(this,
                                                          this._onStateChanged));
        this._onStateChanged();
+        this.isMenuUp = false;
    },

    _onDestroy: function() {
@ -568,8 +552,8 @@ AppWellIcon.prototype = {
            this._menuManager.addMenu(this._menu);
        }

+        this.isMenuUp = true;
        this.actor.set_hover(true);
-        this.actor.show_tooltip();
        this._menu.popup();

        return false;
@ -585,6 +569,7 @@ AppWellIcon.prototype = {

    _onMenuPoppedDown: function() {
        this.actor.sync_hover();
+        this.isMenuUp = false;
    },

    _onActivate: function (event) {
@ -620,22 +605,19 @@ AppWellIcon.prototype = {
    getDragActorSource: function() {
        return this.icon.icon;
    }
-};
+});
 Signals.addSignalMethods(AppWellIcon.prototype);

-function AppIconMenu(source) {
-    this._init(source);
-}
-
-AppIconMenu.prototype = {
-    __proto__: PopupMenu.PopupMenu.prototype,
+const AppIconMenu = new Lang.Class({
+    Name: 'AppIconMenu',
+    Extends: PopupMenu.PopupMenu,

    _init: function(source) {
        let side = St.Side.LEFT;
        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
            side = St.Side.RIGHT;

-        PopupMenu.PopupMenu.prototype._init.call(this, source.actor, 0.5, side);
+        this.parent(source.actor, 0.5, side);

        // We want to keep the item hovered while the menu is up
        this.blockSourceEvents = true;
@ -723,5 +705,5 @@ AppIconMenu.prototype = {
        }
        this.close();
    }
-};
+});
 Signals.addSignalMethods(AppIconMenu.prototype);
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@ -6,11 +6,9 @@ const Signals = imports.signals;

 const Main = imports.ui.main;

-function AppFavorites() {
-    this._init();
-}
+const AppFavorites = new Lang.Class({
+    Name: 'AppFavorites',

-AppFavorites.prototype = {
    FAVORITE_APPS_KEY: 'favorite-apps',

    _init: function() {
@ -122,7 +120,7 @@ AppFavorites.prototype = {
            this._addFavorite(appId, pos);
        }));
    }
-};
+});
 Signals.addSignalMethods(AppFavorites.prototype);

 var appFavoritesInstance = null;
--- a/js/ui/automountManager.js
+++ b/js/ui/automountManager.js
@ -64,11 +64,9 @@ function ConsoleKitManager() {
    return self;
 }

-function AutomountManager() {
-    this._init();
-}
+const AutomountManager = new Lang.Class({
+    Name: 'AutomountManager',

-AutomountManager.prototype = {
    _init: function() {
        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
        this._volumeQueue = [];
@ -268,4 +266,4 @@ AutomountManager.prototype = {
            return false;
        });
    }
-}
+});
--- a/js/ui/autorunManager.js
+++ b/js/ui/autorunManager.js
@ -75,11 +75,9 @@ function HotplugSniffer() {
                                   '/org/gnome/Shell/HotplugSniffer');
 }

-function ContentTypeDiscoverer(callback) {
-    this._init(callback);
-}
+const ContentTypeDiscoverer = new Lang.Class({
+    Name: 'ContentTypeDiscoverer',

-ContentTypeDiscoverer.prototype = {
    _init: function(callback) {
        this._callback = callback;
    },
@ -136,13 +134,11 @@ ContentTypeDiscoverer.prototype = {

        this._callback(mount, apps, contentTypes);
    }
-}
+});

-function AutorunManager() {
-    this._init();
-}
+const AutorunManager = new Lang.Class({
+    Name: 'AutorunManager',

-AutorunManager.prototype = {
    _init: function() {
        this._volumeMonitor = Gio.VolumeMonitor.get();

@ -259,17 +255,14 @@ AutorunManager.prototype = {
                + ': ' + e.toString());
        }
    },
-}
+});

-function AutorunResidentSource() {
-    this._init();
-}
-
-AutorunResidentSource.prototype = {
-    __proto__: MessageTray.Source.prototype,
+const AutorunResidentSource = new Lang.Class({
+    Name: 'AutorunResidentSource',
+    Extends: MessageTray.Source,

    _init: function() {
-        MessageTray.Source.prototype._init.call(this, _("Removable Devices"));
+        this.parent(_("Removable Devices"));

        this._mounts = [];

@ -324,19 +317,14 @@ AutorunResidentSource.prototype = {
                              icon_type: St.IconType.FULLCOLOR,
                              icon_size: this.ICON_SIZE });
    }
-}
+});

-function AutorunResidentNotification(source) {
-    this._init(source);
-}
-
-AutorunResidentNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const AutorunResidentNotification = new Lang.Class({
+    Name: 'AutorunResidentNotification',
+    Extends: MessageTray.Notification,

    _init: function(source) {
-        MessageTray.Notification.prototype._init.call(this, source,
-                                                      source.title, null,
-                                                      { customContent: true });
+        this.parent(source, source.title, null, { customContent: true });

        // set the notification as resident
        this.setResident(true);
@ -410,13 +398,11 @@ AutorunResidentNotification.prototype = {

        return item;
    },
-}
+});

-function AutorunTransientDispatcher() {
-    this._init();
-}
+const AutorunTransientDispatcher = new Lang.Class({
+    Name: 'AutorunTransientDispatcher',

-AutorunTransientDispatcher.prototype = {
    _init: function() {
        this._sources = [];
        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
@ -507,17 +493,14 @@ AutorunTransientDispatcher.prototype = {
        // destroy the notification source
        source.destroy();
    }
-}
+});

-function AutorunTransientSource(mount, apps) {
-    this._init(mount, apps);
-}
-
-AutorunTransientSource.prototype = {
-    __proto__: MessageTray.Source.prototype,
+const AutorunTransientSource = new Lang.Class({
+    Name: 'AutorunTransientSource',
+    Extends: MessageTray.Source,

    _init: function(mount, apps) {
-        MessageTray.Source.prototype._init.call(this, mount.get_name());
+        this.parent(mount.get_name());

        this.mount = mount;
        this.apps = apps;
@ -534,19 +517,14 @@ AutorunTransientSource.prototype = {
        return new St.Icon({ gicon: this.mount.get_icon(),
                             icon_size: this.ICON_SIZE });
    }
-}
+});

-function AutorunTransientNotification(source) {
-    this._init(source);
-}
-
-AutorunTransientNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const AutorunTransientNotification = new Lang.Class({
+    Name: 'AutorunTransientNotification',
+    Extends: MessageTray.Notification,

    _init: function(source) {
-        MessageTray.Notification.prototype._init.call(this, source,
-                                                      source.title, null,
-                                                      { customContent: true });
+        this.parent(source, source.title, null, { customContent: true });

        this._box = new St.BoxLayout({ style_class: 'hotplug-transient-box',
                                       vertical: true });
@ -579,7 +557,7 @@ AutorunTransientNotification.prototype = {

        let label = new St.Bin({ y_align: St.Align.MIDDLE,
                                 child: new St.Label
-                                 ({ text: _("Open with %s").format(app.get_display_name()) })
+                                 ({ text: _("Open with %s").format(app.get_name()) })
                               });
        box.add(label);

@ -621,5 +599,5 @@ AutorunTransientNotification.prototype = {

        return button;
    }
-}
+});

--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@ -21,11 +21,9 @@ const POPUP_ANIMATION_TIME = 0.15;
 * placed.  The arrow position may be controlled via setArrowOrigin().
 *
 */
-function BoxPointer(side, binProperties) {
-    this._init(side, binProperties);
-}
+const BoxPointer = new Lang.Class({
+    Name: 'BoxPointer',

-BoxPointer.prototype = {
    _init: function(arrowSide, binProperties) {
        this._arrowSide = arrowSide;
        this._arrowOrigin = 0;
@ -452,4 +450,4 @@ BoxPointer.prototype = {
    get opacity() {
        return this.actor.opacity;
    }
-};
+});
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -155,28 +155,24 @@ function _getEventDayAbbreviation(dayNumber) {

 // Abstraction for an appointment/event in a calendar

-function CalendarEvent(date, end, summary, allDay) {
-    this._init(date, end, summary, allDay);
-}
+const CalendarEvent = new Lang.Class({
+    Name: 'CalendarEvent',

-CalendarEvent.prototype = {
    _init: function(date, end, summary, allDay) {
        this.date = date;
        this.end = end;
        this.summary = summary;
        this.allDay = allDay;
    }
-};
+});

 // Interface for appointments/events - e.g. the contents of a calendar
 //

 // First, an implementation with no events
-function EmptyEventSource() {
-    this._init();
-}
+const EmptyEventSource = new Lang.Class({
+    Name: 'EmptyEventSource',

-EmptyEventSource.prototype = {
    _init: function() {
    },

@ -191,7 +187,7 @@ EmptyEventSource.prototype = {
    hasEvents: function(day) {
        return false;
    }
-};
+});
 Signals.addSignalMethods(EmptyEventSource.prototype);

 const CalendarServerIface = <interface name="org.gnome.Shell.CalendarServer">
@ -219,11 +215,6 @@ function CalendarServer() {
    return self;
 }

-// an implementation that reads data from a session bus service
-function DBusEventSource() {
-    this._init();
-}
-
 function _datesEqual(a, b) {
    if (a < b)
        return false;
@ -242,8 +233,10 @@ function _dateIntervalsOverlap(a0, a1, b0, b1)
        return true;
 }

+// an implementation that reads data from a session bus service
+const DBusEventSource = new Lang.Class({
+    Name: 'DBusEventSource',

-DBusEventSource.prototype = {
    _init: function() {
        this._resetCache();

@ -344,17 +337,15 @@ DBusEventSource.prototype = {

        return true;
    }
-};
+});
 Signals.addSignalMethods(DBusEventSource.prototype);

 // Calendar:
 // @eventSource: is an object implementing the EventSource API, e.g. the
 // requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
-function Calendar(eventSource) {
-    this._init(eventSource);
-}
+const Calendar = new Lang.Class({
+    Name: 'Calendar',

-Calendar.prototype = {
    _init: function(eventSource) {
        if (eventSource) {
            this._eventSource = eventSource;
@ -620,15 +611,13 @@ Calendar.prototype = {
        if (this._eventSource)
            this._eventSource.requestRange(beginDate, iter, forceReload);
    }
-};
+});

 Signals.addSignalMethods(Calendar.prototype);

-function EventsList(eventSource) {
-    this._init(eventSource);
-}
+const EventsList = new Lang.Class({
+    Name: 'EventsList',

-EventsList.prototype = {
    _init: function(eventSource) {
        this.actor = new St.BoxLayout({ vertical: true, style_class: 'events-header-vbox'});
        this._date = new Date();
@ -759,4 +748,4 @@ EventsList.prototype = {
            this._showOtherDay(this._date);
        }
    }
-};
+});
--- a/js/ui/contactDisplay.js
+++ b/js/ui/contactDisplay.js
@ -20,11 +20,9 @@ function launchContact(id) {


 /* This class represents a shown contact search result in the overview */
-function Contact(id) {
-    this._init(id);
-}
+const Contact = new Lang.Class({
+    Name: 'Contact',

-Contact.prototype = {
    _init: function(id) {
        this._contactSys = Shell.ContactSystem.get_default();
        this.individual = this._contactSys.get_individual(id);
@ -131,19 +129,16 @@ Contact.prototype = {
            return tc.load_icon_name(null, 'avatar-default', St.IconType.FULLCOLOR, size);
        }
    },
-};
+});


 /* Searches for and returns contacts */
-function ContactSearchProvider() {
-    this._init();
-}
-
-ContactSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
+const ContactSearchProvider = new Lang.Class({
+    Name: 'ContactSearchProvider',
+    Extends: Search.SearchProvider,

    _init: function() {
-        Search.SearchProvider.prototype._init.call(this, _("CONTACTS"));
+        this.parent(_("CONTACTS"));
        this._contactSys = Shell.ContactSystem.get_default();
    },

@ -182,4 +177,4 @@ ContactSearchProvider.prototype = {
    activateResult: function(id, params) {
        launchContact(id);
    }
-};
+});
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@ -22,11 +22,9 @@ const SortGroup = {
    BOTTOM: 2
 };

-function CtrlAltTabManager() {
-    this._init();
-}
+const CtrlAltTabManager = new Lang.Class({
+    Name: 'CtrlAltTabManager',

-CtrlAltTabManager.prototype = {
    _init: function() {
        this._items = [];
        this._focusManager = St.FocusManager.get_for_stage(global.stage);
@ -134,17 +132,15 @@ CtrlAltTabManager.prototype = {
                                      }));
        }
    }
-};
+});

 function mod(a, b) {
    return (a + b) % b;
 }

-function CtrlAltTabPopup() {
-    this._init();
-}
+const CtrlAltTabPopup = new Lang.Class({
+    Name: 'CtrlAltTabPopup',

-CtrlAltTabPopup.prototype = {
    _init : function() {
        this.actor = new Shell.GenericContainer({ name: 'ctrlAltTabPopup',
                                                  reactive: true });
@ -303,17 +299,14 @@ CtrlAltTabPopup.prototype = {
        this._selection = num;
        this._switcher.highlight(num);
    }
-};
+});

-function CtrlAltTabSwitcher(items) {
-    this._init(items);
-}
-
-CtrlAltTabSwitcher.prototype = {
-    __proto__ : AltTab.SwitcherList.prototype,
+const CtrlAltTabSwitcher = new Lang.Class({
+    Name: 'CtrlAltTabSwitcher',
+    Extends: AltTab.SwitcherList,

    _init : function(items) {
-        AltTab.SwitcherList.prototype._init.call(this, true);
+        this.parent(true);

        for (let i = 0; i < items.length; i++)
            this._addIcon(items[i]);
@ -336,4 +329,4 @@ CtrlAltTabSwitcher.prototype = {

        this.addItem(box, text);
    }
-};
+});
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -6,6 +6,7 @@ const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
+const Mainloop = imports.mainloop;

 const AppDisplay = imports.ui.appDisplay;
 const AppFavorites = imports.ui.appFavorites;
@ -16,14 +17,15 @@ const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;

 const DASH_ANIMATION_TIME = 0.2;
+const DASH_ITEM_LABEL_SHOW_TIME = 0.15;
+const DASH_ITEM_LABEL_HIDE_TIME = 0.1;
+const DASH_ITEM_HOVER_TIMEOUT = 300;

 // A container like StBin, but taking the child's scale into account
 // when requesting a size
-function DashItemContainer() {
-    this._init();
-}
+const DashItemContainer = new Lang.Class({
+    Name: 'DashItemContainer',

-DashItemContainer.prototype = {
    _init: function() {
        this.actor = new Shell.GenericContainer({ style_class: 'dash-item-container' });
        this.actor.connect('get-preferred-width',
@ -34,6 +36,8 @@ DashItemContainer.prototype = {
                           Lang.bind(this, this._allocate));
        this.actor._delegate = this;

+        this._label = null;
+
        this.child = null;
        this._childScale = 1;
        this._childOpacity = 255;
@ -86,6 +90,60 @@ DashItemContainer.prototype = {
        alloc.natural_size = natWidth * this.child.scale_y;
    },

+    showLabel: function() {
+        if (this._label == null)
+            return;
+
+        this._label.opacity = 0;
+        this._label.show();
+
+        let [stageX, stageY] = this.actor.get_transformed_position();
+
+        let itemHeight = this.actor.allocation.y2 - this.actor.allocation.y1;
+
+        let labelHeight = this._label.get_height();
+        let yOffset = Math.floor((itemHeight - labelHeight) / 2)
+
+        let y = stageY + yOffset;
+
+        let node = this._label.get_theme_node();
+        let xOffset = node.get_length('-x-offset');
+
+        let x;
+        if (St.Widget.get_default_direction () == St.TextDirection.RTL)
+            x = stageX - this._label.get_width() - xOffset;
+        else
+            x = stageX + this.actor.get_width() + xOffset;
+
+        this._label.set_position(x, y);
+        Tweener.addTween(this._label,
+                         { opacity: 255,
+                           time: DASH_ITEM_LABEL_SHOW_TIME,
+                           transition: 'easeOutQuad',
+                         });
+    },
+
+    setLabelText: function(text) {
+        if (this._label == null)
+            this._label = new St.Label({ style_class: 'dash-label'});
+
+        this._label.set_text(text);
+        Main.layoutManager.addChrome(this._label);
+        this._label.hide();
+    },
+
+    hideLabel: function () {
+        this._label.opacity = 255;
+        Tweener.addTween(this._label,
+                         { opacity: 0,
+                           time: DASH_ITEM_LABEL_HIDE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this, function() {
+                               this._label.hide();
+                           })
+                         });
+    },
+
    setChild: function(actor) {
        if (this.child == actor)
            return;
@ -157,17 +215,14 @@ DashItemContainer.prototype = {
    get childOpacity() {
        return this._childOpacity;
    }
-};
+});

-function RemoveFavoriteIcon() {
-    this._init();
-}
-
-RemoveFavoriteIcon.prototype = {
-    __proto__: DashItemContainer.prototype,
+const RemoveFavoriteIcon = new Lang.Class({
+    Name: 'RemoveFavoriteIcon',
+    Extends: DashItemContainer,

    _init: function() {
-        DashItemContainer.prototype._init.call(this);
+        this.parent();

        this._iconBin = new St.Bin({ style_class: 'remove-favorite' });
        this._iconActor = null;
@ -219,28 +274,21 @@ RemoveFavoriteIcon.prototype = {

        return true;
    }
-};
+});

-
-function DragPlaceholderItem() {
-    this._init();
-}
-
-DragPlaceholderItem.prototype = {
-    __proto__: DashItemContainer.prototype,
+const DragPlaceholderItem = new Lang.Class({
+    Name: 'DragPlaceholderItem',
+    Extends: DashItemContainer,

    _init: function() {
-        DashItemContainer.prototype._init.call(this);
+        this.parent();
        this.setChild(new St.Bin({ style_class: 'placeholder' }));
    }
-};
+});

+const Dash = new Lang.Class({
+    Name: 'Dash',

-function Dash() {
-    this._init();
-}
-
-Dash.prototype = {
    _init : function() {
        this._maxHeight = -1;
        this.iconSize = 64;
@ -250,6 +298,9 @@ Dash.prototype = {
        this._dragPlaceholderPos = -1;
        this._animatingPlaceholdersCount = 0;
        this._favRemoveTarget = null;
+        this._showLabelTimeoutId = 0;
+        this._resetHoverTimeoutId = 0;
+        this._labelShowing = false;

        this._box = new St.BoxLayout({ name: 'dash',
                                       vertical: true,
@ -383,16 +434,50 @@ Dash.prototype = {
                                   Lang.bind(this, function() {
                                       display.actor.opacity = 255;
                                   }));
-        display.actor.set_tooltip_text(app.get_name());

        let item = new DashItemContainer();
        item.setChild(display.actor);

-        display.icon.setIconSize(this.iconSize);
+        item.setLabelText(app.get_name());

+        display.icon.setIconSize(this.iconSize);
+        display.actor.connect('notify::hover',
+                               Lang.bind(this, function() {
+                                   this._onHover(item, display)
+                               }));
        return item;
    },

+    _onHover: function (item, display) {
+        if (display.actor.get_hover() && !display.isMenuUp) {
+            if (this._showLabelTimeoutId == 0) {
+                let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
+                this._showLabelTimeoutId = Mainloop.timeout_add(timeout,
+                    Lang.bind(this, function() {
+                        this._labelShowing = true;
+                        item.showLabel();
+                        return false;
+                    }));
+                if (this._resetHoverTimeoutId > 0) {
+                    Mainloop.source_remove(this._resetHoverTimeoutId);
+                this._resetHoverTimeoutId = 0;
+                }
+            }
+        } else {
+            if (this._showLabelTimeoutId > 0)
+                Mainloop.source_remove(this._showLabelTimeoutId);
+            this._showLabelTimeoutId = 0;
+            item.hideLabel();
+            if (this._labelShowing) {
+                this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
+                    Lang.bind(this, function() {
+                        this._labelShowing = false;
+                        return false;
+                    }));
+            }
+        }
+    },
+
    _adjustIconSize: function() {
        // For the icon size, we only consider children which are "proper"
        // icons (i.e. ignoring drag placeholders) and which are not
@ -762,6 +847,6 @@ Dash.prototype = {

        return true;
    }
-};
+});

 Signals.addSignalMethods(Dash.prototype);
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@ -40,12 +40,9 @@ function _onVertSepRepaint (area)
    cr.stroke();
 };

-function DateMenuButton() {
-    this._init.apply(this, arguments);
-}
-
-DateMenuButton.prototype = {
-    __proto__: PanelMenu.Button.prototype,
+const DateMenuButton = new Lang.Class({
+    Name: 'DateMenuButton',
+    Extends: PanelMenu.Button,

    _init: function(params) {
        params = Params.parse(params, { showEvents: true });
@ -57,7 +54,7 @@ DateMenuButton.prototype = {
        let menuAlignment = 0.25;
        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
            menuAlignment = 1.0 - menuAlignment;
-        PanelMenu.Button.prototype._init.call(this, menuAlignment);
+        this.parent(menuAlignment);

        this._clock = new St.Label();
        this.actor.add_actor(this._clock);
@ -239,4 +236,4 @@ DateMenuButton.prototype = {
            }
        }
    }
-};
+});
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -69,11 +69,9 @@ function removeDragMonitor(monitor) {
        }
 }

-function _Draggable(actor, params) {
-    this._init(actor, params);
-}
+const _Draggable = new Lang.Class({
+    Name: 'Draggable',

-_Draggable.prototype = {
    _init : function(actor, params) {
        params = Params.parse(params, { manualMode: false,
                                        restoreOnSuccess: false,
@ -596,7 +594,7 @@ _Draggable.prototype = {
        this._dragActor = undefined;
        currentDraggable = null;
    }
-};
+});

 Signals.addSignalMethods(_Draggable.prototype);

--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@ -1,19 +1,16 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const DocInfo = imports.misc.docInfo;
+const Lang = imports.lang;
 const Params = imports.misc.params;
 const Search = imports.ui.search;

-
-function DocSearchProvider() {
-    this._init();
-}
-
-DocSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
+const DocSearchProvider = new Lang.Class({
+    Name: 'DocSearchProvider',
+    Extends: Search.SearchProvider,

    _init: function(name) {
-        Search.SearchProvider.prototype._init.call(this, _("RECENT ITEMS"));
+        this.parent(_("RECENT ITEMS"));
        this._docManager = DocInfo.getDocManager();
    },

@ -44,4 +41,4 @@ DocSearchProvider.prototype = {
    getSubsearchResultSet: function(previousResults, terms) {
        return this._docManager.subsearch(previousResults, terms);
    }
-};
+});
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -142,11 +142,9 @@ function findAppFromInhibitor(inhibitor) {
    return app;
 }

-function ListItem(app, reason) {
-    this._init(app, reason);
-}
+const ListItem = new Lang.Class({
+    Name: 'ListItem',

-ListItem.prototype = {
    _init: function(app, reason) {
        this._app = app;
        this._reason = reason;
@ -192,7 +190,7 @@ ListItem.prototype = {
        this.emit('activate');
        this._app.activate();
    }
-};
+});
 Signals.addSignalMethods(ListItem.prototype);

 // The logout timer only shows updates every 10 seconds
@ -230,27 +228,19 @@ function _setLabelText(label, text) {
    }
 }

-function EndSessionDialog() {
-    if (_endSessionDialog == null) {
-        this._init();
-        _endSessionDialog = this;
-    }
-
-    return _endSessionDialog;
-}
-
 function init() {
    // This always returns the same singleton object
    // By instantiating it initially, we register the
    // bus object, etc.
-    let dialog = new EndSessionDialog();
+    _endSessionDialog = new EndSessionDialog();
 }

-EndSessionDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
+const EndSessionDialog = new Lang.Class({
+    Name: 'EndSessionDialog',
+    Extends: ModalDialog.ModalDialog,

    _init: function() {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'end-session-dialog' });
+        this.parent({ styleClass: 'end-session-dialog' });

        this._user = AccountsService.UserManager.get_default().get_user(GLib.get_user_name());

@ -343,7 +333,8 @@ EndSessionDialog.prototype = {
        this._iconBin.child = null;
        if (iconFile) {
            this._iconBin.show();
-            this._iconBin.set_style('background-image: url("' + iconFile + '");');
+            this._iconBin.set_style('background-image: url("' + iconFile + '");' +
+                                    'background-size: contain;');
        } else {
            this._iconBin.hide();
        }
@ -441,7 +432,7 @@ EndSessionDialog.prototype = {
    },

    close: function() {
-        ModalDialog.ModalDialog.prototype.close.call(this);
+        this.parent();
        this._dbusImpl.emit_signal('Closed', null);
    },

@ -543,4 +534,4 @@ EndSessionDialog.prototype = {
                                        this.disconnect(signalId);
                                    }));
    }
-};
+});
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -202,7 +202,7 @@ function gotExtensionZipFile(session, message, uuid) {
            global.settings.set_strv(ENABLED_EXTENSIONS_KEY, enabledExtensions);
        }

-        loadExtension(dir, true, ExtensionType.PER_USER);
+        loadExtension(dir, ExtensionType.PER_USER, true);
    });
 }

@ -502,15 +502,12 @@ function loadExtensions() {
    _loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
 }

-function InstallExtensionDialog(uuid, version_tag, name) {
-    this._init(uuid, version_tag, name);
-}
-
-InstallExtensionDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
+const InstallExtensionDialog = new Lang.Class({
+    Name: 'InstallExtensionDialog',
+    Extends: ModalDialog.ModalDialog,

    _init: function(uuid, version_tag, name) {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'extension-dialog' });
+        this.parent({ styleClass: 'extension-dialog' });

        this._uuid = uuid;
        this._version_tag = version_tag;
@ -570,4 +567,4 @@ InstallExtensionDialog.prototype = {

        this.close(global.get_current_time());
    }
-};
+});
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@ -10,11 +10,9 @@ const Params = imports.misc.params;
 const ICON_SIZE = 48;


-function BaseIcon(label, createIcon) {
-    this._init(label, createIcon);
-}
+const BaseIcon = new Lang.Class({
+    Name: 'BaseIcon',

-BaseIcon.prototype = {
    _init : function(label, params) {
        params = Params.parse(params, { createIcon: null,
                                        setSizeManually: false,
@ -37,7 +35,8 @@ BaseIcon.prototype = {
        this.actor.set_child(box);

        this.iconSize = ICON_SIZE;
-        this._iconBin = new St.Bin();
+        this._iconBin = new St.Bin({ x_align: St.Align.MIDDLE,
+                                     y_align: St.Align.MIDDLE });

        box.add_actor(this._iconBin);

@ -127,12 +126,12 @@ BaseIcon.prototype = {
        this.iconSize = size;
        this.icon = this.createIcon(this.iconSize);

+        this._iconBin.child = this.icon;
+
        // The icon returned by createIcon() might actually be smaller than
        // the requested icon size (for instance StTextureCache does this
        // for fallback icons), so set the size explicitly.
-        this.icon.set_size(this.iconSize, this.iconSize);
-
-        this._iconBin.child = this.icon;
+        this._iconBin.set_size(this.iconSize, this.iconSize);
    },

    _onStyleChanged: function() {
@ -147,15 +146,18 @@ BaseIcon.prototype = {
            size = found ? len : ICON_SIZE;
        }

+        // don't create icons unnecessarily
+        if (size == this.iconSize &&
+            this._iconBin.child)
+            return;
+
        this._createIconTexture(size);
    }
-};
+});

-function IconGrid(params) {
-    this._init(params);
-}
+const IconGrid = new Lang.Class({
+    Name: 'IconGrid',

-IconGrid.prototype = {
    _init: function(params) {
        params = Params.parse(params, { rowLimit: null,
                                        columnLimit: null,
@ -324,4 +326,4 @@ IconGrid.prototype = {
    visibleItemsCount: function() {
        return this._grid.get_children().length - this._grid.get_n_skip_paint();
    }
-};
+});
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@ -39,34 +39,31 @@ const PRETTY_KEYS = {
    'Alt_L': 'Alt'
 };

-const CaribouKeyboardIface = {
-    name: 'org.gnome.Caribou.Keyboard',
-    methods:    [ { name: 'Show',
-                    inSignature: 'u',
-                    outSignature: ''
-                  },
-                  { name: 'Hide',
-                    inSignature: 'u',
-                    outSignature: ''
-                  },
-                  { name: 'SetCursorLocation',
-                    inSignature: 'iiii',
-                    outSignature: ''
-                  },
-                  { name: 'SetEntryLocation',
-                    inSignature: 'iiii',
-                    outSignature: ''
-                  } ],
-    properties: [ { name: 'Name',
-                    signature: 's',
-                    access: 'read' } ]
-};
+const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
+<method name='Show'>
+    <arg type='u' direction='in' />
+</method>
+<method name='Hide'>
+    <arg type='u' direction='in' />
+</method>
+<method name='SetCursorLocation'>
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+</method>
+<method name='SetEntryLocation'>
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+</method>
+<property name='Name' access='read' type='s' />
+</interface>;

-function Key() {
-    this._init.apply(this, arguments);
-}
+const Key = new Lang.Class({
+    Name: 'Key',

-Key.prototype = {
    _init : function(key) {
        this._key = key;

@ -192,15 +189,15 @@ Key.prototype = {
            this._boxPointer.hide(true);
        }
    }
-};
+});

-function Keyboard() {
-    this._init.apply(this, arguments);
-}
+const Keyboard = new Lang.Class({
+    // HACK: we can't set Name, because it collides with Name dbus property
+    // Name: 'Keyboard',

-Keyboard.prototype = {
    _init: function () {
-        DBus.session.exportObject('/org/gnome/Caribou/Keyboard', this);
+        this._impl = Gio.DBusExportedObject.wrapJSObject(CaribouKeyboardIface, this);
+        this._impl.export(Gio.DBus.session, '/org/gnome/Caribou/Keyboard');

        this.actor = null;

@ -532,19 +529,15 @@ Keyboard.prototype = {
    get Name() {
        return 'gnome-shell';
    }
-};
-DBus.conformExport(Keyboard.prototype, CaribouKeyboardIface);
+});

-function KeyboardSource() {
-    this._init.apply(this, arguments);
-}
-
-KeyboardSource.prototype = {
-    __proto__: MessageTray.Source.prototype,
+const KeyboardSource = new Lang.Class({
+    Name: 'KeyboardSource',
+    Extends: MessageTray.Source,

    _init: function(keyboard) {
+        this.parent(_("Keyboard"));
        this._keyboard = keyboard;
-        MessageTray.Source.prototype._init.call(this, _("Keyboard"));

        this._setSummaryIcon(this.createNotificationIcon());
    },
@ -555,7 +548,7 @@ KeyboardSource.prototype = {
                             icon_size: this.ICON_SIZE });
    },

-     handleSummaryClick: function() {
+    handleSummaryClick: function() {
        let event = Clutter.get_current_event();
        if (event.type() != Clutter.EventType.BUTTON_RELEASE)
            return false;
@ -567,4 +560,4 @@ KeyboardSource.prototype = {
    open: function() {
        this._keyboard.show();
    }
-};
+});
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@ -17,11 +17,9 @@ const HOT_CORNER_ACTIVATION_TIMEOUT = 0.5;
 const STARTUP_ANIMATION_TIME = 0.2;
 const KEYBOARD_ANIMATION_TIME = 0.5;

-function LayoutManager() {
-    this._init.apply(this, arguments);
-}
+const LayoutManager = new Lang.Class({
+    Name: 'LayoutManager',

-LayoutManager.prototype = {
    _init: function () {
        this._rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
        this.monitors = [];
@ -374,7 +372,7 @@ LayoutManager.prototype = {
    findMonitorForActor: function(actor) {
        return this._chrome.findMonitorForActor(actor);
    }
-};
+});
 Signals.addSignalMethods(LayoutManager.prototype);


@ -382,11 +380,9 @@ Signals.addSignalMethods(LayoutManager.prototype);
 //
 // This class manages a "hot corner" that can toggle switching to
 // overview.
-function HotCorner() {
-    this._init();
-}
+const HotCorner = new Lang.Class({
+    Name: 'HotCorner',

-HotCorner.prototype = {
    _init : function() {
        // We use this flag to mark the case where the user has entered the
        // hot corner and has not left both the hot corner and a surrounding
@ -437,9 +433,9 @@ HotCorner.prototype = {
                             Lang.bind(this, this._onCornerLeft));

        // Cache the three ripples instead of dynamically creating and destroying them.
-        this._ripple1 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0 });
-        this._ripple2 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0 });
-        this._ripple3 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0 });
+        this._ripple1 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
+        this._ripple2 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
+        this._ripple3 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });

        Main.uiGroup.add_actor(this._ripple1);
        Main.uiGroup.add_actor(this._ripple2);
@ -548,7 +544,7 @@ HotCorner.prototype = {
            return true;
        return false;
    }
-};
+});


 // This manages the shell "chrome"; the UI that's visible in the
@ -561,11 +557,9 @@ const defaultParams = {
    affectsInputRegion: true
 };

-function Chrome() {
-    this._init.apply(this, arguments);
-}
+const Chrome = new Lang.Class({
+    Name: 'Chrome',

-Chrome.prototype = {
    _init: function(layoutManager) {
        this._layoutManager = layoutManager;

@ -981,4 +975,4 @@ Chrome.prototype = {

        return false;
    }
-};
+});
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@ -30,11 +30,9 @@ const Tweener = imports.ui.tweener;
 * @container and will track any changes in its size. You can override
 * this by passing an explicit width and height in @params.
 */
-function Lightbox(container, params) {
-    this._init(container, params);
-}
+const Lightbox = new Lang.Class({
+    Name: 'Lightbox',

-Lightbox.prototype = {
    _init : function(container, params) {
        params = Params.parse(params, { inhibitEvents: false,
                                        width: null,
@ -196,4 +194,4 @@ Lightbox.prototype = {

        this.highlight(null);
    }
-};
+});
--- a/js/ui/link.js
+++ b/js/ui/link.js
@ -4,11 +4,9 @@ const Lang = imports.lang;
 const Signals = imports.signals;
 const St = imports.gi.St;

-function Link(props) {
-    this._init(props);
-}
+const Link = new Lang.Class({
+    Name: 'Link',

-Link.prototype = {
    _init : function(props) {
        let realProps = { reactive: true,
                          track_hover: true,
@ -19,6 +17,5 @@ Link.prototype = {

        this.actor = new St.Button(realProps);
    }
-};
-
+});
 Signals.addSignalMethods(Link.prototype);
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -55,11 +55,9 @@ function _getAutoCompleteGlobalKeywords() {
    return keywords.concat(windowProperties).concat(headerProperties);
 }

-function AutoComplete(entry) {
-    this._init(entry);
-}
+const AutoComplete = new Lang.Class({
+    Name: 'AutoComplete',

-AutoComplete.prototype = {
    _init: function(entry) {
        this._entry = entry;
        this._entry.connect('key-press-event', Lang.bind(this, this._entryKeyPressEvent));
@ -118,15 +116,13 @@ AutoComplete.prototype = {

        this._entry.clutter_text.insert_text(additionalCompletionText, cursorPos);
    }
-};
+});
 Signals.addSignalMethods(AutoComplete.prototype);


-function Notebook() {
-    this._init();
-}
+const Notebook = new Lang.Class({
+    Name: 'Notebook',

-Notebook.prototype = {
    _init: function() {
        this.actor = new St.BoxLayout({ vertical: true });

@ -250,7 +246,7 @@ Notebook.prototype = {

        this.selectIndex(prevIndex);
    }
-};
+});
 Signals.addSignalMethods(Notebook.prototype);

 function objectToString(o) {
@ -262,12 +258,9 @@ function objectToString(o) {
    }
 }

-function ObjLink(o, title) {
-    this._init(o, title);
-}
-
-ObjLink.prototype = {
-    __proto__: Link.Link,
+const ObjLink = new Lang.Class({
+    Name: 'ObjLink',
+    Extends: Link.Link,

    _init: function(o, title) {
        let text;
@ -277,7 +270,8 @@ ObjLink.prototype = {
            text = objectToString(o);
        text = GLib.markup_escape_text(text, -1);
        this._obj = o;
-        Link.Link.prototype._init.call(this, { label: text });
+
+        this.parent({ label: text });
        this.actor.get_child().single_line_mode = true;
        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
    },
@ -285,13 +279,11 @@ ObjLink.prototype = {
    _onClicked: function (link) {
        Main.lookingGlass.inspectObject(this._obj, this.actor);
    }
-};
+});

-function Result(command, o, index) {
-    this._init(command, o, index);
-}
+const Result = new Lang.Class({
+    Name: 'Result',

-Result.prototype = {
    _init : function(command, o, index) {
        this.index = index;
        this.o = o;
@ -313,13 +305,11 @@ Result.prototype = {
        padBin.add_actor(line);
        this.actor.add(padBin);
    }
-};
+});

-function WindowList() {
-    this._init();
-}
+const WindowList = new Lang.Class({
+    Name: 'WindowList',

-WindowList.prototype = {
    _init : function () {
        this.actor = new St.BoxLayout({ name: 'Windows', vertical: true, style: 'spacing: 8px' });
        let tracker = Shell.WindowTracker.get_default();
@ -360,14 +350,12 @@ WindowList.prototype = {
            }
        }
    }
-};
+});
 Signals.addSignalMethods(WindowList.prototype);

-function ObjInspector() {
-    this._init();
-}
+const ObjInspector = new Lang.Class({
+    Name: 'ObjInspector',

-ObjInspector.prototype = {
    _init : function () {
        this._obj = null;
        this._previousObj = null;
@ -467,7 +455,7 @@ ObjInspector.prototype = {
    _onBack: function() {
        this.selectObject(this._previousObj, true);
    }
-};
+});

 function addBorderPaintHook(actor) {
    let signalId = actor.connect_after('paint',
@ -493,11 +481,9 @@ function addBorderPaintHook(actor) {
    return signalId;
 }

-function Inspector() {
-    this._init();
-}
+const Inspector = new Lang.Class({
+    Name: 'Inspector',

-Inspector.prototype = {
    _init: function() {
        let container = new Shell.GenericContainer({ width: 0,
                                                     height: 0 });
@ -636,15 +622,13 @@ Inspector.prototype = {
            this._borderPaintId = addBorderPaintHook(this._target);
        }
    }
-};
+});

 Signals.addSignalMethods(Inspector.prototype);

-function ErrorLog() {
-    this._init();
-}
+const ErrorLog = new Lang.Class({
+    Name: 'ErrorLog',

-ErrorLog.prototype = {
    _init: function() {
        this.actor = new St.BoxLayout();
        this.text = new St.Label();
@ -679,13 +663,11 @@ ErrorLog.prototype = {
        }
        this.text.text = text;
    }
-};
+});

-function Memory() {
-    this._init();
-}
+const Memory = new Lang.Class({
+    Name: 'Memory',

-Memory.prototype = {
    _init: function() {
        this.actor = new St.BoxLayout({ vertical: true });
        this._glibc_uordblks = new St.Label();
@ -730,13 +712,11 @@ Memory.prototype = {
        this._gjs_closure.text = 'gjs_closure: ' + memInfo.gjs_closure;
        this._last_gc_seconds_ago.text = 'last_gc_seconds_ago: ' + memInfo.last_gc_seconds_ago;
    }
-};
+});

-function Extensions() {
-    this._init();
-}
+const Extensions = new Lang.Class({
+    Name: 'Extensions',

-Extensions.prototype = {
    _init: function() {
        this.actor = new St.BoxLayout({ vertical: true,
                                        name: 'lookingGlassExtensions' });
@ -866,13 +846,11 @@ Extensions.prototype = {

        return box;
    }
-};
+});

-function LookingGlass() {
-    this._init();
-}
+const LookingGlass = new Lang.Class({
+    Name: 'LookingGlass',

-LookingGlass.prototype = {
    _init : function() {
        this._borderPaintTarget = null;
        this._borderPaintId = 0;
@ -889,7 +867,8 @@ LookingGlass.prototype = {
        this.actor = new St.BoxLayout({ name: 'LookingGlassDialog',
                                        style_class: 'lg-dialog',
                                        vertical: true,
-                                        visible: false });
+                                        visible: false,
+                                        reactive: true });
        this.actor.connect('key-press-event', Lang.bind(this, this._globalKeyPressEvent));

        this._interfaceSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
@ -1228,5 +1207,5 @@ LookingGlass.prototype = {
                                       })
                                     });
    }
-};
+});
 Signals.addSignalMethods(LookingGlass.prototype);
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@ -36,17 +36,15 @@ const CROSS_HAIRS_CLIP_KEY      = 'cross-hairs-clip';

 let magDBusService = null;

-function Magnifier() {
-    this._init();
-}
+const Magnifier = new Lang.Class({
+    Name: 'Magnifier',

-Magnifier.prototype = {
    _init: function() {
        // Magnifier is a manager of ZoomRegions.
        this._zoomRegions = [];

        // Create small clutter tree for the magnified mouse.
-        let xfixesCursor = Shell.XFixesCursor.get_default();
+        let xfixesCursor = Shell.XFixesCursor.get_for_stage(global.stage);
        this._mouseSprite = new Clutter.Texture();
        xfixesCursor.update_texture_image(this._mouseSprite);
        this._cursorRoot = new Clutter.Group();
@ -543,14 +541,12 @@ Magnifier.prototype = {
            );
        }
    }
-};
+});
 Signals.addSignalMethods(Magnifier.prototype);

-function ZoomRegion(magnifier, mouseSourceActor) {
-    this._init(magnifier, mouseSourceActor);
-}
+const ZoomRegion = new Lang.Class({
+    Name: 'ZoomRegion',

-ZoomRegion.prototype = {
    _init: function(magnifier, mouseSourceActor) {
        this._magnifier = magnifier;

@ -1150,13 +1146,11 @@ ZoomRegion.prototype = {
                                               yMagMouse - groupHeight / 2);
        }
    }
-};
+});

-function Crosshairs() {
-    this._init();
-}
+const Crosshairs = new Lang.Class({
+    Name: 'Crosshairs',

-Crosshairs.prototype = {
    _init: function() {

        // Set the group containing the crosshairs to three times the desktop
@ -1412,4 +1406,4 @@ Crosshairs.prototype = {
        this._vertTopHair.set_position((groupWidth - thickness) / 2, top);
        this._vertBottomHair.set_position((groupWidth - thickness) / 2, bottom);
    }
-};
+});
--- a/js/ui/magnifierDBus.js
+++ b/js/ui/magnifierDBus.js
@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Gio = imports.gi.Gio;
+const Lang = imports.lang;
 const Main = imports.ui.main;

 const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
@ -95,11 +96,9 @@ const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}>
 // '/org/gnome/Magnifier/ZoomRegion/zoomer1', etc.
 let _zoomRegionInstanceCount = 0;

-function ShellMagnifier() {
-    this._init();
-}
+const ShellMagnifier = new Lang.Class({
+    Name: 'ShellMagnifier',

-ShellMagnifier.prototype = {
    _init: function() {
        this._zoomers = {};

@ -325,7 +324,7 @@ ShellMagnifier.prototype = {
        // Drop the leading '#'.
        return parseInt(colorString.slice(1), 16);
     }
-};
+});

 /**
 * ShellMagnifierZoomRegion:
@ -333,11 +332,9 @@ ShellMagnifier.prototype = {
 * @zoomerObjectPath:   String that is the path to a DBus ZoomRegion.
 * @zoomRegion:         The actual zoom region associated with the object path.
 */
-function ShellMagnifierZoomRegion(zoomerObjectPath, zoomRegion) {
-    this._init(zoomerObjectPath, zoomRegion);
-}
+const ShellMagnifierZoomRegion = new Lang.Class({
+    Name: 'ShellMagnifierZoomRegion',

-ShellMagnifierZoomRegion.prototype = {
    _init: function(zoomerObjectPath, zoomRegion) {
        this._zoomRegion = zoomRegion;

@ -422,4 +419,4 @@ ShellMagnifierZoomRegion.prototype = {
    destroy: function() {
        this._dbusImpl.unexport();
    }
-};
+});
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -132,15 +132,11 @@ function _initUserSession() {
    ExtensionSystem.init();
    ExtensionSystem.loadExtensions();

-    let shellwm = global.window_manager;
-
-    shellwm.takeover_keybinding('panel-run-dialog');
-    shellwm.connect('keybinding::panel-run-dialog', function () {
+    Meta.keybindings_set_custom_handler('panel-run-dialog', function() {
       getRunDialog().open();
    });

-    shellwm.takeover_keybinding('panel-main-menu');
-    shellwm.connect('keybinding::panel-main-menu', function () {
+    Meta.keybindings_set_custom_handler('panel-main-menu', function () {
        overview.toggle();
    });

@ -336,6 +332,7 @@ function _windowRemoved(workspace, window) {
            workspace._lastRemovedWindow = null;
            _queueCheckWorkspaces();
        }
+        return false;
    });
 }

--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -83,11 +83,9 @@ function _fixMarkup(text, allowMarkup) {
    return GLib.markup_escape_text(text, -1);
 }

-function URLHighlighter(text, lineWrap, allowMarkup) {
-    this._init(text, lineWrap, allowMarkup);
-}
+const URLHighlighter = new Lang.Class({
+    Name: 'URLHighlighter',

-URLHighlighter.prototype = {
    _init: function(text, lineWrap, allowMarkup) {
        if (!text)
            text = '';
@ -211,13 +209,11 @@ URLHighlighter.prototype = {
        }
        return -1;
    }
-};
+});

-function FocusGrabber() {
-    this._init();
-}
+const FocusGrabber = new Lang.Class({
+    Name: 'FocusGrabber',

-FocusGrabber.prototype = {
    _init: function() {
        this.actor = null;

@ -351,7 +347,7 @@ FocusGrabber.prototype = {
            this._togglingFocusGrabMode = false;
        }
    }
-}
+});
 Signals.addSignalMethods(FocusGrabber.prototype);

 // Notification:
@ -408,11 +404,9 @@ Signals.addSignalMethods(FocusGrabber.prototype);
 // the content and the action area of the notification will be cleared.
 // The content area is also always cleared if 'customContent' is false
 // because it might contain the @banner that didn't fit in the banner mode.
-function Notification(source, title, banner, params) {
-    this._init(source, title, banner, params);
-}
+const Notification = new Lang.Class({
+    Name: 'Notification',

-Notification.prototype = {
    IMAGE_SIZE: 125,

    _init: function(source, title, banner, params) {
@ -953,14 +947,12 @@ Notification.prototype = {
        this.actor.destroy();
        this.actor._delegate = null;
    }
-};
+});
 Signals.addSignalMethods(Notification.prototype);

-function Source(title) {
-    this._init(title);
-}
+const Source = new Lang.Class({
+    Name: 'MessageTraySource',

-Source.prototype = {
    ICON_SIZE: 24,

    _init: function(title) {
@ -1142,14 +1134,12 @@ Source.prototype = {
    _lastNotificationRemoved: function() {
        this.destroy();
    }
-};
+});
 Signals.addSignalMethods(Source.prototype);

-function SummaryItem(source) {
-    this._init(source);
-}
+const SummaryItem = new Lang.Class({
+    Name: 'SummaryItem',

-SummaryItem.prototype = {
    _init: function(source) {
        this.source = source;
        this.source.connect('notification-added', Lang.bind(this, this._notificationAddedToSource));
@ -1340,14 +1330,12 @@ SummaryItem.prototype = {
        if (this.notificationStack.get_children().length > 0)
            this.notificationStack.get_children()[0]._delegate.setIconVisible(true);
    }
-};
+});
 Signals.addSignalMethods(SummaryItem.prototype);

-function MessageTray() {
-    this._init();
-}
+const MessageTray = new Lang.Class({
+    Name: 'MessageTray',

-MessageTray.prototype = {
    _init: function() {
        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
            this._onStatusChanged(proxy.status);
@ -1442,8 +1430,16 @@ MessageTray.prototype = {
        this._notificationRemoved = false;
        this._reNotifyAfterHideNotification = null;

+        this._corner = new Clutter.Rectangle({ width: 1,
+                                               height: 1,
+                                               opacity: 0,
+                                               reactive: true });
+        this._corner.connect('enter-event', Lang.bind(this, this._onCornerEnter));
+        Main.layoutManager.trayBox.add_actor(this._corner);
+        Main.layoutManager.trackChrome(this._corner);
+
        Main.layoutManager.trayBox.add_actor(this.actor);
-        this.actor.y = -1;
+        this.actor.y = this.actor.height;
        Main.layoutManager.trackChrome(this.actor);
        Main.layoutManager.trackChrome(this._notificationBin);

@ -1482,12 +1478,24 @@ MessageTray.prototype = {
        this._chatSummaryItemsCount = 0;
    },

+    _onCornerEnter: function(actor, event) {
+        this._pointerInSummary = true;
+        this._updateState();
+    },
+
    _setSizePosition: function() {
        let monitor = Main.layoutManager.bottomMonitor;
        this._notificationBin.x = 0;
        this._notificationBin.width = monitor.width;
        this._summaryBin.x = 0;
        this._summaryBin.width = monitor.width;
+
+        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+            this._corner.x = 0;
+        else
+            this._corner.x = Main.layoutManager.trayBox.width - 1;
+
+        this._corner.y = Main.layoutManager.trayBox.height - 1;
    },

    contains: function(source) {
@ -2088,7 +2096,7 @@ MessageTray.prototype = {

    _hideTray: function() {
        this._tween(this.actor, '_trayState', State.HIDDEN,
-                    { y: -1,
+                    { y: this.actor.height,
                      time: ANIMATION_TIME,
                      transition: 'easeOutQuad'
                    });
@ -2426,17 +2434,14 @@ MessageTray.prototype = {
        if (this._clickedSummaryItem)
            this._updateState();
    }
-};
+});

-function SystemNotificationSource() {
-    this._init();
-}
-
-SystemNotificationSource.prototype = {
-    __proto__:  Source.prototype,
+const SystemNotificationSource = new Lang.Class({
+    Name: 'SystemNotificationSource',
+    Extends: Source,

    _init: function() {
-        Source.prototype._init.call(this, _("System Information"));
+        this.parent(_("System Information"));

        this._setSummaryIcon(this.createNotificationIcon());
    },
@ -2450,4 +2455,4 @@ SystemNotificationSource.prototype = {
    open: function() {
        this.destroy();
    }
-};
+});
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -29,11 +29,9 @@ const State = {
    FADED_OUT: 4
 };

-function ModalDialog() {
-    this._init();
-}
+const ModalDialog = new Lang.Class({
+    Name: 'ModalDialog',

-ModalDialog.prototype = {
    _init: function(params) {
        params = Params.parse(params, { shellReactive: false,
                                        styleClass: null });
@ -303,5 +301,5 @@ ModalDialog.prototype = {
                               })
                         });
    }
-};
+});
 Signals.addSignalMethods(ModalDialog.prototype);
--- a/js/ui/networkAgent.js
+++ b/js/ui/networkAgent.js
@ -32,15 +32,12 @@ const ModalDialog = imports.ui.modalDialog;
 const PopupMenu = imports.ui.popupMenu;
 const ShellEntry = imports.ui.shellEntry;

-function NetworkSecretDialog() {
-    this._init.apply(this, arguments);
-}
-
-NetworkSecretDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
+const NetworkSecretDialog = new Lang.Class({
+    Name: 'NetworkSecretDialog',
+    Extends: ModalDialog.ModalDialog,

    _init: function(agent, requestId, connection, settingName, hints) {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'polkit-dialog' });
+        this.parent({ styleClass: 'polkit-dialog' });

        this._agent = agent;
        this._requestId = requestId;
@ -358,13 +355,11 @@ NetworkSecretDialog.prototype = {

        return content;
    }
-};
+});

-function NetworkAgent() {
-    this._init.apply(this, arguments);
-}
+const NetworkAgent = new Lang.Class({
+    Name: 'NetworkAgent',

-NetworkAgent.prototype = {
    _init: function() {
        this._native = new Shell.NetworkAgent({ auto_register: true,
                                                identifier: 'org.gnome.Shell.NetworkAgent' });
@ -387,4 +382,4 @@ NetworkAgent.prototype = {
        this._dialogs[requestId].close(global.get_current_time());
        this._dialogs[requestId].destroy();
    }
-};
+});
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -87,16 +87,14 @@ const rewriteRules = {
    ]
 };

-function NotificationDaemon() {
-    this._init();
-}
+const NotificationDaemon = new Lang.Class({
+    Name: 'NotificationDaemon',

-NotificationDaemon.prototype = {
    _init: function() {
        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(NotificationDaemonIface, this);
        this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications');

-        this._sources = {};
+        this._sources = [];
        this._senderToPid = {};
        this._notifications = {};
        this._busProxy = new Bus();
@ -154,14 +152,30 @@ NotificationDaemon.prototype = {
        }
    },

+    _lookupSource: function(title, pid, trayIcon) {
+        for (let i = 0; i < this._sources.length; i++) {
+            let source = this._sources[i];
+            if (source.pid == pid &&
+                (source.initialTitle == title || source.trayIcon || trayIcon))
+                return source;
+        }
+        return null;
+    },
+
    // Returns the source associated with ndata.notification if it is set.
-    // Otherwise, returns the source associated with the pid if one is
-    // stored in this._sources and the notification is not transient.
-    // Otherwise, creates a new source as long as pid is provided.
+    // Otherwise, returns the source associated with the title and pid if
+    // such source is stored in this._sources and the notification is not
+    // transient. If the existing or requested source is associated with
+    // a tray icon and passed in pid matches a pid of an existing source,
+    // the title match is ignored to enable representing a tray icon and
+    // notifications from the same application with a single source.
+    //
+    // If no existing source is found, a new source is created as long as
+    // pid is provided.
    //
    // Either a pid or ndata.notification is needed to retrieve or
    // create a source.
-    _getSource: function(title, pid, ndata, sender) {
+    _getSource: function(title, pid, ndata, sender, trayIcon) {
        if (!pid && !(ndata && ndata.notification))
            return null;

@ -178,20 +192,24 @@ NotificationDaemon.prototype = {
        // with a transient one from the same sender, so we
        // always create a new source object for new transient notifications
        // and never add it to this._sources .
-        if (!isForTransientNotification && this._sources[pid]) {
-            let source = this._sources[pid];
-            source.setTitle(title);
-            return source;
+        if (!isForTransientNotification) {
+            let source = this._lookupSource(title, pid, trayIcon);
+            if (source) {
+                source.setTitle(title);
+                return source;
+            }
        }

-        let source = new Source(title, pid, sender);
+        let source = new Source(title, pid, sender, trayIcon);
        source.setTransient(isForTransientNotification);

        if (!isForTransientNotification) {
-            this._sources[pid] = source;
+            this._sources.push(source);
            source.connect('destroy', Lang.bind(this,
                function() {
-                    delete this._sources[pid];
+                    let index = this._sources.indexOf(source);
+                    if (index >= 0)
+                        this._sources.splice(index, 1);
                }));
        }

@ -270,7 +288,7 @@ NotificationDaemon.prototype = {
        let sender = invocation.get_sender();
        let pid = this._senderToPid[sender];

-        let source = this._getSource(appName, pid, ndata, sender);
+        let source = this._getSource(appName, pid, ndata, sender, null);

        if (source) {
            this._notifyForSource(source, ndata);
@ -296,7 +314,7 @@ NotificationDaemon.prototype = {
            }

            let [pid] = result;
-            source = this._getSource(appName, pid, ndata, sender);
+            source = this._getSource(appName, pid, ndata, sender, null);

            // We only store sender-pid entries for persistent sources.
            // Removing the entries once the source is destroyed
@ -445,8 +463,8 @@ NotificationDaemon.prototype = {
        if (!tracker.focus_app)
            return;

-        for (let id in this._sources) {
-            let source = this._sources[id];
+        for (let i = 0; i < this._sources.length; i++) {
+            let source = this._sources[i];
            if (source.app == tracker.focus_app) {
                source.destroyNonResidentNotifications();
                return;
@ -465,28 +483,26 @@ NotificationDaemon.prototype = {
    },

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

    _onTrayIconRemoved: function(o, icon) {
-        let source = this._sources[icon.pid];
+        let source = this._lookupSource(null, icon.pid, true);
        if (source)
            source.destroy();
    }
-};
+});

-function Source(title, pid, sender) {
-    this._init(title, pid, sender);
-}
+const Source = new Lang.Class({
+    Name: 'NotificationDaemonSource',
+    Extends: MessageTray.Source,

-Source.prototype = {
-    __proto__:  MessageTray.Source.prototype,
+    _init: function(title, pid, sender, trayIcon) {
+        this.parent(title);

-    _init: function(title, pid, sender) {
-        MessageTray.Source.prototype._init.call(this, title);
+        this.initialTitle = title;

-        this._pid = pid;
+        this.pid = pid;
        if (sender)
            this._nameWatcherId = Gio.DBus.session.watch_name(sender,
                                                              Gio.BusNameWatcherFlags.NONE,
@ -500,7 +516,12 @@ Source.prototype = {
            this.title = this.app.get_name();
        else
            this.useNotificationIcon = true;
-        this._trayIcon = null;
+
+        this.trayIcon = trayIcon;
+        if (this.trayIcon) {
+           this._setSummaryIcon(this.trayIcon);
+           this.useNotificationIcon = false;
+        }
    },

    _onNameVanished: function() {
@ -527,7 +548,7 @@ Source.prototype = {
    },

    handleSummaryClick: function() {
-        if (!this._trayIcon)
+        if (!this.trayIcon)
            return false;

        let event = Clutter.get_current_event();
@ -548,11 +569,11 @@ Source.prototype = {
            let id = global.connect('notify::stage-input-mode', Lang.bind(this,
                function () {
                    global.disconnect(id);
-                    this._trayIcon.click(event);
+                    this.trayIcon.click(event);
                }));
            Main.overview.hide();
        } else {
-            this._trayIcon.click(event);
+            this.trayIcon.click(event);
        }
        return true;
    },
@ -561,31 +582,25 @@ Source.prototype = {
        if (this.app)
            return;

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

        // Only override the icon if we were previously using
        // notification-based icons (ie, not a trayicon) or if it was unset before
-        if (!this._trayIcon) {
+        if (!this.trayIcon) {
            this.useNotificationIcon = false;
            this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE));
        }
    },

-    setTrayIcon: function(icon) {
-        this._setSummaryIcon(icon);
-        this.useNotificationIcon = false;
-        this._trayIcon = icon;
-    },
-
    open: function(notification) {
        this.destroyNonResidentNotifications();
        this.openApp();
    },

    _lastNotificationRemoved: function() {
-        if (!this._trayIcon)
+        if (!this.trayIcon)
            this.destroy();
    },

@ -606,6 +621,6 @@ Source.prototype = {
            this._nameWatcherId = 0;
        }

-        MessageTray.Source.prototype.destroy.call(this);
+        this.parent();
    }
-};
+});
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -23,6 +23,7 @@ const Params = imports.misc.params;
 const PlaceDisplay = imports.ui.placeDisplay;
 const Tweener = imports.ui.tweener;
 const ViewSelector = imports.ui.viewSelector;
+const Wanda = imports.ui.wanda;
 const WorkspacesView = imports.ui.workspacesView;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;

@ -46,11 +47,9 @@ const SwipeScrollResult = {
    CLICK: 2
 };

-function ShellInfo() {
-    this._init();
-}
+const ShellInfo = new Lang.Class({
+    Name: 'ShellInfo',

-ShellInfo.prototype = {
    _init: function() {
        this._source = null;
        this._undoCallback = null;
@ -95,13 +94,11 @@ ShellInfo.prototype = {

        this._source.notify(notification);
    }
-};
+});

-function Overview() {
-    this._init.apply(this, arguments);
-}
+const Overview = new Lang.Class({
+    Name: 'Overview',

-Overview.prototype = {
    _init : function(params) {
        params = Params.parse(params, { isDummy: false });

@ -112,7 +109,6 @@ Overview.prototype = {
        if (this.isDummy) {
            this.animationInProgress = false;
            this.visible = false;
-            this.workspaces = null;
            return;
        }

@ -184,8 +180,6 @@ Overview.prototype = {
        this._lastActiveWorkspaceIndex = -1;
        this._lastHoveredWindow = null;
        this._needsFakePointerEvent = false;
-
-        this.workspaces = null;
    },

    // The members we construct that are implemented in JS might
@ -208,6 +202,8 @@ Overview.prototype = {
        this._viewSelector.addViewTab('applications', _("Applications"), appView.actor, 'system-run');

        // Default search providers
+        // Wanda comes obviously first
+        this.addSearchProvider(new Wanda.WandaSearchProvider());
        this.addSearchProvider(new AppDisplay.AppSearchProvider());
        this.addSearchProvider(new AppDisplay.SettingsSearchProvider());
        this.addSearchProvider(new PlaceDisplay.PlaceSearchProvider());
@ -591,13 +587,10 @@ Overview.prototype = {

        this._workspacesDisplay.show();

-        this.workspaces = this._workspacesDisplay.workspacesView;
-        global.overlay_group.add_actor(this.workspaces.actor);
-
        if (!this._desktopFade.child)
            this._desktopFade.child = this._getDesktopClone();

-        if (!this.workspaces.getActiveWorkspace().hasMaximizedWindows()) {
+        if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows()) {
            this._desktopFade.opacity = 255;
            this._desktopFade.show();
            Tweener.addTween(this._desktopFade,
@ -732,7 +725,7 @@ Overview.prototype = {
        this.animationInProgress = true;
        this._hideInProgress = true;

-        if (!this.workspaces.getActiveWorkspace().hasMaximizedWindows()) {
+        if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows()) {
            this._desktopFade.opacity = 0;
            this._desktopFade.show();
            Tweener.addTween(this._desktopFade,
@ -741,7 +734,7 @@ Overview.prototype = {
                               transition: 'easeOutQuad' });
        }

-        this.workspaces.hide();
+        this._workspacesDisplay.zoomFromOverview();

        // Make other elements fade out.
        Tweener.addTween(this._group,
@ -783,9 +776,6 @@ Overview.prototype = {

        global.window_group.show();

-        this.workspaces.destroy();
-        this.workspaces = null;
-
        this._workspacesDisplay.hide();

        this._desktopFade.hide();
@ -811,5 +801,5 @@ Overview.prototype = {
            this._needsFakePointerEvent = false;
        }
    }
-};
+});
 Signals.addSignalMethods(Overview.prototype);
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -3,6 +3,7 @@
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Pango = imports.gi.Pango;
@ -98,11 +99,9 @@ function _unpremultiply(color) {
 };


-function AnimatedIcon(name, size) {
-    this._init(name, size);
-}
+const AnimatedIcon = new Lang.Class({
+    Name: 'AnimatedIcon',

-AnimatedIcon.prototype = {
    _init: function(name, size) {
        this.actor = new St.Bin({ visible: false });
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
@ -139,13 +138,11 @@ AnimatedIcon.prototype = {
        if (this._timeoutId)
            Mainloop.source_remove(this._timeoutId);
    }
-};
+});

-function TextShadower() {
-    this._init();
-}
+const TextShadower = new Lang.Class({
+    Name: 'TextShadower',

-TextShadower.prototype = {
    _init: function() {
        this.actor = new Shell.GenericContainer();
        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
@ -225,7 +222,7 @@ TextShadower.prototype = {
            child.allocate(childBox, flags);
        }
    }
-};
+});

 /**
 * AppMenuButton:
@ -235,18 +232,19 @@ TextShadower.prototype = {
 * this menu also handles startup notification for it.  So when we
 * have an active startup notification, we switch modes to display that.
 */
-function AppMenuButton() {
-    this._init();
-}
+const AppMenuButton = new Lang.Class({
+    Name: 'AppMenuButton',
+    Extends: PanelMenu.Button,

-AppMenuButton.prototype = {
-    __proto__: PanelMenu.Button.prototype,
+    _init: function(menuManager) {
+        this.parent(0.0, true);

-    _init: function() {
-        PanelMenu.Button.prototype._init.call(this, 0.0);
        this._startingApps = [];

+        this._menuManager = menuManager;
        this._targetApp = null;
+        this._appMenuNotifyId = 0;
+        this._actionGroupNotifyId = 0;

        let bin = new St.Bin({ name: 'appMenu' });
        this.actor.add_actor(bin);
@ -271,10 +269,6 @@ AppMenuButton.prototype = {

        this._iconBottomClip = 0;

-        this._quitMenu = new PopupMenu.PopupMenuItem('');
-        this.menu.addMenuItem(this._quitMenu);
-        this._quitMenu.connect('activate', Lang.bind(this, this._onQuit));
-
        this._visible = !Main.overview.visible;
        if (!this._visible)
            this.actor.hide();
@ -453,12 +447,6 @@ AppMenuButton.prototype = {
        }
    },

-    _onQuit: function() {
-        if (this._targetApp == null)
-            return;
-        this._targetApp.request_quit();
-    },
-
    _onAppStateChanged: function(appSys, app) {
        let state = app.state;
        if (state != Shell.AppState.STARTING) {
@ -520,8 +508,10 @@ AppMenuButton.prototype = {
        }

        if (targetApp == this._targetApp) {
-            if (targetApp && targetApp.get_state() != Shell.AppState.STARTING)
+            if (targetApp && targetApp.get_state() != Shell.AppState.STARTING) {
                this.stopAnimation();
+                this._maybeSetMenu();
+            }
            return;
        }

@ -531,37 +521,70 @@ AppMenuButton.prototype = {
        this._iconBox.hide();
        this._label.setText('');

+        if (this._appMenuNotifyId)
+            this._targetApp.disconnect(this._appMenuNotifyId);
+        if (this._actionGroupNotifyId)
+            this._targetApp.disconnect(this._actionGroupNotifyId);
+        if (targetApp) {
+            this._appMenuNotifyId = targetApp.connect('notify::menu', Lang.bind(this, this._sync));
+            this._actionGroupNotifyId = targetApp.connect('notify::action-group', Lang.bind(this, this._sync));
+        } else {
+            this._appMenuNotifyId = 0;
+            this._actionGroupNotifyId = 0;
+        }
+
        this._targetApp = targetApp;
        let icon = targetApp.get_faded_icon(2 * PANEL_ICON_SIZE);

        this._label.setText(targetApp.get_name());
-        // TODO - _quit() doesn't really work on apps in state STARTING yet
-        this._quitMenu.label.set_text(_("Quit %s").format(targetApp.get_name()));

        this._iconBox.set_child(icon);
        this._iconBox.show();

        if (targetApp.get_state() == Shell.AppState.STARTING)
            this.startAnimation();
+        else
+            this._maybeSetMenu();

        this.emit('changed');
+    },
+
+    _maybeSetMenu: function() {
+        let menu;
+
+        if (this._targetApp.action_group && this._targetApp.menu) {
+            if (this.menu instanceof PopupMenu.RemoteMenu &&
+                this.menu.actionGroup == this._targetApp.action_group)
+                return;
+
+            menu = new PopupMenu.RemoteMenu(this.actor, this._targetApp.menu, this._targetApp.action_group);
+        } else {
+            if (this.menu && !(this.menu instanceof PopupMenu.RemoteMenu))
+                return;
+
+            // fallback to older menu
+            menu = new PopupMenu.PopupMenu(this.actor, 0.0, St.Side.TOP, 0);
+            menu.addAction(_("Quit"), Lang.bind(this, function() {
+                this._targetApp.request_quit();
+            }));
+        }
+
+        this.setMenu(menu);
+        this._menuManager.addMenu(menu);
    }
-};
+});

 Signals.addSignalMethods(AppMenuButton.prototype);

 // Activities button. Because everything else in the top bar is a
 // PanelMenu.Button, it simplifies some things to make this be one too.
 // We just hack it up to not actually have a menu attached to it.
-function ActivitiesButton() {
-    this._init.apply(this, arguments);
-}
-
-ActivitiesButton.prototype = {
-    __proto__: PanelMenu.Button.prototype,
+const ActivitiesButton = new Lang.Class({
+    Name: 'ActivitiesButton',
+    Extends: PanelMenu.Button,

    _init: function() {
-        PanelMenu.Button.prototype._init.call(this, 0.0);
+        this.parent(0.0);

        let container = new Shell.GenericContainer();
        container.connect('get-preferred-width', Lang.bind(this, this._containerGetPreferredWidth));
@ -698,13 +721,11 @@ ActivitiesButton.prototype = {
        Mainloop.source_remove(this._xdndTimeOut);
        this._xdndTimeOut = 0;
    }
-};
+});

-function PanelCorner(panel, side) {
-    this._init(panel, side);
-}
+const PanelCorner = new Lang.Class({
+    Name: 'PanelCorner',

-PanelCorner.prototype = {
    _init: function(box, side) {
        this._side = side;

@ -880,14 +901,12 @@ PanelCorner.prototype = {
        this.actor.set_size(cornerRadius, innerBorderWidth + cornerRadius);
        this.actor.set_anchor_point(0, innerBorderWidth);
    }
-};
+});


-function Panel() {
-    this._init();
-}
+const Panel = new Lang.Class({
+    Name: 'Panel',

-Panel.prototype = {
    _init : function() {
        this.actor = new Shell.GenericContainer({ name: 'panel',
                                                  reactive: true });
@ -938,9 +957,8 @@ Panel.prototype = {
            // more cleanly with the rest of the panel
            this._menus.addMenu(this._activitiesButton.menu);

-            this._appMenu = new AppMenuButton();
+            this._appMenu = new AppMenuButton(this._menus);
            this._leftBox.add(this._appMenu.actor);
-            this._menus.addMenu(this._appMenu.menu);
        }

        /* center */
@ -1114,5 +1132,4 @@ Panel.prototype = {
        if (box && box._delegate instanceof PanelMenu.ButtonBox)
            box.destroy();
    },
-
-};
+});
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@ -11,11 +11,9 @@ const Main = imports.ui.main;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;

-function ButtonBox(params) {
-    this._init.apply(this, arguments);
-};
+const ButtonBox = new Lang.Class({
+    Name: 'ButtonBox',

-ButtonBox.prototype = {
    _init: function(params) {
        params = Params.parse(params, { style_class: 'panel-button' }, true);
        this.actor = new Shell.GenericContainer(params);
@ -92,31 +90,45 @@ ButtonBox.prototype = {

        child.allocate(childBox, flags);
    },
-}
+});

-function Button(menuAlignment) {
-    this._init(menuAlignment);
-}
+const Button = new Lang.Class({
+    Name: 'PanelMenuButton',
+    Extends: ButtonBox,

-Button.prototype = {
-    __proto__: ButtonBox.prototype,
-
-    _init: function(menuAlignment) {
-        ButtonBox.prototype._init.call(this, { reactive: true,
-                                               can_focus: true,
-                                               track_hover: true });
+    _init: function(menuAlignment, dontCreateMenu) {
+        this.parent({ reactive: true,
+                      can_focus: true,
+                      track_hover: true });

        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
        this.actor.connect('key-press-event', Lang.bind(this, this._onSourceKeyPress));
-        this.menu = new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP);
-        this.menu.actor.add_style_class_name('panel-menu');
-        this.menu.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));
-        this.menu.actor.connect('key-press-event', Lang.bind(this, this._onMenuKeyPress));
-        Main.uiGroup.add_actor(this.menu.actor);
-        this.menu.actor.hide();
+
+        if (dontCreateMenu)
+            this.menu = null;
+        else
+            this.setMenu(new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0));
+    },
+
+    setMenu: function(menu) {
+        if (this.menu)
+            this.menu.destroy();
+
+        this.menu = menu;
+        if (this.menu) {
+            this.menu.actor.add_style_class_name('panel-menu');
+            this.menu.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));
+            this.menu.actor.connect('key-press-event', Lang.bind(this, this._onMenuKeyPress));
+
+            Main.uiGroup.add_actor(this.menu.actor);
+            this.menu.actor.hide();
+        }
    },

    _onButtonPress: function(actor, event) {
+        if (!this.menu)
+            return;
+
        if (!this.menu.isOpen) {
            // Setting the max-height won't do any good if the minimum height of the
            // menu is higher then the screen; it's useful if part of the menu is
@ -130,6 +142,9 @@ Button.prototype = {
    },

    _onSourceKeyPress: function(actor, event) {
+        if (!this.menu)
+            return false;
+
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
            this.menu.toggle();
@ -175,7 +190,7 @@ Button.prototype = {

        this.emit('destroy');
    }
-};
+});
 Signals.addSignalMethods(Button.prototype);

 /* SystemStatusButton:
@ -184,15 +199,13 @@ Signals.addSignalMethods(Button.prototype);
 * volume, bluetooth...), which is just a PanelMenuButton with an
 * icon and a tooltip
 */
-function SystemStatusButton() {
-    this._init.apply(this, arguments);
-}
-
-SystemStatusButton.prototype = {
-    __proto__: Button.prototype,
+const SystemStatusButton = new Lang.Class({
+    Name: 'SystemStatusButton',
+    Extends: Button,

    _init: function(iconName,tooltipText) {
-        Button.prototype._init.call(this, 0.0);
+        this.parent(0.0);
+
        this._iconActor = new St.Icon({ icon_name: iconName,
                                        icon_type: St.IconType.SYMBOLIC,
                                        style_class: 'system-status-icon' });
@ -219,4 +232,4 @@ SystemStatusButton.prototype = {
            this.tooltip = null;
        }
    }
-};
+});
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@ -22,11 +22,9 @@ const Util = imports.misc.util;
 * @iconFactory: A JavaScript callback which will create an icon texture given a size parameter
 * @launch: A JavaScript callback to launch the entry
 */
-function PlaceInfo(id, name, iconFactory, launch) {
-    this._init(id, name, iconFactory, launch);
-}
+const PlaceInfo = new Lang.Class({
+    Name: 'PlaceInfo',

-PlaceInfo.prototype = {
    _init: function(id, name, iconFactory, launch) {
        this.id = id;
        this.name = name;
@ -55,7 +53,7 @@ PlaceInfo.prototype = {
    isRemovable: function() {
        return false;
    }
-};
+});

 // Helper function to translate launch parameters into a GAppLaunchContext
 function _makeLaunchContext(params)
@ -72,12 +70,9 @@ function _makeLaunchContext(params)
    return launchContext;
 }

-function PlaceDeviceInfo(mount) {
-    this._init(mount);
-}
-
-PlaceDeviceInfo.prototype = {
-    __proto__: PlaceInfo.prototype,
+const PlaceDeviceInfo = new Lang.Class({
+    Name: 'PlaceDeviceInfo',
+    Extends: PlaceInfo,

    _init: function(mount) {
        this._mount = mount;
@ -123,13 +118,11 @@ PlaceDeviceInfo.prototype = {
                                     _("Retry"));
        }
    }
-};
+});

-function PlacesManager() {
-    this._init();
-}
+const PlacesManager = new Lang.Class({
+    Name: 'PlacesManager',

-PlacesManager.prototype = {
    _init: function() {
        this._defaultPlaces = [];
        this._mounts = [];
@ -162,9 +155,12 @@ PlacesManager.prototype = {

        this._connect = new PlaceInfo('special:connect', _("Connect to..."),
            function (size) {
-                return new St.Icon({ icon_name: 'applications-internet',
-                                     icon_type: St.IconType.FULLCOLOR,
-                                     icon_size: size });
+                // do NOT use St.Icon here, it crashes the shell
+                // see wanda.js for details
+                return St.TextureCache.get_default().load_icon_name('applications-internet',
+                                                                    null,
+                                                                    St.IconType.FULLCOLOR,
+                                                                    size);
            },
            function (params) {
                // BUG: nautilus-connect-server doesn't have a desktop file, so we can't
@ -360,19 +356,15 @@ PlacesManager.prototype = {
    _removeById: function(sourceArray, id) {
        sourceArray.splice(this._lookupIndexById(sourceArray, id), 1);
    }
-};
+});
 Signals.addSignalMethods(PlacesManager.prototype);

-
-function PlaceSearchProvider() {
-    this._init();
-}
-
-PlaceSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
+const PlaceSearchProvider = new Lang.Class({
+    Name: 'PlaceSearchProvider',
+    Extends: Search.SearchProvider,

    _init: function() {
-        Search.SearchProvider.prototype._init.call(this, _("PLACES & DEVICES"));
+        this.parent(_("PLACES & DEVICES"));
    },

    getResultMeta: function(resultId) {
@ -434,4 +426,4 @@ PlaceSearchProvider.prototype = {
        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
@ -27,6 +27,7 @@ const AccountsService = imports.gi.AccountsService;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 const Pango = imports.gi.Pango;
+const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Mainloop = imports.mainloop;
 const Polkit = imports.gi.Polkit;
@ -35,15 +36,12 @@ const PolkitAgent = imports.gi.PolkitAgent;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;

-function AuthenticationDialog(actionId, message, cookie, userNames) {
-    this._init(actionId, message, cookie, userNames);
-}
-
-AuthenticationDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
+const AuthenticationDialog = new Lang.Class({
+    Name: 'AuthenticationDialog',
+    Extends: ModalDialog.ModalDialog,

    _init: function(actionId, message, cookie, userNames) {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'polkit-dialog' });
+        this.parent({ styleClass: 'polkit-dialog' });

        this.actionId = actionId;
        this.message = message;
@ -88,10 +86,14 @@ AuthenticationDialog.prototype = {
        if (userNames.length > 1) {
            log('polkitAuthenticationAgent: Received ' + userNames.length +
                ' identities that can be used for authentication. Only ' +
-                'considering the first one.');
+                'considering one.');
        }

-        let userName = userNames[0];
+        let userName = GLib.get_user_name();
+        if (userNames.indexOf(userName) < 0)
+            userName = 'root';
+        if (userNames.indexOf(userName) < 0)
+            userName = userNames[0];

        this._user = AccountsService.UserManager.get_default().get_user(userName);
        let userRealName = this._user.get_real_name()
@ -330,15 +332,12 @@ AuthenticationDialog.prototype = {
        this.close(global.get_current_time());
        this._emitDone(false, true);
    },
-
-};
+});
 Signals.addSignalMethods(AuthenticationDialog.prototype);

-function AuthenticationAgent() {
-    this._init();
-}
+const AuthenticationAgent = new Lang.Class({
+    Name: 'AuthenticationAgent',

-AuthenticationAgent.prototype = {
    _init: function() {
        this._native = new Shell.PolkitAuthenticationAgent();
        this._native.connect('initiate', Lang.bind(this, this._onInitiate));
@ -394,12 +393,13 @@ AuthenticationAgent.prototype = {
                                 Lang.bind(this,
                                           function() {
                                               this._reallyCompleteRequest(wasDismissed);
+                                               return false;
                                           }));
        } else {
            this._reallyCompleteRequest(wasDismissed);
        }
    }
-}
+});

 function init() {
    let agent = new AuthenticationAgent();
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -2,7 +2,9 @@

 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
@ -26,11 +28,9 @@ function _ensureStyle(actor) {
        actor.ensure_style();
 }

-function PopupBaseMenuItem(params) {
-    this._init(params);
-}
+const PopupBaseMenuItem = new Lang.Class({
+    Name: 'PopupBaseMenuItem',

-PopupBaseMenuItem.prototype = {
    _init: function (params) {
        params = Params.parse (params, { reactive: true,
                                         activate: true,
@ -377,33 +377,27 @@ PopupBaseMenuItem.prototype = {
                x -= availWidth + this._spacing;
        }
    }
-};
+});
 Signals.addSignalMethods(PopupBaseMenuItem.prototype);

-function PopupMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-PopupMenuItem.prototype = {
-    __proto__: PopupBaseMenuItem.prototype,
+const PopupMenuItem = new Lang.Class({
+    Name: 'PopupMenuItem',
+    Extends: PopupBaseMenuItem,

    _init: function (text, params) {
-        PopupBaseMenuItem.prototype._init.call(this, params);
+        this.parent(params);

        this.label = new St.Label({ text: text });
        this.addActor(this.label);
    }
-};
+});

-function PopupSeparatorMenuItem() {
-    this._init();
-}
-
-PopupSeparatorMenuItem.prototype = {
-    __proto__: PopupBaseMenuItem.prototype,
+const PopupSeparatorMenuItem = new Lang.Class({
+    Name: 'PopupSeparatorMenuItem',
+    Extends: PopupBaseMenuItem,

    _init: function () {
-        PopupBaseMenuItem.prototype._init.call(this, { reactive: false });
+        this.parent({ reactive: false });

        this._drawingArea = new St.DrawingArea({ style_class: 'popup-separator-menu-item' });
        this.addActor(this._drawingArea, { span: -1, expand: true });
@ -429,22 +423,19 @@ PopupSeparatorMenuItem.prototype = {
        cr.rectangle(margin, gradientOffset, gradientWidth, gradientHeight);
        cr.fill();
    }
-};
+});

 const PopupAlternatingMenuItemState = {
    DEFAULT: 0,
    ALTERNATIVE: 1
 }

-function PopupAlternatingMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-PopupAlternatingMenuItem.prototype = {
-    __proto__: PopupBaseMenuItem.prototype,
+const PopupAlternatingMenuItem = new Lang.Class({
+    Name: 'PopupAlternatingMenuItem',
+    Extends: PopupBaseMenuItem,

    _init: function(text, alternateText, params) {
-        PopupBaseMenuItem.prototype._init.call(this, params);
+        this.parent(params);
        this.actor.add_style_class_name('popup-alternating-menu-item');

        this._text = text;
@ -530,17 +521,14 @@ PopupAlternatingMenuItem.prototype = {

        this._updateLabel();
    }
-};
+});

-function PopupSliderMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-PopupSliderMenuItem.prototype = {
-    __proto__: PopupBaseMenuItem.prototype,
+const PopupSliderMenuItem = new Lang.Class({
+    Name: 'PopupSliderMenuItem',
+    Extends: PopupBaseMenuItem,

    _init: function(value) {
-        PopupBaseMenuItem.prototype._init.call(this, { activate: false });
+        this.parent({ activate: false });

        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));

@ -716,13 +704,11 @@ PopupSliderMenuItem.prototype = {
        }
        return false;
    }
-};
+});

-function Switch() {
-    this._init.apply(this, arguments);
-}
+const Switch = new Lang.Class({
+    Name: 'Switch',

-Switch.prototype = {
    _init: function(state) {
        this.actor = new St.Bin({ style_class: 'toggle-switch' });
        // Translators: this MUST be either "toggle-switch-us"
@ -745,17 +731,14 @@ Switch.prototype = {
    toggle: function() {
        this.setToggleState(!this.state);
    }
-};
+});

-function PopupSwitchMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-PopupSwitchMenuItem.prototype = {
-    __proto__: PopupBaseMenuItem.prototype,
+const PopupSwitchMenuItem = new Lang.Class({
+    Name: 'PopupSwitchMenuItem',
+    Extends: PopupBaseMenuItem,

    _init: function(text, active, params) {
-        PopupBaseMenuItem.prototype._init.call(this, params);
+        this.parent(params);

        this.label = new St.Label({ text: text });
        this._switch = new Switch(active);
@ -790,7 +773,7 @@ PopupSwitchMenuItem.prototype = {
            this.toggle();
        }

-        PopupBaseMenuItem.prototype.activate.call(this, event);
+        this.parent(event);
    },

    toggle: function() {
@ -805,17 +788,14 @@ PopupSwitchMenuItem.prototype = {
    setToggleState: function(state) {
        this._switch.setToggleState(state);
    }
-};
+});

-function PopupImageMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-PopupImageMenuItem.prototype = {
-    __proto__: PopupBaseMenuItem.prototype,
+const PopupImageMenuItem = new Lang.Class({
+    Name: 'PopupImageMenuItem',
+    Extends: PopupBaseMenuItem,

    _init: function (text, iconName, params) {
-        PopupBaseMenuItem.prototype._init.call(this, params);
+        this.parent(params);

        this.label = new St.Label({ text: text });
        this.addActor(this.label);
@ -828,13 +808,12 @@ PopupImageMenuItem.prototype = {
    setIcon: function(name) {
        this._icon.icon_name = name;
    }
-};
+});

-function PopupMenuBase() {
-    throw new TypeError('Trying to instantiate abstract class PopupMenuBase');
-}
+const PopupMenuBase = new Lang.Class({
+    Name: 'PopupMenuBase',
+    Abstract: true,

-PopupMenuBase.prototype = {
    _init: function(sourceActor, styleClass) {
        this.sourceActor = sourceActor;

@ -960,7 +939,12 @@ PopupMenuBase.prototype = {
            this.emit('activate', menuItem);
            this.close(true);
        }));
-        menuItem.connect('destroy', Lang.bind(this, function(emitter) {
+        // the weird name is to avoid a conflict with some random property
+        // the menuItem may have, called destroyId
+        // (FIXME: in the future it may make sense to have container objects
+        // like PopupMenuManager does)
+        menuItem._popupMenuDestroyId = menuItem.connect('destroy', Lang.bind(this, function(menuItem) {
+            menuItem.disconnect(menuItem._popupMenuDestroyId);
            menuItem.disconnect(menuItem._activateId);
            menuItem.disconnect(menuItem._activeChangeId);
            menuItem.disconnect(menuItem._sensitiveChangeId);
@ -1139,18 +1123,15 @@ PopupMenuBase.prototype = {

        this.emit('destroy');
    }
-};
+});
 Signals.addSignalMethods(PopupMenuBase.prototype);

-function PopupMenu() {
-    this._init.apply(this, arguments);
-}
-
-PopupMenu.prototype = {
-    __proto__: PopupMenuBase.prototype,
+const PopupMenu = new Lang.Class({
+    Name: 'PopupMenu',
+    Extends: PopupMenuBase,

    _init: function(sourceActor, arrowAlignment, arrowSide) {
-        PopupMenuBase.prototype._init.call (this, sourceActor, 'popup-menu-content');
+        this.parent(sourceActor, 'popup-menu-content');

        this._arrowAlignment = arrowAlignment;
        this._arrowSide = arrowSide;
@ -1235,17 +1216,14 @@ PopupMenu.prototype = {
        this.isOpen = false;
        this.emit('open-state-changed', false);
    }
-};
+});

-function PopupSubMenu() {
-    this._init.apply(this, arguments);
-}
-
-PopupSubMenu.prototype = {
-    __proto__: PopupMenuBase.prototype,
+const PopupSubMenu = new Lang.Class({
+    Name: 'PopupSubMenu',
+    Extends: PopupMenuBase,

    _init: function(sourceActor, sourceArrow) {
-        PopupMenuBase.prototype._init.call(this, sourceActor);
+        this.parent(sourceActor);

        this._arrow = sourceArrow;
        this._arrow.rotation_center_z_gravity = Clutter.Gravity.CENTER;
@ -1400,7 +1378,7 @@ PopupSubMenu.prototype = {

        return false;
    }
-};
+});

 /**
 * PopupMenuSection:
@ -1410,36 +1388,41 @@ PopupSubMenu.prototype = {
 * can add it to another menu), but is completely transparent
 * to the user
 */
-function PopupMenuSection() {
-    this._init.apply(this, arguments);
-}
-
-PopupMenuSection.prototype = {
-    __proto__: PopupMenuBase.prototype,
+const PopupMenuSection = new Lang.Class({
+    Name: 'PopupMenuSection',
+    Extends: PopupMenuBase,

    _init: function() {
-        PopupMenuBase.prototype._init.call(this);
+        this.parent();

        this.actor = this.box;
        this.actor._delegate = this;
        this.isOpen = true;
+
+        // an array of externally managed separators
+        this.separators = [];
    },

    // deliberately ignore any attempt to open() or close(), but emit the
    // corresponding signal so children can still pick it up
    open: function(animate) { this.emit('open-state-changed', true); },
    close: function() { this.emit('open-state-changed', false); },
-}

-function PopupSubMenuMenuItem() {
-    this._init.apply(this, arguments);
-}
+    destroy: function() {
+        for (let i = 0; i < this.separators.length; i++)
+            this.separators[i].destroy();
+        this.separators = [];

-PopupSubMenuMenuItem.prototype = {
-    __proto__: PopupBaseMenuItem.prototype,
+        this.parent();
+    }
+});
+
+const PopupSubMenuMenuItem = new Lang.Class({
+    Name: 'PopupSubMenuMenuItem',
+    Extends: PopupBaseMenuItem,

    _init: function(text) {
-        PopupBaseMenuItem.prototype._init.call(this);
+        this.parent();

        this.actor.add_style_class_name('popup-submenu-menu-item');

@ -1461,7 +1444,8 @@ PopupSubMenuMenuItem.prototype = {

    destroy: function() {
        this.menu.destroy();
-        PopupBaseMenuItem.prototype.destroy.call(this);
+
+        this.parent();
    },

    _onKeyPressEvent: function(actor, event) {
@ -1476,7 +1460,7 @@ PopupSubMenuMenuItem.prototype = {
            return true;
        }

-        return PopupBaseMenuItem.prototype._onKeyPressEvent.call(this, actor, event);
+        return this.parent(actor, event);
    },

    activate: function(event) {
@ -1486,18 +1470,15 @@ PopupSubMenuMenuItem.prototype = {
    _onButtonReleaseEvent: function(actor) {
        this.menu.toggle();
    }
-};
+});

-function PopupComboMenu() {
-    this._init.apply(this, arguments);
-}
-
-PopupComboMenu.prototype = {
-    __proto__: PopupMenuBase.prototype,
+const PopupComboMenu = new Lang.Class({
+    Name: 'PopupComboMenu',
+    Extends: PopupMenuBase,

    _init: function(sourceActor) {
-        PopupMenuBase.prototype._init.call(this,
-                                           sourceActor, 'popup-combo-menu');
+        this.parent(sourceActor, 'popup-combo-menu');
+
        this.actor = this.box;
        this.actor._delegate = this;
        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
@ -1602,17 +1583,14 @@ PopupComboMenu.prototype = {
    getItemVisible: function(position) {
        return this._getMenuItems()[position].actor.visible;
    }
-};
+});

-function PopupComboBoxMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-PopupComboBoxMenuItem.prototype = {
-    __proto__: PopupBaseMenuItem.prototype,
+const PopupComboBoxMenuItem = new Lang.Class({
+    Name: 'PopupComboBoxMenuItem',
+    Extends: PopupBaseMenuItem,

    _init: function (params) {
-        PopupBaseMenuItem.prototype._init.call(this, params);
+        this.parent(params);

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

 /* Basic implementation of a menu manager.
 * Call addMenu to add menus
 */
-function PopupMenuManager(owner) {
-    this._init(owner);
-}
+const PopupMenuManager = new Lang.Class({
+    Name: 'PopupMenuManager',

-PopupMenuManager.prototype = {
    _init: function(owner) {
        this._owner = owner;
        this.grabbed = false;
@ -2011,4 +2249,4 @@ PopupMenuManager.prototype = {
        if (this._activeMenu != null)
            this._activeMenu.close(true);
    }
-};
+});
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -30,11 +30,9 @@ const EXEC_ARG_KEY = 'exec-arg';

 const DIALOG_GROW_TIME = 0.1;

-function CommandCompleter() {
-    this._init();
-}
+const CommandCompleter = new Lang.Class({
+    Name: 'CommandCompleter',

-CommandCompleter.prototype = {
    _init : function() {
        this._changedCount = 0;
        this._paths = GLib.getenv('PATH').split(':');
@ -162,16 +160,14 @@ CommandCompleter.prototype = {
            return common.substr(text.length);
        return common;
    }
-};
+});

-function RunDialog() {
-    this._init();
-}
+const RunDialog = new Lang.Class({
+    Name: 'RunDialog',
+    Extends: ModalDialog.ModalDialog,

-RunDialog.prototype = {
-__proto__: ModalDialog.ModalDialog.prototype,
    _init : function() {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'run-dialog' });
+        this.parent({ styleClass: 'run-dialog' });

        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
        this._terminalSettings = new Gio.Settings({ schema: TERMINAL_SCHEMA });
@ -384,8 +380,7 @@ __proto__: ModalDialog.ModalDialog.prototype,
        if (this._lockdownSettings.get_boolean(DISABLE_COMMAND_LINE_KEY))
            return;

-        ModalDialog.ModalDialog.prototype.open.call(this);
+        this.parent();
    },
-
-};
+});
 Signals.addSignalMethods(RunDialog.prototype);
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -23,11 +23,9 @@ const MatchType = {
    MULTIPLE_PREFIX: 4
 };

-function SearchResultDisplay(provider) {
-    this._init(provider);
-}
+const SearchResultDisplay = new Lang.Class({
+    Name: 'SearchResultDisplay',

-SearchResultDisplay.prototype = {
    _init: function(provider) {
        this.provider = provider;
        this.actor = null;
@ -96,7 +94,7 @@ SearchResultDisplay.prototype = {
    activateSelected: function() {
        throw new Error('Not implemented');
    }
-};
+});

 /**
 * SearchProvider:
@ -105,11 +103,9 @@ SearchResultDisplay.prototype = {
 * to the search system, then call registerProvider()
 * in SearchSystem with an instance.
 */
-function SearchProvider(title) {
-    this._init(title);
-}
+const SearchProvider = new Lang.Class({
+    Name: 'SearchProvider',

-SearchProvider.prototype = {
    _init: function(title) {
        this.title = title;
        this.searchSystem = null;
@ -243,14 +239,12 @@ SearchProvider.prototype = {
    activateResult: function(id) {
        throw new Error('Not implemented');
    }
-};
+});
 Signals.addSignalMethods(SearchProvider.prototype);

-function OpenSearchSystem() {
-    this._init();
-}
+const OpenSearchSystem = new Lang.Class({
+    Name: 'OpenSearchSystem',

-OpenSearchSystem.prototype = {
    _init: function() {
        this._providers = [];
        global.settings.connect('changed::' + DISABLED_OPEN_SEARCH_PROVIDERS_KEY, Lang.bind(this, this._refresh));
@ -338,14 +332,12 @@ OpenSearchSystem.prototype = {
            }
        }));
    }
-}
+});
 Signals.addSignalMethods(OpenSearchSystem.prototype);

-function SearchSystem() {
-    this._init();
-}
+const SearchSystem = new Lang.Class({
+    Name: 'SearchSystem',

-SearchSystem.prototype = {
    _init: function() {
        this._providers = [];
        this.reset();
@ -433,5 +425,5 @@ SearchSystem.prototype = {
        this._previousResults = results;
        this.emit('search-completed', results);
    },
-};
+});
 Signals.addSignalMethods(SearchSystem.prototype);
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@ -15,11 +15,9 @@ const Search = imports.ui.search;
 const MAX_SEARCH_RESULTS_ROWS = 1;


-function SearchResult(provider, metaInfo, terms) {
-    this._init(provider, metaInfo, terms);
-}
+const SearchResult = new Lang.Class({
+    Name: 'SearchResult',

-SearchResult.prototype = {
    _init: function(provider, metaInfo, terms) {
        this.provider = provider;
        this.metaInfo = metaInfo;
@ -97,18 +95,16 @@ SearchResult.prototype = {
        else
            this.provider.activateResult(this.metaInfo.id, params);
    }
-};
+});


-function GridSearchResults(provider, grid) {
-    this._init(provider, grid);
-}
-
-GridSearchResults.prototype = {
-    __proto__: Search.SearchResultDisplay.prototype,
+const GridSearchResults = new Lang.Class({
+    Name: 'GridSearchResults',
+    Extends: Search.SearchResultDisplay,

    _init: function(provider, grid) {
-        Search.SearchResultDisplay.prototype._init.call(this, provider);
+        this.parent(provider);
+
        this._grid = grid || new IconGrid.IconGrid({ rowLimit: MAX_SEARCH_RESULTS_ROWS,
                                                     xAlign: St.Align.START });
        this.actor = new St.Bin({ x_align: St.Align.START });
@ -179,14 +175,11 @@ GridSearchResults.prototype = {
        let targetActor = this._grid.getItemAtIndex(this.selectionIndex);
        targetActor._delegate.activate();
    }
-};
+});

+const SearchResults = new Lang.Class({
+    Name: 'SearchResults',

-function SearchResults(searchSystem, openSearchSystem) {
-    this._init(searchSystem, openSearchSystem);
-}
-
-SearchResults.prototype = {
    _init: function(searchSystem, openSearchSystem) {
        this._searchSystem = searchSystem;
        this._searchSystem.connect('search-updated', Lang.bind(this, this._updateCurrentResults));
@ -486,4 +479,4 @@ SearchResults.prototype = {
        resultDisplay.activateSelected();
        Main.overview.hide();
    }
-};
+});
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@ -66,11 +66,9 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
 </signal>
 </interface>;

-function GnomeShell() {
-    this._init();
-}
+const GnomeShell = new Lang.Class({
+    Name: 'GnomeShellDBus',

-GnomeShell.prototype = {
    _init: function() {
        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellIface, this);
        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell');
@ -124,8 +122,13 @@ GnomeShell.prototype = {
     * indicating whether the operation was successful or not.
     *
     */
-    ScreenshotAreaAsync : function (x, y, width, height, filename, callback) {
-        global.screenshot_area (x, y, width, height, filename, function (obj, result) { callback(result); });
+    ScreenshotAreaAsync : function (params, invocation) {
+        let [x, y, width, height, filename, callback] = params;
+        global.screenshot_area (x, y, width, height, filename,
+            function (obj, result) {
+                let retval = GLib.Variant.new('(b)', [result]);
+                invocation.return_value(retval);
+            });
    },

    /**
@ -151,12 +154,17 @@ GnomeShell.prototype = {
     * indicating whether the operation was successful or not.
     *
     */
-    ScreenshotAsync : function (filename, callback) {
-        global.screenshot(filename, function (obj, result) { callback(result); });
+    ScreenshotAsync : function (params, invocation) {
+        let [filename] = params;
+        global.screenshot(filename,
+            function (obj, result) {
+                let retval = GLib.Variant.new('(b)', [result]);
+                invocation.return_value(retval);
+            });
    },

    ListExtensions: function() {
-        let out;
+        let out = {};
        for (let uuid in ExtensionSystem.extensionMeta) {
            let dbusObj = this.GetExtensionInfo(uuid);
            out[uuid] = dbusObj;
@ -166,19 +174,19 @@ GnomeShell.prototype = {

    GetExtensionInfo: function(uuid) {
        let meta = ExtensionSystem.extensionMeta[uuid] || {};
-        let out;
+        let out = {};
        for (let key in meta) {
            let val = meta[key];
            let type;
            switch (typeof val) {
-            case 'object':
-                throw Error('Extension had a nested object in the metadata. This is not supported');
            case 'string':
                type = 's';
                break;
            case 'number':
                type = 'd';
                break;
+            default:
+                continue;
            }
            out[key] = GLib.Variant.new(type, val);
        }
@ -230,4 +238,4 @@ GnomeShell.prototype = {
        this._dbusImpl.emit_signal('ExtensionStatusChanged',
                                   GLib.Variant.new('(sis)', [newState.uuid, newState.state, newState.error]));
    }
-};
+});
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@ -7,18 +7,14 @@ const Main = imports.ui.main;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;

-
-function _EntryMenu(entry, params) {
-    this._init(entry, params);
-};
-
-_EntryMenu.prototype = {
-    __proto__: PopupMenu.PopupMenu.prototype,
+const _EntryMenu = new Lang.Class({
+    Name: 'ShellEntryMenu',
+    Extends: PopupMenu.PopupMenu,

    _init: function(entry, params) {
        params = Params.parse (params, { isPassword: false });

-        PopupMenu.PopupMenu.prototype._init.call(this, entry, 0, St.Side.TOP);
+        this.parent(entry, 0, St.Side.TOP);

        this.actor.add_style_class_name('entry-context-menu');

@ -60,7 +56,7 @@ _EntryMenu.prototype = {
        if (!this.actor.navigate_focus(null, direction, false))
            this.actor.grab_key_focus();

-        PopupMenu.PopupMenu.prototype.open.call(this);
+        this.parent();
    },

    _updateCopyItem: function() {
@ -103,8 +99,7 @@ _EntryMenu.prototype = {
        let visible = !!(this._entry.clutter_text.password_char);
        this._entry.clutter_text.set_password_char(visible ? '' : '\u25cf');
    }
-};
-
+});

 function _setMenuAlignment(entry, stageX) {
    let [success, entryX, entryY] = entry.transform_stage_point(stageX, 0);
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@ -50,11 +50,9 @@ function _setLabelsForMessage(dialog, message) {

 /* -------------------------------------------------------- */

-function ListItem(app) {
-    this._init(app);
-}
+const ListItem = new Lang.Class({
+    Name: 'ListItem',

-ListItem.prototype = {
    _init: function(app) {
        this._app = app;

@ -86,14 +84,12 @@ ListItem.prototype = {
        this.emit('activate');
        this._app.activate();
    }
-};
+});
 Signals.addSignalMethods(ListItem.prototype);

-function ShellMountOperation(source, params) {
-    this._init(source, params);
-}
+const ShellMountOperation = new Lang.Class({
+    Name: 'ShellMountOperation',

-ShellMountOperation.prototype = {
    _init: function(source, params) {
        params = Params.parse(params, { reaskPassword: false });

@ -190,17 +186,14 @@ ShellMountOperation.prototype = {

        this._processesDialog.update(message, processes, choices);
    },
-}
+});

-function ShellMountQuestionDialog(icon) {
-    this._init(icon);
-}
-
-ShellMountQuestionDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
+const ShellMountQuestionDialog = new Lang.Class({
+    Name: 'ShellMountQuestionDialog',
+    Extends: ModalDialog.ModalDialog,

    _init: function(icon) {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'mount-question-dialog' });
+        this.parent({ styleClass: 'mount-question-dialog' });

        let mainContentLayout = new St.BoxLayout();
        this.contentLayout.add(mainContentLayout, { x_fill: true,
@ -236,19 +229,16 @@ ShellMountQuestionDialog.prototype = {
        _setLabelsForMessage(this, message);
        _setButtonsForChoices(this, choices);
    }
-}
+});
 Signals.addSignalMethods(ShellMountQuestionDialog.prototype);

-function ShellMountPasswordSource(message, icon, reaskPassword) {
-    this._init(message, icon, reaskPassword);
-}
-
-ShellMountPasswordSource.prototype = {
-    __proto__: MessageTray.Source.prototype,
+const ShellMountPasswordSource = new Lang.Class({
+    Name: 'ShellMountPasswordSource',
+    Extends: MessageTray.Source,

    _init: function(message, icon, reaskPassword) {
        let strings = message.split('\n');
-        MessageTray.Source.prototype._init.call(this, strings[0]);
+        this.parent(strings[0]);

        this._notification = new ShellMountPasswordNotification(this, strings, icon, reaskPassword);

@ -256,21 +246,15 @@ ShellMountPasswordSource.prototype = {
        Main.messageTray.add(this);
        this.notify(this._notification);
    },
-}
+});
 Signals.addSignalMethods(ShellMountPasswordSource.prototype);

-function ShellMountPasswordNotification(source, strings, icon, reaskPassword) {
-    this._init(source, strings, icon, reaskPassword);
-}
-
-ShellMountPasswordNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const ShellMountPasswordNotification = new Lang.Class({
+    Name: 'ShellMountPasswordNotification',
+    Extends: MessageTray.Notification,

    _init: function(source, strings, icon, reaskPassword) {
-        MessageTray.Notification.prototype._init.call(this, source,
-                                                      strings[0], null,
-                                                      { customContent: true,
-                                                        icon: icon });
+        this.parent(source, strings[0], null, { customContent: true, icon: icon });

        // set the notification to transient and urgent, so that it
        // expands out
@ -305,17 +289,14 @@ ShellMountPasswordNotification.prototype = {

        this.source.emit('password-ready', text);
    }
-}
+});

-function ShellProcessesDialog(icon) {
-    this._init(icon);
-}
-
-ShellProcessesDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
+const ShellProcessesDialog = new Lang.Class({
+    Name: 'ShellProcessesDialog',
+    Extends: ModalDialog.ModalDialog,

    _init: function(icon) {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'show-processes-dialog' });
+        this.parent({ styleClass: 'show-processes-dialog' });

        let mainContentLayout = new St.BoxLayout();
        this.contentLayout.add(mainContentLayout, { x_fill: true,
@ -401,5 +382,5 @@ ShellProcessesDialog.prototype = {
        _setLabelsForMessage(this, message);
        _setButtonsForChoices(this, choices);
    }
-}
+});
 Signals.addSignalMethods(ShellProcessesDialog.prototype);
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@ -1,6 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const DBus = imports.dbus;
 const GDesktopEnums = imports.gi.GDesktopEnums;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
@ -40,15 +39,12 @@ const KEY_TEXT_SCALING_FACTOR = 'text-scaling-factor';

 const HIGH_CONTRAST_THEME = 'HighContrast';

-function ATIndicator() {
-    this._init.apply(this, arguments);
-}
-
-ATIndicator.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
+const ATIndicator = new Lang.Class({
+    Name: 'ATIndicator',
+    Extends: PanelMenu.SystemStatusButton,

    _init: function() {
-        PanelMenu.SystemStatusButton.prototype._init.call(this, 'preferences-desktop-accessibility', null);
+        this.parent('preferences-desktop-accessibility', null);

        let highContrast = this._buildHCItem();
        this.menu.addMenuItem(highContrast);
@ -172,5 +168,4 @@ ATIndicator.prototype = {
        });
        return widget;
    }
-};
-Signals.addSignalMethods(ATIndicator.prototype);
+});
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@ -23,17 +23,13 @@ const ConnectionState = {
    CONNECTING: 3
 }

-function Indicator() {
-    this._init.apply(this, arguments);
-}
-
-Indicator.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
+const Indicator = new Lang.Class({
+    Name: 'BTIndicator',
+    Extends: PanelMenu.SystemStatusButton,

    _init: function() {
-        PanelMenu.SystemStatusButton.prototype._init.call(this, 'bluetooth-disabled', null);
+        this.parent('bluetooth-disabled', null);

-        GLib.spawn_command_line_sync ('pkill -f "^bluetooth-applet$"');
        this._applet = new GnomeBluetoothApplet.Applet();

        this._killswitch = new PopupMenu.PopupSwitchMenuItem(_("Bluetooth"), false);
@ -335,17 +331,14 @@ Indicator.prototype = {
    _cancelRequest: function() {
        this._source.destroy();
    }
-}
+});

-function Source() {
-    this._init.apply(this, arguments);
-}
-
-Source.prototype = {
-    __proto__: MessageTray.Source.prototype,
+const Source = new Lang.Class({
+    Name: 'BluetoothSource',
+    Extends: MessageTray.Source,

    _init: function() {
-        MessageTray.Source.prototype._init.call(this, _("Bluetooth"));
+        this.parent(_("Bluetooth"));

        this._setSummaryIcon(this.createNotificationIcon());
    },
@ -359,7 +352,7 @@ Source.prototype = {
            }
        }));

-        MessageTray.Source.prototype.notify.call(this, notification);
+        this.parent(notification);
    },

    createNotificationIcon: function() {
@ -367,21 +360,17 @@ Source.prototype = {
                             icon_type: St.IconType.SYMBOLIC,
                             icon_size: this.ICON_SIZE });
    }
-}
+});

-function AuthNotification() {
-    this._init.apply(this, arguments);
-}
-
-AuthNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const AuthNotification = new Lang.Class({
+    Name: 'AuthNotification',
+    Extends: MessageTray.Notification,

    _init: function(source, applet, device_path, name, long_name, uuid) {
-        MessageTray.Notification.prototype._init.call(this,
-                                                      source,
-                                                      _("Bluetooth"),
-                                                      _("Authorization request from %s").format(name),
-                                                      { customContent: true });
+        this.parent(source,
+                    _("Bluetooth"),
+                    _("Authorization request from %s").format(name),
+                    { customContent: true });
        this.setResident(true);

        this._applet = applet;
@ -407,21 +396,17 @@ AuthNotification.prototype = {
            this.destroy();
        }));
    }
-}
+});

-function ConfirmNotification() {
-    this._init.apply(this, arguments);
-}
-
-ConfirmNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const ConfirmNotification = new Lang.Class({
+    Name: 'ConfirmNotification',
+    Extends: MessageTray.Notification,

    _init: function(source, applet, device_path, name, long_name, pin) {
-        MessageTray.Notification.prototype._init.call(this,
-                                                      source,
-                                                      _("Bluetooth"),
-                                                      _("Pairing confirmation for %s").format(name),
-                                                      { customContent: true });
+        this.parent(source,
+                    _("Bluetooth"),
+                    _("Pairing confirmation for %s").format(name),
+                    { customContent: true });
        this.setResident(true);

        this._applet = applet;
@ -440,21 +425,17 @@ ConfirmNotification.prototype = {
            this.destroy();
        }));
    }
-}
+});

-function PinNotification() {
-    this._init.apply(this, arguments);
-}
-
-PinNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const PinNotification = new Lang.Class({
+    Name: 'PinNotification',
+    Extends: MessageTray.Notification,

    _init: function(source, applet, device_path, name, long_name, numeric) {
-        MessageTray.Notification.prototype._init.call(this,
-                                                      source,
-                                                      _("Bluetooth"),
-                                                      _("Pairing request for %s").format(name),
-                                                      { customContent: true });
+        this.parent(source,
+                    _("Bluetooth"),
+                    _("Pairing request for %s").format(name),
+                    { customContent: true });
        this.setResident(true);

        this._applet = applet;
@ -503,7 +484,7 @@ PinNotification.prototype = {
    },

    grabFocus: function(lockTray) {
-        MessageTray.Notification.prototype.grabFocus.call(this, lockTray);
+        this.parent(lockTray);
        global.stage.set_key_focus(this._entry);
    }
-}
+});
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -14,15 +14,12 @@ const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
 const Util = imports.misc.util;

-function LayoutMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-LayoutMenuItem.prototype = {
-    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+const LayoutMenuItem = new Lang.Class({
+    Name: 'LayoutMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,

    _init: function(config, id, indicator, long_name) {
-        PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
+        this.parent();

        this._config = config;
        this._id = id;
@ -33,20 +30,18 @@ LayoutMenuItem.prototype = {
    },

    activate: function(event) {
-        PopupMenu.PopupBaseMenuItem.prototype.activate.call(this);
+        this.parent(event);
+
        this._config.lock_group(this._id);
    }
-};
+});

-function XKBIndicator() {
-    this._init.call(this);
-}
-
-XKBIndicator.prototype = {
-    __proto__: PanelMenu.Button.prototype,
+const XKBIndicator = new Lang.Class({
+    Name: 'XKBIndicator',
+    Extends: PanelMenu.Button,

    _init: function() {
-        PanelMenu.Button.prototype._init.call(this, St.Align.START);
+        this.parent(0.0);

        this._container = new Shell.GenericContainer();
        this._container.connect('get-preferred-width', Lang.bind(this, this._containerGetPreferredWidth));
@ -221,4 +216,4 @@ XKBIndicator.prototype = {
        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
@ -97,15 +97,12 @@ function ssidToLabel(ssid) {
    return label;
 }

-function NMNetworkMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-NMNetworkMenuItem.prototype = {
-    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+const NMNetworkMenuItem = new Lang.Class({
+    Name: 'NMNetworkMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,

    _init: function(accessPoints, title, params) {
-        PopupMenu.PopupBaseMenuItem.prototype._init.call(this, params);
+        this.parent(params);

        accessPoints = sortAccessPoints(accessPoints);
        this.bestAP = accessPoints[0];
@ -184,21 +181,18 @@ NMNetworkMenuItem.prototype = {
            apObj.updateId = 0;
        }

-        PopupMenu.PopupBaseMenuItem.prototype.destroy.call(this);
+        this.parent();
    }
-};
+});

-function NMWiredSectionTitleMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-NMWiredSectionTitleMenuItem.prototype = {
-    __proto__: PopupMenu.PopupSwitchMenuItem.prototype,
+const NMWiredSectionTitleMenuItem = new Lang.Class({
+    Name: 'NMWiredSectionTitleMenuItem',
+    Extends: PopupMenu.PopupSwitchMenuItem,

    _init: function(label, params) {
        params = params || { };
        params.style_class = 'popup-subtitle-menu-item';
-        PopupMenu.PopupSwitchMenuItem.prototype._init.call(this, label, false, params);
+        this.parent(label, false, params);
    },

    updateForDevice: function(device) {
@ -211,7 +205,7 @@ NMWiredSectionTitleMenuItem.prototype = {
    },

    activate: function(event) {
-        PopupMenu.PopupSwitchMenuItem.prototype.activate.call(this, event);
+        this.parent(event);

        if (!this._device) {
            log('Section title activated when there is more than one device, should be non reactive');
@ -230,19 +224,16 @@ NMWiredSectionTitleMenuItem.prototype = {
        else
            this._device.deactivate();
    }
-};
+});

-function NMWirelessSectionTitleMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-NMWirelessSectionTitleMenuItem.prototype = {
-    __proto__: PopupMenu.PopupSwitchMenuItem.prototype,
+const NMWirelessSectionTitleMenuItem = new Lang.Class({
+    Name: 'NMWirelessSectionTitleMenuItem',
+    Extends: PopupMenu.PopupSwitchMenuItem,

    _init: function(client, property, title, params) {
        params = params || { };
        params.style_class = 'popup-subtitle-menu-item';
-        PopupMenu.PopupSwitchMenuItem.prototype._init.call(this, title, false, params);
+        this.parent(title, false, params);

        this._client = client;
        this._property = property + '_enabled';
@ -258,9 +249,11 @@ NMWirelessSectionTitleMenuItem.prototype = {
    updateForDevice: function(device) {
        // we show the switch
        // - if there not just one device
-        // - if the switch is off
+        // - if the switch is off (but it can be turned on)
        // - if the device is activated or disconnected
-        if (device && this._softwareEnabled && this._hardwareEnabled) {
+        if (!this._hardwareEnabled) {
+            this.setStatus(_("hardware disabled"));
+        } else if (device && this._softwareEnabled) {
            let text = device.getStatusLabel();
            this.setStatus(text);
        } else
@ -268,7 +261,7 @@ NMWirelessSectionTitleMenuItem.prototype = {
    },

    activate: function(event) {
-        PopupMenu.PopupSwitchMenuItem.prototype.activate.call(this, event);
+        this.parent(event);

        this._client[this._setEnabledFunc](this._switch.state);
    },
@ -285,13 +278,12 @@ NMWirelessSectionTitleMenuItem.prototype = {

        this.emit('enabled-changed', enabled);
    }
-};
+});

-function NMDevice() {
-    throw new TypeError('Instantanting abstract class NMDevice');
-}
+const NMDevice = new Lang.Class({
+    Name: 'NMDevice',
+    Abstract: true,

-NMDevice.prototype = {
    _init: function(client, device, connections) {
        this.device = device;
        if (device) {
@ -337,7 +329,7 @@ NMDevice.prototype = {
        }
        this.section = new PopupMenu.PopupMenuSection();

-        this._createSection();
+        this._deferredWorkId = Main.initializeDeferredWork(this.section.actor, Lang.bind(this, this._createSection));
    },

    destroy: function() {
@ -404,16 +396,29 @@ NMDevice.prototype = {
        this._activeConnection = activeConnection;

        this._clearSection();
-        this._createSection();
+        this._queueCreateSection();
    },

    checkConnection: function(connection) {
-        let exists = this._findConnection(connection._uuid) != -1;
+        let pos = this._findConnection(connection._uuid);
+        let exists = pos != -1;
        let valid = this.connectionValid(connection);
+
        if (exists && !valid)
            this.removeConnection(connection);
        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) {
@ -428,7 +433,7 @@ NMDevice.prototype = {
        this._connections.sort(this._connectionSortFunction);

        this._clearSection();
-        this._createSection();
+        this._queueCreateSection();
    },

    removeConnection: function(connection) {
@ -452,7 +457,7 @@ NMDevice.prototype = {
            // (or in the case of NMDeviceWired, we want to hide
            // the only explicit connection)
            this._clearSection();
-            this._createSection();
+            this._queueCreateSection();
        }
    },

@ -536,6 +541,11 @@ NMDevice.prototype = {
        return -1;
    },

+    _queueCreateSection: function() {
+        this._clearSection();
+        Main.queueDeferredWork(this._deferredWorkId);
+    },
+
    _clearSection: function() {
        // Clear everything
        this.section.removeAll();
@ -630,7 +640,7 @@ NMDevice.prototype = {
        this._updateStatusItem();

        this._clearSection();
-        this._createSection();
+        this._queueCreateSection();
        this.emit('state-changed');
    },

@ -673,26 +683,23 @@ NMDevice.prototype = {

        return out;
    }
-};
+});
 Signals.addSignalMethods(NMDevice.prototype);


-function NMDeviceWired() {
-    this._init.apply(this, arguments);
-}
-
-NMDeviceWired.prototype = {
-    __proto__: NMDevice.prototype,
+const NMDeviceWired = new Lang.Class({
+    Name: 'NMDeviceWired',
+    Extends: NMDevice,

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

-        NMDevice.prototype._init.call(this, client, device, connections);
+        this.parent(client, device, connections);
    },

    _createSection: function() {
-        NMDevice.prototype._createSection.call(this);
+        this.parent();

        // if we have only one connection (normal or automatic)
        // we hide the connection list, and use the switch to control
@ -717,14 +724,11 @@ NMDeviceWired.prototype = {
        }));
        return connection;
    }
-};
+});

-function NMDeviceModem() {
-    this._init.apply(this, arguments);
-}
-
-NMDeviceModem.prototype = {
-    __proto__: NMDevice.prototype,
+const NMDeviceModem = new Lang.Class({
+    Name: 'NMDeviceModem',
+    Extends: NMDevice,

    _init: function(client, device, connections) {
        let is_wwan = false;
@ -773,7 +777,7 @@ NMDeviceModem.prototype = {
            }));
        }

-        NMDevice.prototype._init.call(this, client, device, connections);
+        this.parent(client, device, connections);
    },

    setEnabled: function(enabled) {
@ -786,7 +790,7 @@ NMDeviceModem.prototype = {
                this.statusItem.setStatus(this.getStatusLabel());
        }

-        NMDevice.prototype.setEnabled.call(this, enabled);
+        this.parent(enabled);
    },

    get connected() {
@ -803,7 +807,7 @@ NMDeviceModem.prototype = {
            this._signalQualityId = 0;
        }

-        NMDevice.prototype.destroy.call(this);
+        this.parent();
    },

    _getSignalIcon: function() {
@ -824,13 +828,13 @@ NMDeviceModem.prototype = {
            this.section.addMenuItem(this._operatorItem);
        }

-        NMDevice.prototype._createSection.call(this);
+        this.parent();
    },

    _clearSection: function() {
        this._operatorItem = null;

-        NMDevice.prototype._clearSection.call(this);
+        this.parent();
    },

    _createAutomaticConnection: function() {
@ -840,14 +844,11 @@ NMDeviceModem.prototype = {
                    'connect-3g', this.device.get_path()]);
        return null;
    }
-};
+});

-function NMDeviceBluetooth() {
-    this._init.apply(this, arguments);
-}
-
-NMDeviceBluetooth.prototype = {
-    __proto__: NMDevice.prototype,
+const NMDeviceBluetooth = new Lang.Class({
+    Name: 'NMDeviceBluetooth',
+    Extends: NMDevice,

    _init: function(client, device, connections) {
        this._autoConnectionName = this._makeConnectionName(device);
@ -855,7 +856,7 @@ NMDeviceBluetooth.prototype = {

        this.category = NMConnectionCategory.WWAN;

-        NMDevice.prototype._init.call(this, client, device, connections);
+        this.parent(client, device, connections);
    },

    _createAutomaticConnection: function() {
@ -883,25 +884,27 @@ NMDeviceBluetooth.prototype = {
        this._autoConnectionName = this._makeConnectionName(this.device);

        this._clearSection();
-        this._createSection();
+        this._queueCreateSection();
+        this._updateStatusItem();
+    },
+
+    _getDescription: function() {
+        return this.device.name || _("Bluetooth");
    }
-};
+});


 // Not a real device, but I save a lot code this way
-function NMDeviceVPN() {
-    this._init.apply(this, arguments);
-}
-
-NMDeviceVPN.prototype = {
-    __proto__: NMDevice.prototype,
+const NMDeviceVPN = new Lang.Class({
+    Name: 'NMDeviceVPN',
+    Extends: NMDevice,

    _init: function(client) {
        // Disable autoconnections
        this._autoConnectionName = null;
        this.category = NMConnectionCategory.VPN;

-        NMDevice.prototype._init.call(this, client, null, [ ]);
+        this.parent(client, null, [ ]);
    },

    connectionValid: function(connection) {
@ -917,7 +920,7 @@ NMDeviceVPN.prototype = {
    },

    setActiveConnection: function(activeConnection) {
-        NMDevice.prototype.setActiveConnection.call(this, activeConnection);
+        this.parent(activeConnection);

        this.emit('active-connection-changed');
    },
@ -934,14 +937,11 @@ NMDeviceVPN.prototype = {
    getStatusLabel: function() {
        return null;
    }
-};
+});

-function NMDeviceWireless() {
-    this._init.apply(this, arguments);
-}
-
-NMDeviceWireless.prototype = {
-    __proto__: NMDevice.prototype,
+const NMDeviceWireless = new Lang.Class({
+    Name: 'NMDeviceWireless',
+    Extends: NMDevice,

    _init: function(client, device, connections) {
        this.category = NMConnectionCategory.WIRELESS;
@ -1013,7 +1013,7 @@ NMDeviceWireless.prototype = {
        this._apAddedId = device.connect('access-point-added', Lang.bind(this, this._accessPointAdded));
        this._apRemovedId = device.connect('access-point-removed', Lang.bind(this, this._accessPointRemoved));

-        NMDevice.prototype._init.call(this, client, device, validConnections);
+        this.parent(client, device, validConnections);
    },

    destroy: function() {
@ -1033,7 +1033,7 @@ NMDeviceWireless.prototype = {
            this._apRemovedId = 0;
        }

-        NMDevice.prototype.destroy.call(this);
+        this.parent();
    },

    setEnabled: function(enabled) {
@ -1234,7 +1234,6 @@ NMDeviceWireless.prototype = {
                      accessPoints: [ accessPoint ]
                    };
            apObj.ssidText = ssidToLabel(apObj.ssid);
-            needsupdate = true;
        }

        // check if this enables new connections for this group
@ -1249,37 +1248,13 @@ NMDeviceWireless.prototype = {
            }
        }

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

-            if (this._networks.length == 0) {
-                // only network in the list
-                this._networks.push(apObj);
-                this._clearSection();
-                this._createSection();
-                return;
-            }
-
-            // skip networks that should appear earlier
-            let menuPos = 0;
-            for (pos = 0;
-                 pos < this._networks.length &&
-                 this._networkSortFunction(this._networks[pos], apObj) < 0; ++pos) {
-                if (this._networks[pos] != this._activeNetwork)
-                    menuPos++;
-            }
-
-            // (re-)add the network
-            this._networks.splice(pos, 0, apObj);
-
-            if (this._shouldShowConnectionList()) {
-                menuPos += (this._activeConnectionItem ? 1 : 0);
-                this._createNetworkItem(apObj, menuPos);
-            }
+            this._clearSection();
+            this._queueCreateSection();
        }
    },

@ -1347,7 +1322,7 @@ NMDeviceWireless.prototype = {
    },

    _clearSection: function() {
-        NMDevice.prototype._clearSection.call(this);
+        this.parent();

        for (let i = 0; i < this._networks.length; i++)
            this._networks[i].item = null;
@ -1366,7 +1341,7 @@ NMDeviceWireless.prototype = {
        let obj = this._connections[pos];
        this._connections.splice(pos, 1);

-        let anyauto = false, forceupdate = false;
+        let forceupdate = false;
        for (let i = 0; i < this._networks.length; i++) {
            let apObj = this._networks[i];
            let connections = apObj.connections;
@ -1374,16 +1349,14 @@ NMDeviceWireless.prototype = {
                if (connections[k]._uuid == connection._uuid) {
                    // remove the connection from the access point group
                    connections.splice(k);
-                    anyauto = connections.length == 0;
+                    forceupdate = forceupdate || connections.length == 0;

-                    if (anyauto) {
-                        // this potentially changes the sorting order
-                        forceupdate = true;
+                    if (forceupdate)
                        break;
-                    }
+
                    if (apObj.item) {
                        if (apObj.item instanceof PopupMenu.PopupSubMenuMenuItem) {
-                            let items = apObj.item.menu.getMenuItems();
+                            let items = apObj.item.menu._getMenuItems();
                            if (items.length == 2) {
                                // we need to update the connection list to convert this to a normal item
                                forceupdate = true;
@ -1405,10 +1378,10 @@ NMDeviceWireless.prototype = {
            }
        }

-        if (forceupdate || anyauto) {
+        if (forceupdate) {
            this._networks.sort(this._networkSortFunction);
            this._clearSection();
-            this._createSection();
+            this._queueCreateSection();
        }
    },

@ -1441,13 +1414,13 @@ NMDeviceWireless.prototype = {
        if (forceupdate) {
            this._networks.sort(this._networkSortFunction);
            this._clearSection();
-            this._createSection();
+            this._queueCreateSection();
        }
    },

    _createActiveConnectionItem: function() {
        let icon, title;
-        if (this._activeConnection._connection) {
+        if (this._activeConnection && this._activeConnection._connection) {
            let connection = this._activeConnection._connection;
            if (this._activeNetwork)
                this._activeConnectionItem = new NMNetworkMenuItem(this._activeNetwork.accessPoints, undefined,
@ -1540,7 +1513,7 @@ NMDeviceWireless.prototype = {
        if (!this._shouldShowConnectionList())
            return;

-        if(this._activeConnection) {
+        if (this._activeNetwork) {
            this._createActiveConnectionItem();
            this.section.addMenuItem(this._activeConnectionItem);
        }
@ -1549,22 +1522,22 @@ NMDeviceWireless.prototype = {

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

            this._createNetworkItem(apObj, j + activeOffset);
        }
    },
-};
+});

-function NMApplet() {
-    this._init.apply(this, arguments);
-}
-NMApplet.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
+const NMApplet = new Lang.Class({
+    Name: 'NMApplet',
+    Extends: PanelMenu.SystemStatusButton,

    _init: function() {
-        PanelMenu.SystemStatusButton.prototype._init.call(this, 'network-error');
+        this.parent('network-error', null);

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

@ -1830,6 +1803,7 @@ NMApplet.prototype = {
        let activating = null;
        let default_ip4 = null;
        let default_ip6 = null;
+        let active_vpn = null;
        for (let i = 0; i < this._activeConnections.length; i++) {
            let a = this._activeConnections[i];

@ -1859,6 +1833,8 @@ NMApplet.prototype = {
                default_ip4 = a;
            if (a.default6)
                default_ip6 = a;
+            if (a._type == 'vpn')
+                active_vpn = a;

            if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING)
                activating = a;
@ -1889,7 +1865,7 @@ NMApplet.prototype = {
            }
        }

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

    _notifyActivated: function(activeConnection) {
@ -2130,17 +2106,14 @@ NMApplet.prototype = {
            this._mobileUpdateId = 0;
        }
    }
-};
+});

-function NMMessageTraySource() {
-    this._init();
-}
-
-NMMessageTraySource.prototype = {
-    __proto__: MessageTray.Source.prototype,
+const NMMessageTraySource = new Lang.Class({
+    Name: 'NMMessageTraySource',
+    Extends: MessageTray.Source,

    _init: function() {
-        MessageTray.Source.prototype._init.call(this, _("Network Manager"));
+        this.parent(_("Network Manager"));

        let icon = new St.Icon({ icon_name: 'network-transmit-receive',
                                 icon_type: St.IconType.SYMBOLIC,
@ -2148,4 +2121,4 @@ NMMessageTraySource.prototype = {
                               });
        this._setSummaryIcon(icon);
    }
-};
+});
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@ -52,15 +52,13 @@ const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">

 const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);

-function Indicator() {
-    this._init.apply(this, arguments);
-}
-
-Indicator.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
+const Indicator = new Lang.Class({
+    Name: 'PowerIndicator',
+    Extends: PanelMenu.SystemStatusButton,

    _init: function() {
-        PanelMenu.SystemStatusButton.prototype._init.call(this, 'battery-missing');
+        this.parent('battery-missing', null);
+
        this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);

        this._deviceItems = [ ];
@ -163,17 +161,14 @@ Indicator.prototype = {
        this._readPrimaryDevice();
        this._readOtherDevices();
    }
-};
+});

-function DeviceItem() {
-    this._init.apply(this, arguments);
-}
-
-DeviceItem.prototype = {
-    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+const DeviceItem = new Lang.Class({
+    Name: 'DeviceItem',
+    Extends: PopupMenu.PopupBaseMenuItem,

    _init: function(device) {
-        PopupMenu.PopupBaseMenuItem.prototype._init.call(this, { reactive: false });
+        this.parent({ reactive: false });

        let [device_id, device_type, icon, percentage, state, time] = device;

@ -220,4 +215,4 @@ DeviceItem.prototype = {
            return _("Unknown");
        }
    }
-}
+});
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@ -17,15 +17,12 @@ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */

 const VOLUME_NOTIFY_ID = 1;

-function Indicator() {
-    this._init.apply(this, arguments);
-}
-
-Indicator.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
+const Indicator = new Lang.Class({
+    Name: 'VolumeIndicator',
+    Extends: PanelMenu.SystemStatusButton,

    _init: function() {
-        PanelMenu.SystemStatusButton.prototype._init.call(this, 'audio-volume-muted', null);
+        this.parent('audio-volume-muted', null);

        this._control = new Gvc.MixerControl({ name: 'GNOME Shell Volume Control' });
        this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
@ -214,4 +211,4 @@ Indicator.prototype = {
        if (property == '_output' && !this._output.is_muted)
            this.setIcon(this._volumeToIcon(this._output.volume));
    }
-};
+});
--- a/js/ui/statusIconDispatcher.js
+++ b/js/ui/statusIconDispatcher.js
@ -23,11 +23,9 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
    'ibus-ui-gtk': 'input-method'
 };

-function StatusIconDispatcher() {
-    this._init();
-}
+const StatusIconDispatcher = new Lang.Class({
+    Name: 'StatusIconDispatcher',

-StatusIconDispatcher.prototype = {
    _init: function() {
        this._traymanager = new Shell.TrayManager();
        this._traymanager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
@ -61,5 +59,5 @@ StatusIconDispatcher.prototype = {
        else
            this.emit('message-icon-removed', icon);
    }
-};
+});
 Signals.addSignalMethods(StatusIconDispatcher.prototype);
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@ -33,10 +33,6 @@ const NotificationDirection = {
    RECEIVED: 'chat-received'
 };

-let contactFeatures = [Tp.ContactFeature.ALIAS,
-                        Tp.ContactFeature.AVATAR_DATA,
-                        Tp.ContactFeature.PRESENCE];
-
 // This is GNOME Shell's implementation of the Telepathy 'Client'
 // interface. Specifically, the shell is a Telepathy 'Observer', which
 // lets us see messages even if they belong to another app (eg,
@ -72,11 +68,9 @@ function makeMessageFromTplEvent(event) {
    };
 }

-function Client() {
-    this._init();
-};
+const Client = new Lang.Class({
+    Name: 'Client',

-Client.prototype = {
    _init : function() {
        // channel path -> ChatSource
        this._chatSources = {};
@ -85,11 +79,21 @@ Client.prototype = {
        // account path -> AccountNotification
        this._accountNotifications = {};

+        // Define features we want
+        this._accountManager = Tp.AccountManager.dup();
+        let factory = this._accountManager.get_factory();
+        factory.add_account_features([Tp.Account.get_feature_quark_connection()]);
+        factory.add_connection_features([Tp.Connection.get_feature_quark_contact_list()]);
+        factory.add_channel_features([Tp.Channel.get_feature_quark_contacts()]);
+        factory.add_contact_features([Tp.ContactFeature.ALIAS,
+                                      Tp.ContactFeature.AVATAR_DATA,
+                                      Tp.ContactFeature.PRESENCE,
+                                      Tp.ContactFeature.SUBSCRIPTION_STATES]);
+
        // Set up a SimpleObserver, which will call _observeChannels whenever a
        // channel matching its filters is detected.
        // The second argument, recover, means _observeChannels will be run
        // for any existing channel as well.
-        this._accountManager = Tp.AccountManager.dup();
        this._tpClient = new Shell.TpClient({ 'account-manager': this._accountManager,
                                              'name': 'GnomeShell',
                                              'uniquify-name': true })
@ -116,16 +120,9 @@ Client.prototype = {
            throw new Error('Couldn\'t register Telepathy client. Error: \n' + e);
        }

-
        // Watch subscription requests and connection errors
        this._subscriptionSource = null;
        this._accountSource = null;
-        let factory = this._accountManager.get_factory();
-        factory.add_account_features([Tp.Account.get_feature_quark_connection()]);
-        factory.add_connection_features([Tp.Connection.get_feature_quark_contact_list()]);
-        factory.add_contact_features([Tp.ContactFeature.SUBSCRIPTION_STATES,
-                                      Tp.ContactFeature.ALIAS,
-                                      Tp.ContactFeature.AVATAR_DATA]);

        this._accountManager.connect('account-validity-changed',
            Lang.bind(this, this._accountValidityChanged));
@ -135,22 +132,6 @@ Client.prototype = {

    _observeChannels: function(observer, account, conn, channels,
                               dispatchOp, requests, context) {
-        // If the self_contact doesn't have the ALIAS, make sure
-        // to fetch it before trying to grab the channels.
-        let self_contact = conn.get_self_contact();
-        if (self_contact.has_feature(Tp.ContactFeature.ALIAS)) {
-            this._finishObserveChannels(account, conn, channels, context);
-        } else {
-            Shell.get_self_contact_features(conn,
-                                            contactFeatures,
-                                            Lang.bind(this, function() {
-                                                this._finishObserveChannels(account, conn, channels, context);
-                                            }));
-            context.delay();
-        }
-    },
-
-    _finishObserveChannels: function(account, conn, channels, context) {
        let len = channels.length;
        for (let i = 0; i < len; i++) {
            let channel = channels[i];
@ -161,16 +142,7 @@ Client.prototype = {
               targetHandleType != Tp.HandleType.CONTACT)
               continue;

-            /* Request a TpContact */
-            Shell.get_tp_contacts(conn, [targetHandle],
-                    contactFeatures,
-                    Lang.bind(this,  function (connection, contacts, failed) {
-                        if (contacts.length < 1)
-                            return;
-
-                        /* We got the TpContact */
-                        this._createChatSource(account, conn, channel, contacts[0]);
-                    }), null);
+            this._createChatSource(account, conn, channel, channel.get_target_contact());
        }

        context.accept();
@ -199,11 +171,11 @@ Client.prototype = {

    _handleChannels: function(handler, account, conn, channels,
                              requests, user_action_time, context) {
-        this._handlingChannels(account, conn, channels);
+        this._handlingChannels(account, conn, channels, true);
        context.accept();
    },

-    _handlingChannels: function(account, conn, channels) {
+    _handlingChannels: function(account, conn, channels, notify) {
        let len = channels.length;
        for (let i = 0; i < len; i++) {
            let channel = channels[i];
@ -214,7 +186,18 @@ Client.prototype = {
                continue;
            }

-            if (this._tpClient.is_handling_channel(channel)) {
+            // 'notify' will be true when coming from an actual HandleChannels
+            // call, and not when from a successful Claim call. The point is
+            // we don't want to notify for a channel we just claimed which
+            // has no new messages (for example, a new channel which only has
+            // a delivery notification). We rely on _displayPendingMessages()
+            // and _messageReceived() to notify for new messages.
+
+            // But we should still notify from HandleChannels because the
+            // Telepathy spec states that handlers must foreground channels
+            // in HandleChannels calls which are already being handled.
+
+            if (notify && this._tpClient.is_handling_channel(channel)) {
                // We are already handling the channel, display the source
                let source = this._chatSources[channel.get_object_path()];
                if (source)
@ -225,41 +208,25 @@ Client.prototype = {

    _displayRoomInvitation: function(conn, channel, dispatchOp, context) {
        // We can only approve the rooms if we have been invited to it
-        let selfHandle = channel.group_get_self_handle();
-        if (selfHandle == 0) {
+        let selfContact = channel.group_get_self_contact();
+        if (selfContact == null) {
            Shell.decline_dispatch_op(context, 'Not invited to the room');
            return;
        }

-        let [invited, inviter, reason, msg] = channel.group_get_local_pending_info(selfHandle);
+        let [invited, inviter, reason, msg] = channel.group_get_local_pending_contact_info(selfContact);
        if (!invited) {
            Shell.decline_dispatch_op(context, 'Not invited to the room');
            return;
        }

-        // Request a TpContact for the inviter
-        Shell.get_tp_contacts(conn, [inviter],
-                contactFeatures,
-                Lang.bind(this, this._createRoomInviteSource, channel, context, dispatchOp));
-
-        context.delay();
-     },
-
-    _createRoomInviteSource: function(connection, contacts, failed, channel, context, dispatchOp) {
-        if (contacts.length < 1) {
-            Shell.decline_dispatch_op(context, 'Failed to get inviter');
-            return;
-        }
-
-        // We got the TpContact
-
        // FIXME: We don't have a 'chat room' icon (bgo #653737) use
        // system-users for now as Empathy does.
        let source = new ApproverSource(dispatchOp, _("Invitation"),
                                        Gio.icon_new_for_string('system-users'));
        Main.messageTray.add(source);

-        let notif = new RoomInviteNotification(source, dispatchOp, channel, contacts[0]);
+        let notif = new RoomInviteNotification(source, dispatchOp, channel, inviter);
        source.notify(notif);
        context.accept();
    },
@ -287,7 +254,7 @@ Client.prototype = {
                                        Lang.bind(this, function(dispatchOp, result) {
                try {
                    dispatchOp.claim_with_finish(result);
-                    this._handlingChannels(account, conn, [channel]);
+                    this._handlingChannels(account, conn, [channel], false);
                } catch (err) {
                    throw new Error('Failed to Claim channel: ' + err);
                }}));
@ -299,21 +266,6 @@ Client.prototype = {
    },

    _approveCall: function(account, conn, channel, dispatchOp, context) {
-        let [targetHandle, targetHandleType] = channel.get_handle();
-
-        Shell.get_tp_contacts(conn, [targetHandle],
-                contactFeatures,
-                Lang.bind(this, this._createAudioVideoSource, channel, context, dispatchOp));
-
-        context.delay();
-    },
-
-    _createAudioVideoSource: function(connection, contacts, failed, channel, context, dispatchOp) {
-        if (contacts.length < 1) {
-            Shell.decline_dispatch_op(context, 'Failed to get inviter');
-            return;
-        }
-
        let isVideo = false;

        let props = channel.borrow_immutable_properties();
@ -328,27 +280,13 @@ Client.prototype = {
                                        Gio.icon_new_for_string('audio-input-microphone'));
        Main.messageTray.add(source);

-        let notif = new AudioVideoNotification(source, dispatchOp, channel, contacts[0], isVideo);
+        let notif = new AudioVideoNotification(source, dispatchOp, channel,
+            channel.get_target_contact(), isVideo);
        source.notify(notif);
        context.accept();
    },

    _approveFileTransfer: function(account, conn, channel, dispatchOp, context) {
-        let [targetHandle, targetHandleType] = channel.get_handle();
-
-        Shell.get_tp_contacts(conn, [targetHandle],
-                contactFeatures,
-                Lang.bind(this, this._createFileTransferSource, channel, context, dispatchOp));
-
-        context.delay();
-    },
-
-    _createFileTransferSource: function(connection, contacts, failed, channel, context, dispatchOp) {
-        if (contacts.length < 1) {
-            Shell.decline_dispatch_op(context, 'Failed to get file sender');
-            return;
-        }
-
        // Use the icon of the file being transferred
        let gicon = Gio.content_type_get_icon(channel.get_mime_type());

@ -356,7 +294,8 @@ Client.prototype = {
        let source = new ApproverSource(dispatchOp, _("File Transfer"), gicon);
        Main.messageTray.add(source);

-        let notif = new FileTransferNotification(source, dispatchOp, channel, contacts[0]);
+        let notif = new FileTransferNotification(source, dispatchOp, channel,
+            channel.get_target_contact());
        source.notify(notif);
        context.accept();
    },
@ -479,17 +418,14 @@ Client.prototype = {

        return this._accountSource;
    }
-};
+});

-function ChatSource(account, conn, channel, contact, client) {
-    this._init(account, conn, channel, contact, client);
-}
-
-ChatSource.prototype = {
-    __proto__:  MessageTray.Source.prototype,
+const ChatSource = new Lang.Class({
+    Name: 'ChatSource',
+    Extends: MessageTray.Source,

    _init: function(account, conn, channel, contact, client) {
-        MessageTray.Source.prototype._init.call(this, contact.get_alias());
+        this.parent(contact.get_alias());

        this.isChat = true;

@ -507,15 +443,9 @@ ChatSource.prototype = {
        this._notification.setUrgency(MessageTray.Urgency.HIGH);
        this._notifyTimeoutId = 0;

-        // We ack messages when the message box is collapsed if user has
-        // interacted with it before and so read the messages:
-        // - user clicked on it the tray
-        // - user expanded the notification by hovering over the toaster notification
-        this._shouldAck = false;
-
-        this.connect('summary-item-clicked', Lang.bind(this, this._summaryItemClicked));
-        this._notification.connect('expanded', Lang.bind(this, this._notificationExpanded));
-        this._notification.connect('collapsed', Lang.bind(this, this._notificationCollapsed));
+        // We ack messages when the user expands the new notification or views the summary
+        // notification, in which case the notification is also expanded.
+        this._notification.connect('expanded', Lang.bind(this, this._ackMessages));

        this._presence = contact.get_presence_type();

@ -697,7 +627,7 @@ ChatSource.prototype = {
    },

    notify: function() {
-        MessageTray.Source.prototype.notify.call(this, this._notification);
+        this.parent(this._notification);
    },

    respond: function(text) {
@ -739,12 +669,12 @@ ChatSource.prototype = {
        if (presence == Tp.ConnectionPresenceType.AVAILABLE) {
            msg = _("%s is online.").format(title);
            shouldNotify = (this._presence == Tp.ConnectionPresenceType.OFFLINE);
-        } else if (presence == Tp.ConnectionPresenceType.OFFLINE ||
-                   presence == Tp.ConnectionPresenceType.EXTENDED_AWAY) {
+        } else if (presence == Tp.ConnectionPresenceType.OFFLINE) {
            presence = Tp.ConnectionPresenceType.OFFLINE;
            msg = _("%s is offline.").format(title);
            shouldNotify = (this._presence != Tp.ConnectionPresenceType.OFFLINE);
-        } else if (presence == Tp.ConnectionPresenceType.AWAY) {
+        } else if (presence == Tp.ConnectionPresenceType.AWAY ||
+                   presence == Tp.ConnectionPresenceType.EXTENDED_AWAY) {
            msg = _("%s is away.").format(title);
            shouldNotify = false;
        } else if (presence == Tp.ConnectionPresenceType.BUSY) {
@ -779,36 +709,15 @@ ChatSource.prototype = {
        // 'pending-message-removed' for each one.
        this._channel.ack_all_pending_messages_async(Lang.bind(this, function(src, result) {
            this._channel.ack_all_pending_messages_finish(result);}));
-    },
-
-    _summaryItemClicked: function(source, button) {
-        if (button != 1)
-            return;
-
-        this._shouldAck = true;
-    },
-
-    _notificationExpanded: function() {
-        this._shouldAck = true;
-    },
-
-    _notificationCollapsed: function() {
-        if (this._shouldAck)
-            this._ackMessages();
-
-        this._shouldAck = false;
    }
-};
+});

-function ChatNotification(source) {
-    this._init(source);
-}
-
-ChatNotification.prototype = {
-    __proto__:  MessageTray.Notification.prototype,
+const ChatNotification = new Lang.Class({
+    Name: 'ChatNotification',
+    Extends: MessageTray.Notification,

    _init: function(source) {
-        MessageTray.Notification.prototype._init.call(this, source, source.title, null, { customContent: true });
+        this.parent(source, source.title, null, { customContent: true });
        this.setResident(true);

        this._responseEntry = new St.Entry({ style_class: 'chat-response',
@ -1091,17 +1000,14 @@ ChatNotification.prototype = {
            this.source.setChatState(Tp.ChannelChatState.ACTIVE);
        }
    }
-};
+});

-function ApproverSource(dispatchOp, text, gicon) {
-    this._init(dispatchOp, text, gicon);
-}
-
-ApproverSource.prototype = {
-    __proto__: MessageTray.Source.prototype,
+const ApproverSource = new Lang.Class({
+    Name: 'ApproverSource',
+    Extends: MessageTray.Source,

    _init: function(dispatchOp, text, gicon) {
-        MessageTray.Source.prototype._init.call(this, text);
+        this.parent(text);

        this._gicon = gicon;
        this._setSummaryIcon(this.createNotificationIcon());
@ -1122,7 +1028,7 @@ ApproverSource.prototype = {
            this._invalidId = 0;
        }

-        MessageTray.Source.prototype.destroy.call(this);
+        this.parent();
    },

    createNotificationIcon: function() {
@ -1130,23 +1036,19 @@ ApproverSource.prototype = {
                             icon_type: St.IconType.FULLCOLOR,
                             icon_size: this.ICON_SIZE });
    }
-}
+});

-function RoomInviteNotification(source, dispatchOp, channel, inviter) {
-    this._init(source, dispatchOp, channel, inviter);
-}
-
-RoomInviteNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const RoomInviteNotification = new Lang.Class({
+    Name: 'RoomInviteNotification',
+    Extends: MessageTray.Notification,

    _init: function(source, dispatchOp, channel, inviter) {
-        MessageTray.Notification.prototype._init.call(this,
-                                                      source,
-                                                      /* translators: argument is a room name like
-                                                       * room@jabber.org for example. */
-                                                      _("Invitation to %s").format(channel.get_identifier()),
-                                                      null,
-                                                      { customContent: true });
+        this.parent(source,
+                    /* translators: argument is a room name like
+                     * room@jabber.org for example. */
+                    _("Invitation to %s").format(channel.get_identifier()),
+                    null,
+                    { customContent: true });
        this.setResident(true);

        /* translators: first argument is the name of a contact and the second
@ -1173,15 +1075,12 @@ RoomInviteNotification.prototype = {
            this.destroy();
        }));
    }
-};
+});

 // Audio Video
-function AudioVideoNotification(source, dispatchOp, channel, contact, isVideo) {
-    this._init(source, dispatchOp, channel, contact, isVideo);
-}
-
-AudioVideoNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const AudioVideoNotification = new Lang.Class({
+    Name: 'AudioVideoNotification',
+    Extends: MessageTray.Notification,

    _init: function(source, dispatchOp, channel, contact, isVideo) {
        let title = '';
@ -1193,11 +1092,7 @@ AudioVideoNotification.prototype = {
             /* translators: argument is a contact name like Alice for example. */
            title = _("Call from %s").format(contact.get_alias());

-        MessageTray.Notification.prototype._init.call(this,
-                                                      source,
-                                                      title,
-                                                      null,
-                                                      { customContent: true });
+        this.parent(this, source, title, null, { customContent: true });
        this.setResident(true);

        this.addButton('reject', _("Reject"));
@ -1220,28 +1115,25 @@ AudioVideoNotification.prototype = {
            this.destroy();
        }));
    }
-};
+});

 // File Transfer
-function FileTransferNotification(source, dispatchOp, channel, contact) {
-    this._init(source, dispatchOp, channel, contact);
-}
-
-FileTransferNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const FileTransferNotification = new Lang.Class({
+    Name: 'FileTransferNotification',
+    Extends: MessageTray.Notification,

    _init: function(source, dispatchOp, channel, contact) {
-        MessageTray.Notification.prototype._init.call(this,
-                                                      source,
-                                                      /* To translators: The first parameter is
-                                                       * the contact's alias and the second one is the
-                                                       * file name. The string will be something
-                                                       * like: "Alice is sending you test.ogg"
-                                                       */
-                                                      _("%s is sending you %s").format(contact.get_alias(),
-                                                                                       channel.get_filename()),
-                                                      null,
-                                                      { customContent: true });
+        this.parent(this,
+                    source,
+                    /* To translators: The first parameter is
+                     * the contact's alias and the second one is the
+                     * file name. The string will be something
+                     * like: "Alice is sending you test.ogg"
+                     */
+                    _("%s is sending you %s").format(contact.get_alias(),
+                                                     channel.get_filename()),
+                    null,
+                    { customContent: true });
        this.setResident(true);

        this.addButton('decline', _("Decline"));
@ -1263,18 +1155,15 @@ FileTransferNotification.prototype = {
            this.destroy();
        }));
    }
-};
+});

 // A notification source that can embed multiple notifications
-function MultiNotificationSource(title, icon) {
-    this._init(title, icon);
-}
-
-MultiNotificationSource.prototype = {
-    __proto__: MessageTray.Source.prototype,
+const MultiNotificationSource = new Lang.Class({
+    Name: 'MultiNotificationSource',
+    Extends: MessageTray.Source,

    _init: function(title, icon) {
-        MessageTray.Source.prototype._init.call(this, title);
+        this.parent(title);

        this._icon = icon;
        this._setSummaryIcon(this.createNotificationIcon());
@ -1282,7 +1171,7 @@ MultiNotificationSource.prototype = {
    },

    notify: function(notification) {
-        MessageTray.Source.prototype.notify.call(this, notification);
+        this.parent(notification);

        this._nbNotifications += 1;

@ -1300,21 +1189,18 @@ MultiNotificationSource.prototype = {
                             icon_type: St.IconType.FULLCOLOR,
                             icon_size: this.ICON_SIZE });
    }
-};
+});

 // Subscription request
-function SubscriptionRequestNotification(source, contact) {
-    this._init(source, contact);
-}
-
-SubscriptionRequestNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const SubscriptionRequestNotification = new Lang.Class({
+    Name: 'SubscriptionRequestNotification',
+    Extends: MessageTray.Notification,

    _init: function(source, contact) {
-        MessageTray.Notification.prototype._init.call(this, source,
-            /* To translators: The parameter is the contact's alias */
-            _("%s would like permission to see when you are online").format(contact.get_alias()),
-            null, { customContent: true });
+        this.parent(this, source,
+                    /* To translators: The parameter is the contact's alias */
+                    _("%s would like permission to see when you are online").format(contact.get_alias()),
+                    null, { customContent: true });

        this._contact = contact;
        this._connection = contact.get_connection();
@ -1388,7 +1274,7 @@ SubscriptionRequestNotification.prototype = {
            this._invalidatedId = 0;
        }

-        MessageTray.Notification.prototype.destroy.call(this);
+        this.parent();
    },

    _subscriptionStatesChangedCb: function(contact, subscribe, publish, msg) {
@ -1397,12 +1283,7 @@ SubscriptionRequestNotification.prototype = {
        if (publish != Tp.SubscriptionState.ASK)
            this.destroy();
    }
-};
-
-
-function AccountNotification(source, account, connectionError) {
-    this._init(source, account, connectionError);
-}
+});

 // Messages from empathy/libempathy/empathy-utils.c
 // create_errors_to_message_hash()
@ -1457,15 +1338,16 @@ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INSECURE)]
 _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_LIMIT_EXCEEDED)]
  = _("The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library");

-AccountNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
+const AccountNotification = new Lang.Class({
+    Name: 'AccountNotification',
+    Extends: MessageTray.Notification,

    _init: function(source, account, connectionError) {
-        MessageTray.Notification.prototype._init.call(this, source,
-            /* translators: argument is the account name, like
-             * name@jabber.org for example. */
-            _("Connection to %s failed").format(account.get_display_name()),
-            null, { customContent: true });
+        this.parent(source,
+                    /* translators: argument is the account name, like
+                     * name@jabber.org for example. */
+                    _("Connection to %s failed").format(account.get_display_name()),
+                    null, { customContent: true });

        this._label = new St.Label();
        this.addActor(this._label);
@ -1541,6 +1423,6 @@ AccountNotification.prototype = {
            this._connectionStatusId = 0;
        }

-        MessageTray.Notification.prototype.destroy.call(this);
+        this.parent();
    }
-};
+});
--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@ -202,11 +202,9 @@ function registerSpecialPropertySplitter(name, splitFunction, parameters) {
 // time updates; even better is to pay attention to the vertical
 // vblank and sync to that when possible.)
 //
-function ClutterFrameTicker() {
-    this._init();
-}
+const ClutterFrameTicker = new Lang.Class({
+    Name: 'ClutterFrameTicker',

-ClutterFrameTicker.prototype = {
    FRAME_RATE : 60,

    _init : function() {
@ -261,6 +259,6 @@ ClutterFrameTicker.prototype = {
        this._startTime = -1;
        global.end_work();
    }
-};
+});

 Signals.addSignalMethods(ClutterFrameTicker.prototype);
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@ -40,15 +40,12 @@ const IMStatus = {
 // Copyright (C) 2008,2009 Red Hat, Inc.


-function IMStatusItem(label, iconName) {
-    this._init(label, iconName);
-}
-
-IMStatusItem.prototype = {
-    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+const IMStatusItem = new Lang.Class({
+    Name: 'IMStatusItem',
+    Extends: PopupMenu.PopupBaseMenuItem,

    _init: function(label, iconName) {
-        PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
+        this.parent();

        this.actor.add_style_class_name('status-chooser-status-item');

@ -61,19 +58,15 @@ IMStatusItem.prototype = {
        this.label = new St.Label({ text: label });
        this.addActor(this.label);
    }
-};
+});

-function IMUserNameItem() {
-    this._init();
-}
-
-IMUserNameItem.prototype = {
-    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+const IMUserNameItem = new Lang.Class({
+    Name: 'IMUserNameItem',
+    Extends: PopupMenu.PopupBaseMenuItem,

    _init: function() {
-        PopupMenu.PopupBaseMenuItem.prototype._init.call(this,
-                                                         { reactive: false,
-                                                           style_class: 'status-chooser-user-name' });
+        this.parent({ reactive: false,
+                      style_class: 'status-chooser-user-name' });

        this._wrapper = new Shell.GenericContainer();
        this._wrapper.connect('get-preferred-width',
@ -102,19 +95,15 @@ IMUserNameItem.prototype = {
    _wrapperAllocate: function(actor, box, flags) {
        this.label.allocate(box, flags);
    }
-};
+});

-function IMStatusChooserItem() {
-    this._init();
-}
-
-IMStatusChooserItem.prototype = {
-    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+const IMStatusChooserItem = new Lang.Class({
+    Name: 'IMStatusChooserItem',
+    Extends: PopupMenu.PopupBaseMenuItem,

    _init: function() {
-        PopupMenu.PopupBaseMenuItem.prototype._init.call (this,
-                                                          { reactive: false,
-                                                            style_class: 'status-chooser' });
+        this.parent({ reactive: false,
+                      style_class: 'status-chooser' });

        this._iconBin = new St.Button({ style_class: 'status-chooser-user-icon' });
        this.addActor(this._iconBin);
@ -220,7 +209,7 @@ IMStatusChooserItem.prototype = {
            this._userChangedId = 0;
        }

-        PopupMenu.PopupBaseMenuItem.prototype.destroy.call(this);
+        this.parent();
    },

    // Override getColumnWidths()/setColumnWidths() to make the item
@ -250,7 +239,8 @@ IMStatusChooserItem.prototype = {
    },

    _setIconFromFile: function(iconFile) {
-        this._iconBin.set_style('background-image: url("' + iconFile + '");');
+        this._iconBin.set_style('background-image: url("' + iconFile + '");' +
+                                'background-size: contain;');
        this._iconBin.child = null;
    },

@ -422,18 +412,16 @@ IMStatusChooserItem.prototype = {
        this._expectedPresence = newPresence;
        this._accountMgr.set_all_requested_presences(newPresence, status, msg);
    }
-};
+});


-function UserMenuButton() {
-    this._init();
-}
-
-UserMenuButton.prototype = {
-    __proto__: PanelMenu.Button.prototype,
+const UserMenuButton = new Lang.Class({
+    Name: 'UserMenuButton',
+    Extends: PanelMenu.Button,

    _init: function() {
-        PanelMenu.Button.prototype._init.call(this, 0.0);
+        this.parent(0.0);
+
        let box = new St.BoxLayout({ name: 'panelUserMenu' });
        this.actor.add_actor(box);

@ -736,4 +724,4 @@ UserMenuButton.prototype = {
            this._session.ShutdownRemote();
        }
    }
-};
+});
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -15,11 +15,9 @@ const SearchDisplay = imports.ui.searchDisplay;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;

-function BaseTab(titleActor, pageActor, name, a11yIcon) {
-    this._init(titleActor, pageActor, name, a11yIcon);
-}
+const BaseTab = new Lang.Class({
+    Name: 'BaseTab',

-BaseTab.prototype = {
    _init: function(titleActor, pageActor, name, a11yIcon) {
        this.title = titleActor;
        this.page = new St.Bin({ child: pageActor,
@ -75,16 +73,13 @@ BaseTab.prototype = {
    _activate: function() {
        this.emit('activated');
    }
-};
+});
 Signals.addSignalMethods(BaseTab.prototype);


-function ViewTab(id, label, pageActor, a11yIcon) {
-    this._init(id, label, pageActor, a11yIcon);
-}
-
-ViewTab.prototype = {
-    __proto__: BaseTab.prototype,
+const ViewTab = new Lang.Class({
+    Name: 'ViewTab',
+    Extends: BaseTab,

    _init: function(id, label, pageActor, a11yIcon) {
        this.id = id;
@ -93,17 +88,14 @@ ViewTab.prototype = {
                                         style_class: 'view-tab-title' });
        titleActor.connect('clicked', Lang.bind(this, this._activate));

-        BaseTab.prototype._init.call(this, titleActor, pageActor, label, a11yIcon);
+        this.parent(titleActor, pageActor, label, a11yIcon);
    }
-};
+});


-function SearchTab() {
-    this._init();
-}
-
-SearchTab.prototype = {
-    __proto__: BaseTab.prototype,
+const SearchTab = new Lang.Class({
+    Name: 'SearchTab',
+    Extends: BaseTab,

    _init: function() {
        this.active = false;
@ -136,11 +128,7 @@ SearchTab.prototype = {
        this._iconClickedId = 0;

        this._searchResults = new SearchDisplay.SearchResults(this._searchSystem, this._openSearchSystem);
-        BaseTab.prototype._init.call(this,
-                                     this._entry,
-                                     this._searchResults.actor,
-                                     _("Search"),
-                                     'edit-find');
+        this.parent(this._entry, this._searchResults.actor, _("Search"), 'edit-find');

        this._text.connect('text-changed', Lang.bind(this, this._onTextChanged));
        this._text.connect('key-press-event', Lang.bind(this, function (o, e) {
@ -166,7 +154,7 @@ SearchTab.prototype = {
    },

    hide: function() {
-        BaseTab.prototype.hide.call(this);
+        this.parent();

        // Leave the entry focused when it doesn't have any text;
        // when replacing a selected search term, Clutter emits
@ -310,14 +298,12 @@ SearchTab.prototype = {

        return false;
    }
-};
+});


-function ViewSelector() {
-    this._init();
-}
+const ViewSelector = new Lang.Class({
+    Name: 'ViewSelector',

-ViewSelector.prototype = {
    _init : function() {
        this.actor = new St.BoxLayout({ name: 'viewSelector',
                                        vertical: true });
@ -433,29 +419,6 @@ ViewSelector.prototype = {
        // not when setting the initially selected one.
        if (!tab.visible)
            tab.show(!firstSwitch);
-
-        // Pull a Meg Ryan:
-        if (!firstSwitch && Main.overview.workspaces) {
-            if (tab != this._tabs[0]) {
-                Tweener.addTween(Main.overview.workspaces.actor,
-                                 { opacity: 0,
-                                   time: 0.1,
-                                   transition: 'easeOutQuad',
-                                   onComplete: Lang.bind(this,
-                                       function() {
-                                           Main.overview.workspaces.actor.hide();
-                                           Main.overview.workspaces.actor.opacity = 255;
-                                       })
-                                });
-            } else {
-                Main.overview.workspaces.actor.opacity = 0;
-                Main.overview.workspaces.actor.show();
-                Tweener.addTween(Main.overview.workspaces.actor,
-                                 { opacity: 255,
-                                   time: 0.1,
-                                   transition: 'easeOutQuad' });
-            }
-        }
    },

    switchTab: function(id) {
@ -577,5 +540,5 @@ ViewSelector.prototype = {
    removeSearchProvider: function(provider) {
        this._searchTab.removeSearchProvider(provider);
    }
-};
+});
 Signals.addSignalMethods(ViewSelector.prototype);
--- a/js/ui/wanda.js
+++ b/js/ui/wanda.js
@ -0,0 +1,210 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Clutter = imports.gi.Clutter;
+const GdkPixbuf = imports.gi.GdkPixbuf;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const St = imports.gi.St;
+
+const IconGrid = imports.ui.iconGrid;
+const Main = imports.ui.main;
+const Search = imports.ui.search;
+
+// we could make these gsettings
+const FISH_NAME = 'wanda';
+const FISH_SPEED = 300;
+const FISH_COMMAND = 'fortune';
+
+const GNOME_PANEL_PIXMAPDIR = '../gnome-panel/pixmaps';
+const FISH_GROUP = 'Fish Animation';
+
+const MAGIC_FISH_KEY = 'free the fish';
+
+const WandaIcon = new Lang.Class({
+    Name: 'WandaIcon',
+    Extends: IconGrid.BaseIcon,
+
+    _init : function(fish, label, params) {
+        this._fish = fish;
+        let file = GLib.build_filenamev([global.datadir, GNOME_PANEL_PIXMAPDIR, fish + '.fish']);
+
+        if (GLib.file_test(file, GLib.FileTest.EXISTS)) {
+            this._keyfile = new GLib.KeyFile();
+            this._keyfile.load_from_file(file, GLib.KeyFileFlags.NONE);
+
+            this._imageFile = GLib.build_filenamev([global.datadir, GNOME_PANEL_PIXMAPDIR,
+                                                    this._keyfile.get_string(FISH_GROUP, 'image')]);
+
+            let tmpPixbuf = GdkPixbuf.Pixbuf.new_from_file(this._imageFile);
+
+            this._imgHeight = tmpPixbuf.height;
+            this._imgWidth = tmpPixbuf.width / this._keyfile.get_integer(FISH_GROUP, 'frames');
+        } else {
+            this._imageFile = null;
+        }
+
+        this.parent(label, params);
+    },
+
+    createIcon: function(iconSize) {
+        if (this._animations)
+            this._animations.destroy();
+
+        if (!this._imageFile) {
+            return new St.Icon({ icon_name: 'face-smile',
+                                 icon_type: St.IconType.FULLCOLOR,
+                                 icon_size: iconSize
+                               });
+        }
+
+        this._animations = St.TextureCache.get_default().load_sliced_image(this._imageFile, this._imgWidth, this._imgHeight);
+        this._animations.connect('destroy', Lang.bind(this, function() {
+            if (this._timeoutId)
+                GLib.source_remove(this._timeoutId);
+            this._timeoutId = 0;
+            this._animations = null;
+        }));
+        this._animations.connect('notify::mapped', Lang.bind(this, function() {
+            if (this._animations.mapped && !this._timeoutId) {
+                this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, FISH_SPEED, Lang.bind(this, this._update));
+
+                this._i = 0;
+                this._update();
+            } else if (!this._animations.mapped && this._timeoutId) {
+                GLib.source_remove(this._timeoutId);
+                this._timeoutId = 0;
+            }
+        }));
+
+        this._i = 0;
+
+        return this._animations;
+    },
+
+    _update: function() {
+        let n = this._animations.get_n_children();
+        if (n == 0) {
+            return true;
+        }
+
+        this._animations.get_nth_child(this._i).hide();
+        this._i = (this._i + 1) % n;
+        this._animations.get_nth_child(this._i).show();
+
+        return true;
+    },
+});
+
+const WandaIconBin = new Lang.Class({
+    Name: 'WandaIconBin',
+
+    _init: function(fish, label, params) {
+        this.actor = new St.Bin({ style_class: 'search-result-content',
+                                  reactive: true,
+                                  track_hover: true });
+        this.icon = new WandaIcon(fish, label, params);
+
+        this.actor.child = this.icon.actor;
+        this.actor.label_actor = this.icon.label;
+    },
+});
+
+const FortuneDialog = new Lang.Class({
+    Name: 'FortuneDialog',
+
+    _init: function(name, command) {
+        let text;
+
+        try {
+            let [res, stdout, stderr, status] = GLib.spawn_command_line_sync(command);
+            text = String.fromCharCode.apply(null, stdout);
+        } catch(e) {
+            text = _("Sorry, no wisdom for you today:\n%s").format(e.message);
+        }
+
+        this._title = new St.Label({ style_class: 'polkit-dialog-headline',
+                                     text: _("%s the Oracle says").format(name) });
+        this._label = new St.Label({ style_class: 'polkit-dialog-description',
+                                     text: text });
+        this._label.clutter_text.line_wrap = true;
+
+        this._box = new St.BoxLayout({ vertical: true,
+                                       style_class: 'polkit-dialog' // this is just to force a reasonable width
+                                     });
+        this._box.add(this._title, { align: St.Align.MIDDLE });
+        this._box.add(this._label, { expand: true });
+
+        this._button = new St.Button({ button_mask: St.ButtonMask.ONE,
+                                       style_class: 'modal-dialog',
+                                       reactive: true });
+        this._button.connect('clicked', Lang.bind(this, this.destroy));
+        this._button.child = this._box;
+
+        let monitor = Main.layoutManager.primaryMonitor;
+
+        Main.layoutManager.addChrome(this._button);
+        this._button.set_position(Math.floor(monitor.width / 2 - this._button.width / 2),
+                                  Math.floor(monitor.height / 2 - this._button.height / 2));
+
+        GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 10, Lang.bind(this, this.destroy));
+    },
+
+    destroy: function() {
+        this._button.destroy();
+    }
+});
+
+function capitalize(str) {
+    return str[0].toUpperCase() + str.substring(1, str.length);
+}
+
+const WandaSearchProvider = new Lang.Class({
+    Name: 'WandaSearchProvider',
+    Extends: Search.SearchProvider,
+
+    _init: function() {
+        this.parent(_("Your favorite Easter Egg"));
+    },
+
+    getResultMeta: function(fish) {
+        return { 'id': fish,
+                 'name': capitalize(fish),
+                 '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) {
+            return [ FISH_NAME ];
+        }
+        return [];
+    },
+
+    getSubsearchResultSet: function(previousResults, terms) {
+        return this.getInitialResultSet(terms);
+    },
+
+    activateResult: function(fish, params) {
+        if (this._dialog)
+            this._dialog.destroy();
+        this._dialog = new FortuneDialog(capitalize(fish), FISH_COMMAND);
+    },
+
+    createResultActor: function (resultMeta, terms) {
+        let icon = new WandaIconBin(resultMeta.id, resultMeta.name);
+        return icon.actor;
+    }
+});
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@ -6,11 +6,9 @@ const Shell = imports.gi.Shell;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;

-function WindowAttentionHandler() {
-    this._init();
-}
+const WindowAttentionHandler = new Lang.Class({
+    Name: 'WindowAttentionHandler',

-WindowAttentionHandler.prototype = {
    _init : function() {
        this._tracker = Shell.WindowTracker.get_default();
        global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention));
@ -43,17 +41,14 @@ WindowAttentionHandler.prototype = {
                                                 notification.update(title, banner);
                                             })));
    }
-};
+});

-function Source(app, window) {
-    this._init(app, window);
-}
-
-Source.prototype = {
-    __proto__ : MessageTray.Source.prototype,
+const Source = new Lang.Class({
+    Name: 'WindowAttentionSource',
+    Extends: MessageTray.Source,

    _init: function(app, window) {
-        MessageTray.Source.prototype._init.call(this, app.get_name());
+        this.parent(app.get_name());
        this._window = window;
        this._app = app;
        this._setSummaryIcon(this.createNotificationIcon());
@ -81,4 +76,4 @@ Source.prototype = {
        Main.activateWindow(this._window);
        this.destroy();
    }
-};
+});
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -31,11 +31,9 @@ function getTopInvisibleBorder(metaWindow) {
    return outerRect.y - inputRect.y;
 }

-function WindowDimmer(actor) {
-    this._init(actor);
-}
+const WindowDimmer = new Lang.Class({
+    Name: 'WindowDimmer',

-WindowDimmer.prototype = {
    _init: function(actor) {
        if (Clutter.feature_available(Clutter.FeatureFlags.SHADERS_GLSL)) {
            this._effect = new Clutter.ShaderEffect({ shader_type: Clutter.ShaderType.FRAGMENT_SHADER });
@ -75,7 +73,7 @@ WindowDimmer.prototype = {
    },

    _dimFraction: 0.0
-};
+});

 function getWindowDimmer(actor) {
    if (!actor._windowDimmer)
@ -84,15 +82,12 @@ function getWindowDimmer(actor) {
    return actor._windowDimmer;
 }

-function WindowManager() {
-    this._init();
-}
+const WindowManager = new Lang.Class({
+    Name: 'WindowManager',

-WindowManager.prototype = {
    _init : function() {
        this._shellwm =  global.window_manager;

-        this._keyBindingHandlers = [];
        this._minimizing = [];
        this._maximizing = [];
        this._unmaximizing = [];
@ -121,15 +116,24 @@ WindowManager.prototype = {
        this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));

        this._workspaceSwitcherPopup = null;
-        this.setKeybindingHandler('switch-to-workspace-left', Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setKeybindingHandler('switch-to-workspace-right', Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setKeybindingHandler('switch-to-workspace-up', Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setKeybindingHandler('switch-to-workspace-down', Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setKeybindingHandler('switch-windows', Lang.bind(this, this._startAppSwitcher));
-        this.setKeybindingHandler('switch-group', Lang.bind(this, this._startAppSwitcher));
-        this.setKeybindingHandler('switch-windows-backward', Lang.bind(this, this._startAppSwitcher));
-        this.setKeybindingHandler('switch-group-backward', Lang.bind(this, this._startAppSwitcher));
-        this.setKeybindingHandler('switch-panels', Lang.bind(this, this._startA11ySwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-left',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-right',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-up',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-down',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-windows',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-group',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-windows-backward',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-group-backward',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-panels',
+                                            Lang.bind(this, this._startA11ySwitcher));

        Main.overview.connect('showing', Lang.bind(this, function() {
            for (let i = 0; i < this._dimmedWindows.length; i++)
@ -141,16 +145,6 @@ WindowManager.prototype = {
        }));
    },

-    setKeybindingHandler: function(keybinding, handler){
-        if (this._keyBindingHandlers[keybinding])
-            this._shellwm.disconnect(this._keyBindingHandlers[keybinding]);
-        else
-            this._shellwm.takeover_keybinding(keybinding);
-
-        this._keyBindingHandlers[keybinding] =
-            this._shellwm.connect('keybinding::' + keybinding, handler);
-    },
-
    blockAnimations: function() {
        this._animationBlockCount++;
    },
@ -534,37 +528,41 @@ WindowManager.prototype = {
        shellwm.completed_switch_workspace();
    },

-    _startAppSwitcher : function(shellwm, binding, mask, window, backwards) {
+    _startAppSwitcher : function(display, screen, window, binding) {
        /* prevent a corner case where both popups show up at once */
        if (this._workspaceSwitcherPopup != null)
            this._workspaceSwitcherPopup.actor.hide();

        let tabPopup = new AltTab.AltTabPopup();

-        if (!tabPopup.show(backwards, binding, mask))
+        let modifiers = binding.get_modifiers();
+        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
+        if (!tabPopup.show(backwards, binding.get_name(), binding.get_mask()))
            tabPopup.destroy();
    },

-    _startA11ySwitcher : function(shellwm, binding, mask, window, backwards) {
-        Main.ctrlAltTabManager.popup(backwards, mask);
+    _startA11ySwitcher : function(display, screen, window, binding) {
+        let modifiers = binding.get_modifiers();
+        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
+        Main.ctrlAltTabManager.popup(backwards, binding.get_mask());
    },

-    _showWorkspaceSwitcher : function(shellwm, binding, mask, window, backwards) {
-        if (global.screen.n_workspaces == 1)
+    _showWorkspaceSwitcher : function(display, screen, window, binding) {
+        if (screen.n_workspaces == 1)
            return;

        if (this._workspaceSwitcherPopup == null)
            this._workspaceSwitcherPopup = new WorkspaceSwitcherPopup.WorkspaceSwitcherPopup();

-        if (binding == 'switch-to-workspace-up')
+        if (binding.get_name() == 'switch-to-workspace-up')
            this.actionMoveWorkspaceUp();
-        else if (binding == 'switch-to-workspace-down')
+        else if (binding.get_name() == 'switch-to-workspace-down')
            this.actionMoveWorkspaceDown();
        // left/right would effectively act as synonyms for up/down if we enabled them;
        // but that could be considered confusing.
-        // else if (binding == 'switch-to-workspace-left')
+        // else if (binding.get_name() == 'switch-to-workspace-left')
        //   this.actionMoveWorkspaceLeft();
-        // else if (binding == 'switch-to-workspace-right')
+        // else if (binding.get_name() == 'switch-to-workspace-right')
        //   this.actionMoveWorkspaceRight();
    },

@ -625,4 +623,4 @@ WindowManager.prototype = {
        if (!Main.overview.visible)
            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.DOWN, indexToActivate);
    }
-};
+});
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -23,6 +23,8 @@ const WINDOW_DND_SIZE = 256;

 const SCROLL_SCALE_AMOUNT = 100 / 5;

+const WINDOW_CLONE_MAXIMUM_SCALE = 0.7;
+
 const LIGHTBOX_FADE_TIME = 0.1;
 const CLOSE_BUTTON_FADE_TIME = 0.1;

@ -56,11 +58,13 @@ function _clamp(value, min, max) {
 }


-function ScaledPoint(x, y, scaleX, scaleY) {
-    [this.x, this.y, this.scaleX, this.scaleY] = arguments;
-}
+const ScaledPoint = new Lang.Class({
+    Name: 'ScaledPoint',
+
+    _init: function(x, y, scaleX, scaleY) {
+        [this.x, this.y, this.scaleX, this.scaleY] = arguments;
+    },

-ScaledPoint.prototype = {
    getPosition : function() {
        return [this.x, this.y];
    },
@ -86,18 +90,17 @@ ScaledPoint.prototype = {
        return [_interpolate(this.scaleX, other.scaleX, step),
                _interpolate(this.scaleY, other.scaleY, step)];
    }
-};
+});


-function WindowClone(realWindow) {
-    this._init(realWindow);
-}
+const WindowClone = new Lang.Class({
+    Name: 'WindowClone',

-WindowClone.prototype = {
-    _init : function(realWindow) {
+    _init : function(realWindow, workspace) {
        this.realWindow = realWindow;
        this.metaWindow = realWindow.meta_window;
        this.metaWindow._delegate = this;
+        this._workspace = workspace;

        let [borderX, borderY] = this._getInvisibleBorderPadding();
        this._windowClone = new Clutter.Clone({ source: realWindow.get_texture(),
@ -383,19 +386,12 @@ WindowClone.prototype = {
        this.emit('drag-begin');
    },

-    _getWorkspaceActor : function() {
-        let index = this.metaWindow.get_workspace().index();
-        return Main.overview.workspaces.getWorkspaceByIndex(index);
-    },
-
    handleDragOver : function(source, actor, x, y, time) {
-        let workspace = this._getWorkspaceActor();
-        return workspace.handleDragOver(source, actor, x, y, time);
+        return this._workspace.handleDragOver(source, actor, x, y, time);
    },

    acceptDrop : function(source, actor, x, y, time) {
-        let workspace = this._getWorkspaceActor();
-        workspace.acceptDrop(source, actor, x, y, time);
+        this._workspace.acceptDrop(source, actor, x, y, time);
    },

    _onDragCancelled : function (draggable, time) {
@ -418,7 +414,7 @@ WindowClone.prototype = {

        this.emit('drag-end');
    }
-};
+});
 Signals.addSignalMethods(WindowClone.prototype);


@ -427,11 +423,9 @@ Signals.addSignalMethods(WindowClone.prototype);
 * @parentActor: The actor which will be the parent of all overlay items
 *               such as app icon and window caption
 */
-function WindowOverlay(windowClone, parentActor) {
-    this._init(windowClone, parentActor);
-}
+const WindowOverlay = new Lang.Class({
+    Name: 'WindowOverlay',

-WindowOverlay.prototype = {
    _init : function(windowClone, parentActor) {
        let metaWindow = windowClone.metaWindow;

@ -496,6 +490,9 @@ WindowOverlay.prototype = {
    },

    fadeIn: function() {
+        if (!this._hidden)
+            return;
+
        this.show();
        this.title.opacity = 0;
        this._parentActor.raise_top();
@ -524,7 +521,7 @@ WindowOverlay.prototype = {
    // get_transformed_position() and get_transformed_size(),
    // as windowClone might be moving.
    // See Workspace._showWindowOverlay
-    updatePositions: function(cloneX, cloneY, cloneWidth, cloneHeight) {
+    updatePositions: function(cloneX, cloneY, cloneWidth, cloneHeight, animate) {
        let button = this.closeButton;
        let title = this.title;

@ -546,15 +543,34 @@ WindowOverlay.prototype = {
        else
            buttonX = cloneX + (cloneWidth - button._overlap);

-        button.set_position(Math.floor(buttonX), Math.floor(buttonY));
+        if (animate)
+            this._animateOverlayActor(button, Math.floor(buttonX), Math.floor(buttonY), button.width);
+        else
+            button.set_position(Math.floor(buttonX), Math.floor(buttonY));

        if (!title.fullWidth)
            title.fullWidth = title.width;
-        title.width = Math.min(title.fullWidth, cloneWidth);
+        let titleWidth = Math.min(title.fullWidth, cloneWidth);

-        let titleX = cloneX + (cloneWidth - title.width) / 2;
+        let titleX = cloneX + (cloneWidth - titleWidth) / 2;
        let titleY = cloneY + cloneHeight + title._spacing;
-        title.set_position(Math.floor(titleX), Math.floor(titleY));
+
+        if (animate)
+            this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY), titleWidth);
+        else {
+            title.width = titleWidth;
+            title.set_position(Math.floor(titleX), Math.floor(titleY));
+        }
+    },
+
+    _animateOverlayActor: function(actor, x, y, width) {
+        Tweener.addTween(actor,
+                         { x: x,
+                           y: y,
+                           width: width,
+                           time: Overview.ANIMATION_TIME,
+                           transition: 'easeOutQuad'
+                         });
    },

    _closeWindow: function(actor) {
@ -642,7 +658,7 @@ WindowOverlay.prototype = {

        this._parentActor.queue_relayout();
    }
-};
+});
 Signals.addSignalMethods(WindowOverlay.prototype);

 const WindowPositionFlags = {
@ -653,11 +669,9 @@ const WindowPositionFlags = {
 /**
 * @metaWorkspace: a #Meta.Workspace, or null
 */
-function Workspace(metaWorkspace, monitorIndex) {
-    this._init(metaWorkspace, monitorIndex);
-}
+const Workspace = new Lang.Class({
+    Name: 'Workspace',

-Workspace.prototype = {
    _init : function(metaWorkspace, monitorIndex) {
        // When dragging a window, we use this slot for reserve space.
        this._reservedSlot = null;
@ -952,7 +966,7 @@ Workspace.prototype = {

        let scale = Math.min((width - buttonOuterWidth) / rect.width,
                             (height - buttonOuterHeight - captionHeight) / rect.height,
-                             1.0);
+                             WINDOW_CLONE_MAXIMUM_SCALE);

        x = Math.floor(x + (width - scale * rect.width) / 2);

@ -1021,7 +1035,7 @@ Workspace.prototype = {

            let [x, y, scale] = this._computeWindowLayout(metaWindow, slot);

-            if (overlay)
+            if (overlay && initialPositioning)
                overlay.hide();
            if (animate && isOnCurrentWorkspace) {
                if (!metaWindow.showing_on_its_workspace()) {
@ -1044,20 +1058,11 @@ Workspace.prototype = {
                                      });
                }

-                Tweener.addTween(clone.actor,
-                                 { x: x,
-                                   y: y,
-                                   scale_x: scale,
-                                   scale_y: scale,
-                                   time: Overview.ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
-                                   onComplete: Lang.bind(this, function() {
-                                      this._showWindowOverlay(clone, overlay, true);
-                                   })
-                                 });
+                this._animateClone(clone, overlay, x, y, scale, initialPositioning);
            } else {
                clone.actor.set_position(x, y);
                clone.actor.set_scale(scale, scale);
+                this._updateWindowOverlayPositions(clone, overlay, x, y, scale, false);
                this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
            }
        }
@ -1079,23 +1084,35 @@ Workspace.prototype = {
        }
    },

+    _animateClone: function(clone, overlay, x, y, scale, initialPositioning) {
+        Tweener.addTween(clone.actor,
+                                 { x: x,
+                                   y: y,
+                                   scale_x: scale,
+                                   scale_y: scale,
+                                   time: Overview.ANIMATION_TIME,
+                                   transition: 'easeOutQuad',
+                                   onComplete: Lang.bind(this, function() {
+                                         this._showWindowOverlay(clone, overlay, true);
+                                   })
+                                 });
+
+        this._updateWindowOverlayPositions(clone, overlay, x, y, scale, true);
+    },
+
+    _updateWindowOverlayPositions: function(clone, overlay, x, y, scale, animate) {
+        let [cloneWidth, cloneHeight] = clone.actor.get_size();
+        cloneWidth = scale * cloneWidth;
+        cloneHeight = scale * cloneHeight;
+        if (overlay)
+            overlay.updatePositions(x, y, cloneWidth, cloneHeight, animate);
+    },
+
    _showWindowOverlay: function(clone, overlay, fade) {
        if (clone.inDrag)
            return;

-        // This is a little messy and complicated because when we
-        // start the fade-in we may not have done the final positioning
-        // of the workspaces. (Tweener doesn't necessarily finish
-        // all animations before calling onComplete callbacks.)
-        // So we need to manually compute where the window will
-        // be after the workspace animation finishes.
-        let [cloneX, cloneY] = clone.actor.get_position();
-        let [cloneWidth, cloneHeight] = clone.actor.get_size();
-        cloneWidth = clone.actor.scale_x * cloneWidth;
-        cloneHeight = clone.actor.scale_y * cloneHeight;
-
        if (overlay) {
-            overlay.updatePositions(cloneX, cloneY, cloneWidth, cloneHeight);
            if (fade)
                overlay.fadeIn();
            else
@ -1113,6 +1130,16 @@ Workspace.prototype = {
        }
    },

+    _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;
@ -1130,22 +1157,16 @@ Workspace.prototype = {
            return true;
        }

+        let actorUnderPointer = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
+        for (let i = 0; i < this._windows.length; i++) {
+            if (this._windows[i].actor == actorUnderPointer)
+                return true;
+        }
+
        this.positionWindows(WindowPositionFlags.ANIMATE);
        return false;
    },

-    showWindowsOverlays: function() {
-        if (this.leavingOverview)
-            return;
-
-        this._windowOverlaysGroup.show();
-        this._showAllOverlays();
-    },
-
-    hideWindowsOverlays: function() {
-        this._windowOverlaysGroup.hide();
-    },
-
    _doRemoveWindow : function(metaWin) {
        let win = metaWin.get_compositor_private();

@ -1299,7 +1320,7 @@ Workspace.prototype = {

        this.leavingOverview = true;

-        this.hideWindowsOverlays();
+        this._hideAllOverlays();

        if (this._repositionWindowsId > 0) {
            Mainloop.source_remove(this._repositionWindowsId);
@ -1390,7 +1411,7 @@ Workspace.prototype = {

    // Create a clone of a (non-desktop) window and add it to the window list
    _addWindowClone : function(win) {
-        let clone = new WindowClone(win);
+        let clone = new WindowClone(win, this);
        let overlay = new WindowOverlay(clone, this._windowOverlaysGroup);

        clone.connect('selected',
@ -1518,6 +1539,6 @@ Workspace.prototype = {

        return false;
    }
-};
+});

 Signals.addSignalMethods(Workspace.prototype);
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -15,11 +15,9 @@ const DISPLAY_TIMEOUT = 600;
 const UP = -1;
 const DOWN = 1;

-function WorkspaceSwitcherPopup() {
-    this._init();
-}
+const WorkspaceSwitcherPopup = new Lang.Class({
+    Name: 'WorkspaceSwitcherPopup',

-WorkspaceSwitcherPopup.prototype = {
    _init : function() {
        this.actor = new St.Group({ reactive: true,
                                         x: 0,
@ -158,4 +156,4 @@ WorkspaceSwitcherPopup.prototype = {
                                            onCompleteScope: this
                                           });
    }
-};
+});
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -25,11 +25,9 @@ const SLIDE_ANIMATION_TIME = 0.2;
 // placeholder exactly.
 const WORKSPACE_CUT_SIZE = 10;

-function WindowClone(realWindow) {
-    this._init(realWindow);
-}
+const WindowClone = new Lang.Class({
+    Name: 'WindowClone',

-WindowClone.prototype = {
    _init : function(realWindow) {
        this.actor = new Clutter.Clone({ source: realWindow.get_texture(),
                                         reactive: true });
@ -53,6 +51,7 @@ WindowClone.prototype = {
                                              dragActorMaxSize: Workspace.WINDOW_DND_SIZE,
                                              dragActorOpacity: Workspace.DRAGGING_WINDOW_OPACITY });
        this._draggable.connect('drag-begin', Lang.bind(this, this._onDragBegin));
+        this._draggable.connect('drag-cancelled', Lang.bind(this, this._onDragCancelled));
        this._draggable.connect('drag-end', Lang.bind(this, this._onDragEnd));
        this.inDrag = false;
    },
@ -110,6 +109,10 @@ WindowClone.prototype = {
        this.emit('drag-begin');
    },

+    _onDragCancelled : function (draggable, time) {
+        this.emit('drag-cancelled');
+    },
+
    _onDragEnd : function (draggable, time, snapback) {
        this.inDrag = false;

@ -126,7 +129,7 @@ WindowClone.prototype = {

        this.emit('drag-end');
    }
-};
+});
 Signals.addSignalMethods(WindowClone.prototype);


@ -144,15 +147,15 @@ const ThumbnailState = {
 /**
 * @metaWorkspace: a #Meta.Workspace
 */
-function WorkspaceThumbnail(metaWorkspace) {
-    this._init(metaWorkspace);
-}
+const WorkspaceThumbnail = new Lang.Class({
+    Name: 'WorkspaceThumbnail',

-WorkspaceThumbnail.prototype = {
    _init : function(metaWorkspace) {
        this.metaWorkspace = metaWorkspace;
        this.monitorIndex = Main.layoutManager.primaryIndex;

+        this._removed = false;
+
        this.actor = new St.Group({ reactive: true,
                                    clip_to_allocation: true,
                                    style_class: 'workspace-thumbnail' });
@ -178,17 +181,21 @@ WorkspaceThumbnail.prototype = {
        let monitor = Main.layoutManager.primaryMonitor;
        this.setPorthole(monitor.x, monitor.y, monitor.width, monitor.height);

-        let windows = global.get_window_actors().filter(this._isMyWindow, this);
+        let windows = global.get_window_actors().filter(this._isWorkspaceWindow, this);

        // Create clones for windows that should be visible in the Overview
        this._windows = [];
+        this._allWindows = [];
+        this._minimizedChangedIds = [];
        for (let i = 0; i < windows.length; i++) {
-            windows[i].meta_window._minimizedChangedId =
+            let minimizedChangedId =
                windows[i].meta_window.connect('notify::minimized',
                                               Lang.bind(this,
                                                         this._updateMinimized));
+            this._allWindows.push(windows[i].meta_window);
+            this._minimizedChangedIds.push(minimizedChangedId);

-            if (this._isOverviewWindow(windows[i])) {
+            if (this._isMyWindow(windows[i]) && this._isOverviewWindow(windows[i])) {
                this._addWindowClone(windows[i]);
            }
        }
@ -273,17 +280,11 @@ WorkspaceThumbnail.prototype = {
        let clone = this._windows[index];
        this._windows.splice(index, 1);

-        if (win && this._isOverviewWindow(win)) {
-            if (metaWin._minimizedChangedId) {
-                metaWin.disconnect(metaWin._minimizedChangedId);
-                delete metaWin._minimizedChangedId;
-            }
-        }
        clone.destroy();
    },

    _doAddWindow : function(metaWin) {
-        if (this.leavingOverview)
+        if (this._removed)
            return;

        let win = metaWin.get_compositor_private();
@ -293,7 +294,7 @@ WorkspaceThumbnail.prototype = {
            // the compositor finds out about them...
            Mainloop.idle_add(Lang.bind(this,
                                        function () {
-                                            if (this.actor &&
+                                            if (!this._removed &&
                                                metaWin.get_compositor_private() &&
                                                metaWin.get_workspace() == this.metaWorkspace)
                                                this._doAddWindow(metaWin);
@ -302,16 +303,19 @@ WorkspaceThumbnail.prototype = {
            return;
        }

+        if (this._allWindows.indexOf(metaWin) == -1) {
+            let minimizedChangedId = metaWin.connect('notify::minimized',
+                                                     Lang.bind(this,
+                                                               this._updateMinimized));
+            this._allWindows.push(metaWin);
+            this._minimizedChangedIds.push(minimizedChangedId);
+        }
+
        // We might have the window in our list already if it was on all workspaces and
        // now was moved to this workspace
        if (this._lookupIndex (metaWin) != -1)
            return;

-        if (!metaWin._minimizedChangedId)
-            metaWin._minimizedChangedId = metaWin.connect('notify::minimized',
-                                                          Lang.bind(this,
-                                                                    this._updateMinimized));
-
        if (!this._isMyWindow(win) || !this._isOverviewWindow(win))
            return;

@ -323,6 +327,13 @@ WorkspaceThumbnail.prototype = {
    },

    _windowRemoved : function(metaWorkspace, metaWin) {
+        let index = this._allWindows.indexOf(metaWin);
+        if (index != -1) {
+            metaWin.disconnect(this._minimizedChangedIds[index]);
+            this._allWindows.splice(index, 1);
+            this._minimizedChangedIds.splice(index, 1);
+        }
+
        this._doRemoveWindow(metaWin);
    },

@ -349,27 +360,36 @@ WorkspaceThumbnail.prototype = {
        this.actor.destroy();
    },

-    _onDestroy: function(actor) {
+    workspaceRemoved : function() {
+        if (this._removed)
+            return;
+
+        this._removed = true;
+
        this.metaWorkspace.disconnect(this._windowAddedId);
        this.metaWorkspace.disconnect(this._windowRemovedId);
        global.screen.disconnect(this._windowEnteredMonitorId);
        global.screen.disconnect(this._windowLeftMonitorId);

-        for (let i = 0; i < this._windows.length; i++) {
-            let metaWin = this._windows[i].metaWindow;
-            if (metaWin._minimizedChangedId) {
-                metaWin.disconnect(metaWin._minimizedChangedId);
-                delete metaWin._minimizedChangedId;
-            }
-        }
+        for (let i = 0; i < this._allWindows.length; i++)
+            this._allWindows[i].disconnect(this._minimizedChangedIds[i]);
+    },
+
+    _onDestroy: function(actor) {
+        this.workspaceRemoved();

        this._windows = [];
        this.actor = null;
    },

+    // Tests if @win belongs to this workspace
+    _isWorkspaceWindow : function (win) {
+        return Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index());
+    },
+
    // Tests if @win belongs to this workspace and monitor
    _isMyWindow : function (win) {
-        return Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index()) &&
+        return this._isWorkspaceWindow(win) &&
            (!win.get_meta_window() || win.get_meta_window().get_monitor() == this.monitorIndex);
    },

@ -390,6 +410,10 @@ WorkspaceThumbnail.prototype = {
                      Lang.bind(this, function(clone) {
                          Main.overview.beginWindowDrag();
                      }));
+        clone.connect('drag-cancelled',
+                      Lang.bind(this, function(clone) {
+                          Main.overview.cancelledWindowDrag();
+                      }));
        clone.connect('drag-end',
                      Lang.bind(this, function(clone) {
                          Main.overview.endWindowDrag();
@ -469,16 +493,14 @@ WorkspaceThumbnail.prototype = {

        return false;
    }
-};
+});

 Signals.addSignalMethods(WorkspaceThumbnail.prototype);


-function ThumbnailsBox() {
-    this._init();
-}
+const ThumbnailsBox = new Lang.Class({
+    Name: 'ThumbnailsBox',

-ThumbnailsBox.prototype = {
    _init: function() {
        this.actor = new Shell.GenericContainer({ style_class: 'workspace-thumbnails',
                                                  request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT });
@ -525,6 +547,59 @@ ThumbnailsBox.prototype = {
            this._stateCounts[ThumbnailState[key]] = 0;

        this._thumbnails = [];
+
+        Main.overview.connect('item-drag-begin',
+                              Lang.bind(this, this._onDragBegin));
+        Main.overview.connect('item-drag-end',
+                              Lang.bind(this, this._onDragEnd));
+        Main.overview.connect('item-drag-cancelled',
+                              Lang.bind(this, this._onDragCancelled));
+        Main.overview.connect('window-drag-begin',
+                              Lang.bind(this, this._onDragBegin));
+        Main.overview.connect('window-drag-end',
+                              Lang.bind(this, this._onDragEnd));
+        Main.overview.connect('window-drag-cancelled',
+                              Lang.bind(this, this._onDragCancelled));
+    },
+
+    _onDragBegin: function() {
+        this._dragCancelled = false;
+        this._dragMonitor = {
+            dragMotion: Lang.bind(this, this._onDragMotion)
+        };
+        DND.addDragMonitor(this._dragMonitor);
+    },
+
+    _onDragEnd: function() {
+        if (this._dragCancelled)
+            return;
+
+        this._endDrag();
+    },
+
+    _onDragCancelled: function() {
+        this._dragCancelled = true;
+        this._endDrag();
+    },
+
+    _endDrag: function() {
+        this._clearDragPlaceholder();
+        DND.removeDragMonitor(this._dragMonitor);
+    },
+
+    _onDragMotion: function(dragEvent) {
+        if (!this.actor.contains(dragEvent.targetActor))
+            this._onLeave();
+        return DND.DragMotionResult.CONTINUE;
+    },
+
+    _onLeave: function() {
+        this._clearDragPlaceholder();
+    },
+
+    _clearDragPlaceholder: function() {
+        this._dropPlaceholderPos = -1;
+        this.actor.queue_relayout();
    },

    // Draggable target interface
@ -597,7 +672,7 @@ ThumbnailsBox.prototype = {
            // ... and bam, a workspace, good as new.
            source.metaWindow.change_workspace_by_index(newWorkspaceIndex,
                                                        true, time);
-        else (source.shellWorkspaceLaunch)
+        else if (source.shellWorkspaceLaunch)
            source.shellWorkspaceLaunch({ workspace: newWorkspaceIndex,
                                          timestamp: time });

@ -676,8 +751,10 @@ ThumbnailsBox.prototype = {
            if (thumbnail.state > ThumbnailState.NORMAL)
                continue;

-            if (currentPos >= start && currentPos < start + count)
+            if (currentPos >= start && currentPos < start + count) {
+                thumbnail.workspaceRemoved();
                this._setThumbnailState(thumbnail, ThumbnailState.REMOVING);
+            }

            currentPos++;
        }
@ -1028,4 +1105,4 @@ ThumbnailsBox.prototype = {
                           onCompleteScope: this
                         });
    }
-};
+});
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@ -19,15 +20,14 @@ const WORKSPACE_SWITCH_TIME = 0.25;
 // Note that mutter has a compile-time limit of 36
 const MAX_WORKSPACES = 16;

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

 const CONTROLS_POP_IN_TIME = 0.1;


-function WorkspacesView(workspaces) {
-    this._init(workspaces);
-}
+const WorkspacesView = new Lang.Class({
+    Name: 'WorkspacesView',

-WorkspacesView.prototype = {
    _init: function(workspaces) {
        this.actor = new St.Group({ style_class: 'workspaces-view' });

@ -42,8 +42,6 @@ WorkspacesView.prototype = {
                this._spacing = node.get_length('spacing');
                this._updateWorkspaceActors(false);
            }));
-        this.actor.connect('notify::mapped',
-                           Lang.bind(this, this._onMappedChanged));

        this._width = 0;
        this._height = 0;
@ -61,6 +59,11 @@ WorkspacesView.prototype = {
        this._zoomOut = false; // zoom to a larger area
        this._inDrag = false; // dragging a window

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

@ -69,17 +72,7 @@ WorkspacesView.prototype = {
            this._workspaces[w].actor.reparent(this.actor);
        this._workspaces[activeWorkspaceIndex].actor.raise_top();

-        this._extraWorkspaces = [];
-        let monitors = Main.layoutManager.monitors;
-        let m = 0;
-        for (let i = 0; i < monitors.length; i++) {
-            if (i == Main.layoutManager.primaryIndex)
-                continue;
-            let ws = new Workspace.Workspace(null, i);
-            this._extraWorkspaces[m++] = ws;
-            ws.setGeometry(monitors[i].x, monitors[i].y, monitors[i].width, monitors[i].height);
-            global.overlay_group.add_actor(ws.actor);
-        }
+        this._updateExtraWorkspaces();

        // Position/scale the desktop windows and their children after the
        // workspaces have been created. This cannot be done first because
@ -90,6 +83,8 @@ WorkspacesView.prototype = {
                                 Lang.bind(this, function() {
                for (let w = 0; w < this._workspaces.length; w++)
                    this._workspaces[w].zoomToOverview();
+                if (!this._extraWorkspaces)
+                    return;
                for (let w = 0; w < this._extraWorkspaces.length; w++)
                    this._extraWorkspaces[w].zoomToOverview();
        }));
@ -100,14 +95,14 @@ WorkspacesView.prototype = {
                                    this._clipWidth, this._clipHeight);
        }));

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

        this._switchWorkspaceNotifyId =
            global.window_manager.connect('switch-workspace',
@ -121,8 +116,35 @@ WorkspacesView.prototype = {
                                                        Lang.bind(this, this._dragBegin));
        this._windowDragEndId = Main.overview.connect('window-drag-end',
                                                      Lang.bind(this, this._dragEnd));
-        this._swipeScrollBeginId = 0;
-        this._swipeScrollEndId = 0;
+    },
+
+    _updateExtraWorkspaces: function() {
+        this._destroyExtraWorkspaces();
+
+        if (!this._settings.get_boolean('workspaces-only-on-primary'))
+            return;
+
+        this._extraWorkspaces = [];
+        let monitors = Main.layoutManager.monitors;
+        for (let i = 0; i < monitors.length; i++) {
+            if (i == Main.layoutManager.primaryIndex)
+                continue;
+
+            let ws = new Workspace.Workspace(null, i);
+            ws.setGeometry(monitors[i].x, monitors[i].y,
+                           monitors[i].width, monitors[i].height);
+            global.overlay_group.add_actor(ws.actor);
+            this._extraWorkspaces.push(ws);
+        }
+    },
+
+    _destroyExtraWorkspaces: function() {
+        if (!this._extraWorkspaces)
+            return;
+
+        for (let m = 0; m < this._extraWorkspaces.length; m++)
+            this._extraWorkspaces[m].destroy();
+        this._extraWorkspaces = null;
    },

    setGeometry: function(x, y, width, height, spacing) {
@ -159,10 +181,6 @@ WorkspacesView.prototype = {
        return this._workspaces[active];
    },

-    getWorkspaceByIndex: function(index) {
-        return this._workspaces[index];
-    },
-
    hide: function() {
        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
        let activeWorkspace = this._workspaces[activeWorkspaceIndex];
@ -173,6 +191,8 @@ WorkspacesView.prototype = {

        for (let w = 0; w < this._workspaces.length; w++)
            this._workspaces[w].zoomFromOverview();
+        if (!this._extraWorkspaces)
+            return;
        for (let w = 0; w < this._extraWorkspaces.length; w++)
            this._extraWorkspaces[w].zoomFromOverview();
    },
@ -184,6 +204,8 @@ WorkspacesView.prototype = {
    syncStacking: function(stackIndices) {
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].syncStacking(stackIndices);
+        if (!this._extraWorkspaces)
+            return;
        for (let i = 0; i < this._extraWorkspaces.length; i++)
            this._extraWorkspaces[i].syncStacking(stackIndices);
    },
@ -245,10 +267,8 @@ WorkspacesView.prototype = {
        for (let w = 0; w < this._workspaces.length; w++) {
            let workspace = this._workspaces[w];
            if (this._animating || this._scrolling) {
-                workspace.hideWindowsOverlays();
                workspace.actor.show();
            } else {
-                workspace.showWindowsOverlays();
                if (this._inDrag)
                    workspace.actor.visible = (Math.abs(w - active) <= 1);
                else
@ -264,7 +284,7 @@ WorkspacesView.prototype = {
        this._animatingScroll = true;

        if (showAnimation) {
-            Tweener.addTween(this._scrollAdjustment, {
+            Tweener.addTween(this.scrollAdjustment, {
               value: index,
               time: WORKSPACE_SWITCH_TIME,
               transition: 'easeOutQuad',
@ -274,7 +294,7 @@ WorkspacesView.prototype = {
                   })
            });
        } else {
-            this._scrollAdjustment.value = index;
+            this.scrollAdjustment.value = index;
            this._animatingScroll = false;
        }
    },
@ -282,7 +302,7 @@ WorkspacesView.prototype = {
    updateWorkspaces: function(oldNumWorkspaces, newNumWorkspaces) {
        let active = global.screen.get_active_workspace_index();

-        Tweener.addTween(this._scrollAdjustment,
+        Tweener.addTween(this.scrollAdjustment,
                         { upper: newNumWorkspaces,
                           time: WORKSPACE_SWITCH_TIME,
                           transition: 'easeOutQuad'
@ -309,12 +329,12 @@ WorkspacesView.prototype = {
    },

    _onDestroy: function() {
-        for (let i = 0; i < this._extraWorkspaces.length; i++)
-            this._extraWorkspaces[i].destroy();
-        this._scrollAdjustment.run_dispose();
+        this._destroyExtraWorkspaces();
+        this.scrollAdjustment.run_dispose();
        Main.overview.disconnect(this._overviewShowingId);
        Main.overview.disconnect(this._overviewShownId);
        global.window_manager.disconnect(this._switchWorkspaceNotifyId);
+        this._settings.disconnect(this._updateExtraWorkspacesId);

        if (this._inDrag)
            this._dragEnd();
@ -337,21 +357,6 @@ WorkspacesView.prototype = {
        }
    },

-    _onMappedChanged: function() {
-        if (this.actor.mapped) {
-            let direction = Overview.SwipeScrollDirection.VERTICAL;
-            Main.overview.setScrollAdjustment(this._scrollAdjustment,
-                                              direction);
-            this._swipeScrollBeginId = Main.overview.connect('swipe-scroll-begin',
-                                                             Lang.bind(this, this._swipeScrollBegin));
-            this._swipeScrollEndId = Main.overview.connect('swipe-scroll-end',
-                                                           Lang.bind(this, this._swipeScrollEnd));
-        } else {
-            Main.overview.disconnect(this._swipeScrollBeginId);
-            Main.overview.disconnect(this._swipeScrollEndId);
-        }
-    },
-
    _dragBegin: function() {
        if (this._scrolling)
            return;
@ -373,6 +378,9 @@ WorkspacesView.prototype = {
            this._firstDragMotion = false;
            for (let i = 0; i < this._workspaces.length; i++)
                this._workspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
+            if (!this._extraWorkspaces)
+                return DND.DragMotionResult.CONTINUE;
+
            for (let i = 0; i < this._extraWorkspaces.length; i++)
                this._extraWorkspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
        }
@ -386,15 +394,18 @@ WorkspacesView.prototype = {

        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].setReservedSlot(null);
+
+        if (!this._extraWorkspaces)
+            return;
        for (let i = 0; i < this._extraWorkspaces.length; i++)
            this._extraWorkspaces[i].setReservedSlot(null);
    },

-    _swipeScrollBegin: function() {
+    startSwipeScroll: function() {
        this._scrolling = true;
    },

-    _swipeScrollEnd: function(overview, result) {
+    endSwipeScroll: function(result) {
        this._scrolling = false;

        if (result == Overview.SwipeScrollResult.CLICK) {
@ -443,7 +454,6 @@ WorkspacesView.prototype = {
        let dy = newY - currentY;

        for (let i = 0; i < this._workspaces.length; i++) {
-            this._workspaces[i].hideWindowsOverlays();
            this._workspaces[i].actor.visible = Math.abs(i - adj.value) <= 1;
            this._workspaces[i].actor.y += dy;
        }
@ -452,20 +462,20 @@ WorkspacesView.prototype = {
    _getWorkspaceIndexToRemove: function() {
        return global.screen.get_active_workspace_index();
    }
-};
+});
 Signals.addSignalMethods(WorkspacesView.prototype);


-function WorkspacesDisplay() {
-    this._init();
-}
+const WorkspacesDisplay = new Lang.Class({
+    Name: 'WorkspacesDisplay',

-WorkspacesDisplay.prototype = {
    _init: function() {
        this.actor = new Shell.GenericContainer();
        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
        this.actor.connect('allocate', Lang.bind(this, this._allocate));
+        this.actor.connect('notify::mapped', Lang.bind(this, this._setupSwipeScrolling));
+        this.actor.connect('parent-set', Lang.bind(this, this._parentSet));
        this.actor.set_clip_to_allocation(true);

        let controls = new St.Bin({ style_class: 'workspace-controls',
@ -482,12 +492,19 @@ WorkspacesDisplay.prototype = {
        controls.connect('scroll-event',
                         Lang.bind(this, this._onScrollEvent));

-        this._monitorIndex = Main.layoutManager.primaryIndex;
+        this._primaryIndex = Main.layoutManager.primaryIndex;

        this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
        controls.add_actor(this._thumbnailsBox.actor);

-        this.workspacesView = null;
+        this._workspacesViews = null;
+        this._primaryScrollAdjustment = null;
+
+        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
+        this._settings.connect('changed::workspaces-only-on-primary',
+                               Lang.bind(this,
+                                         this._workspacesOnlyOnPrimaryChanged));
+        this._workspacesOnlyOnPrimaryChanged();

        this._inDrag = false;
        this._cancelledDrag = false;
@ -498,6 +515,8 @@ WorkspacesDisplay.prototype = {

        this._updateAlwaysZoom();

+        // If we stop hiding the overview on layout changes, we will need to
+        // update the _workspacesViews here
        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._updateAlwaysZoom));

        Main.xdndHandler.connect('drag-begin', Lang.bind(this, function(){
@ -518,6 +537,9 @@ WorkspacesDisplay.prototype = {
        this._windowDragBeginId = 0;
        this._windowDragCancelledId = 0;
        this._windowDragEndId = 0;
+        this._notifyOpacityId = 0;
+        this._swipeScrollBeginId = 0;
+        this._swipeScrollEndId = 0;
    },

    show: function() {
@ -528,16 +550,7 @@ WorkspacesDisplay.prototype = {
        this._controls.show();
        this._thumbnailsBox.show();

-        this._workspaces = [];
-        for (let i = 0; i < global.screen.n_workspaces; i++) {
-            let metaWorkspace = global.screen.get_workspace_by_index(i);
-            this._workspaces[i] = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
-        }
-
-        if (this.workspacesView)
-            this.workspacesView.destroy();
-        this.workspacesView = new WorkspacesView(this._workspaces);
-        this._updateWorkspacesGeometry();
+        this._updateWorkspacesViews();

        this._restackedNotifyId =
            global.screen.connect('restacked',
@ -568,6 +581,12 @@ WorkspacesDisplay.prototype = {
        this._onRestacked();
    },

+    zoomFromOverview: function() {
+        for (let i = 0; i < this._workspacesViews.length; i++) {
+            this._workspacesViews[i].hide();
+        }
+    },
+
    hide: function() {
        this._controls.hide();
        this._thumbnailsBox.hide();
@ -601,12 +620,120 @@ WorkspacesDisplay.prototype = {
            this._windowDragEndId = 0;
        }

-        this.workspacesView.destroy();
-        this.workspacesView = null;
-        for (let w = 0; w < this._workspaces.length; w++) {
-            this._workspaces[w].disconnectAll();
-            this._workspaces[w].destroy();
+        for (let i = 0; i < this._workspacesViews.length; i++)
+            this._workspacesViews[i].destroy();
+        this._workspacesViews = null;
+
+        for (let i = 0; i < this._workspaces.length; i++)
+            for (let w = 0; w < this._workspaces[i].length; w++) {
+                this._workspaces[i][w].disconnectAll();
+                this._workspaces[i][w].destroy();
+            }
+    },
+
+    _setupSwipeScrolling: function() {
+        if (this._swipeScrollBeginId)
+            Main.overview.disconnect(this._swipeScrollBeginId);
+        this._swipeScrollBeginId = 0;
+
+        if (this._swipeScrollEndId)
+            Main.overview.disconnect(this._swipeScrollEndId);
+        this._swipeScrollEndId = 0;
+
+        if (!this.actor.mapped)
+            return;
+
+        let direction = Overview.SwipeScrollDirection.VERTICAL;
+        Main.overview.setScrollAdjustment(this._scrollAdjustment,
+                                          direction);
+        this._swipeScrollBeginId = Main.overview.connect('swipe-scroll-begin',
+            Lang.bind(this, function() {
+                for (let i = 0; i < this._workspacesViews.length; i++)
+                    this._workspacesViews[i].startSwipeScroll();
+            }));
+        this._swipeScrollEndId = Main.overview.connect('swipe-scroll-end',
+           Lang.bind(this, function(overview, result) {
+                for (let i = 0; i < this._workspacesViews.length; i++)
+                    this._workspacesViews[i].endSwipeScroll(result);
+           }));
+    },
+
+    _workspacesOnlyOnPrimaryChanged: function() {
+        this._workspacesOnlyOnPrimary = this._settings.get_boolean('workspaces-only-on-primary');
+
+        if (!Main.overview.visible)
+            return;
+
+        this._updateWorkspacesViews();
+    },
+
+    _updateWorkspacesViews: function() {
+        if (this._workspacesViews)
+            for (let i = 0; i < this._workspacesViews.length; i++)
+                this._workspacesViews[i].destroy();
+
+        if (this._workspaces)
+            for (let i = 0; i < this._workspaces.length; i++)
+                for (let w = 0; w < this._workspaces[i].length; w++)
+                    this._workspaces[i][w].destroy();
+
+        this._workspacesViews = [];
+        this._workspaces = [];
+        let monitors = Main.layoutManager.monitors;
+        for (let i = 0; i < monitors.length; i++) {
+            if (this._workspacesOnlyOnPrimary && i != this._primaryIndex)
+                continue;  // we are only interested in the primary monitor
+
+            let monitorWorkspaces = [];
+            for (let w = 0; w < global.screen.n_workspaces; w++) {
+                let metaWorkspace = global.screen.get_workspace_by_index(w);
+                monitorWorkspaces.push(new Workspace.Workspace(metaWorkspace, i));
+            }
+
+            this._workspaces.push(monitorWorkspaces);
+
+            let view = new WorkspacesView(monitorWorkspaces);
+            if (this._workspacesOnlyOnPrimary || i == this._primaryIndex) {
+                this._scrollAdjustment = view.scrollAdjustment;
+                this._scrollAdjustment.connect('notify::value',
+                                               Lang.bind(this, this._scrollValueChanged));
+                this._setupSwipeScrolling();
+            }
+            this._workspacesViews.push(view);
        }
+
+        this._updateWorkspacesGeometry();
+
+        for (let i = 0; i < this._workspacesViews.length; i++)
+            global.overlay_group.add_actor(this._workspacesViews[i].actor);
+    },
+
+    _scrollValueChanged: function() {
+        if (this._workspacesOnlyOnPrimary)
+            return;
+
+        for (let i = 0; i < this._workspacesViews.length; i++) {
+            if (i == this._primaryIndex)
+                continue;
+
+            let adjustment = this._workspacesViews[i].scrollAdjustment;
+            // the adjustments work in terms of workspaces, so the
+            // values map directly
+            adjustment.value = this._scrollAdjustment.value;
+        }
+    },
+
+    _getPrimaryView: function() {
+        if (!this._workspacesViews)
+            return null;
+        if (this._workspacesOnlyOnPrimary)
+            return this._workspacesViews[0];
+        else
+            return this._workspacesViews[this._primaryIndex];
+    },
+
+    activeWorkspaceHasMaximizedWindows: function() {
+        return this._getPrimaryView().getActiveWorkspace().hasMaximizedWindows();
    },

    // zoomFraction property allows us to tween the controls sliding in and out
@ -679,8 +806,37 @@ WorkspacesDisplay.prototype = {
        this._updateWorkspacesGeometry();
    },

+    _parentSet: function(actor, oldParent) {
+        if (oldParent && this._notifyOpacityId)
+            oldParent.disconnect(this._notifyOpacityId);
+        this._notifyOpacityId = 0;
+
+        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
+            function() {
+                let newParent = this.actor.get_parent();
+                if (!newParent)
+                    return;
+
+                // This is kinda hackish - we want the primary view to
+                // appear as parent of this.actor, though in reality it
+                // is added directly to overlay_group
+                this._notifyOpacityId = newParent.connect('notify::opacity',
+                    Lang.bind(this, function() {
+                        let opacity = this.actor.get_parent().opacity;
+                        let primaryView = this._getPrimaryView();
+                        if (!primaryView)
+                            return;
+                        primaryView.actor.opacity = opacity;
+                        if (opacity == 0)
+                            primaryView.actor.hide();
+                        else
+                            primaryView.actor.show();
+                    }));
+        }));
+    },
+
    _updateWorkspacesGeometry: function() {
-        if (!this.workspacesView)
+        if (!this._workspacesViews)
            return;

        let fullWidth = this.actor.allocation.x2 - this.actor.allocation.x1;
@ -701,8 +857,6 @@ WorkspacesDisplay.prototype = {
        let clipX = rtl ? x + controlsVisible : x;
        let clipY = y + (fullHeight - clipHeight) / 2;

-        this.workspacesView.setClipRect(clipX, clipY, clipWidth, clipHeight);
-
        if (this._zoomOut) {
            width -= controlsNatural;
            if (rtl)
@ -717,7 +871,28 @@ WorkspacesDisplay.prototype = {
        let difference = fullHeight - height;
        y += difference / 2;

-        this.workspacesView.setGeometry(x, y, width, height, difference);
+
+        let monitors = Main.layoutManager.monitors;
+        let m = 0;
+        for (let i = 0; i < monitors.length; i++) {
+            if (i == this._primaryIndex) {
+                this._workspacesViews[m].setClipRect(clipX, clipY,
+                                                     clipWidth, clipHeight);
+                this._workspacesViews[m].setGeometry(x, y, width, height,
+                                                     difference);
+                m++;
+            } else if (!this._workspacesOnlyOnPrimary) {
+                this._workspacesViews[m].setClipRect(monitors[i].x,
+                                                     monitors[i].y,
+                                                     monitors[i].width,
+                                                     monitors[i].height);
+                this._workspacesViews[m].setGeometry(monitors[i].x,
+                                                     monitors[i].y,
+                                                     monitors[i].width,
+                                                     monitors[i].height, 0);
+                m++;
+            }
+        }
    },

    _onRestacked: function() {
@ -729,12 +904,14 @@ WorkspacesDisplay.prototype = {
            stackIndices[stack[i].get_meta_window().get_stable_sequence()] = i;
        }

-        this.workspacesView.syncStacking(stackIndices);
+        for (let i = 0; i < this._workspacesViews.length; i++)
+            this._workspacesViews[i].syncStacking(stackIndices);
+
        this._thumbnailsBox.syncStacking(stackIndices);
    },

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

@ -744,15 +921,24 @@ WorkspacesDisplay.prototype = {
        this._updateAlwaysZoom();
        this._updateZoom();

-        if (this.workspacesView == null)
+        if (this._workspacesViews == null)
            return;

        let lostWorkspaces = [];
        if (newNumWorkspaces > oldNumWorkspaces) {
-            // Assume workspaces are only added at the end
-            for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-                let metaWorkspace = global.screen.get_workspace_by_index(w);
-                this._workspaces[w] = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
+            let monitors = Main.layoutManager.monitors;
+            let m = 0;
+            for (let i = 0; i < monitors.length; i++) {
+                if (this._workspacesOnlyOnPrimaryChanged &&
+                    i != this._primaryIndex)
+                    continue;
+
+                // Assume workspaces are only added at the end
+                for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
+                    let metaWorkspace = global.screen.get_workspace_by_index(w);
+                    this._workspaces[m++][w] =
+                        new Workspace.Workspace(metaWorkspace, i);
+                }
            }

            this._thumbnailsBox.addThumbnails(oldNumWorkspaces, newNumWorkspaces - oldNumWorkspaces);
@ -763,25 +949,28 @@ WorkspacesDisplay.prototype = {
            let removedNum = oldNumWorkspaces - newNumWorkspaces;
            for (let w = 0; w < oldNumWorkspaces; w++) {
                let metaWorkspace = global.screen.get_workspace_by_index(w);
-                if (this._workspaces[w].metaWorkspace != metaWorkspace) {
+                if (this._workspaces[0][w].metaWorkspace != metaWorkspace) {
                    removedIndex = w;
                    break;
                }
            }

-            lostWorkspaces = this._workspaces.splice(removedIndex,
-                                                     removedNum);
+            for (let i = 0; i < this._workspaces.length; i++) {
+                lostWorkspaces = this._workspaces[i].splice(removedIndex,
+                                                            removedNum);

-            for (let l = 0; l < lostWorkspaces.length; l++) {
-                lostWorkspaces[l].disconnectAll();
-                lostWorkspaces[l].destroy();
+                for (let l = 0; l < lostWorkspaces.length; l++) {
+                    lostWorkspaces[l].disconnectAll();
+                    lostWorkspaces[l].destroy();
+                }
            }

            this._thumbnailsBox.removeThumbmails(removedIndex, removedNum);
        }

-        this.workspacesView.updateWorkspaces(oldNumWorkspaces,
-                                             newNumWorkspaces);
+        for (let i = 0; i < this._workspacesViews.length; i++)
+            this._workspacesViews[i].updateWorkspaces(oldNumWorkspaces,
+                                                      newNumWorkspaces);
    },

    _updateZoom : function() {
@ -793,7 +982,7 @@ WorkspacesDisplay.prototype = {
            this._zoomOut = shouldZoom;
            this._updateWorkspacesGeometry();

-            if (!this.workspacesView)
+            if (!this._workspacesViews)
                return;

            Tweener.addTween(this,
@ -801,7 +990,8 @@ WorkspacesDisplay.prototype = {
                               time: WORKSPACE_SWITCH_TIME,
                               transition: 'easeOutQuad' });

-            this.workspacesView.updateWindowPositions();
+            for (let i = 0; i < this._workspacesViews.length; i++)
+                this._workspacesViews[i].updateWindowPositions();
        }
    },

@ -852,5 +1042,5 @@ WorkspacesDisplay.prototype = {
            break;
        }
    }
-};
+});
 Signals.addSignalMethods(WorkspacesDisplay.prototype);
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@ -6,11 +6,9 @@ const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const DND = imports.ui.dnd;

-function XdndHandler() {
-    this._init();
-}
+const XdndHandler = new Lang.Class({
+    Name: 'XdndHandler',

-XdndHandler.prototype = {
    _init: function() {
        // Used to display a clone of the cursor window when the
        // window group is hidden (like it happens in the overview)
@ -125,6 +123,6 @@ XdndHandler.prototype = {
                pickedActor = pickedActor.get_parent();
        }
    }
-}
+});

 Signals.addSignalMethods(XdndHandler.prototype);
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -35,6 +35,7 @@ kn
 ku
 lt
 lv
+mk
 mr
 ms
 nb
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -36,6 +36,7 @@ js/ui/status/volume.js
 js/ui/telepathyClient.js
 js/ui/userMenu.js
 js/ui/viewSelector.js
+js/ui/wanda.js
 js/ui/windowAttentionHandler.js
 src/gvc/gvc-mixer-control.c
 src/main.c
--- a/po/be.po
+++ b/po/be.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/it.po
+++ b/po/it.po
@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2011-10-04 20:49+0000\n"
-"PO-Revision-Date: 2011-10-17 10:30+0200\n"
+"PO-Revision-Date: 2012-01-04 10:19+0100\n"
 "Last-Translator: Luca Ferretti <lferrett@gnome.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@ -583,7 +583,7 @@ msgstr[1] "Il sistema verrà spento automaticamente tra %d secondi."

 #: ../js/ui/endSessionDialog.js:87
 msgid "Powering off the system."
-msgstr "pegnimento del sistema."
+msgstr "Spegnimento del sistema."

 #: ../js/ui/endSessionDialog.js:98
 msgid "Click Restart to quit these applications and restart the system."
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/mk.po
+++ b/po/mk.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nn.po
+++ b/po/nn.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/te.po
+++ b/po/te.po
--- a/Show More
+++ b/Show More