Bump version to 3.26.2

Update NEWS.

.gitlab-ci.yml

@@ -1,13 +0,0 @@
-image: fedora:rawhide
-
-stages:
- - build
-
-before_script:
-  - dnf install -y meson gettext gjs-devel
-
-build-shell-extensions:
-  stage: build
-  script:
-    - meson _build .
-    - ninja -C _build test install

HACKING

@@ -0,0 +1,31 @@
+--- Creating a New Extension ---
+
+To create a new extension, add a subdirectory in extensions.
+Then create a Makefile.am like the one in example, replacing
+the EXTENSION_ID with the basename of your extension, which
+must match the UUID in metadata.json.
+If you need additional files, add them to EXTENSION_EXTRA.
+
+Then modify extensions/Makefile.am and configure.ac. It should
+be pretty self-explanatory.
+
+Don't forget to add any translatable file to po/POTFILES.in, and
+then you're done.
+The Gettext domain you should choose is gnome-shell-extensions,
+not gnome-shell, unless you're sure there is the string you
+need in gnome-shell.
+
+--- Coding Style ---
+
+Generally, we follow GJS coding style (you can find it at
+http://git.gnome.org/browse/gjs/tree/doc/Style_Guide.txt), which
+in short is: indent 4 spaces, no tabs, space after comma, no space
+after function call.
+
+The Emacs mode line for this
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+Imports should be at the top, in two groups, one for standard
+imports (like imports.lang or imports.dbus) and introspection,
+the other for Shell API. Within the same group, put everything
+in alphabetic order.

HACKING.md

@@ -1,31 +0,0 @@
-## Creating a New Extension
-
-To create a new extension, add a subdirectory in extensions. Then create
-a meson.build from the provided [template](extensions/meson.build.template).
-If you need additional sources, add them to extension_sources. Similarily add
-GSettings schemas to extension_schemas and other files to extension_data.
-
-Then modify the [toplevel Meson file](meson.build) to add the new
-extension name in the appropriate set (that is one of classic_extensions,
-default_extensions or all_extensions).
-
-Don't forget to add any translatable file to po/POTFILES.in, and
-then you're done.
-The Gettext domain you should choose is gnome-shell-extensions,
-not gnome-shell, unless you're sure there is the string you
-need in gnome-shell.
-
-## Coding Style
-
-Generally, we follow [GJS coding style][coding-style], which in short is:
-indent 4 spaces, no tabs, space after comma, no space after function call.
-
-The Emacs mode line for this
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-Imports should be at the top, in two groups, one for standard
-imports (like imports.lang or imports.dbus) and introspection,
-the other for Shell API. Within the same group, put everything
-in alphabetic order.
-
-[coding-style]: https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Style_Guide.md

Makefile.am

@@ -0,0 +1,52 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+DIST_SUBDIRS = data extensions po
+
+SUBDIRS = extensions po
+
+if CLASSIC_MODE
+SUBDIRS += data
+endif
+
+EXTRA_DIST = lib/convenience.js
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-extensions=all
+
+include include.mk
+
+zip-file: all
+	-rm -fR $(builddir)/_build
+	-rm -fR $(builddir)/zip-files
+	$(MKDIR_P) $(builddir)/_build; \
+	$(MKDIR_P) $(builddir)/zip-files; \
+	$(MAKE) install DESTDIR="$(abs_builddir)/_build"; \
+	for i in $(ENABLED_EXTENSIONS); do \
+		mv "$(builddir)/_build$(topextensiondir)/$${i}$(extensionbase)" "$(builddir)/_build/"; \
+		cp -r "$(builddir)/_build$(datadir)/locale" "$(builddir)/_build/$${i}$(extensionbase)"; \
+		cp "$(srcdir)/COPYING" -t "$(builddir)/_build/$${i}$(extensionbase)"; \
+		cp "$(srcdir)/NEWS" -t "$(builddir)/_build/$${i}$(extensionbase)"; \
+		if [ -f "$(builddir)/_build$(datadir)/glib-2.0/schemas/$(gschemabase).$${i}.gschema.xml" ]; then \
+			$(MKDIR_P) "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
+			mv "$(builddir)/_build$(datadir)/glib-2.0/schemas/$(gschemabase).$${i}.gschema.xml" "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
+			glib-compile-schemas "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
+		fi; \
+		(cd "$(builddir)/_build/$${i}$(extensionbase)"; \
+		 zip -qr "$(abs_builddir)/zip-files/$${i}$(extensionbase).shell-extension.zip" .; \
+		); \
+	done
+	-rm -fR $(builddir)/_build
+
+localprefix = $(HOME)/.local/share/gnome-shell/extensions
+
+local-install: zip-file
+	for i in $(ENABLED_EXTENSIONS); do \
+	    uuid="$${i}$(extensionbase)"; \
+	    zip_file="$(abs_builddir)/zip-files/$${uuid}.shell-extension.zip"; \
+	    if [ -d "$(localprefix)/$${uuid}" ]; then \
+		rm -fR "$(localprefix)/$${uuid}"; \
+	    fi; \
+	    $(MKDIR_P) $(localprefix)/$${uuid}; \
+	    (cd $(localprefix)/$${uuid}; \
+		unzip -q $${zip_file}; \
+	    ); \
+	done

NEWS

@@ -1,25 +1,6 @@
-3.27.91
+3.26.2
-=======
-* places-menu: Support unmounting ejectable places [Rémy; #17]
-* apps-menu: Support separators and custom sort order [Florian; #27]
-* Port to meson [Florian; #31, #45]
-* window-list: Fix missing icons on wayland [Florian; #10]
-* places-menu: Fix terminating gnome-shell with recent gjs [Florian; #44]
-* auto-move: Make it work with wayland windows [Florian; #33]
-* Classic theme fixes [Florian, Jonas; #26, #41, #39, #40]
-* Require sassc for classic styling [Florian; !28]
-* Misc. bug fixes [Piotr, Florian; #772211, #32, #30]
-
-Contributors:
-  Jeremy Bicha, Piotr Drąg, Jonas Kümmerlin, Rémy Lefevre, Iñigo Martínez,
-  Florian Müllner
-
-Translators:
-  Matej Urbančič [sl], Kjartan Maraas [nb]
-
-3.27.1
 ======
-* updated translations (ca@valencia)
+* updated translations: (ca@valencia)
 
 3.26.1
 ======

README

@@ -0,0 +1,74 @@
+GNOME Shell Extensions is a collection of extensions providing additional
+and optional functionality to GNOME Shell.
+
+Since GNOME Shell is not API stable, extensions work only against a very
+specific version of the shell, usually the same as this package (see
+"configure --version"). The extensions in this package are supported by GNOME
+and will be updated to reflect future API changes in GNOME Shell.
+
+For more information about GNOME Shell Extensions
+ https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+For general information about GNOME Shell
+ https://wiki.gnome.org/Projects/GnomeShell
+
+Bugs should be reported at https://bugzilla.gnome.org against the 'gnome-shell'
+product, with the 'extensions' component.
+
+Extensions
+==========
+
+alternate-tab
+
+  Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
+
+apps-menu
+
+  Lets you reach an application using gnome 2.x style menu on the panel.
+
+auto-move-windows
+
+  Lets you manage your workspaces more easily, assigning a specific workspace to
+each application as soon as it creates a window, in a manner configurable with a
+GSettings key.
+
+dock
+
+  Shows a dock-style task switcher on the right side of the screen.
+
+drive-menu
+  Shows a status menu for rapid unmount and power off of external storage devices
+  (i.e. pendrives)
+
+example
+
+  A minimal example illustrating how to write extensions.
+
+gajim
+
+  Integration with Gajim, a Jabber/XMPP instant messaging client.
+
+native-window-placement
+
+  An alternative algorithm for layouting the thumbnails in the windows overview, that
+  more closely reflects the actual positions and sizes.
+
+places-menu
+
+  Shows a status Indicator for navigating to Places.
+
+user-theme
+
+  Loads a shell theme from ~/.themes/<name>/gnome-shell.
+
+windowsNavigator
+
+  Allow keyboard selection of windows and workspaces in overlay mode.
+
+License
+=======
+GNOME Shell Extensions are distributed under the terms of the GNU General Public License,
+version 2 or later. See the COPYING file for details.
+Individual extensions may be licensed under different terms, see each source
+file for details.
+

README.md

@@ -1,84 +0,0 @@
-# GNOME Shell Extensions
-
-GNOME Shell Extensions is a collection of extensions providing additional
-and optional functionality to GNOME Shell.
-
-Since GNOME Shell is not API stable, extensions work only against a very
-specific version of the shell, usually the same as this package (see
-"configure --version"). The extensions in this package are supported by GNOME
-and will be updated to reflect future API changes in GNOME Shell.
-
-The GNOME wiki has more information about [GNOME Shell Extensions][project-page],
-as well as some general information about [GNOME Shell][shell-page].
-
-Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
-
-## Extensions
-
- * alternate-tab
- 
-     Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
-
- * apps-menu
-
-     Lets you reach an application using gnome 2.x style menu on the panel.
-
- * auto-move-windows
-
-     Lets you manage your workspaces more easily, assigning a specific workspace to
-each application as soon as it creates a window, in a manner configurable with a
-GSettings key.
-
- * drive-menu
- 
-     Shows a status menu for rapid unmount and power off of external storage devices
-  (i.e. pendrives)
-
- * example
-
-     A minimal example illustrating how to write extensions.
-
- * launch-new-instance
-
-     Changes application icons to always launch a new instance when activated.
-
- * native-window-placement
-
-     An alternative algorithm for layouting the thumbnails in the windows overview, that
-  more closely reflects the actual positions and sizes.
-
- * places-menu
-
-     Shows a status Indicator for navigating to Places.
-
- * screenshot-window-sizer
-
-     Adds a shortcut for resizing the focus window to a size that is suitable for GNOME Software screenshots
-
- * user-theme
-
-     Loads a shell theme from ~/.themes/<name>/gnome-shell.
-
- * window-list
-
-     Adds a bottom panel with a traditional window list.
-
- * windowsNavigator
-
-     Allow keyboard selection of windows and workspaces in overlay mode.
-
- * workspace-indicator
-
-     Adds a simple workspace switcher to the top bar.
-
-## License
-
-GNOME Shell Extensions are distributed under the terms of the GNU General
-Public License, version 2 or later. See the [COPYING file][license] for details.
-Individual extensions may be licensed under different terms, see each source
-file for details.
-
-[project-page]: https://wiki.gnome.org/Projects/GnomeShell/Extensions
-[shell-page]: https://wiki.gnome.org/Projects/GnomeShell
-[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues
-[license]: COPYING

autogen.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+test -f $srcdir/configure.ac || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level gnome-shell-extensions directory"
+    exit 1
+}
+
+# Fetch submodules if needed
+if test ! -f data/gnome-shell-sass/COPYING;
+then
+  echo "+ Setting up submodules"
+  git submodule init
+fi
+git submodule update
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from GNOME Git (or from"
+    echo "your OS vendor's package manager)."
+    exit 1
+}
+. gnome-autogen.sh

config/.gitignore

@@ -0,0 +1,3 @@
+install-sh
+mkinstalldirs
+missing

configure.ac

@@ -0,0 +1,98 @@
+AC_PREREQ(2.63)
+AC_INIT([gnome-shell-extensions],[3.26.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([config])
+
+AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip foreign tar-ustar])
+
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+GETTEXT_PACKAGE=gnome-shell-extensions
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+                   [The prefix for our gettext translation domains.])
+
+AM_GNU_GETTEXT_VERSION([0.19.6])
+AM_GNU_GETTEXT([external])
+
+PKG_PROG_PKG_CONFIG([0.22])
+
+GLIB_GSETTINGS
+
+SHELL_VERSION="$PACKAGE_VERSION"
+shell_major=`echo "$PACKAGE_VERSION" | cut -d'.' -f1`
+shell_minor=`echo "$PACKAGE_VERSION" | cut -d'.' -f2`
+if test "$(($shell_minor % 2))" -eq 0; then
+	SHELL_VERSION="$shell_major.$shell_minor"
+fi
+AC_SUBST([SHELL_VERSION])
+
+dnl keep this in alphabetic order
+CLASSIC_EXTENSIONS="apps-menu places-menu alternate-tab launch-new-instance window-list"
+DEFAULT_EXTENSIONS="$CLASSIC_EXTENSIONS drive-menu screenshot-window-sizer windowsNavigator workspace-indicator"
+ALL_EXTENSIONS="$DEFAULT_EXTENSIONS auto-move-windows example native-window-placement user-theme"
+AC_SUBST(CLASSIC_EXTENSIONS, [$CLASSIC_EXTENSIONS])
+AC_SUBST(ALL_EXTENSIONS, [$ALL_EXTENSIONS])
+AC_ARG_ENABLE([extensions],
+	[AS_HELP_STRING([--enable-extensions],[Space separated list of extensions to enable.
+	The default is to build and distribute all extensions that can be installed in the home directory and have no external depedencies.
+	Use "all" to enable all available extensions, or "classic-mode" to enable extensions that restore GNOME 2 functionality.])],
+	[],
+	[enable_extensions=$DEFAULT_EXTENSIONS]
+)
+
+if test x"$enable_extensions" = xall; then
+   enable_extensions="$ALL_EXTENSIONS"
+   enable_classic_mode_default=yes
+elif test x"$enable_extensions" = xclassic-mode; then
+   enable_extensions="$CLASSIC_EXTENSIONS"
+   enable_classic_mode_default=yes
+else
+   enable_classic_mode_default=no
+fi
+
+AC_ARG_ENABLE([classic-mode],
+        [AS_HELP_STRING([--enable-classic-mode],[Enable installing data files for classic mode.
+        Defaults to yes if enabling all or classic-mode extensions, and no otherwise.])],
+        [],
+        [enable_classic_mode=$enable_classic_mode_default])
+AM_CONDITIONAL([CLASSIC_MODE], [test x"$enable_classic_mode" != xno])
+
+ENABLED_EXTENSIONS=
+for e in $enable_extensions; do
+	case $e in
+dnl		keep this in alphabetic order
+		alternate-tab|apps-menu|auto-move-windows|drive-menu|example|launch-new-instance|native-window-placement|places-menu|screenshot-window-sizer|user-theme|window-list|windowsNavigator|workspace-indicator)
+			ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"
+			;;
+		*)
+			AC_MSG_ERROR([invalid extension $e])
+	esac
+done
+
+AC_SUBST(ENABLED_EXTENSIONS, [$ENABLED_EXTENSIONS])
+
+AC_PATH_PROG([SASSC],[sassc],[])
+
+dnl Please keep this sorted alphabetically
+AC_CONFIG_FILES([
+  data/Makefile
+  extensions/alternate-tab/Makefile
+  extensions/apps-menu/Makefile
+  extensions/auto-move-windows/Makefile
+  extensions/drive-menu/Makefile
+  extensions/example/Makefile
+  extensions/launch-new-instance/Makefile
+  extensions/native-window-placement/Makefile
+  extensions/places-menu/Makefile
+  extensions/screenshot-window-sizer/Makefile
+  extensions/user-theme/Makefile
+  extensions/window-list/Makefile
+  extensions/windowsNavigator/Makefile
+  extensions/workspace-indicator/Makefile
+  extensions/Makefile
+  Makefile
+  po/Makefile.in
+])
+AC_OUTPUT

data/HACKING

@@ -1,2 +1,6 @@
+To generate the css files, from the project directory:
+
+sassc -a gnome-classic.scss gnome-classic.css
+
 To update the gnome-shell-sass submodule to latest upstream commit:
 git submodule update --rebase

data/Makefile.am

@@ -0,0 +1,73 @@
+include $(top_srcdir)/include.mk
+
+sessiondir = $(datadir)/gnome-session/sessions
+session_in_files = gnome-classic.session.desktop.in
+session_DATA = $(session_in_files:.session.desktop.in=.session)
+
+xsessiondir = $(datadir)/xsessions
+xsession_in_files = gnome-classic.desktop.in
+xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
+
+modedir = $(datadir)/gnome-shell/modes
+mode_in_files = classic.json.in
+mode_DATA = $(mode_in_files:.json.in=.json)
+
+themedir = $(datadir)/gnome-shell/theme
+theme_DATA = 				\
+	$(srcdir)/calendar-today.svg		\
+	$(srcdir)/classic-process-working.svg		\
+	$(srcdir)/classic-toggle-off-intl.svg		\
+	$(srcdir)/classic-toggle-off-us.svg		\
+	$(srcdir)/classic-toggle-on-intl.svg		\
+	$(srcdir)/classic-toggle-on-us.svg		\
+	$(srcdir)/gnome-classic.css			\
+	$(srcdir)/gnome-classic-high-contrast.css	\
+	$(NULL)
+
+theme_sources =							\
+	$(srcdir)/gnome-classic.scss				\
+	$(srcdir)/gnome-shell-sass/_colors.scss			\
+	$(srcdir)/gnome-shell-sass/_common.scss			\
+	$(srcdir)/gnome-shell-sass/_drawing.scss		\
+	$(srcdir)/gnome-shell-sass/_high-contrast-colors.scss	\
+	$(NULL)
+
+%.css: %.scss $(theme_sources)
+	@if test -n "$(SASSC)"; then \
+		if $(AM_V_P); then PS4= set -x; else echo "  GEN      $@"; fi; \
+		$(SASSC) -a $< $@; \
+	fi
+
+gsettings_SCHEMAS = org.gnome.shell.extensions.classic-overrides.gschema.xml
+
+@GSETTINGS_RULES@
+
+%.desktop:%.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
+%.session: %.session.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
+comma:=,
+empty:=
+space:= $(empty) $(empty)
+extensions:=$(patsubst %,\"%$(extensionbase)\",$(CLASSIC_EXTENSIONS))
+extension_list:=$(subst $(space),$(comma),$(extensions))
+%.json:%.json.in
+	$(AM_V_GEN) sed \
+		-e "s|\@CLASSIC_EXTENSIONS\@|$(extension_list)|g" \
+		$< > $@
+
+EXTRA_DIST = \
+	$(session_in_files) \
+	$(xsession_in_files) \
+	$(mode_in_files) \
+	$(gsettings_SCHEMAS) \
+	$(theme_DATA) \
+	$(NULL)
+
+CLEANFILES = \
+	$(session_DATA) \
+	$(xsession_DATA) \
+	$(mode_DATA) \
+	$(NULL)

data/gnome-classic.scss

@@ -7,9 +7,9 @@ $variant: 'light';
 
 /* Overrides */
 
-#panel, #panel.solid {
+#panel {
   font-weight: normal;
-  background-color: $bg_color;
+  background-color: $bg_color !important;
   background-gradient-direction: vertical;
   background-gradient-end: darken($bg_color,5%);
   border-top-color: #666; /* we don't support non-uniform border-colors and
@@ -30,7 +30,7 @@ $variant: 'light';
     -natural-hpadding: 8px;
     -minimum-hpadding: 4px;
     font-weight: normal;
-    color: $fg_color;
+    color: $fg_color !important;
     text-shadow: none;
     &:active, &:overview, &:focus, &:checked {
       // Trick due to St limitations. It needs a background to draw
@@ -45,10 +45,6 @@ $variant: 'light';
       & .system-status-icon { icon-shadow: none; }
     }
     .app-menu-icon { width: 0; height: 0; margin: 0; } // shell's display:none; :D
-
-    .system-status-icon {
-      icon-shadow: none;
-    }
   }
 
   .panel-corner,
@@ -90,16 +86,3 @@ $variant: 'light';
 .calendar-day-with-events {
   background-image: url("calendar-today.svg");
 }
-
-.message-list-clear-button.button {
-  color: $fg_color
-}
-
-.notification-banner {
-  background-color: $bg_color !important;
-  color: $fg_color;
-  .notification-button {
-    background-color: darken($bg_color,5%);
-    &:hover, &focus { background-color: darken($bg_color,2%); }
-  }
-}

data/gnome-classic.session.desktop.in

@@ -1,3 +1,3 @@
 [GNOME Session]
 Name=GNOME Classic
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;nautilus-classic;
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;nautilus-classic;

data/meson.build

@@ -1,62 +0,0 @@
-sessions = [
-  ['gnome-classic.session.desktop', sessiondir],
-  ['gnome-classic.desktop', xsessiondir]
-]
-foreach s : sessions
-  i18n.merge_file('',
-    input:  s[0] + '.in',
-    output: s[0],
-    po_dir: '../po',
-    install: true,
-    install_dir: s[1],
-    type: 'desktop'
-  )
-endforeach
-
-classic_uuids = []
-foreach e : classic_extensions
-    classic_uuids += e + uuid_suffix
-endforeach
-
-mode_conf = configuration_data()
-mode_conf.set('CLASSIC_EXTENSIONS', '"' + '", "'.join(classic_uuids) + '"')
-
-mode_file = 'classic.json'
-configure_file(
-  input: mode_file + '.in',
-  output: mode_file,
-  configuration: mode_conf,
-  install_dir: modedir
-)
-
-theme_sources = files(
-  'gnome-shell-sass/_colors.scss',
-  'gnome-shell-sass/_common.scss',
-  'gnome-shell-sass/_drawing.scss',
-  'gnome-shell-sass/_high-contrast-colors.scss'
-)
-
-theme_data = [
-  'calendar-today.svg',
-  'classic-process-working.svg',
-  'classic-toggle-off-intl.svg',
-  'classic-toggle-off-us.svg',
-  'classic-toggle-on-intl.svg',
-  'classic-toggle-on-us.svg',
-  'gnome-classic-high-contrast.css'
-]
-
-style = 'gnome-classic'
-custom_target(style + '.css',
-  input: style + '.scss',
-  output: style + '.css',
-  depend_files: theme_sources,
-  command: [sassc, '-a', '@INPUT@', '@OUTPUT@'],
-  install: true,
-  install_dir: themedir
-)
-
-install_data(theme_data, install_dir: themedir)
-
-classic_schema = 'org.gnome.shell.extensions.classic-overrides.gschema.xml'
-install_data(classic_schema, install_dir: schemadir)

export-zips.sh

@@ -1,36 +0,0 @@
-#!/bin/sh
-
-srcdir=`dirname $0`
-srcdir=`(cd $srcdir && pwd)`
-
-builddir=`mktemp -p $srcdir -d _build.XXXXXX` || exit 1
-installdir=`mktemp -p $srcdir -d _install.XXXXXX` || exit 1
-
-meson setup --prefix=$installdir -Dextension_set=all $srcdir $builddir
-ninja -C$builddir install
-
-rm -rf $srcdir/zip-files
-mkdir $srcdir/zip-files
-
-extensiondir=$installdir/share/gnome-shell/extensions
-schemadir=$installdir/share/glib-2.0/schemas
-localedir=$installdir/share/locale
-
-for f in $extensiondir/*; do
-  name=`basename ${f%%@*}`
-  uuid=$name@gnome-shell-extensions.gcampax.github.com
-  schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml
-
-  cp $srcdir/NEWS $srcdir/COPYING $f
-
-  if [ -f $schema ]; then
-    mkdir $f/schemas
-    cp $schema $f/schemas;
-    glib-compile-schemas $f/schemas
-  fi
-
-  (cd $f && zip -rmq $srcdir/zip-files/$uuid.shell-extension.zip .)
-done
-
-rm -rf $builddir
-rm -rf $installdir

extension.mk

@@ -0,0 +1,18 @@
+include $(top_srcdir)/include.mk
+
+dist_extension_DATA = extension.js stylesheet.css $(EXTRA_MODULES)
+nodist_extension_DATA = metadata.json $(top_srcdir)/lib/convenience.js $(EXTRA_EXTENSION)
+
+EXTRA_DIST = metadata.json.in
+
+metadata.json: metadata.json.in $(top_builddir)/config.status
+	$(AM_V_GEN) sed \
+            -e "s|[@]extension_id@|$(EXTENSION_ID)|" \
+	    -e "s|[@]uuid@|$(uuid)|" \
+	    -e "s|[@]gschemaname@|$(gschemaname)|" \
+	    -e "s|[@]gettext_domain@|$(GETTEXT_PACKAGE)|" \
+	    -e "s|[@]shell_current@|$(SHELL_VERSION)|" \
+	    -e "s|[@]url@|$(extensionurl)|" \
+	    $< > $@
+
+CLEANFILES = metadata.json

extensions/Makefile.am

@@ -0,0 +1,3 @@
+DIST_SUBDIRS = $(ALL_EXTENSIONS)
+
+SUBDIRS = $(ENABLED_EXTENSIONS)

extensions/alternate-tab/Makefile.am

@@ -0,0 +1,5 @@
+EXTENSION_ID = alternate-tab
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk

extensions/alternate-tab/extension.js

@@ -1,6 +1,7 @@
 /* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 
@@ -42,19 +43,15 @@ function enable() {
             tabPopup.destroy();
     };
 
-    setKeybinding('switch-applications',
+    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._forcedWindowSwitcher));
-                  Main.wm._forcedWindowSwitcher.bind(Main.wm));
+    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._forcedWindowSwitcher));
-    setKeybinding('switch-applications-backward',
-                  Main.wm._forcedWindowSwitcher.bind(Main.wm));
 }
 
 function disable() {
     var prop;
 
-    setKeybinding('switch-applications',
+    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._startSwitcher));
-                  Main.wm._startSwitcher.bind(Main.wm));
+    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._startSwitcher));
-    setKeybinding('switch-applications-backward',
-                  Main.wm._startSwitcher.bind(Main.wm));
 
     for (prop in injections)
         AltTab.WindowSwitcherPopup.prototype[prop] = injections[prop];

extensions/alternate-tab/meson.build

@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')

extensions/alternate-tab/metadata.json.in

@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "AlternateTab",
-"description": "Substitute Alt-Tab with a window based switcher that does not group by application.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
+"description": "Substitute Alt-Tab with a window based switcher that does not group by application.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
 "original-authors": [  "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"

extensions/alternate-tab/prefs.js

@@ -3,10 +3,11 @@
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const GObject = imports.gi.GObject;
+const Lang = imports.lang;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = e => e;
+const N_ = function(e) { return e };
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@@ -21,13 +22,16 @@ const MODES = {
     'both': N_("Thumbnail and application icon"),
 };
 
-const AltTabSettingsWidget = GObject.registerClass(
+const AltTabSettingsWidget = new GObject.Class({
-class AltTabSettingsWidget extends Gtk.Grid {
+    Name: 'AlternateTab.Prefs.AltTabSettingsWidget',
-    _init(params) {
+    GTypeName: 'AltTabSettingsWidget',
-        super._init(params);
+    Extends: Gtk.Grid,
+
+    _init : function(params) {
+        this.parent(params);
         this.margin = 24;
         this.row_spacing = 6;
-        this.orientation = Gtk.Orientation.VERTICAL;
+	this.orientation = Gtk.Orientation.VERTICAL;
 
         this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
 
@@ -52,21 +56,21 @@ class AltTabSettingsWidget extends Gtk.Grid {
             let name = Gettext.gettext(MODES[mode]);
 
             radio = new Gtk.RadioButton({ group: radio, label: name, valign: Gtk.Align.START });
-            radio.connect('toggled', widget => {
+            radio.connect('toggled', Lang.bind(this, function(widget) {
                 if (widget.active)
                     this._settings.set_string(SETTINGS_APP_ICON_MODE, modeCapture);
-            });
+            }));
             grid.add(radio);
 
             if (mode == currentMode)
                 radio.active = true;
         }
 
-        let check = new Gtk.CheckButton({ label: _("Show only windows in the current workspace"),
+	let check = new Gtk.CheckButton({ label: _("Show only windows in the current workspace"),
-                                          margin_top: 6 });
+	                                  margin_top: 6 });
-        this._settings.bind(SETTINGS_CURRENT_WORKSPACE_ONLY, check, 'active', Gio.SettingsBindFlags.DEFAULT);
+	this._settings.bind(SETTINGS_CURRENT_WORKSPACE_ONLY, check, 'active', Gio.SettingsBindFlags.DEFAULT);
-        this.add(check);
+	this.add(check);
-    }
+    },
 });
 
 function init() {

extensions/apps-menu/Makefile.am

@@ -0,0 +1,3 @@
+EXTENSION_ID = apps-menu
+
+include ../../extension.mk

extensions/apps-menu/extension.js

@@ -3,6 +3,7 @@
 const Atk = imports.gi.Atk;
 const DND = imports.ui.dnd;
 const GMenu = imports.gi.GMenu;
+const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Clutter = imports.gi.Clutter;
@@ -30,24 +31,30 @@ const HORIZ_FACTOR = 5;
 const MENU_HEIGHT_OFFSET = 132;
 const NAVIGATION_REGION_OVERSHOOT = 50;
 
-class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
+const ActivitiesMenuItem = new Lang.Class({
-    constructor(button) {
+    Name: 'ActivitiesMenuItem',
-        super();
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function(button) {
+	this.parent();
         this._button = button;
         this.actor.add_child(new St.Label({ text: _("Activities Overview") }));
-    }
+    },
 
-    activate(event) {
+    activate: function(event) {
         this._button.menu.toggle();
         Main.overview.toggle();
-        super.activate(event);
+	this.parent(event);
-    }
+    },
-};
+});
 
-class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
+const ApplicationMenuItem = new Lang.Class({
-    constructor(button, app) {
+    Name: 'ApplicationMenuItem',
-        super();
+    Extends: PopupMenu.PopupBaseMenuItem,
-        this._app = app;
+
+    _init: function(button, app) {
+	this.parent();
+	this._app = app;
         this._button = button;
 
         this._iconBin = new St.Bin();
@@ -60,10 +67,11 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
 
         let textureCache = St.TextureCache.get_default();
         let iconThemeChangedId = textureCache.connect('icon-theme-changed',
-                                                      this._updateIcon.bind(this));
+                                                      Lang.bind(this, this._updateIcon));
-        this.actor.connect('destroy', () => {
+        this.actor.connect('destroy', Lang.bind(this,
-            textureCache.disconnect(iconThemeChangedId);
+            function() {
-        });
+                textureCache.disconnect(iconThemeChangedId);
+            }));
         this._updateIcon();
 
         this.actor._delegate = this;
@@ -82,42 +90,45 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         draggable.connect('drag-end', () => {
             Shell.util_set_hidden_from_pick(Main.legacyTray.actor, false);
         });
-    }
+    },
 
-    activate(event) {
+    activate: function(event) {
-        this._app.open_new_window(-1);
+	this._app.open_new_window(-1);
         this._button.selectCategory(null, null);
         this._button.menu.toggle();
-        super.activate(event);
+	this.parent(event);
-    }
+    },
 
-    setActive(active, params) {
+    setActive: function(active, params) {
         if (active)
             this._button.scrollToButton(this);
-        super.setActive(active, params);
+        this.parent(active, params);
-    }
+    },
 
-    setDragEnabled(enable) {
+    setDragEnabled: function(enable) {
         this._dragEnabled = enable;
-    }
+    },
 
-    getDragActor() {
+    getDragActor: function() {
         return this._app.create_icon_texture(APPLICATION_ICON_SIZE);
-    }
+    },
 
-    getDragActorSource() {
+    getDragActorSource: function() {
         return this._iconBin;
-    }
+    },
 
-    _updateIcon() {
+    _updateIcon: function() {
         this._iconBin.set_child(this.getDragActor());
     }
-};
+});
 
-class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
+const CategoryMenuItem = new Lang.Class({
-    constructor(button, category) {
+    Name: 'CategoryMenuItem',
-        super();
+    Extends: PopupMenu.PopupBaseMenuItem,
-        this._category = category;
+
+    _init: function(button, category) {
+	this.parent();
+	this._category = category;
         this._button = button;
 
         this._oldX = -1;
@@ -130,16 +141,16 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
             name = _("Favorites");
 
         this.actor.add_child(new St.Label({ text: name }));
-        this.actor.connect('motion-event', this._onMotionEvent.bind(this));
+        this.actor.connect('motion-event', Lang.bind(this, this._onMotionEvent));
-    }
+    },
 
-    activate(event) {
+    activate: function(event) {
         this._button.selectCategory(this._category, this);
         this._button.scrollToCatButton(this);
-        super.activate(event);
+	this.parent(event);
-    }
+    },
 
-    _isNavigatingSubmenu([x, y]) {
+    _isNavigatingSubmenu: function([x, y]) {
         let [posX, posY] = this.actor.get_transformed_position();
 
         if (this._oldX == -1) {
@@ -194,9 +205,9 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
              return true;
 
         return false;
-    }
+    },
 
-    _onMotionEvent(actor, event) {
+    _onMotionEvent: function(actor, event) {
         if (!Clutter.get_pointer_grab()) {
             this._oldX = -1;
             this._oldY = -1;
@@ -217,80 +228,85 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
             source.sync_hover();
 
         return false;
-    }
+    },
 
-    setActive(active, params) {
+    setActive: function(active, params) {
         if (active) {
             this._button.selectCategory(this._category, this);
             this._button.scrollToCatButton(this);
         }
-        super.setActive(active, params);
+        this.parent(active, params);
     }
-};
+});
 
-class ApplicationsMenu extends PopupMenu.PopupMenu {
+const ApplicationsMenu = new Lang.Class({
-    constructor(sourceActor, arrowAlignment, arrowSide, button) {
+    Name: 'ApplicationsMenu',
-        super(sourceActor, arrowAlignment, arrowSide);
+    Extends: PopupMenu.PopupMenu,
+
+    _init: function(sourceActor, arrowAlignment, arrowSide, button) {
+        this.parent(sourceActor, arrowAlignment, arrowSide);
         this._button = button;
-    }
+    },
 
-    isEmpty() {
+    isEmpty: function() {
-        return false;
+	return false;
-    }
+    },
 
-    open(animate) {
+    open: function(animate) {
         this._button.hotCorner.setBarrierSize(0);
         if (this._button.hotCorner.actor) // fallback corner
             this._button.hotCorner.actor.hide();
-        super.open(animate);
+        this.parent(animate);
-    }
+    },
 
-    close(animate) {
+    close: function(animate) {
         let size = Main.layoutManager.panelBox.height;
         this._button.hotCorner.setBarrierSize(size);
         if (this._button.hotCorner.actor) // fallback corner
             this._button.hotCorner.actor.show();
-        super.close(animate);
+        this.parent(animate);
-    }
+    },
 
-    toggle() {
+    toggle: function() {
         if (this.isOpen) {
             this._button.selectCategory(null, null);
         } else {
             if (Main.overview.visible)
                 Main.overview.hide();
         }
-        super.toggle();
+        this.parent();
     }
-};
+});
 
-class DesktopTarget {
+const DesktopTarget = new Lang.Class({
-    constructor() {
+    Name: 'DesktopTarget',
+
+    _init: function() {
         this._desktop = null;
         this._desktopDestroyedId = 0;
 
         this._windowAddedId =
             global.window_group.connect('actor-added',
-                                        this._onWindowAdded.bind(this));
+                                        Lang.bind(this, this._onWindowAdded));
 
         global.get_window_actors().forEach(a => {
             this._onWindowAdded(a.get_parent(), a);
         });
-    }
+    },
 
     get hasDesktop() {
         return this._desktop != null;
-    }
+    },
 
-    _onWindowAdded(group, actor) {
+    _onWindowAdded: function(group, actor) {
         if (!(actor instanceof Meta.WindowActor))
             return;
 
         if (actor.meta_window.get_window_type() == Meta.WindowType.DESKTOP)
             this._setDesktop(actor);
-    }
+    },
 
-    _setDesktop(desktop) {
+    _setDesktop: function(desktop) {
         if (this._desktop) {
             this._desktop.disconnect(this._desktopDestroyedId);
             this._desktopDestroyedId = 0;
@@ -307,15 +323,15 @@ class DesktopTarget {
             });
             this._desktop._delegate = this;
         }
-    }
+    },
 
-    _getSourceAppInfo(source) {
+    _getSourceAppInfo: function(source) {
         if (!(source instanceof ApplicationMenuItem))
             return null;
         return source._app.app_info;
-    }
+    },
 
-    _touchFile(file) {
+    _touchFile: function(file) {
         let queryFlags = Gio.FileQueryInfoFlags.NONE;
         let ioPriority = GLib.PRIORITY_DEFAULT;
 
@@ -330,9 +346,9 @@ class DesktopTarget {
                     log('Failed to update access time: ' + e.message);
                 }
             });
-    }
+    },
 
-    _markTrusted(file) {
+    _markTrusted: function(file) {
         let modeAttr = Gio.FILE_ATTRIBUTE_UNIX_MODE;
         let trustedAttr = 'metadata::trusted';
         let queryFlags = Gio.FileQueryInfoFlags.NONE;
@@ -357,25 +373,25 @@ class DesktopTarget {
                     log('Failed to mark file as trusted: ' + e.message);
                 }
             });
-    }
+    },
 
-    destroy() {
+    destroy: function() {
         if (this._windowAddedId)
             global.window_group.disconnect(this._windowAddedId);
         this._windowAddedId = 0;
 
         this._setDesktop(null);
-    }
+    },
 
-    handleDragOver(source, actor, x, y, time) {
+    handleDragOver: function(source, actor, x, y, time) {
         let appInfo = this._getSourceAppInfo(source);
         if (!appInfo)
             return DND.DragMotionResult.CONTINUE;
 
         return DND.DragMotionResult.COPY_DROP;
-    }
+    },
 
-    acceptDrop(source, actor, x, y, time) {
+    acceptDrop: function(source, actor, x, y, time) {
         let appInfo = this._getSourceAppInfo(source);
         if (!appInfo)
             return false;
@@ -397,12 +413,15 @@ class DesktopTarget {
 
         return true;
     }
-};
+});
 Signals.addSignalMethods(DesktopTarget.prototype);
 
-class ApplicationsButton extends PanelMenu.Button {
+const ApplicationsButton = new Lang.Class({
-    constructor() {
+    Name: 'ApplicationsButton',
-        super(1.0, null, false);
+    Extends: PanelMenu.Button,
+
+    _init: function() {
+        this.parent(1.0, null, false);
 
         this.setMenu(new ApplicationsMenu(this.actor, 1.0, St.Side.TOP, this));
         Main.panel.menuManager.addMenu(this.menu);
@@ -424,17 +443,17 @@ class ApplicationsButton extends PanelMenu.Button {
         this.actor.name = 'panelApplications';
         this.actor.label_actor = this._label;
 
-        this.actor.connect('captured-event', this._onCapturedEvent.bind(this));
+        this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
-        this.actor.connect('destroy', this._onDestroy.bind(this));
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
-        this._showingId = Main.overview.connect('showing', () => {
+        this._showingId = Main.overview.connect('showing', Lang.bind(this, function() {
             this.actor.add_accessible_state (Atk.StateType.CHECKED);
-        });
+        }));
-        this._hidingId = Main.overview.connect('hiding', () => {
+        this._hidingId = Main.overview.connect('hiding', Lang.bind(this, function() {
             this.actor.remove_accessible_state (Atk.StateType.CHECKED);
-        });
+        }));
         Main.layoutManager.connect('startup-complete',
-                                   this._setKeybinding.bind(this));
+                                   Lang.bind(this, this._setKeybinding));
         this._setKeybinding();
 
         this._desktopTarget = new DesktopTarget();
@@ -447,64 +466,55 @@ class ApplicationsButton extends PanelMenu.Button {
             });
         });
 
-        this._tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
-        this._treeChangedId = this._tree.connect('changed',
-                                                 this._onTreeChanged.bind(this));
-
         this._applicationsButtons = new Map();
         this.reloadFlag = false;
         this._createLayout();
         this._display();
-        this._installedChangedId = appSys.connect('installed-changed',
+        this._installedChangedId = appSys.connect('installed-changed', Lang.bind(this, function() {
-                                                  this._onTreeChanged.bind(this));
+            if (this.menu.isOpen) {
-    }
+                this._redisplay();
-
+                this.mainBox.show();
-    _onTreeChanged() {
+            } else {
-        if (this.menu.isOpen) {
+                this.reloadFlag = true;
-            this._redisplay();
+            }
-            this.mainBox.show();
+        }));
-        } else {
+    },
-            this.reloadFlag = true;
-        }
-    }
 
     get hotCorner() {
         return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
-    }
+    },
 
-    _createVertSeparator() {
+    _createVertSeparator: function() {
         let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
                                              pseudo_class: 'highlighted' });
-        separator.connect('repaint', this._onVertSepRepaint.bind(this));
+        separator.connect('repaint', Lang.bind(this, this._onVertSepRepaint));
         return separator;
-    }
+    },
 
-    _onDestroy() {
+    _onDestroy: function() {
         Main.overview.disconnect(this._showingId);
         Main.overview.disconnect(this._hidingId);
         appSys.disconnect(this._installedChangedId);
-        this._tree.disconnect(this._treeChangedId);
-        this._tree = null;
 
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
                                            Shell.ActionMode.NORMAL |
                                            Shell.ActionMode.OVERVIEW,
                                            Main.sessionMode.hasOverview ?
-                                           Main.overview.toggle.bind(Main.overview) :
+                                           Lang.bind(Main.overview, Main.overview.toggle) :
                                            null);
 
         this._desktopTarget.destroy();
-    }
+    },
 
-    _onCapturedEvent(actor, event) {
+    _onCapturedEvent: function(actor, event) {
         if (event.type() == Clutter.EventType.BUTTON_PRESS) {
             if (!Main.overview.shouldToggleByCornerOrButton())
                 return true;
         }
         return false;
-    }
+    },
 
-    _onMenuKeyPress(actor, event) {
+    _onMenuKeyPress: function(actor, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
             let direction = symbol == Clutter.KEY_Left ? Gtk.DirectionType.LEFT
@@ -512,10 +522,10 @@ class ApplicationsButton extends PanelMenu.Button {
             if (this.menu.actor.navigate_focus(global.stage.key_focus, direction, false))
                 return true;
         }
-        return super._onMenuKeyPress(actor, event);
+        return this.parent(actor, event);
-    }
+    },
 
-    _onVertSepRepaint(area) {
+    _onVertSepRepaint: function(area) {
         let cr = area.get_context();
         let themeNode = area.get_theme_node();
         let [width, height] = area.get_surface_size();
@@ -528,9 +538,9 @@ class ApplicationsButton extends PanelMenu.Button {
         cr.setDash([1, 3], 1); // Hard-code for now
         cr.setLineWidth(stippleWidth);
         cr.stroke();
-    }
+    },
 
-    _onOpenStateChanged(menu, open) {
+    _onOpenStateChanged: function(menu, open) {
        if (open) {
            if (this.reloadFlag) {
                this._redisplay();
@@ -538,23 +548,25 @@ class ApplicationsButton extends PanelMenu.Button {
            }
            this.mainBox.show();
        }
-       super._onOpenStateChanged(menu, open);
+       this.parent(menu, open);
-    }
+    },
 
-    _setKeybinding() {
+    _setKeybinding: function() {
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
                                            Shell.ActionMode.NORMAL |
                                            Shell.ActionMode.OVERVIEW,
-                                           () => { this.menu.toggle(); });
+                                           Lang.bind(this, function() {
-    }
+                                               this.menu.toggle();
+                                           }));
+    },
 
-    _redisplay() {
+    _redisplay: function() {
         this.applicationsBox.destroy_all_children();
         this.categoriesBox.destroy_all_children();
         this._display();
-    }
+    },
 
-    _loadCategory(categoryId, dir) {
+    _loadCategory: function(categoryId, dir) {
         let iter = dir.iter();
         let nextType;
         while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
@@ -571,17 +583,15 @@ class ApplicationsButton extends PanelMenu.Button {
                     app = new Shell.App({ app_info: entry.get_app_info() });
                 if (app.get_app_info().should_show())
                     this.applicationsByCategory[categoryId].push(app);
-            } else if (nextType == GMenu.TreeItemType.SEPARATOR) {
-                this.applicationsByCategory[categoryId].push('separator');
             } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                 let subdir = iter.get_directory();
                 if (!subdir.get_is_nodisplay())
                     this._loadCategory(categoryId, subdir);
             }
         }
-    }
+    },
 
-    scrollToButton(button) {
+    scrollToButton: function(button) {
         let appsScrollBoxAdj = this.applicationsScrollBox.get_vscroll_bar().get_adjustment();
         let appsScrollBoxAlloc = this.applicationsScrollBox.get_allocation_box();
         let currentScrollValue = appsScrollBoxAdj.get_value();
@@ -594,9 +604,9 @@ class ApplicationsButton extends PanelMenu.Button {
             newScrollValue = buttonAlloc.y2 - boxHeight + 10;
         if (newScrollValue != currentScrollValue)
             appsScrollBoxAdj.set_value(newScrollValue);
-    }
+    },
 
-    scrollToCatButton(button) {
+    scrollToCatButton: function(button) {
         let catsScrollBoxAdj = this.categoriesScrollBox.get_vscroll_bar().get_adjustment();
         let catsScrollBoxAlloc = this.categoriesScrollBox.get_allocation_box();
         let currentScrollValue = catsScrollBoxAdj.get_value();
@@ -609,9 +619,9 @@ class ApplicationsButton extends PanelMenu.Button {
             newScrollValue = buttonAlloc.y2 - boxHeight + 10;
         if (newScrollValue != currentScrollValue)
             catsScrollBoxAdj.set_value(newScrollValue);
-    }
+    },
 
-    _createLayout() {
+    _createLayout: function() {
         let section = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(section);
         this.mainBox = new St.BoxLayout({ vertical: false });
@@ -621,19 +631,23 @@ class ApplicationsButton extends PanelMenu.Button {
                                                          style_class: 'apps-menu vfade' });
         this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         let vscroll = this.applicationsScrollBox.get_vscroll_bar();
-        vscroll.connect('scroll-start', () => {
+        vscroll.connect('scroll-start', Lang.bind(this, function() {
             this.menu.passEvents = true;
-        });
+        }));
-        vscroll.connect('scroll-stop', () => {
+        vscroll.connect('scroll-stop', Lang.bind(this, function() {
             this.menu.passEvents = false;
-        });
+        }));
         this.categoriesScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
                                                        y_align: St.Align.START,
                                                        style_class: 'vfade' });
         this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         vscroll = this.categoriesScrollBox.get_vscroll_bar();
-        vscroll.connect('scroll-start', () => { this.menu.passEvents = true; });
+        vscroll.connect('scroll-start', Lang.bind(this, function() {
-        vscroll.connect('scroll-stop', () => { this.menu.passEvents = false; });
+                              this.menu.passEvents = true;
+                          }));
+        vscroll.connect('scroll-stop', Lang.bind(this, function() {
+            this.menu.passEvents = false;
+        }));
         this.leftBox.add(this.categoriesScrollBox, { expand: true,
                                                      x_fill: true, y_fill: true,
                                                      y_align: St.Align.START });
@@ -652,17 +666,18 @@ class ApplicationsButton extends PanelMenu.Button {
         this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true});
         this.mainBox.add(this.applicationsScrollBox, { expand: true, x_fill: true, y_fill: true });
         section.actor.add_actor(this.mainBox);
-    }
+    },
 
-    _display() {
+    _display: function() {
         this._applicationsButtons.clear();
         this.mainBox.style=('width: 35em;');
         this.mainBox.hide();
 
         //Load categories
         this.applicationsByCategory = {};
-        this._tree.load_sync();
+        let tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
-        let root = this._tree.get_root_directory();
+        tree.load_sync();
+        let root = tree.get_root_directory();
         let categoryMenuItem = new CategoryMenuItem(this, null);
         this.categoriesBox.add_actor(categoryMenuItem.actor);
         let iter = root.iter();
@@ -687,31 +702,33 @@ class ApplicationsButton extends PanelMenu.Button {
 
         let height = this.categoriesBox.height + MENU_HEIGHT_OFFSET + 'px';
         this.mainBox.style+=('height: ' + height);
-    }
+    },
 
-    selectCategory(dir, categoryMenuItem) {
+    _clearApplicationsBox: function(selectedActor) {
-        this.applicationsBox.get_children().forEach(c => {
+        let actors = this.applicationsBox.get_children();
-            if (c._delegate instanceof PopupMenu.PopupSeparatorMenuItem)
+        for (let i = 0; i < actors.length; i++) {
-                c._delegate.destroy();
+            let actor = actors[i];
-            else
+            this.applicationsBox.remove_actor(actor);
-                this.applicationsBox.remove_actor(c);
+        }
-        });
+    },
+
+    selectCategory: function(dir, categoryMenuItem) {
+        if (categoryMenuItem)
+            this._clearApplicationsBox(categoryMenuItem.actor);
+        else
+            this._clearApplicationsBox(null);
 
         if (dir)
             this._displayButtons(this._listApplications(dir.get_menu_id()));
         else
             this._displayButtons(this._listApplications(null));
-    }
+    },
 
-    _displayButtons(apps) {
+    _displayButtons: function(apps) {
          if (apps) {
             for (let i = 0; i < apps.length; i++) {
                let app = apps[i];
-               let item;
+               let item = this._applicationsButtons.get(app);
-               if (app instanceof Shell.App)
-                   item = this._applicationsButtons.get(app);
-               else
-                   item = new PopupMenu.PopupSeparatorMenuItem();
                if (!item) {
                   item = new ApplicationMenuItem(this, app);
                   item.setDragEnabled(this._desktopTarget.hasDesktop);
@@ -721,13 +738,16 @@ class ApplicationsButton extends PanelMenu.Button {
                   this.applicationsBox.add_actor(item.actor);
             }
          }
-    }
+    },
 
-    _listApplications(category_menu_id) {
+    _listApplications: function(category_menu_id) {
         let applist;
 
         if (category_menu_id) {
             applist = this.applicationsByCategory[category_menu_id];
+            applist.sort(function(a,b) {
+                return a.get_name().toLowerCase() > b.get_name().toLowerCase();
+            });
         } else {
             applist = new Array();
             let favorites = global.settings.get_strv('favorite-apps');
@@ -739,13 +759,13 @@ class ApplicationsButton extends PanelMenu.Button {
         }
 
         return applist;
-    }
+    },
 
-    destroy() {
+    destroy: function() {
-        this.menu.actor.get_children().forEach(c => { c.destroy() });
+        this.menu.actor.get_children().forEach(function(c) { c.destroy() });
-        super.destroy();
+        this.parent();
     }
-};
+});
 
 let appsMenuButton;
 let activitiesButton;

extensions/apps-menu/meson.build

@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)

extensions/apps-menu/metadata.json.in

@@ -3,7 +3,7 @@
 "uuid": "@uuid@",
 "gettext-domain": "@gettext_domain@",
 "name": "Applications Menu",
-"description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
+"description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
 "original-authors": [ "e2002@bk.ru", "debarshir@gnome.org" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"

extensions/auto-move-windows/Makefile.am

@@ -0,0 +1,7 @@
+EXTENSION_ID = auto-move-windows
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk
+include ../../settings.mk
+

extensions/auto-move-windows/extension.js

@@ -1,7 +1,13 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
 
+const Glib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 
@@ -9,126 +15,135 @@ const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const Convenience = Me.imports.convenience;
 
-class WindowMover {
+const SETTINGS_KEY = 'application-list';
-    constructor() {
-        this._settings = Convenience.getSettings();
-        this._appSystem = Shell.AppSystem.get_default();
-        this._appConfigs = new Map();
-        this._appData = new Map();
 
-        this._appsChangedId =
+let settings;
-            this._appSystem.connect('installed-changed',
-                                    this._updateAppData.bind(this));
 
-        this._settings.connect('changed', this._updateAppConfigs.bind(this));
+const WindowMover = new Lang.Class({
-        this._updateAppConfigs();
+    Name: 'AutoMoveWindows.WindowMover',
-    }
 
-    _updateAppConfigs() {
+    _init: function() {
-        this._appConfigs.clear();
+        this._settings = settings;
+        this._windowTracker = Shell.WindowTracker.get_default();
 
-        this._settings.get_strv('application-list').forEach(v => {
+        let display = global.screen.get_display();
-            let [appId, num] = v.split(':');
+        // Connect after so the handler from ShellWindowTracker has already run
-            this._appConfigs.set(appId, parseInt(num) - 1);
+        this._windowCreatedId = display.connect_after('window-created', Lang.bind(this, this._findAndMove));
-        });
+    },
 
-        this._updateAppData();
+    destroy: function() {
-    }
+        if (this._windowCreatedId) {
-
+            global.screen.get_display().disconnect(this._windowCreatedId);
-    _updateAppData() {
+            this._windowCreatedId = 0;
-        let ids = [...this._appConfigs.keys()];
-        let removedApps = [...this._appData.keys()].filter(
-            a => !ids.includes(a.id)
-        );
-        removedApps.forEach(app => {
-            app.disconnect(this._appData.get(app).windowsChangedId);
-            this._appData.delete(app);
-        });
-
-        let addedApps = ids.map(id => this._appSystem.lookup_app(id)).filter(
-            app => app != null && !this._appData.has(app)
-        );
-        addedApps.forEach(app => {
-            let data = {
-                windowsChangedId: app.connect('windows-changed',
-                                              this._appWindowsChanged.bind(this)),
-                moveWindowsId: 0,
-                windows: app.get_windows()
-            }
-            this._appData.set(app, data);
-        });
-    }
-
-    destroy() {
-        if (this._appsChangedId) {
-            this._appSystem.disconnect(this._appsChangedId);
-            this._appsChangedId = 0;
         }
+    },
 
-        if (this._settings) {
+    _ensureAtLeastWorkspaces: function(num, window) {
-            this._settings.run_dispose();
+        for (let j = global.screen.n_workspaces; j <= num; j++) {
-            this._settings = null;
+            window.change_workspace_by_index(j-1, false);
+            global.screen.append_new_workspace(false, 0);
         }
+    },
 
-        this._appConfigs.clear();
+    _findAndMove: function(display, window, noRecurse) {
-        this._updateAppData();
-    }
-
-    _moveWindow(window, workspaceNum) {
         if (window.skip_taskbar)
             return;
 
-        // ensure we have the required number of workspaces
+        let spaces = this._settings.get_strv(SETTINGS_KEY);
-        for (let i = global.screen.n_workspaces; i <= workspaceNum; i++) {
+
-            window.change_workspace_by_index(i - 1, false);
+        let app = this._windowTracker.get_window_app(window);
-            global.screen.append_new_workspace(false, 0);
+        if (!app) {
+            if (!noRecurse) {
+                // window is not tracked yet
+                Mainloop.idle_add(Lang.bind(this, function() {
+                    this._findAndMove(display, window, true);
+                    return false;
+                }));
+            } else
+                log ('Cannot find application for window');
+            return;
         }
+        let app_id = app.get_id();
+        for ( let j = 0 ; j < spaces.length; j++ ) {
+            let apps_to_space = spaces[j].split(":");
+            // Match application id
+            if (apps_to_space[0] == app_id) {
+                let workspace_num = parseInt(apps_to_space[1]) - 1;
 
-        window.change_workspace_by_index(workspaceNum, false);
+                if (workspace_num >= global.screen.n_workspaces)
+                    this._ensureAtLeastWorkspaces(workspace_num, window);
+
+                window.change_workspace_by_index(workspace_num, false);
+            }
+        }
     }
-
+});
-    _appWindowsChanged(app) {
-        let data = this._appData.get(app);
-        let windows = app.get_windows();
-
-        // If get_compositor_private() returns non-NULL on a removed windows,
-        // the window still exists and is just moved to a different workspace
-        // or something; assume it'll be added back immediately, so keep it
-        // to avoid moving it again
-        windows.push(...data.windows.filter(
-            w => !windows.includes(w) && w.get_compositor_private() != null
-        ));
-
-        let workspaceNum = this._appConfigs.get(app.id);
-        windows.filter(w => !data.windows.includes(w)).forEach(window => {
-            this._moveWindow(window, workspaceNum);
-        });
-        data.windows = windows;
-    }
-};
 
 let prevCheckWorkspaces;
 let winMover;
 
 function init() {
     Convenience.initTranslations();
+    settings = Convenience.getSettings();
 }
 
 function myCheckWorkspaces() {
-    let keepAliveWorkspaces = [];
+    let i;
-    let foundNonEmpty = false;
+    let emptyWorkspaces = new Array(this._workspaces.length);
-    for (let i = this._workspaces.length - 1; i >= 0; i--) {
+
-        if (!foundNonEmpty)
+    if (!Meta.prefs_get_dynamic_workspaces()) {
-            foundNonEmpty = this._workspaces[i].list_windows().length > 0;
+        this._checkWorkspacesId = 0;
-        else if (!this._workspaces[i]._keepAliveId)
+        return false;
-            keepAliveWorkspaces.push(this._workspaces[i]);
     }
 
-    // make sure the original method only removes empty workspaces at the end
+    for (i = 0; i < this._workspaces.length; i++) {
-    keepAliveWorkspaces.forEach(ws => { ws._keepAliveId = 1; });
+        let lastRemoved = this._workspaces[i]._lastRemovedWindow;
-    prevCheckWorkspaces.call(this);
+        if ((lastRemoved &&
-    keepAliveWorkspaces.forEach(ws => { delete ws._keepAliveId; });
+             (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
+              lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
+              lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
+            this._workspaces[i]._keepAliveId)
+            emptyWorkspaces[i] = false;
+        else
+            emptyWorkspaces[i] = true;
+    }
 
+    let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
+    for (i = 0; i < sequences.length; i++) {
+        let index = sequences[i].get_workspace();
+        if (index >= 0 && index <= global.screen.n_workspaces)
+            emptyWorkspaces[index] = false;
+    }
+
+    let windows = global.get_window_actors();
+    for (i = 0; i < windows.length; i++) {
+	let winActor = windows[i];
+        let win = winActor.meta_window;
+	if (win.is_on_all_workspaces())
+            continue;
+
+	let workspaceIndex = win.get_workspace().index();
+	emptyWorkspaces[workspaceIndex] = false;
+    }
+
+    // If we don't have an empty workspace at the end, add one
+    if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
+	global.screen.append_new_workspace(false, global.get_current_time());
+	emptyWorkspaces.push(false);
+    }
+
+    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+    emptyWorkspaces[activeWorkspaceIndex] = false;
+
+    // Delete other empty workspaces; do it from the end to avoid index changes
+    for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
+        if (emptyWorkspaces[i])
+            global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
+        else
+            break;
+    }
+
+    this._checkWorkspacesId = 0;
     return false;
 }
 

extensions/auto-move-windows/meson.build

@@ -1,8 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/auto-move-windows/prefs.js

@@ -4,10 +4,11 @@
 const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = e => e;
+const N_ = function(e) { return e };
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@@ -25,19 +26,21 @@ const Columns = {
     ADJUSTMENT: 4
 };
 
-const Widget = GObject.registerClass({
+const Widget = new GObject.Class({
+    Name: 'AutoMoveWindows.Prefs.Widget',
     GTypeName: 'AutoMoveWindowsPrefsWidget',
-}, class Widget extends Gtk.Grid {
+    Extends: Gtk.Grid,
-    _init(params) {
+
-        super._init(params);
+    _init: function(params) {
+	this.parent(params);
         this.set_orientation(Gtk.Orientation.VERTICAL);
 
-        this._settings = Convenience.getSettings();
+	this._settings = Convenience.getSettings();
-        this._settings.connect('changed', this._refresh.bind(this));
+	this._settings.connect('changed', Lang.bind(this, this._refresh));
-        this._changedPermitted = false;
+	this._changedPermitted = false;
 
-        this._store = new Gtk.ListStore();
+	this._store = new Gtk.ListStore();
-        this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
+	this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
                                       Gtk.Adjustment]);
 
         let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN});
@@ -45,205 +48,212 @@ const Widget = GObject.registerClass({
         this.add(scrolled);
 
 
-        this._treeView = new Gtk.TreeView({ model: this._store,
+	this._treeView = new Gtk.TreeView({ model: this._store,
                                             hexpand: true, vexpand: true });
-        this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
+	this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
 
-        let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.DISPLAY_NAME,
+	let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.DISPLAY_NAME,
-                                                 title: _("Application") });
+						 title: _("Application") });
-        let iconRenderer = new Gtk.CellRendererPixbuf;
+	let iconRenderer = new Gtk.CellRendererPixbuf;
-        appColumn.pack_start(iconRenderer, false);
+	appColumn.pack_start(iconRenderer, false);
-        appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON);
+	appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON);
-        let nameRenderer = new Gtk.CellRendererText;
+	let nameRenderer = new Gtk.CellRendererText;
-        appColumn.pack_start(nameRenderer, true);
+	appColumn.pack_start(nameRenderer, true);
-        appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME);
+	appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME);
-        this._treeView.append_column(appColumn);
+	this._treeView.append_column(appColumn);
 
-        let workspaceColumn = new Gtk.TreeViewColumn({ title: _("Workspace"),
+	let workspaceColumn = new Gtk.TreeViewColumn({ title: _("Workspace"),
                                                        sort_column_id: Columns.WORKSPACE });
-        let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
+	let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
-        workspaceRenderer.connect('edited', this._workspaceEdited.bind(this));
+	workspaceRenderer.connect('edited', Lang.bind(this, this._workspaceEdited));
-        workspaceColumn.pack_start(workspaceRenderer, true);
+	workspaceColumn.pack_start(workspaceRenderer, true);
-        workspaceColumn.add_attribute(workspaceRenderer, "adjustment", Columns.ADJUSTMENT);
+	workspaceColumn.add_attribute(workspaceRenderer, "adjustment", Columns.ADJUSTMENT);
         workspaceColumn.add_attribute(workspaceRenderer, "text", Columns.WORKSPACE);
-        this._treeView.append_column(workspaceColumn);
+	this._treeView.append_column(workspaceColumn);
 
-        scrolled.add(this._treeView);
+	scrolled.add(this._treeView);
 
-        let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
+	let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
-        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+	toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
-        this.add(toolbar);
+	this.add(toolbar);
 
-        let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
+	let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
                                              label: _("Add Rule"),
-                                             is_important: true });
+					     is_important: true });
-        newButton.connect('clicked', this._createNew.bind(this));
+	newButton.connect('clicked', Lang.bind(this, this._createNew));
-        toolbar.add(newButton);
+	toolbar.add(newButton);
 
-        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
+	let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
-        delButton.connect('clicked', this._deleteSelected.bind(this));
+	delButton.connect('clicked', Lang.bind(this, this._deleteSelected));
-        toolbar.add(delButton);
+	toolbar.add(delButton);
 
         let selection = this._treeView.get_selection();
-        selection.connect('changed', () => {
+        selection.connect('changed',
-            delButton.sensitive = selection.count_selected_rows() > 0;
+            function() {
-        });
+                delButton.sensitive = selection.count_selected_rows() > 0;
+            });
         delButton.sensitive = selection.count_selected_rows() > 0;
 
-        this._changedPermitted = true;
+	this._changedPermitted = true;
-        this._refresh();
+	this._refresh();
-    }
+    },
 
-    _createNew() {
+    _createNew: function() {
-        let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
+	let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
-                                      transient_for: this.get_toplevel(),
+				      transient_for: this.get_toplevel(),
                                       use_header_bar: true,
-                                      modal: true });
+				      modal: true });
-        dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
+	dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
-        let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
+	let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
         dialog.set_default_response(Gtk.ResponseType.OK);
 
-        let grid = new Gtk.Grid({ column_spacing: 10,
+	let grid = new Gtk.Grid({ column_spacing: 10,
                                   row_spacing: 15,
                                   margin: 10 });
-        dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
+	dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
-        dialog._appChooser.connect('application-selected', (w, appInfo) => {
+        dialog._appChooser.connect('application-selected', Lang.bind(this,
-            addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
+            function(w, appInfo) {
-        });
+                addButton.sensitive = appInfo &&
+                                      this._checkId(appInfo.get_id());
+            }));
         let appInfo = dialog._appChooser.get_app_info();
         addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
 
-        grid.attach(dialog._appChooser, 0, 0, 2, 1);
+	grid.attach(dialog._appChooser, 0, 0, 2, 1);
-        grid.attach(new Gtk.Label({ label: _("Workspace"),
+	grid.attach(new Gtk.Label({ label: _("Workspace"),
                                     halign: Gtk.Align.END }), 0, 1, 1, 1);
-        let adjustment = new Gtk.Adjustment({ lower: 1,
+	let adjustment = new Gtk.Adjustment({ lower: 1,
-                                              upper: WORKSPACE_MAX,
+					      upper: WORKSPACE_MAX,
-                                              step_increment: 1
+					      step_increment: 1
                                             });
-        dialog._spin = new Gtk.SpinButton({ adjustment: adjustment,
+	dialog._spin = new Gtk.SpinButton({ adjustment: adjustment,
-                                            snap_to_ticks: true });
+					    snap_to_ticks: true });
         dialog._spin.set_value(1);
-        grid.attach(dialog._spin, 1, 1, 1, 1);
+	grid.attach(dialog._spin, 1, 1, 1, 1);
-        dialog.get_content_area().add(grid);
+	dialog.get_content_area().add(grid);
 
-        dialog.connect('response', (dialog, id) => {
+	dialog.connect('response', Lang.bind(this, function(dialog, id) {
-            if (id != Gtk.ResponseType.OK) {
+	    if (id != Gtk.ResponseType.OK) {
                 dialog.destroy();
-                return;
+		return;
             }
 
-            let appInfo = dialog._appChooser.get_app_info();
+	    let appInfo = dialog._appChooser.get_app_info();
-            if (!appInfo)
+	    if (!appInfo)
-                return;
+		return;
-            let index = Math.floor(dialog._spin.value);
+	    let index = Math.floor(dialog._spin.value);
-            if (isNaN(index) || index < 0)
+	    if (isNaN(index) || index < 0)
-                index = 1;
+		index = 1;
 
-            this._changedPermitted = false;
+	    this._changedPermitted = false;
-            this._appendItem(appInfo.get_id(), index);
+	    this._appendItem(appInfo.get_id(), index);
-            this._changedPermitted = true;
+	    this._changedPermitted = true;
 
-            let iter = this._store.append();
+	    let iter = this._store.append();
-            let adj = new Gtk.Adjustment({ lower: 1,
+	    let adj = new Gtk.Adjustment({ lower: 1,
-                                           upper: WORKSPACE_MAX,
+					   upper: WORKSPACE_MAX,
-                                           step_increment: 1,
+					   step_increment: 1,
                                            value: index });
-            this._store.set(iter,
+	    this._store.set(iter,
-                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
+			    [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
-                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);
+			    [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);
 
             dialog.destroy();
-        });
+	}));
-        dialog.show_all();
+	dialog.show_all();
-    }
+    },
 
-    _deleteSelected() {
+    _deleteSelected: function() {
-        let [any, model, iter] = this._treeView.get_selection().get_selected();
+	let [any, model, iter] = this._treeView.get_selection().get_selected();
 
-        if (any) {
+	if (any) {
-            let appInfo = this._store.get_value(iter, Columns.APPINFO);
+	    let appInfo = this._store.get_value(iter, Columns.APPINFO);
 
-            this._changedPermitted = false;
+	    this._changedPermitted = false;
-            this._removeItem(appInfo.get_id());
+	    this._removeItem(appInfo.get_id());
-            this._changedPermitted = true;
+	    this._changedPermitted = true;
-            this._store.remove(iter);
+	    this._store.remove(iter);
-        }
+	}
-    }
+    },
 
-    _workspaceEdited(renderer, pathString, text) {
+    _workspaceEdited: function(renderer, pathString, text) {
-        let index = parseInt(text);
+	let index = parseInt(text);
-        if (isNaN(index) || index < 0)
+	if (isNaN(index) || index < 0)
-            index = 1;
+	    index = 1;
         let path = Gtk.TreePath.new_from_string(pathString);
-        let [model, iter] = this._store.get_iter(path);
+	let [model, iter] = this._store.get_iter(path);
-        let appInfo = this._store.get_value(iter, Columns.APPINFO);
+	let appInfo = this._store.get_value(iter, Columns.APPINFO);
 
-        this._changedPermitted = false;
+	this._changedPermitted = false;
-        this._changeItem(appInfo.get_id(), index);
+	this._changeItem(appInfo.get_id(), index);
-        this._store.set_value(iter, Columns.WORKSPACE, index);
+	this._store.set_value(iter, Columns.WORKSPACE, index);
-        this._changedPermitted = true;
+	this._changedPermitted = true;
-    }
+    },
 
-    _refresh() {
+    _refresh: function() {
-        if (!this._changedPermitted)
+	if (!this._changedPermitted)
-            // Ignore this notification, model is being modified outside
+	    // Ignore this notification, model is being modified outside
-            return;
+	    return;
 
-        this._store.clear();
+	this._store.clear();
 
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let validItems = [ ];
+	let validItems = [ ];
-        for (let i = 0; i < currentItems.length; i++) {
+	for (let i = 0; i < currentItems.length; i++) {
-            let [id, index] = currentItems[i].split(':');
+	    let [id, index] = currentItems[i].split(':');
-            let appInfo = Gio.DesktopAppInfo.new(id);
+	    let appInfo = Gio.DesktopAppInfo.new(id);
-            if (!appInfo)
+	    if (!appInfo)
-                continue;
+		continue;
-            validItems.push(currentItems[i]);
+	    validItems.push(currentItems[i]);
 
-            let iter = this._store.append();
+	    let iter = this._store.append();
-            let adj = new Gtk.Adjustment({ lower: 1,
+	    let adj = new Gtk.Adjustment({ lower: 1,
-                                           upper: WORKSPACE_MAX,
+					   upper: WORKSPACE_MAX,
-                                           step_increment: 1,
+					   step_increment: 1,
                                            value: index });
-            this._store.set(iter,
+	    this._store.set(iter,
-                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
+			    [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
-                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]);
+			    [appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]);
-        }
+	}
 
-        if (validItems.length != currentItems.length) // some items were filtered out
+	if (validItems.length != currentItems.length) // some items were filtered out
-            this._settings.set_strv(SETTINGS_KEY, validItems);
+	    this._settings.set_strv(SETTINGS_KEY, validItems);
-    }
+    },
 
-    _checkId(id) {
+    _checkId: function(id) {
         let items = this._settings.get_strv(SETTINGS_KEY);
-        return !items.some(i => i.startsWith(id + ':'));
+        return !items.some(function(i) { return i.startsWith(id + ':'); });
-    }
+    },
 
-    _appendItem(id, workspace) {
+    _appendItem: function(id, workspace) {
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        currentItems.push(id + ':' + workspace);
+	currentItems.push(id + ':' + workspace);
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
+	this._settings.set_strv(SETTINGS_KEY, currentItems);
-    }
+    },
 
-    _removeItem(id) {
+    _removeItem: function(id) {
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+	let index = currentItems.map(function(el) {
+	    return el.split(':')[0];
+	}).indexOf(id);
 
-        if (index < 0)
+	if (index < 0)
-            return;
+	    return;
-        currentItems.splice(index, 1);
+	currentItems.splice(index, 1);
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
+	this._settings.set_strv(SETTINGS_KEY, currentItems);
-    }
+    },
 
-    _changeItem(id, workspace) {
+    _changeItem: function(id, workspace) {
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+	let index = currentItems.map(function(el) {
+	    return el.split(':')[0];
+	}).indexOf(id);
 
-        if (index < 0)
+	if (index < 0)
-            currentItems.push(id + ':' + workspace);
+	    currentItems.push(id + ':' + workspace);
-        else
+	else
-            currentItems[index] = id + ':' + workspace;
+	    currentItems[index] = id + ':' + workspace;
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
+	this._settings.set_strv(SETTINGS_KEY, currentItems);
     }
 });
 

extensions/drive-menu/Makefile.am

@@ -0,0 +1,3 @@
+EXTENSION_ID = drive-menu
+
+include ../../extension.mk

extensions/drive-menu/extension.js

@@ -1,6 +1,7 @@
 // Drive menu extension
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const Lang = imports.lang;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 
@@ -17,36 +18,39 @@ const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const Convenience = Me.imports.convenience;
 
-class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
+const MountMenuItem = new Lang.Class({
-    constructor(mount) {
+    Name: 'DriveMenu.MountMenuItem',
-        super();
+    Extends: PopupMenu.PopupBaseMenuItem,
 
-        this.label = new St.Label({ text: mount.get_name() });
+    _init: function(mount) {
-        this.actor.add(this.label, { expand: true });
+	this.parent();
+
+	this.label = new St.Label({ text: mount.get_name() });
+	this.actor.add(this.label, { expand: true });
         this.actor.label_actor = this.label;
 
-        this.mount = mount;
+	this.mount = mount;
 
-        let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
+	let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                      style_class: 'popup-menu-icon ' });
+				      style_class: 'popup-menu-icon ' });
-        let ejectButton = new St.Button({ child: ejectIcon });
+	let ejectButton = new St.Button({ child: ejectIcon });
-        ejectButton.connect('clicked', this._eject.bind(this));
+	ejectButton.connect('clicked', Lang.bind(this, this._eject));
-        this.actor.add(ejectButton);
+	this.actor.add(ejectButton);
 
-        this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
+        this._changedId = mount.connect('changed', Lang.bind(this, this._syncVisibility));
         this._syncVisibility();
-    }
+    },
 
-    destroy() {
+    destroy: function() {
         if (this._changedId) {
             this.mount.disconnect(this._changedId);
             this._changedId = 0;
         }
 
-        super.destroy();
+        this.parent();
-    }
+    },
 
-    _isInteresting() {
+    _isInteresting: function() {
         if (!this.mount.can_eject() && !this.mount.can_unmount())
             return false;
         if (this.mount.is_shadowed())
@@ -61,61 +65,64 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
         }
 
         return volume.get_identifier('class') != 'network';
-    }
+    },
 
-    _syncVisibility() {
+    _syncVisibility: function() {
         this.actor.visible = this._isInteresting();
-    }
+    },
 
-    _eject() {
+    _eject: function() {
         let mountOp = new ShellMountOperation.ShellMountOperation(this.mount);
 
-        if (this.mount.can_eject())
+	if (this.mount.can_eject())
-            this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
+	    this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
                                             mountOp.mountOp,
-                                            null, // Gio.Cancellable
+					    null, // Gio.Cancellable
-                                            this._ejectFinish.bind(this));
+					    Lang.bind(this, this._ejectFinish));
-        else
+	else
-            this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
+	    this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
                                               mountOp.mountOp,
-                                              null, // Gio.Cancellable
+			                      null, // Gio.Cancellable
-                                              this._unmountFinish.bind(this));
+			                      Lang.bind(this, this._unmountFinish));
-    }
+    },
 
-    _unmountFinish(mount, result) {
+    _unmountFinish: function(mount, result) {
-        try {
+	try {
-            mount.unmount_with_operation_finish(result);
+	    mount.unmount_with_operation_finish(result);
-        } catch(e) {
+	} catch(e) {
-            this._reportFailure(e);
+	    this._reportFailure(e);
-        }
+	}
-    }
+    },
 
-    _ejectFinish(mount, result) {
+    _ejectFinish: function(mount, result) {
-        try {
+	try {
-            mount.eject_with_operation_finish(result);
+	    mount.eject_with_operation_finish(result);
-        } catch(e) {
+	} catch(e) {
-            this._reportFailure(e);
+	    this._reportFailure(e);
-        }
+	}
-    }
+    },
 
-    _reportFailure(exception) {
+    _reportFailure: function(exception) {
-        // TRANSLATORS: %s is the filesystem name
+	// TRANSLATORS: %s is the filesystem name
-        let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name());
+	let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name());
-        Main.notifyError(msg, exception.message);
+	Main.notifyError(msg, exception.message);
-    }
+    },
 
-    activate(event) {
+    activate: function(event) {
         let context = global.create_app_launch_context(event.get_time(), -1);
         Gio.AppInfo.launch_default_for_uri(this.mount.get_root().get_uri(),
                                            context);
 
-        super.activate(event);
+	this.parent(event);
     }
-};
+});
 
-class DriveMenu extends PanelMenu.Button {
+const DriveMenu = new Lang.Class({
-    constructor() {
+    Name: 'DriveMenu.DriveMenu',
-        super(0.0, _("Removable devices"));
+    Extends: PanelMenu.Button,
+
+    _init: function() {
+        this.parent(0.0, _("Removable devices"));
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
@@ -125,66 +132,66 @@ class DriveMenu extends PanelMenu.Button {
         hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
         this.actor.add_child(hbox);
 
-        this._monitor = Gio.VolumeMonitor.get();
+	this._monitor = Gio.VolumeMonitor.get();
-        this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
+	this._addedId = this._monitor.connect('mount-added', Lang.bind(this, function(monitor, mount) {
-            this._addMount(mount);
+	    this._addMount(mount);
-            this._updateMenuVisibility();
+	    this._updateMenuVisibility();
-        });
+	}));
-        this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
+	this._removedId = this._monitor.connect('mount-removed', Lang.bind(this, function(monitor, mount) {
-            this._removeMount(mount);
+	    this._removeMount(mount);
-            this._updateMenuVisibility();
+	    this._updateMenuVisibility();
-        });
+	}));
 
-        this._mounts = [ ];
+	this._mounts = [ ];
 
-        this._monitor.get_mounts().forEach(this._addMount.bind(this));
+	this._monitor.get_mounts().forEach(Lang.bind(this, this._addMount));
 
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+	this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addAction(_("Open Files"), event => {
+	this.menu.addAction(_("Open Files"), function(event) {
-            let appSystem = Shell.AppSystem.get_default();
+	    let appSystem = Shell.AppSystem.get_default();
-            let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
+	    let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
-            app.activate_full(-1, event.get_time());
+	    app.activate_full(-1, event.get_time());
-        });
+	});
 
-        this._updateMenuVisibility();
+	this._updateMenuVisibility();
-    }
+    },
 
-    _updateMenuVisibility() {
+    _updateMenuVisibility: function() {
-        if (this._mounts.filter(i => i.actor.visible).length > 0)
+	if (this._mounts.filter(function(i) i.actor.visible).length > 0)
-            this.actor.show();
+	    this.actor.show();
-        else
+	else
-            this.actor.hide();
+	    this.actor.hide();
-    }
+    },
 
-    _addMount(mount) {
+    _addMount: function(mount) {
-        let item = new MountMenuItem(mount);
+	let item = new MountMenuItem(mount);
-        this._mounts.unshift(item);
+	this._mounts.unshift(item);
-        this.menu.addMenuItem(item, 0);
+	this.menu.addMenuItem(item, 0);
-    }
+    },
 
-    _removeMount(mount) {
+    _removeMount: function(mount) {
-        for (let i = 0; i < this._mounts.length; i++) {
+	for (let i = 0; i < this._mounts.length; i++) {
-            let item = this._mounts[i];
+	    let item = this._mounts[i];
-            if (item.mount == mount) {
+	    if (item.mount == mount) {
-                item.destroy();
+		item.destroy();
-                this._mounts.splice(i, 1);
+		this._mounts.splice(i, 1);
-                return;
+		return;
-            }
+	    }
-        }
+	}
-        log ('Removing a mount that was never added to the menu');
+	log ('Removing a mount that was never added to the menu');
-    }
+    },
 
-    destroy() {
+    destroy: function() {
         if (this._connectedId) {
-            this._monitor.disconnect(this._connectedId);
+	    this._monitor.disconnect(this._connectedId);
-            this._monitor.disconnect(this._disconnectedId);
+	    this._monitor.disconnect(this._disconnectedId);
             this._connectedId = 0;
             this._disconnectedId = 0;
         }
 
-        super.destroy();
+	this.parent();
-    }
+    },
-};
+});
 
 function init() {
     Convenience.initTranslations();

extensions/drive-menu/meson.build

@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)

extensions/example/Makefile.am

@@ -0,0 +1,6 @@
+EXTENSION_ID = example
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk
+include ../../settings.mk

extensions/example/extension.js

@@ -20,7 +20,7 @@ function _showHello() {
     let monitor = Main.layoutManager.primaryMonitor;
     global.stage.add_actor(label);
     label.set_position(Math.floor (monitor.width / 2 - label.width / 2), Math.floor(monitor.height / 2 - label.height / 2));
-    Mainloop.timeout_add(3000, () => { label.destroy(); });
+    Mainloop.timeout_add(3000, function () { label.destroy(); });
 }
 
 // Put your extension initialization code here
@@ -43,7 +43,7 @@ function disable() {
     log ('Example extension disabled');
 
     if (signalId) {
-        Main.panel.actor.disconnect(signalId);
+	Main.panel.actor.disconnect(signalId);
-        signalId = 0;
+	signalId = 0;
     }
 }

extensions/example/meson.build

@@ -1,8 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/example/prefs.js

@@ -16,15 +16,18 @@ function init() {
     Convenience.initTranslations();
 }
 
-const ExamplePrefsWidget = GObject.registerClass(
+const ExamplePrefsWidget = new GObject.Class({
-class ExamplePrefsWidget extends Gtk.Grid {
+    Name: 'Example.Prefs.Widget',
-    _init(params) {
+    GTypeName: 'ExamplePrefsWidget',
-        super._init(params);
+    Extends: Gtk.Grid,
+
+    _init: function(params) {
+	this.parent(params);
         this.margin = 12;
         this.row_spacing = this.column_spacing = 6;
         this.set_orientation(Gtk.Orientation.VERTICAL);
 
-        this.add(new Gtk.Label({ label: '<b>' + _("Message") + '</b>',
+	this.add(new Gtk.Label({ label: '<b>' + _("Message") + '</b>',
                                  use_markup: true,
                                  halign: Gtk.Align.START }));
 
@@ -32,16 +35,16 @@ class ExamplePrefsWidget extends Gtk.Grid {
                                     margin_bottom: 12 });
         this.add(entry);
 
-        this._settings = Convenience.getSettings();
+	this._settings = Convenience.getSettings();
-        this._settings.bind('hello-text', entry, 'text', Gio.SettingsBindFlags.DEFAULT);
+	this._settings.bind('hello-text', entry, 'text', Gio.SettingsBindFlags.DEFAULT);
 
-        // TRANSLATORS: Example is the name of the extension, should not be
+	// TRANSLATORS: Example is the name of the extension, should not be
-        // translated
+	// translated
-        let primaryText = _("Example aims to show how to build well behaved \
+	let primaryText = _("Example aims to show how to build well behaved \
 extensions for the Shell and as such it has little functionality on its own.\n\
 Nevertheless it’s possible to customize the greeting message.");
 
-        this.add(new Gtk.Label({ label: primaryText,
+	this.add(new Gtk.Label({ label: primaryText,
                                  wrap: true, xalign: 0 }));
     }
 });

extensions/launch-new-instance/Makefile.am

@@ -0,0 +1,3 @@
+EXTENSION_ID = launch-new-instance
+
+include ../../extension.mk

extensions/launch-new-instance/meson.build

@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)

extensions/launch-new-instance/metadata.json.in

@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Launch new instance",
-"description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
+"description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }

extensions/meson.build

@@ -1,45 +0,0 @@
-extension_schemas = []
-js_sources = extensionlib
-
-metadata_name = 'metadata.json'
-
-foreach e : all_extensions
-  uuid = e + uuid_suffix
-
-  metadata_conf = configuration_data()
-  metadata_conf.set('extension_id', e)
-  metadata_conf.set('uuid', uuid)
-  metadata_conf.set('gschemaname', 'org.gnome.shell.extensions.' + e)
-  metadata_conf.set('gettext_domain', gettext_domain)
-  metadata_conf.set('shell_current', shell_version)
-  metadata_conf.set('url', 'https://gitlab.gnome.org/GNOME/gnome-shell-extensions')
-
-  extension_sources = files(e + '/extension.js')
-  extension_data = files(e + '/stylesheet.css')
-
-  subdir(e)
-
-  js_sources += extension_sources
-
-  if (enabled_extensions.contains(e))
-    install_data (extension_sources + extension_data + extensionlib,
-      install_dir: join_paths(extensiondir, uuid)
-    )
-  endif
-endforeach
-
-install_data (extension_schemas,
-  install_dir: schemadir
-)
-
-foreach js_source : js_sources
-  if (js52.found())
-    path_array = '@0@'.format(js_source).split('/')
-    name = join_paths(path_array[-2], path_array[-1])
-
-    test('Checking syntax of ' + name, js52,
-      args: ['-s', '-c', js_source],
-      workdir: meson.current_source_dir()
-    )
-  endif
-endforeach

extensions/meson.build.template

@@ -1,8 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-# extension_sources += files('prefs.js')
-# extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/native-window-placement/Makefile.am

@@ -0,0 +1,5 @@
+EXTENSION_ID = native-window-placement
+
+include ../../extension.mk
+include ../../settings.mk
+

extensions/native-window-placement/extension.js

@@ -1,5 +1,24 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// import just everything from workspace.js:
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Signals = imports.signals;
+
+const DND = imports.ui.dnd;
+const Lightbox = imports.ui.lightbox;
+const Main = imports.ui.main;
+const Overview = imports.ui.overview;
+const Panel = imports.ui.panel;
+const Tweener = imports.ui.tweener;
+
 const Workspace = imports.ui.workspace;
+const WindowPositionFlags = Workspace.WindowPositionFlags;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@@ -12,19 +31,40 @@ const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy
 const WINDOW_PLACEMENT_NATURAL_GAPS = 5;                            // half of the minimum gap between windows
 const WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS = 5000;             // safety limit for preventing endless loop if something is wrong in the algorithm
 
-class Rect {
+const PLACE_WINDOW_CAPTIONS_ON_TOP = true;                          // place window titles in overview on top of windows with overlap parameter
-    constructor(x, y, width, height) {
+
-        [this.x, this.y, this.width, this.height] = [x, y, width, height];
+const WORKSPACE_BORDER_GAP = 10;                                    // minimum gap between the workspace area and the workspace selector
+const WINDOW_AREA_TOP_GAP = 20;                                     // minimum gap between the workspace area and the top border. This keeps window captions and close buttons visible. 13px (26/2) should currently be enough.
+
+const BUTTON_LAYOUT_SCHEMA = 'org.gnome.desktop.wm.preferences';
+const BUTTON_LAYOUT_KEY = 'button-layout';
+
+function injectToFunction(parent, name, func) {
+    let origin = parent[name];
+    parent[name] = function() {
+        let ret;
+        ret = origin.apply(this, arguments);
+        if (ret === undefined)
+            ret = func.apply(this, arguments);
+        return ret;
     }
+}
+
+const Rect = new Lang.Class({
+    Name: 'NativeWindowPlacement.Rect',
+
+    _init: function(x, y, width, height) {
+        [this.x, this.y, this.width, this.height] = [x, y, width, height];
+    },
 
     /**
      * used in _calculateWindowTransformationsNatural to replace Meta.Rectangle that is too slow.
      */
-    copy() {
+    copy: function() {
         return new Rect(this.x, this.y, this.width, this.height);
-    }
+    },
 
-    union(rect2) {
+    union: function(rect2) {
         let dest = this.copy();
         if (rect2.x < dest.x)
           {
@@ -42,57 +82,68 @@ class Rect {
           dest.height = rect2.y + rect2.height - dest.y;
 
         return dest;
-    }
+    },
 
-    adjusted(dx, dy, dx2, dy2) {
+    adjusted: function(dx, dy, dx2, dy2) {
         let dest = this.copy();
         dest.x += dx;
         dest.y += dy;
         dest.width += -dx + dx2;
         dest.height += -dy + dy2;
         return dest;
-    }
+    },
 
-    overlap(rect2) {
+    overlap: function(rect2) {
         return !((this.x + this.width    <= rect2.x) ||
                  (rect2.x + rect2.width  <= this.x) ||
                  (this.y + this.height   <= rect2.y) ||
                  (rect2.y + rect2.height <= this.y));
-    }
+    },
 
-    center() {
+    center: function() {
         return [this.x + this.width / 2, this.y + this.height / 2];
-    }
+    },
 
-    translate(dx, dy) {
+    translate: function(dx, dy) {
         this.x += dx;
         this.y += dy;
     }
-};
+});
 
-class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
+let winInjections, workspaceInjections, connectedSignals;
-    constructor(settings) {
-        super();
-        this._settings = settings;
-    }
 
-    computeLayout(windows, layout) {
+function resetState() {
-        layout.windows = windows;
+    winInjections = { };
-    }
+    workspaceInjections = { };
+    connectedSignals = [ ];
+}
+
+function enable() {
+    resetState();
+
+    let settings = Convenience.getSettings();
+    let useMoreScreen = settings.get_boolean('use-more-screen');
+    let windowCaptionsOnTop = settings.get_boolean('window-captions-on-top');
+    let signalId = settings.connect('changed::use-more-screen', function() {
+        useMoreScreen = settings.get_boolean('use-more-screen');
+    });
+    connectedSignals.push({ obj: settings, id: signalId });
 
     /**
+     * _calculateWindowTransformationsNatural:
+     * @clones: Array of #MetaWindow
+     *
      * Returns clones with matching target coordinates and scales to arrange windows in a natural way that no overlap exists and relative window size is preserved.
      * This function is almost a 1:1 copy of the function
      * PresentWindowsEffect::calculateWindowTransformationsNatural() from KDE, see:
      * https://projects.kde.org/projects/kde/kdebase/kde-workspace/repository/revisions/master/entry/kwin/effects/presentwindows/presentwindows.cpp
      */
-    computeWindowSlots(layout, area) {
+    Workspace.Workspace.prototype._calculateWindowTransformationsNatural = function(clones, area) {
         // As we are using pseudo-random movement (See "slot") we need to make sure the list
         // is always sorted the same way no matter which window is currently active.
 
         let area_rect = new Rect(area.x, area.y, area.width, area.height);
         let bounds = area_rect.copy();
-        let clones = layout.windows;
 
         let direction = 0;
         let directions = [];
@@ -150,7 +201,7 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                         rects[j].translate(diff[0], diff[1]);
 
 
-                        if (this._settings.get_boolean('use-more-screen')) {
+                        if (useMoreScreen) {
                             // Try to keep the bounding rect the same aspect as the screen so that more
                             // screen real estate is utilised. We do this by splitting the screen into nine
                             // equal sections, if the window center is in any of the corner sections pull the
@@ -240,39 +291,157 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
 
         return slots;
     }
-};
+    workspaceInjections['_calculateWindowTransformationsNatural'] = undefined;
 
-let winInjections, workspaceInjections;
+    /**
+     * _updateWindowPositions:
+     * @flags:
+     *  INITIAL - this is the initial positioning of the windows.
+     *  ANIMATE - Indicates that we need animate changing position.
+     */
+    workspaceInjections['_updateWindowPositions'] = Workspace.Workspace.prototype._updateWindowPositions;
+    Workspace.Workspace.prototype._updateWindowPositions = function(flags) {
+            if (this._currentLayout == null) {
+                this._recalculateWindowPositions(flags);
+                return;
+            }
 
-function resetState() {
+            let initialPositioning = flags & WindowPositionFlags.INITIAL;
-    winInjections = { };
+            let animate = flags & WindowPositionFlags.ANIMATE;
-    workspaceInjections = { };
-}
 
-function enable() {
+            let layout = this._currentLayout;
-    resetState();
+            let strategy = layout.strategy;
 
-    let settings = Convenience.getSettings();
+            let [, , padding] = this._getSpacingAndPadding();
+            let area = Workspace.padArea(this._actualGeometry, padding);
 
-    workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
+            /// EDIT replace this version by our own:
-    Workspace.Workspace.prototype._getBestLayout = function(windows) {
+            //let slots = strategy.computeWindowSlots(layout, area);
-        let strategy = new NaturalLayoutStrategy(settings);
-        let layout = { strategy };
-        strategy.computeLayout(windows, layout);
 
-        return layout;
-    }
 
-    /// position window titles on top of windows in overlay ////
+            /// EDIT copied from _realRecalculateWindowPositions:
-    winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
+            let clones = this._windows.slice();
-    Workspace.WindowOverlay.prototype.relayout = function(animate) {
+            if (clones.length == 0)
-        if (settings.get_boolean('window-captions-on-top')) {
+                return;
-            let [, , , cloneHeight] = this._windowClone.slot;
+
-            this.title.translation_y = -cloneHeight;
+            clones.sort(function(a, b) {
+                return a.metaWindow.get_stable_sequence() - b.metaWindow.get_stable_sequence();
+            });
+
+            if (this._reservedSlot)
+                clones.push(this._reservedSlot);
+
+            /// EDIT our own window placement function:
+            let slots = this._calculateWindowTransformationsNatural(clones, area);
+
+
+            let currentWorkspace = global.screen.get_active_workspace();
+            let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
+
+            for (let i = 0; i < slots.length; i++) {
+                let slot = slots[i];
+                let [x, y, scale, clone] = slot;
+                let metaWindow = clone.metaWindow;
+                let overlay = clone.overlay;
+                clone.slotId = i;
+
+                // Positioning a window currently being dragged must be avoided;
+                // we'll just leave a blank spot in the layout for it.
+                if (clone.inDrag)
+                    continue;
+
+                let cloneWidth = clone.actor.width * scale;
+                let cloneHeight = clone.actor.height * scale;
+                clone.slot = [x, y, cloneWidth, cloneHeight];
+
+                if (overlay && (initialPositioning || !clone.positioned))
+                    overlay.hide();
+
+                if (!clone.positioned) {
+                    // This window appeared after the overview was already up
+                    // Grow the clone from the center of the slot
+                    clone.actor.x = x + cloneWidth / 2;
+                    clone.actor.y = y + cloneHeight / 2;
+                    clone.actor.scale_x = 0;
+                    clone.actor.scale_y = 0;
+                    clone.positioned = true;
+                }
+
+                if (animate && isOnCurrentWorkspace) {
+                    if (!metaWindow.showing_on_its_workspace()) {
+                        /* Hidden windows should fade in and grow
+                         * therefore we need to resize them now so they
+                         * can be scaled up later */
+                        if (initialPositioning) {
+                            clone.actor.opacity = 0;
+                            clone.actor.scale_x = 0;
+                            clone.actor.scale_y = 0;
+                            clone.actor.x = x;
+                            clone.actor.y = y;
+                        }
+
+                        Tweener.addTween(clone.actor,
+                                         { opacity: 255,
+                                           time: Overview.ANIMATION_TIME,
+                                           transition: 'easeInQuad'
+                                         });
+                    }
+
+                    this._animateClone(clone, overlay, x, y, scale, initialPositioning);
+                } else {
+                    // cancel any active tweens (otherwise they might override our changes)
+                    Tweener.removeTweens(clone.actor);
+                    clone.actor.set_position(x, y);
+                    clone.actor.set_scale(scale, scale);
+                    clone.overlay.relayout(false);
+                    this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
+                }
+            }
         }
 
-        winInjections['relayout'].call(this, animate);
+
-    };
+
+    /// position window titles on top of windows in overlay ////
+    if (windowCaptionsOnTop) {
+
+        /// This is almost a direct copy of the original relayout function. Differences are marked.
+        winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
+        Workspace.WindowOverlay.prototype.relayout = function(animate) {
+            winInjections['relayout'].call(this, animate);
+            let title = this.title;
+            let border = this.border;
+
+            this._parentActor.set_child_above_sibling(title, border);
+
+            Tweener.removeTweens(title);
+
+            let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
+
+            // Clutter.Actor.get_preferred_width() will return the fixed width if one
+            // is set, so we need to reset the width by calling set_width(-1), to forward
+            // the call down to StLabel.
+            // We also need to save and restore the current width, otherwise the animation
+            // starts from the wrong point.
+            let prevTitleWidth = title.width;
+            title.set_width(-1);
+            let [titleMinWidth, titleNatWidth] = title.get_preferred_width(-1);
+            let titleWidth = Math.max(titleMinWidth, Math.min(titleNatWidth, cloneWidth));
+            title.width = prevTitleWidth;
+
+            let titleX = cloneX + (cloneWidth - titleWidth) / 2;
+
+            /// this is the actual difference to original gnome-shell:
+            //let titleY = cloneY + cloneHeight - (title.height - this.borderSize) / 2;
+            let titleY = cloneY - (title.height - this.borderSize) / 2;
+
+            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));
+            }
+        };
+    }
 }
 
 function removeInjection(object, injection, name) {
@@ -290,6 +459,9 @@ function disable() {
     for (i in winInjections)
         removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
 
+    for each (i in connectedSignals)
+        i.obj.disconnect(i.id);
+
     global.stage.queue_relayout();
     resetState();
 }

extensions/native-window-placement/meson.build

@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/places-menu/Makefile.am

@@ -0,0 +1,5 @@
+EXTENSION_ID = places-menu
+
+EXTRA_MODULES = placeDisplay.js
+
+include ../../extension.mk

extensions/places-menu/extension.js

@@ -3,6 +3,7 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
@@ -13,7 +14,7 @@ const Panel = imports.ui.panel;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = x => x;
+const N_ = function(x) { return x; }
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@@ -22,50 +23,45 @@ const PlaceDisplay = Me.imports.placeDisplay;
 
 const PLACE_ICON_SIZE = 16;
 
-class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
+const PlaceMenuItem = new Lang.Class({
-    constructor(info) {
+    Name: 'PlaceMenuItem',
-        super();
+    Extends: PopupMenu.PopupBaseMenuItem,
-        this._info = info;
+
+    _init: function(info) {
+	this.parent();
+	this._info = info;
 
         this._icon = new St.Icon({ gicon: info.icon,
                                    icon_size: PLACE_ICON_SIZE });
-        this.actor.add_child(this._icon);
+	this.actor.add_child(this._icon);
 
-        this._label = new St.Label({ text: info.name, x_expand: true });
+        this._label = new St.Label({ text: info.name });
         this.actor.add_child(this._label);
 
-        if (info.isRemovable()) {
-            this._ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                            style_class: 'popup-menu-icon ' });
-            this._ejectButton = new St.Button({ child: this._ejectIcon });
-            this._ejectButton.connect('clicked', info.eject.bind(info));
-            this.actor.add_child(this._ejectButton);
-        }
-
         this._changedId = info.connect('changed',
-                                       this._propertiesChanged.bind(this));
+                                       Lang.bind(this, this._propertiesChanged));
-    }
+    },
 
-    destroy() {
+    destroy: function() {
         if (this._changedId) {
             this._info.disconnect(this._changedId);
             this._changedId = 0;
         }
 
-        super.destroy();
+        this.parent();
-    }
+    },
 
-    activate(event) {
+    activate: function(event) {
-        this._info.launch(event.get_time());
+	this._info.launch(event.get_time());
 
-        super.activate(event);
+	this.parent(event);
-    }
+    },
 
-    _propertiesChanged(info) {
+    _propertiesChanged: function(info) {
         this._icon.gicon = info.icon;
         this._label.text = info.name;
-    }
+    },
-};
+});
 
 const SECTIONS = [
     'special',
@@ -74,9 +70,12 @@ const SECTIONS = [
     'network'
 ]
 
-class PlacesMenu extends PanelMenu.Button {
+const PlacesMenu = new Lang.Class({
-    constructor() {
+    Name: 'PlacesMenu.PlacesMenu',
-        super(0.0, _("Places"));
+    Extends: PanelMenu.Button,
+
+    _init: function() {
+        this.parent(0.0, _("Places"));
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         let label = new St.Label({ text: _("Places"),
@@ -88,41 +87,41 @@ class PlacesMenu extends PanelMenu.Button {
 
         this.placesManager = new PlaceDisplay.PlacesManager();
 
-        this._sections = { };
+	this._sections = { };
 
-        for (let i=0; i < SECTIONS.length; i++) {
+	for (let i=0; i < SECTIONS.length; i++) {
-            let id = SECTIONS[i];
+	    let id = SECTIONS[i];
-            this._sections[id] = new PopupMenu.PopupMenuSection();
+	    this._sections[id] = new PopupMenu.PopupMenuSection();
-            this.placesManager.connect(id + '-updated', () => {
+	    this.placesManager.connect(id + '-updated', Lang.bind(this, function() {
-                this._redisplay(id);
+		this._redisplay(id);
-            });
+	    }));
 
-            this._create(id);
+	    this._create(id);
-            this.menu.addMenuItem(this._sections[id]);
+	    this.menu.addMenuItem(this._sections[id]);
-            this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+	    this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        }
+	}
-    }
+    },
 
-    destroy() {
+    destroy: function() {
-        this.placesManager.destroy();
+	this.placesManager.destroy();
 
-        super.destroy();
+        this.parent();
-    }
+    },
 
-    _redisplay(id) {
+    _redisplay: function(id) {
-        this._sections[id].removeAll();
+	this._sections[id].removeAll();
         this._create(id);
-    }
+    },
 
-    _create(id) {
+    _create: function(id) {
         let places = this.placesManager.get(id);
 
         for (let i = 0; i < places.length; i++)
             this._sections[id].addMenuItem(new PlaceMenuItem(places[i]));
 
-        this._sections[id].actor.visible = places.length > 0;
+	this._sections[id].actor.visible = places.length > 0;
     }
-};
+});
 
 function init() {
     Convenience.initTranslations();
@@ -135,7 +134,7 @@ function enable() {
 
     let pos = 1;
     if ('apps-menu' in Main.panel.statusArea)
-        pos = 2;
+	pos = 2;
     Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
 }
 

extensions/places-menu/meson.build

@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('placeDisplay.js')

extensions/places-menu/metadata.json.in

@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Places Status Indicator",
-"description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
+"description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }

extensions/places-menu/placeDisplay.js

@@ -3,6 +3,7 @@
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Shell = imports.gi.Shell;
+const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 const St = imports.gi.St;
@@ -16,7 +17,7 @@ const Util = imports.misc.util;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = x => x;
+const N_ = function(x) { return x; }
 
 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
 
@@ -27,26 +28,24 @@ const Hostname1Iface = '<node> \
 </node>';
 const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);
 
-class PlaceInfo {
+const PlaceInfo = new Lang.Class({
-    constructor() {
+    Name: 'PlaceInfo',
-        this._init.apply(this, arguments);
-    }
 
-    _init(kind, file, name, icon) {
+    _init: function(kind, file, name, icon) {
         this.kind = kind;
         this.file = file;
         this.name = name || this._getFileName();
         this.icon = icon ? new Gio.ThemedIcon({ name: icon }) : this.getIcon();
-    }
+    },
 
-    destroy() {
+    destroy: function() {
-    }
+    },
 
-    isRemovable() {
+    isRemovable: function() {
         return false;
-    }
+    },
 
-    _createLaunchCallback(launchContext, tryMount) {
+    _createLaunchCallback: function(launchContext, tryMount) {
         return (_ignored, result) => {
             try {
                 Gio.AppInfo.launch_default_for_uri_finish(result);
@@ -79,20 +78,20 @@ class PlaceInfo {
                 Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
             }
         }
-    }
+    },
 
-    launch(timestamp) {
+    launch: function(timestamp) {
         let launchContext = global.create_app_launch_context(timestamp, -1);
         let callback = this._createLaunchCallback(launchContext, true);
         Gio.AppInfo.launch_default_for_uri_async(this.file.get_uri(),
                                                  launchContext,
                                                  null,
                                                  callback);
-    }
+    },
 
-    getIcon() {
+    getIcon: function() {
         this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
-                                   (file, result) => {
+                                   Lang.bind(this, function(file, result) {
                                        try {
                                            let info = file.query_info_finish(result);
                                            this.icon = info.get_symbolic_icon();
@@ -100,7 +99,7 @@ class PlaceInfo {
                                        } catch(e if e instanceof Gio.IOErrorEnum) {
                                            return;
                                        }
-                                   });
+                                   }));
 
         // return a generic icon for this kind for now, until we have the
         // icon from the query info above
@@ -117,135 +116,101 @@ class PlaceInfo {
             else
                 return new Gio.ThemedIcon({ name: 'folder-symbolic' });
         }
-    }
+    },
 
-    _getFileName() {
+    _getFileName: function() {
         try {
             let info = this.file.query_info('standard::display-name', 0, null);
             return info.get_display_name();
         } catch(e if e instanceof Gio.IOErrorEnum) {
             return this.file.get_basename();
         }
-    }
+    },
-};
+});
 Signals.addSignalMethods(PlaceInfo.prototype);
 
-class RootInfo extends PlaceInfo {
+const RootInfo = new Lang.Class({
-    _init() {
+    Name: 'RootInfo',
-        super._init('devices', Gio.File.new_for_path('/'), _("Computer"));
+    Extends: PlaceInfo,
 
-        let busName = 'org.freedesktop.hostname1';
+    _init: function() {
-        let objPath = '/org/freedesktop/hostname1';
+        this.parent('devices', Gio.File.new_for_path('/'), _("Computer"));
-        new Hostname1(Gio.DBus.system, busName, objPath, (obj, error) => {
-            if (error)
-                return;
 
-            this._proxy = obj;
+        this._proxy = new Hostname1(Gio.DBus.system,
-            this._proxy.connect('g-properties-changed',
+                                    'org.freedesktop.hostname1',
-                                this._propertiesChanged.bind(this));
+                                    '/org/freedesktop/hostname1',
-            this._propertiesChanged(obj);
+                                    Lang.bind(this, function(obj, error) {
-        });
+                                        if (error)
-    }
+                                            return;
 
-    getIcon() {
+                                        this._proxy.connect('g-properties-changed',
+                                                            Lang.bind(this, this._propertiesChanged));
+                                        this._propertiesChanged(obj);
+                                    }));
+    },
+
+    getIcon: function() {
         return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
-    }
+    },
 
-    _propertiesChanged(proxy) {
+    _propertiesChanged: function(proxy) {
         // GDBusProxy will emit a g-properties-changed when hostname1 goes down
         // ignore it
         if (proxy.g_name_owner) {
             this.name = proxy.PrettyHostname || _("Computer");
             this.emit('changed');
         }
+    },
+
+    destroy: function() {
+        this._proxy.run_dispose();
+        this.parent();
     }
-
+});
-    destroy() {
-        if (this._proxy) {
-            this._proxy.run_dispose();
-            this._proxy = null;
-        }
-        super.destroy();
-    }
-};
 
 
-class PlaceDeviceInfo extends PlaceInfo {
+const PlaceDeviceInfo = new Lang.Class({
-    _init(kind, mount) {
+    Name: 'PlaceDeviceInfo',
+    Extends: PlaceInfo,
+
+    _init: function(kind, mount) {
         this._mount = mount;
-        super._init(kind, mount.get_root(), mount.get_name());
+        this.parent(kind, mount.get_root(), mount.get_name());
-    }
+    },
 
-    getIcon() {
+    getIcon: function() {
         return this._mount.get_symbolic_icon();
     }
+});
 
-    isRemovable() {
+const PlaceVolumeInfo = new Lang.Class({
-        return this._mount.can_eject();
+    Name: 'PlaceVolumeInfo',
-    }
+    Extends: PlaceInfo,
 
-    eject() {
+    _init: function(kind, volume) {
-        let mountOp = new ShellMountOperation.ShellMountOperation(this._mount);
-
-        if (this._mount.can_eject())
-            this._mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
-                                             mountOp.mountOp,
-                                             null, // Gio.Cancellable
-                                             this._ejectFinish.bind(this));
-        else
-            this._mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
-                                               mountOp.mountOp,
-                                               null, // Gio.Cancellable
-                                               this._unmountFinish.bind(this));
-    }
-
-    _ejectFinish(mount, result) {
-        try {
-            mount.eject_with_operation_finish(result);
-        } catch(e) {
-            this._reportFailure(e);
-        }
-    }
-
-    _unmountFinish(mount, result) {
-        try {
-            mount.unmount_with_operation_finish(result);
-        } catch(e) {
-            this._reportFailure(e);
-        }
-    }
-
-    _reportFailure(exception) {
-        let msg = _("Ejecting drive “%s” failed:").format(this._mount.get_name());
-        Main.notifyError(msg, exception.message);
-    }
-};
-
-class PlaceVolumeInfo extends PlaceInfo {
-    _init(kind, volume) {
         this._volume = volume;
-        super._init(kind, volume.get_activation_root(), volume.get_name());
+        this.parent(kind, volume.get_activation_root(), volume.get_name());
-    }
+    },
 
-    launch(timestamp) {
+    launch: function(timestamp) {
         if (this.file) {
-            super.launch(timestamp);
+            this.parent(timestamp);
             return;
         }
 
-        this._volume.mount(0, null, null, (volume, result) => {
+        this._volume.mount(0, null, null, Lang.bind(this, function(volume, result) {
             volume.mount_finish(result);
 
             let mount = volume.get_mount();
             this.file = mount.get_root();
-            super.launch(timestamp);
+            this.parent(timestamp);
-        });
+        }));
-    }
+    },
 
-    getIcon() {
+    getIcon: function() {
         return this._volume.get_symbolic_icon();
     }
-};
+});
 
 const DEFAULT_DIRECTORIES = [
     GLib.UserDirectory.DIRECTORY_DOCUMENTS,
@@ -255,8 +220,10 @@ const DEFAULT_DIRECTORIES = [
     GLib.UserDirectory.DIRECTORY_VIDEOS,
 ];
 
-var PlacesManager = class {
+var PlacesManager = new Lang.Class({
-    constructor() {
+    Name: 'PlacesManager',
+
+    _init: function() {
         this._places = {
             special: [],
             devices: [],
@@ -267,7 +234,7 @@ var PlacesManager = class {
         this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
         this._showDesktopIconsChangedId =
             this._settings.connect('changed::show-desktop-icons',
-                                   this._updateSpecials.bind(this));
+                                   Lang.bind(this, this._updateSpecials));
         this._updateSpecials();
 
         /*
@@ -283,35 +250,35 @@ var PlacesManager = class {
 
         if (this._bookmarksFile) {
             this._monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
-            this._monitor.connect('changed', () => {
+            this._monitor.connect('changed', Lang.bind(this, function () {
                 if (this._bookmarkTimeoutId > 0)
                     return;
                 /* Defensive event compression */
-                this._bookmarkTimeoutId = Mainloop.timeout_add(100, () => {
+                this._bookmarkTimeoutId = Mainloop.timeout_add(100, Lang.bind(this, function () {
                     this._bookmarkTimeoutId = 0;
                     this._reloadBookmarks();
                     return false;
-                });
+                }));
-            });
+            }));
 
             this._reloadBookmarks();
         }
-    }
+    },
 
-    _connectVolumeMonitorSignals() {
+    _connectVolumeMonitorSignals: function() {
         const signals = ['volume-added', 'volume-removed', 'volume-changed',
                          'mount-added', 'mount-removed', 'mount-changed',
                          'drive-connected', 'drive-disconnected', 'drive-changed'];
 
         this._volumeMonitorSignals = [];
-        let func = this._updateMounts.bind(this);
+        let func = Lang.bind(this, this._updateMounts);
         for (let i = 0; i < signals.length; i++) {
             let id = this._volumeMonitor.connect(signals[i], func);
             this._volumeMonitorSignals.push(id);
         }
-    }
+    },
 
-    destroy() {
+    destroy: function() {
         if (this._settings)
             this._settings.disconnect(this._showDesktopIconsChangedId);
         this._settings = null;
@@ -323,10 +290,10 @@ var PlacesManager = class {
             this._monitor.cancel();
         if (this._bookmarkTimeoutId)
             Mainloop.source_remove(this._bookmarkTimeoutId);
-    }
+    },
 
-    _updateSpecials() {
+    _updateSpecials: function() {
-        this._places.special.forEach(p => { p.destroy(); });
+        this._places.special.forEach(function (p) { p.destroy(); });
         this._places.special = [];
 
         let homePath = GLib.get_home_dir();
@@ -356,19 +323,21 @@ var PlacesManager = class {
             specials.push(info);
         }
 
-        specials.sort((a, b) => GLib.utf8_collate(a.name, b.name));
+        specials.sort(function(a, b) {
+            return GLib.utf8_collate(a.name, b.name);
+        });
         this._places.special = this._places.special.concat(specials);
 
         this.emit('special-updated');
-    }
+    },
 
-    _updateMounts() {
+    _updateMounts: function() {
         let networkMounts = [];
         let networkVolumes = [];
 
-        this._places.devices.forEach(p => { p.destroy(); });
+        this._places.devices.forEach(function (p) { p.destroy(); });
         this._places.devices = [];
-        this._places.network.forEach(p => { p.destroy(); });
+        this._places.network.forEach(function (p) { p.destroy(); });
         this._places.network = [];
 
         /* Add standard places */
@@ -443,9 +412,9 @@ var PlacesManager = class {
 
         this.emit('devices-updated');
         this.emit('network-updated');
-    }
+    },
 
-    _findBookmarksFile() {
+    _findBookmarksFile: function() {
         let paths = [
             GLib.build_filenamev([GLib.get_user_config_dir(), 'gtk-3.0', 'bookmarks']),
             GLib.build_filenamev([GLib.get_home_dir(), '.gtk-bookmarks']),
@@ -457,9 +426,9 @@ var PlacesManager = class {
         }
 
         return null;
-    }
+    },
 
-    _reloadBookmarks() {
+    _reloadBookmarks: function() {
 
         this._bookmarks = [];
 
@@ -507,9 +476,9 @@ var PlacesManager = class {
         this._places.bookmarks = bookmarks;
 
         this.emit('bookmarks-updated');
-    }
+    },
 
-    _addMount(kind, mount) {
+    _addMount: function(kind, mount) {
         let devItem;
 
         try {
@@ -519,9 +488,9 @@ var PlacesManager = class {
         }
 
         this._places[kind].push(devItem);
-    }
+    },
 
-    _addVolume(kind, volume) {
+    _addVolume: function(kind, volume) {
         let volItem;
 
         try {
@@ -531,10 +500,10 @@ var PlacesManager = class {
         }
 
         this._places[kind].push(volItem);
-    }
+    },
 
-    get(kind) {
+    get: function (kind) {
         return this._places[kind];
     }
-};
+});
 Signals.addSignalMethods(PlacesManager.prototype);

extensions/screenshot-window-sizer/Makefile.am

@@ -0,0 +1,4 @@
+EXTENSION_ID = screenshot-window-sizer
+
+include ../../extension.mk
+include ../../settings.mk

extensions/screenshot-window-sizer/extension.js

@@ -84,7 +84,11 @@ function cycleScreenshotSizes(display, screen, window, binding) {
 
     // Double both axes if on a hidpi display
     let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-    let scaledSizes = SIZES.map(size => size.map(wh => wh * scaleFactor));
+    let scaledSizes = SIZES.map(function(size) {
+        return size.map(function(wh) {
+            return wh * scaleFactor;
+        });
+    });
 
     // Find the nearest 16:9 size for the current window size
     let nearestIndex;

extensions/screenshot-window-sizer/meson.build

@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/user-theme/Makefile.am

@@ -0,0 +1,5 @@
+EXTENSION_ID = user-theme
+
+include ../../extension.mk
+include ../../settings.mk
+

extensions/user-theme/extension.js

@@ -3,6 +3,7 @@
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
+const Lang = imports.lang;
 const Main = imports.ui.main;
 
 const SETTINGS_KEY = 'name';
@@ -11,17 +12,19 @@ const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const Convenience = Me.imports.convenience;
 
-class ThemeManager {
+const ThemeManager = new Lang.Class({
-    constructor() {
+    Name: 'UserTheme.ThemeManager',
+
+    _init: function() {
         this._settings = Convenience.getSettings();
-    }
+    },
 
-    enable() {
+    enable: function() {
-        this._changedId = this._settings.connect('changed::'+SETTINGS_KEY, this._changeTheme.bind(this));
+        this._changedId = this._settings.connect('changed::'+SETTINGS_KEY, Lang.bind(this, this._changeTheme));
         this._changeTheme();
-    }
+    },
 
-    disable() {
+    disable: function() {
         if (this._changedId) {
             this._settings.disconnect(this._changedId);
             this._changedId = 0;
@@ -29,9 +32,9 @@ class ThemeManager {
 
         Main.setThemeStylesheet(null);
         Main.loadTheme();
-    }
+    },
 
-    _changeTheme() {
+    _changeTheme: function() {
         let _stylesheet = null;
         let _themeName = this._settings.get_string(SETTINGS_KEY);
 
@@ -61,7 +64,7 @@ class ThemeManager {
         Main.setThemeStylesheet(_stylesheet);
         Main.loadTheme();
     }
-};
+});
 
 function init() {
     return new ThemeManager();

extensions/user-theme/meson.build

@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/window-list/Makefile.am

@@ -0,0 +1,10 @@
+EXTENSION_ID = window-list
+
+EXTRA_MODULES = prefs.js
+
+if CLASSIC_MODE
+  EXTRA_MODULES += classic.css
+endif
+
+include ../../extension.mk
+include ../../settings.mk

extensions/window-list/meson.build

@@ -1,12 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
-
-if classic_mode_enabled
-  extension_data += files('classic.css')
-endif

extensions/window-list/metadata.json.in

@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Window List",
-"description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
+"description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }

extensions/window-list/prefs.js

@@ -3,6 +3,7 @@
 const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -16,10 +17,13 @@ function init() {
     Convenience.initTranslations();
 }
 
-const WindowListPrefsWidget = GObject.registerClass(
+const WindowListPrefsWidget = new GObject.Class({
-class WindowListPrefsWidget extends Gtk.Grid {
+    Name: 'WindowList.Prefs.Widget',
-    _init(params) {
+    GTypeName: 'WindowListPrefsWidget',
-        super._init(params);
+    Extends: Gtk.Grid,
+
+    _init: function(params) {
+        this.parent(params);
 
         this.margin = 24;
         this.row_spacing = 6;
@@ -62,10 +66,10 @@ class WindowListPrefsWidget extends Gtk.Grid {
                                           group: radio });
             grid.add(radio);
 
-            radio.connect('toggled', button => {
+            radio.connect('toggled', Lang.bind(this, function(button) {
                 if (button.active)
                     this._settings.set_string('grouping-mode', mode);
-            });
+            }));
         }
 
         let check = new Gtk.CheckButton({ label: _("Show on all monitors"),

extensions/windowsNavigator/Makefile.am

@@ -0,0 +1,3 @@
+EXTENSION_ID = windowsNavigator
+
+include ../../extension.mk

extensions/windowsNavigator/extension.js

@@ -1,5 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const St = imports.gi.St;
 
@@ -232,9 +233,9 @@ function enable() {
                                                           visible: false }));
 
             this.actor.add_actor(this._tip);
-            let signalId = this.actor.connect('notify::scale-x', () => {
+            let signalId = this.actor.connect('notify::scale-x', Lang.bind(this, function() {
                 this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
-            });
+            }));
             connectedSignals.push({ obj: this.actor, id: signalId });
         } else
             this._tip = null;
@@ -243,10 +244,8 @@ function enable() {
     workViewInjections['_init'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(width, height, x, y, workspaces) {
         this._pickWorkspace = false;
         this._pickWindow = false;
-        this._keyPressEventId =
+        this._keyPressEventId = global.stage.connect('key-press-event', Lang.bind(this, this._onKeyPress));
-            global.stage.connect('key-press-event', this._onKeyPress.bind(this));
+        this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._onKeyRelease));
-        this._keyReleaseEventId =
-            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
         connectedSignals.push({ obj: global.stage, id: this._keyPressEventId });
         connectedSignals.push({ obj: global.stage, id: this._keyReleaseEventId });
     });
@@ -275,10 +274,10 @@ function disable() {
     for (i in workViewInjections)
         removeInjection(WorkspacesView.WorkspacesView.prototype, workViewInjections, i);
 
-    for (i of connectedSignals)
+    for each (i in connectedSignals)
         i.obj.disconnect(i.id);
 
-    for (i of createdActors)
+    for each (i in createdActors)
         i.destroy();
 
     resetState();

extensions/windowsNavigator/meson.build

@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)

extensions/workspace-indicator/Makefile.am

@@ -0,0 +1,5 @@
+EXTENSION_ID = workspace-indicator
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk

extensions/workspace-indicator/extension.js

@@ -4,6 +4,7 @@ const Gio = imports.gi.Gio;
 const Meta = imports.gi.Meta;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
+const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@@ -21,112 +22,111 @@ const Convenience = Me.imports.convenience;
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
 
-class WorkspaceIndicator extends PanelMenu.Button {
+const WorkspaceIndicator = new Lang.Class({
-    constructor() {
+    Name: 'WorkspaceIndicator.WorkspaceIndicator',
-        super(0.0, _("Workspace Indicator"));
+    Extends: PanelMenu.Button,
 
-        this._currentWorkspace = global.screen.get_active_workspace().index();
+    _init: function(){
-        this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
+	this.parent(0.0, _("Workspace Indicator"));
+
+	this._currentWorkspace = global.screen.get_active_workspace().index();
+	this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
                                           text: this._labelText() });
 
-        this.actor.add_actor(this.statusLabel);
+	this.actor.add_actor(this.statusLabel);
 
-        this.workspacesItems = [];
+	this.workspacesItems = [];
-        this._workspaceSection = new PopupMenu.PopupMenuSection();
+	this._workspaceSection = new PopupMenu.PopupMenuSection();
-        this.menu.addMenuItem(this._workspaceSection);
+	this.menu.addMenuItem(this._workspaceSection);
 
-        this._screenSignals = [];
+	this._screenSignals = [];
-        this._screenSignals.push(global.screen.connect_after('workspace-added',                                                              this._createWorkspacesSection.bind(this)));
+	this._screenSignals.push(global.screen.connect_after('workspace-added', Lang.bind(this,this._createWorkspacesSection)));
-        this._screenSignals.push(global.screen.connect_after('workspace-removed',
+	this._screenSignals.push(global.screen.connect_after('workspace-removed', Lang.bind(this,this._createWorkspacesSection)));
-                                                             this._createWorkspacesSection.bind(this)));
+	this._screenSignals.push(global.screen.connect_after('workspace-switched', Lang.bind(this,this._updateIndicator)));
-        this._screenSignals.push(global.screen.connect_after('workspace-switched',
-                                                             this._updateIndicator.bind(this)));
 
-        this.actor.connect('scroll-event', this._onScrollEvent.bind(this));
+	this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
-        this._createWorkspacesSection();
+	this._createWorkspacesSection();
 
-        //styling
+	//styling
-        this.statusLabel.add_style_class_name('panel-workspace-indicator');
+	this.statusLabel.add_style_class_name('panel-workspace-indicator');
 
         this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
-        this._settingsChangedId =
+        this._settingsChangedId = this._settings.connect('changed::' + WORKSPACE_KEY, Lang.bind(this, this._createWorkspacesSection));
-            this._settings.connect('changed::' + WORKSPACE_KEY,
+    },
-                                   this._createWorkspacesSection.bind(this));
-    }
 
-    destroy() {
+    destroy: function() {
-        for (let i = 0; i < this._screenSignals.length; i++)
+	for (let i = 0; i < this._screenSignals.length; i++)
-            global.screen.disconnect(this._screenSignals[i]);
+	    global.screen.disconnect(this._screenSignals[i]);
 
         if (this._settingsChangedId) {
             this._settings.disconnect(this._settingsChangedId);
             this._settingsChangedId = 0;
         }
 
-        super.destroy();
+	this.parent();
-    }
+    },
 
-    _updateIndicator() {
+    _updateIndicator: function() {
-        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
+	this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
-        this._currentWorkspace = global.screen.get_active_workspace().index();
+	this._currentWorkspace = global.screen.get_active_workspace().index();
-        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
+	this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
 
-        this.statusLabel.set_text(this._labelText());
+	this.statusLabel.set_text(this._labelText());
-    }
+    },
 
-    _labelText(workspaceIndex) {
+    _labelText : function(workspaceIndex) {
-        if(workspaceIndex == undefined) {
+	if(workspaceIndex == undefined) {
-            workspaceIndex = this._currentWorkspace;
+	    workspaceIndex = this._currentWorkspace;
-            return (workspaceIndex + 1).toString();
+	    return (workspaceIndex + 1).toString();
-        }
+	}
-        return Meta.prefs_get_workspace_name(workspaceIndex);
+	return Meta.prefs_get_workspace_name(workspaceIndex);
-    }
+    },
 
-    _createWorkspacesSection() {
+    _createWorkspacesSection : function() {
-        this._workspaceSection.removeAll();
+	this._workspaceSection.removeAll();
-        this.workspacesItems = [];
+	this.workspacesItems = [];
-        this._currentWorkspace = global.screen.get_active_workspace().index();
+	this._currentWorkspace = global.screen.get_active_workspace().index();
 
-        let i = 0;
+	let i = 0;
-        for(; i < global.screen.n_workspaces; i++) {
+	for(; i < global.screen.n_workspaces; i++) {
-            this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
+	    this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
-            this._workspaceSection.addMenuItem(this.workspacesItems[i]);
+	    this._workspaceSection.addMenuItem(this.workspacesItems[i]);
-            this.workspacesItems[i].workspaceId = i;
+	    this.workspacesItems[i].workspaceId = i;
-            this.workspacesItems[i].label_actor = this.statusLabel;
+	    this.workspacesItems[i].label_actor = this.statusLabel;
-            let self = this;
+	    let self = this;
-            this.workspacesItems[i].connect('activate', (actor, event) => {
+	    this.workspacesItems[i].connect('activate', Lang.bind(this, function(actor, event) {
-                this._activate(actor.workspaceId);
+		this._activate(actor.workspaceId);
-            });
+	    }));
 
-            if (i == this._currentWorkspace)
+	    if (i == this._currentWorkspace)
-                this.workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
+		this.workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
-        }
+	}
 
-        this.statusLabel.set_text(this._labelText());
+	this.statusLabel.set_text(this._labelText());
-    }
+    },
 
-    _activate(index) {
+    _activate : function (index) {
-        if(index >= 0 && index <  global.screen.n_workspaces) {
+	if(index >= 0 && index <  global.screen.n_workspaces) {
-            let metaWorkspace = global.screen.get_workspace_by_index(index);
+	    let metaWorkspace = global.screen.get_workspace_by_index(index);
-            metaWorkspace.activate(global.get_current_time());
+	    metaWorkspace.activate(global.get_current_time());
-        }
+	}
-    }
+    },
 
-    _onScrollEvent(actor, event) {
+    _onScrollEvent : function(actor, event) {
-        let direction = event.get_scroll_direction();
+	let direction = event.get_scroll_direction();
-        let diff = 0;
+	let diff = 0;
-        if (direction == Clutter.ScrollDirection.DOWN) {
+	if (direction == Clutter.ScrollDirection.DOWN) {
-            diff = 1;
+	    diff = 1;
-        } else if (direction == Clutter.ScrollDirection.UP) {
+	} else if (direction == Clutter.ScrollDirection.UP) {
-            diff = -1;
+	    diff = -1;
-        } else {
+	} else {
-            return;
+	    return;
-        }
+	}
 
-        let newIndex = global.screen.get_active_workspace().index() + diff;
+	let newIndex = global.screen.get_active_workspace().index() + diff;
-        this._activate(newIndex);
+	this._activate(newIndex);
-    }
+    },
-};
+});
 
 function init(meta) {
     Convenience.initTranslations();

extensions/workspace-indicator/meson.build

@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')

extensions/workspace-indicator/prefs.js

@@ -4,10 +4,11 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = e => e;
+const N_ = function(e) { return e };
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@@ -16,29 +17,32 @@ const Convenience = Me.imports.convenience;
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
 
-const WorkspaceNameModel = GObject.registerClass(
+const WorkspaceNameModel = new GObject.Class({
-class WorkspaceNameModel extends Gtk.ListStore {
+    Name: 'WorkspaceIndicator.WorkspaceNameModel',
-    _init(params) {
+    GTypeName: 'WorkspaceNameModel',
-        super._init(params);
+    Extends: Gtk.ListStore,
+
+    Columns: {
+        LABEL: 0,
+    },
+
+    _init: function(params) {
+        this.parent(params);
         this.set_column_types([GObject.TYPE_STRING]);
 
-        this.Columns = {
-            LABEL: 0,
-        };
-
         this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
-        //this._settings.connect('changed::workspace-names', this._reloadFromSettings.bind(this));
+        //this._settings.connect('changed::workspace-names', Lang.bind(this, this._reloadFromSettings));
 
         this._reloadFromSettings();
 
         // overriding class closure doesn't work, because GtkTreeModel
         // plays tricks with marshallers and class closures
-        this.connect('row-changed', this._onRowChanged.bind(this));
+        this.connect('row-changed', Lang.bind(this, this._onRowChanged));
-        this.connect('row-inserted', this._onRowInserted.bind(this));
+        this.connect('row-inserted', Lang.bind(this, this._onRowInserted));
-        this.connect('row-deleted', this._onRowDeleted.bind(this));
+        this.connect('row-deleted', Lang.bind(this, this._onRowDeleted));
-    }
+    },
 
-    _reloadFromSettings() {
+    _reloadFromSettings: function() {
         if (this._preventChanges)
             return;
         this._preventChanges = true;
@@ -63,9 +67,9 @@ class WorkspaceNameModel extends Gtk.ListStore {
         }
 
         this._preventChanges = false;
-    }
+    },
 
-    _onRowChanged(self, path, iter) {
+    _onRowChanged: function(self, path, iter) {
         if (this._preventChanges)
             return;
         this._preventChanges = true;
@@ -84,9 +88,9 @@ class WorkspaceNameModel extends Gtk.ListStore {
         this._settings.set_strv(WORKSPACE_KEY, names);
 
         this._preventChanges = false;
-    }
+    },
 
-    _onRowInserted(self, path, iter) {
+    _onRowInserted: function(self, path, iter) {
         if (this._preventChanges)
             return;
         this._preventChanges = true;
@@ -99,9 +103,9 @@ class WorkspaceNameModel extends Gtk.ListStore {
         this._settings.set_strv(WORKSPACE_KEY, names);
 
         this._preventChanges = false;
-    }
+    },
 
-    _onRowDeleted(self, path) {
+    _onRowDeleted: function(self, path) {
         if (this._preventChanges)
             return;
         this._preventChanges = true;
@@ -121,13 +125,16 @@ class WorkspaceNameModel extends Gtk.ListStore {
         this._settings.set_strv(WORKSPACE_KEY, names);
 
         this._preventChanges = false;
-    }
+    },
 });
 
-const WorkspaceSettingsWidget = GObject.registerClass(
+const WorkspaceSettingsWidget = new GObject.Class({
-class WorkspaceSettingsWidget extends Gtk.Grid {
+    Name: 'WorkspaceIndicator.WorkspaceSettingsWidget',
-    _init(params) {
+    GTypeName: 'WorkspaceSettingsWidget',
-        super._init(params);
+    Extends: Gtk.Grid,
+
+    _init: function(params) {
+        this.parent(params);
         this.margin = 12;
         this.orientation = Gtk.Orientation.VERTICAL;
 
@@ -149,7 +156,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
 
         let column = new Gtk.TreeViewColumn({ title: _("Name") });
         let renderer = new Gtk.CellRendererText({ editable: true });
-        renderer.connect('edited', this._cellEdited.bind(this));
+        renderer.connect('edited', Lang.bind(this, this._cellEdited));
         column.pack_start(renderer, true);
         column.add_attribute(renderer, 'text', this._store.Columns.LABEL);
         this._treeView.append_column(column);
@@ -160,38 +167,39 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
         toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
 
         let newButton = new Gtk.ToolButton({ icon_name: 'list-add-symbolic' });
-        newButton.connect('clicked', this._newClicked.bind(this));
+        newButton.connect('clicked', Lang.bind(this, this._newClicked));
         toolbar.add(newButton);
 
         let delButton = new Gtk.ToolButton({ icon_name: 'list-remove-symbolic' });
-        delButton.connect('clicked', this._delClicked.bind(this));
+        delButton.connect('clicked', Lang.bind(this, this._delClicked));
         toolbar.add(delButton);
 
         let selection = this._treeView.get_selection();
-        selection.connect('changed', () => {
+        selection.connect('changed',
-            delButton.sensitive = selection.count_selected_rows() > 0;
+            function() {
-        });
+                delButton.sensitive = selection.count_selected_rows() > 0;
+            });
         delButton.sensitive = selection.count_selected_rows() > 0;
 
         this.add(toolbar);
-    }
+    },
 
-    _cellEdited(renderer, path, new_text) {
+    _cellEdited: function(renderer, path, new_text) {
         let [ok, iter] = this._store.get_iter_from_string(path);
 
         if (ok)
             this._store.set(iter, [this._store.Columns.LABEL], [new_text]);
-    }
+    },
 
-    _newClicked() {
+    _newClicked: function() {
         let iter = this._store.append();
         let index = this._store.get_path(iter).get_indices()[0];
 
         let label = _("Workspace %d").format(index + 1);
         this._store.set(iter, [this._store.Columns.LABEL], [label]);
-    }
+    },
 
-    _delClicked() {
+    _delClicked: function() {
         let [any, model, iter] = this._treeView.get_selection().get_selected();
 
         if (any)

gnome-shell-extensions.doap

@@ -15,7 +15,7 @@ and will be picked automatically at next login.
   <homepage rdf:resource="https://wiki.gnome.org/Projects/GnomeShell/Extensions" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
   <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell-extensions/" />
-  <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues" />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-shell&amp;component=extensions" />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
   <programming-language>JavaScript</programming-language>

include.mk

@@ -0,0 +1,12 @@
+extensionurl = http://git.gnome.org/gnome-shell-extensions
+
+# Change these to modify how installation is performed
+topextensiondir = $(datadir)/gnome-shell/extensions
+extensionbase = @gnome-shell-extensions.gcampax.github.com
+
+gschemabase = org.gnome.shell.extensions
+
+uuid = $(EXTENSION_ID)$(extensionbase)
+gschemaname = $(gschemabase).$(EXTENSION_ID)
+
+extensiondir = $(topextensiondir)/$(uuid)

m4/.gitignore

@@ -0,0 +1 @@
+intltool.m4

meson.build

@@ -1,99 +0,0 @@
-project('gnome-shell-extensions',
-  version: '3.27.91',
-  meson_version: '>= 0.44.0',
-  license: 'GPL2+'
-)
-
-gettext_domain = meson.project_name()
-
-gnome = import('gnome')
-i18n = import('i18n')
-
-datadir = get_option('datadir')
-
-shelldir = join_paths(datadir, 'gnome-shell')
-extensiondir = join_paths(shelldir, 'extensions')
-modedir = join_paths(shelldir, 'modes')
-themedir = join_paths(shelldir, 'theme')
-
-schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
-sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
-xsessiondir = join_paths(datadir, 'xsession')
-
-extensionlib = files('lib/convenience.js')
-
-js52 = find_program('js52', required: false)
-
-ver_arr = meson.project_version().split('.')
-if ver_arr[1].to_int().is_even()
-  shell_version = '@0@.@1@'.format(ver_arr[0], ver_arr[1])
-else
-  shell_version = '.'.join(ver_arr)
-endif
-
-uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
-
-classic_extensions = [
-  'alternate-tab',
-  'apps-menu',
-  'places-menu',
-  'launch-new-instance',
-  'window-list'
-]
-
-default_extensions = classic_extensions
-default_extensions += [
-  'drive-menu',
-  'screenshot-window-sizer',
-  'windowsNavigator',
-  'workspace-indicator'
-]
-
-all_extensions = default_extensions
-all_extensions += [
-  'auto-move-windows',
-  'example',
-  'native-window-placement',
-  'user-theme'
-]
-
-enabled_extensions = get_option('enable_extensions')
-
-if enabled_extensions.length() == 0
-  set = get_option('extension_set')
-
-  if set == 'classic'
-    enabled_extensions += classic_extensions
-  elif set == 'default'
-    enabled_extensions += default_extensions
-  elif set == 'all'
-    enabled_extensions += all_extensions
-  endif
-endif
-
-classic_mode_enabled = get_option('classic_mode')
-
-if classic_mode_enabled
-  # Sanity check: Make sure all classic extensions are enabled
-  foreach e : classic_extensions
-    if not enabled_extensions.contains(e)
-      error('Classic mode is enabled, ' +
-            'but the required extension @0@ is not.'.format(e))
-    endif
-  endforeach
-endif
-
-# Sanity check: Make sure enabled extensions are valid
-foreach e : enabled_extensions
-  if not all_extensions.contains(e)
-    error('Invalid extension @0@.'.format(e))
-  endif
-endforeach
-
-if classic_mode_enabled
-  sassc = find_program('sassc', required: true)
-  subdir('data')
-endif
-
-subdir('extensions')
-subdir('po')

meson_options.txt

@@ -1,18 +0,0 @@
-option('extension_set',
-  type: 'combo',
-  choices: ['classic', 'default', 'all'],
-  value: 'default',
-  description: 'Predefined sets of extensions'
-)
-
-option('enable_extensions',
-  type: 'array',
-  value: [],
-  description: 'Comma separated list of extensions to enable instead of a predefined set.'
-)
-
-option('classic_mode',
-  type: 'boolean',
-  value: false,
-  description: 'Enable installing data files for classic mode.'
-)

po/Makevars

@@ -0,0 +1,68 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
+        --keyword=C_:1c,2 --keyword=NC_:1c,2 \
+        --keyword=g_dngettext:2,3 --add-comments \
+        --flag=g_dngettext:2:pass-c-format \
+        --flag=g_strdup_printf:1:c-format \
+        --flag=g_string_printf:2:c-format \
+        --flag=g_string_append_printf:2:c-format \
+        --flag=g_error_new:3:c-format \
+        --flag=g_set_error:4:c-format \
+        --flag=g_markup_printf_escaped:1:c-format \
+        --flag=g_log:3:c-format \
+        --flag=g_print:1:c-format \
+        --flag=g_printerr:1:c-format \
+        --flag=g_printf:1:c-format \
+        --flag=g_fprintf:2:c-format \
+        --flag=g_sprintf:2:c-format \
+        --flag=g_snprintf:3:c-format
+
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Translation copyright holder
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=extensions
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# Ignore the timestamp of the .pot file, as git clones do not have
+# deterministic timestamps, and .po files are updated by translators
+# (only) in GNOME projects.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no

po/meson.build

@@ -1 +0,0 @@
-i18n.gettext(gettext_domain, preset: 'glib')

po/nb.po

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell-extensions 3.26.x\n"
+"Project-Id-Version: gnome-shell-extensions 3.23.x\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=extensions\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-10-04 18:03+0000\n"
+"POT-Creation-Date: 2017-02-16 01:20+0000\n"
-"PO-Revision-Date: 2017-11-06 13:40+0100\n"
+"PO-Revision-Date: 2017-02-19 17:40+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -83,15 +83,15 @@ msgstr "Vis vinduer som"
 msgid "Show only windows in the current workspace"
 msgstr "Vis kun vinduer i aktivt arbeidsområde"
 
-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Aktivitetsoversikt"
 
-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Favoritter"
 
-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Programmer"
 
@@ -128,18 +128,17 @@ msgstr "Lag en ny regel for treff"
 msgid "Add"
 msgstr "Legg til"
 
-#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:106
-#: extensions/drive-menu/extension.js:107
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Utløsing av stasjon «%s» feilet:"
 
-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Avtagbare enheter"
 
-#: extensions/drive-menu/extension.js:150
+#: extensions/drive-menu/extension.js:149
-msgid "Open Files"
+msgid "Open File"
 msgstr "Åpne fil"
 
 #: extensions/example/extension.js:17
@@ -210,26 +209,21 @@ msgstr ""
 msgid "Places"
 msgstr "Steder"
 
-#: extensions/places-menu/placeDisplay.js:65
+#: extensions/places-menu/placeDisplay.js:59
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Klarte ikke å montere volum for «%s»"
-
-#: extensions/places-menu/placeDisplay.js:78
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Klarte ikke å starte «%s»"
 
-#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:101
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Datamaskin"
 
-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Hjem"
 
-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Bla gjennom nettverk"
 
@@ -237,10 +231,6 @@ msgstr "Bla gjennom nettverk"
 msgid "Cycle Screenshot Sizes"
 msgstr "Bla gjennom størrelser på skjermdump"
 
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Bla gjennom størrelser på skjermdump baklengs"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Navn på tema"
@@ -253,48 +243,48 @@ msgstr "Navn på tema som skal lastes fra ~/.themes/name/gnome-shell"
 msgid "Close"
 msgstr "Lukk"
 
-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Gjenopprett"
 
-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimer"
 
-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Gjenopprett"
 
-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maksimer"
 
-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Minimer alle"
 
-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Gjenopprett alle"
 
-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Maksimer alle"
 
-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Gjenopprett alle"
 
-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Lukk alle"
 
-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Arbeidsområdeindikator"
 
-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Vinduliste"
 

po/sl.po

@@ -2,7 +2,7 @@
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
 #
-# Matej Urbančič <mateju@svn.gnome.org>, + 2011–2017.
+# Matej Urbančič <mateju@svn.gnome.org>, 2011–2017.
 #
 msgid ""
 msgstr ""
@@ -111,7 +111,7 @@ msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"Seznam nizov z določilom ID programa (ime programa), ki mu sledi "
+"Seznam nizov z določilom ID programa (namizno ime programa), ki mu sledi "
 "dvopičje in nato številka delovne površine."
 
 #: extensions/auto-move-windows/prefs.js:60
@@ -129,7 +129,7 @@ msgstr "Dodaj pravilo"
 
 #: extensions/auto-move-windows/prefs.js:106
 msgid "Create new matching rule"
-msgstr "Ustvari novo skladno pravilo"
+msgstr "Ustvari novo pravilo skladanja"
 
 #: extensions/auto-move-windows/prefs.js:111
 msgid "Add"
@@ -160,7 +160,9 @@ msgstr "Nadomestno pozdravno besedilo."
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
-msgstr "Vpisano besedilo bo prikazano ob kliku na pladenj."
+msgstr ""
+"V kolikor vrednost ni prazna, vsebuje besedilo, ki bo prikazano ob kliku na "
+"pladenj."
 
 #: extensions/example/prefs.js:30
 msgid "Message"
@@ -174,8 +176,8 @@ msgid ""
 "as such it has little functionality on its own.\n"
 "Nevertheless it’s possible to customize the greeting message."
 msgstr ""
-"Primer je oblikovan kot predloga za izgradnjo kakovostnih razširitev "
+"Primer je oblikovan kot predloga za izgradnjo kakovostnih razširitev za "
-"za lupino, zato je delovanje deloma prilagojeno.\n"
+"lupino, zato je delovanje deloma prilagojeno.\n"
 "Kljub vsemu je mogoče prilagajati pozdravno sporočilo."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
@@ -190,7 +192,7 @@ msgid ""
 msgstr ""
 "Poskusi uporabiti več zaslona za postavitev sličic oken s prilagajanjem "
 "razmerja velikosti zaslona in prilagajanjem postavitve okvirja. Nastavitev "
-"je mogoče uporabiti le z naravnim načinom postavitve."
+"je mogoče uporabiti le z naravnim načinom postavitve okna."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
@@ -202,9 +204,9 @@ msgid ""
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
-"Izbrana možnost določi postavitev nazivov oken na vrh posamezne sličice"
+"Izbrana možnost določi postavitev nazivov oken na vrh posamezne sličice in s "
-"in s tem prepiše privzeti izpis pod sličico. Za uveljavitev sprememb je "
+"tem prepiše privzeti izpis pod sličico. Za uveljavitev sprememb je treba "
-"treba lupino ponovno zagnati."
+"lupino ponovno zagnati."
 
 #: extensions/places-menu/extension.js:78
 #: extensions/places-menu/extension.js:81
@@ -280,11 +282,11 @@ msgstr "Pomanjšaj vse"
 
 #: extensions/window-list/extension.js:436
 msgid "Maximize all"
-msgstr "Razpni vse"
+msgstr "Razpni"
 
 #: extensions/window-list/extension.js:445
 msgid "Unmaximize all"
-msgstr "Pomanjšaj vse"
+msgstr "_Pomanjšaj vse"
 
 #: extensions/window-list/extension.js:454
 msgid "Close all"
@@ -309,7 +311,7 @@ msgid ""
 "Possible values are “never”, “auto” and “always”."
 msgstr ""
 "Določi, kdaj se okna istega programa v seznamu programov združujejo. "
-"Veljavne vrednosti so »nikoli«, »samodejno« in »vedno«."
+"Veljavne vrednosti so \"nikoli\", \"samodejno\" in \"vedno\"."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
@@ -320,7 +322,7 @@ msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
-"Ali naj bo prikazan seznam oken na vseh povezanih zasloni ali le na osnovnem."
+"Ali naj bo prikazan seznam okna na vseh povezanih zasloni ali le na osnovnem."
 
 #: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
@@ -332,11 +334,11 @@ msgstr "Nikoli ne združuj oken"
 
 #: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
-msgstr "Združi okna, ko je prostor omejen"
+msgstr "Združi okna v skupine, ko je prostor omejen"
 
 #: extensions/window-list/prefs.js:52
 msgid "Always group windows"
-msgstr "Okna vedno združi"
+msgstr "Vedno združuj okna"
 
 #: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
@@ -414,9 +416,9 @@ msgstr "Delovna površina %d"
 #~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
 #~ "only' (shows only the application icon) or 'both'."
 #~ msgstr ""
-#~ "Nastavitev prikaza oken v preklopniku. Veljavne možnosti so »le sličice«, "
+#~ "Nastavitev prikaza oken v preklopniku. Veljavne možnosti so 'le sličice', "
-#~ "kar pokaže pomanjšano sličico okna, »le ikona programa«, kar pokaže ikono "
+#~ "kar pokaže pomanjšano sličico okna, 'le ikono programa', kar pokaže ikono "
-#~ "in možnost »oboje«, torej ikono in pomanjšano sličico."
+#~ "in možnost 'oboje', torej ikono in pomanjšano sličico."
 
 #~ msgid "Devices"
 #~ msgstr "Naprave"
@@ -449,8 +451,8 @@ msgstr "Delovna površina %d"
 #~ "Sets the position of the dock in the screen. Allowed values are 'right' "
 #~ "or 'left'"
 #~ msgstr ""
-#~ "Določi položaj sidrišča na zaslonu. Dovoljeni vrednosti sta »desno« ali "
+#~ "Določi položaj sidrišča na zaslonu. Dovoljeni vrednosti sta 'desno' ali "
-#~ "»levo«."
+#~ "'levo'."
 
 #~ msgid "Icon size"
 #~ msgstr "Velikost ikone"
@@ -468,8 +470,8 @@ msgstr "Delovna površina %d"
 #~ "Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' "
 #~ "and 'move'"
 #~ msgstr ""
-#~ "Določi učinek skrivanja sidrišča. Dovoljeni vrednosti sta »spremeni "
+#~ "Določi učinek skrivanja sidrišča. Dovoljeni vrednosti sta 'spremeni "
-#~ "velikost«, »prilagodi velikost« ali »premakni«."
+#~ "velikost', 'prilagodi velikost' ali 'premakni'."
 
 #~ msgid "Autohide duration"
 #~ msgstr "Trajanje samodejnega skrivanja"
@@ -509,8 +511,8 @@ msgstr "Delovna površina %d"
 #~ "Sets the Alt-Tab behaviour. Possible values are: all_thumbnails and "
 #~ "workspace_icons. See the configuration dialogs for details."
 #~ msgstr ""
-#~ "Določi obnašanje tipk Alt-Tab. Mogoče vrednosti so: »vse sličice« in "
+#~ "Določi obnašanje tipk Alt-Tab. Mogoče vrednosti so: vse_sličice in "
-#~ "»ikone delovne površine«. Za več podrobnosti si oglejte nastavitve."
+#~ "ikone_delovne_površine. Za več podrobnosti si oglejte nastavitve."
 
 #~ msgid ""
 #~ "This mode presents all applications from all workspaces in one selection "

settings.mk

@@ -0,0 +1,9 @@
+gsettings_SCHEMAS = $(gschemaname).gschema.xml
+
+%.desktop:%.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
+@GSETTINGS_RULES@
+
+CLEANFILES += $(gsettings_SCHEMAS:.xml=.valid)
+EXTRA_DIST += $(gsettings_SCHEMAS)