build: Don't introspect ShellMenu

It is now only used internally by ShellApp to track remote actions,
so there's no need to expose it to javascript code.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/624

.gitignore

@@ -80,4 +80,3 @@ tests/run-test.sh
 *~
 *.patch
 *.sw?
-.vscode

.gitlab-ci.yml

@@ -1,88 +0,0 @@
-stages:
- - review
- - source_check
- - build
- - test
-
-variables:
-    JS_LOG: "js-report.txt"
-    POT_LOG: "pot-update.txt"
-
-.only_default: &only_default
-    only:
-        - branches
-        - tags
-        - merge_requests
-
-check_commit_log:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
-    stage: review
-    variables:
-        GIT_DEPTH: "100"
-    script:
-        - ./.gitlab-ci/check-commit-log.sh
-    only:
-        - merge_requests
-
-js_check:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
-    stage: source_check
-    script:
-        - find js -name '*.js' -exec js60 -c -s '{}' ';' 2>&1 | tee $JS_LOG
-        - (! grep -q . $JS_LOG)
-    <<: *only_default
-    only:
-        changes:
-            - js/**/*
-    artifacts:
-        paths:
-            - ${JS_LOG}
-        when: on_failure
-
-build:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
-    stage: build
-    before_script:
-        - .gitlab-ci/checkout-mutter.sh
-        - meson mutter mutter/build --prefix=/usr -Dtests=false
-        - ninja -C mutter/build install
-    script:
-        - meson . build -Dbuiltype=debugoptimized
-        - ninja -C build
-        - ninja -C build install
-    <<: *only_default
-    artifacts:
-        expire_in: 1 day
-        paths:
-            - mutter
-            - build
-
-test:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
-    stage: test
-    before_script:
-        - ninja -C mutter/build install
-    script:
-        - xvfb-run meson test -C build --no-rebuild
-    <<: *only_default
-    artifacts:
-        expire_in: 1 day
-        paths:
-            - build/meson-logs/testlog.txt
-        when: on_failure
-
-test-pot:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
-    stage: test
-    before_script:
-        - ninja -C mutter/build install
-    script:
-        # Check that pot files are generated correctly:
-        # https://savannah.gnu.org/bugs/?50920#comment5
-        - ninja -C build gnome-shell-pot 2>&1 | awk '
-            BEGIN { start=0; }
-            start==1 { print $0; }
-            /gnome-shell-pot/ { start=1; }
-          ' | tee $POT_LOG
-        - (! grep -q . $POT_LOG)
-    <<: *only_default

.gitlab-ci/Dockerfile.extension-ci

@@ -1,18 +0,0 @@
-FROM registry.fedoraproject.org/fedora:latest
-
-RUN dnf -y update && dnf -y upgrade && \
-    dnf install -y 'dnf-command(copr)' && \
-
-    # For syntax checks with `find . -name '*.js' -exec js60 -c -s '{}' ';'`
-    dnf install -y findutils mozjs60-devel && \
-
-    # For static analysis with eslint
-    dnf install -y nodejs && \
-    npm install -g eslint && \
-
-    # Shameless plug for my own tooling; useful for generating zip
-    dnf copr enable -y fmuellner/gnome-shell-ci && \
-    dnf install -y gnome-extensions-tool meson && \
-
-    dnf clean all && \
-    rm -rf /var/cache/dnf

.gitlab-ci/check-commit-log.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
-  echo Cannot review non-merge request
-  exit 1
-fi
-
-git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
-
-branch_point=$(git merge-base HEAD FETCH_HEAD)
-
-commits=$(git log --format='format:%H' $branch_point..$CI_COMMIT_SHA)
-
-if [ -z "$commits" ]; then
-  echo Commit range empty
-  exit 1
-fi
-
-function commit_message_has_url() {
-  commit=$1
-  commit_message=$(git show -s --format='format:%b' $commit)
-  echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)"
-  return $?
-}
-
-for commit in $commits; do
-  if ! commit_message_has_url $commit; then
-    echo "Missing merge request or issue URL on commit $(echo $commit | cut -c -8)"
-    exit 1
-  fi
-done

.gitlab-ci/checkout-mutter.sh

@@ -1,35 +0,0 @@
-#!/usr/bin/bash
-
-shell_branch=$(git describe --contains --all HEAD)
-mutter_target=
-
-git clone https://gitlab.gnome.org/GNOME/mutter.git
-
-if [ $? -ne 0 ]; then
-  echo Checkout failed
-  exit 1
-fi
-
-cd mutter
-
-if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
-  merge_request_remote=${CI_MERGE_REQUEST_SOURCE_PROJECT_URL//gnome-shell/mutter}
-  merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-
-  echo Looking for $merge_request_branch on remote ...
-  if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then
-    mutter_target=FETCH_HEAD
-  else
-    mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
-    echo Using $mutter_target instead
-  fi
-fi
-
-if [ -z "$mutter_target" ]; then
-  mutter_target=$(git branch -r -l origin/$shell_branch)
-  mutter_target=${mutter_target:-$(git branch -r -l ${shell_branch#remotes/})}
-  mutter_target=${mutter_target:-origin/master}
-  echo Using $mutter_target instead
-fi
-
-git checkout -q $mutter_target

.project

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>gnome-shell</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.linuxtools.cdt.autotools.genmakebuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.linuxtools.cdt.autotools.autotoolsNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.cdt.core.prefs

@@ -0,0 +1,148 @@
+#Fri Nov 28 14:33:30 EST 2008
+eclipse.preferences.version=1
+org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=80
+org.eclipse.cdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.cdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.cdt.core.formatter.alignment_for_declarator_list=16
+org.eclipse.cdt.core.formatter.alignment_for_enumerator_list=48
+org.eclipse.cdt.core.formatter.alignment_for_expression_list=0
+org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.cdt.core.formatter.brace_position_for_array_initializer=next_line_shifted
+org.eclipse.cdt.core.formatter.brace_position_for_block=next_line_shifted
+org.eclipse.cdt.core.formatter.brace_position_for_block_in_case=next_line_shifted
+org.eclipse.cdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration=next_line
+org.eclipse.cdt.core.formatter.brace_position_for_switch=next_line_shifted
+org.eclipse.cdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.cdt.core.formatter.compact_else_if=true
+org.eclipse.cdt.core.formatter.continuation_indentation=2
+org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header=false
+org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier=true
+org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header=true
+org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header=true
+org.eclipse.cdt.core.formatter.indent_empty_lines=false
+org.eclipse.cdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.cdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.cdt.core.formatter.indentation.size=8
+org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration=insert
+org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
+org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
+org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration=insert
+org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
+org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.cdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments=insert
+org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters=insert
+org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause=insert
+org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters=insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.cdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.cdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause=insert
+org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.cdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets=do not insert
+org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.cdt.core.formatter.lineSplit=80
+org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.cdt.core.formatter.tabulation.char=space
+org.eclipse.cdt.core.formatter.tabulation.size=2
+org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations=false

.settings/org.eclipse.cdt.ui.prefs

@@ -0,0 +1,4 @@
+#Fri Nov 28 14:33:30 EST 2008
+eclipse.preferences.version=1
+formatter_profile=org.eclipse.cdt.ui.default.gnu_profile
+formatter_settings_version=1

.settings/org.eclipse.wst.jsdt.core.prefs

@@ -0,0 +1,315 @@
+#Fri Nov 28 14:43:43 EST 2008
+eclipse.preferences.version=1
+org.eclipse.wst.jsdt.core.codeComplete.argumentPrefixes=
+org.eclipse.wst.jsdt.core.codeComplete.argumentSuffixes=
+org.eclipse.wst.jsdt.core.codeComplete.fieldPrefixes=
+org.eclipse.wst.jsdt.core.codeComplete.fieldSuffixes=
+org.eclipse.wst.jsdt.core.codeComplete.localPrefixes=
+org.eclipse.wst.jsdt.core.codeComplete.localSuffixes=
+org.eclipse.wst.jsdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.wst.jsdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.wst.jsdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.wst.jsdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.wst.jsdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.wst.jsdt.core.compiler.compliance=1.4
+org.eclipse.wst.jsdt.core.compiler.debug.lineNumber=generate
+org.eclipse.wst.jsdt.core.compiler.debug.localVariable=generate
+org.eclipse.wst.jsdt.core.compiler.debug.sourceFile=generate
+org.eclipse.wst.jsdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.wst.jsdt.core.compiler.problem.deprecation=warning
+org.eclipse.wst.jsdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.wst.jsdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.wst.jsdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.wst.jsdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.wst.jsdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.wst.jsdt.core.compiler.problem.forbiddenReference=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.wst.jsdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.looseVarDecleration=warning
+org.eclipse.wst.jsdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.wst.jsdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.nullReference=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.optionalSemicolon=warning
+org.eclipse.wst.jsdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.undefinedField=warning
+org.eclipse.wst.jsdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.unresolvedFieldReference=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.unresolvedMethodReference=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.unresolvedTypeReference=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.wst.jsdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.wst.jsdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.wst.jsdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.wst.jsdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.wst.jsdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.wst.jsdt.core.compiler.source=1.3
+org.eclipse.wst.jsdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_assignment=0
+org.eclipse.wst.jsdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.wst.jsdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.wst.jsdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.wst.jsdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_after_package=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_field=0
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_method=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_package=0
+org.eclipse.wst.jsdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_between_type_declarations=0
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_objlit_initializer=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.wst.jsdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.wst.jsdt.core.formatter.comment.format_block_comments=true
+org.eclipse.wst.jsdt.core.formatter.comment.format_header=false
+org.eclipse.wst.jsdt.core.formatter.comment.format_html=true
+org.eclipse.wst.jsdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.wst.jsdt.core.formatter.comment.format_line_comments=true
+org.eclipse.wst.jsdt.core.formatter.comment.format_source_code=true
+org.eclipse.wst.jsdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.wst.jsdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.wst.jsdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.wst.jsdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.wst.jsdt.core.formatter.comment.line_length=80
+org.eclipse.wst.jsdt.core.formatter.compact_else_if=true
+org.eclipse.wst.jsdt.core.formatter.continuation_indentation=2
+org.eclipse.wst.jsdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.wst.jsdt.core.formatter.continuation_indentation_for_objlit_initializer=1
+org.eclipse.wst.jsdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.wst.jsdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.wst.jsdt.core.formatter.indent_empty_lines=false
+org.eclipse.wst.jsdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.wst.jsdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.wst.jsdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.wst.jsdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.wst.jsdt.core.formatter.indentation.size=4
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_comma_in_objlit_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_opening_brace_in_objlit_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_closing_brace_in_objlit_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.wst.jsdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.wst.jsdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.wst.jsdt.core.formatter.keep_empty_objlit_initializer_on_one_line=false
+org.eclipse.wst.jsdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.wst.jsdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.wst.jsdt.core.formatter.lineSplit=80
+org.eclipse.wst.jsdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.wst.jsdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.wst.jsdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.wst.jsdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.wst.jsdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.wst.jsdt.core.formatter.tabulation.char=space
+org.eclipse.wst.jsdt.core.formatter.tabulation.size=4
+org.eclipse.wst.jsdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.wst.jsdt.core.formatter.wrap_before_binary_operator=true

.settings/org.eclipse.wst.jsdt.ui.prefs

@@ -0,0 +1,10 @@
+#Fri Nov 28 14:39:12 EST 2008
+eclipse.preferences.version=1
+formatter_profile=_gjs
+formatter_settings_version=11
+org.eclipse.wst.jsdt.ui.exception.name=e
+org.eclipse.wst.jsdt.ui.gettersetter.use.is=true
+org.eclipse.wst.jsdt.ui.javadoc=false
+org.eclipse.wst.jsdt.ui.keywordthis=false
+org.eclipse.wst.jsdt.ui.overrideannotation=true
+org.eclipse.wst.jsdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>

.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary

.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Window

HACKING.md

@@ -80,7 +80,9 @@ e.g. `imports.ui.popupMenu`.
 Each import block should be sorted alphabetically. Don't import modules you
 don't use.
 ```javascript
-    const { GLib, Gio, St } = imports.gi;
+    const GLib = imports.gi.GLib;
+    const Gio = imports.gi.Gio;
+    const St = imports.gi.St;
 
     const Main = imports.ui.main;
     const Params = imports.misc.params;
@@ -156,15 +158,15 @@ you to inherit from a type to use it, you can do so:
     var MyClutterActor = GObject.registerClass(
     class MyClutterActor extends Clutter.Actor {
 
-        vfunc_get_preferred_width(forHeight) {
+        vfunc_get_preferred_width(actor, forHeight) {
              return [100, 100];
         }
 
-        vfunc_get_preferred_height(forWidth) {
+        vfunc_get_preferred_height(actor, forWidth) {
              return [100, 100];
         }
 
-        vfunc_paint() {
+        vfunc_paint(actor) {
              let alloc = this.get_allocation_box();
              Cogl.set_source_color4ub(255, 0, 0, 255);
              Cogl.rectangle(alloc.x1, alloc.y1,

NEWS

@@ -1,202 +1,3 @@
-3.33.3
-======
-* Prepare for optional X11 [Carlos; !378]
-* Fix opening window menu [Marco; !557]
-* Reload search providers when installed applications change [Cosimo; !562]
-* Implement locate-pointer accessibility feature [Olivier; #981]
-* Allow to disable window menus via session mode [Cosimo; !569]
-* Implement mouse accessibility [Olivier; !474]
-* Call GDM's RegisterSession() after startup [Iain; !570]
-* Fix extended keys popups being hidden by on-screen keyboard [Marco; !583]
-* Fix top bar being hidden by lock screen [Jonas; !571]
-* Update theme to better match GTK's Adwaita [Frederik; #841]
-* Set up GJS profiler when GJS_TRACE_FD is set [Christian; !573]
-* Misc. bug fixes and cleanups [Jonas, Cosimo, Robert, Florian, Marco, Simon,
-  Laurent, Niels, Will; !551, !555, !464, #1333, !565, !572, !568, !558, #1205,
-  #1336, !579, !576, #1392, !582, !586, #1406, #1351]
-
-Contributors:
-  Laurent Bigonville, Cosimo Cecchi, Piotr Drąg, Jonas Dreßler,
-  Frederik Feichtmeier, Olivier Fourdan, Carlos Garnacho, Niels De Graef,
-  Christian Hergert, Iain Lane, Robert Mader, Florian Müllner, Simon Schampijer,
-  Jakub Steiner, Will Thompson, Marco Trevisan (Treviño)
-
-Translators:
-  Kukuh Syafaat [id], Balázs Meskó [hu], Daniel Mustieles [es],
-  Fabio Tomat [fur], Nathan Follens [nl], Goran Vidović [hr], Jordi Mas [ca]
-
-3.33.2
-======
-* Fix keeping actors visible in scrollviews [Marco; #1061]
-* Move some chrome above popup windows [Jonas D.; !358]
-* Include 'sandboxed-app-id' in winodw introspection info [Florian; #1289]
-* Port to libecal-2.0 [Milan; !501]
-* Support TCRYPT in mount password dialog [segfault; !126]
-* Misc. bug fixes and cleanups [Florian, Marco, Veerasamy; !517, #745, !499,
-  !510, !515, !546, !549]
-
-Contributors:
-  Cosimo Cecchi, Milan Crha, Jonas Dreßler, Florian Müllner, segfault,
-  Veerasamy Sevagen, Marco Trevisan (Treviño)
-
-Translators:
-  Daniel Mustieles [es]
-
-3.33.1
-======
-* Refine the app menu [Florian; #968]
-* Refine window preview style [Feichtmeier; !461]
-* Only emit ::style-changed on actual changes [Carlos; #1153]
-* Disable emoji on-screen keyboard support on X11 [Florian; #1172]
-* Fix tablet button mapping overlay [Carlos; #1220]
-* Don't crash for world clock locations with no timezone [Florian; #1062]
-* Don't leak old on-screen keyboard layout groups [Carlos; mutter#556]
-* Fix ellipsization in dialog subtitles/bodies [Marco; !531]
-* Fix glitch of fullscreen window in workspace switch animation [Jonas D.; !322]
-* Fix distortion of some image contents [Florian; !525]
-* Allow dragging unfocused tiled/maximized windows from top bar [Dylan; #679290]
-* Handle network interface name changes [Fabrice; !534]
-* Avoid unnecessary style changes when computing :first/:last-child
-  [Florian; !529]
-* Misc. bug fixes and cleanups [Florian, Marco, Robert, Georges, Carlos, Simon,
-  Jonas D.; !487, !441, !502, !503, !504, !506, #822, !551, !512, !509, !511,
-  #1054, !524, #1065, !331, !540]
-
-Contributors:
-  Fabrice Bellet, Jonas Dreßler, Feichtmeier, Carlos Garnacho, Robert Mader,
-  Dylan McCall, Simon McVittie, Florian Müllner, Georges Basile Stavracas Neto,
-  Marco Trevisan (Treviño)
-
-Translators:
-  Daniel Mustieles [es], Kukuh Syafaat [id], Fabio Tomat [fur],
-  Carmen Bianca BAKKER [eo], Dingzhong Chen [zh_CN], Tim Sabsch [de]
-
-3.32.1
-======
-* Fix avatar scaling on login screen [Florian; #1024]
-* Fix distortion of desktop zoom [Florian; #646]
-* Fix mouse cursor visibility when using desktop zoom [Florian, Marco; #1020]
-* Fix screen dimming after wake-up on lock screen [Xiaoguang; #900]
-* Fix Alt+Esc switcher [Florian; #1064]
-* Respect struts for popover placement [Andrea; #1102]
-* Fix app icons updates after theme changes [Florian; #1117]
-* Fix desktop zoom after resolution changes [Marco; #1120]
-* Implement stick-to-finger workspace switch overview gestures [Florian; #516]
-* Make World Clocks offsets relative to local time [Florian; #1157]
-* Fix top app icon disappearing from dash [Florian; #1053]
-* Update switch style to match new Adwaita [Jakub; !496]
-* Ensure CSS units are pixel-aligned when scaling is used [Carlos; #91]
-* Misc. bug fixes and cleanups [Florian, Jakub, Robert, Alex, Carlos, Phil,
-  Marco, Benjamin, AsciiWolf, Ray, verdre; !444, #1016, #1018, !449, #1036,
-  !455, #1094, !440, #1023, #624, #1017, !476, !473, !480, #1130, !485, !481,
-  !490, !489, #1151, !435, #1160, !482, #1150, #1166, !384]
-
-Contributors:
-  AsciiWolf, Andrea Azzarone, Benjamin Berg, Carlos Garnacho, Victor Ibragimov,
-  Robert Mader, Alex Monday, Florian Müllner, Jakub Steiner, Ray Strode,
-  Marco Trevisan (Treviño), verdre, Xiaoguang Wang, Phil Wyett
-
-Translators:
-  Victor Ibragimov [tg, af, et, ja], Bruce Cowan [en_GB], Piotr Drąg [tg],
-  Charles Monzat [fr], Khaled Hosny [ar], Goran Vidović [hr],
-  Cheng-Chia Tseng [zh_TW], Carmen Bianca BAKKER [eo], Daniel Mustieles [es],
-  Dušan Kazik [sk]
-
-3.32.0
-======
-* Fix sizing issues in on-screen-keyboard emoji panel [Carlos; !439]
-* Fix test linker failure on Debian/Ubuntu [Iain; !442]
-* Avoid assertion when sizing fallback app icons from CSS [Florian; #1027]
-* Fix mis-sized menu arrows after texture cache changes [Florian; !452]
-
-Contributors:
-  Carlos Garnacho, Iain Lane, Florian Müllner
-
-Translators:
-  Gábor Kelemen [hu], Victor Ibragimov [tg], Ryuta Fujii [ja], Piotr Drąg [af,
-  tg], Mart Raudsepp [et]
-
-3.31.92
-=======
-* Fix visual glitch in submenus [Alex; #987]
-* Support fractional scaling [Jonas, Marco; #765011, !5]
-* Only consider visible children for :first-child/:last-child [Florian; !312]
-* Hide trailing separator in search results [verdre; !311]
-* Remember choice in inhibit-shortcuts dialogue [Olivier; !382]
-* Don't toggle on-screen keyboard on every focus change [Carlos; !397]
-* Fix legacy tray icons not responding to events on wayland [Florian; #191]
-* Fix generating French OSK layout [Florian; #997]
-* Use borderless round user images [Florian; #811]
-* Misc. bug fixes and cleanups [Andrea, Robert, Florian, Marco, Niels,
-  Benjamin; !414, !417, !420, #996, !408, !422, !425, #1006, !427, !315,
-  #989, !430, !431, !432, #1015, !429, !423, !419, !434]
-
-Contributors:
-  Jonas Ådahl, Alan, Andrea Azzarone, Benjamin Berg, Olivier Fourdan,
-  Carlos Garnacho, Niels De Graef, Robert Mader, Alex Monday, Florian Müllner,
-  Marco Trevisan (Treviño), verdre
-
-Translators:
-  Carmen Bianca BAKKER [eo], Asier Sarasua Garmendia [eu], Stas Solovey [ru],
-  Changwoo Ryu [ko], Julien Humbert [fr], Milo Casagrande [it],
-  Марко Костић [sr], Ask Hjorth Larsen [da], Kukuh Syafaat [id],
-  Daniel Șerbănescu [ro], Bernd Homuth [de], Trần Ngọc Quân [vi],
-  Nathan Follens [nl], Rūdolfs Mazurs [lv], Aurimas Černius [lt]
-
-3.31.91
-=======
-* Don't close on-screen-keyboard's language menu on hover [Florian; #171]
-* Don't let unfullscreen gesture interfere with top bar taps [Jonas D.; #552]
-* Always use symbolic user icon in system menu [Florian; #957]
-* Add flags parameter in GrabAccelerators API [Andrea; #68]
-* Misc. bug fixes and cleanups [Florian, Jonas A.; !399, !398, !400, !402,
-  !407, !410, !411]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Arnaud Bonatti, Jonas Dreßler, Florian Müllner
-
-Translators:
-  Jordi Mas [ca], Ryuta Fujii [ja], Marek Cernocky [cs], Fran Dieguez [gl],
-  Jiri Grönroos [fi], Serdar Sağlam [tr], Anders Jonsson [sv],
-  Matej Urbančič [sl], Gun Chleoc [gd], Kukuh Syafaat [id],
-  Baurzhan Muftakhidinov [kk], Alan Mortensen [da], Rafael Fontenelle [pt_BR],
-  Sveinn í Felli [is]
-
-3.31.90
-=======
-* Fix input methods after ibus restarts [Takao; #295]
-* Refresh world clocks and weather sections [Florian; #262]
-* Port to ES6 classes (update your extensions!) [Florian; !361]
-* networkAgent: Advise users when WPS support is available [Lubomir; !329]
-* Performance improvements [Carlos; #832, #815]
-* Fix drag-and-drop with wacom pens [Carlos; #540]
-* Fix CAPS LOCK indication on wayland [Carlos; #762881]
-* Show details of non-sensitive notifications on lock screen [Philip; #726]
-* Refine extension-prefs' error UI [Florian; !193]
-* Add switch-to-application-n keybindings [Florian; #648000]
-* Remove top bar translucency [Florian; #408]
-* Support emojis and keypads in on-screen keyboard [Carlos; #675]
-* Don't allow popups to re-enable keyboard shortcuts on lock screen
-  (CVE-2019-3820) [Florian, Ray; #851]
-* Replace app menu [Florian; #624]
-* Include commonly copied+pasted extension helpers [Florian; !150]
-* Misc. bug fixes and cleanups [Florian, Daniel, Philip, Sergio, Pascal,
-  Georges, verdre, Carlos, Christopher; #780, #909, !316, !308, !309, #915,
-  !350, !362, !357, !365, !366, !283, !367, #942, !371, !373, !374, !343,
-  !375, !292, !317, !377, !379, !346, !383, #953, !388]
-
-Contributors:
-  Sergio Costas, Christopher Davis, Bilal Elmoussaoui, Takao Fujiwara,
-  Carlos Garnacho, Niels De Graef, Christian Kellner, Ignat Loskutov,
-  Florian Müllner, Georges Basile Stavracas Neto, Pascal Nowack, Lubomir Rintel,
-  Jakub Steiner, Ray Strode, verdre, Daniel van Vugt, Philip Withnall
-
-Translators:
-  Daniel Mustieles [es], Carmen Bianca BAKKER [eo], Charles Monzat [fr],
-  Pieter Schalk Schoeman [af], Jordi Mas [ca], Matej Urbančič [sl],
-  Fran Dieguez [gl], Balázs Úr [hu], A S Alam [pa], Fabio Tomat [fur],
-  Aurimas Černius [lt], Piotr Drąg [pl], Marek Cernocky [cs], Ryuta Fujii [ja]
-
 3.31.4
 ======
 * Improve icon grid performance [Daniel; #174]

README.md

@@ -11,14 +11,6 @@ see the [project wiki][project-wiki].
 
 Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
 
-## Contributing
-
-To contribute, open merge requests at https://gitlab.gnome.org/GNOME/gnome-shell.
-
-Commit messages should follow the [GNOME commit message
-guidelines](https://wiki.gnome.org/Git/CommitMessages). We require an URL
-to either an issue or a merge request in each commit.
-
 ## License
 GNOME Shell is distributed under the terms of the GNU General Public License,
 version 2 or later. See the [COPYING][license] file for details.

README.mdwn

@@ -1,40 +0,0 @@
-cldr2json
-=========
-
-This script converts Unicode CLDR android keyboard layouts to JSON usable by
-GNOME Shell.
-
-CLDR keyboard layouts can be found at
-<http://www.unicode.org/Public/cldr/latest/keyboards.zip>
-
-
-Usage
-=====
-
-    ./cldr2json <input file or directory> <output directory>
-
-example:
-
-    ./cldr2json cldr/keyboards/android/ json_layouts/
-
-
-Keyboard layout mapping
-=======================
-
-Unicode CLDR layout identifiers are language codes, while XKB layout
-identifiers are... something else. The mapping between the two currently uses
-heuristic based on the layout descriptions, in this order:
-
-- if the CLDR layout description matches an XKB layout description, chose its
-  XKB identifier
-- if one word of the CLDR layout description matches an XKB layout
-  description, chose its XKB identifier
-- if the CLDR layout description matches one word of an XKB layout description,
-  chose its XKB identifier
-
-That doesn't always work. For instance it fails for "en" language, that should
-match "us" XKB identifier. For such cases, there is a mapping in
-LOCALE_TO_XKB_OVERRIDES at the top of the script. If you discover a weird
-mapping of if you get a "failed to find XKB mapping for <locale>" warning then
-please consider adding an override there.
-

cldr2json.py

@@ -1,208 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright 2015  Daiki Ueno <dueno@src.gnome.org>
-#           2016  Parag Nemade <pnemade@redhat.com>
-#           2017  Alan <alan@boum.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program; if not, see
-# <http://www.gnu.org/licenses/>.
-
-import glob
-import json
-import locale
-import logging
-import os
-import re
-import sys
-import xml.etree.ElementTree
-
-import gi
-gi.require_version('GnomeDesktop', '3.0')   # NOQA: E402
-from gi.repository import GnomeDesktop
-
-ESCAPE_PATTERN = re.compile(r'\\u\{([0-9A-Fa-f]+?)\}')
-ISO_PATTERN = re.compile(r'[A-E]([0-9]+)')
-
-LOCALE_TO_XKB_OVERRIDES = {
-    'af':    'za',
-    'en':    'us',
-    'en-GB': 'uk',
-    'es-US': 'latam',
-    'fr-CA': 'ca',
-    'hi':    'in+bolnagri',
-    'ky':    'kg',
-    'nl-BE': 'be',
-    'zu':    None
-}
-
-
-def parse_single_key(value):
-    def unescape(m):
-        return chr(int(m.group(1), 16))
-    value = ESCAPE_PATTERN.sub(unescape, value)
-    return value
-
-
-def parse_rows(keymap):
-    unsorted_rows = {}
-    for _map in keymap.iter('map'):
-        value = _map.get('to')
-        key = [parse_single_key(value)]
-        iso = _map.get('iso')
-        if not ISO_PATTERN.match(iso):
-            sys.stderr.write('invalid ISO key name: %s\n' % iso)
-            continue
-        if not iso[0] in unsorted_rows:
-            unsorted_rows[iso[0]] = []
-        unsorted_rows[iso[0]].append((int(iso[1:]), key))
-        # add subkeys
-        longPress = _map.get('longPress')
-        if longPress:
-            for value in longPress.split(' '):
-                subkey = parse_single_key(value)
-                key.append(subkey)
-
-    rows = []
-    for k, v in sorted(list(unsorted_rows.items()),
-                       key=lambda x: x[0],
-                       reverse=True):
-        row = []
-        for key in sorted(v, key=lambda x: x):
-            row.append(key[1])
-        rows.append(row)
-
-    return rows
-
-
-def convert_xml(tree):
-    root = {}
-    for xml_keyboard in tree.iter("keyboard"):
-        locale_full = xml_keyboard.get("locale")
-        locale, sep, end = locale_full.partition("-t-")
-    root["locale"] = locale
-    for xml_name in tree.iter("name"):
-        name = xml_name.get("value")
-    root["name"] = name
-    root["levels"] = []
-    # parse levels
-    for index, keymap in enumerate(tree.iter('keyMap')):
-        # FIXME: heuristics here
-        modifiers = keymap.get('modifiers')
-        if not modifiers:
-            mode = 'default'
-            modifiers = ''
-        elif 'shift' in modifiers.split(' '):
-            mode = 'latched'
-            modifiers = 'shift'
-        else:
-            mode = 'locked'
-        level = {}
-        level["level"] = modifiers
-        level["mode"] = mode
-        level["rows"] = parse_rows(keymap)
-        root["levels"].append(level)
-    return root
-
-
-def locale_to_xkb(locale, name):
-    if locale in sorted(LOCALE_TO_XKB_OVERRIDES.keys()):
-        xkb = LOCALE_TO_XKB_OVERRIDES[locale]
-        logging.debug("override for %s → %s",
-                      locale, xkb)
-        if xkb:
-            return xkb
-        else:
-            raise KeyError("layout %s explicitely disabled in overrides"
-                           % locale)
-    xkb_names = sorted(name_to_xkb.keys())
-    if name in xkb_names:
-        return name_to_xkb[name]
-    else:
-        logging.debug("name %s failed" % name)
-    for sub_name in name.split(' '):
-        if sub_name in xkb_names:
-            xkb = name_to_xkb[sub_name]
-            logging.debug("dumb mapping failed but match with locale word: "
-                          "%s (%s) → %s (%s)",
-                          locale, name, xkb, sub_name)
-            return xkb
-        else:
-            logging.debug("sub_name failed")
-    for xkb_name in xkb_names:
-        for xkb_sub_name in xkb_name.split(' '):
-            if xkb_sub_name.strip('()') == name:
-                xkb = name_to_xkb[xkb_name]
-                logging.debug("dumb mapping failed but match with xkb word: "
-                              "%s (%s) → %s (%s)",
-                              locale, name, xkb, xkb_name)
-                return xkb
-    raise KeyError("failed to find XKB mapping for %s" % locale)
-
-
-def convert_file(source_file, destination_path):
-    logging.info("Parsing %s", source_file)
-
-    itree = xml.etree.ElementTree.ElementTree()
-    itree.parse(source_file)
-
-    root = convert_xml(itree)
-
-    try:
-        xkb_name = locale_to_xkb(root["locale"], root["name"])
-    except KeyError as e:
-        logging.warn(e)
-        return False
-    destination_file = os.path.join(destination_path, xkb_name + ".json")
-
-    with open(destination_file, 'w', encoding="utf-8") as dest_fd:
-        json.dump(root, dest_fd, ensure_ascii=False, indent=2, sort_keys=True)
-
-    logging.debug("written %s", destination_file)
-
-
-def load_xkb_mappings():
-    xkb = GnomeDesktop.XkbInfo()
-    layouts = xkb.get_all_layouts()
-    name_to_xkb = {}
-
-    for layout in layouts:
-        name = xkb.get_layout_info(layout).display_name
-        name_to_xkb[name] = layout
-
-    return name_to_xkb
-
-
-locale.setlocale(locale.LC_ALL, "C")
-name_to_xkb = load_xkb_mappings()
-
-
-if __name__ == "__main__":
-    if "DEBUG" in os.environ:
-        logging.basicConfig(level=logging.DEBUG)
-
-    if len(sys.argv) < 2:
-        print("supply a CLDR keyboard file")
-        sys.exit(1)
-
-    if len(sys.argv) < 3:
-        print("supply an output directory")
-        sys.exit(1)
-
-    source = sys.argv[1]
-    destination = sys.argv[2]
-    if os.path.isfile(source):
-        convert_file(source, destination)
-    elif os.path.isdir(source):
-        for path in glob.glob(source + "/*-t-k0-android.xml"):
-            convert_file(path, destination)

data/dbus-interfaces/org.gnome.Shell.CalendarServer.xml

@@ -1,12 +0,0 @@
-<node>
-  <interface name="org.gnome.Shell.CalendarServer">
-    <method name="GetEvents">
-      <arg type="x" direction="in" />
-      <arg type="x" direction="in" />
-      <arg type="b" direction="in" />
-      <arg type="a(sssbxxa{sv})" direction="out" />
-    </method>
-    <property name="HasCalendars" type="b" access="read" />
-    <signal name="Changed" />
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.Shell.xml

@@ -9,6 +9,9 @@
     <method name="ShowOSD">
       <arg type="a{sv}" direction="in" name="params"/>
     </method>
+    <method name="ShowMonitorLabels">
+      <arg type="a{uv}" direction="in" name="params"/>
+    </method>
     <method name="ShowMonitorLabels2">
       <arg type="a{sv}" direction="in" name="params"/>
     </method>
@@ -19,22 +22,17 @@
     <method name="ShowApplications"/>
     <method name="GrabAccelerator">
       <arg type="s" direction="in" name="accelerator"/>
-      <arg type="u" direction="in" name="modeFlags"/>
+      <arg type="u" direction="in" name="flags"/>
-      <arg type="u" direction="in" name="grabFlags"/>
       <arg type="u" direction="out" name="action"/>
     </method>
     <method name="GrabAccelerators">
-      <arg type="a(suu)" direction="in" name="accelerators"/>
+      <arg type="a(su)" direction="in" name="accelerators"/>
       <arg type="au" direction="out" name="actions"/>
     </method>
     <method name="UngrabAccelerator">
       <arg type="u" direction="in" name="action"/>
       <arg type="b" direction="out" name="success"/>
     </method>
-    <method name="UngrabAccelerators">
-      <arg type="au" direction="in" name="action"/>
-      <arg type="b" direction="out" name="success"/>
-    </method>
     <signal name="AcceleratorActivated">
       <arg name="action" type="u"/>
       <arg name="parameters" type="a{sv}"/>

data/gnome-shell-dbus-interfaces.gresource.xml

@@ -39,7 +39,6 @@
     <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Rfkill.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Wacom.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.AudioDeviceSelection.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Shell.CalendarServer.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.Extensions.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.Introspect.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.HotplugSniffer.xml</file>

data/gnome-shell-osk-layouts.gresource.xml

@@ -6,7 +6,6 @@
     <file>be.json</file>
     <file>bg.json</file>
     <file>by.json</file>
-    <file>ca.json</file>
     <file>cz.json</file>
     <file>de.json</file>
     <file>dk.json</file>
@@ -55,6 +54,5 @@
     <file>us.json</file>
     <file>vn.json</file>
     <file>za.json</file>
-    <file>emoji.json</file>
   </gresource>
 </gresources>

data/gnome-shell-theme.gresource.xml

@@ -20,16 +20,12 @@
     <file>no-notifications.svg</file>
     <file>noise-texture.png</file>
     <file>pad-osd.css</file>
-    <file alias="icons/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
-    <file alias="icons/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
-    <file alias="icons/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
-    <file alias="icons/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
     <file>process-working.svg</file>
-    <file>toggle-off.svg</file>
+    <file>toggle-off-us.svg</file>
-    <file>toggle-off-dark.svg</file>
+    <file>toggle-off-intl.svg</file>
     <file>toggle-off-hc.svg</file>
-    <file>toggle-on.svg</file>
+    <file>toggle-on-us.svg</file>
-    <file>toggle-on-dark.svg</file>
+    <file>toggle-on-intl.svg</file>
     <file>toggle-on-hc.svg</file>
   </gresource>
 </gresources>

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

@@ -99,17 +99,11 @@
       </description>
     </key>
     <child name="keybindings" schema="org.gnome.shell.keybindings"/>
+    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
   </schema>
 
   <schema id="org.gnome.shell.keybindings" path="/org/gnome/shell/keybindings/"
           gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="open-application-menu" type="as">
-      <default>["&lt;Super&gt;F10"]</default>
-      <summary>Keybinding to open the application menu</summary>
-      <description>
-        Keybinding to open the application menu.
-      </description>
-    </key>
     <key name="toggle-application-view" type="as">
       <default>["&lt;Super&gt;a"]</default>
       <summary>Keybinding to open the “Show Applications” view</summary>
@@ -144,41 +138,16 @@
       <summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</summary>
       <description></description>
     </key>
-    <key name="switch-to-application-1" type="as">
+  </schema>
-      <default>["&lt;Super&gt;1"]</default>
+
-      <summary>Switch to application 1</summary>
+  <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
-    </key>
+          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="switch-to-application-2" type="as">
+    <key name="keyboard-type" type="s">
-      <default>["&lt;Super&gt;2"]</default>
+      <default>'touch'</default>
-      <summary>Switch to application 2</summary>
+      <summary>Which keyboard to use</summary>
-    </key>
+      <description>
-    <key name="switch-to-application-3" type="as">
+        The type of keyboard to use.
-      <default>["&lt;Super&gt;3"]</default>
+      </description>
-      <summary>Switch to application 3</summary>
-    </key>
-    <key name="switch-to-application-4" type="as">
-      <default>["&lt;Super&gt;4"]</default>
-      <summary>Switch to application 4</summary>
-    </key>
-    <key name="switch-to-application-5" type="as">
-      <default>["&lt;Super&gt;5"]</default>
-      <summary>Switch to application 5</summary>
-    </key>
-    <key name="switch-to-application-6" type="as">
-      <default>["&lt;Super&gt;6"]</default>
-      <summary>Switch to application 6</summary>
-    </key>
-    <key name="switch-to-application-7" type="as">
-      <default>["&lt;Super&gt;7"]</default>
-      <summary>Switch to application 7</summary>
-    </key>
-    <key name="switch-to-application-8" type="as">
-      <default>["&lt;Super&gt;8"]</default>
-      <summary>Switch to application 8</summary>
-    </key>
-    <key name="switch-to-application-9" type="as">
-      <default>["&lt;Super&gt;9"]</default>
-      <summary>Switch to application 9</summary>
     </key>
   </schema>
 

data/osk-layouts/ca.json

@@ -1,599 +0,0 @@
-{
-  "levels": [
-    {
-      "level": "",
-      "mode": "default",
-      "rows": [
-        [
-          [
-            "q"
-          ],
-          [
-            "w"
-          ],
-          [
-            "e",
-            "é",
-            "è",
-            "ê",
-            "ë",
-            "%",
-            "ę",
-            "ė",
-            "ē"
-          ],
-          [
-            "r"
-          ],
-          [
-            "t"
-          ],
-          [
-            "y",
-            "%",
-            "ÿ"
-          ],
-          [
-            "u",
-            "ù",
-            "û",
-            "%",
-            "ü",
-            "ú",
-            "ū"
-          ],
-          [
-            "i",
-            "î",
-            "%",
-            "ï",
-            "ì",
-            "í",
-            "į",
-            "ī"
-          ],
-          [
-            "o",
-            "ô",
-            "œ",
-            "%",
-            "ö",
-            "ò",
-            "ó",
-            "õ",
-            "ø",
-            "ō",
-            "º"
-          ],
-          [
-            "p"
-          ]
-        ],
-        [
-          [
-            "a",
-            "à",
-            "â",
-            "%",
-            "æ",
-            "á",
-            "ä",
-            "ã",
-            "å",
-            "ā",
-            "ª"
-          ],
-          [
-            "s"
-          ],
-          [
-            "d"
-          ],
-          [
-            "f"
-          ],
-          [
-            "g"
-          ],
-          [
-            "h"
-          ],
-          [
-            "j"
-          ],
-          [
-            "k"
-          ],
-          [
-            "l"
-          ]
-        ],
-        [
-          [
-            "z"
-          ],
-          [
-            "x"
-          ],
-          [
-            "c",
-            "ç",
-            "ć",
-            "č"
-          ],
-          [
-            "v"
-          ],
-          [
-            "b"
-          ],
-          [
-            "n"
-          ],
-          [
-            "m"
-          ]
-        ],
-        [
-          [
-            ","
-          ],
-          [
-            " "
-          ],
-          [
-            ".",
-            "#",
-            "!",
-            ",",
-            "?",
-            "-",
-            ":",
-            "'",
-            "@"
-          ]
-        ]
-      ]
-    },
-    {
-      "level": "shift",
-      "mode": "latched",
-      "rows": [
-        [
-          [
-            "Q"
-          ],
-          [
-            "W"
-          ],
-          [
-            "E",
-            "É",
-            "È",
-            "Ê",
-            "Ë",
-            "%",
-            "Ę",
-            "Ė",
-            "Ē"
-          ],
-          [
-            "R"
-          ],
-          [
-            "T"
-          ],
-          [
-            "Y",
-            "%",
-            "Ÿ"
-          ],
-          [
-            "U",
-            "Ù",
-            "Û",
-            "%",
-            "Ü",
-            "Ú",
-            "Ū"
-          ],
-          [
-            "I",
-            "Î",
-            "%",
-            "Ï",
-            "Ì",
-            "Í",
-            "Į",
-            "Ī"
-          ],
-          [
-            "O",
-            "Ô",
-            "Œ",
-            "%",
-            "Ö",
-            "Ò",
-            "Ó",
-            "Õ",
-            "Ø",
-            "Ō",
-            "º"
-          ],
-          [
-            "P"
-          ]
-        ],
-        [
-          [
-            "A",
-            "À",
-            "Â",
-            "%",
-            "Æ",
-            "Á",
-            "Ä",
-            "Ã",
-            "Å",
-            "Ā",
-            "ª"
-          ],
-          [
-            "S"
-          ],
-          [
-            "D"
-          ],
-          [
-            "F"
-          ],
-          [
-            "G"
-          ],
-          [
-            "H"
-          ],
-          [
-            "J"
-          ],
-          [
-            "K"
-          ],
-          [
-            "L"
-          ]
-        ],
-        [
-          [
-            "Z"
-          ],
-          [
-            "X"
-          ],
-          [
-            "C",
-            "Ç",
-            "Ć",
-            "Č"
-          ],
-          [
-            "V"
-          ],
-          [
-            "B"
-          ],
-          [
-            "N"
-          ],
-          [
-            "M"
-          ]
-        ],
-        [
-          [
-            ","
-          ],
-          [
-            " "
-          ],
-          [
-            ".",
-            "#",
-            "!",
-            ",",
-            "?",
-            "-",
-            ":",
-            "'",
-            "@"
-          ]
-        ]
-      ]
-    },
-    {
-      "level": "opt",
-      "mode": "locked",
-      "rows": [
-        [
-          [
-            "1",
-            "¹",
-            "½",
-            "⅓",
-            "¼",
-            "⅛"
-          ],
-          [
-            "2",
-            "²",
-            "⅔"
-          ],
-          [
-            "3",
-            "³",
-            "¾",
-            "⅜"
-          ],
-          [
-            "4",
-            "⁴"
-          ],
-          [
-            "5",
-            "⅝"
-          ],
-          [
-            "6"
-          ],
-          [
-            "7",
-            "⅞"
-          ],
-          [
-            "8"
-          ],
-          [
-            "9"
-          ],
-          [
-            "0",
-            "ⁿ",
-            "∅"
-          ]
-        ],
-        [
-          [
-            "@"
-          ],
-          [
-            "#"
-          ],
-          [
-            "$",
-            "¢",
-            "£",
-            "€",
-            "¥",
-            "₱"
-          ],
-          [
-            "%",
-            "‰"
-          ],
-          [
-            "&"
-          ],
-          [
-            "-",
-            "_",
-            "–",
-            "—",
-            "·"
-          ],
-          [
-            "+",
-            "±"
-          ],
-          [
-            "(",
-            "<",
-            "{",
-            "["
-          ],
-          [
-            ")",
-            ">",
-            "}",
-            "]"
-          ]
-        ],
-        [
-          [
-            "*",
-            "†",
-            "‡",
-            "★"
-          ],
-          [
-            "\"",
-            "“",
-            "”",
-            "«",
-            "»"
-          ],
-          [
-            "'",
-            "‘",
-            "’",
-            "‹",
-            "›"
-          ],
-          [
-            ":"
-          ],
-          [
-            ";"
-          ],
-          [
-            "!",
-            "¡"
-          ],
-          [
-            "?",
-            "¿"
-          ]
-        ],
-        [
-          [
-            "_"
-          ],
-          [
-            "/"
-          ],
-          [
-            " "
-          ],
-          [
-            ","
-          ],
-          [
-            ".",
-            "…"
-          ]
-        ]
-      ]
-    },
-    {
-      "level": "opt+shift",
-      "mode": "locked",
-      "rows": [
-        [
-          [
-            "~"
-          ],
-          [
-            "`"
-          ],
-          [
-            "|"
-          ],
-          [
-            "•",
-            "♪",
-            "♥",
-            "♠",
-            "♦",
-            "♣"
-          ],
-          [
-            "√"
-          ],
-          [
-            "Π",
-            "π"
-          ],
-          [
-            "÷"
-          ],
-          [
-            "×"
-          ],
-          [
-            "¶",
-            "§"
-          ],
-          [
-            "∆"
-          ]
-        ],
-        [
-          [
-            "£"
-          ],
-          [
-            "¢"
-          ],
-          [
-            "€"
-          ],
-          [
-            "¥"
-          ],
-          [
-            "^",
-            "↑",
-            "↓",
-            "←",
-            "→"
-          ],
-          [
-            "°",
-            "′",
-            "″"
-          ],
-          [
-            "=",
-            "≠",
-            "≈",
-            "∞"
-          ],
-          [
-            "{"
-          ],
-          [
-            "}"
-          ]
-        ],
-        [
-          [
-            "\\"
-          ],
-          [
-            "©"
-          ],
-          [
-            "®"
-          ],
-          [
-            "™"
-          ],
-          [
-            "℅"
-          ],
-          [
-            "["
-          ],
-          [
-            "]"
-          ]
-        ],
-        [
-          [
-            "<",
-            "‹",
-            "≤",
-            "«"
-          ],
-          [
-            ">",
-            "›",
-            "≥",
-            "»"
-          ],
-          [
-            " "
-          ],
-          [
-            ","
-          ],
-          [
-            ".",
-            "…"
-          ]
-        ]
-      ]
-    }
-  ],
-  "locale": "fr-CA",
-  "name": "French Canada"
-}

data/osk-layouts/fr.json

@@ -6,20 +6,10 @@
       "rows": [
         [
           [
-            "a",
+            "q"
-            "à",
-            "â",
-            "%",
-            "æ",
-            "á",
-            "ä",
-            "ã",
-            "å",
-            "ā",
-            "ª"
           ],
           [
-            "z"
+            "w"
           ],
           [
             "e",
@@ -81,7 +71,17 @@
         ],
         [
           [
-            "q"
+            "a",
+            "à",
+            "â",
+            "%",
+            "æ",
+            "á",
+            "ä",
+            "ã",
+            "å",
+            "ā",
+            "ª"
           ],
           [
             "s"
@@ -106,14 +106,11 @@
           ],
           [
             "l"
-          ],
-          [
-            "m"
           ]
         ],
         [
           [
-            "w"
+            "z"
           ],
           [
             "x"
@@ -134,11 +131,7 @@
             "n"
           ],
           [
-            "'",
+            "m"
-            "‘",
-            "’",
-            "‹",
-            "›"
           ]
         ],
         [
@@ -168,20 +161,10 @@
       "rows": [
         [
           [
-            "A",
+            "Q"
-            "À",
-            "Â",
-            "%",
-            "Æ",
-            "Á",
-            "Ä",
-            "Ã",
-            "Å",
-            "Ā",
-            "ª"
           ],
           [
-            "Z"
+            "W"
           ],
           [
             "E",
@@ -243,7 +226,17 @@
         ],
         [
           [
-            "Q"
+            "A",
+            "À",
+            "Â",
+            "%",
+            "Æ",
+            "Á",
+            "Ä",
+            "Ã",
+            "Å",
+            "Ā",
+            "ª"
           ],
           [
             "S"
@@ -268,14 +261,11 @@
           ],
           [
             "L"
-          ],
-          [
-            "M"
           ]
         ],
         [
           [
-            "W"
+            "Z"
           ],
           [
             "X"
@@ -296,11 +286,7 @@
             "N"
           ],
           [
-            "'",
+            "M"
-            "‘",
-            "’",
-            "‹",
-            "›"
           ]
         ],
         [
@@ -383,10 +369,10 @@
             "#"
           ],
           [
-            "€",
+            "$",
             "¢",
             "£",
-            "$",
+            "€",
             "¥",
             "₱"
           ],
@@ -524,16 +510,15 @@
           [
             "£"
           ],
+          [
+            "¢"
+          ],
+          [
+            "€"
+          ],
           [
             "¥"
           ],
-          [
-            "$",
-            "¢"
-          ],
-          [
-            "¢"
-          ],
           [
             "^",
             "↑",
@@ -609,6 +594,6 @@
       ]
     }
   ],
-  "locale": "fr",
+  "locale": "fr-CA",
-  "name": "French"
+  "name": "French Canada"
 }

data/theme/gnome-shell-high-contrast.scss

@@ -1,5 +1,3 @@
-$variant: 'light';
-
 @import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
 @import "gnome-shell-sass/_common";

data/theme/gnome-shell-sass/_colors.scss

@@ -2,34 +2,33 @@
 // it gets @if ed depending on $variant
 
 
-$base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
+$base_color: if($variant =='light', #ffffff, #292929);
-$bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
+$bg_color: if($variant =='light', #ededed, #393f3f);
-$fg_color: if($variant == 'light', #2e3436, #eeeeec);
+$fg_color: if($variant =='light', #2e3436, #eeeeec);
 
 $selected_fg_color: #ffffff;
-$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
+$selected_bg_color: if($variant == 'light', #4a90d9, darken(#4a90d9,20%));
-$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
+$selected_borders_color: if($variant=='light', darken($selected_bg_color, 30%),
-$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
+                                               darken($selected_bg_color, 20%));
-$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
+$borders_color: if($variant =='light', darken($bg_color,30%), darken($bg_color,12%));
-$link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
+$borders_edge: if($variant =='light', white, transparentize($fg_color, 0.9));
-$link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
+$link_color: if($variant == 'light', darken($selected_bg_color,10%),
+                                     lighten($selected_bg_color,20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%),
+                                     lighten($selected_bg_color,10%));
 $top_hilight: $borders_edge;
 
 $warning_color: #f57900;
-$error_color: #ff8080;
+$error_color: #cc0000;
-$success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
+$success_color: if($variant =='light', #73d216, darken(#73d216,10%));
-$destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
+$destructive_color: if($variant =='light', #ef2929, darken(#ef2929,10%));
 
 $osd_fg_color: #eeeeec;
-$osd_text_color: white;
+$osd_bg_color: #2e3436;
-$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
-$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
-$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.84);
+$osd_outer_borders_color: transparentize(white, 0.9);
 
 $tooltip_borders_color: $osd_outer_borders_color;
-$shadow_color: transparentize(black, 0.9);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);

data/theme/gnome-shell-sass/_drawing.scss

@@ -37,13 +37,16 @@
 // possible $t values:
 // normal, focus, insensitive
 //
+  $_inner_shadows: inset 0 2px 4px transparentize(black, 0.6);
 
   @if $t==normal {
     background-color: $base_color;
     border-color: $borders_color;
+    @include _shadows($_inner_shadows);
 
   }
   @if $t==focus {
+    @include _shadows($_inner_shadows);
     border-color: if($fc==$selected_bg_color,
                      $selected_borders_color,
                      darken($fc,35%));
@@ -108,7 +111,7 @@
   }
 }
 
-@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge) {
+@mixin button($t, $c:$osd_bg_color, $tc:$fg_color, $edge: $borders_edge) {
 //
 // Button drawing function
 //
@@ -127,17 +130,19 @@
   $_hilight_color: _button_hilight_color($c);
   $_button_edge: if($edge == none, none, _widget_edge($edge));
   $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
-  $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
+
 
   @if $t==normal {
   //
   // normal button
   //
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
+                            $osd_bg_color);
 
-    color: $tc;
+    color: $osd_fg_color;
-    background-color: $c;
+    background-color: $_bg;
-    border-color: $borders_color;
+    border-color: $osd_borders_color;
-    box-shadow: $_button_shadow;
+    box-shadow: inset 0 1px lighten($osd_bg_color,10%);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
   }
@@ -145,21 +150,26 @@
   //
   // focused button
   //
-    color: $tc;
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+                          lighten($osd_bg_color,3%));
+
+    color: $osd_fg_color;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    box-shadow: inset 0px 0px 0px 2px $selected_bg_color;
+    box-shadow: inset 0px 0px 0px 1px $selected_bg_color;
-    //border-color: $selected_bg_color;
   }
 
   @else if $t==hover {
   //
   // active osd button
   //
-    color: $tc;
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
-    border-color: $borders_color;
+                            lighten($osd_bg_color,3%));
-    background-color: $c;
+
-    box-shadow: $_button_shadow;
+    color: white;
+    border-color: $osd_borders_color;
+    background-color: $_bg;
+    box-shadow: inset 0 1px lighten($osd_bg_color,20%);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
 
@@ -168,18 +178,27 @@
   //
   // active osd button
   //
-    color: $tc;
+    $_bg: if($c!=$bg_color, $c, $osd_borders_color);
-    border-color: $borders_color;
+
-    background-color: $c;
+    color: white;
+    border-color: $osd_borders_color;
+    background-color: $selected_bg_color;
+    // This should be none, but it's creating some issues with borders, so to
+    // workaround it for now, use inset wich goes through a different code path.
+    // see https://bugzilla.gnome.org/show_bug.cgi?id=752934
+    box-shadow: inset 0 0 black;
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: none;
   }
   @else if $t==insensitive {
+  //
+  // insensitive osd button
+  //
+    $_bg: transparentize(mix($insensitive_fg_color,$osd_bg_color,20%),0.3);
 
     color: $insensitive_fg_color;
-    border-color: $insensitive_borders_color;
+    border-color: $osd_borders_color;
-    background-color: $insensitive_bg_color;
+    background-color: $_bg;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;

data/theme/gnome-shell-sass/_high-contrast-colors.scss

@@ -26,7 +26,6 @@ $osd_borders_color: transparentize(black, 0.3);
 $osd_outer_borders_color: transparentize(white, 0.9);
 
 $tooltip_borders_color: $osd_outer_borders_color;
-$shadow_color: transparentize(black, 0.9);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);

data/theme/pointer-double-click-symbolic.svg

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2">
-  <g
-     id="layer1"
-     style="display:inline">
-    <g
-       id="id1"
-       transform="translate(-19,-0.75)">
-      <path
-         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         d="m 19.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.38151 2.829427,-2.763021 4.24414,-4.144531 0.5882,1.18866 1.158389,2.386561 1.758464,3.569127 1.108631,1.640259 4.157538,0.465128 3.89799,-1.495859 0.01057,-0.470226 -0.405577,-0.908445 -0.434651,-1.313638 0.259401,-0.25321 0.518802,-0.50642 0.778203,-0.75963 0.5882,1.18866 1.158389,2.386561 1.758464,3.569127 1.108631,1.640259 4.157538,0.465128 3.89799,-1.495859 -0.192325,-0.904303 -0.717854,-1.698026 -1.068629,-2.548967 -0.238908,-0.512658 -0.477817,-1.025315 -0.716725,-1.537973 1.755859,0 3.511719,0 5.267578,0 C 34.777352,9.738932 30.31641,5.0970051 25.855469,0.45507812 c 0,2.08138018 0,4.16276048 0,6.24414068 -2,-2.0813802 -4,-4.1627605 -6,-6.24414068 z m 1.5,3.72656248 c 2,2.0813801 4,4.1627603 6,6.2441404 0,-2.0813801 0,-4.1627603 0,-6.2441404 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.366537,0 -2.733073,0 -4.09961,0 0.883468,1.903435 1.781983,3.800273 2.656081,5.707817 0.0065,0.622781 -1.227555,0.980575 -1.325116,0.207118 -0.80433,-1.640251 -1.608661,-3.280501 -2.412991,-4.920752 -1.020182,0.995443 -2.040365,1.990885 -3.060547,2.986328 0.263642,0.608048 0.596803,1.192457 0.814693,1.816134 -0.182662,0.601037 -1.26833,0.8373 -1.365856,0.06795 -0.796094,-1.623456 -1.592189,-3.246912 -2.388284,-4.870368 -1.059245,1.033854 -2.118489,2.067708 -3.177734,3.101562 -4e-6,-4.265002 -7e-6,-8.5300036 -1.1e-5,-12.7950054 z"
-         id="path5565" />
-    </g>
-    <g
-       id="id2"
-       transform="translate(-25,-0.75)" />
-  </g>
-</svg>

data/theme/pointer-drag-symbolic.svg

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2">
-  <g
-     id="g835">
-    <path
-       style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       d="M 10.705078 1.671875 C 9.8685536 1.7465699 8.886927 1.5353073 8.2578125 2.2480469 C 8.0785627 2.7511513 7.8667422 2.9777446 7.3125 2.8652344 C 6.5186841 2.8141575 5.6105879 2.9190179 5.125 3.6386719 C 4.5700923 4.4696324 4.8113194 5.4949043 4.7578125 6.4316406 L 4.7578125 7.9335938 C 4.2480917 7.6156216 3.6258927 7.8015358 3.0585938 7.7519531 C 2.6157606 7.7312277 2.1774807 7.7771069 1.7402344 7.84375 C 1.7971654 10.529678 1.813967 13.217089 1.8613281 15.902344 C 1.9550191 17.204635 3.0933719 18.307155 4.40625 18.326172 C 5.0391993 18.341272 5.8885801 18.332951 6.6308594 18.337891 C 9.8526764 18.325821 13.076973 18.38774 16.296875 18.28125 C 17.459088 18.161027 18.510143 17.092798 18.367188 15.884766 L 18.367188 6.4042969 C 17.660379 5.4636119 16.551912 4.623434 15.308594 4.8339844 C 15.009045 4.3804158 14.822476 3.3608651 14.082031 3.0351562 C 13.727176 2.744118 13.242443 2.9253873 12.822266 2.8730469 C 12.524824 2.8003648 11.966366 3.0655864 11.953125 2.6210938 C 11.795774 2.0995736 11.23789 1.7125276 10.705078 1.671875 z M 10.599609 3.1757812 C 10.764131 3.4472414 10.782382 3.9294982 10.818359 4.3007812 C 10.824915 4.3076775 10.838155 4.3066925 10.845703 4.3125 C 10.836598 4.3123268 10.827465 4.3126732 10.818359 4.3125 L 11.3125 10.212891 L 11.976562 4.3710938 L 13.322266 4.375 C 13.858345 4.7645492 13.735252 5.5154752 13.876953 6.0976562 C 13.865826 6.1651282 13.88335 6.1937019 13.892578 6.234375 C 13.891928 6.2343667 13.891276 6.2343833 13.890625 6.234375 L 13.902344 6.3203125 L 14.384766 10.185547 L 15.048828 6.265625 C 15.622863 6.228498 16.206517 6.3041365 16.607422 6.7675781 C 17.017062 6.9844433 16.823063 7.4565491 16.867188 7.8261719 L 16.867188 16.167969 C 16.530129 17.131654 15.267211 16.71624 14.492188 16.828125 C 11.121671 16.841205 7.7500508 16.861953 4.3808594 16.814453 C 3.4051926 16.786173 3.2389196 15.744474 3.3398438 14.972656 C 3.3282027 13.065594 3.2950998 11.158732 3.2617188 9.2519531 C 3.5880829 9.2584131 3.9376766 9.2391948 4.25 9.2617188 C 4.7438842 10.17694 4.7346154 11.262903 4.7578125 12.277344 C 5.2504494 12.270544 5.8011939 12.317174 6.2578125 12.277344 C 6.2669593 9.7577406 6.2393741 7.2373172 6.2714844 4.71875 C 6.3763823 4.198849 7.0022289 4.409587 7.3828125 4.3652344 L 8.0585938 4.3652344 L 8.546875 10.212891 L 9.2167969 4.3359375 L 9.2128906 4.3359375 C 9.2438386 3.9531035 9.0622615 3.4401006 9.4609375 3.2167969 L 10.599609 3.1757812 z "
-       id="path5630" />
-  </g>
-</svg>

data/theme/pointer-primary-click-symbolic.svg

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2"
-   version="1.1">
-  <g
-     id="layer1"
-     style="display:inline">
-    <g
-       id="id1"
-       transform="translate(-22.25,-0.75)">
-      <path
-         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         d="m 25.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.380859 2.829427,-2.761719 4.24414,-4.142578 0.612408,1.215372 1.173049,2.460221 1.819709,3.656095 1.141947,1.476279 3.975266,0.389006 3.846009,-1.473608 -0.09413,-0.822519 -0.594755,-1.521423 -0.899969,-2.277599 -0.298869,-0.640171 -0.597739,-1.280342 -0.896608,-1.920513 1.75651,0 3.513021,0 5.269531,0 C 34.777344,9.738932 30.316406,5.0970051 25.855469,0.45507812 Z m 1.5,3.72656248 c 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.367188,0 -2.734375,0 -4.101563,0 0.885072,1.903196 1.781799,3.80152 2.659622,5.707744 0.0349,0.566084 -1.149057,0.988823 -1.282093,0.297971 -0.818567,-1.671162 -1.637133,-3.342323 -2.455699,-5.013485 -1.059896,1.034505 -2.119791,2.06901 -3.179687,3.103515 1.5e-5,-4.264988 3e-5,-8.5299756 4.5e-5,-12.7949634 z"
-         id="path5565" />
-    </g>
-  </g>
-</svg>

data/theme/pointer-secondary-click-symbolic.svg

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
-   id="svg2">
-  <g
-     id="layer1"
-     style="display:inline;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
-    <g
-       transform="matrix(-1,0,0,1,42,-0.75)"
-       id="g5847"
-       style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
-      <path
-         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         d="m 25.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.380859 2.829427,-2.761719 4.24414,-4.142578 0.612408,1.215372 1.173049,2.460221 1.819709,3.656095 1.141947,1.476279 3.975266,0.389006 3.846009,-1.473608 -0.09413,-0.822519 -0.594755,-1.521423 -0.899969,-2.277599 -0.298869,-0.640171 -0.597739,-1.280342 -0.896608,-1.920513 1.75651,0 3.513021,0 5.269531,0 C 34.777344,9.738932 30.316406,5.0970051 25.855469,0.45507812 Z m 1.5,3.72656248 c 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.367188,0 -2.734375,0 -4.101563,0 0.885072,1.903196 1.781799,3.80152 2.659622,5.707744 0.0349,0.566084 -1.149057,0.988823 -1.282093,0.297971 -0.818567,-1.671162 -1.637133,-3.342323 -2.455699,-5.013485 -1.059896,1.034505 -2.119791,2.06901 -3.179687,3.103515 1.5e-5,-4.264988 3e-5,-8.5299756 4.5e-5,-12.7949634 z"
-         id="path5851" />
-    </g>
-  </g>
-</svg>

data/theme/toggle-off-dark.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="22"><defs><linearGradient id="a"><stop offset="0" stop-color="#39393a"/><stop offset="1" stop-color="#302f30"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="53" y1="294.429" x2="53" y2="309.804" gradientUnits="userSpaceOnUse" gradientTransform="translate(-42.76)"/></defs><g transform="translate(0 -291.18)" stroke-width="1.085"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#323233" stroke="#272728"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none" fill="url(#b)" stroke="#151515"/></g></svg>

data/theme/toggle-off-intl.svg

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="22"
+   id="svg2857"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="toggle-off-us.svg">
+  <defs
+     id="defs2859">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2865" />
+    <inkscape:perspective
+       id="perspective2843"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient76469-7-7-4"
+       id="linearGradient38024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
+       x1="6"
+       y1="102.95528"
+       x2="6"
+       y2="84.505203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient76469-7-7-4">
+      <stop
+         style="stop-color:#2e3232;stop-opacity:1"
+         offset="0"
+         id="stop76471-7-1-5" />
+      <stop
+         style="stop-color:#3e4545;stop-opacity:1"
+         offset="1"
+         id="stop76473-9-0-0" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4-0"
+       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient37802-8"
+       id="linearGradient12311-3-1-0-5-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
+       x1="610.13782"
+       y1="501.43866"
+       x2="610.13782"
+       y2="492.52756" />
+    <linearGradient
+       id="linearGradient37802-8"
+       inkscape:collect="always">
+      <stop
+         id="stop37804-1"
+         offset="0"
+         style="stop-color:#2c2c2c;stop-opacity:1" />
+      <stop
+         id="stop37806-8"
+         offset="1"
+         style="stop-color:#16191a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="492.52756"
+       x2="610.13782"
+       y1="501.43866"
+       x1="610.13782"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient13602"
+       xlink:href="#linearGradient37802-8"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="-5.0602834"
+     inkscape:cy="16.473273"
+     inkscape:document-units="px"
+     inkscape:current-layer="g37994"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1375"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid12954"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2862">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-444.64286,-781.36218)">
+    <g
+       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
+       id="g37994">
+      <g
+         id="g37996"
+         transform="translate(-115,1277)">
+        <rect
+           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
+           id="rect13475"
+           width="98"
+           height="25"
+           x="644.5"
+           y="484.61118"
+           rx="4.7429576"
+           ry="3.8424656" />
+        <rect
+           ry="3.8424656"
+           rx="4.7429576"
+           y="483.5"
+           x="644.5"
+           height="25"
+           width="98"
+           id="rect38000"
+           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+      </g>
+      <g
+         transform="translate(-49.946213,-1.890275)"
+         id="g38002">
+        <g
+           transform="translate(-115,1247)"
+           style="display:inline"
+           id="g38004">
+          <rect
+             ry="3.7972314"
+             rx="4.6871223"
+             y="515.5"
+             x="694.53046"
+             height="25"
+             width="45.969578"
+             id="rect38006"
+             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 699.09675,516.7365 36.86904,0"
+             id="path38016"
+             inkscape:path-effect="#path-effect77541-4"
+             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2.15627193;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         id="path13479"
+         sodipodi:cx="16.4375"
+         sodipodi:cy="10.8125"
+         sodipodi:rx="4.3125"
+         sodipodi:ry="4.3125"
+         d="m 20.75,10.8125 a 4.3125,4.3125 0 1 1 -8.625,0 4.3125,4.3125 0 1 1 8.625,0 z"
+         transform="matrix(1.4212691,0,0,1.1514287,577.38488,1761.1138)" />
+    </g>
+  </g>
+</svg>

data/theme/toggle-off-us.svg

@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="22"
+   id="svg2857"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="toggle-on-intl.svg">
+  <defs
+     id="defs2859">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2865" />
+    <inkscape:perspective
+       id="perspective2843"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient76469-7-7-4"
+       id="linearGradient38024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
+       x1="6"
+       y1="102.95528"
+       x2="6"
+       y2="84.505203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient76469-7-7-4">
+      <stop
+         style="stop-color:#2e3232;stop-opacity:1"
+         offset="0"
+         id="stop76471-7-1-5" />
+      <stop
+         style="stop-color:#3e4545;stop-opacity:1"
+         offset="1"
+         id="stop76473-9-0-0" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4"
+       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient37802"
+       id="linearGradient12311-3-1-0-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
+       x1="610.13782"
+       y1="501.43866"
+       x2="610.13782"
+       y2="492.52756" />
+    <linearGradient
+       id="linearGradient37802"
+       inkscape:collect="always">
+      <stop
+         id="stop37804"
+         offset="0"
+         style="stop-color:#2c2c2c;stop-opacity:1" />
+      <stop
+         id="stop37806"
+         offset="1"
+         style="stop-color:#16191a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient76469-7-7-4-3"
+       id="linearGradient77680"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0322581,717.71949,428.68472)"
+       x1="6"
+       y1="102.95528"
+       x2="6"
+       y2="84.505203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient76469-7-7-4-3">
+      <stop
+         style="stop-color:#2e3232;stop-opacity:1"
+         offset="0"
+         id="stop76471-7-1-5-7" />
+      <stop
+         style="stop-color:#3e4545;stop-opacity:1"
+         offset="1"
+         id="stop76473-9-0-0-9" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4-0"
+       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient37802-8"
+       id="linearGradient12311-3-1-0-5-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
+       x1="610.13782"
+       y1="501.43866"
+       x2="610.13782"
+       y2="492.52756" />
+    <linearGradient
+       id="linearGradient37802-8"
+       inkscape:collect="always">
+      <stop
+         id="stop37804-1"
+         offset="0"
+         style="stop-color:#2c2c2c;stop-opacity:1" />
+      <stop
+         id="stop37806-8"
+         offset="1"
+         style="stop-color:#16191a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="492.52756"
+       x2="610.13782"
+       y1="501.43866"
+       x1="610.13782"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient13602"
+       xlink:href="#linearGradient37802-8"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="16.760995"
+     inkscape:cy="21.955673"
+     inkscape:document-units="px"
+     inkscape:current-layer="g37994"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1375"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid12954"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2862">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-444.64286,-781.36218)">
+    <g
+       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
+       id="g37994">
+      <g
+         id="g37996"
+         transform="translate(-115,1277)">
+        <rect
+           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
+           id="rect13475"
+           width="98"
+           height="25"
+           x="644.5"
+           y="484.61118"
+           rx="4.7429576"
+           ry="3.8424656" />
+        <rect
+           ry="3.8424656"
+           rx="4.7429576"
+           y="483.5"
+           x="644.5"
+           height="25"
+           width="98"
+           id="rect38000"
+           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+      </g>
+      <g
+         transform="translate(-49.946213,-1.890275)"
+         id="g38002">
+        <g
+           transform="translate(-115,1247)"
+           style="display:inline"
+           id="g38004">
+          <rect
+             ry="3.7972314"
+             rx="4.6871223"
+             y="515.5"
+             x="694.53046"
+             height="25"
+             width="45.969578"
+             id="rect38006"
+             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 699.09675,516.7365 36.86904,0"
+             id="path38016"
+             inkscape:path-effect="#path-effect77541-4"
+             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-size:13.79166794px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         x="520.29974"
+         y="1997.0011"
+         id="text75614"
+         sodipodi:linespacing="125%"
+         transform="scale(1.1236771,0.88993537)"><tspan
+           sodipodi:role="line"
+           id="tspan75616"
+           x="520.29974"
+           y="1997.0011">OFF</tspan></text>
+    </g>
+  </g>
+</svg>

data/theme/toggle-off.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="46" height="22"><g transform="translate(0 -291.18)"><rect style="marker:none;font-variant-east_asian:normal" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#e1dedb" stroke="#cdc7c2" stroke-linecap="round" stroke-linejoin="round"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none;font-variant-east_asian:normal" fill="#f8f7f7" stroke="#aa9f98" stroke-linecap="round" stroke-linejoin="round"/><g transform="matrix(.97148 0 0 1 1658.914 -2552.91)" stroke-width="1.015" stroke-linecap="round" stroke-linejoin="round"><rect ry="13.17" rx="13.556" y="1234.681" x="-1242.732" height="26" width="49.409" style="marker:none" fill="#e1dedb" stroke="#cdc7c2"/><rect style="marker:none" width="26.763" height="26" x="-1242.732" y="1234.769" rx="13.511" ry="13.126" fill="#f8f7f7" stroke="#aa9f98"/></g><g transform="matrix(.97148 0 0 1 1658.914 -2512.91)" stroke-width="1.015" stroke="#2b73cc"><rect style="marker:none" width="49.409" height="26" x="-1242.732" y="1234.681" rx="13.556" ry="13.17" fill="#3081e3"/><rect ry="13.126" rx="13.511" y="1234.769" x="-1220.086" height="26" width="26.763" style="marker:none" fill="#f8f7f7" stroke-linecap="round" stroke-linejoin="round"/></g></g></svg>

data/theme/toggle-on-dark.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="22"><defs><linearGradient id="a"><stop offset="0" stop-color="#39393a"/><stop offset="1" stop-color="#302f30"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="53" y1="294.429" x2="53" y2="309.804" gradientUnits="userSpaceOnUse" gradientTransform="translate(-19)"/></defs><g transform="translate(0 -291.18)" stroke="#030e1b" stroke-width="1.085"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#15539e"/><rect ry="10.455" rx="10.455" y="291.715" x="24.304" height="20.911" width="21.143" style="marker:none" fill="url(#b)"/></g></svg>

data/theme/toggle-on-intl.svg

@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="22"
+   id="svg2857"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="toggle-on-intl.svg">
+  <defs
+     id="defs2859">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2865" />
+    <inkscape:perspective
+       id="perspective2843"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient77461"
+       id="linearGradient77551"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
+       x1="1164.7644"
+       y1="962.93695"
+       x2="1164.7644"
+       y2="970.51404" />
+    <linearGradient
+       id="linearGradient77461"
+       inkscape:collect="always">
+      <stop
+         id="stop77463"
+         offset="0"
+         style="stop-color:#182f4c;stop-opacity:1" />
+      <stop
+         id="stop77465"
+         offset="1"
+         style="stop-color:#205b9a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient76469-7-7-4"
+       id="linearGradient38024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
+       x1="6"
+       y1="102.95528"
+       x2="6"
+       y2="84.505203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient76469-7-7-4">
+      <stop
+         style="stop-color:#2e3232;stop-opacity:1"
+         offset="0"
+         id="stop76471-7-1-5" />
+      <stop
+         style="stop-color:#3e4545;stop-opacity:1"
+         offset="1"
+         id="stop76473-9-0-0" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4"
+       is_visible="true" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="37.410841"
+     inkscape:cy="16.009314"
+     inkscape:document-units="px"
+     inkscape:current-layer="g37994"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid12954"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2862">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-444.64286,-781.36218)">
+    <g
+       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
+       id="g37994">
+      <g
+         id="g37996"
+         transform="translate(-115,1277)">
+        <rect
+           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
+           id="rect13475"
+           width="98"
+           height="25"
+           x="644.5"
+           y="484.61118"
+           rx="4.7429576"
+           ry="3.8424656" />
+        <rect
+           ry="3.8424656"
+           rx="4.7429576"
+           y="483.5"
+           x="644.5"
+           height="25"
+           width="98"
+           id="rect38000"
+           style="color:#000000;fill:url(#linearGradient77551);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+      <g
+         transform="translate(2.0625,-2)"
+         id="g38002">
+        <g
+           transform="translate(-115,1247)"
+           style="display:inline"
+           id="g38004">
+          <rect
+             ry="3.7972314"
+             rx="4.6871223"
+             y="515.5"
+             x="694.53046"
+             height="25"
+             width="45.969578"
+             id="rect38006"
+             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 699.09675,516.7365 36.86904,0"
+             id="path38016"
+             inkscape:path-effect="#path-effect77541-4"
+             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         id="rect13678"
+         width="3.0646207"
+         height="12.414008"
+         x="554.77728"
+         y="1767.3566" />
+    </g>
+  </g>
+</svg>

data/theme/toggle-on-us.svg

@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="22"
+   id="svg2857"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="toggle-on-us.svg">
+  <defs
+     id="defs2859">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2865" />
+    <inkscape:perspective
+       id="perspective2843"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient76469-7-7-4"
+       id="linearGradient38024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
+       x1="6"
+       y1="102.95528"
+       x2="6"
+       y2="84.505203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient76469-7-7-4">
+      <stop
+         style="stop-color:#2e3232;stop-opacity:1"
+         offset="0"
+         id="stop76471-7-1-5" />
+      <stop
+         style="stop-color:#3e4545;stop-opacity:1"
+         offset="1"
+         id="stop76473-9-0-0" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4"
+       is_visible="true" />
+    <linearGradient
+       id="linearGradient77461-1"
+       inkscape:collect="always">
+      <stop
+         id="stop77463-1"
+         offset="0"
+         style="stop-color:#182f4c;stop-opacity:1" />
+      <stop
+         id="stop77465-4"
+         offset="1"
+         style="stop-color:#205b9a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient77461-1"
+       id="linearGradient77551-6-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8527367,0,0,0.80554422,-969.41608,-778.00299)"
+       x1="1164.7644"
+       y1="962.93695"
+       x2="1164.7644"
+       y2="970.51404" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient77461-1"
+       id="linearGradient11198"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3066667,0,0,1,-1066.3709,794.25325)"
+       x1="1322.5831"
+       y1="-312.51855"
+       x2="1322.5831"
+       y2="-306.53461" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="-26.798898"
+     inkscape:cy="5.3753009"
+     inkscape:document-units="px"
+     inkscape:current-layer="g37994"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid12954"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2862">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-444.64286,-781.36218)">
+    <g
+       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
+       id="g37994">
+      <g
+         id="g37996"
+         transform="translate(-115,1277)">
+        <rect
+           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
+           id="rect13475"
+           width="98"
+           height="25"
+           x="644.5"
+           y="484.61118"
+           rx="4.7429576"
+           ry="3.8424656" />
+        <rect
+           ry="3.8424656"
+           rx="4.7429576"
+           y="483.5"
+           x="644.5"
+           height="25"
+           width="98"
+           id="rect38000"
+           style="color:#000000;fill:url(#linearGradient11198);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
+      </g>
+      <g
+         transform="translate(2.0625,-2)"
+         id="g38002">
+        <g
+           transform="translate(-115,1247)"
+           style="display:inline"
+           id="g38004">
+          <rect
+             ry="3.7972314"
+             rx="4.6871223"
+             y="515.5"
+             x="694.53046"
+             height="25"
+             width="45.969578"
+             id="rect38006"
+             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 699.09675,516.7365 36.86904,0"
+             id="path38016"
+             inkscape:path-effect="#path-effect77541-4"
+             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <text
+         transform="scale(1.1000946,0.90901274)"
+         sodipodi:linespacing="125%"
+         id="text38018"
+         y="1955.5205"
+         x="495.94223"
+         style="font-size:13.29953671px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         xml:space="preserve"><tspan
+           y="1955.5205"
+           x="495.94223"
+           id="tspan38020"
+           sodipodi:role="line">ON</tspan></text>
+    </g>
+  </g>
+</svg>

data/theme/toggle-on.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="46" height="22"><g transform="translate(0 -291.18)" stroke="#2b73cc"><rect style="marker:none;font-variant-east_asian:normal" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#3081e3"/><rect ry="10.455" rx="10.455" y="291.715" x="24.304" height="20.911" width="21.143" style="marker:none;font-variant-east_asian:normal" fill="#f8f7f7" stroke-linecap="round" stroke-linejoin="round"/></g></svg>

data/update-osk-layouts.sh

@@ -40,7 +40,6 @@ do
 done
 
 cat >>$TMP_GRESOURCE_FILE <<EOF
-    <file>emoji.json</file>
   </gresource>
 </gresources>
 EOF

js/extensionPrefs/main.js

@@ -1,5 +1,10 @@
 const Gettext = imports.gettext;
-const { Gdk, GLib, Gio, GObject, Gtk, Pango } = imports.gi;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
+const Gdk = imports.gi.Gdk;
+const Pango = imports.gi.Pango;
 const Format = imports.format;
 
 const _ = Gettext.gettext;
@@ -99,118 +104,29 @@ var Application = class {
     }
 
     _buildErrorUI(extension, exc) {
-        let scroll = new Gtk.ScrolledWindow({
+        let box = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
-            hscrollbar_policy: Gtk.PolicyType.NEVER,
-            propagate_natural_height: true
-        });
-
-        let box = new Gtk.Box({
-            orientation: Gtk.Orientation.VERTICAL,
-            spacing: 12,
-            margin: 100,
-            margin_bottom: 60
-        });
-        scroll.add(box);
-
         let label = new Gtk.Label({
-            label: '<span size="x-large">%s</span>'.format(_("Something’s gone wrong")),
+            label: _("There was an error loading the preferences dialog for %s:").format(extension.metadata.name)
-            use_markup: true
-        });
-        label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
-        box.add(label);
-
-        label = new Gtk.Label({
-            label: _("We’re very sorry, but there’s been a problem: the settings for this extension can’t be displayed. We recommend that you report the issue to the extension authors."),
-            justify: Gtk.Justification.CENTER,
-            wrap: true
         });
         box.add(label);
 
-        let expander = new Expander({
+        let errortext = '';
-            label: _("Technical Details"),
+        errortext += exc;
-            margin_top: 12
+        errortext += '\n\n';
-        });
+        errortext += 'Stack trace:\n';
-        box.add(expander);
 
-        let errortext = `${exc}\n\nStack trace:\n${
+        // Indent stack trace.
-            // Indent stack trace.
+        errortext += exc.stack.split('\n').map(line => '  ' + line).join('\n');
-            exc.stack.split('\n').map(line => `  ${line}`).join('\n')
-        }`;
 
+        let scroll = new Gtk.ScrolledWindow({ vexpand: true });
         let buffer = new Gtk.TextBuffer({ text: errortext });
-        let textview = new Gtk.TextView({
+        let textview = new Gtk.TextView({ buffer: buffer });
-            buffer: buffer,
+        textview.override_font(Pango.font_description_from_string('monospace'));
-            wrap_mode: Gtk.WrapMode.WORD,
+        scroll.add(textview);
-            monospace: true,
+        box.add(scroll);
-            editable: false,
-            top_margin: 12,
-            bottom_margin: 12,
-            left_margin: 12,
-            right_margin: 12
-        });
 
-        let toolbar = new Gtk.Toolbar();
+        box.show_all();
-        let provider = new Gtk.CssProvider();
+        return box;
-        provider.load_from_data(`* {
-            border: 0 solid @borders;
-            border-top-width: 1px;
-        }`);
-        toolbar.get_style_context().add_provider(
-            provider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
-        );
-
-        let copyButton = new Gtk.ToolButton({
-            icon_name: 'edit-copy-symbolic',
-            tooltip_text: _("Copy Error")
-        });
-        toolbar.add(copyButton);
-
-        copyButton.connect('clicked', w => {
-            let clipboard = Gtk.Clipboard.get_default(w.get_display());
-            // markdown for pasting in gitlab issues
-            let lines = [
-                `The settings of extension ${extension.uuid} had an error:`,
-                '```',
-                `${exc}`,
-                '```',
-                '',
-                'Stack trace:',
-                '```',
-                exc.stack.replace(/\n$/, ''), // stack without trailing newline
-                '```',
-                ''
-            ];
-            clipboard.set_text(lines.join('\n'), -1);
-        });
-
-        let spacing = new Gtk.SeparatorToolItem({ draw: false });
-        toolbar.add(spacing);
-        toolbar.child_set_property(spacing, "expand", true);
-
-        let urlButton = new Gtk.ToolButton({
-            label: _("Homepage"),
-            tooltip_text: _("Visit extension homepage"),
-            no_show_all: true,
-            visible: extension.metadata.url != null
-        });
-        toolbar.add(urlButton);
-
-        urlButton.connect('clicked', w => {
-            let context = w.get_display().get_app_launch_context();
-            Gio.AppInfo.launch_default_for_uri(extension.metadata.url, context);
-        });
-
-        let expandedBox = new Gtk.Box({
-            orientation: Gtk.Orientation.VERTICAL
-        });
-        expandedBox.add(textview);
-        expandedBox.add(toolbar);
-
-        expander.add(expandedBox);
-
-        scroll.show_all();
-        return scroll;
     }
 
     _buildUI(app) {
@@ -231,12 +147,8 @@ var Application = class {
                             Gio.SettingsBindFlags.DEFAULT |
                             Gio.SettingsBindFlags.INVERT_BOOLEAN);
 
-        this._mainStack = new Gtk.Stack({
-            transition_type: Gtk.StackTransitionType.CROSSFADE
-        });
-        this._window.add(this._mainStack);
-
         let scroll = new Gtk.ScrolledWindow({ hscrollbar_policy: Gtk.PolicyType.NEVER });
+        this._window.add(scroll);
 
         this._extensionSelector = new Gtk.ListBox({ selection_mode: Gtk.SelectionMode.NONE });
         this._extensionSelector.set_sort_func(this._sortList.bind(this));
@@ -244,8 +156,6 @@ var Application = class {
 
         scroll.add(this._extensionSelector);
 
-        this._mainStack.add_named(scroll, 'listing');
-        this._mainStack.add_named(new EmptyPlaceholder(), 'placeholder');
 
         this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
         this._shellProxy.connectSignal('ExtensionStatusChanged', (proxy, senderName, [uuid, state, error]) => {
@@ -290,11 +200,6 @@ var Application = class {
     }
 
     _extensionsLoaded() {
-        if (this._extensionSelector.get_children().length > 0)
-            this._mainStack.visible_child_name = 'listing';
-        else
-            this._mainStack.visible_child_name = 'placeholder';
-
         if (this._startupUuid && this._extensionAvailable(this._startupUuid))
             this._selectExtension(this._startupUuid);
         this._startupUuid = null;
@@ -334,171 +239,6 @@ var Application = class {
     }
 };
 
-var Expander = GObject.registerClass({
-    Properties: {
-        'label': GObject.ParamSpec.string(
-            'label', 'label', 'label',
-            GObject.ParamFlags.READWRITE,
-            null
-        )
-    }
-}, class Expander extends Gtk.Box {
-    _init(params = {}) {
-        this._labelText = null;
-
-        super._init(Object.assign(params, {
-            orientation: Gtk.Orientation.VERTICAL,
-            spacing: 0
-        }));
-
-        this._frame = new Gtk.Frame({
-            shadow_type: Gtk.ShadowType.IN,
-            hexpand: true
-        });
-
-        let eventBox = new Gtk.EventBox();
-        this._frame.add(eventBox);
-
-        let hbox = new Gtk.Box({
-            spacing: 6,
-            margin: 12
-        });
-        eventBox.add(hbox);
-
-        this._arrow = new Gtk.Image({
-            icon_name: 'pan-end-symbolic'
-        });
-        hbox.add(this._arrow);
-
-        this._label = new Gtk.Label({ label: this._labelText });
-        hbox.add(this._label);
-
-        this._revealer = new Gtk.Revealer();
-
-        this._childBin = new Gtk.Frame({
-            shadow_type: Gtk.ShadowType.IN
-        });
-        this._revealer.add(this._childBin);
-
-        // Directly chain up to parent for internal children
-        super.add(this._frame);
-        super.add(this._revealer);
-
-        let provider = new Gtk.CssProvider();
-        provider.load_from_data('* { border-top-width: 0; }');
-        this._childBin.get_style_context().add_provider(
-            provider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
-        );
-
-        this._gesture = new Gtk.GestureMultiPress({
-            widget: this._frame,
-            button: 0,
-            exclusive: true
-        });
-        this._gesture.connect('released', (gesture, nPress) => {
-            if (nPress == 1)
-                this._revealer.reveal_child = !this._revealer.reveal_child;
-        });
-        this._revealer.connect('notify::reveal-child', () => {
-            if (this._revealer.reveal_child)
-                this._arrow.icon_name = 'pan-down-symbolic';
-            else
-                this._arrow.icon_name = 'pan-end-symbolic';
-        });
-    }
-
-    get label() {
-        return this._labelText;
-    }
-
-    set label(text) {
-        if (this._labelText == text)
-            return;
-
-        if (this._label)
-            this._label.label = text;
-        this._labelText = text;
-        this.notify('label');
-    }
-
-    add(child) {
-        // set expanded child
-        this._childBin.get_children().forEach(c => {
-            this._childBin.remove(c);
-        });
-
-        if (child)
-            this._childBin.add(child);
-    }
-});
-
-var EmptyPlaceholder = GObject.registerClass(
-class EmptyPlaceholder extends Gtk.Box {
-    _init() {
-        super._init({
-            orientation: Gtk.Orientation.VERTICAL,
-            spacing: 6,
-            margin: 32
-        });
-
-        let image = new Gtk.Image({
-            icon_name: 'application-x-addon-symbolic',
-            pixel_size: 96,
-            visible: true,
-            vexpand: true,
-            valign: Gtk.Align.END
-        });
-        image.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
-        this.add(image);
-
-        let label = new Gtk.Label({
-            label: `<b><span size="x-large">${_("No Extensions Installed" )}</span></b>`,
-            use_markup: true,
-            visible: true
-        });
-        label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
-        this.add(label);
-
-        let appInfo = Gio.DesktopAppInfo.new('org.gnome.Software.desktop');
-
-        let desc = new Gtk.Label({
-            label: _("Extensions can be installed through Software or <a href=\"https://extensions.gnome.org\">extensions.gnome.org</a>."),
-            use_markup: true,
-            wrap: true,
-            justify: Gtk.Justification.CENTER,
-            visible: true,
-            max_width_chars: 50,
-            hexpand: true,
-            vexpand: (appInfo == null),
-            halign: Gtk.Align.CENTER,
-            valign: Gtk.Align.START
-        });
-        this.add(desc);
-
-        if (appInfo) {
-            let button = new Gtk.Button({
-                label: _("Browse in Software"),
-                image: new Gtk.Image({
-                    icon_name: "org.gnome.Software-symbolic"
-                }),
-                always_show_image: true,
-                margin_top: 12,
-                visible: true,
-                halign: Gtk.Align.CENTER,
-                valign: Gtk.Align.START,
-                vexpand: true
-            });
-            this.add(button);
-
-            button.connect('clicked', w => {
-                let context = w.get_display().get_app_launch_context();
-                appInfo.launch([], context);
-            });
-        }
-    }
-});
-
 var DescriptionLabel = GObject.registerClass(
 class DescriptionLabel extends Gtk.Label {
     vfunc_get_preferred_height_for_width(width) {
@@ -558,9 +298,9 @@ class ExtensionRow extends Gtk.ListBoxRow {
 
         let button = new Gtk.Button({ valign: Gtk.Align.CENTER,
                                       no_show_all: true });
-        button.set_image(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
+        button.add(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
-                                         icon_size: Gtk.IconSize.BUTTON,
+                                   icon_size: Gtk.IconSize.BUTTON,
-                                         visible: true }));
+                                   visible: true }));
         button.get_style_context().add_class('circular');
         hbox.add(button);
 
@@ -589,12 +329,12 @@ class ExtensionRow extends Gtk.ListBoxRow {
 
     _isEnabled() {
         let extensions = this._settings.get_strv('enabled-extensions');
-        return extensions.includes(this.uuid);
+        return extensions.indexOf(this.uuid) != -1;
     }
 
     _enable() {
         let extensions = this._settings.get_strv('enabled-extensions');
-        if (extensions.includes(this.uuid))
+        if (extensions.indexOf(this.uuid) != -1)
             return;
 
         extensions.push(this.uuid);
@@ -618,12 +358,12 @@ function initEnvironment() {
     // Monkey-patch in a "global" object that fakes some Shell utilities
     // that ExtensionUtils depends on.
     window.global = {
-        log(...args) {
+        log() {
-            print(args.join(', '));
+            print([].join.call(arguments, ', '));
         },
 
         logError(s) {
-            log(`ERROR: ${s}`);
+            log('ERROR: ' + s);
         },
 
         userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell'])

js/gdm/authPrompt.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const Pango = imports.gi.Pango;
 const Signals = imports.signals;
+const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const Batch = imports.gdm.batch;
@@ -59,23 +62,23 @@ var AuthPrompt = class {
         this.smartcardDetected = this._userVerifier.smartcardDetected;
 
         this.connect('next', () => {
-            this.updateSensitivity(false);
+                this.updateSensitivity(false);
-            this.startSpinning();
+                this.startSpinning();
-            if (this._queryingService) {
+                if (this._queryingService) {
-                this._userVerifier.answerQuery(this._queryingService, this._entry.text);
+                    this._userVerifier.answerQuery(this._queryingService, this._entry.text);
-            } else {
+                } else {
-                this._preemptiveAnswer = this._entry.text;
+                    this._preemptiveAnswer = this._entry.text;
-            }
+                }
-        });
+            });
 
         this.actor = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
                                         vertical: true });
         this.actor.connect('destroy', this._onDestroy.bind(this));
         this.actor.connect('key-press-event', (actor, event) => {
-            if (event.get_key_symbol() == Clutter.KEY_Escape)
+                if (event.get_key_symbol() == Clutter.KEY_Escape)
-                this.cancel();
+                    this.cancel();
-            return Clutter.EVENT_PROPAGATE;
+                return Clutter.EVENT_PROPAGATE;
-        });
+            });
 
         this._userWell = new St.Bin({ x_fill: true,
                                       x_align: St.Align.START });
@@ -93,7 +96,7 @@ var AuthPrompt = class {
                          x_align: St.Align.START });
         this._entry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
                                      can_focus: true });
-        ShellEntry.addContextMenu(this._entry, { isPassword: true, actionMode: Shell.ActionMode.NONE });
+        ShellEntry.addContextMenu(this._entry, { isPassword: true });
 
         this.actor.add(this._entry,
                        { expand: true,
@@ -112,7 +115,7 @@ var AuthPrompt = class {
         this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
                                              vertical: false });
         this.actor.add(this._buttonBox,
-                       { expand: true,
+                       { expand:  true,
                          x_align: St.Align.MIDDLE,
                          y_align: St.Align.END });
 
@@ -138,7 +141,7 @@ var AuthPrompt = class {
                                             reactive: true,
                                             can_focus: true,
                                             label: _("Cancel") });
-        this.cancelButton.connect('clicked', () => this.cancel());
+        this.cancelButton.connect('clicked', () => { this.cancel(); });
         this._buttonBox.add(this.cancelButton,
                             { expand: false,
                               x_fill: false,
@@ -157,7 +160,7 @@ var AuthPrompt = class {
                                           reactive: true,
                                           can_focus: true,
                                           label: _("Next") });
-        this.nextButton.connect('clicked', () => this.emit('next'));
+        this.nextButton.connect('clicked', () => { this.emit('next'); });
         this.nextButton.add_style_pseudo_class('default');
         this._buttonBox.add(this.nextButton,
                             { expand: false,
@@ -295,11 +298,12 @@ var AuthPrompt = class {
                                    time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
                                    delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
                                    transition: 'linear',
-                                   onComplete: () => {
+                                   onCompleteScope: this,
-                                       if (wasSpinner) {
+                                   onComplete() {
-                                           if (this._spinner)
+                                      if (wasSpinner) {
-                                               this._spinner.stop();
+                                          if (this._spinner)
-                                       }
+                                              this._spinner.stop();
+                                      }
                                    }
                                  });
             }

js/gdm/batch.js

@@ -44,7 +44,6 @@
  * replaced by something else.
  */
 
-const { GObject } = imports.gi;
 const Signals = imports.signals;
 
 var Task = class {
@@ -125,7 +124,7 @@ var Batch = class extends Task {
     }
 
     process() {
-        throw new GObject.NotImplementedError(`process in ${this.constructor.name}`);
+        throw new Error('Not implemented');
     }
 
     runTask() {
@@ -177,36 +176,36 @@ Signals.addSignalMethods(Batch.prototype);
 
 var ConcurrentBatch = class extends Batch {
     process() {
-        let hold = this.runTask();
+       let hold = this.runTask();
 
-        if (hold) {
+       if (hold) {
-            this.hold.acquireUntilAfter(hold);
+           this.hold.acquireUntilAfter(hold);
-        }
+       }
 
-        // Regardless of the state of the just run task,
+       // Regardless of the state of the just run task,
-        // fire off the next one, so all the tasks can run
+       // fire off the next one, so all the tasks can run
-        // concurrently.
+       // concurrently.
-        this.nextTask();
+       this.nextTask();
     }
 };
 Signals.addSignalMethods(ConcurrentBatch.prototype);
 
 var ConsecutiveBatch = class extends Batch {
     process() {
-        let hold = this.runTask();
+       let hold = this.runTask();
 
-        if (hold && hold.isAcquired()) {
+       if (hold && hold.isAcquired()) {
-            // This task is inhibiting the batch. Wait on it
+           // This task is inhibiting the batch. Wait on it
-            // before processing the next one.
+           // before processing the next one.
-            let signalId = hold.connect('release', () => {
+           let signalId = hold.connect('release', () => {
-                hold.disconnect(signalId);
+               hold.disconnect(signalId);
-                this.nextTask();
+               this.nextTask();
-            });
+           });
-            return;
+           return;
-        } else {
+       } else {
-            // This task finished, process the next one
+           // This task finished, process the next one
-            this.nextTask();
+           this.nextTask();
-        }
+       }
     }
 };
 Signals.addSignalMethods(ConsecutiveBatch.prototype);

js/gdm/fingerprint.js

@@ -1,6 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
 
 const FprintManagerIface = `
 <node>
@@ -23,8 +25,8 @@ function FprintManager() {
 
     try {
         self.init(null);
-    } catch (e) {
+    } catch(e) {
-        log(`Failed to connect to Fprint service: ${e.message}`);
+        log('Failed to connect to Fprint service: ' + e.message);
         return null;
     }
 

js/gdm/loginDialog.js

@@ -16,9 +16,19 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-const { AccountsService, Atk, Clutter, Gdm, Gio,
+const AccountsService = imports.gi.AccountsService;
-        GLib, GObject, Meta, Pango, Shell, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gtk = imports.gi.Gtk;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
+const St = imports.gi.St;
 
 const AuthPrompt = imports.gdm.authPrompt;
 const Batch = imports.gdm.batch;
@@ -43,7 +53,7 @@ var UserListItem = class {
     constructor(user) {
         this.user = user;
         this._userChangedId = this.user.connect('changed',
-                                                this._onUserChanged.bind(this));
+                                                 this._onUserChanged.bind(this));
 
         let layout = new St.BoxLayout({ vertical: true });
         this.actor = new St.Button({ style_class: 'login-dialog-user-list-item',
@@ -150,9 +160,9 @@ Signals.addSignalMethods(UserListItem.prototype);
 
 var UserList = class {
     constructor() {
-        this.actor = new St.ScrollView({ style_class: 'login-dialog-user-list-view' });
+        this.actor = new St.ScrollView({ style_class: 'login-dialog-user-list-view'});
-        this.actor.set_policy(St.PolicyType.NEVER,
+        this.actor.set_policy(Gtk.PolicyType.NEVER,
-                              St.PolicyType.AUTOMATIC);
+                              Gtk.PolicyType.AUTOMATIC);
 
         this._box = new St.BoxLayout({ vertical: true,
                                        style_class: 'login-dialog-user-list',
@@ -173,7 +183,7 @@ var UserList = class {
         if (global.stage.get_key_focus() != this.actor)
             return;
 
-        let focusSet = this.actor.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
+        let focusSet = this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
         if (!focusSet) {
             Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
                 this._moveFocusToItems();
@@ -187,6 +197,8 @@ var UserList = class {
     }
 
     updateStyle(isExpanded) {
+        let tasks = [];
+
         if (isExpanded)
             this._box.add_style_pseudo_class('expanded');
         else
@@ -242,7 +254,7 @@ var UserList = class {
             return;
 
         if (user.locked)
-            return;
+           return;
 
         let userName = user.get_user_name();
 
@@ -259,7 +271,7 @@ var UserList = class {
         item.connect('activate', this._onItemActivated.bind(this));
 
         // Try to keep the focused item front-and-center
-        item.actor.connect('key-focus-in', () => this.scrollToItem(item));
+        item.actor.connect('key-focus-in', () => { this.scrollToItem(item); });
 
         this._moveFocusToItems();
 
@@ -317,17 +329,16 @@ var SessionMenuButton = class {
         this._menu.actor.hide();
 
         this._menu.connect('open-state-changed', (menu, isOpen) => {
-            if (isOpen)
+             if (isOpen)
-                this._button.add_style_pseudo_class('active');
+                 this._button.add_style_pseudo_class('active');
-            else
+             else
-                this._button.remove_style_pseudo_class('active');
+                 this._button.remove_style_pseudo_class('active');
         });
 
-        this._manager = new PopupMenu.PopupMenuManager(this._button,
+        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button });
-                                                       { actionMode: Shell.ActionMode.NONE });
         this._manager.addMenu(this._menu);
 
-        this._button.connect('clicked', () => this._menu.toggle());
+        this._button.connect('clicked', () => { this._menu.toggle(); });
 
         this._items = {};
         this._activeSessionId = null;
@@ -351,11 +362,11 @@ var SessionMenuButton = class {
     }
 
     setActiveSession(sessionId) {
-        if (sessionId == this._activeSessionId)
+         if (sessionId == this._activeSessionId)
-            return;
+             return;
 
-        this._activeSessionId = sessionId;
+         this._activeSessionId = sessionId;
-        this._updateOrnament();
+         this._updateOrnament();
     }
 
     close() {
@@ -401,18 +412,18 @@ var LoginDialog = GObject.registerClass({
         this.connect('destroy', this._onDestroy.bind(this));
         parentActor.add_child(this);
 
-        this._userManager = AccountsService.UserManager.get_default();
+        this._userManager = AccountsService.UserManager.get_default()
         this._gdmClient = new Gdm.Client();
 
         this._settings = new Gio.Settings({ schema_id: GdmUtil.LOGIN_SCREEN_SCHEMA });
 
-        this._settings.connect(`changed::${GdmUtil.BANNER_MESSAGE_KEY}`,
+        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,
                                this._updateBanner.bind(this));
-        this._settings.connect(`changed::${GdmUtil.BANNER_MESSAGE_TEXT_KEY}`,
+        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,
                                this._updateBanner.bind(this));
-        this._settings.connect(`changed::${GdmUtil.DISABLE_USER_LIST_KEY}`,
+        this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,
                                this._updateDisableUserList.bind(this));
-        this._settings.connect(`changed::${GdmUtil.LOGO_KEY}`,
+        this._settings.connect('changed::' + GdmUtil.LOGO_KEY,
                                this._updateLogo.bind(this));
 
         this._textureCache = St.TextureCache.get_default();
@@ -462,8 +473,8 @@ var LoginDialog = GObject.registerClass({
 
         this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',
                                                opacity: 0,
-                                               vscrollbar_policy: St.PolicyType.AUTOMATIC,
+                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,
-                                               hscrollbar_policy: St.PolicyType.NEVER });
+                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
         this.add_child(this._bannerView);
 
         let bannerBox = new St.BoxLayout({ vertical: true });
@@ -479,9 +490,6 @@ var LoginDialog = GObject.registerClass({
         this._logoBin = new St.Widget({ style_class: 'login-dialog-logo-bin',
                                         x_align: Clutter.ActorAlign.CENTER,
                                         y_align: Clutter.ActorAlign.END });
-        this._logoBin.connect('resource-scale-changed', () => {
-            this._updateLogoTexture(this._textureCache, this._logoFile);
-        });
         this.add_child(this._logoBin);
         this._updateLogo();
 
@@ -573,15 +581,19 @@ var LoginDialog = GObject.registerClass({
         // First find out what space the children require
         let bannerAllocation = null;
         let bannerHeight = 0;
+        let bannerWidth = 0;
         if (this._bannerView.visible) {
             bannerAllocation = this._getBannerAllocation(dialogBox, this._bannerView);
             bannerHeight = bannerAllocation.y2 - bannerAllocation.y1;
+            bannerWidth = bannerAllocation.x2 - bannerAllocation.x1;
         }
 
         let authPromptAllocation = null;
+        let authPromptHeight = 0;
         let authPromptWidth = 0;
         if (this._authPrompt.actor.visible) {
             authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt.actor);
+            authPromptHeight = authPromptAllocation.y2 - authPromptAllocation.y1;
             authPromptWidth = authPromptAllocation.x2 - authPromptAllocation.x1;
         }
 
@@ -613,64 +625,64 @@ var LoginDialog = GObject.registerClass({
             let leftOverYSpace = bannerSpace - bannerHeight;
 
             if (leftOverYSpace > 0) {
-                // First figure out how much left over space is up top
+                 // First figure out how much left over space is up top
-                let leftOverTopSpace = leftOverYSpace / 2;
+                 let leftOverTopSpace = leftOverYSpace / 2;
 
-                // Then, shift the banner into the middle of that extra space
+                 // Then, shift the banner into the middle of that extra space
-                let yShift = Math.floor(leftOverTopSpace / 2);
+                 let yShift = Math.floor(leftOverTopSpace / 2);
 
-                bannerAllocation.y1 += yShift;
+                 bannerAllocation.y1 += yShift;
-                bannerAllocation.y2 += yShift;
+                 bannerAllocation.y2 += yShift;
             } else {
-                // Then figure out how much space there would be if we switched to a
+                 // Then figure out how much space there would be if we switched to a
-                // wide layout with banner on one side and authprompt on the other.
+                 // wide layout with banner on one side and authprompt on the other.
-                let leftOverXSpace = dialogWidth - authPromptWidth;
+                 let leftOverXSpace = dialogWidth - authPromptWidth;
 
-                // In a wide view, half of the available space goes to the banner,
+                 // In a wide view, half of the available space goes to the banner,
-                // and the other half goes to the margins.
+                 // and the other half goes to the margins.
-                let wideBannerWidth = leftOverXSpace / 2;
+                 let wideBannerWidth = leftOverXSpace / 2;
-                let wideSpacing  = leftOverXSpace - wideBannerWidth;
+                 let wideSpacing  = leftOverXSpace - wideBannerWidth;
 
-                // If we do go with a wide layout, we need there to be at least enough
+                 // If we do go with a wide layout, we need there to be at least enough
-                // space for the banner and the auth prompt to be the same width,
+                 // space for the banner and the auth prompt to be the same width,
-                // so it doesn't look unbalanced.
+                 // so it doesn't look unbalanced.
-                if (authPromptWidth > 0 && wideBannerWidth > authPromptWidth) {
+                 if (authPromptWidth > 0 && wideBannerWidth > authPromptWidth) {
-                    let centerX = dialogBox.x1 + dialogWidth / 2;
+                     let centerX = dialogBox.x1 + dialogWidth / 2;
-                    let centerY = dialogBox.y1 + dialogHeight / 2;
+                     let centerY = dialogBox.y1 + dialogHeight / 2;
 
-                    // A small portion of the spacing goes down the center of the
+                     // A small portion of the spacing goes down the center of the
-                    // screen to help delimit the two columns of the wide view
+                     // screen to help delimit the two columns of the wide view
-                    let centerGap = wideSpacing / 8;
+                     let centerGap = wideSpacing / 8;
 
-                    // place the banner along the left edge of the center margin
+                     // place the banner along the left edge of the center margin
-                    bannerAllocation.x2 = Math.floor(centerX - centerGap / 2);
+                     bannerAllocation.x2 = Math.floor(centerX - centerGap / 2);
-                    bannerAllocation.x1 = Math.floor(bannerAllocation.x2 - wideBannerWidth);
+                     bannerAllocation.x1 = Math.floor(bannerAllocation.x2 - wideBannerWidth);
 
-                    // figure out how tall it would like to be and try to accommodate
+                     // figure out how tall it would like to be and try to accomodate
-                    // but don't let it get too close to the logo
+                     // but don't let it get too close to the logo
-                    let [wideMinHeight, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);
+                     let [wideMinHeight, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);
 
-                    let maxWideHeight = dialogHeight - 3 * logoHeight;
+                     let maxWideHeight = dialogHeight - 3 * logoHeight;
-                    wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);
+                     wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);
-                    bannerAllocation.y1 = Math.floor(centerY - wideBannerHeight / 2);
+                     bannerAllocation.y1 = Math.floor(centerY - wideBannerHeight / 2);
-                    bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;
+                     bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;
 
-                    // place the auth prompt along the right edge of the center margin
+                     // place the auth prompt along the right edge of the center margin
-                    authPromptAllocation.x1 = Math.floor(centerX + centerGap / 2);
+                     authPromptAllocation.x1 = Math.floor(centerX + centerGap / 2);
-                    authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;
+                     authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;
-                } else {
+                 } else {
-                    // If we aren't going to do a wide view, then we need to limit
+                     // If we aren't going to do a wide view, then we need to limit
-                    // the height of the banner so it will present scrollbars
+                     // the height of the banner so it will present scrollbars
 
-                    // First figure out how much space there is without the banner
+                     // First figure out how much space there is without the banner
-                    leftOverYSpace += bannerHeight;
+                     leftOverYSpace += bannerHeight;
 
-                    // Then figure out how much of that space is up top
+                     // Then figure out how much of that space is up top
-                    let availableTopSpace = Math.floor(leftOverYSpace / 2);
+                     let availableTopSpace = Math.floor(leftOverYSpace / 2);
 
-                    // Then give all of that space to the banner
+                     // Then give all of that space to the banner
-                    bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;
+                     bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;
-                }
+                 }
             }
         } else if (userSelectionAllocation) {
             // Grow the user list to fill the space
@@ -775,12 +787,11 @@ var LoginDialog = GObject.registerClass({
             return;
 
         this._logoBin.destroy_all_children();
-        if (this._logoFile && this._logoBin.resource_scale > 0) {
+        if (this._logoFile) {
             let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
             this._logoBin.add_child(this._textureCache.load_file_async(this._logoFile,
                                                                        -1, _LOGO_ICON_HEIGHT,
-                                                                       scaleFactor,
+                                                                       scaleFactor));
-                                                                       this._logoBin.resource_scale));
         }
     }
 
@@ -845,10 +856,10 @@ var LoginDialog = GObject.registerClass({
     _shouldShowSessionMenuButton() {
         if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFYING &&
             this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFICATION_FAILED)
-            return false;
+          return false;
 
         if (this._user && this._user.is_loaded && this._user.is_logged_in())
-            return false;
+          return false;
 
         return true;
     }
@@ -913,7 +924,7 @@ var LoginDialog = GObject.registerClass({
                          { opacity: 255,
                            time: _FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad',
-                           onUpdate: () => {
+                           onUpdate() {
                                let children = Main.layoutManager.uiGroup.get_children();
 
                                for (let i = 0; i < children.length; i++) {
@@ -921,10 +932,12 @@ var LoginDialog = GObject.registerClass({
                                        children[i].opacity = this.opacity;
                                }
                            },
-                           onComplete: () => {
+                           onUpdateScope: this,
+                           onComplete() {
                                if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
                                    this._authPrompt.reset();
-                           } });
+                           },
+                           onCompleteScope: this });
     }
 
     _gotGreeterSessionProxy(proxy) {
@@ -941,7 +954,7 @@ var LoginDialog = GObject.registerClass({
                          { opacity: 0,
                            time: _FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad',
-                           onUpdate: () => {
+                           onUpdate() {
                                let children = Main.layoutManager.uiGroup.get_children();
 
                                for (let i = 0; i < children.length; i++) {
@@ -949,20 +962,22 @@ var LoginDialog = GObject.registerClass({
                                        children[i].opacity = this.opacity;
                                }
                            },
-                           onComplete: () => {
+                           onUpdateScope: this,
+                           onComplete() {
                                this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
-                           } });
+                           },
+                           onCompleteScope: this });
     }
 
     _onSessionOpened(client, serviceName) {
-        this._authPrompt.finish(() => this._startSession(serviceName));
+        this._authPrompt.finish(() => { this._startSession(serviceName); });
     }
 
     _waitForItemForUser(userName) {
         let item = this._userList.getItemFromUserName(userName);
 
         if (item)
-            return null;
+          return null;
 
         let hold = new Batch.Hold();
         let signalId = this._userList.connect('item-added',
@@ -973,7 +988,7 @@ var LoginDialog = GObject.registerClass({
                     hold.release();
             });
 
-        hold.connect('release', () => this._userList.disconnect(signalId));
+        hold.connect('release', () => { this._userList.disconnect(signalId); });
 
         return hold;
     }
@@ -1037,7 +1052,6 @@ var LoginDialog = GObject.registerClass({
                              return this._blockTimedLoginUntilIdle();
                          } else {
                              animationTime = delay;
-                             return null;
                          }
                      },
 
@@ -1073,12 +1087,12 @@ var LoginDialog = GObject.registerClass({
 
         // Restart timed login on user interaction
         global.stage.connect('captured-event', (actor, event) => {
-            if (event.type() == Clutter.EventType.KEY_PRESS ||
+           if (event.type() == Clutter.EventType.KEY_PRESS ||
                event.type() == Clutter.EventType.BUTTON_PRESS) {
-                this._startTimedLogin(userName, seconds);
+               this._startTimedLogin(userName, seconds);
-            }
+           }
 
-            return Clutter.EVENT_PROPAGATE;
+           return Clutter.EVENT_PROPAGATE;
         });
     }
 

js/gdm/realmd.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
@@ -19,7 +20,7 @@ var Manager = class {
         this._aggregateProvider = Provider(Gio.DBus.system,
                                            'org.freedesktop.realmd',
                                            '/org/freedesktop/realmd',
-                                           this._reloadRealms.bind(this));
+                                           this._reloadRealms.bind(this))
         this._realms = {};
 
         this._signalId = this._aggregateProvider.connect('g-properties-changed',
@@ -36,10 +37,10 @@ var Manager = class {
             return;
 
         for (let i = 0; i < realmPaths.length; i++) {
-            Realm(Gio.DBus.system,
+            let realm = Realm(Gio.DBus.system,
-                  'org.freedesktop.realmd',
+                              'org.freedesktop.realmd',
-                  realmPaths[i],
+                              realmPaths[i],
-                  this._onRealmLoaded.bind(this));
+                              this._onRealmLoaded.bind(this));
         }
     }
 
@@ -98,10 +99,10 @@ var Manager = class {
         Service(Gio.DBus.system,
                 'org.freedesktop.realmd',
                 '/org/freedesktop/realmd',
-                service => service.ReleaseRemote());
+                service => { service.ReleaseRemote(); });
         this._aggregateProvider.disconnect(this._signalId);
         this._realms = { };
         this._updateLoginFormat();
     }
 };
-Signals.addSignalMethods(Manager.prototype);
+Signals.addSignalMethods(Manager.prototype)

js/gdm/util.js

@@ -1,13 +1,18 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Mainloop = imports.mainloop;
 const Signals = imports.signals;
+const St = imports.gi.St;
 
 const Batch = imports.gdm.batch;
 const Fprint = imports.gdm.fingerprint;
 const OVirt = imports.gdm.oVirt;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
+const ShellEntry = imports.ui.shellEntry;
 const SmartcardManager = imports.misc.smartcardManager;
 const Tweener = imports.ui.tweener;
 
@@ -30,7 +35,7 @@ var LOGO_KEY = 'logo';
 var DISABLE_USER_LIST_KEY = 'disable-user-list';
 
 // Give user 48ms to read each character of a PAM message
-var USER_READ_TIME = 48;
+var USER_READ_TIME = 48
 
 var MessageType = {
     NONE: 0,
@@ -342,7 +347,7 @@ var ShellUserVerifier = class {
         try {
             this._clearUserVerifier();
             this._userVerifier = client.open_reauthentication_channel_finish(result);
-        } catch (e) {
+        } catch(e) {
             if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                 return;
             if (e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
@@ -369,7 +374,7 @@ var ShellUserVerifier = class {
         try {
             this._clearUserVerifier();
             this._userVerifier = client.get_user_verifier_finish(result);
-        } catch (e) {
+        } catch(e) {
             if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                 return;
             this._reportInitError('Failed to obtain user verifier', e);
@@ -423,31 +428,36 @@ var ShellUserVerifier = class {
     _startService(serviceName) {
         this._hold.acquire();
         if (this._userName) {
-            this._userVerifier.call_begin_verification_for_user(serviceName, this._userName, this._cancellable, (obj, result) => {
+           this._userVerifier.call_begin_verification_for_user(serviceName,
-                try {
+                                                               this._userName,
-                    obj.call_begin_verification_for_user_finish(result);
+                                                               this._cancellable,
-                } catch (e) {
+                                                               (obj, result) => {
-                    if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+               try {
-                        return;
+                   obj.call_begin_verification_for_user_finish(result);
-                    this._reportInitError('Failed to start verification for user', e);
+               } catch(e) {
-                    return;
+                   if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                }
+                       return;
+                   this._reportInitError('Failed to start verification for user', e);
+                   return;
+               }
 
-                this._hold.release();
+               this._hold.release();
-            });
+           });
         } else {
-            this._userVerifier.call_begin_verification(serviceName, this._cancellable, (obj, result) => {
+           this._userVerifier.call_begin_verification(serviceName,
-                try {
+                                                      this._cancellable,
-                    obj.call_begin_verification_finish(result);
+                                                      (obj, result) => {
-                } catch (e) {
+               try {
-                    if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                   obj.call_begin_verification_finish(result);
-                        return;
+               } catch(e) {
-                    this._reportInitError('Failed to start verification', e);
+                   if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                    return;
+                       return;
-                }
+                   this._reportInitError('Failed to start verification', e);
+                   return;
+               }
 
-                this._hold.release();
+               this._hold.release();
-            });
+           });
         }
     }
 

js/js-resources.gresource.xml

@@ -64,7 +64,6 @@
     <file>ui/keyboard.js</file>
     <file>ui/layout.js</file>
     <file>ui/lightbox.js</file>
-    <file>ui/locatePointer.js</file>
     <file>ui/lookingGlass.js</file>
     <file>ui/magnifier.js</file>
     <file>ui/magnifierDBus.js</file>
@@ -79,14 +78,11 @@
     <file>ui/overview.js</file>
     <file>ui/overviewControls.js</file>
     <file>ui/padOsd.js</file>
-    <file>ui/pageIndicators.js</file>
     <file>ui/panel.js</file>
     <file>ui/panelMenu.js</file>
-    <file>ui/pointerA11yTimeout.js</file>
     <file>ui/pointerWatcher.js</file>
     <file>ui/popupMenu.js</file>
     <file>ui/remoteSearch.js</file>
-    <file>ui/ripples.js</file>
     <file>ui/runDialog.js</file>
     <file>ui/screenShield.js</file>
     <file>ui/screencast.js</file>
@@ -123,7 +119,6 @@
 
     <file>ui/status/accessibility.js</file>
     <file>ui/status/brightness.js</file>
-    <file>ui/status/dwellClick.js</file>
     <file>ui/status/location.js</file>
     <file>ui/status/keyboard.js</file>
     <file>ui/status/nightLight.js</file>

js/misc/extensionUtils.js

@@ -3,7 +3,6 @@
 // Common utils for the extension system and the extension
 // preferences tool
 
-const Gettext = imports.gettext;
 const Signals = imports.signals;
 
 const Gio = imports.gi.Gio;
@@ -31,7 +30,7 @@ function getCurrentExtension() {
     // Search for an occurrence of an extension stack frame
     // Start at 1 because 0 is the stack frame of this function
     for (let i = 1; i < stack.length; i++) {
-        if (stack[i].includes('/gnome-shell/extensions/')) {
+        if (stack[i].indexOf('/gnome-shell/extensions/') > -1) {
             extensionStackLine = stack[i];
             break;
         }
@@ -64,66 +63,6 @@ function getCurrentExtension() {
     return null;
 }
 
-/**
- * initTranslations:
- * @domain: (optional): the gettext domain to use
- *
- * Initialize Gettext to load translations from extensionsdir/locale.
- * If @domain is not provided, it will be taken from metadata['gettext-domain']
- */
-function initTranslations(domain) {
-    let extension = getCurrentExtension();
-
-    if (!extension)
-        throw new Error('initTranslations() can only be called from extensions');
-
-    domain = domain || extension.metadata['gettext-domain'];
-
-    // Expect USER extensions to have a locale/ subfolder, otherwise assume a
-    // SYSTEM extension that has been installed in the same prefix as the shell
-    let localeDir = extension.dir.get_child('locale');
-    if (localeDir.query_exists(null))
-        Gettext.bindtextdomain(domain, localeDir.get_path());
-    else
-        Gettext.bindtextdomain(domain, Config.LOCALEDIR);
-}
-
-/**
- * getSettings:
- * @schema: (optional): the GSettings schema id
- *
- * Builds and returns a GSettings schema for @schema, using schema files
- * in extensionsdir/schemas. If @schema is omitted, it is taken from
- * metadata['settings-schema'].
- */
-function getSettings(schema) {
-    let extension = getCurrentExtension();
-
-    if (!extension)
-        throw new Error('getSettings() can only be called from extensions');
-
-    schema = schema || extension.metadata['settings-schema'];
-
-    const GioSSS = Gio.SettingsSchemaSource;
-
-    // Expect USER extensions to have a schemas/ subfolder, otherwise assume a
-    // SYSTEM extension that has been installed in the same prefix as the shell
-    let schemaDir = extension.dir.get_child('schemas');
-    let schemaSource;
-    if (schemaDir.query_exists(null))
-        schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
-                                                 GioSSS.get_default(),
-                                                 false);
-    else
-        schemaSource = GioSSS.get_default();
-
-    let schemaObj = schemaSource.lookup(schema, true);
-    if (!schemaObj)
-        throw new Error(`Schema ${schema} could not be found for extension ${extension.metadata.uuid}. Please check your installation`);
-
-    return new Gio.Settings({ settings_schema: schemaObj });
-}
-
 /**
  * versionCheck:
  * @required: an array of versions we're compatible with
@@ -162,6 +101,8 @@ function isOutOfDate(extension) {
 }
 
 function createExtensionObject(uuid, dir, type) {
+    let info;
+
     let metadataFile = dir.get_child('metadata.json');
     if (!metadataFile.query_exists(null)) {
         throw new Error('Missing metadata.json');
@@ -173,25 +114,25 @@ function createExtensionObject(uuid, dir, type) {
         if (metadataContents instanceof Uint8Array)
             metadataContents = imports.byteArray.toString(metadataContents);
     } catch (e) {
-        throw new Error(`Failed to load metadata.json: ${e}`);
+        throw new Error('Failed to load metadata.json: ' + e);
     }
     let meta;
     try {
         meta = JSON.parse(metadataContents);
     } catch (e) {
-        throw new Error(`Failed to parse metadata.json: ${e}`);
+        throw new Error('Failed to parse metadata.json: ' + e);
     }
 
     let requiredProperties = ['uuid', 'name', 'description', 'shell-version'];
     for (let i = 0; i < requiredProperties.length; i++) {
         let prop = requiredProperties[i];
         if (!meta[prop]) {
-            throw new Error(`missing "${prop}" property in metadata.json`);
+            throw new Error('missing "' + prop + '" property in metadata.json');
         }
     }
 
     if (uuid != meta.uuid) {
-        throw new Error(`uuid "${meta.uuid}" from metadata.json does not match directory name "${uuid}"`);
+        throw new Error('uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + uuid + '"');
     }
 
     let extension = {};
@@ -235,7 +176,7 @@ var ExtensionFinder = class {
                                                        : ExtensionType.SYSTEM;
         try {
             extension = createExtensionObject(uuid, extensionDir, type);
-        } catch (e) {
+        } catch(e) {
             logError(e, 'Could not load extension %s'.format(uuid));
             return;
         }

js/misc/fileUtils.js

@@ -1,7 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Config = imports.misc.config;
+const Params = imports.misc.params;
 
 function collectFromDatadirs(subdir, includeUserDir, processFile) {
     let dataDirs = GLib.get_system_data_dirs();
@@ -36,7 +38,7 @@ function recursivelyDeleteDir(dir, deleteParent) {
     let children = dir.enumerate_children('standard::name,standard::type',
                                           Gio.FileQueryInfoFlags.NONE, null);
 
-    let info;
+    let info, child;
     while ((info = children.next_file(null)) != null) {
         let type = info.get_file_type();
         let child = dir.get_child(info.get_name());
@@ -57,7 +59,7 @@ function recursivelyMoveDir(srcDir, destDir) {
     if (!destDir.query_exists(null))
         destDir.make_directory_with_parents(null);
 
-    let info;
+    let info, child;
     while ((info = children.next_file(null)) != null) {
         let type = info.get_file_type();
         let srcChild = srcDir.get_child(info.get_name());
@@ -86,11 +88,11 @@ function loadInterfaceXML(iface) {
     try {
         let [ok, bytes] = f.load_contents(null);
         if (bytes instanceof Uint8Array)
-            xml = imports.byteArray.toString(bytes);
+            xml = imports.byteArray.toString(bytes)
         else
             xml = bytes.toString();
     } catch (e) {
-        log(`Failed to load D-Bus interface ${iface}`);
+        log('Failed to load D-Bus interface ' + iface);
     }
 
     return xml;

js/misc/gnomeSession.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
+const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 

js/misc/history.js

@@ -18,7 +18,7 @@ var HistoryManager = class {
         this._historyIndex = 0;
         if (this._key) {
             this._history = global.settings.get_strv(this._key);
-            global.settings.connect(`changed::${this._key}`,
+            global.settings.connect('changed::' + this._key,
                                     this._historyChanged.bind(this));
 
         } else {
@@ -66,7 +66,7 @@ var HistoryManager = class {
             this._indexChanged();
         }
 
-        return this._historyIndex ? this._history[this._historyIndex - 1] : null;
+        return this._historyIndex ? this._history[this._historyIndex -1] : null;
     }
 
     addItem(input) {

js/misc/ibusManager.js

@@ -1,9 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Gio, GLib, IBus } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 
+const IBus = imports.gi.IBus;
 const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
 
 // Ensure runtime version matches
@@ -42,7 +44,7 @@ var IBusManager = class {
         this._candidatePopup = new IBusCandidatePopup.CandidatePopup();
 
         this._panelService = null;
-        this._engines = new Map();
+        this._engines = {};
         this._ready = false;
         this._registerPropertiesId = 0;
         this._currentEngineName = null;
@@ -62,8 +64,8 @@ var IBusManager = class {
         try {
             Gio.Subprocess.new(['ibus-daemon', '--xim', '--panel', 'disable'],
                                Gio.SubprocessFlags.NONE);
-        } catch (e) {
+        } catch(e) {
-            log(`Failed to launch ibus-daemon: ${e.message}`);
+            log('Failed to launch ibus-daemon: ' + e.message);
         }
     }
 
@@ -73,7 +75,7 @@ var IBusManager = class {
 
         this._panelService = null;
         this._candidatePopup.setPanelService(null);
-        this._engines.clear();
+        this._engines = {};
         this._ready = false;
         this._registerPropertiesId = 0;
         this._currentEngineName = null;
@@ -96,7 +98,7 @@ var IBusManager = class {
         if (enginesList) {
             for (let i = 0; i < enginesList.length; ++i) {
                 let name = enginesList[i].get_name();
-                this._engines.set(name, enginesList[i]);
+                this._engines[name] = enginesList[i];
             }
             this._updateReadiness();
         } else {
@@ -119,7 +121,7 @@ var IBusManager = class {
                 if (!GLib.str_has_suffix(path, '/InputContext_1'))
                     this.emit ('focus-in');
             });
-            this._panelService.connect('focus-out', () => this.emit('focus-out'));
+            this._panelService.connect('focus-out', () => { this.emit('focus-out'); });
 
             try {
                 // IBus versions older than 1.5.10 have a bug which
@@ -138,7 +140,7 @@ var IBusManager = class {
                     engine = this._ibus.get_global_engine_async_finish(result);
                     if (!engine)
                         return;
-                } catch (e) {
+                } catch(e) {
                     return;
                 }
                 this._engineChanged(this._ibus, engine.get_name());
@@ -150,7 +152,8 @@ var IBusManager = class {
     }
 
     _updateReadiness() {
-        this._ready = this._engines.size > 0 && this._panelService != null;
+        this._ready = (Object.keys(this._engines).length > 0 &&
+                       this._panelService != null);
         this.emit('ready', this._ready);
     }
 
@@ -188,10 +191,10 @@ var IBusManager = class {
     }
 
     getEngineDesc(id) {
-        if (!this._ready || !this._engines.has(id))
+        if (!this._ready || !this._engines.hasOwnProperty(id))
             return null;
 
-        return this._engines.get(id);
+        return this._engines[id];
     }
 
     setEngine(id, callback) {

js/misc/inputMethod.js

@@ -1,9 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-const { Clutter, GLib, GObject, IBus } = imports.gi;
+const Clutter = imports.gi.Clutter;
-
+const GObject = imports.gi.GObject;
+const IBus = imports.gi.IBus;
 const Keyboard = imports.ui.status.keyboard;
-
+const Signals = imports.signals;
-var HIDE_PANEL_TIME = 50;
 
 var InputMethod = GObject.registerClass(
 class InputMethod extends Clutter.InputMethod {
@@ -15,7 +15,6 @@ class InputMethod extends Clutter.InputMethod {
         this._preeditStr = '';
         this._preeditPos = 0;
         this._preeditVisible = false;
-        this._hidePanelId = 0;
         this._ibus = IBus.Bus.new_async();
         this._ibus.connect('connected', this._onConnected.bind(this));
         this._ibus.connect('disconnected', this._clear.bind(this));
@@ -74,7 +73,7 @@ class InputMethod extends Clutter.InputMethod {
         this._context = null;
         this._hints = 0;
         this._purpose = 0;
-        this._preeditStr = '';
+        this._preeditStr = ''
         this._preeditPos = 0;
         this._preeditVisible = false;
     }
@@ -139,11 +138,6 @@ class InputMethod extends Clutter.InputMethod {
             this._updateCapabilities();
             this._emitRequestSurrounding();
         }
-
-        if (this._hidePanelId) {
-            GLib.source_remove(this._hidePanelId);
-            this._hidePanelId = 0;
-        }
     }
 
     vfunc_focus_out() {
@@ -158,12 +152,6 @@ class InputMethod extends Clutter.InputMethod {
             this.set_preedit_text(null, 0);
             this._preeditStr = null;
         }
-
-        this._hidePanelId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, HIDE_PANEL_TIME, () => {
-            this.set_input_panel_state(Clutter.InputPanelState.OFF);
-            this._hidePanelId = 0;
-            return GLib.SOURCE_REMOVE;
-        });
     }
 
     vfunc_reset() {
@@ -262,7 +250,7 @@ class InputMethod extends Clutter.InputMethod {
                                                       let retval = context.process_key_event_async_finish(res);
                                                       this.notify_key_event(event, retval);
                                                   } catch (e) {
-                                                      log(`Error processing key on IM: ${e.message}`);
+                                                      log('Error processing key on IM: ' + e.message);
                                                   }
                                               });
         return true;

js/misc/introspect.js

@@ -1,4 +1,7 @@
-const { Gio, GLib, Meta, Shell } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
 
 const INTROSPECT_SCHEMA = 'org.gnome.shell';
 const INTROSPECT_KEY = 'introspect';
@@ -42,20 +45,17 @@ var IntrospectService = class {
     }
 
     _isStandaloneApp(app) {
+        let windows = app.get_windows();
+
         return app.get_windows().some(w => w.transient_for == null);
     }
 
     _isIntrospectEnabled() {
-        return this._settings.get_boolean(INTROSPECT_KEY);
+       return this._settings.get_boolean(INTROSPECT_KEY);
     }
 
     _isSenderWhitelisted(sender) {
-        return APP_WHITELIST.includes(sender);
+       return APP_WHITELIST.includes(sender);
-    }
-
-    _getSandboxedAppId(app) {
-        let ids = app.get_windows().map(w => w.get_sandboxed_app_id());
-        return ids.find(id => id != null);
     }
 
     _syncRunningApplications() {
@@ -79,10 +79,6 @@ var IntrospectService = class {
                 newActiveApplication = app.get_id();
             }
 
-            let sandboxedAppId = this._getSandboxedAppId(app);
-            if (sandboxedAppId)
-                appInfo['sandboxed-app-id'] = new GLib.Variant('s', sandboxedAppId);
-
             newRunningApplications[app.get_id()] = appInfo;
         }
 
@@ -144,7 +140,6 @@ var IntrospectService = class {
                 let frameRect = window.get_frame_rect();
                 let title = window.get_title();
                 let wmClass = window.get_wm_class();
-                let sandboxedAppId = window.get_sandboxed_app_id();
 
                 windowsList[windowId] = {
                     'app-id': GLib.Variant.new('s', app.get_id()),
@@ -161,10 +156,6 @@ var IntrospectService = class {
 
                 if (wmClass != null)
                     windowsList[windowId]['wm-class'] = GLib.Variant.new('s', wmClass);
-
-                if (sandboxedAppId != null)
-                    windowsList[windowId]['sandboxed-app-id'] =
-                        GLib.Variant.new('s', sandboxedAppId);
             }
         }
         invocation.return_value(new GLib.Variant('(a{ta{sv}})', [windowsList]));

js/misc/jsParse.js

@@ -51,14 +51,14 @@ function getCompletions(text, commandHeader, globalCompletionList) {
 // if we encounter anything that isn't a letter, '.', ')', or ']',
 // we should stop parsing.
 function isStopChar(c) {
-    return !c.match(/[\w.)\]]/);
+    return !c.match(/[\w\.\)\]]/);
 }
 
 // Given the ending position of a quoted string, find where it starts
 function findMatchingQuote(expr, offset) {
     let quoteChar = expr.charAt(offset);
     for (let i = offset - 1; i >= 0; --i) {
-        if (expr.charAt(i) == quoteChar && expr.charAt(i - 1) != '\\') {
+        if (expr.charAt(i) == quoteChar && expr.charAt(i-1) != '\\'){
             return i;
         }
     }
@@ -68,7 +68,7 @@ function findMatchingQuote(expr, offset) {
 // Given the ending position of a regex, find where it starts
 function findMatchingSlash(expr, offset) {
     for (let i = offset - 1; i >= 0; --i) {
-        if (expr.charAt(i) == '/' && expr.charAt(i - 1) != '\\') {
+        if (expr.charAt(i) == '/' && expr.charAt(i-1) != '\\'){
             return i;
         }
     }
@@ -81,7 +81,7 @@ function findMatchingSlash(expr, offset) {
 // findMatchingBrace("[(])", 3) returns 1.
 function findMatchingBrace(expr, offset) {
     let closeBrace = expr.charAt(offset);
-    let openBrace = ({ ')': '(', ']': '[' })[closeBrace];
+    let openBrace = ({')': '(', ']': '['})[closeBrace];
 
     function findTheBrace(expr, offset) {
         if (offset < 0) {
@@ -117,11 +117,11 @@ function getExpressionOffset(expr, offset) {
     while (offset >= 0) {
         let currChar = expr.charAt(offset);
 
-        if (isStopChar(currChar)) {
+        if (isStopChar(currChar)){
             return offset + 1;
         }
 
-        if (currChar.match(/[)\]]/)) {
+        if (currChar.match(/[\)\]]/)) {
             offset = findMatchingBrace(expr, offset);
         }
 
@@ -159,7 +159,7 @@ function getPropertyNamesFromExpression(expr, commandHeader) {
     let obj = {};
     if (!isUnsafeExpression(expr)) {
         try {
-            obj = eval(commandHeader + expr);
+                obj = eval(commandHeader + expr);
         } catch (e) {
             return [];
         }
@@ -168,7 +168,7 @@ function getPropertyNamesFromExpression(expr, commandHeader) {
     }
 
     let propsUnique = {};
-    if (typeof obj === 'object') {
+    if (typeof obj === 'object'){
         let allProps = getAllProps(obj);
         // Get only things we are allowed to complete following a '.'
         allProps = allProps.filter( isValidPropertyName );

js/misc/keyboardManager.js

@@ -1,6 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { GLib, GnomeDesktop, Meta } = imports.gi;
+const GLib = imports.gi.GLib;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const Meta = imports.gi.Meta;
 
 const Main = imports.ui.main;
 
@@ -60,7 +62,7 @@ var KeyboardManager = class {
             this._currentKeymap.options == options)
             return;
 
-        this._currentKeymap = { layouts, variants, options };
+        this._currentKeymap = {layouts, variants, options};
         Meta.get_backend().set_keymap(layouts, variants, options);
     }
 
@@ -125,7 +127,7 @@ var KeyboardManager = class {
 
     _getLocaleLayout() {
         let locale = GLib.get_language_names()[0];
-        if (!locale.includes('_'))
+        if (locale.indexOf('_') == -1)
             locale = DEFAULT_LOCALE;
 
         let [found, , id] = GnomeDesktop.get_input_source_from_locale(locale);

js/misc/loginManager.js

@@ -1,6 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { GLib, Gio } = imports.gi;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
@@ -43,33 +46,11 @@ function canLock() {
 
         let version = result.deep_unpack()[0].deep_unpack();
         return haveSystemd() && versionCompare('3.5.91', version);
-    } catch (e) {
+    } catch(e) {
         return false;
     }
 }
 
-
-function registerSessionWithGDM() {
-    log("Registering session with GDM");
-    Gio.DBus.system.call('org.gnome.DisplayManager',
-                         '/org/gnome/DisplayManager/Manager',
-                         'org.gnome.DisplayManager.Manager',
-                         'RegisterSession',
-                         GLib.Variant.new('(a{sv})', [{}]), null,
-                         Gio.DBusCallFlags.NONE, -1, null,
-        (source, result) => {
-            try {
-                source.call_finish(result);
-            } catch (e) {
-                if (!e.matches(Gio.DBusError, Gio.DBusError.UNKNOWN_METHOD))
-                    log(`Error registering session with GDM: ${e.message}`);
-                else
-                    log("Not calling RegisterSession(): method not exported, GDM too old?");
-            }
-        }
-    );
-}
-
 let _loginManager = null;
 
 /**
@@ -185,7 +166,7 @@ var LoginManagerSystemd = class {
                     let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result);
                     fd = fdList.steal_fds()[0];
                     callback(new Gio.UnixInputStream({ fd: fd }));
-                } catch (e) {
+                } catch(e) {
                     logError(e, "Error getting systemd inhibitor");
                     callback(null);
                 }

js/misc/modemManager.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Gio, NMA } = imports.gi;
+const Gio = imports.gi.Gio;
+const NMA = imports.gi.NMA;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
@@ -26,33 +27,33 @@ function _getMobileProvidersDatabase() {
 }
 
 // _findProviderForMccMnc:
-// @operatorName: operator name
+// @operator_name: operator name
-// @operatorCode: operator code
+// @operator_code: operator code
 //
 // Given an operator name string (which may not be a real operator name) and an
 // operator code string, tries to find a proper operator name to display.
 //
-function _findProviderForMccMnc(operatorName, operatorCode) {
+function _findProviderForMccMnc(operator_name, operator_code) {
-    if (operatorName) {
+    if (operator_name) {
-        if (operatorName.length != 0 &&
+        if (operator_name.length != 0 &&
-            (operatorName.length > 6 || operatorName.length < 5)) {
+            (operator_name.length > 6 || operator_name.length < 5)) {
             // this looks like a valid name, i.e. not an MCCMNC (that some
             // devices return when not yet connected
-            return operatorName;
+            return operator_name;
         }
 
-        if (isNaN(parseInt(operatorName))) {
+        if (isNaN(parseInt(operator_name))) {
             // name is definitely not a MCCMNC, so it may be a name
             // after all; return that
-            return operatorName;
+            return operator_name;
         }
     }
 
     let needle;
-    if ((!operatorName || operatorName.length == 0) && operatorCode)
+    if ((!operator_name || operator_name.length == 0) && operator_code)
-        needle = operatorCode;
+        needle = operator_code;
-    else if (operatorName && (operatorName.length == 6 || operatorName.length == 5))
+    else if (operator_name && (operator_name.length == 6 || operator_name.length == 5))
-        needle = operatorName;
+        needle = operator_name;
     else // nothing to search
         return null;
 
@@ -71,7 +72,7 @@ function _findProviderForMccMnc(operatorName, operatorCode) {
 // Tries to find the operator name corresponding to the given SID
 //
 function _findProviderForSid(sid) {
-    if (!sid)
+    if (sid == 0)
         return null;
 
     let mpd = _getMobileProvidersDatabase();
@@ -173,7 +174,7 @@ var ModemCdma = class {
             } else {
                 let [bandClass, band, sid] = result;
 
-                this.operator_name = _findProviderForSid(sid);
+                this.operator_name = _findProviderForSid(sid)
             }
             this.emit('notify::operator-name');
         });
@@ -230,17 +231,17 @@ var BroadbandModem = class {
     }
 
     _reloadOperatorName() {
-        let newName = "";
+        let new_name = "";
         if (this.operator_name_3gpp && this.operator_name_3gpp.length > 0)
-            newName += this.operator_name_3gpp;
+            new_name += this.operator_name_3gpp;
 
         if (this.operator_name_cdma && this.operator_name_cdma.length > 0) {
-            if (newName != "")
+            if (new_name != "")
-                newName += ", ";
+                new_name += ", ";
-            newName += this.operator_name_cdma;
+            new_name += this.operator_name_cdma;
         }
 
-        this.operator_name = newName;
+        this.operator_name = new_name;
         this.emit('notify::operator-name');
     }
 

js/misc/objectManager.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Params = imports.misc.params;
 const Signals = imports.signals;
 
@@ -77,51 +78,54 @@ var ObjectManager = class {
         let info = this._interfaceInfos[interfaceName];
 
         if (!info) {
-            if (onFinished)
+           if (onFinished)
-                onFinished();
+               onFinished();
-            return;
+           return;
         }
 
         let proxy = new Gio.DBusProxy({ g_connection: this._connection,
-                                        g_name: this._serviceName,
+                                       g_name: this._serviceName,
-                                        g_object_path: objectPath,
+                                       g_object_path: objectPath,
-                                        g_interface_name: interfaceName,
+                                       g_interface_name: interfaceName,
-                                        g_interface_info: info,
+                                       g_interface_info: info,
-                                        g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START });
+                                       g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START });
 
-        proxy.init_async(GLib.PRIORITY_DEFAULT, this._cancellable, (initable, result) => {
+        proxy.init_async(GLib.PRIORITY_DEFAULT,
-            try {
+                         this._cancellable,
-                initable.init_finish(result);
+                         (initable, result) => {
-            } catch (e) {
+               let error = null;
-                logError(e, `could not initialize proxy for interface ${interfaceName}`);
+               try {
+                   initable.init_finish(result);
+               } catch(e) {
+                   logError(e, 'could not initialize proxy for interface ' + interfaceName);
 
-                if (onFinished)
+                   if (onFinished)
-                    onFinished();
+                       onFinished();
-                return;
+                   return;
-            }
+               }
 
-            let isNewObject;
+               let isNewObject;
-            if (!this._objects[objectPath]) {
+               if (!this._objects[objectPath]) {
-                this._objects[objectPath] = {};
+                   this._objects[objectPath] = {};
-                isNewObject = true;
+                   isNewObject = true;
-            } else {
+               } else {
-                isNewObject = false;
+                   isNewObject = false;
-            }
+               }
 
-            this._objects[objectPath][interfaceName] = proxy;
+               this._objects[objectPath][interfaceName] = proxy;
 
-            if (!this._interfaces[interfaceName])
+               if (!this._interfaces[interfaceName])
-                this._interfaces[interfaceName] = [];
+                   this._interfaces[interfaceName] = [];
 
-            this._interfaces[interfaceName].push(proxy);
+               this._interfaces[interfaceName].push(proxy);
 
-            if (isNewObject)
+               if (isNewObject)
-                this.emit('object-added', objectPath);
+                   this.emit('object-added', objectPath);
 
-            this.emit('interface-added', interfaceName, proxy);
+               this.emit('interface-added', interfaceName, proxy);
 
-            if (onFinished)
+               if (onFinished)
-                onFinished();
+                   onFinished();
         });
     }
 
@@ -152,10 +156,11 @@ var ObjectManager = class {
     }
 
     _onManagerProxyLoaded(initable, result) {
+        let error = null;
         try {
             initable.init_finish(result);
-        } catch (e) {
+        } catch(e) {
-            logError(e, `could not initialize object manager for object ${this._serviceName}`);
+            logError(e, 'could not initialize object manager for object ' + params.name);
 
             this._tryToCompleteLoad();
             return;
@@ -193,7 +198,7 @@ var ObjectManager = class {
         this._managerProxy.GetManagedObjectsRemote((result, error) => {
             if (!result) {
                 if (error) {
-                    logError(error, `could not get remote objects for service ${this._serviceName} path ${this._managerPath}`);
+                   logError(error, 'could not get remote objects for service ' + this._serviceName + ' path ' + this._managerPath);
                 }
 
                 this._tryToCompleteLoad();
@@ -276,8 +281,8 @@ var ObjectManager = class {
             let object = this._objects[objectPaths];
 
             let interfaceNames = Object.keys(object);
-            for (let j = 0; j < interfaceNames.length; j++) {
+            for (let j = 0; i < interfaceNames.length; i++) {
-                let interfaceName = interfaceNames[j];
+                let interfaceName = interfaceNames[i];
                 if (object[interfaceName])
                     proxies.push(object(interfaceName));
             }

js/misc/params.js

@@ -1,7 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Lang = imports.lang;
-
 // parse:
 // @params: caller-provided parameter object, or %null
 // @defaults-provided defaults object
@@ -16,14 +14,22 @@ const Lang = imports.lang;
 //
 // Return value: a new object, containing the merged parameters from
 // @params and @defaults
-function parse(params = {}, defaults, allowExtras) {
+function parse(params, defaults, allowExtras) {
-    if (!allowExtras) {
+    let ret = {}, prop;
-        for (let prop in params)
+
-            if (!(prop in defaults))
+    if (!params)
-                throw new Error(`Unrecognized parameter "${prop}"`);
+        params = {};
+
+    for (prop in params) {
+        if (!(prop in defaults) && !allowExtras)
+            throw new Error('Unrecognized parameter "' + prop + '"');
+        ret[prop] = params[prop];
     }
 
-    let defaultsCopy = {};
+    for (prop in defaults) {
-    Lang.copyProperties(defaults, defaultsCopy);
+        if (!(prop in params))
-    return Object.assign(defaultsCopy, params);
+            ret[prop] = defaults[prop];
+    }
+
+    return ret;
 }

js/misc/permissionStore.js

@@ -12,4 +12,4 @@ function PermissionStore(initCallback, cancellable) {
                                     'org.freedesktop.impl.portal.PermissionStore',
                                     '/org/freedesktop/impl/portal/PermissionStore',
                                     initCallback, cancellable);
-}
+};

js/misc/smartcardManager.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const ObjectManager = imports.misc.objectManager;
@@ -29,7 +30,7 @@ var SmartcardManager = class {
         this._objectManager = new ObjectManager.ObjectManager({ connection: Gio.DBus.session,
                                                                 name: "org.gnome.SettingsDaemon.Smartcard",
                                                                 objectPath: '/org/gnome/SettingsDaemon/Smartcard',
-                                                                knownInterfaces: [SmartcardTokenIface],
+                                                                knownInterfaces: [ SmartcardTokenIface ],
                                                                 onLoaded: this._onLoaded.bind(this) });
         this._insertedTokens = {};
         this._loginToken = null;

js/misc/systemActions.js

@@ -1,4 +1,10 @@
-const { AccountsService, Clutter, Gdm, Gio, GLib, GObject, Meta } = imports.gi;
+const AccountsService = imports.gi.AccountsService;
+const Clutter = imports.gi.Clutter;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const GObject = imports.gi.GObject;
 
 const GnomeSession = imports.misc.gnomeSession;
 const LoginManager = imports.misc.loginManager;
@@ -83,54 +89,48 @@ const SystemActions = GObject.registerClass({
         this._canHaveSuspend = true;
 
         this._actions = new Map();
-        this._actions.set(POWER_OFF_ACTION_ID, {
+        this._actions.set(POWER_OFF_ACTION_ID,
-            // Translators: The name of the power-off action in search
+                          { // Translators: The name of the power-off action in search
-            name: C_("search-result", "Power Off"),
+                            name: C_("search-result", "Power Off"),
-            iconName: 'system-shutdown-symbolic',
+                            iconName: 'system-shutdown-symbolic',
-            // Translators: A list of keywords that match the power-off action, separated by semicolons
+                            // Translators: A list of keywords that match the power-off action, separated by semicolons
-            keywords: _("power off;shutdown;reboot;restart").split(/[; ]/),
+                            keywords: _("power off;shutdown;reboot;restart").split(';'),
-            available: false
+                            available: false });
-        });
+        this._actions.set(LOCK_SCREEN_ACTION_ID,
-        this._actions.set(LOCK_SCREEN_ACTION_ID, {
+                          { // Translators: The name of the lock screen action in search
-            // Translators: The name of the lock screen action in search
+                            name: C_("search-result", "Lock Screen"),
-            name: C_("search-result", "Lock Screen"),
+                            iconName: 'system-lock-screen-symbolic',
-            iconName: 'system-lock-screen-symbolic',
+                            // Translators: A list of keywords that match the lock screen action, separated by semicolons
-            // Translators: A list of keywords that match the lock screen action, separated by semicolons
+                            keywords: _("lock screen").split(';'),
-            keywords: _("lock screen").split(/[; ]/),
+                            available: false });
-            available: false
+        this._actions.set(LOGOUT_ACTION_ID,
-        });
+                          { // Translators: The name of the logout action in search
-        this._actions.set(LOGOUT_ACTION_ID, {
+                            name: C_("search-result", "Log Out"),
-            // Translators: The name of the logout action in search
+                            iconName: 'application-exit-symbolic',
-            name: C_("search-result", "Log Out"),
+                            // Translators: A list of keywords that match the logout action, separated by semicolons
-            iconName: 'application-exit-symbolic',
+                            keywords: _("logout;sign off").split(';'),
-            // Translators: A list of keywords that match the logout action, separated by semicolons
+                            available: false });
-            keywords: _("logout;log out;sign off").split(/[; ]/),
+        this._actions.set(SUSPEND_ACTION_ID,
-            available: false
+                          { // Translators: The name of the suspend action in search
-        });
+                            name: C_("search-result", "Suspend"),
-        this._actions.set(SUSPEND_ACTION_ID, {
+                            iconName: 'media-playback-pause-symbolic',
-            // Translators: The name of the suspend action in search
+                            // Translators: A list of keywords that match the suspend action, separated by semicolons
-            name: C_("search-result", "Suspend"),
+                            keywords: _("suspend;sleep").split(';'),
-            iconName: 'media-playback-pause-symbolic',
+                            available: false });
-            // Translators: A list of keywords that match the suspend action, separated by semicolons
+        this._actions.set(SWITCH_USER_ACTION_ID,
-            keywords: _("suspend;sleep").split(/[; ]/),
+                          { // Translators: The name of the switch user action in search
-            available: false
+                            name: C_("search-result", "Switch User"),
-        });
+                            iconName: 'system-switch-user-symbolic',
-        this._actions.set(SWITCH_USER_ACTION_ID, {
+                            // Translators: A list of keywords that match the switch user action, separated by semicolons
-            // Translators: The name of the switch user action in search
+                            keywords: _("switch user").split(';'),
-            name: C_("search-result", "Switch User"),
+                            available: false });
-            iconName: 'system-switch-user-symbolic',
+        this._actions.set(LOCK_ORIENTATION_ACTION_ID,
-            // Translators: A list of keywords that match the switch user action, separated by semicolons
+                          { // Translators: The name of the lock orientation action in search
-            keywords: _("switch user").split(/[; ]/),
+                            name: C_("search-result", "Lock Orientation"),
-            available: false
+                            iconName: '',
-        });
+                            // Translators: A list of keywords that match the lock orientation action, separated by semicolons
-        this._actions.set(LOCK_ORIENTATION_ACTION_ID, {
+                            keywords: _("lock orientation;screen;rotation").split(';'),
-            // Translators: The name of the lock orientation action in search
+                            available: false });
-            name: C_("search-result", "Lock Orientation"),
-            iconName: '',
-            // Translators: A list of keywords that match the lock orientation action, separated by semicolons
-            keywords: _("lock orientation;screen;rotation").split(/[; ]/),
-            available: false
-        });
 
         this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
         this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
@@ -143,39 +143,37 @@ const SystemActions = GObject.registerClass({
         this._userManager = AccountsService.UserManager.get_default();
 
         this._userManager.connect('notify::is-loaded',
-                                  () => this._updateMultiUser());
+                                  () => { this._updateMultiUser(); });
         this._userManager.connect('notify::has-multiple-users',
-                                  () => this._updateMultiUser());
+                                  () => { this._updateMultiUser(); });
         this._userManager.connect('user-added',
-                                  () => this._updateMultiUser());
+                                  () => { this._updateMultiUser(); });
         this._userManager.connect('user-removed',
-                                  () => this._updateMultiUser());
+                                  () => { this._updateMultiUser(); });
 
-        this._lockdownSettings.connect(`changed::${DISABLE_USER_SWITCH_KEY}`,
+        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
-                                       () => this._updateSwitchUser());
+                                       () => { this._updateSwitchUser(); });
-        this._lockdownSettings.connect(`changed::${DISABLE_LOG_OUT_KEY}`,
+        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
-                                       () => this._updateLogout());
+                                       () => { this._updateLogout(); });
-        global.settings.connect(`changed::${ALWAYS_SHOW_LOG_OUT_KEY}`,
+        global.settings.connect('changed::' + ALWAYS_SHOW_LOG_OUT_KEY,
-                                () => this._updateLogout());
+                                () => { this._updateLogout(); });
 
-        this._lockdownSettings.connect(`changed::${DISABLE_LOCK_SCREEN_KEY}`,
+        this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
-                                       () => this._updateLockScreen());
+                                       () => { this._updateLockScreen(); });
 
-        this._lockdownSettings.connect(`changed::${DISABLE_LOG_OUT_KEY}`,
+        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
-                                       () => this._updateHaveShutdown());
+                                       () => { this._updateHaveShutdown(); });
 
         this.forceUpdate();
 
         this._orientationSettings.connect('changed::orientation-lock',
-                                          () => {
+                                          () => { this._updateOrientationLock();
-                                              this._updateOrientationLock();
+                                                  this._updateOrientationLockIcon(); });
-                                              this._updateOrientationLockIcon();
-                                          });
         Main.layoutManager.connect('monitors-changed',
-                                   () => this._updateOrientationLock());
+                                   () => { this._updateOrientationLock(); });
         Gio.DBus.system.watch_name(SENSOR_BUS_NAME,
                                    Gio.BusNameWatcherFlags.NONE,
-                                   () => this._sensorProxyAppeared(),
+                                   () => { this._sensorProxyAppeared(); },
                                    () => {
                                        this._sensorProxy = null;
                                        this._updateOrientationLock();
@@ -183,7 +181,7 @@ const SystemActions = GObject.registerClass({
         this._updateOrientationLock();
         this._updateOrientationLockIcon();
 
-        Main.sessionMode.connect('updated', () => this._sessionUpdated());
+        Main.sessionMode.connect('updated', () => { this._sessionUpdated(); });
         this._sessionUpdated();
     }
 
@@ -223,7 +221,7 @@ const SystemActions = GObject.registerClass({
                     return;
                 }
                 this._sensorProxy.connect('g-properties-changed',
-                                          () => this._updateOrientationLock());
+                                          () => { this._updateOrientationLock(); });
                 this._updateOrientationLock();
             });
     }
@@ -265,12 +263,12 @@ const SystemActions = GObject.registerClass({
 
     getMatchingActions(terms) {
         // terms is a list of strings
-        terms = terms.map((term) => term.toLowerCase());
+        terms = terms.map((term) => { return term.toLowerCase(); });
 
         let results = [];
 
-        for (let [key, { available, keywords }] of this._actions)
+        for (let [key, {available, keywords}] of this._actions)
-            if (available && terms.every(t => keywords.some(k => k.startsWith(t))))
+            if (available && terms.every(t => keywords.some(k => (k.indexOf(t) >= 0))))
                 results.push(key);
 
         return results;
@@ -286,24 +284,24 @@ const SystemActions = GObject.registerClass({
 
     activateAction(id) {
         switch (id) {
-        case POWER_OFF_ACTION_ID:
+            case POWER_OFF_ACTION_ID:
-            this.activatePowerOff();
+                this.activatePowerOff();
-            break;
+                break;
-        case LOCK_SCREEN_ACTION_ID:
+            case LOCK_SCREEN_ACTION_ID:
-            this.activateLockScreen();
+                this.activateLockScreen();
-            break;
+                break;
-        case LOGOUT_ACTION_ID:
+            case LOGOUT_ACTION_ID:
-            this.activateLogout();
+                this.activateLogout();
-            break;
+                break;
-        case SUSPEND_ACTION_ID:
+            case SUSPEND_ACTION_ID:
-            this.activateSuspend();
+                this.activateSuspend();
-            break;
+                break;
-        case SWITCH_USER_ACTION_ID:
+            case SWITCH_USER_ACTION_ID:
-            this.activateSwitchUser();
+                this.activateSwitchUser();
-            break;
+                break;
-        case LOCK_ORIENTATION_ACTION_ID:
+            case LOCK_ORIENTATION_ACTION_ID:
-            this.activateLockOrientation();
+                this.activateLockOrientation();
-            break;
+                break;
         }
     }
 

js/misc/util.js

@@ -1,9 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
 const Gettext = imports.gettext;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@@ -17,7 +22,7 @@ const _leadingJunk = '[\\s`(\\[{\'\\"<\u00AB\u201C\u2018]';
 const _notTrailingJunk = '[^\\s`!()\\[\\]{};:\'\\".,<>?\u00AB\u00BB\u201C\u201D\u2018\u2019]';
 
 const _urlRegexp = new RegExp(
-    `(^|${_leadingJunk})` +
+    '(^|' + _leadingJunk + ')' +
     '(' +
         '(?:' +
             '(?:http|https|ftp)://' +             // scheme://
@@ -29,12 +34,12 @@ const _urlRegexp = new RegExp(
         '(?:' +                                   // one or more:
             '[^\\s()<>]+' +                       // run of non-space non-()
             '|' +                                 // or
-            `${_balancedParens}` +                // balanced parens
+            _balancedParens +                     // balanced parens
         ')+' +
         '(?:' +                                   // end with:
-            `${_balancedParens}` +                // balanced parens
+            _balancedParens +                     // balanced parens
             '|' +                                 // or
-            `${_notTrailingJunk}` +               // last non-junk char
+            _notTrailingJunk +                    // last non-junk char
         ')' +
     ')', 'gi');
 
@@ -69,16 +74,16 @@ function spawn(argv) {
 }
 
 // spawnCommandLine:
-// @commandLine: a command line
+// @command_line: a command line
 //
-// Runs @commandLine in the background, handling any errors that
+// Runs @command_line in the background, handling any errors that
 // occur when trying to parse or start the program.
-function spawnCommandLine(commandLine) {
+function spawnCommandLine(command_line) {
     try {
-        let [success, argv] = GLib.shell_parse_argv(commandLine);
+        let [success, argv] = GLib.shell_parse_argv(command_line);
         trySpawn(argv);
     } catch (err) {
-        _handleSpawnError(commandLine, err);
+        _handleSpawnError(command_line, err);
     }
 }
 
@@ -93,7 +98,7 @@ function spawnApp(argv) {
 
         let context = global.create_app_launch_context(0, -1);
         app.launch([], context);
-    } catch (err) {
+    } catch(err) {
         _handleSpawnError(argv[0], err);
     }
 }
@@ -103,7 +108,8 @@ function spawnApp(argv) {
 //
 // Runs @argv in the background. If launching @argv fails,
 // this will throw an error.
-function trySpawn(argv) {
+function trySpawn(argv)
+{
     var success, pid;
     try {
         [success, pid] = GLib.spawn_async(null, argv, null,
@@ -134,19 +140,19 @@ function trySpawn(argv) {
 }
 
 // trySpawnCommandLine:
-// @commandLine: a command line
+// @command_line: a command line
 //
-// Runs @commandLine in the background. If launching @commandLine
+// Runs @command_line in the background. If launching @command_line
 // fails, this will throw an error.
-function trySpawnCommandLine(commandLine) {
+function trySpawnCommandLine(command_line) {
     let success, argv;
 
     try {
-        [success, argv] = GLib.shell_parse_argv(commandLine);
+        [success, argv] = GLib.shell_parse_argv(command_line);
     } catch (err) {
         // Replace "Error invoking GLib.shell_parse_argv: " with
         // something nicer
-        err.message = err.message.replace(/[^:]*: /, `${_("Could not parse command:")}\n`);
+        err.message = err.message.replace(/[^:]*: /, _("Could not parse command:") + "\n");
         throw err;
     }
 
@@ -221,7 +227,7 @@ function formatTime(time, params) {
             /* Translators: Time in 24h format */
             format = N_("%H\u2236%M");
         // Show the word "Yesterday" and time if date is on yesterday
-        else if (daysAgo < 2)
+        else if (daysAgo <2)
             /* Translators: this is the word "Yesterday" followed by a
              time string in 24h format. i.e. "Yesterday, 14:30" */
             // xgettext:no-c-format
@@ -250,7 +256,7 @@ function formatTime(time, params) {
             /* Translators: Time in 12h format */
             format = N_("%l\u2236%M %p");
         // Show the word "Yesterday" and time if date is on yesterday
-        else if (daysAgo < 2)
+        else if (daysAgo <2)
             /* Translators: this is the word "Yesterday" followed by a
              time string in 12h format. i.e. "Yesterday, 2:30 pm" */
             // xgettext:no-c-format
@@ -288,7 +294,7 @@ function createTimeLabel(date, params) {
     let id = _desktopSettings.connect('changed::clock-format', () => {
         label.text = formatTime(date, params);
     });
-    label.connect('destroy', () => _desktopSettings.disconnect(id));
+    label.connect('destroy', () => { _desktopSettings.disconnect(id); });
     return label;
 }
 
@@ -345,7 +351,7 @@ function insertSorted(array, val, cmp) {
 var CloseButton = GObject.registerClass(
 class CloseButton extends St.Button {
     _init(boxpointer) {
-        super._init({ style_class: 'notification-close' });
+        super._init({ style_class: 'notification-close'});
 
         // This is a bit tricky. St.Bin has its own x-align/y-align properties
         // that compete with Clutter's properties. This should be fixed for
@@ -365,7 +371,7 @@ class CloseButton extends St.Button {
     }
 
     _computeBoxPointerOffset() {
-        if (!this._boxPointer || !this._boxPointer.get_stage())
+        if (!this._boxPointer || !this._boxPointer.actor.get_stage())
             return 0;
 
         let side = this._boxPointer.arrowSide;
@@ -379,7 +385,7 @@ class CloseButton extends St.Button {
         let themeNode = this.get_theme_node();
 
         let offY = this._computeBoxPointerOffset();
-        this.translation_x = themeNode.get_length('-shell-close-overlap-x');
+        this.translation_x = themeNode.get_length('-shell-close-overlap-x')
         this.translation_y = themeNode.get_length('-shell-close-overlap-y') + offY;
     }
 
@@ -466,7 +472,7 @@ var AppSettingsMonitor = class {
         if (!this._settings || handler.id > 0)
             return;
 
-        handler.id = this._settings.connect(`changed::${handler.key}`,
+        handler.id = this._settings.connect('changed::' + handler.key,
                                             handler.callback);
         handler.callback(this._settings, handler.key);
     }
@@ -492,13 +498,13 @@ var AppSettingsMonitor = class {
     }
 
     _setSettings(settings) {
-        this._handlers.forEach((handler) => this._disconnectHandler(handler));
+        this._handlers.forEach((handler) => { this._disconnectHandler(handler); });
 
         let hadSettings = (this._settings != null);
         this._settings = settings;
         let haveSettings = (this._settings != null);
 
-        this._handlers.forEach((handler) => this._connectHandler(handler));
+        this._handlers.forEach((handler) => { this._connectHandler(handler); });
 
         if (hadSettings != haveSettings)
             this.emit('available-changed');

js/misc/weather.js

@@ -1,6 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Geoclue, Gio, GLib, GWeather } = imports.gi;
+const Geoclue = imports.gi.Geoclue;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GWeather = imports.gi.GWeather;
 const Signals = imports.signals;
 
 const PermissionStore = imports.misc.permissionStore;
@@ -26,21 +29,13 @@ var WeatherClient = class {
         this._weatherAuthorized = false;
         this._permStore = new PermissionStore.PermissionStore((proxy, error) => {
             if (error) {
-                log(`Failed to connect to permissionStore: ${error.message}`);
+                log('Failed to connect to permissionStore: ' + error.message);
-                return;
-            }
-
-            if (this._permStore.g_name_owner == null) {
-                // Failed to auto-start, likely because xdg-desktop-portal
-                // isn't installed; don't restrict access to location service
-                this._weatherAuthorized = true;
-                this._updateAutoLocation();
                 return;
             }
 
             this._permStore.LookupRemote('gnome', 'geolocation', (res, error) => {
                 if (error)
-                    log(`Error looking up permission: ${error.message}`);
+                    log('Error looking up permission: ' + error.message);
 
                 let [perms, data] = error ? [{}, null] : res;
                 let  params = ['gnome', 'geolocation', false, data, perms];
@@ -66,9 +61,9 @@ var WeatherClient = class {
             this.emit('changed');
         });
 
-        this._weatherAppMon = new Util.AppSettingsMonitor('org.gnome.Weather.desktop',
+        this._weatherAppMon = new Util.AppSettingsMonitor('org.gnome.Weather.Application.desktop',
-                                                          'org.gnome.Weather');
+                                                          'org.gnome.Weather.Application');
-        this._weatherAppMon.connect('available-changed', () => this.emit('changed'));
+        this._weatherAppMon.connect('available-changed', () => { this.emit('changed'); });
         this._weatherAppMon.watchSetting('automatic-location',
                                          this._onAutomaticLocationChanged.bind(this));
         this._weatherAppMon.watchSetting('locations',
@@ -178,8 +173,8 @@ var WeatherClient = class {
             (o, res) => {
                 try {
                     this._gclueService = Geoclue.Simple.new_finish(res);
-                } catch (e) {
+                } catch(e) {
-                    log(`Failed to connect to Geoclue2 service: ${e.message}`);
+                    log('Failed to connect to Geoclue2 service: ' + e.message);
                     this._setLocation(this._mostRecentLocation);
                     return;
                 }
@@ -239,7 +234,7 @@ var WeatherClient = class {
         if (table != 'gnome' || id != 'geolocation')
             return;
 
-        let permission = perms['org.gnome.Weather'] || ['NONE'];
+        let permission = perms['org.gnome.Weather.Application'] || ['NONE'];
         let [accuracy] = permission;
         this._weatherAuthorized = accuracy != 'NONE';
 

js/perf/core.js

@@ -10,7 +10,7 @@ const Scripting = imports.ui.scripting;
 // someone should be able to get an idea of how well the shell is performing
 // on a particular system.
 
-var METRICS = {
+let METRICS = {
     overviewLatencyFirst:
     { description: "Time to first frame after triggering overview, first time",
       units: "us" },
@@ -19,7 +19,7 @@ var METRICS = {
       units: "frames / s" },
     overviewLatencySubsequent:
     { description: "Time to first frame after triggering overview, second time",
-      units: "us" },
+      units: "us"},
     overviewFpsSubsequent:
     { description: "Frames rate when going to the overview, second time",
       units: "frames / s" },
@@ -52,7 +52,7 @@ var METRICS = {
       units: "us" },
     applicationsShowTimeSubsequent:
     { description: "Time to switch to applications view, second time",
-      units: "us" }
+      units: "us"}
 };
 
 let WINDOW_CONFIGS = [
@@ -65,7 +65,7 @@ let WINDOW_CONFIGS = [
     { width: 640, height: 480, alpha: true,  maximized: false, count: 10, metric: 'overviewFps10Alpha' }
 ];
 
-function *run() {
+function run() {
     Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview");
     Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing");
     Scripting.defineScriptEvent("afterShowHide", "After a show/hide cycle for the overview");
@@ -136,6 +136,7 @@ let overviewFrames;
 let overviewLatency;
 let mallocUsedSize = 0;
 let overviewShowCount = 0;
+let firstOverviewUsedSize;
 let haveSwapComplete = false;
 let applicationsShowStart;
 let applicationsShowCount = 0;

js/perf/hwtest.js

@@ -1,8 +1,12 @@
-const { Clutter, Gio, Shell } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
+const Meta = imports.gi.Meta;
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
+const Shell = imports.gi.Shell;
 
-var METRICS = {
+let METRICS = {
     timeToDesktop:
     { description: "Time from starting graphical.target to desktop showing",
       units: "us" },
@@ -30,7 +34,7 @@ var METRICS = {
     geditStartTime:
     { description: "Time from gedit launch to window drawn",
       units: "us" },
-};
+}
 
 function waitAndDraw(milliseconds) {
     let cb;
@@ -48,7 +52,7 @@ function waitAndDraw(milliseconds) {
             cb();
     });
 
-    return callback => cb = callback;
+    return callback => { cb = callback; };
 }
 
 function waitSignal(object, signal) {
@@ -60,7 +64,7 @@ function waitSignal(object, signal) {
             cb();
     });
 
-    return callback => cb = callback;
+    return callback => { cb = callback; };
 }
 
 function extractBootTimestamp() {
@@ -85,7 +89,7 @@ function extractBootTimestamp() {
     return result;
 }
 
-function *run() {
+function run() {
     Scripting.defineScriptEvent("desktopShown", "Finished initial animation");
     Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview");
     Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing");
@@ -104,10 +108,7 @@ function *run() {
     yield Scripting.waitLeisure();
     Scripting.scriptEvent('desktopShown');
 
-    let interfaceSettings = new Gio.Settings({
+    Gtk.Settings.get_default().gtk_enable_animations = false;
-        schema_id: 'org.gnome.desktop.interface'
-    });
-    interfaceSettings.set_boolean('enable-animations', false);
 
     Scripting.scriptEvent('overviewShowStart');
     Main.overview.show();
@@ -157,7 +158,7 @@ function *run() {
     Main.overview.hide();
 
     yield Scripting.createTestWindow({ maximized: true,
-                                       redraws: true });
+                                       redraws: true});
     yield Scripting.waitTestWindows();
 
     yield Scripting.sleep(1000);
@@ -203,7 +204,7 @@ function *run() {
 
     yield Scripting.sleep(1000);
 
-    interfaceSettings.set_boolean('enable-animations', true);
+    Gtk.Settings.get_default().gtk_enable_animations = true;
 }
 
 let overviewShowStart;
@@ -269,11 +270,11 @@ function script_collectTimings(time) {
         if (len == 0)
             median = -1;
         else if (len % 2 == 1)
-            median = times[(len - 1) / 2];
+            median = times[(len - 1)/ 2];
         else
             median = Math.round((times[len / 2 - 1] + times[len / 2]) / 2);
 
-        METRICS[`${timing}RedrawTime`].value = median;
+        METRICS[timing + 'RedrawTime'].value = median;
     }
 }
 

js/portalHelper/main.js

@@ -1,6 +1,12 @@
 const Format = imports.format;
 const Gettext = imports.gettext;
-const { Gio, GLib, GObject, Gtk, Pango, Soup, WebKit2: WebKit } = imports.gi;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
+const Pango = imports.gi.Pango;
+const Soup = imports.gi.Soup;
+const WebKit = imports.gi.WebKit2;
 
 const _ = Gettext.gettext;
 
@@ -19,6 +25,7 @@ const PortalHelperSecurityLevel = {
     INSECURE: 2
 };
 
+const INACTIVITY_TIMEOUT = 30000; //ms
 const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org';
 const CONNECTIVITY_CHECK_URI = 'http://' + CONNECTIVITY_CHECK_HOST;
 const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
@@ -58,7 +65,7 @@ class PortalHeaderBar extends Gtk.HeaderBar {
                                              single_line_mode: true,
                                              ellipsize: Pango.EllipsizeMode.END,
                                              valign: Gtk.Align.BASELINE,
-                                             selectable: true });
+                                             selectable: true});
         this.subtitleLabel.get_style_context().add_class('subtitle');
         hbox.add(this.subtitleLabel);
 
@@ -264,7 +271,7 @@ class WebPortalHelper extends Gtk.Application {
         this._queue = [];
 
         let action = new Gio.SimpleAction({ name: 'quit' });
-        action.connect('activate', () => this.active_window.destroyWindow());
+        action.connect('activate', () => { this.active_window.destroyWindow(); });
         this.add_action(action);
     }
 

js/ui/accessDialog.js

@@ -1,4 +1,9 @@
-const { Clutter, Gio, GLib, GObject, Shell } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
@@ -15,10 +20,9 @@ var DialogResponse = {
     CLOSED: 2
 };
 
-var AccessDialog = GObject.registerClass(
+var AccessDialog = class extends ModalDialog.ModalDialog {
-class AccessDialog extends ModalDialog.ModalDialog {
+    constructor(invocation, handle, title, subtitle, body, options) {
-    _init(invocation, handle, title, subtitle, body, options) {
+        super({ styleClass: 'access-dialog' });
-        super._init({ styleClass: 'access-dialog' });
 
         this._invocation = invocation;
         this._handle = handle;
@@ -69,7 +73,7 @@ class AccessDialog extends ModalDialog.ModalDialog {
         this.addButton({ label: grantLabel,
                          action: () => {
                              this._sendResponse(DialogResponse.OK);
-                         } });
+                         }});
     }
 
     open() {
@@ -110,7 +114,7 @@ class AccessDialog extends ModalDialog.ModalDialog {
         });
         this.close();
     }
-});
+};
 
 var AccessDialogDBus = class {
     constructor() {
@@ -135,7 +139,7 @@ var AccessDialogDBus = class {
         let [handle, appId, parentWindow, title, subtitle, body, options] = params;
         // We probably want to use parentWindow and global.display.focus_window
         // for this check in the future
-        if (appId && `${appId}.desktop` != this._windowTracker.focus_app.id) {
+        if (appId && appId + '.desktop' != this._windowTracker.focus_app.id) {
             invocation.return_error_literal(Gio.DBusError,
                                             Gio.DBusError.ACCESS_DENIED,
                                             'Only the focused app is allowed to show a system access dialog');
@@ -146,7 +150,7 @@ var AccessDialogDBus = class {
                                       subtitle, body, options);
         dialog.open();
 
-        dialog.connect('closed', () => this._accessDialog = null);
+        dialog.connect('closed', () => { this._accessDialog = null; });
 
         this._accessDialog = dialog;
     }

js/ui/altTab.js

@@ -1,7 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Atk = imports.gi.Atk;
 
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;
@@ -36,7 +43,7 @@ function _createWindowClone(window, size) {
                                // usual hack for the usual bug in ClutterBinLayout...
                                x_expand: true,
                                y_expand: true });
-}
+};
 
 function getWindows(workspace) {
     // We ignore skip-taskbar windows in switchers, but if they are attached
@@ -395,7 +402,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
                          { opacity: 255,
                            time: THUMBNAIL_FADE_TIME,
                            transition: 'easeOutQuad',
-                           onComplete: () => this.thumbnailsVisible = true
+                           onComplete: () => { this.thumbnailsVisible = true; }
                          });
 
         this._switcherList._items[this._selectedIndex].add_accessible_state (Atk.StateType.EXPANDED);
@@ -459,7 +466,7 @@ class CyclerHighlight {
     _onDestroy() {
         this.window = null;
     }
-}
+};
 
 // We don't show an actual popup, so just provide what SwitcherPopup
 // expects instead of inheriting from SwitcherList
@@ -474,10 +481,12 @@ var CyclerList = GObject.registerClass({
     }
 });
 
-var CyclerPopup = GObject.registerClass({
+var CyclerPopup = GObject.registerClass(
-    GTypeFlags: GObject.TypeFlags.ABSTRACT
+class CyclerPopup extends SwitcherPopup.SwitcherPopup {
-}, class CyclerPopup extends SwitcherPopup.SwitcherPopup {
     _init() {
+        if (new.target === CyclerPopup)
+            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
+
         super._init();
 
         this._items = this._getWindows();
@@ -617,8 +626,9 @@ class WindowSwitcherPopup extends SwitcherPopup.SwitcherPopup {
 var WindowCyclerPopup = GObject.registerClass(
 class WindowCyclerPopup extends CyclerPopup {
     _init() {
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
         super._init();
+
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
     }
 
     _getWindows() {
@@ -663,6 +673,14 @@ class AppIcon extends St.BoxLayout {
     set_size(size) {
         this.icon = this.app.create_icon_texture(size);
         this._iconBin.child = this.icon;
+        this._iconBin.set_size(size, size);
+    }
+
+    vfunc_get_preferred_width(forHeight) {
+        let [minWidth, ] = super.vfunc_get_preferred_width(forHeight);
+
+        minWidth = Math.max(minWidth, forHeight);
+        return [minWidth, minWidth];
     }
 });
 
@@ -716,16 +734,15 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
 
     _setIconSize() {
         let j = 0;
-        while (this._items.length > 1 && this._items[j].style_class != 'item-box') {
+        while(this._items.length > 1 && this._items[j].style_class != 'item-box') {
-            j++;
+                j++;
         }
         let themeNode = this._items[j].get_theme_node();
-        this._list.ensure_style();
 
         let iconPadding = themeNode.get_horizontal_padding();
         let iconBorder = themeNode.get_border_width(St.Side.LEFT) + themeNode.get_border_width(St.Side.RIGHT);
-        let [, labelNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
+        let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
-        let iconSpacing = labelNaturalHeight + iconPadding + iconBorder;
+        let iconSpacing = iconNaturalHeight + iconPadding + iconBorder;
         let totalSpacing = this._list.spacing * (this._items.length - 1);
 
         // We just assume the whole screen here due to weirdness happing with the passed width
@@ -738,7 +755,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
         let iconSize = baseIconSizes[0];
 
         if (this._items.length > 1) {
-            for (let i =  0; i < baseIconSizes.length; i++) {
+            for(let i =  0; i < baseIconSizes.length; i++) {
                 iconSize = baseIconSizes[i];
                 let height = iconSizes[i] + iconSpacing;
                 let w = height * this._items.length + totalSpacing;
@@ -749,7 +766,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
 
         this._iconSize = iconSize;
 
-        for (let i = 0; i < this.icons.length; i++) {
+        for(let i = 0; i < this.icons.length; i++) {
             if (this.icons[i].icon != null)
                 break;
             this.icons[i].set_size(iconSize);
@@ -795,9 +812,8 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
                                                             return GLib.SOURCE_REMOVE;
                                                         });
             GLib.Source.set_name_by_id(this._mouseTimeOutId, '[gnome-shell] this._enterItem');
-        } else {
+        } else
-            this._itemEntered(index);
+           this._itemEntered(index);
-        }
     }
 
     _enterItem(index) {
@@ -842,8 +858,9 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
                 this._removeIcon(app);
         });
 
+        let n = this._arrows.length;
         let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
-        arrow.connect('repaint', () => SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM));
+        arrow.connect('repaint', () => { SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM); });
         this.add_actor(arrow);
         this._arrows.push(arrow);
 
@@ -984,23 +1001,23 @@ class WindowIcon extends St.BoxLayout {
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
 
         switch (mode) {
-        case AppIconMode.THUMBNAIL_ONLY:
+            case AppIconMode.THUMBNAIL_ONLY:
-            size = WINDOW_PREVIEW_SIZE;
+                size = WINDOW_PREVIEW_SIZE;
-            this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+                this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
-            break;
+                break;
 
-        case AppIconMode.BOTH:
+            case AppIconMode.BOTH:
-            size = WINDOW_PREVIEW_SIZE;
+                size = WINDOW_PREVIEW_SIZE;
-            this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+                this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
 
-            if (this.app)
+                if (this.app)
-                this._icon.add_actor(this._createAppIcon(this.app,
+                    this._icon.add_actor(this._createAppIcon(this.app,
-                                                         APP_ICON_SIZE_SMALL));
+                                                             APP_ICON_SIZE_SMALL));
-            break;
+                break;
 
-        case AppIconMode.APP_ICON_ONLY:
+            case AppIconMode.APP_ICON_ONLY:
-            size = APP_ICON_SIZE;
+                size = APP_ICON_SIZE;
-            this._icon.add_actor(this._createAppIcon(this.app, size));
+                this._icon.add_actor(this._createAppIcon(this.app, size));
         }
 
         this._icon.set_size(size * scaleFactor, size * scaleFactor);
@@ -1037,7 +1054,7 @@ class WindowList extends SwitcherPopup.SwitcherList {
             this.icons.push(icon);
 
             icon._unmanagedSignalId = icon.window.connect('unmanaged', (window) => {
-                this._removeWindow(window);
+                this._removeWindow(window)
             });
         }
 
@@ -1073,7 +1090,7 @@ class WindowList extends SwitcherPopup.SwitcherList {
         childBox.y1 = childBox.y2 - this._label.height;
         this._label.allocate(childBox, flags);
 
-        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM);
+        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM)
         childBox.x1 = box.x1;
         childBox.x2 = box.x2;
         childBox.y1 = box.y1;

js/ui/animation.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { GLib, Gio, St } = imports.gi;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
 const Mainloop = imports.mainloop;
+const St = imports.gi.St;
+const Signals = imports.signals;
+const Atk = imports.gi.Atk;
 
 const Tweener = imports.ui.tweener;
 
@@ -12,16 +16,7 @@ var SPINNER_ANIMATION_DELAY = 1.0;
 var Animation = class {
     constructor(file, width, height, speed) {
         this.actor = new St.Bin();
-        this.actor.set_size(width, height);
         this.actor.connect('destroy', this._onDestroy.bind(this));
-        this.actor.connect('notify::size', this._syncAnimationSize.bind(this));
-        this.actor.connect('resource-scale-changed',
-            this._loadFile.bind(this, file, width, height));
-
-        let themeContext = St.ThemeContext.get_for_stage(global.stage);
-        this._scaleChangedId = themeContext.connect('notify::scale-factor',
-            this._loadFile.bind(this, file, width, height));
-
         this._speed = speed;
 
         this._isLoaded = false;
@@ -29,7 +24,10 @@ var Animation = class {
         this._timeoutId = 0;
         this._frame = 0;
 
-        this._loadFile(file, width, height);
+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        this._animations = St.TextureCache.get_default().load_sliced_image (file, width, height, scaleFactor,
+                                                                            this._animationsLoaded.bind(this));
+        this.actor.set_child(this._animations);
     }
 
     play() {
@@ -53,23 +51,6 @@ var Animation = class {
         this._isPlaying = false;
     }
 
-    _loadFile(file, width, height) {
-        let [validResourceScale, resourceScale] = this.actor.get_resource_scale();
-
-        this._isLoaded = false;
-        this.actor.destroy_all_children();
-
-        if (!validResourceScale)
-            return;
-
-        let textureCache = St.TextureCache.get_default();
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._animations = textureCache.load_sliced_image(file, width, height,
-                                                          scaleFactor, resourceScale,
-                                                          this._animationsLoaded.bind(this));
-        this.actor.set_child(this._animations);
-    }
-
     _showFrame(frame) {
         let oldFrameActor = this._animations.get_child_at_index(this._frame);
         if (oldFrameActor)
@@ -87,32 +68,15 @@ var Animation = class {
         return GLib.SOURCE_CONTINUE;
     }
 
-    _syncAnimationSize() {
-        if (!this._isLoaded)
-            return;
-
-        let [width, height] = this.actor.get_size();
-
-        for (let i = 0; i < this._animations.get_n_children(); ++i)
-            this._animations.get_child_at_index(i).set_size(width, height);
-    }
-
     _animationsLoaded() {
         this._isLoaded = this._animations.get_n_children() > 0;
 
-        this._syncAnimationSize();
-
         if (this._isPlaying)
             this.play();
     }
 
     _onDestroy() {
         this.stop();
-
-        let themeContext = St.ThemeContext.get_for_stage(global.stage);
-        if (this._scaleChangedId)
-            themeContext.disconnect(this._scaleChangedId);
-        this._scaleChangedId = 0;
     }
 };
 
@@ -123,7 +87,7 @@ var AnimatedIcon = class extends Animation {
 };
 
 var Spinner = class extends AnimatedIcon {
-    constructor(size, animate = false) {
+    constructor(size, animate=false) {
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
         super(file, size);
 
@@ -162,7 +126,7 @@ var Spinner = class extends AnimatedIcon {
                 time: SPINNER_ANIMATION_TIME,
                 transition: 'linear',
                 onComplete: () => {
-                    super.stop();
+                    this.stop(false);
                 }
             });
         } else {

js/ui/appDisplay.js

@@ -1,8 +1,16 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gtk = imports.gi.Gtk;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 const Mainloop = imports.mainloop;
+const Atk = imports.gi.Atk;
 
 const AppFavorites = imports.ui.appFavorites;
 const BoxPointer = imports.ui.boxpointer;
@@ -10,16 +18,20 @@ const DND = imports.ui.dnd;
 const GrabHelper = imports.ui.grabHelper;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
-const PageIndicators = imports.ui.pageIndicators;
+const Overview = imports.ui.overview;
+const OverviewControls = imports.ui.overviewControls;
 const PopupMenu = imports.ui.popupMenu;
 const Tweener = imports.ui.tweener;
+const Workspace = imports.ui.workspace;
 const Search = imports.ui.search;
+const System = imports.ui.status.system;
 const Params = imports.misc.params;
 const Util = imports.misc.util;
 const SystemActions = imports.misc.systemActions;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
+var MAX_APPLICATION_WORK_MILLIS = 75;
 var MENU_POPUP_TIMEOUT = 600;
 var MAX_COLUMNS = 6;
 var MIN_COLUMNS = 4;
@@ -33,9 +45,23 @@ var FOLDER_SUBICON_FRACTION = .4;
 
 var MIN_FREQUENT_APPS_COUNT = 3;
 
+var INDICATORS_BASE_TIME = 0.25;
+var INDICATORS_ANIMATION_DELAY = 0.125;
+var INDICATORS_ANIMATION_MAX_TIME = 0.75;
+
 var VIEWS_SWITCH_TIME = 0.4;
 var VIEWS_SWITCH_ANIMATION_DELAY = 0.1;
 
+// Follow iconGrid animations approach and divide by 2 to animate out to
+// not annoy the user when the user wants to quit appDisplay.
+// Also, make sure we don't exceed iconGrid animation total time or
+// views switch time.
+var INDICATORS_BASE_TIME_OUT = 0.125;
+var INDICATORS_ANIMATION_DELAY_OUT = 0.0625;
+var INDICATORS_ANIMATION_MAX_TIME_OUT =
+    Math.min (VIEWS_SWITCH_TIME,
+              IconGrid.ANIMATION_TIME_OUT + IconGrid.ANIMATION_MAX_DELAY_OUT_FOR_ITEM);
+
 var PAGE_SWITCH_TIME = 0.3;
 
 const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl';
@@ -54,7 +80,7 @@ function _getCategories(info) {
 
 function _listsIntersect(a, b) {
     for (let itemA of a)
-        if (b.includes(itemA))
+        if (b.indexOf(itemA) >= 0)
             return true;
     return false;
 }
@@ -69,7 +95,7 @@ function _getFolderName(folder) {
         try {
             keyfile.load_from_data_dirs(path, GLib.KeyFileFlags.NONE);
             name = keyfile.get_locale_string('Desktop Entry', 'Name', null);
-        } catch (e) {
+        } catch(e) {
             return name;
         }
     }
@@ -83,8 +109,8 @@ function clamp(value, min, max) {
 
 class BaseAppView {
     constructor(params, gridParams) {
-        if (this.constructor === BaseAppView)
+        if (new.target === BaseAppView)
-            throw new TypeError(`Cannot instantiate abstract class ${this.constructor.name}`);
+            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
 
         gridParams = Params.parse(gridParams, { xAlign: St.Align.MIDDLE,
                                                 columnLimit: MAX_COLUMNS,
@@ -94,7 +120,7 @@ class BaseAppView {
                                                 padWithSpacing: true });
         params = Params.parse(params, { usePagination: false });
 
-        if (params.usePagination)
+        if(params.usePagination)
             this._grid = new IconGrid.PaginatedIconGrid(gridParams);
         else
             this._grid = new IconGrid.IconGrid(gridParams);
@@ -143,15 +169,15 @@ class BaseAppView {
 
     loadGrid() {
         this._allItems.sort(this._compareItems);
-        this._allItems.forEach(item => this._grid.addItem(item));
+        this._allItems.forEach(item => { this._grid.addItem(item); });
         this.emit('view-loaded');
     }
 
     _selectAppInternal(id) {
         if (this._items[id])
-            this._items[id].actor.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
+            this._items[id].actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
         else
-            log(`No such application ${id}`);
+            log('No such application ' + id);
     }
 
     selectApp(id) {
@@ -212,14 +238,124 @@ class BaseAppView {
         } else {
             params.opacity = 0;
             params.delay = 0;
-            params.onComplete = () => this.actor.hide();
+            params.onComplete = () => { this.actor.hide(); };
         }
 
         Tweener.addTween(this._grid, params);
     }
-}
+};
 Signals.addSignalMethods(BaseAppView.prototype);
 
+var PageIndicatorsActor = GObject.registerClass(
+class PageIndicatorsActor extends St.BoxLayout {
+    _init() {
+        super._init({ style_class: 'page-indicators',
+                      vertical: true,
+                      x_expand: true, y_expand: true,
+                      x_align: Clutter.ActorAlign.END,
+                      y_align: Clutter.ActorAlign.CENTER,
+                      reactive: true,
+                      clip_to_allocation: true });
+    }
+
+    vfunc_get_preferred_height(forWidth) {
+        // We want to request the natural height of all our children as our
+        // natural height, so we chain up to St.BoxLayout, but we only request 0
+        // as minimum height, since it's not that important if some indicators
+        // are not shown
+        let [, natHeight] = super.vfunc_get_preferred_height(forWidth);
+        return [0, natHeight];
+    }
+});
+
+class PageIndicators {
+    constructor() {
+        this.actor = new PageIndicatorsActor();
+        this._nPages = 0;
+        this._currentPage = undefined;
+
+        this.actor.connect('notify::mapped', () => {
+            this.animateIndicators(IconGrid.AnimationDirection.IN);
+        });
+    }
+
+    setNPages(nPages) {
+        if (this._nPages == nPages)
+            return;
+
+        let diff = nPages - this._nPages;
+        if (diff > 0) {
+            for (let i = 0; i < diff; i++) {
+                let pageIndex = this._nPages + i;
+                let indicator = new St.Button({ style_class: 'page-indicator',
+                                                button_mask: St.ButtonMask.ONE |
+                                                             St.ButtonMask.TWO |
+                                                             St.ButtonMask.THREE,
+                                                toggle_mode: true,
+                                                checked: pageIndex == this._currentPage });
+                indicator.child = new St.Widget({ style_class: 'page-indicator-icon' });
+                indicator.connect('clicked', () => {
+                    this.emit('page-activated', pageIndex);
+                });
+                this.actor.add_actor(indicator);
+            }
+        } else {
+            let children = this.actor.get_children().splice(diff);
+            for (let i = 0; i < children.length; i++)
+                children[i].destroy();
+        }
+        this._nPages = nPages;
+        this.actor.visible = (this._nPages > 1);
+    }
+
+    setCurrentPage(currentPage) {
+        this._currentPage = currentPage;
+
+        let children = this.actor.get_children();
+        for (let i = 0; i < children.length; i++)
+            children[i].set_checked(i == this._currentPage);
+    }
+
+    animateIndicators(animationDirection) {
+        if (!this.actor.mapped)
+            return;
+
+        let children = this.actor.get_children();
+        if (children.length == 0)
+            return;
+
+        for (let i = 0; i < this._nPages; i++)
+            Tweener.removeTweens(children[i]);
+
+        let offset;
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
+            offset = -children[0].width;
+        else
+            offset = children[0].width;
+
+        let isAnimationIn = animationDirection == IconGrid.AnimationDirection.IN;
+        let delay = isAnimationIn ? INDICATORS_ANIMATION_DELAY :
+                                    INDICATORS_ANIMATION_DELAY_OUT;
+        let baseTime = isAnimationIn ? INDICATORS_BASE_TIME : INDICATORS_BASE_TIME_OUT;
+        let totalAnimationTime = baseTime + delay * this._nPages;
+        let maxTime = isAnimationIn ? INDICATORS_ANIMATION_MAX_TIME :
+                                      INDICATORS_ANIMATION_MAX_TIME_OUT;
+        if (totalAnimationTime > maxTime)
+            delay -= (totalAnimationTime - maxTime) / this._nPages;
+
+        for (let i = 0; i < this._nPages; i++) {
+            children[i].translation_x = isAnimationIn ? offset : 0;
+            Tweener.addTween(children[i],
+                             { translation_x: isAnimationIn ? 0 : offset,
+                               time: baseTime + delay * i,
+                               transition: 'easeInOutQuad',
+                               delay: isAnimationIn ? VIEWS_SWITCH_ANIMATION_DELAY : 0
+                             });
+        }
+    }
+};
+Signals.addSignalMethods(PageIndicators.prototype);
+
 var AllView = class AllView extends BaseAppView {
     constructor() {
         super({ usePagination: true }, null);
@@ -231,20 +367,20 @@ var AllView = class AllView extends BaseAppView {
                                                reactive: true,
                                                y_align: St.Align.START });
         this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
-                                     x_expand: true, y_expand: true });
+                                     x_expand:true, y_expand:true });
         this.actor.add_actor(this._scrollView);
 
-        this._scrollView.set_policy(St.PolicyType.NEVER,
+        this._scrollView.set_policy(Gtk.PolicyType.NEVER,
-                                    St.PolicyType.EXTERNAL);
+                                    Gtk.PolicyType.EXTERNAL);
         this._adjustment = this._scrollView.vscroll.adjustment;
 
-        this._pageIndicators = new PageIndicators.AnimatedPageIndicators();
+        this._pageIndicators = new PageIndicators();
         this._pageIndicators.connect('page-activated',
             (indicators, pageIndex) => {
                 this.goToPage(pageIndex);
             });
-        this._pageIndicators.connect('scroll-event', this._onScroll.bind(this));
+        this._pageIndicators.actor.connect('scroll-event', this._onScroll.bind(this));
-        this.actor.add_actor(this._pageIndicators);
+        this.actor.add_actor(this._pageIndicators.actor);
 
         this.folderIcons = [];
 
@@ -285,7 +421,7 @@ var AllView = class AllView extends BaseAppView {
         this._availWidth = 0;
         this._availHeight = 0;
 
-        Main.overview.connect('hidden', () => this.goToPage(0));
+        Main.overview.connect('hidden', () => { this.goToPage(0); });
         this._grid.connect('space-opened', () => {
             let fadeEffect = this._scrollView.get_effect('fade');
             if (fadeEffect)
@@ -351,21 +487,15 @@ var AllView = class AllView extends BaseAppView {
         });
     }
 
-    getAppInfos() {
-        return this._appInfoList;
-    }
-
     _loadApps() {
-        this._appInfoList = Shell.AppSystem.get_default().get_installed().filter(appInfo => {
+        let apps = Gio.AppInfo.get_all().filter(appInfo => {
             try {
-                (appInfo.get_id()); // catch invalid file encodings
+                let id = appInfo.get_id(); // catch invalid file encodings
-            } catch (e) {
+            } catch(e) {
                 return false;
             }
             return appInfo.should_show();
-        });
+        }).map(app => app.get_id());
-
-        let apps = this._appInfoList.map(app => app.get_id());
 
         let appSys = Shell.AppSystem.get_default();
 
@@ -399,7 +529,7 @@ var AllView = class AllView extends BaseAppView {
         this._refilterApps();
     }
 
-    // Overridden from BaseAppView
+    // Overriden from BaseAppView
     animate(animationDirection, onComplete) {
         this._scrollView.reactive = false;
         let completionFunc = () => {
@@ -432,7 +562,7 @@ var AllView = class AllView extends BaseAppView {
                                transition: 'easeOutQuad',
                                opacity: 0,
                                onComplete() {
-                                   this.opacity = 255;
+                                  this.opacity = 255;
                                } });
 
         if (animationDirection == IconGrid.AnimationDirection.OUT)
@@ -531,7 +661,7 @@ var AllView = class AllView extends BaseAppView {
     }
 
     _onPanEnd(action) {
-        if (this._displayingPopup)
+         if (this._displayingPopup)
             return;
 
         let pageHeight = this._grid.getPageHeight();
@@ -570,7 +700,7 @@ var AllView = class AllView extends BaseAppView {
             this._eventBlocker.reactive = isOpen;
             this._currentPopup = isOpen ? popup : null;
             this._updateIconOpacities(isOpen);
-            if (!isOpen)
+            if(!isOpen)
                 this._closeSpaceForPopup();
         });
     }
@@ -617,9 +747,9 @@ var AllView = class AllView extends BaseAppView {
             this._scrollView.get_effect('fade').fade_edges = true;
 
         if (this._availWidth != availWidth || this._availHeight != availHeight || oldNPages != this._grid.nPages()) {
+            this._adjustment.value = 0;
+            this._grid.currentPage = 0;
             Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
-                this._adjustment.value = 0;
-                this._grid.currentPage = 0;
                 this._pageIndicators.setNPages(this._grid.nPages());
                 this._pageIndicators.setCurrentPage(0);
             });
@@ -671,7 +801,7 @@ var FrequentView = class FrequentView extends BaseAppView {
         let mostUsed = this._usage.get_most_used();
         let hasUsefulData = this.hasUsefulData();
         this._noFrequentAppsLabel.visible = !hasUsefulData;
-        if (!hasUsefulData)
+        if(!hasUsefulData)
             return;
 
         // Allow dragging of the icon only if the Dash would accept a drop to
@@ -720,11 +850,11 @@ class ControlsBoxLayout extends Clutter.BoxLayout {
         let maxMinWidth = 0;
         let maxNaturalWidth = 0;
         for (let child = container.get_first_child();
-            child;
+             child;
-            child = child.get_next_sibling()) {
+             child = child.get_next_sibling()) {
-            let [minWidth, natWidth] = child.get_preferred_width(forHeight);
+             let [minWidth, natWidth] = child.get_preferred_width(forHeight);
-            maxMinWidth = Math.max(maxMinWidth, minWidth);
+             maxMinWidth = Math.max(maxMinWidth, minWidth);
-            maxNaturalWidth = Math.max(maxNaturalWidth, natWidth);
+             maxNaturalWidth = Math.max(maxNaturalWidth, natWidth);
         }
         let childrenCount = container.get_n_children();
         let totalSpacing = this.spacing * (childrenCount - 1);
@@ -787,7 +917,7 @@ var AppDisplay = class AppDisplay {
             // shown next, so make sure to restore their opacity
             // when they are hidden
             if (this._controls.mapped)
-                return;
+              return;
 
             Tweener.removeTweens(this._controls);
             this._controls.opacity = 255;
@@ -852,14 +982,14 @@ var AppDisplay = class AppDisplay {
             this._controls.opacity = 0;
             finalOpacity = 255;
         } else {
-            finalOpacity = 0;
+            finalOpacity = 0
         }
 
         Tweener.addTween(this._controls,
                          { time: IconGrid.ANIMATION_TIME_IN,
                            transition: 'easeInOutQuad',
                            opacity: finalOpacity,
-                         });
+                          });
 
         currentView.animate(animationDirection, onComplete);
     }
@@ -895,7 +1025,7 @@ var AppDisplay = class AppDisplay {
 
     _onAllocatedSizeChanged(actor, width, height) {
         let box = new Clutter.ActorBox();
-        box.x1 = box.y1 = 0;
+        box.x1 = box.y1 =0;
         box.x2 = width;
         box.y2 = height;
         box = this._viewStack.get_theme_node().get_content_box(box);
@@ -926,7 +1056,7 @@ var AppSearchProvider = class AppSearchProvider {
                              'name': app.get_name(),
                              'createIcon'(size) {
                                  return app.create_icon_texture(size);
-                             }
+                           }
                 });
             } else {
                 let name = this._systemActions.getName(id);
@@ -988,7 +1118,7 @@ var FolderView = class FolderView extends BaseAppView {
         this._grid.x_expand = true;
 
         this.actor = new St.ScrollView({ overlay_scrollbars: true });
-        this.actor.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
+        this.actor.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         let scrollableContainer = new St.BoxLayout({ vertical: true, reactive: true });
         scrollableContainer.add_actor(this._grid);
         this.actor.add_actor(scrollableContainer);
@@ -1002,7 +1132,7 @@ var FolderView = class FolderView extends BaseAppView {
         Util.ensureActorVisibleInScrollView(this.actor, actor);
     }
 
-    // Overridden from BaseAppView
+    // Overriden from BaseAppView
     animate(animationDirection) {
         this._grid.animatePulse(animationDirection);
     }
@@ -1066,7 +1196,7 @@ var FolderView = class FolderView extends BaseAppView {
 
         let contentBox = this.actor.get_theme_node().get_content_box(pageBox);
         // We only can show icons inside the collection view boxPointer
-        // so we have to subtract the required padding etc of the boxpointer
+        // so we have to substract the required padding etc of the boxpointer
         return [(contentBox.x2 - contentBox.x1) - 2 * this._offsetForEachSide, (contentBox.y2 - contentBox.y1) - 2 * this._offsetForEachSide];
     }
 
@@ -1150,7 +1280,7 @@ var FolderIcon = class FolderIcon {
         let excludedApps = this._folder.get_strv('excluded-apps');
         let appSys = Shell.AppSystem.get_default();
         let addAppId = appId => {
-            if (excludedApps.includes(appId))
+            if (excludedApps.indexOf(appId) >= 0)
                 return;
 
             let app = appSys.lookup_app(appId);
@@ -1168,13 +1298,15 @@ var FolderIcon = class FolderIcon {
         folderApps.forEach(addAppId);
 
         let folderCategories = this._folder.get_strv('categories');
-        let appInfos = this._parentView.getAppInfos();
+        Gio.AppInfo.get_all().forEach(appInfo => {
-        appInfos.forEach(appInfo => {
             let appCategories = _getCategories(appInfo);
             if (!_listsIntersect(folderCategories, appCategories))
                 return;
 
-            addAppId(appInfo.get_id());
+            try {
+                addAppId(appInfo.get_id()); // catch invalid file encodings
+            } catch(e) {
+            }
         });
 
         this.actor.visible = this.view.getAllItems().length > 0;
@@ -1251,7 +1383,7 @@ var FolderIcon = class FolderIcon {
     adaptToSize(width, height) {
         this._parentAvailableWidth = width;
         this._parentAvailableHeight = height;
-        if (this._popup)
+        if(this._popup)
             this.view.adaptToSize(width, height);
         this._popupInvalidated = true;
     }
@@ -1286,20 +1418,20 @@ var AppFolderPopup = class AppFolderPopup {
                                                        x_expand: true,
                                                        x_align: St.Align.START });
 
-        this._boxPointer.style_class = 'app-folder-popup';
+        this._boxPointer.actor.style_class = 'app-folder-popup';
-        this.actor.add_actor(this._boxPointer);
+        this.actor.add_actor(this._boxPointer.actor);
         this._boxPointer.bin.set_child(this._view.actor);
 
         this.closeButton = Util.makeCloseButton(this._boxPointer);
         this.closeButton.connect('clicked', this.popdown.bind(this));
         this.actor.add_actor(this.closeButton);
 
-        this._boxPointer.bind_property('opacity', this.closeButton, 'opacity',
+        this._boxPointer.actor.bind_property('opacity', this.closeButton, 'opacity',
-                                       GObject.BindingFlags.SYNC_CREATE);
+                                             GObject.BindingFlags.SYNC_CREATE);
 
         global.focus_manager.add_group(this.actor);
 
-        source.actor.connect('destroy', () => this.actor.destroy());
+        source.actor.connect('destroy', () => { this.actor.destroy(); });
         this._grabHelper = new GrabHelper.GrabHelper(this.actor, {
             actionMode: Shell.ActionMode.POPUP
         });
@@ -1331,22 +1463,22 @@ var AppFolderPopup = class AppFolderPopup {
         let direction;
         let isLtr = Clutter.get_default_text_direction() == Clutter.TextDirection.LTR;
         switch (event.get_key_symbol()) {
-        case Clutter.Down:
+            case Clutter.Down:
-            direction = St.DirectionType.TAB_FORWARD;
+                direction = Gtk.DirectionType.TAB_FORWARD;
-            break;
+                break;
-        case Clutter.Right:
+            case Clutter.Right:
-            direction = isLtr ? St.DirectionType.TAB_FORWARD :
+                direction = isLtr ? Gtk.DirectionType.TAB_FORWARD :
-                                    St.DirectionType.TAB_BACKWARD;
+                                    Gtk.DirectionType.TAB_BACKWARD;
-            break;
+                break;
-        case Clutter.Up:
+            case Clutter.Up:
-            direction = St.DirectionType.TAB_BACKWARD;
+                direction = Gtk.DirectionType.TAB_BACKWARD;
-            break;
+                break;
-        case Clutter.Left:
+            case Clutter.Left:
-            direction = isLtr ? St.DirectionType.TAB_BACKWARD :
+                direction = isLtr ? Gtk.DirectionType.TAB_BACKWARD :
-                                    St.DirectionType.TAB_FORWARD;
+                                    Gtk.DirectionType.TAB_FORWARD;
-            break;
+                break;
-        default:
+            default:
-            return Clutter.EVENT_PROPAGATE;
+                return Clutter.EVENT_PROPAGATE;
         }
         return actor.navigate_focus(null, direction, false);
     }
@@ -1378,9 +1510,9 @@ var AppFolderPopup = class AppFolderPopup {
         this._boxPointer.open(BoxPointer.PopupAnimation.FADE |
                               BoxPointer.PopupAnimation.SLIDE,
                               () => {
-                                  this._view.actor.opacity = 255;
+                this._view.actor.opacity = 255;
-                                  this._view.animate(IconGrid.AnimationDirection.IN);
+                this._view.animate(IconGrid.AnimationDirection.IN);
-                              });
+            });
 
         this.emit('open-state-changed', true);
     }
@@ -1464,7 +1596,7 @@ var AppIcon = class AppIcon {
         this.actor.connect('popup-menu', this._onKeyboardPopupMenu.bind(this));
 
         this._menu = null;
-        this._menuManager = new PopupMenu.PopupMenuManager(this.actor);
+        this._menuManager = new PopupMenu.PopupMenuManager(this);
 
         if (isDraggable) {
             this._draggable = DND.makeDraggable(this.actor);
@@ -1476,7 +1608,7 @@ var AppIcon = class AppIcon {
                 Main.overview.cancelledItemDrag(this);
             });
             this._draggable.connect('drag-end', () => {
-                Main.overview.endItemDrag(this);
+               Main.overview.endItemDrag(this);
             });
         }
 
@@ -1554,7 +1686,7 @@ var AppIcon = class AppIcon {
 
     _onKeyboardPopupMenu() {
         this.popupMenu();
-        this._menu.actor.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
+        this._menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     }
 
     getId() {
@@ -1692,20 +1824,25 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
             w => !w.skip_taskbar
         );
 
-        if (windows.length > 0)
+        // Display the app windows menu items and the separator between windows
-            this.addMenuItem(
+        // of the current desktop and other windows.
-                /* Translators: This is the heading of a list of open windows */
+        let workspaceManager = global.workspace_manager;
-                new PopupMenu.PopupSeparatorMenuItem(_("Open Windows"))
+        let activeWorkspace = workspaceManager.get_active_workspace();
-            );
+        let separatorShown = windows.length > 0 && windows[0].get_workspace() != activeWorkspace;
 
-        windows.forEach(window => {
+        for (let i = 0; i < windows.length; i++) {
+            let window = windows[i];
+            if (!separatorShown && window.get_workspace() != activeWorkspace) {
+                this._appendSeparator();
+                separatorShown = true;
+            }
             let title = window.title ? window.title
                                      : this._source.app.get_name();
             let item = this._appendMenuItem(title);
             item.connect('activate', () => {
                 this.emit('activate-window', window);
             });
-        });
+        }
 
         if (!this._source.app.is_window_backed()) {
             this._appendSeparator();
@@ -1713,7 +1850,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
             let appInfo = this._source.app.get_app_info();
             let actions = appInfo.list_actions();
             if (this._source.app.can_open_new_window() &&
-                actions.includes('new-window')) {
+                actions.indexOf('new-window') == -1) {
                 this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
                 this._newWindowMenuItem.connect('activate', () => {
                     if (this._source.app.state == Shell.AppState.STOPPED)
@@ -1727,7 +1864,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
 
             if (discreteGpuAvailable &&
                 this._source.app.state == Shell.AppState.STOPPED &&
-                actions.includes('activate-discrete-gpu')) {
+                actions.indexOf('activate-discrete-gpu') == -1) {
                 this._onDiscreteGpuMenuItem = this._appendMenuItem(_("Launch using Dedicated Graphics Card"));
                 this._onDiscreteGpuMenuItem.connect('activate', () => {
                     if (this._source.app.state == Shell.AppState.STOPPED)

js/ui/appFavorites.js

@@ -14,47 +14,36 @@ const RENAMED_DESKTOP_IDS = {
     'epiphany.desktop': 'org.gnome.Epiphany.desktop',
     'evolution.desktop': 'org.gnome.Evolution.desktop',
     'file-roller.desktop': 'org.gnome.FileRoller.desktop',
-    'five-or-more.desktop': 'org.gnome.five-or-more.desktop',
-    'four-in-a-row.desktop': 'org.gnome.Four-in-a-row.desktop',
     'gcalctool.desktop': 'org.gnome.Calculator.desktop',
     'geary.desktop': 'org.gnome.Geary.desktop',
     'gedit.desktop': 'org.gnome.gedit.desktop',
-    'glchess.desktop': 'org.gnome.Chess.desktop',
+    'glchess.desktop': 'gnome-chess.desktop',
-    'glines.desktop': 'org.gnome.five-or-more.desktop',
+    'glines.desktop': 'five-or-more.desktop',
-    'gnect.desktop': 'org.gnome.Four-in-a-row.desktop',
+    'gnect.desktop': 'four-in-a-row.desktop',
     'gnibbles.desktop': 'org.gnome.Nibbles.desktop',
-    'gnobots2.desktop': 'org.gnome.Robots.desktop',
+    'gnobots2.desktop': 'gnome-robots.desktop',
     'gnome-boxes.desktop': 'org.gnome.Boxes.desktop',
     'gnome-calculator.desktop': 'org.gnome.Calculator.desktop',
-    'gnome-chess.desktop': 'org.gnome.Chess.desktop',
     'gnome-clocks.desktop': 'org.gnome.clocks.desktop',
     'gnome-contacts.desktop': 'org.gnome.Contacts.desktop',
     'gnome-documents.desktop': 'org.gnome.Documents.desktop',
     'gnome-font-viewer.desktop': 'org.gnome.font-viewer.desktop',
-    'gnome-klotski.desktop': 'org.gnome.Klotski.desktop',
     'gnome-nibbles.desktop': 'org.gnome.Nibbles.desktop',
     'gnome-mahjongg.desktop': 'org.gnome.Mahjongg.desktop',
-    'gnome-mines.desktop': 'org.gnome.Mines.desktop',
     'gnome-music.desktop': 'org.gnome.Music.desktop',
     'gnome-photos.desktop': 'org.gnome.Photos.desktop',
-    'gnome-robots.desktop': 'org.gnome.Robots.desktop',
     'gnome-screenshot.desktop': 'org.gnome.Screenshot.desktop',
     'gnome-software.desktop': 'org.gnome.Software.desktop',
     'gnome-terminal.desktop': 'org.gnome.Terminal.desktop',
-    'gnome-tetravex.desktop': 'org.gnome.Tetravex.desktop',
     'gnome-tweaks.desktop': 'org.gnome.tweaks.desktop',
-    'gnome-weather.desktop': 'org.gnome.Weather.desktop',
+    'gnome-weather.desktop': 'org.gnome.Weather.Application.desktop',
-    'gnomine.desktop': 'org.gnome.Mines.desktop',
+    'gnomine.desktop': 'gnome-mines.desktop',
-    'gnotravex.desktop': 'org.gnome.Tetravex.desktop',
+    'gnotravex.desktop': 'gnome-tetravex.desktop',
-    'gnotski.desktop': 'org.gnome.Klotski.desktop',
+    'gnotski.desktop': 'gnome-klotski.desktop',
-    'gtali.desktop': 'org.gnome.Tali.desktop',
+    'gtali.desktop': 'tali.desktop',
-    'iagno.desktop': 'org.gnome.Reversi.desktop',
+    'iagno.desktop': 'org.gnome.Iagno.desktop',
     'nautilus.desktop': 'org.gnome.Nautilus.desktop',
-    'org.gnome.gnome-2048.desktop': 'org.gnome.TwentyFortyEight.desktop',
-    'org.gnome.taquin.desktop': 'org.gnome.Taquin.desktop',
-    'org.gnome.Weather.Application.desktop': 'org.gnome.Weather.desktop',
     'polari.desktop': 'org.gnome.Polari.desktop',
-    'tali.desktop': 'org.gnome.Tali.desktop',
     'totem.desktop': 'org.gnome.Totem.desktop',
     'evince.desktop': 'org.gnome.Evince.desktop',
 };
@@ -63,7 +52,7 @@ class AppFavorites {
     constructor() {
         this.FAVORITE_APPS_KEY = 'favorite-apps';
         this._favorites = {};
-        global.settings.connect(`changed::${this.FAVORITE_APPS_KEY}`, this._onFavsChanged.bind(this));
+        global.settings.connect('changed::' + this.FAVORITE_APPS_KEY, this._onFavsChanged.bind(this));
         this.reload();
     }
 
@@ -164,7 +153,7 @@ class AppFavorites {
     }
 
     _removeFavorite(appId) {
-        if (!(appId in this._favorites))
+        if (!appId in this._favorites)
             return false;
 
         let ids = this._getIds().filter(id => id != appId);
@@ -187,7 +176,7 @@ class AppFavorites {
                                    }
                                  });
     }
-}
+};
 Signals.addSignalMethods(AppFavorites.prototype);
 
 var appFavoritesInstance = null;

js/ui/audioDeviceSelection.js

@@ -1,4 +1,9 @@
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
@@ -13,11 +18,10 @@ var AudioDevice = {
 
 const AudioDeviceSelectionIface = loadInterfaceXML('org.gnome.Shell.AudioDeviceSelection');
 
-var AudioDeviceSelectionDialog = GObject.registerClass({
+var AudioDeviceSelectionDialog =
-    Signals: { 'device-selected': { param_types: [GObject.TYPE_UINT] } }
+class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
-}, class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
+    constructor(devices) {
-    _init(devices) {
+        super({ styleClass: 'audio-device-selection-dialog' });
-        super._init({ styleClass: 'audio-device-selection-dialog' });
 
         this._deviceItems = {};
 
@@ -34,6 +38,10 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
             throw new Error('Too few devices for a selection');
     }
 
+    destroy() {
+        super.destroy();
+    }
+
     _buildLayout(devices) {
         let title = new St.Label({ style_class: 'audio-selection-title',
                                    text: _("Select Audio Device"),
@@ -54,28 +62,28 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
     }
 
     _getDeviceLabel(device) {
-        switch (device) {
+        switch(device) {
-        case AudioDevice.HEADPHONES:
+            case AudioDevice.HEADPHONES:
-            return _("Headphones");
+                return _("Headphones");
-        case AudioDevice.HEADSET:
+            case AudioDevice.HEADSET:
-            return _("Headset");
+                return _("Headset");
-        case AudioDevice.MICROPHONE:
+            case AudioDevice.MICROPHONE:
-            return _("Microphone");
+                return _("Microphone");
-        default:
+            default:
-            return null;
+                return null;
         }
     }
 
     _getDeviceIcon(device) {
-        switch (device) {
+        switch(device) {
-        case AudioDevice.HEADPHONES:
+            case AudioDevice.HEADPHONES:
-            return 'audio-headphones-symbolic';
+                return 'audio-headphones-symbolic';
-        case AudioDevice.HEADSET:
+            case AudioDevice.HEADSET:
-            return 'audio-headset-symbolic';
+                return 'audio-headset-symbolic';
-        case AudioDevice.MICROPHONE:
+            case AudioDevice.MICROPHONE:
-            return 'audio-input-microphone-symbolic';
+                return 'audio-input-microphone-symbolic';
-        default:
+            default:
-            return null;
+                return null;
         }
     }
 
@@ -110,11 +118,11 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
     }
 
     _openSettings() {
-        let desktopFile = 'gnome-sound-panel.desktop';
+        let desktopFile = 'gnome-sound-panel.desktop'
         let app = Shell.AppSystem.get_default().lookup_app(desktopFile);
 
         if (!app) {
-            log(`Settings panel for desktop file ${desktopFile} could not be loaded!`);
+            log('Settings panel for desktop file ' + desktopFile + ' could not be loaded!');
             return;
         }
 
@@ -122,7 +130,7 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
         Main.overview.hide();
         app.activate();
     }
-});
+};
 
 var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
     constructor() {
@@ -159,12 +167,12 @@ var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
 
         let [deviceNames] = params;
         let devices = 0;
-        deviceNames.forEach(n => devices |= AudioDevice[n.toUpperCase()]);
+        deviceNames.forEach(n => { devices |= AudioDevice[n.toUpperCase()]; });
 
         let dialog;
         try {
             dialog = new AudioDeviceSelectionDialog(devices);
-        } catch (e) {
+        } catch(e) {
             invocation.return_value(null);
             return;
         }

js/ui/background.js

@@ -93,7 +93,12 @@
 //     MetaBackgroundImage         MetaBackgroundImage
 //     MetaBackgroundImage         MetaBackgroundImage
 
-const { Clutter, GDesktopEnums, Gio, GLib, GnomeDesktop, Meta } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GDesktopEnums = imports.gi.GDesktopEnums;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 
 const LoginManager = imports.misc.loginManager;
@@ -108,6 +113,7 @@ const PRIMARY_COLOR_KEY = 'primary-color';
 const SECONDARY_COLOR_KEY = 'secondary-color';
 const COLOR_SHADING_TYPE_KEY = 'color-shading-type';
 const BACKGROUND_STYLE_KEY = 'picture-options';
+const PICTURE_OPACITY_KEY = 'picture-opacity';
 const PICTURE_URI_KEY = 'picture-uri';
 
 var FADE_ANIMATION_TIME = 1.0;
@@ -256,15 +262,14 @@ var Background = class Background {
                 this._refreshAnimation();
             });
 
-        this._settingsChangedSignalId =
+        this._settingsChangedSignalId = this._settings.connect('changed', () => {
-            this._settings.connect('changed', this._emitChangedSignal.bind(this));
+            this.emit('changed');
+        });
 
         this._load();
     }
 
     destroy() {
-        this.background = null;
-
         this._cancellable.cancel();
         this._removeAnimationTimeout();
 
@@ -288,22 +293,6 @@ var Background = class Background {
         if (this._settingsChangedSignalId != 0)
             this._settings.disconnect(this._settingsChangedSignalId);
         this._settingsChangedSignalId = 0;
-
-        if (this._changedIdleId) {
-            GLib.source_remove(this._changedIdleId);
-            this._changedIdleId = 0;
-        }
-    }
-
-    _emitChangedSignal() {
-        if (this._changedIdleId)
-            return;
-
-        this._changedIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-            this._changedIdleId = 0;
-            this.emit('changed');
-            return GLib.SOURCE_REMOVE;
-        });
     }
 
     updateResolution() {
@@ -359,7 +348,7 @@ var Background = class Background {
                                                if (changedFile.equal(file)) {
                                                    let imageCache = Meta.BackgroundImageCache.get_default();
                                                    imageCache.purge(changedFile);
-                                                   this._emitChangedSignal();
+                                                   this.emit('changed');
                                                }
                                            });
         this._fileWatches[key] = signalId;
@@ -432,12 +421,12 @@ var Background = class Background {
             return;
 
         this._updateAnimationTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                          interval,
+                                                      interval,
-                                                          () => {
+                                                      () => {
-                                                              this._updateAnimationTimeoutId = 0;
+                                                          this._updateAnimationTimeoutId = 0;
-                                                              this._updateAnimation();
+                                                          this._updateAnimation();
-                                                              return GLib.SOURCE_REMOVE;
+                                                          return GLib.SOURCE_REMOVE;
-                                                          });
+                                                      });
         GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
     }
 
@@ -464,9 +453,9 @@ var Background = class Background {
 
         let cache = Meta.BackgroundImageCache.get_default();
         let image = cache.load(file);
-        if (image.is_loaded()) {
+        if (image.is_loaded())
             this._setLoaded();
-        } else {
+        else {
             let id = image.connect('loaded', () => {
                 this._setLoaded();
                 image.disconnect(id);
@@ -715,6 +704,7 @@ var BackgroundManager = class BackgroundManager {
                            time: FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad',
                            onComplete() {
+                               oldBackgroundActor.background.run_dispose();
                                oldBackgroundActor.destroy();
                            }
                          });
@@ -761,8 +751,10 @@ var BackgroundManager = class BackgroundManager {
 
         this._container.add_child(backgroundActor);
 
+        let monitor = this._layoutManager.monitors[this._monitorIndex];
+
+        backgroundActor.set_size(monitor.width, monitor.height);
         if (this._controlPosition) {
-            let monitor = this._layoutManager.monitors[this._monitorIndex];
             backgroundActor.set_position(monitor.x, monitor.y);
             backgroundActor.lower_bottom();
         }

js/ui/backgroundMenu.js

@@ -1,6 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
@@ -25,7 +27,7 @@ var BackgroundMenu = class BackgroundMenu extends PopupMenu.PopupMenu {
 function addBackgroundMenu(actor, layoutManager) {
     actor.reactive = true;
     actor._backgroundMenu = new BackgroundMenu(layoutManager);
-    actor._backgroundManager = new PopupMenu.PopupMenuManager(actor);
+    actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
     actor._backgroundManager.addMenu(actor._backgroundMenu);
 
     function openMenu(x, y) {

js/ui/barLevel.js

@@ -1,6 +1,9 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const { Atk, Clutter, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Cairo = imports.cairo;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 const Signals = imports.signals;
 
 var BarLevel = class {
@@ -14,7 +17,7 @@ var BarLevel = class {
         this._barLevelWidth = 0;
 
         if (params == undefined)
-            params = {};
+            params = {}
 
         this.actor = new St.DrawingArea({ styleClass: params['styleClass'] || 'barlevel',
                                           can_focus: params['canFocus'] || false,
@@ -105,7 +108,7 @@ var BarLevel = class {
             overdriveSeparatorWidth = themeNode.get_length('-barlevel-overdrive-separator-width');
 
         /* background bar */
-        cr.arc(width - barLevelBorderRadius - barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * (3 / 4), TAU * (1 / 4));
+        cr.arc(width - barLevelBorderRadius - barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
         cr.lineTo(endX, (height + barLevelHeight) / 2);
         cr.lineTo(endX, (height - barLevelHeight) / 2);
         cr.lineTo(width - barLevelBorderRadius - barLevelBorderWidth, (height - barLevelHeight) / 2);
@@ -117,12 +120,11 @@ var BarLevel = class {
 
         /* normal progress bar */
         let x = Math.min(endX, overdriveSeparatorX - overdriveSeparatorWidth / 2);
-        cr.arc(barLevelBorderRadius + barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * (1 / 4), TAU * (3 / 4));
+        cr.arc(barLevelBorderRadius + barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * 1 / 4, TAU * 3 / 4);
         cr.lineTo(x, (height - barLevelHeight) / 2);
         cr.lineTo(x, (height + barLevelHeight) / 2);
         cr.lineTo(barLevelBorderRadius + barLevelBorderWidth, (height + barLevelHeight) / 2);
-        if (this._value > 0)
+        Clutter.cairo_set_source_color(cr, barLevelActiveColor);
-            Clutter.cairo_set_source_color(cr, barLevelActiveColor);
         cr.fillPreserve();
         Clutter.cairo_set_source_color(cr, barLevelActiveBorderColor);
         cr.setLineWidth(barLevelBorderWidth);
@@ -144,19 +146,17 @@ var BarLevel = class {
         }
 
         /* end progress bar arc */
-        if (this._value > 0) {
+        if (this._value <= this._overdriveStart)
-            if (this._value <= this._overdriveStart)
+            Clutter.cairo_set_source_color(cr, barLevelActiveColor);
-                Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+        else
-            else
+            Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
-                Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
+        cr.arc(endX, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
-            cr.arc(endX, height / 2, barLevelBorderRadius, TAU * (3 / 4), TAU * (1 / 4));
+        cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
-            cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
+        cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
-            cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
+        cr.lineTo(endX, (height - barLevelHeight) / 2);
-            cr.lineTo(endX, (height - barLevelHeight) / 2);
+        cr.fillPreserve();
-            cr.fillPreserve();
+        cr.setLineWidth(barLevelBorderWidth);
-            cr.setLineWidth(barLevelBorderWidth);
+        cr.stroke();
-            cr.stroke();
-        }
 
         /* draw overdrive separator */
         if (overdriveActive) {

js/ui/boxpointer.js

@@ -1,6 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, GObject, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@@ -24,7 +29,7 @@ var POPUP_ANIMATION_TIME = 0.15;
  * placed.  The arrow position may be controlled via
  * setArrowOrigin(). The arrow side might be temporarily flipped
  * depending on the box size and source position to keep the box
- * totally inside the monitor workarea if possible.
+ * totally inside the monitor if possible.
  *
  */
 var BoxPointer = GObject.registerClass({
@@ -33,6 +38,8 @@ var BoxPointer = GObject.registerClass({
     _init(arrowSide, binProperties) {
         super._init();
 
+        this.actor = this;
+
         this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._arrowSide = arrowSide;
@@ -45,18 +52,13 @@ var BoxPointer = GObject.registerClass({
         this._border.connect('repaint', this._drawBorder.bind(this));
         this.add_actor(this._border);
         this.bin.raise(this._border);
+        this._xOffset = 0;
+        this._yOffset = 0;
+        this._xPosition = 0;
+        this._yPosition = 0;
         this._sourceAlignment = 0.5;
         this._capturedEventId = 0;
         this._muteInput();
-
-        this.connect('destroy', this._onDestroy.bind(this));
-    }
-
-    _onDestroy() {
-        if (this._sourceActorDestroyId) {
-            this._sourceActor.disconnect(this._sourceActorDestroyId);
-            delete this._sourceActorDestroyId;
-        }
     }
 
     get arrowSide() {
@@ -76,6 +78,36 @@ var BoxPointer = GObject.registerClass({
         }
     }
 
+    // BoxPointer.show() and BoxPointer.hide() are here for only compatibility
+    // purposes, and will be removed in 3.32.
+    show(animate, onComplete) {
+        if (animate !== undefined) {
+            try {
+                throw new Error('BoxPointer.show() has been moved to BoxPointer.open(), this code will break in the future.');
+            } catch(e) {
+                logError(e);
+                this.open(animate, onComplete);
+                return;
+            }
+        }
+
+        this.visible = true;
+    }
+
+    hide(animate, onComplete) {
+        if (animate !== undefined) {
+            try {
+                throw new Error('BoxPointer.hide() has been moved to BoxPointer.close(), this code will break in the future.');
+            } catch(e) {
+                logError(e);
+                this.close(animate, onComplete);
+                return;
+            }
+        }
+
+        this.visible = false;
+    }
+
     open(animate, onComplete) {
         let themeNode = this.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
@@ -90,24 +122,24 @@ var BoxPointer = GObject.registerClass({
 
         if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
-            case St.Side.TOP:
+                case St.Side.TOP:
-                this.translation_y = -rise;
+                    this.yOffset = -rise;
-                break;
+                    break;
-            case St.Side.BOTTOM:
+                case St.Side.BOTTOM:
-                this.translation_y = rise;
+                    this.yOffset = rise;
-                break;
+                    break;
-            case St.Side.LEFT:
+                case St.Side.LEFT:
-                this.translation_x = -rise;
+                    this.xOffset = -rise;
-                break;
+                    break;
-            case St.Side.RIGHT:
+                case St.Side.RIGHT:
-                this.translation_x = rise;
+                    this.xOffset = rise;
-                break;
+                    break;
             }
         }
 
         Tweener.addTween(this, { opacity: 255,
-                                 translation_x: 0,
+                                 xOffset: 0,
-                                 translation_y: 0,
+                                 yOffset: 0,
                                  transition: 'linear',
                                  onComplete: () => {
                                      this._unmuteInput();
@@ -121,8 +153,8 @@ var BoxPointer = GObject.registerClass({
         if (!this.visible)
             return;
 
-        let translationX = 0;
+        let xOffset = 0;
-        let translationY = 0;
+        let yOffset = 0;
         let themeNode = this.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
         let fade = (animate & PopupAnimation.FADE);
@@ -130,18 +162,18 @@ var BoxPointer = GObject.registerClass({
 
         if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
-            case St.Side.TOP:
+                case St.Side.TOP:
-                translationY = rise;
+                    yOffset = rise;
-                break;
+                    break;
-            case St.Side.BOTTOM:
+                case St.Side.BOTTOM:
-                translationY = -rise;
+                    yOffset = -rise;
-                break;
+                    break;
-            case St.Side.LEFT:
+                case St.Side.LEFT:
-                translationX = rise;
+                    xOffset = rise;
-                break;
+                    break;
-            case St.Side.RIGHT:
+                case St.Side.RIGHT:
-                translationX = -rise;
+                    xOffset = -rise;
-                break;
+                    break;
             }
         }
 
@@ -149,15 +181,15 @@ var BoxPointer = GObject.registerClass({
 
         Tweener.removeTweens(this);
         Tweener.addTween(this, { opacity: fade ? 0 : 255,
-                                 translation_x: translationX,
+                                 xOffset: xOffset,
-                                 translation_y: translationY,
+                                 yOffset: yOffset,
                                  transition: 'linear',
                                  time: animationTime,
                                  onComplete: () => {
                                      this.hide();
                                      this.opacity = 0;
-                                     this.translation_x = 0;
+                                     this.xOffset = 0;
-                                     this.translation_y = 0;
+                                     this.yOffset = 0;
                                      if (onComplete)
                                          onComplete();
                                  }
@@ -204,10 +236,13 @@ var BoxPointer = GObject.registerClass({
         this.set_allocation(box, flags);
 
         let themeNode = this.get_theme_node();
+        box = themeNode.get_content_box(box);
+
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let rise = themeNode.get_length('-arrow-rise');
         let childBox = new Clutter.ActorBox();
-        let [availWidth, availHeight] = themeNode.get_content_box(box).get_size();
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
 
         childBox.x1 = 0;
         childBox.y1 = 0;
@@ -220,25 +255,24 @@ var BoxPointer = GObject.registerClass({
         childBox.x2 = availWidth - borderWidth;
         childBox.y2 = availHeight - borderWidth;
         switch (this._arrowSide) {
-        case St.Side.TOP:
+            case St.Side.TOP:
-            childBox.y1 += rise;
+                childBox.y1 += rise;
-            break;
+                break;
-        case St.Side.BOTTOM:
+            case St.Side.BOTTOM:
-            childBox.y2 -= rise;
+                childBox.y2 -= rise;
-            break;
+                break;
-        case St.Side.LEFT:
+            case St.Side.LEFT:
-            childBox.x1 += rise;
+                childBox.x1 += rise;
-            break;
+                break;
-        case St.Side.RIGHT:
+            case St.Side.RIGHT:
-            childBox.x2 -= rise;
+                childBox.x2 -= rise;
-            break;
+                break;
         }
         this.bin.allocate(childBox, flags);
 
         if (this._sourceActor && this._sourceActor.mapped) {
-            this._reposition(box);
+            this._reposition();
-            this._updateFlip(box);
+            this._updateFlip();
-            this.set_allocation(box, flags);
         }
     }
 
@@ -264,7 +298,7 @@ var BoxPointer = GObject.registerClass({
         let borderRadius = themeNode.get_length('-arrow-border-radius');
 
         let halfBorder = borderWidth / 2;
-        let halfBase = Math.floor(base / 2);
+        let halfBase = Math.floor(base/2);
 
         let backgroundColor = themeNode.get_color('-arrow-background-color');
 
@@ -345,7 +379,7 @@ var BoxPointer = GObject.registerClass({
         if (!skipTopRight) {
             cr.lineTo(x2 - borderRadius, y1);
             cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
-                   3 * Math.PI / 2, Math.PI * 2);
+                   3*Math.PI/2, Math.PI*2);
         }
 
         if (this._arrowSide == St.Side.RIGHT && rise) {
@@ -366,7 +400,7 @@ var BoxPointer = GObject.registerClass({
         if (!skipBottomRight) {
             cr.lineTo(x2, y2 - borderRadius);
             cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
-                   0, Math.PI / 2);
+                   0, Math.PI/2);
         }
 
         if (this._arrowSide == St.Side.BOTTOM && rise) {
@@ -387,7 +421,7 @@ var BoxPointer = GObject.registerClass({
         if (!skipBottomLeft) {
             cr.lineTo(x1 + borderRadius, y2);
             cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
-                   Math.PI / 2, Math.PI);
+                   Math.PI/2, Math.PI);
         }
 
         if (this._arrowSide == St.Side.LEFT && rise) {
@@ -396,7 +430,7 @@ var BoxPointer = GObject.registerClass({
                 cr.lineTo(x1 - rise, y1);
                 cr.lineTo(x1 + borderRadius, y1);
             } else if (skipBottomLeft) {
-                cr.lineTo(x1 - rise, y2);
+                cr.lineTo(x1 - rise, y2)
                 cr.lineTo(x1 - rise, y2 - halfBase);
             } else {
                 cr.lineTo(x1, this._arrowOrigin + halfBase);
@@ -408,7 +442,7 @@ var BoxPointer = GObject.registerClass({
         if (!skipTopLeft) {
             cr.lineTo(x1, y1 + borderRadius);
             cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
-                   Math.PI, 3 * Math.PI / 2);
+                   Math.PI, 3*Math.PI/2);
         }
 
         Clutter.cairo_set_source_color(cr, backgroundColor);
@@ -425,25 +459,15 @@ var BoxPointer = GObject.registerClass({
     }
 
     setPosition(sourceActor, alignment) {
-        if (!this._sourceActor || sourceActor != this._sourceActor) {
+        // We need to show it now to force an allocation,
-            if (this._sourceActorDestroyId) {
+        // so that we can query the correct size.
-                this._sourceActor.disconnect(this._sourceActorDestroyId);
+        this.show();
-                delete this._sourceActorDestroyId;
-            }
-
-            this._sourceActor = sourceActor;
-
-            if (this._sourceActor) {
-                this._sourceActorDestroyId = this._sourceActor.connect('destroy', () => {
-                    this._sourceActor = null;
-                    delete this._sourceActorDestroyId;
-                });
-            }
-        }
 
+        this._sourceActor = sourceActor;
         this._arrowAlignment = alignment;
 
-        this.queue_relayout();
+        this._reposition();
+        this._updateFlip();
     }
 
     setSourceAlignment(alignment) {
@@ -455,18 +479,14 @@ var BoxPointer = GObject.registerClass({
         this.setPosition(this._sourceActor, this._arrowAlignment);
     }
 
-    _reposition(allocationBox) {
+    _reposition() {
         let sourceActor = this._sourceActor;
         let alignment = this._arrowAlignment;
-        let monitorIndex = Main.layoutManager.findIndexForActor(sourceActor);
-
-        this._sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
-        this._workArea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
 
         // Position correctly relative to the sourceActor
         let sourceNode = sourceActor.get_theme_node();
         let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
-        let sourceAllocation = this._sourceAllocation;
+        let sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
         let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
         let sourceCenterY = sourceAllocation.y1 + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) * this._sourceAlignment;
         let [minWidth, minHeight, natWidth, natHeight] = this.get_preferred_size();
@@ -474,7 +494,7 @@ var BoxPointer = GObject.registerClass({
         // We also want to keep it onscreen, and separated from the
         // edge by the same distance as the main part of the box is
         // separated from its sourceActor
-        let workarea = this._workArea;
+        let monitor = Main.layoutManager.findMonitorForActor(sourceActor);
         let themeNode = this.get_theme_node();
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let arrowBase = themeNode.get_length('-arrow-base');
@@ -513,7 +533,7 @@ var BoxPointer = GObject.registerClass({
         //     of the box to maintain the arrow's accuracy.
 
         let arrowOrigin;
-        let halfBase = Math.floor(arrowBase / 2);
+        let halfBase = Math.floor(arrowBase/2);
         let halfBorder = borderWidth / 2;
         let halfMargin = margin / 2;
         let [x1, y1] = [halfBorder, halfBorder];
@@ -524,8 +544,8 @@ var BoxPointer = GObject.registerClass({
         case St.Side.BOTTOM:
             resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
 
-            resX = Math.max(resX, workarea.x + padding);
+            resX = Math.max(resX, monitor.x + padding);
-            resX = Math.min(resX, workarea.x + workarea.width - (padding + natWidth));
+            resX = Math.min(resX, monitor.x + monitor.width - (padding + natWidth));
 
             arrowOrigin = sourceCenterX - resX;
             if (arrowOrigin <= (x1 + (borderRadius + halfBase))) {
@@ -543,8 +563,8 @@ var BoxPointer = GObject.registerClass({
         case St.Side.RIGHT:
             resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
 
-            resY = Math.max(resY, workarea.y + padding);
+            resY = Math.max(resY, monitor.y + padding);
-            resY = Math.min(resY, workarea.y + workarea.height - (padding + natHeight));
+            resY = Math.min(resY, monitor.y + monitor.height - (padding + natHeight));
 
             arrowOrigin = sourceCenterY - resY;
             if (arrowOrigin <= (y1 + (borderRadius + halfBase))) {
@@ -568,8 +588,9 @@ var BoxPointer = GObject.registerClass({
             parent = parent.get_parent();
         }
 
-        // Actually set the position
+        this._xPosition = Math.floor(x);
-        allocationBox.set_origin(Math.floor(x), Math.floor(y));
+        this._yPosition = Math.floor(y);
+        this._shiftActor();
     }
 
     // @origin: Coordinate specifying middle of the arrow, along
@@ -592,30 +613,44 @@ var BoxPointer = GObject.registerClass({
         }
     }
 
+    _shiftActor() {
+        // Since the position of the BoxPointer depends on the allocated size
+        // of the BoxPointer and the position of the source actor, trying
+        // to position the BoxPointer via the x/y properties will result in
+        // allocation loops and warnings. Instead we do the positioning via
+        // the anchor point, which is independent of allocation, and leave
+        // x == y == 0.
+        this.set_anchor_point(-(this._xPosition + this._xOffset),
+                              -(this._yPosition + this._yOffset));
+    }
+
     _calculateArrowSide(arrowSide) {
-        let sourceAllocation = this._sourceAllocation;
+        let sourceAllocation = Shell.util_get_transformed_allocation(this._sourceActor);
         let [minWidth, minHeight, boxWidth, boxHeight] = this.get_preferred_size();
-        let workarea = this._workArea;
+        let monitorActor = this.sourceActor;
+        if (!monitorActor)
+            monitorActor = this;
+        let monitor = Main.layoutManager.findMonitorForActor(monitorActor);
 
         switch (arrowSide) {
         case St.Side.TOP:
-            if (sourceAllocation.y2 + boxHeight > workarea.y + workarea.height &&
+            if (sourceAllocation.y2 + boxHeight > monitor.y + monitor.height &&
-                boxHeight < sourceAllocation.y1 - workarea.y)
+                boxHeight < sourceAllocation.y1 - monitor.y)
                 return St.Side.BOTTOM;
             break;
         case St.Side.BOTTOM:
-            if (sourceAllocation.y1 - boxHeight < workarea.y &&
+            if (sourceAllocation.y1 - boxHeight < monitor.y &&
-                boxHeight < workarea.y + workarea.height - sourceAllocation.y2)
+                boxHeight < monitor.y + monitor.height - sourceAllocation.y2)
                 return St.Side.TOP;
             break;
         case St.Side.LEFT:
-            if (sourceAllocation.x2 + boxWidth > workarea.x + workarea.width &&
+            if (sourceAllocation.x2 + boxWidth > monitor.x + monitor.width &&
-                boxWidth < sourceAllocation.x1 - workarea.x)
+                boxWidth < sourceAllocation.x1 - monitor.x)
                 return St.Side.RIGHT;
             break;
         case St.Side.RIGHT:
-            if (sourceAllocation.x1 - boxWidth < workarea.x &&
+            if (sourceAllocation.x1 - boxWidth < monitor.x &&
-                boxWidth < workarea.x + workarea.width - sourceAllocation.x2)
+                boxWidth < monitor.x + monitor.width - sourceAllocation.x2)
                 return St.Side.LEFT;
             break;
         }
@@ -623,16 +658,38 @@ var BoxPointer = GObject.registerClass({
         return arrowSide;
     }
 
-    _updateFlip(allocationBox) {
+    _updateFlip() {
         let arrowSide = this._calculateArrowSide(this._userArrowSide);
         if (this._arrowSide != arrowSide) {
             this._arrowSide = arrowSide;
-            this._reposition(allocationBox);
+            this._reposition();
+            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
+                this.queue_relayout();
+                return false;
+            });
 
             this.emit('arrow-side-changed');
         }
     }
 
+    set xOffset(offset) {
+        this._xOffset = offset;
+        this._shiftActor();
+    }
+
+    get xOffset() {
+        return this._xOffset;
+    }
+
+    set yOffset(offset) {
+        this._yOffset = offset;
+        this._shiftActor();
+    }
+
+    get yOffset() {
+        return this._yOffset;
+    }
+
     updateArrowSide(side) {
         this._arrowSide = side;
         this._border.queue_repaint();

js/ui/calendar.js

@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+const St = imports.gi.St;
 const Signals = imports.signals;
+const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;
@@ -9,15 +14,13 @@ const MessageTray = imports.ui.messageTray;
 const Mpris = imports.ui.mpris;
 const Util = imports.misc.util;
 
-const { loadInterfaceXML } = imports.misc.fileUtils;
-
 var MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 var SHOW_WEEKDATE_KEY = 'show-weekdate';
 var ELLIPSIS_CHAR = '\u2026';
 
 var MESSAGE_ICON_SIZE = -1; // pick up from CSS
 
-var NC_ = (context, str) => `${context}\u0004${str}`;
+var NC_ = (context, str) => context + '\u0004' + str;
 
 function sameYear(dateA, dateB) {
     return (dateA.getYear() == dateB.getYear());
@@ -38,7 +41,7 @@ function isToday(date) {
 function _isWorkDay(date) {
     /* Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
     let days = C_('calendar-no-work', "06");
-    return !days.includes(date.getDay().toString());
+    return days.indexOf(date.getDay().toString()) == -1;
 }
 
 function _getBeginningOfDay(date) {
@@ -123,7 +126,19 @@ var EmptyEventSource = class EmptyEventSource {
 };
 Signals.addSignalMethods(EmptyEventSource.prototype);
 
-const CalendarServerIface = loadInterfaceXML('org.gnome.Shell.CalendarServer');
+const CalendarServerIface = `
+<node>
+<interface name="org.gnome.Shell.CalendarServer">
+<method name="GetEvents">
+    <arg type="x" direction="in" />
+    <arg type="x" direction="in" />
+    <arg type="b" direction="in" />
+    <arg type="a(sssbxxa{sv})" direction="out" />
+</method>
+<property name="HasCalendars" type="b" access="read" />
+<signal name="Changed" />
+</interface>
+</node>`;
 
 const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);
 
@@ -143,7 +158,8 @@ function _datesEqual(a, b) {
     return true;
 }
 
-function _dateIntervalsOverlap(a0, a1, b0, b1) {
+function _dateIntervalsOverlap(a0, a1, b0, b1)
+{
     if (a1 <= b0)
         return false;
     else if (b1 <= a0)
@@ -167,7 +183,7 @@ var DBusEventSource = class DBusEventSource {
             try {
                 this._dbusProxy.init_finish(result);
                 loaded = true;
-            } catch (e) {
+            } catch(e) {
                 if (e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) {
                     // Ignore timeouts and install signals as normal, because with high
                     // probability the service will appear later on, and we will get a
@@ -177,7 +193,7 @@ var DBusEventSource = class DBusEventSource {
                     // about the HasCalendars property and would cause an exception trying
                     // to read it)
                 } else {
-                    log(`Error loading calendars: ${e.message}`);
+                    log('Error loading calendars: ' + e.message);
                     return;
                 }
             }
@@ -262,7 +278,7 @@ var DBusEventSource = class DBusEventSource {
         if (!this._initialized)
             return;
 
-        if (this._curRequestBegin && this._curRequestEnd) {
+        if (this._curRequestBegin && this._curRequestEnd){
             this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
                                             this._curRequestEnd.getTime() / 1000,
                                             forceReload,
@@ -284,7 +300,7 @@ var DBusEventSource = class DBusEventSource {
 
     getEvents(begin, end) {
         let result = [];
-        for (let n = 0; n < this._events.length; n++) {
+        for(let n = 0; n < this._events.length; n++) {
             let event = this._events[n];
 
             if (_dateIntervalsOverlap (event.date, event.end, begin, end)) {
@@ -319,7 +335,7 @@ var Calendar = class Calendar {
         this._weekStart = Shell.util_get_week_start();
         this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.calendar' });
 
-        this._settings.connect(`changed::${SHOW_WEEKDATE_KEY}`, this._onSettingsChange.bind(this));
+        this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, this._onSettingsChange.bind(this));
         this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
 
         /**
@@ -401,8 +417,8 @@ var Calendar = class Calendar {
         this._topBox.add(this._backButton);
         this._backButton.connect('clicked', this._onPrevMonthButtonClicked.bind(this));
 
-        this._monthLabel = new St.Label({ style_class: 'calendar-month-label',
+        this._monthLabel = new St.Label({style_class: 'calendar-month-label',
-                                          can_focus: true });
+                                         can_focus: true });
         this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
 
         this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward pager-button',
@@ -465,7 +481,8 @@ var Calendar = class Calendar {
                 let day = 32 - new Date(newDate.getFullYear() - 1, 11, 32).getDate();
                 newDate = new Date(newDate.getFullYear() - 1, 11, day);
             }
-        } else {
+        }
+        else {
             newDate.setMonth(oldMonth - 1);
             if (newDate.getMonth() != oldMonth - 1) {
                 let day = 32 - new Date(newDate.getFullYear(), oldMonth - 1, 32).getDate();
@@ -488,7 +505,8 @@ var Calendar = class Calendar {
                 let day = 32 - new Date(newDate.getFullYear() + 1, 0, 32).getDate();
                 newDate = new Date(newDate.getFullYear() + 1, 0, day);
             }
-        } else {
+        }
+        else {
             newDate.setMonth(oldMonth + 1);
             if (newDate.getMonth() != oldMonth + 1) {
                 let day = 32 - new Date(newDate.getFullYear(), oldMonth + 1, 32).getDate();
@@ -543,6 +561,8 @@ var Calendar = class Calendar {
         this._calendarBegin = new Date(beginDate);
         this._markedAsToday = now;
 
+        let year = beginDate.getYear();
+
         let daysToWeekStart = (7 + beginDate.getDay() - this._weekStart) % 7;
         let startsOnWeekStart = daysToWeekStart == 0;
         let weekPadding = startsOnWeekStart ? 7 : 0;
@@ -554,7 +574,7 @@ var Calendar = class Calendar {
         let row = 2;
         // nRows here means 6 weeks + one header + one navbar
         let nRows = 8;
-        while (row < nRows) {
+        while (row < 8) {
             // xgettext:no-javascript-format
             let button = new St.Button({ label: iter.toLocaleFormat(C_("date day number format", "%d")),
                                          can_focus: true });
@@ -580,12 +600,12 @@ var Calendar = class Calendar {
 
             // Hack used in lieu of border-collapse - see gnome-shell.css
             if (row == 2)
-                styleClass = `calendar-day-top ${styleClass}`;
+                styleClass = 'calendar-day-top ' + styleClass;
 
             let leftMost = rtl ? iter.getDay() == (this._weekStart + 6) % 7
                                : iter.getDay() == this._weekStart;
             if (leftMost)
-                styleClass = `calendar-day-left ${styleClass}`;
+                styleClass = 'calendar-day-left ' + styleClass;
 
             if (sameDay(now, iter))
                 styleClass += ' calendar-today';
@@ -643,9 +663,9 @@ var Calendar = class Calendar {
                 button.add_style_pseudo_class('selected');
                 if (this._shouldDateGrabFocus)
                     button.grab_key_focus();
-            } else {
-                button.remove_style_pseudo_class('selected');
             }
+            else
+                button.remove_style_pseudo_class('selected');
         });
     }
 };
@@ -1063,7 +1083,7 @@ var CalendarMessageList = class CalendarMessageList {
                                                overlay_scrollbars: true,
                                                x_expand: true, y_expand: true,
                                                x_fill: true, y_fill: true });
-        this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
+        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         box.add_actor(this._scrollView);
 
         this._clearButton = new St.Button({ style_class: 'message-list-clear-button button',
@@ -1072,7 +1092,7 @@ var CalendarMessageList = class CalendarMessageList {
         this._clearButton.set_x_align(Clutter.ActorAlign.END);
         this._clearButton.connect('clicked', () => {
             let sections = [...this._sections.keys()];
-            sections.forEach((s) => s.clear());
+            sections.forEach((s) => { s.clear(); });
         });
         box.add_actor(this._clearButton);
 
@@ -1098,7 +1118,7 @@ var CalendarMessageList = class CalendarMessageList {
     _addSection(section) {
         let obj = {
             destroyId: 0,
-            visibleId: 0,
+            visibleId:  0,
             emptyChangedId: 0,
             canClearChangedId: 0,
             keyFocusId: 0

js/ui/checkBox.js

@@ -1,4 +1,6 @@
-const { Clutter, Pango, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 
 var CheckBox = class CheckBox {
     constructor(label) {

js/ui/closeDialog.js

@@ -1,17 +1,22 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
-var FROZEN_WINDOW_BRIGHTNESS = -0.3;
+var FROZEN_WINDOW_BRIGHTNESS = -0.3
-var DIALOG_TRANSITION_TIME = 0.15;
+var DIALOG_TRANSITION_TIME = 0.15
 var ALIVE_TIMEOUT = 5000;
 
 var CloseDialog = GObject.registerClass({
-    Implements: [Meta.CloseDialog],
+    Implements: [ Meta.CloseDialog ],
     Properties: {
         'window': GObject.ParamSpec.override('window', Meta.CloseDialog)
     },
@@ -56,12 +61,12 @@ var CloseDialog = GObject.registerClass({
         this._dialog.height = windowActor.height;
 
         this._dialog.addContent(this._createDialogContent());
-        this._dialog.addButton({ label: _('Force Quit'),
+        this._dialog.addButton({ label:   _('Force Quit'),
-                                 action: this._onClose.bind(this),
+                                 action:  this._onClose.bind(this),
                                  default: true });
-        this._dialog.addButton({ label: _('Wait'),
+        this._dialog.addButton({ label:  _('Wait'),
                                  action: this._onWait.bind(this),
-                                 key: Clutter.Escape });
+                                 key:    Clutter.Escape });
 
         global.focus_manager.add_group(this._dialog);
     }
@@ -165,7 +170,7 @@ var CloseDialog = GObject.registerClass({
         GLib.source_remove(this._timeoutId);
         this._timeoutId = 0;
 
-        global.display.disconnect(this._windowFocusChangedId);
+        global.display.disconnect(this._windowFocusChangedId)
         this._windowFocusChangedId = 0;
 
         global.stage.disconnect(this._keyFocusChangedId);

js/ui/components/__init__.js

@@ -13,13 +13,13 @@ var ComponentManager = class {
         let newEnabledComponents = Main.sessionMode.components;
 
         newEnabledComponents.filter(
-            name => !this._enabledComponents.includes(name)
+            name => this._enabledComponents.indexOf(name) == -1
         ).forEach(name => {
             this._enableComponent(name);
         });
 
         this._enabledComponents.filter(
-            name => !newEnabledComponents.includes(name)
+            name => newEnabledComponents.indexOf(name) == -1
         ).forEach(name => {
             this._disableComponent(name);
         });
@@ -37,8 +37,8 @@ var ComponentManager = class {
         if (component)
             return component;
 
-        if (Main.sessionMode.isLocked)
+	if (Main.sessionMode.isLocked)
-            return null;
+	    return null;
 
         let constructor = this._importComponent(name);
         component = new constructor();
@@ -48,7 +48,7 @@ var ComponentManager = class {
 
     _enableComponent(name) {
         let component = this._ensureComponent(name);
-        if (component)
+	if (component)
             component.enable();
     }
 

js/ui/components/automountManager.js

@@ -1,8 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Gio, GLib } = imports.gi;
 const Mainloop = imports.mainloop;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
 const Params = imports.misc.params;
+const Shell = imports.gi.Shell;
 
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
@@ -94,10 +96,10 @@ var AutomountManager = class {
         if (!this._session.SessionIsActive)
             return;
 
-        let player = global.display.get_sound_player();
+        let sound = global.display.get_sound();
-        player.play_from_theme('device-removed-media',
+        sound.play_from_theme('device-removed-media',
-                               _("External drive disconnected"),
+                              _("External drive disconnected"),
-                               null);
+                              null);
     }
 
     _onDriveEjectButton(monitor, drive) {
@@ -109,23 +111,25 @@ var AutomountManager = class {
         // we force stop/eject in this case, so we don't have to pass a
         // mount operation object
         if (drive.can_stop()) {
-            drive.stop(Gio.MountUnmountFlags.FORCE, null, null,
+            drive.stop
-                (drive, res) => {
+                (Gio.MountUnmountFlags.FORCE, null, null,
-                    try {
+                 (drive, res) => {
-                        drive.stop_finish(res);
+                     try {
-                    } catch (e) {
+                         drive.stop_finish(res);
-                        log(`Unable to stop the drive after drive-eject-button ${e.toString()}`);
+                     } catch (e) {
-                    }
+                         log("Unable to stop the drive after drive-eject-button " + e.toString());
-                });
+                     }
+                 });
         } else if (drive.can_eject()) {
-            drive.eject_with_operation(Gio.MountUnmountFlags.FORCE, null, null,
+            drive.eject_with_operation 
-                (drive, res) => {
+                (Gio.MountUnmountFlags.FORCE, null, null,
-                    try {
+                 (drive, res) => {
-                        drive.eject_with_operation_finish(res);
+                     try {
-                    } catch (e) {
+                         drive.eject_with_operation_finish(res);
-                        log(`Unable to eject the drive after drive-eject-button ${e.toString()}`);
+                     } catch (e) {
-                    }
+                         log("Unable to eject the drive after drive-eject-button " + e.toString());
-                });
+                     }
+                 });
         }
     }
 
@@ -198,20 +202,12 @@ var AutomountManager = class {
             // error strings are not unique for the cases in the comments below.
             if (e.message.includes('No key available with this passphrase') || // cryptsetup
                 e.message.includes('No key available to unlock device') ||     // udisks (no password)
-                // libblockdev wrong password opening LUKS device
+                e.message.includes('Error unlocking')) {                       // udisks (wrong password)
-                e.message.includes('Failed to activate device: Incorrect passphrase') ||
-                // cryptsetup returns EINVAL in many cases, including wrong TCRYPT password/parameters
-                e.message.includes('Failed to load device\'s parameters: Invalid argument')) {
-
                 this._reaskPassword(volume);
             } else {
-                if (e.message.includes('Compiled against a version of libcryptsetup that does not support the VeraCrypt PIM setting')) {
-                    Main.notifyError(_("Unable to unlock volume"),
-                        _("The installed udisks version does not support the PIM setting"));
-                }
-
                 if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                    log(`Unable to mount volume ${volume.get_name()}: ${e.toString()}`);
+                    log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
+
                 this._closeOperation(volume);
             }
         }

js/ui/components/autorunManager.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Gio, St } = imports.gi;
+const Gio = imports.gi.Gio;
+const St = imports.gi.St;
 
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
@@ -40,7 +41,7 @@ function isMountRootHidden(root) {
     let path = root.get_path();
 
     // skip any mounts in hidden directory hierarchies
-    return (path.includes('/.'));
+    return (path.indexOf('/.') != -1);
 }
 
 function isMountNonLocal(mount) {
@@ -65,7 +66,8 @@ function startAppForMount(app, mount) {
         retval = app.launch(files, 
                             global.create_app_launch_context(0, -1));
     } catch (e) {
-        log(`Unable to launch the application ${app.get_name()}: ${e}`);
+        log('Unable to launch the application ' + app.get_name()
+            + ': ' + e.toString());
     }
 
     return retval;
@@ -106,7 +108,8 @@ var ContentTypeDiscoverer = class {
         try {
             contentTypes = mount.guess_content_type_finish(res);
         } catch (e) {
-            log(`Unable to guess content types on added mount ${mount.get_name()}: ${e}`);
+            log('Unable to guess content types on added mount ' + mount.get_name()
+                + ': ' + e.toString());
         }
 
         if (contentTypes.length) {
@@ -190,15 +193,15 @@ var AutorunDispatcher = class {
 
     _getAutorunSettingForType(contentType) {
         let runApp = this._settings.get_strv(SETTING_START_APP);
-        if (runApp.includes(contentType))
+        if (runApp.indexOf(contentType) != -1)
             return AutorunSetting.RUN;
 
         let ignore = this._settings.get_strv(SETTING_IGNORE);
-        if (ignore.includes(contentType))
+        if (ignore.indexOf(contentType) != -1)
             return AutorunSetting.IGNORE;
 
         let openFiles = this._settings.get_strv(SETTING_OPEN_FOLDER);
-        if (openFiles.includes(contentType))
+        if (openFiles.indexOf(contentType) != -1)
             return AutorunSetting.FILES;
 
         return AutorunSetting.ASK;

js/ui/components/keyring.js

@@ -1,19 +1,25 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gcr, Gio, GObject, Pango, Shell, St } = imports.gi;
+const Shell = imports.gi.Shell;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+const Pango = imports.gi.Pango;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Gcr = imports.gi.Gcr;
 
 const Animation = imports.ui.animation;
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
 const CheckBox = imports.ui.checkBox;
+const Tweener = imports.ui.tweener;
 
 var WORK_SPINNER_ICON_SIZE = 16;
 
-var KeyringDialog = GObject.registerClass(
+var KeyringDialog = class extends ModalDialog.ModalDialog {
-class KeyringDialog extends ModalDialog.ModalDialog {
+    constructor() {
-    _init() {
+        super({ styleClass: 'prompt-dialog' });
-        super._init({ styleClass: 'prompt-dialog' });
 
         this.prompt = new Shell.KeyringPrompt();
         this.prompt.connect('show-password', this._onShowPassword.bind(this));
@@ -24,8 +30,20 @@ class KeyringDialog extends ModalDialog.ModalDialog {
         this._content = new Dialog.MessageDialogContent({ icon });
         this.contentLayout.add(this._content);
 
+        // FIXME: Why does this break now?
+        /*
         this.prompt.bind_property('message', this._content, 'title', GObject.BindingFlags.SYNC_CREATE);
         this.prompt.bind_property('description', this._content, 'body', GObject.BindingFlags.SYNC_CREATE);
+        */
+        this.prompt.connect('notify::message', () => {
+            this._content.title = this.prompt.message;
+        });
+        this._content.title = this.prompt.message;
+
+        this.prompt.connect('notify::description', () => {
+            this._content.body = this.prompt.description;
+        });
+        this._content.body = this.prompt.description;
 
         this._workSpinner = null;
         this._controlTable = null;
@@ -162,7 +180,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {
         // NOTE: ModalDialog.open() is safe to call if the dialog is
         // already open - it just returns true without side-effects
         if (this.open())
-            return true;
+          return true;
 
         // The above fail if e.g. unable to get input grab
         //
@@ -172,7 +190,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {
 
         log('keyringPrompt: Failed to show modal dialog.' +
             ' Dismissing prompt request');
-        this.prompt.cancel();
+        this.prompt.cancel()
         return false;
     }
 
@@ -213,7 +231,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {
     _onCancelButton() {
         this.prompt.cancel();
     }
-});
+};
 
 var KeyringDummyDialog = class {
     constructor() {

js/ui/components/networkAgent.js

@@ -1,21 +1,28 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, NM, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const NM = imports.gi.NM;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
+const St = imports.gi.St;
 
 const Config = imports.misc.config;
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const ModalDialog = imports.ui.modalDialog;
+const PopupMenu = imports.ui.popupMenu;
 const ShellEntry = imports.ui.shellEntry;
 
 const VPN_UI_GROUP = 'VPN Plugin UI';
 
-var NetworkSecretDialog = GObject.registerClass(
+var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
-class NetworkSecretDialog extends ModalDialog.ModalDialog {
+    constructor(agent, requestId, connection, settingName, hints, flags, contentOverride) {
-    _init(agent, requestId, connection, settingName, hints, flags, contentOverride) {
+        super({ styleClass: 'prompt-dialog' });
-        super._init({ styleClass: 'prompt-dialog' });
 
         this._agent = agent;
         this._requestId = requestId;
@@ -80,9 +87,8 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
                         secret.valid = secret.value.length > 0;
                     this._updateOkButton();
                 });
-            } else {
+            } else
                 secret.valid = true;
-            }
 
             if (rtl) {
                 layout.attach(secret.entry, 0, pos, 1, 1);
@@ -105,20 +111,20 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
             descriptionLabel.clutter_text.line_wrap = true;
             descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
 
-            contentBox.messageBox.add(descriptionLabel,
+            messageBox.add(descriptionLabel,
-                                      { y_fill: true,
+                           { y_fill:  true,
-                                        y_align: St.Align.START,
+                             y_align: St.Align.START,
-                                        expand: true });
+                             expand: true });
         }
 
-        this._okButton = { label: _("Connect"),
+        this._okButton = { label:  _("Connect"),
                            action: this._onOk.bind(this),
                            default: true
                          };
 
         this.setButtons([{ label: _("Cancel"),
                            action: this.cancel.bind(this),
-                           key: Clutter.KEY_Escape,
+                           key:    Clutter.KEY_Escape,
                          },
                          this._okButton]);
 
@@ -177,25 +183,24 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
         let value = secret.value;
         if (secret.wep_key_type == NM.WepKeyType.KEY) {
             if (value.length == 10 || value.length == 26) {
-                for (let i = 0; i < value.length; i++) {
+		for (let i = 0; i < value.length; i++) {
                     if (!((value[i] >= 'a' && value[i] <= 'f')
                           || (value[i] >= 'A' && value[i] <= 'F')
                           || (value[i] >= '0' && value[i] <= '9')))
                         return false;
-                }
+		}
-            } else if (value.length == 5 || value.length == 13) {
+	    } else if (value.length == 5 || value.length == 13) {
-                for (let i = 0; i < value.length; i++) {
+		for (let i = 0; i < value.length; i++) {
                     if (!((value[i] >= 'a' && value[i] <= 'z')
                           || (value[i] >= 'A' && value[i] <= 'Z')))
                         return false;
                 }
-            } else {
+            } else
                 return false;
-            }
+	} else if (secret.wep_key_type == NM.WepKeyType.PASSPHRASE) {
-        } else if (secret.wep_key_type == NM.WepKeyType.PASSPHRASE) {
+	    if (value.length < 0 || value.length > 64)
-            if (value.length < 0 || value.length > 64)
+	        return false;
-                return false;
+	}
-        }
         return true;
     }
 
@@ -216,7 +221,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
                            validate: this._validateWpaPsk, password: true });
             break;
         case 'none': // static WEP
-            secrets.push({ label: _("Key: "), key: `wep-key${wirelessSecuritySetting.wep_tx_keyidx}`,
+            secrets.push({ label: _("Key: "), key: 'wep-key' + wirelessSecuritySetting.wep_tx_keyidx,
                            value: wirelessSecuritySetting.get_wep_key(wirelessSecuritySetting.wep_tx_keyidx) || '',
                            wep_key_type: wirelessSecuritySetting.wep_key_type,
                            validate: this._validateStaticWep, password: true });
@@ -232,12 +237,13 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
             this._get8021xSecrets(secrets);
             break;
         default:
-            log(`Invalid wireless key management: ${wirelessSecuritySetting.key_mgmt}`);
+            log('Invalid wireless key management: ' + wirelessSecuritySetting.key_mgmt);
         }
     }
 
     _get8021xSecrets(secrets) {
         let ieee8021xSetting = this._connection.get_setting_802_1x();
+        let phase2method;
 
         /* If hints were given we know exactly what we need to ask */
         if (this._settingName == "802-1x" && this._hints.length) {
@@ -274,7 +280,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
                            value: ieee8021xSetting.private_key_password || '', password: true });
             break;
         default:
-            log(`Invalid EAP/IEEE802.1x method: ${ieee8021xSetting.get_eap_method(0)}`);
+            log('Invalid EAP/IEEE802.1x method: ' + ieee8021xSetting.get_eap_method(0));
         }
     }
 
@@ -305,7 +311,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
         let ssid;
 
         let content = { };
-        content.secrets = [];
+        content.secrets = [ ];
 
         switch (connectionType) {
         case '802-11-wireless':
@@ -328,7 +334,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
             this._getPPPoESecrets(content.secrets);
             break;
         case 'gsm':
-            if (this._hints.includes('pin')) {
+            if (this._hints.indexOf('pin') != -1) {
                 let gsmSetting = this._connection.get_setting_gsm();
                 content.title = _("PIN code required");
                 content.message = _("PIN code is needed for the mobile broadband device");
@@ -344,12 +350,12 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
             this._getMobileSecrets(content.secrets, connectionType);
             break;
         default:
-            log(`Invalid connection type: ${connectionType}`);
+            log('Invalid connection type: ' + connectionType);
-        }
+        };
 
         return content;
     }
-});
+};
 
 var VPNRequestHandler = class {
     constructor(agent, requestId, authHelper, serviceType, connection, hints, flags) {
@@ -360,15 +366,16 @@ var VPNRequestHandler = class {
         this._pluginOutBuffer = [];
         this._title = null;
         this._description = null;
-        this._content = [];
+        this._content = [ ];
         this._shellDialog = null;
 
         let connectionSetting = connection.get_setting_connection();
 
-        let argv = [authHelper.fileName,
+        let argv = [ authHelper.fileName,
-                    '-u', connectionSetting.uuid,
+                     '-u', connectionSetting.uuid,
-                    '-n', connectionSetting.id,
+                     '-n', connectionSetting.id,
-                    '-s', serviceType];
+                     '-s', serviceType
+                   ];
         if (authHelper.externalUIMode)
             argv.push('--external-ui-mode');
         if (flags & NM.SecretAgentGetSecretsFlags.ALLOW_INTERACTION)
@@ -407,7 +414,7 @@ var VPNRequestHandler = class {
                                                     this._vpnChildFinished.bind(this));
 
             this._writeConnection();
-        } catch (e) {
+        } catch(e) {
             logError(e, 'error while spawning VPN auth helper');
 
             this._agent.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
@@ -424,7 +431,7 @@ var VPNRequestHandler = class {
         } else {
             try {
                 this._stdin.write('QUIT\n\n', null);
-            } catch (e) { /* ignore broken pipe errors */ }
+            } catch(e) { /* ignore broken pipe errors */ }
         }
 
         this.destroy();
@@ -459,9 +466,8 @@ var VPNRequestHandler = class {
                 this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
             else
                 this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
-        } else {
+        } else
             this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
-        }
 
         this.destroy();
     }
@@ -474,7 +480,7 @@ var VPNRequestHandler = class {
             if (line == '' && this._previousLine == '') {
                 try {
                     this._stdin.write('QUIT\n\n', null);
-                } catch (e) { /* ignore broken pipe errors */ }
+                } catch(e) { /* ignore broken pipe errors */ }
             } else {
                 this._agent.set_password(this._requestId, this._previousLine, line);
                 this._previousLine = undefined;
@@ -562,7 +568,7 @@ var VPNRequestHandler = class {
                     this._agent.set_password(this._requestId, groups[i], value);
                 }
             }
-        } catch (e) {
+        } catch(e) {
             // No output is a valid case it means "both secrets are stored"
             if (data.length > 0) {
                 logError(e, 'error while reading VPN plugin output keyfile');
@@ -588,15 +594,15 @@ var VPNRequestHandler = class {
 
         try {
             vpnSetting.foreach_data_item((key, value) => {
-                this._stdin.write(`DATA_KEY=${key}\n`, null);
+                this._stdin.write('DATA_KEY=' + key + '\n', null);
-                this._stdin.write(`DATA_VAL=${value || ''}\n\n`, null);
+                this._stdin.write('DATA_VAL=' + (value || '') + '\n\n', null);
             });
             vpnSetting.foreach_secret((key, value) => {
-                this._stdin.write(`SECRET_KEY=${key}\n`, null);
+                this._stdin.write('SECRET_KEY=' + key + '\n', null);
-                this._stdin.write(`SECRET_VAL=${value || ''}\n\n`, null);
+                this._stdin.write('SECRET_VAL=' + (value || '') + '\n\n', null);
             });
             this._stdin.write('DONE\n\n', null);
-        } catch (e) {
+        } catch(e) {
             logError(e, 'internal error while writing connection to helper');
 
             this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
@@ -620,9 +626,9 @@ var NetworkAgent = class {
         this._pluginDir = Gio.file_new_for_path(Config.VPNDIR);
         try {
             let monitor = this._pluginDir.monitor(Gio.FileMonitorFlags.NONE, null);
-            monitor.connect('changed', () => this._vpnCacheBuilt = false);
+            monitor.connect('changed', () => { this._vpnCacheBuilt = false; });
-        } catch (e) {
+        } catch(e) {
-            log(`Failed to create monitor for VPN plugin dir: ${e.message}`);
+            log('Failed to create monitor for VPN plugin dir: ' + e.message);
         }
 
         this._native.connect('new-request', this._newRequest.bind(this));
@@ -633,7 +639,7 @@ var NetworkAgent = class {
             try {
                 this._native.init_finish(res);
                 this._initialized = true;
-            } catch (e) {
+            } catch(e) {
                 this._native = null;
                 logError(e, 'error initializing the NetworkManager Agent');
             }
@@ -681,13 +687,12 @@ var NetworkAgent = class {
         let connectionSetting = connection.get_setting_connection();
         let connectionType = connectionSetting.get_connection_type();
         switch (connectionType) {
-        case '802-11-wireless': {
+        case '802-11-wireless':
             let wirelessSetting = connection.get_setting_wireless();
             let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
             title = _("Authentication required by wireless network");
             body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
             break;
-        }
         case '802-3-ethernet':
             title = _("Wired 802.1X authentication");
             body = _("A password is required to connect to “%s”.".format(connection.get_id()));
@@ -697,19 +702,20 @@ var NetworkAgent = class {
             body = _("A password is required to connect to “%s”.".format(connection.get_id()));
             break;
         case 'gsm':
-            if (hints.includes('pin')) {
+            if (hints.indexOf('pin') != -1) {
+                let gsmSetting = connection.get_setting_gsm();
                 title = _("PIN code required");
-                body = _("PIN code is needed for the mobile broadband device");
+                message = _("PIN code is needed for the mobile broadband device");
                 break;
             }
             // fall through
         case 'cdma':
         case 'bluetooth':
             title = _("Mobile broadband network password");
-            body = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
+            message = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
             break;
         default:
-            log(`Invalid connection type: ${connectionType}`);
+            log('Invalid connection type: ' + connectionType);
             this._native.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
             return;
         }

js/ui/components/polkitAgent.js

@@ -1,24 +1,33 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { AccountsService, Clutter, Gio, GLib,
+const Signals = imports.signals;
-        GObject, Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
+const Shell = imports.gi.Shell;
+const AccountsService = imports.gi.AccountsService;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+const Pango = imports.gi.Pango;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Mainloop = imports.mainloop;
+const Polkit = imports.gi.Polkit;
+const PolkitAgent = imports.gi.PolkitAgent;
 
 const Animation = imports.ui.animation;
+const Components = imports.ui.components;
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
 const UserWidget = imports.ui.userWidget;
+const Tweener = imports.ui.tweener;
 
 var DIALOG_ICON_SIZE = 48;
 
 var WORK_SPINNER_ICON_SIZE = 16;
 
-var AuthenticationDialog = GObject.registerClass({
+var AuthenticationDialog = class extends ModalDialog.ModalDialog {
-    Signals: { 'done': { param_types: [GObject.TYPE_BOOLEAN] } }
+    constructor(actionId, body, cookie, userNames) {
-}, class AuthenticationDialog extends ModalDialog.ModalDialog {
+        super({ styleClass: 'prompt-dialog' });
-    _init(actionId, body, cookie, userNames) {
-        super._init({ styleClass: 'prompt-dialog' });
 
         this.actionId = actionId;
         this.message = body;
@@ -26,7 +35,7 @@ var AuthenticationDialog = GObject.registerClass({
         this._wasDismissed = false;
 
         this._sessionUpdatedId = Main.sessionMode.connect('updated', () => {
-            this.visible = !Main.sessionMode.isLocked;
+            this._group.visible = !Main.sessionMode.isLocked;
         });
 
         this.connect('closed', this._onDialogClosed.bind(this));
@@ -38,19 +47,19 @@ var AuthenticationDialog = GObject.registerClass({
         this.contentLayout.add_actor(content);
 
         if (userNames.length > 1) {
-            log(`polkitAuthenticationAgent: Received ${userNames.length} ` +
+            log('polkitAuthenticationAgent: Received ' + userNames.length +
-                'identities that can be used for authentication. Only ' +
+                ' identities that can be used for authentication. Only ' +
                 'considering one.');
         }
 
         let userName = GLib.get_user_name();
-        if (!userNames.includes(userName))
+        if (userNames.indexOf(userName) < 0)
             userName = 'root';
-        if (!userNames.includes(userName))
+        if (userNames.indexOf(userName) < 0)
             userName = userNames[0];
 
         this._user = AccountsService.UserManager.get_default().get_user(userName);
-        let userRealName = this._user.get_real_name();
+        let userRealName = this._user.get_real_name()
         this._userLoadedId = this._user.connect('notify::is_loaded',
                                                 this._onUserChanged.bind(this));
         this._userChangedId = this._user.connect('changed',
@@ -77,15 +86,15 @@ var AuthenticationDialog = GObject.registerClass({
                                                        styleClass: 'polkit-dialog-user-icon' });
             this._userAvatar.actor.hide();
             userBox.add(this._userAvatar.actor,
-                        { x_fill: true,
+                        { x_fill:  true,
-                          y_fill: false,
+                          y_fill:  false,
                           x_align: St.Align.END,
                           y_align: St.Align.START });
             let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-label',
                                             text: userRealName }));
             userBox.add(userLabel,
-                        { x_fill: true,
+                        { x_fill:  true,
-                          y_fill: false,
+                          y_fill:  false,
                           x_align: St.Align.END,
                           y_align: St.Align.MIDDLE });
         }
@@ -98,7 +107,7 @@ var AuthenticationDialog = GObject.registerClass({
         this._passwordBox.add(this._passwordLabel, { y_fill: false, y_align: St.Align.MIDDLE });
         this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                              text: "",
-                                             can_focus: true });
+                                             can_focus: true});
         ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
         this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
         this._passwordBox.add(this._passwordEntry,
@@ -127,7 +136,7 @@ var AuthenticationDialog = GObject.registerClass({
          * gnome-shell.css sets the color to be transparent
          */
         this._nullMessageLabel = new St.Label({ style_class: 'prompt-dialog-null-label',
-                                                text: 'abc' });
+                                                text: 'abc'});
         this._nullMessageLabel.add_style_class_name('hidden');
         this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
         this._nullMessageLabel.clutter_text.line_wrap = true;
@@ -137,7 +146,7 @@ var AuthenticationDialog = GObject.registerClass({
         this._cancelButton = this.addButton({ label: _("Cancel"),
                                               action: this.cancel.bind(this),
                                               key: Clutter.Escape });
-        this._okButton = this.addButton({ label: _("Authenticate"),
+        this._okButton = this.addButton({ label:  _("Authenticate"),
                                           action: this._onAuthenticateButtonPressed.bind(this),
                                           default: true });
 
@@ -180,9 +189,9 @@ var AuthenticationDialog = GObject.registerClass({
             //
             // We could add retrying if this turns out to be a problem
 
-            log('polkitAuthenticationAgent: Failed to show modal dialog. ' +
+            log('polkitAuthenticationAgent: Failed to show modal dialog.' +
-                `Dismissing authentication request for action-id ${this.actionId} ` +
+                ' Dismissing authentication request for action-id ' + this.actionId +
-                `cookie ${this._cookie}`);
+                ' cookie ' + this._cookie);
             this._emitDone(true);
         }
     }
@@ -250,14 +259,14 @@ var AuthenticationDialog = GObject.registerClass({
         }
     }
 
-    _onSessionRequest(session, request, echoOn) {
+    _onSessionRequest(session, request, echo_on) {
         // Cheap localization trick
         if (request == 'Password:' || request == 'Password: ')
             this._passwordLabel.set_text(_("Password:"));
         else
             this._passwordLabel.set_text(request);
 
-        if (echoOn)
+        if (echo_on)
             this._passwordEntry.clutter_text.set_password_char('');
         else
             this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
@@ -327,7 +336,8 @@ var AuthenticationDialog = GObject.registerClass({
 
         this._destroySession();
     }
-});
+};
+Signals.addSignalMethods(AuthenticationDialog.prototype);
 
 var AuthenticationAgent = class {
     constructor() {
@@ -342,7 +352,7 @@ var AuthenticationAgent = class {
     enable() {
         try {
             this._native.register();
-        } catch (e) {
+        } catch(e) {
             log('Failed to register AuthenticationAgent');
         }
     }
@@ -350,7 +360,7 @@ var AuthenticationAgent = class {
     disable() {
         try {
             this._native.unregister();
-        } catch (e) {
+        } catch(e) {
             log('Failed to unregister AuthenticationAgent');
         }
     }

js/ui/components/telepathyClient.js

@@ -1,14 +1,21 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+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 Mainloop = imports.mainloop;
+const Signals = imports.signals;
+const St = imports.gi.St;
 
 var Tpl = null;
 var Tp = null;
 try {
-    ({ TelepathyGLib: Tp, TelepathyLogger: Tpl } = imports.gi);
+    Tpl = imports.gi.TelepathyLogger;
-} catch (e) {
+    Tp = imports.gi.TelepathyGLib;
+} catch(e) {
     log('Telepathy is not available, chat integration will be disabled.');
 }
 
@@ -17,6 +24,7 @@ const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;
 const MessageTray = imports.ui.messageTray;
 const Params = imports.misc.params;
+const PopupMenu = imports.ui.popupMenu;
 const Util = imports.misc.util;
 
 const HAVE_TP = (Tp != null && Tpl != null);
@@ -40,6 +48,8 @@ var NotificationDirection = {
     RECEIVED: 'chat-received'
 };
 
+var N_ = s => s;
+
 function makeMessageFromTpMessage(tpMessage, direction) {
     let [text, flags] = tpMessage.to_text();
 
@@ -87,7 +97,7 @@ var TelepathyComponent = class {
         try {
             this._client.register();
         } catch (e) {
-            throw new Error(`Could not register Telepathy client. Error: ${e}`);
+            throw new Error('Couldn\'t register Telepathy client. Error: \n' + e);
         }
 
         if (!this._client.account_manager.is_prepared(Tp.AccountManager.get_feature_quark_core()))
@@ -147,20 +157,20 @@ class TelepathyClient extends Tp.BaseClient {
             this._delegatedChannelsCb.bind(this));
     }
 
-    vfunc_observe_channels(...args) {
+    vfunc_observe_channels(account, conn, channels,
-        let [account, conn, channels, dispatchOp, requests, context] = args;
+                                     dispatchOp, requests, context) {
         let len = channels.length;
         for (let i = 0; i < len; i++) {
             let channel = channels[i];
             let [targetHandle, targetHandleType] = channel.get_handle();
 
             if (channel.get_invalidated())
-                continue;
+              continue;
 
             /* Only observe contact text channels */
             if ((!(channel instanceof Tp.TextChannel)) ||
                targetHandleType != Tp.HandleType.CONTACT)
-                continue;
+               continue;
 
             this._createChatSource(account, conn, channel, channel.get_target_contact());
         }
@@ -180,8 +190,8 @@ class TelepathyClient extends Tp.BaseClient {
         });
     }
 
-    vfunc_handle_channels(...args) {
+    vfunc_handle_channels(account, conn, channels, requests,
-        let [account, conn, channels, requests, userActionTime, context] = args;
+                                    user_action_time, context) {
         this._handlingChannels(account, conn, channels, true);
         context.accept();
     }
@@ -198,7 +208,7 @@ class TelepathyClient extends Tp.BaseClient {
             }
 
             if (channel.get_invalidated())
-                continue;
+              continue;
 
             // 'notify' will be true when coming from an actual HandleChannels
             // call, and not when from a successful Claim call. The point is
@@ -220,8 +230,8 @@ class TelepathyClient extends Tp.BaseClient {
         }
     }
 
-    vfunc_add_dispatch_operation(...args) {
+    vfunc_add_dispatch_operation(account, conn, channels,
-        let [account, conn, channels, dispatchOp, context] = args;
+                                           dispatchOp, context) {
         let channel = channels[0];
         let chanType = channel.get_channel_type();
 
@@ -253,7 +263,7 @@ class TelepathyClient extends Tp.BaseClient {
                 dispatchOp.claim_with_finish(result);
                 this._handlingChannels(account, conn, [channel], false);
             } catch (err) {
-                log(`Failed to Claim channel: ${err}`);
+                log('Failed to Claim channel: ' + err);
             }
         });
 
@@ -360,28 +370,28 @@ var ChatSource = class extends MessageTray.Source {
         let presenceType = this._contact.get_presence_type();
 
         switch (presenceType) {
-        case Tp.ConnectionPresenceType.AVAILABLE:
+            case Tp.ConnectionPresenceType.AVAILABLE:
-            iconName = 'user-available';
+                iconName = 'user-available';
-            break;
+                break;
-        case Tp.ConnectionPresenceType.BUSY:
+            case Tp.ConnectionPresenceType.BUSY:
-            iconName = 'user-busy';
+                iconName = 'user-busy';
-            break;
+                break;
-        case Tp.ConnectionPresenceType.OFFLINE:
+            case Tp.ConnectionPresenceType.OFFLINE:
-            iconName = 'user-offline';
+                iconName = 'user-offline';
-            break;
+                break;
-        case Tp.ConnectionPresenceType.HIDDEN:
+            case Tp.ConnectionPresenceType.HIDDEN:
-            iconName = 'user-invisible';
+                iconName = 'user-invisible';
-            break;
+                break;
-        case Tp.ConnectionPresenceType.AWAY:
+            case Tp.ConnectionPresenceType.AWAY:
-            iconName = 'user-away';
+                iconName = 'user-away';
-            break;
+                break;
-        case Tp.ConnectionPresenceType.EXTENDED_AWAY:
+            case Tp.ConnectionPresenceType.EXTENDED_AWAY:
-            iconName = 'user-idle';
+                iconName = 'user-idle';
-            break;
+                break;
-        default:
+            default:
-            iconName = 'user-offline';
+                iconName = 'user-offline';
-        }
+       }
-        return new Gio.ThemedIcon({ name: iconName });
+       return new Gio.ThemedIcon({ name: iconName });
     }
 
     _updateAvatarIcon() {
@@ -399,7 +409,7 @@ var ChatSource = class extends MessageTray.Source {
         if (this._client.is_handling_channel(this._channel)) {
             // We are handling the channel, try to pass it to Empathy or Polari
             // (depending on the channel type)
-            // We don't check if either app is available - mission control will
+            // We don't check if either app is availble - mission control will
             // fallback to something else if activation fails
 
             let target;
@@ -595,8 +605,8 @@ var ChatSource = class extends MessageTray.Source {
         // keep track of it with the ChatStateChanged signal but it is good
         // enough right now.
         if (state != this._chatState) {
-            this._chatState = state;
+          this._chatState = state;
-            this._channel.set_chat_state_async(state, null);
+          this._channel.set_chat_state_async(state, null);
         }
     }
 
@@ -811,8 +821,8 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
         });
 
         this._scrollArea = new St.ScrollView({ style_class: 'chat-scrollview vfade',
-                                               vscrollbar_policy: St.PolicyType.AUTOMATIC,
+                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,
-                                               hscrollbar_policy: St.PolicyType.NEVER,
+                                               hscrollbar_policy: Gtk.PolicyType.NEVER,
                                                visible: this.expanded });
         this._contentArea = new St.BoxLayout({ style_class: 'chat-body',
                                                vertical: true });

js/ui/ctrlAltTab.js

@@ -1,12 +1,18 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gtk = imports.gi.Gtk;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;
 const Params = imports.misc.params;
+const Tweener = imports.ui.tweener;
 
 var POPUP_APPICON_SIZE = 96;
+var POPUP_FADE_TIME = 0.1; // seconds
 
 var SortGroup = {
     TOP:    0,
@@ -32,7 +38,7 @@ var CtrlAltTabManager = class CtrlAltTabManager {
         item.iconName = icon;
 
         this._items.push(item);
-        root.connect('destroy', () => this.removeGroup(root));
+        root.connect('destroy', () => { this.removeGroup(root); });
         if (root instanceof St.Widget)
             global.focus_manager.add_group(root);
     }
@@ -52,7 +58,7 @@ var CtrlAltTabManager = class CtrlAltTabManager {
         if (item.focusCallback)
             item.focusCallback(timestamp);
         else
-            item.root.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
+            item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     }
 
     // Sort the items into a consistent order; panel first, tray last,
@@ -93,9 +99,7 @@ var CtrlAltTabManager = class CtrlAltTabManager {
                     if (app)
                         icon = app.create_icon_texture(POPUP_APPICON_SIZE);
                     else
-                        icon = textureCache.bind_cairo_surface_property(windows[i],
+                        icon = textureCache.bind_cairo_surface_property(windows[i], 'icon');
-                                                                        'icon',
-                                                                        POPUP_APPICON_SIZE);
                 }
 
                 items.push({ name: windows[i].title,
@@ -130,10 +134,10 @@ var CtrlAltTabManager = class CtrlAltTabManager {
     }
 };
 
-var CtrlAltTabPopup = GObject.registerClass(
+var CtrlAltTabPopup =
 class CtrlAltTabPopup extends SwitcherPopup.SwitcherPopup {
-    _init(items) {
+    constructor(items) {
-        super._init(items);
+        super(items);
 
         this._switcherList = new CtrlAltTabSwitcher(this._items);
     }
@@ -157,12 +161,12 @@ class CtrlAltTabPopup extends SwitcherPopup.SwitcherPopup {
         super._finish(time);
         Main.ctrlAltTabManager.focusGroup(this._items[this._selectedIndex], time);
     }
-});
+};
 
-var CtrlAltTabSwitcher = GObject.registerClass(
+var CtrlAltTabSwitcher =
 class CtrlAltTabSwitcher extends SwitcherPopup.SwitcherList {
-    _init(items) {
+    constructor(items) {
-        super._init(true);
+        super(true);
 
         for (let i = 0; i < items.length; i++)
             this._addIcon(items[i]);
@@ -184,4 +188,4 @@ class CtrlAltTabSwitcher extends SwitcherPopup.SwitcherList {
 
         this.addItem(box, text);
     }
-});
+};

js/ui/dash.js

@@ -1,8 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
-const Mainloop = imports.mainloop;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
 const Signals = imports.signals;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Mainloop = imports.mainloop;
 
 const AppDisplay = imports.ui.appDisplay;
 const AppFavorites = imports.ui.appFavorites;
@@ -10,6 +16,7 @@ const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
+const Workspace = imports.ui.workspace;
 
 var DASH_ANIMATION_TIME = 0.2;
 var DASH_ITEM_LABEL_SHOW_TIME = 0.15;
@@ -35,7 +42,7 @@ class DashItemContainer extends St.Widget {
                       x_align: Clutter.ActorAlign.CENTER });
 
         this._labelText = "";
-        this.label = new St.Label({ style_class: 'dash-label' });
+        this.label = new St.Label({ style_class: 'dash-label'});
         this.label.hide();
         Main.layoutManager.addChrome(this.label);
         this.label_actor = this.label;
@@ -81,7 +88,7 @@ class DashItemContainer extends St.Widget {
         let itemHeight = this.allocation.y2 - this.allocation.y1;
 
         let labelHeight = this.label.get_height();
-        let yOffset = Math.floor((itemHeight - labelHeight) / 2);
+        let yOffset = Math.floor((itemHeight - labelHeight) / 2)
 
         let y = stageY + yOffset;
 
@@ -198,9 +205,9 @@ class ShowAppsIcon extends DashItemContainer {
                                             toggle_mode: true });
         this._iconActor = null;
         this.icon = new IconGrid.BaseIcon(_("Show Applications"),
-                                          { setSizeManually: true,
+                                           { setSizeManually: true,
-                                            showLabel: false,
+                                             showLabel: false,
-                                            createIcon: this._createIcon.bind(this) });
+                                             createIcon: this._createIcon.bind(this) });
         this.toggleButton.add_actor(this.icon);
         this.toggleButton._delegate = this;
 
@@ -321,14 +328,14 @@ class DashActor extends St.Widget {
         let themeNode = this.get_theme_node();
         let adjustedForWidth = themeNode.adjust_for_width(forWidth);
         let [, showAppsButton] = this.get_children();
-        let [minHeight] = showAppsButton.get_preferred_height(adjustedForWidth);
+        let [minHeight, ] = showAppsButton.get_preferred_height(adjustedForWidth);
-        [minHeight] = themeNode.adjust_preferred_height(minHeight, natHeight);
+        [minHeight, ] = themeNode.adjust_preferred_height(minHeight, natHeight);
 
         return [minHeight, natHeight];
     }
 });
 
-const baseIconSizes = [16, 22, 24, 32, 48, 64];
+const baseIconSizes = [ 16, 22, 24, 32, 48, 64 ];
 
 var Dash = class Dash {
     constructor() {
@@ -584,18 +591,22 @@ var Dash = class Dash {
         let firstButton = iconChildren[0].child;
         let firstIcon = firstButton._delegate.icon;
 
-        // Enforce valid spacings during the size request
+        let minHeight, natHeight;
+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+
+        // Enforce the current icon size during the size request
         firstIcon.icon.ensure_style();
-        let [, iconHeight] = firstIcon.icon.get_preferred_height(-1);
+        let [, currentHeight] = firstIcon.icon.get_size();
-        let [, buttonHeight] = firstButton.get_preferred_height(-1);
+        firstIcon.icon.set_height(this.iconSize * scaleFactor);
+        [minHeight, natHeight] = firstButton.get_preferred_height(-1);
+        firstIcon.icon.set_height(currentHeight);
 
         // Subtract icon padding and box spacing from the available height
-        availHeight -= iconChildren.length * (buttonHeight - iconHeight) +
+        availHeight -= iconChildren.length * (natHeight - this.iconSize * scaleFactor) +
                        (iconChildren.length - 1) * spacing;
 
         let availSize = availHeight / iconChildren.length;
 
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
         let iconSizes = baseIconSizes.map(s => s * scaleFactor);
 
         let newIconSize = baseIconSizes[0];
@@ -648,10 +659,10 @@ var Dash = class Dash {
         let running = this._appSystem.get_running();
 
         let children = this._box.get_children().filter(actor => {
-            return actor.child &&
+                return actor.child &&
-                   actor.child._delegate &&
+                       actor.child._delegate &&
-                   actor.child._delegate.app;
+                       actor.child._delegate.app;
-        });
+            });
         // Apps currently in the dash
         let oldApps = children.map(actor => actor.child._delegate.app);
         // Apps supposed to be in the dash
@@ -700,14 +711,14 @@ var Dash = class Dash {
             }
 
             // App removed at oldIndex
-            if (oldApp && !newApps.includes(oldApp)) {
+            if (oldApp && newApps.indexOf(oldApp) == -1) {
                 removedActors.push(children[oldIndex]);
                 oldIndex++;
                 continue;
             }
 
             // App added at newIndex
-            if (newApp && !oldApps.includes(newApp)) {
+            if (newApp && oldApps.indexOf(newApp) == -1) {
                 addedItems.push({ app: newApp,
                                   item: this._createAppItem(newApp),
                                   pos: newIndex });
@@ -899,7 +910,7 @@ var Dash = class Dash {
                 favPos++;
         }
 
-        // No drag placeholder means we don't want to favorite the app
+        // No drag placeholder means we don't wan't to favorite the app
         // and we are dragging it to its original position
         if (!this._dragPlaceholder)
             return true;

js/ui/dateMenu.js

@@ -1,17 +1,28 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, GLib, GnomeDesktop,
+const GLib = imports.gi.GLib;
-        GObject, GWeather, Shell, St } = imports.gi;
+const Gio = imports.gi.Gio;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const GObject = imports.gi.GObject;
+const Gtk = imports.gi.Gtk;
+const GWeather = imports.gi.GWeather;
+const Mainloop = imports.mainloop;
+const Pango = imports.gi.Pango;
+const Cairo = imports.cairo;
+const Clutter = imports.gi.Clutter;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Atk = imports.gi.Atk;
 
+const Params = imports.misc.params;
 const Util = imports.misc.util;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
 const Calendar = imports.ui.calendar;
 const Weather = imports.misc.weather;
 const System = imports.system;
 
-const MAX_FORECASTS = 5;
-
 function _isToday(date) {
     let now = new Date();
     return now.getYear() == date.getYear() &&
@@ -47,7 +58,7 @@ var TodayButton = class TodayButton {
         this._calendar.connect('selected-date-changed', (calendar, date) => {
             // Make the button reactive only if the selected date is not the
             // current date.
-            this.actor.reactive = !_isToday(date);
+            this.actor.reactive = !_isToday(date)
         });
     }
 
@@ -118,7 +129,7 @@ var WorldClocksSection = class WorldClocksSection {
             if (!clocks[i].location)
                 continue;
             let l = world.deserialize(clocks[i].location);
-            if (l && l.get_timezone() != null)
+            if (l)
                 this._locations.push({ location: l });
         }
 
@@ -136,37 +147,26 @@ var WorldClocksSection = class WorldClocksSection {
         layout.attach(header, 0, 0, 2, 1);
         this.actor.label_actor = header;
 
-        let localOffset = GLib.DateTime.new_now_local().get_utc_offset();
-
         for (let i = 0; i < this._locations.length; i++) {
             let l = this._locations[i].location;
 
-            let name = l.get_city_name() || l.get_name();
+            let name = l.get_level() == GWeather.LocationLevel.NAMED_TIMEZONE ? l.get_name()
+                                                                              : l.get_city_name();
             let label = new St.Label({ style_class: 'world-clocks-city',
                                        text: name,
                                        x_align: Clutter.ActorAlign.START,
-                                       y_align: Clutter.ActorAlign.CENTER,
                                        x_expand: true });
 
-            let time = new St.Label({ style_class: 'world-clocks-time' });
+            let time = new St.Label({ style_class: 'world-clocks-time',
-
+                                      x_align: Clutter.ActorAlign.END,
-            let otherOffset = this._getTimeAtLocation(l).get_utc_offset();
+                                      x_expand: true });
-            let offset = (otherOffset - localOffset) / GLib.TIME_SPAN_HOUR;
-            let fmt = (Math.trunc(offset) == offset) ? '%s%.0f' : '%s%.1f';
-            let prefix = (offset >= 0) ? '+' : '-';
-            let tz = new St.Label({ style_class: 'world-clocks-timezone',
-                                    text: fmt.format(prefix, Math.abs(offset)),
-                                    x_align: Clutter.ActorAlign.END,
-                                    y_align: Clutter.ActorAlign.CENTER });
 
             if (this._grid.text_direction == Clutter.TextDirection.RTL) {
-                layout.attach(tz, 0, i + 1, 1, 1);
+                layout.attach(time, 0, i + 1, 1, 1);
-                layout.attach(time, 1, i + 1, 1, 1);
+                layout.attach(label, 1, i + 1, 1, 1);
-                layout.attach(label, 2, i + 1, 1, 1);
             } else {
                 layout.attach(label, 0, i + 1, 1, 1);
                 layout.attach(time, 1, i + 1, 1, 1);
-                layout.attach(tz, 2, i + 1, 1, 1);
             }
 
             this._locations[i].actor = time;
@@ -184,15 +184,11 @@ var WorldClocksSection = class WorldClocksSection {
         }
     }
 
-    _getTimeAtLocation(location) {
-        let tz = GLib.TimeZone.new(location.get_timezone().get_tzid());
-        return GLib.DateTime.new_now(tz);
-    }
-
     _updateLabels() {
         for (let i = 0; i < this._locations.length; i++) {
             let l = this._locations[i];
-            let now = this._getTimeAtLocation(l.location);
+            let tz = GLib.TimeZone.new(l.location.get_timezone().get_tzid());
+            let now = GLib.DateTime.new_now(tz);
             l.actor.text = Util.formatTime(now, { timeOnly: true });
         }
     }
@@ -217,118 +213,114 @@ var WeatherSection = class WeatherSection {
         });
 
         let box = new St.BoxLayout({ style_class: 'weather-box',
-                                     vertical: true });
+                                      vertical: true });
 
         this.actor.child = box;
 
-        let titleBox = new St.BoxLayout();
+        box.add_child(new St.Label({ style_class: 'weather-header',
-        titleBox.add_child(new St.Label({ style_class: 'weather-header',
+                                     x_align: Clutter.ActorAlign.START,
-                                          x_align: Clutter.ActorAlign.START,
+                                     text: _("Weather") }));
-                                          x_expand: true,
-                                          text: _("Weather") }));
-        box.add_child(titleBox);
 
-        this._titleLocation = new St.Label({ style_class: 'weather-header location',
+        this._conditionsLabel = new St.Label({ style_class: 'weather-conditions',
-                                             x_align: Clutter.ActorAlign.END });
+                                               x_align: Clutter.ActorAlign.START });
-        titleBox.add_child(this._titleLocation);
+        this._conditionsLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-
+        this._conditionsLabel.clutter_text.line_wrap = true;
-        let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
+        box.add_child(this._conditionsLabel);
-        this._forecastGrid = new St.Widget({ style_class: 'weather-grid',
-                                             layout_manager: layout });
-        layout.hookup_style(this._forecastGrid);
-        box.add_child(this._forecastGrid);
 
         this._weatherClient.connect('changed', this._sync.bind(this));
         this._sync();
     }
 
-    _getInfos() {
+    _getSummary(info, capitalize=false) {
+        let options = capitalize ? GWeather.FormatOptions.SENTENCE_CAPITALIZATION
+                                 : GWeather.FormatOptions.NO_CAPITALIZATION;
+
+        let [ok, phenomenon, qualifier] = info.get_value_conditions();
+        if (ok)
+            return new GWeather.Conditions({ significant: true,
+                                             phenomenon,
+                                             qualifier }).to_string_full(options);
+
+        let [, sky] = info.get_value_sky();
+        return GWeather.Sky.to_string_full(sky, options);
+    }
+
+    _sameSummary(info1, info2) {
+        let [ok1, phenom1, qualifier1] = info1.get_value_conditions();
+        let [ok2, phenom2, qualifier2] = info2.get_value_conditions();
+        if (ok1 || ok2)
+            return ok1 == ok2 && phenom1 == phenom2 && qualifier1 == qualifier2;
+
+        let [, sky1] = info1.get_value_sky();
+        let [, sky2] = info2.get_value_sky();
+        return sky1 == sky2;
+    }
+
+    _getSummaryText() {
         let info = this._weatherClient.info;
         let forecasts = info.get_forecast_list();
+        if (forecasts.length == 0) // No forecasts, just current conditions
+            return '%s.'.format(this._getSummary(info, true));
 
         let current = info;
         let infos = [info];
         for (let i = 0; i < forecasts.length; i++) {
             let [ok, timestamp] = forecasts[i].get_value_update();
-            let datetime = new Date(timestamp * 1000);
+            if (!_isToday(new Date(timestamp * 1000)))
-            if (!_isToday(datetime))
                 continue; // Ignore forecasts from other days
 
-            [ok, timestamp] = current.get_value_update();
+            if (this._sameSummary(current, forecasts[i]))
-            let currenttime = new Date(timestamp * 1000);
+                continue; // Ignore consecutive runs of equal summaries
-            if (currenttime.getHours() == datetime.getHours())
-                continue; // Enforce a minimum interval of 1h
 
             current = forecasts[i];
-            if (infos.push(current) == MAX_FORECASTS)
+            if (infos.push(current) == 3)
-                break; // Use a maximum of five forecasts
+                break; // Use a maximum of three summaries
         }
-        return infos;
-    }
 
-    _addForecasts() {
+        let fmt;
-        let layout = this._forecastGrid.layout_manager;
+        switch(infos.length) {
+            /* Translators: %s is a weather condition like "Clear sky"; see
+               libgweather for the possible condition strings. If at all
+               possible, the sentence should match the grammatical case etc. of
+               the inserted conditions. */
+            case 1: fmt = _("%s all day."); break;
 
-        let infos = this._getInfos();
+            /* Translators: %s is a weather condition like "Clear sky"; see
-        if (this._forecastGrid.text_direction == Clutter.TextDirection.RTL)
+               libgweather for the possible condition strings. If at all
-            infos.reverse();
+               possible, the sentence should match the grammatical case etc. of
+               the inserted conditions. */
+            case 2: fmt = _("%s, then %s later."); break;
 
-        let col = 0;
+            /* Translators: %s is a weather condition like "Clear sky"; see
-        infos.forEach(fc => {
+               libgweather for the possible condition strings. If at all
-            let [ok, timestamp] = fc.get_value_update();
+               possible, the sentence should match the grammatical case etc. of
-            let timeStr = Util.formatTime(new Date(timestamp * 1000), {
+               the inserted conditions. */
-                timeOnly: true
+            case 3: fmt = _("%s, then %s, followed by %s later."); break;
-            });
+        }
-
+        let summaries = infos.map((info, i) => {
-            let icon = new St.Icon({ style_class: 'weather-forecast-icon',
+            let capitalize = i == 0 && fmt.startsWith('%s');
-                                     icon_name: fc.get_symbolic_icon_name(),
+            return this._getSummary(info, capitalize);
-                                     x_align: Clutter.ActorAlign.CENTER,
-                                     x_expand: true });
-            let temp = new St.Label({ style_class: 'weather-forecast-temp',
-                                      text: fc.get_temp_summary(),
-                                      x_align: Clutter.ActorAlign.CENTER });
-            let time = new St.Label({ style_class: 'weather-forecast-time',
-                                      text: timeStr,
-                                      x_align: Clutter.ActorAlign.CENTER });
-
-            layout.attach(icon, col, 0, 1, 1);
-            layout.attach(temp, col, 1, 1, 1);
-            layout.attach(time, col, 2, 1, 1);
-            col++;
         });
+        return String.prototype.format.apply(fmt, summaries);
     }
 
-    _setStatusLabel(text) {
+    _getLabelText() {
-        let layout = this._forecastGrid.layout_manager;
+        if (!this._weatherClient.hasLocation)
-        let label = new St.Label({ text });
+            return _("Select a location…");
-        layout.attach(label, 0, 0, 1, 1);
-    }
 
-    _updateForecasts() {
+        if (this._weatherClient.loading)
-        this._forecastGrid.destroy_all_children();
+            return _("Loading…");
-
-        if (!this._weatherClient.hasLocation) {
-            this._setStatusLabel(_("Select a location…"));
-            return;
-        }
 
         let info = this._weatherClient.info;
-        this._titleLocation.text = info.get_location().get_name();
+        if (info.is_valid())
-
+            return this._getSummaryText() + ' ' +
-        if (this._weatherClient.loading) {
+                   /* Translators: %s is a temperature with unit, e.g. "23℃" */
-            this._setStatusLabel(_("Loading…"));
+                   _("Feels like %s.").format(info.get_apparent());
-            return;
-        }
-
-        if (info.is_valid()) {
-            this._addForecasts();
-            return;
-        }
 
         if (info.network_error())
-            this._setStatusLabel(_("Go online for weather information"));
+            return _("Go online for weather information");
-        else
+
-            this._setStatusLabel(_("Weather information is currently unavailable"));
+        return _("Weather information is currently unavailable");
     }
 
     _sync() {
@@ -337,9 +329,7 @@ var WeatherSection = class WeatherSection {
         if (!this.actor.visible)
             return;
 
-        this._titleLocation.visible = this._weatherClient.hasLocation;
+        this._conditionsLabel.text = this._getLabelText();
-
-        this._updateForecasts();
     }
 };
 
@@ -357,7 +347,7 @@ var MessagesIndicator = class MessagesIndicator {
         Main.messageTray.connect('queue-changed', this._updateCount.bind(this));
 
         let sources = Main.messageTray.getSources();
-        sources.forEach(source => this._onSourceAdded(null, source));
+        sources.forEach(source => { this._onSourceAdded(null, source); });
     }
 
     _onSourceAdded(tray, source) {
@@ -373,7 +363,7 @@ var MessagesIndicator = class MessagesIndicator {
 
     _updateCount() {
         let count = 0;
-        this._sources.forEach(source => count += source.unseenCount);
+        this._sources.forEach(source => { count += source.unseenCount; });
         count -= Main.messageTray.queueCount;
 
         this.actor.visible = (count > 0);
@@ -384,18 +374,17 @@ var IndicatorPad = GObject.registerClass(
 class IndicatorPad extends St.Widget {
     _init(actor) {
         this._source = actor;
-        this._source.connect('notify::visible', () => this.queue_relayout());
+        this._source.connect('notify::visible', () => { this.queue_relayout(); });
-        this._source.connect('notify::size', () => this.queue_relayout());
         super._init();
     }
 
-    vfunc_get_preferred_width(forHeight) {
+    vfunc_get_preferred_width(container, forHeight) {
         if (this._source.visible)
             return this._source.get_preferred_width(forHeight);
         return [0, 0];
     }
 
-    vfunc_get_preferred_height(forWidth) {
+    vfunc_get_preferred_height(container, forWidth) {
         if (this._source.visible)
             return this._source.get_preferred_height(forWidth);
         return [0, 0];
@@ -459,6 +448,7 @@ class CalendarColumnLayout extends Clutter.BoxLayout {
 var DateMenuButton = GObject.registerClass(
 class DateMenuButton extends PanelMenu.Button {
     _init() {
+        let item;
         let hbox;
         let vbox;
 
@@ -475,9 +465,10 @@ class DateMenuButton extends PanelMenu.Button {
         box.add_actor(this._clockDisplay);
         box.add_actor(this._indicator.actor);
 
-        this.label_actor = this._clockDisplay;
+        this.actor.label_actor = this._clockDisplay;
-        this.add_actor(box);
+        this.actor.add_actor(box);
-        this.add_style_class_name ('clock-display');
+        this.actor.add_style_class_name ('clock-display');
+
 
         let layout = new FreezableBinLayout();
         let bin = new St.Widget({ layout_manager: layout });
@@ -524,7 +515,7 @@ class DateMenuButton extends PanelMenu.Button {
         this._displaysSection = new St.ScrollView({ style_class: 'datemenu-displays-section vfade',
                                                     x_expand: true, x_fill: true,
                                                     overlay_scrollbars: true });
-        this._displaysSection.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
+        this._displaysSection.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         vbox.add_actor(this._displaysSection);
 
         let displaysBox = new St.BoxLayout({ vertical: true,

js/ui/dialog.js

@@ -1,6 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GObject, Pango, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 
 var Dialog = GObject.registerClass(
 class Dialog extends St.Widget {
@@ -25,9 +29,9 @@ class Dialog extends St.Widget {
 
     _createDialog() {
         this._dialog = new St.BoxLayout({ style_class: 'modal-dialog',
-                                          x_align: Clutter.ActorAlign.CENTER,
+                                          x_align:     Clutter.ActorAlign.CENTER,
-                                          y_align: Clutter.ActorAlign.CENTER,
+                                          y_align:     Clutter.ActorAlign.CENTER,
-                                          vertical: true });
+                                          vertical:    true });
 
         // modal dialogs are fixed width and grow vertically; set the request
         // mode accordingly so wrapped labels are handled correctly during
@@ -38,13 +42,13 @@ class Dialog extends St.Widget {
         this.contentLayout = new St.BoxLayout({ vertical: true,
                                                 style_class: "modal-dialog-content-box" });
         this._dialog.add(this.contentLayout,
-                         { expand: true,
+                         { expand:  true,
-                           x_fill: true,
+                           x_fill:  true,
-                           y_fill: true,
+                           y_fill:  true,
                            x_align: St.Align.MIDDLE,
                            y_align: St.Align.START });
 
-        this.buttonLayout = new St.Widget ({ layout_manager: new Clutter.BoxLayout({ homogeneous: true }) });
+        this.buttonLayout = new St.Widget ({ layout_manager: new Clutter.BoxLayout({ homogeneous:true }) });
         this._dialog.add(this.buttonLayout,
                          { x_align: St.Align.MIDDLE,
                            y_align: St.Align.START });
@@ -116,11 +120,11 @@ class Dialog extends St.Widget {
 
         let button = new St.Button({ style_class: 'modal-dialog-linked-button',
                                      button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-                                     reactive: true,
+                                     reactive:    true,
-                                     can_focus: true,
+                                     can_focus:   true,
-                                     x_expand: true,
+                                     x_expand:    true,
-                                     y_expand: true,
+                                     y_expand:    true,
-                                     label: label });
+                                     label:       label });
         button.connect('clicked', action);
 
         buttonInfo['button'] = button;
@@ -175,10 +179,10 @@ var MessageDialogContent = GObject.registerClass({
             this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
         });
 
-        let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
+        let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
                           line_wrap: true };
-        this._subtitle.clutter_text.set(textProps);
+        Object.assign(this._subtitle.clutter_text, textProps);
-        this._body.clutter_text.set(textProps);
+        Object.assign(this._body.clutter_text, textProps);
 
         if (!params.hasOwnProperty('style_class'))
             params.style_class = 'message-dialog-main-layout';
@@ -214,10 +218,7 @@ var MessageDialogContent = GObject.registerClass({
     }
 
     set icon(icon) {
-        this._icon.set({
+        Object.assign(this._icon, { gicon: icon, visible: icon != null });
-            gicon: icon,
-            visible: icon != null
-        });
         this.notify('icon');
     }
 
@@ -234,10 +235,7 @@ var MessageDialogContent = GObject.registerClass({
     }
 
     _setLabel(label, prop, value) {
-        label.set({
+        Object.assign(label, { text: value || '', visible: value != null });
-            text: value || '',
-            visible: value != null
-        });
         this.notify(prop);
     }
 

js/ui/dnd.js

@@ -1,11 +1,16 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, GLib, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+const St = imports.gi.St;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-
-const Main = imports.ui.main;
-const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
+const Main = imports.ui.main;
+
+const Params = imports.misc.params;
 
 // Time to scale down to maxDragActorSize
 var SCALE_ANIMATION_TIME = 0.25;
@@ -104,7 +109,6 @@ var _Draggable = class _Draggable {
         this._dragCancellable = true;
 
         this._eventsGrabbed = false;
-        this._capturedEventId = 0;
     }
 
     _onButtonPress(actor, event) {
@@ -115,7 +119,7 @@ var _Draggable = class _Draggable {
             return Clutter.EVENT_PROPAGATE;
 
         this._buttonDown = true;
-        this._grabActor(event.get_device());
+        this._grabActor();
 
         let [stageX, stageY] = event.get_coords();
         this._dragStartX = stageX;
@@ -125,16 +129,6 @@ var _Draggable = class _Draggable {
     }
 
     _onTouchEvent(actor, event) {
-        // We only handle touch events here on wayland. On X11
-        // we do get emulated pointer events, which already works
-        // for single-touch cases. Besides, the X11 passive touch grab
-        // set up by Mutter will make us see first the touch events
-        // and later the pointer events, so it will look like two
-        // unrelated series of events, we want to avoid double handling
-        // in these cases.
-        if (!Meta.is_wayland_compositor())
-            return Clutter.EVENT_PROPAGATE;
-
         if (event.type() != Clutter.EventType.TOUCH_BEGIN ||
             !global.display.is_pointer_emulating_sequence(event.get_event_sequence()))
             return Clutter.EVENT_PROPAGATE;
@@ -142,8 +136,10 @@ var _Draggable = class _Draggable {
         if (Tweener.getTweenCount(actor))
             return Clutter.EVENT_PROPAGATE;
 
+        this._touchSequence = event.get_event_sequence();
+
         this._buttonDown = true;
-        this._grabActor(event.get_device(), event.get_event_sequence());
+        this._grabActor();
 
         let [stageX, stageY] = event.get_coords();
         this._dragStartX = stageX;
@@ -152,30 +148,19 @@ var _Draggable = class _Draggable {
         return Clutter.EVENT_PROPAGATE;
     }
 
-    _grabDevice(actor, pointer, touchSequence) {
+    _grabDevice(actor) {
-        if (touchSequence)
+        let manager = Clutter.DeviceManager.get_default();
-            pointer.sequence_grab(touchSequence, actor);
+        let pointer = manager.get_core_device(Clutter.InputDeviceType.POINTER_DEVICE);
+
+        if (pointer && this._touchSequence)
+            pointer.sequence_grab(this._touchSequence, actor);
         else if (pointer)
             pointer.grab (actor);
 
         this._grabbedDevice = pointer;
-        this._touchSequence = touchSequence;
-
-        this._capturedEventId = global.stage.connect('captured-event', (actor, event) => {
-            let device = event.get_device();
-            if (device != this._grabbedDevice &&
-                device.get_device_type() != Clutter.InputDeviceType.KEYBOARD_DEVICE)
-                return Clutter.EVENT_STOP;
-            return Clutter.EVENT_PROPAGATE;
-        });
     }
 
     _ungrabDevice() {
-        if (this._capturedEventId != 0) {
-            global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
-
         if (this._touchSequence)
             this._grabbedDevice.sequence_ungrab (this._touchSequence);
         else
@@ -185,8 +170,8 @@ var _Draggable = class _Draggable {
         this._grabbedDevice = null;
     }
 
-    _grabActor(device, touchSequence) {
+    _grabActor() {
-        this._grabDevice(this.actor, device, touchSequence);
+        this._grabDevice(this.actor);
         this._onEventId = this.actor.connect('event',
                                              this._onEvent.bind(this));
     }
@@ -200,11 +185,11 @@ var _Draggable = class _Draggable {
         this._onEventId = null;
     }
 
-    _grabEvents(device, touchSequence) {
+    _grabEvents() {
         if (!this._eventsGrabbed) {
             this._eventsGrabbed = Main.pushModal(_getEventHandlerActor());
             if (this._eventsGrabbed)
-                this._grabDevice(_getEventHandlerActor(), device, touchSequence);
+                this._grabDevice(_getEventHandlerActor());
         }
     }
 
@@ -216,36 +201,14 @@ var _Draggable = class _Draggable {
         }
     }
 
-    _eventIsRelease(event) {
-        if (event.type() == Clutter.EventType.BUTTON_RELEASE) {
-            let buttonMask = (Clutter.ModifierType.BUTTON1_MASK |
-                              Clutter.ModifierType.BUTTON2_MASK |
-                              Clutter.ModifierType.BUTTON3_MASK);
-            /* We only obey the last button release from the device,
-             * other buttons may get pressed/released during the DnD op.
-             */
-            return (event.get_state() & buttonMask) == 0;
-        } else if (event.type() == Clutter.EventType.TOUCH_END) {
-            /* For touch, we only obey the pointer emulating sequence */
-            return global.display.is_pointer_emulating_sequence(event.get_event_sequence());
-        }
-
-        return false;
-    }
-
     _onEvent(actor, event) {
-        let device = event.get_device();
-
-        if (this._grabbedDevice &&
-            device != this._grabbedDevice &&
-            device.get_device_type() != Clutter.InputDeviceType.KEYBOARD_DEVICE)
-            return Clutter.EVENT_PROPAGATE;
-
         // We intercept BUTTON_RELEASE event to know that the button was released in case we
         // didn't start the drag, to drop the draggable in case the drag was in progress, and
         // to complete the drag and ensure that whatever happens to be under the pointer does
         // not get triggered if the drag was cancelled with Esc.
-        if (this._eventIsRelease(event)) {
+        if (event.type() == Clutter.EventType.BUTTON_RELEASE ||
+            (event.type() == Clutter.EventType.TOUCH_END &&
+             global.display.is_pointer_emulating_sequence(event.get_event_sequence()))) {
             this._buttonDown = false;
             if (this._dragState == DragState.DRAGGING) {
                 return this._dragActorDropped(event);
@@ -305,22 +268,7 @@ var _Draggable = class _Draggable {
      * This function is useful to call if you've specified manualMode
      * for the draggable.
      */
-    startDrag(stageX, stageY, time, sequence, device) {
+    startDrag(stageX, stageY, time, sequence) {
-        if (currentDraggable)
-            return;
-
-        if (device == undefined) {
-            let event = Clutter.get_current_event();
-
-            if (event)
-                device = event.get_device();
-
-            if (device == undefined) {
-                let manager = Clutter.DeviceManager.get_default();
-                device = manager.get_core_device(Clutter.InputDeviceType.POINTER_DEVICE);
-            }
-        }
-
         currentDraggable = this;
         this._dragState = DragState.DRAGGING;
 
@@ -335,7 +283,8 @@ var _Draggable = class _Draggable {
         if (this._onEventId)
             this._ungrabActor();
 
-        this._grabEvents(device, sequence);
+        this._touchSequence = sequence;
+        this._grabEvents();
         global.display.set_cursor(Meta.Cursor.DND_IN_DRAG);
 
         this._dragX = this._dragStartX = stageX;
@@ -403,8 +352,7 @@ var _Draggable = class _Draggable {
             this._finishAnimation();
 
             this._dragActor = null;
-            if (this._dragState == DragState.DRAGGING)
+            this._dragState = DragState.CANCELLED;
-                this._dragState = DragState.CANCELLED;
         });
         this._dragOrigOpacity = this._dragActor.opacity;
         if (this._dragActorOpacity != undefined)
@@ -434,13 +382,14 @@ var _Draggable = class _Draggable {
                                    scale_y: scale * origScale,
                                    time: SCALE_ANIMATION_TIME,
                                    transition: 'easeOutQuad',
-                                   onUpdate: () => {
+                                   onUpdate() {
                                        let currentScale = this._dragActor.scale_x / origScale;
                                        this._dragOffsetX = currentScale * origDragOffsetX;
                                        this._dragOffsetY = currentScale * origDragOffsetY;
                                        this._dragActor.set_position(this._dragX + this._dragOffsetX,
                                                                     this._dragY + this._dragOffsetY);
-                                   } });
+                                   },
+                                   onUpdateScope: this });
             }
         }
     }
@@ -449,12 +398,10 @@ var _Draggable = class _Draggable {
         let [stageX, stageY] = event.get_coords();
 
         // See if the user has moved the mouse enough to trigger a drag
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        let threshold = Gtk.Settings.get_default().gtk_dnd_drag_threshold;
-        let threshold = St.Settings.get().drag_threshold * scaleFactor;
+        if ((Math.abs(stageX - this._dragStartX) > threshold ||
-        if (!currentDraggable &&
-            (Math.abs(stageX - this._dragStartX) > threshold ||
              Math.abs(stageY - this._dragStartY) > threshold)) {
-            this.startDrag(stageX, stageY, event.get_time(), this._touchSequence, event.get_device());
+            this.startDrag(stageX, stageY, event.get_time(), this._touchSequence);
             this._updateDragPosition(event);
         }
 
@@ -560,11 +507,11 @@ var _Draggable = class _Draggable {
             let dropFunc = dragMonitors[i].dragDrop;
             if (dropFunc)
                 switch (dropFunc(dropEvent)) {
-                case DragDropResult.FAILURE:
+                    case DragDropResult.FAILURE:
-                case DragDropResult.SUCCESS:
+                    case DragDropResult.SUCCESS:
-                    return true;
+                        return true;
-                case DragDropResult.CONTINUE:
+                    case DragDropResult.CONTINUE:
-                    continue;
+                        continue;
                 }
         }
 
@@ -587,9 +534,8 @@ var _Draggable = class _Draggable {
                         if (this._restoreOnSuccess) {
                             this._restoreDragActor(event.get_time());
                             return true;
-                        } else {
+                        } else
                             this._dragActor.destroy();
-                        }
                     }
 
                     this._dragState = DragState.INIT;
@@ -689,12 +635,12 @@ var _Draggable = class _Draggable {
         params['onCompleteParams'] = [this._dragActor, eventTime];
 
         // start the animation
-        Tweener.addTween(this._dragActor, params);
+        Tweener.addTween(this._dragActor, params)
     }
 
     _finishAnimation() {
         if (!this._animationInProgress)
-            return;
+            return
 
         this._animationInProgress = false;
         if (!this._buttonDown)

js/ui/edgeDragAction.js

@@ -1,6 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, GObject, Meta, St } = imports.gi;
+const GObject = imports.gi.GObject;
+const Signals = imports.signals;
+const Meta = imports.gi.Meta;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 
@@ -16,7 +20,7 @@ var EdgeDragAction = GObject.registerClass({
         this._allowedModes = allowedModes;
         this.set_n_touch_points(1);
 
-        global.display.connect('grab-op-begin', () => this.cancel());
+        global.display.connect('grab-op-begin', () => { this.cancel(); });
     }
 
     _getMonitorRect(x, y) {
@@ -26,7 +30,7 @@ var EdgeDragAction = GObject.registerClass({
         return global.display.get_monitor_geometry(monitorIndex);
     }
 
-    vfunc_gesture_prepare(actor) {
+    vfunc_gesture_prepare(action, actor) {
         if (this.get_n_current_points() == 0)
             return false;
 
@@ -42,7 +46,7 @@ var EdgeDragAction = GObject.registerClass({
                 (this._side == St.Side.BOTTOM && y > monitorRect.y + monitorRect.height - EDGE_THRESHOLD));
     }
 
-    vfunc_gesture_progress(actor) {
+    vfunc_gesture_progress(action, actor) {
         let [startX, startY] = this.get_press_coords(0);
         let [x, y] = this.get_motion_coords(0);
         let offsetX = Math.abs (x - startX);
@@ -62,7 +66,7 @@ var EdgeDragAction = GObject.registerClass({
         return true;
     }
 
-    vfunc_gesture_end(actor) {
+    vfunc_gesture_end(action, actor) {
         let [startX, startY] = this.get_press_coords(0);
         let [x, y] = this.get_motion_coords(0);
         let monitorRect = this._getMonitorRect(startX, startY);

js/ui/endSessionDialog.js

@@ -18,20 +18,32 @@
 
 const Mainloop = imports.mainloop;
 
-const { AccountsService, Clutter, Gio,
+const AccountsService = imports.gi.AccountsService;
-        GLib, GObject, Pango, Polkit, Shell, St }  = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+const Pango = imports.gi.Pango;
+const Polkit = imports.gi.Polkit;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
 
 const CheckBox = imports.ui.checkBox;
 const GnomeSession = imports.misc.gnomeSession;
 const LoginManager = imports.misc.loginManager;
 const ModalDialog = imports.ui.modalDialog;
+const Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
+let _endSessionDialog = null;
+
 const _ITEM_ICON_SIZE = 48;
 const _DIALOG_ICON_SIZE = 48;
 
+var GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
+
 const EndSessionDialogIface = loadInterfaceXML('org.gnome.SessionManager.EndSessionDialog');
 
 const logoutDialogContent = {
@@ -49,7 +61,7 @@ const logoutDialogContent = {
     },
     showBatteryWarning: false,
     confirmButtons: [{ signal: 'ConfirmedLogout',
-                       label: C_("button", "Log Out") }],
+                       label:  C_("button", "Log Out") }],
     iconStyleClass: 'end-session-dialog-logout-icon',
     showOtherSessions: false,
 };
@@ -65,9 +77,9 @@ const shutdownDialogContent = {
     checkBoxText: C_("checkbox", "Install pending software updates"),
     showBatteryWarning: true,
     confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label: C_("button", "Restart") },
+                       label:  C_("button", "Restart") },
                      { signal: 'ConfirmedShutdown',
-                       label: C_("button", "Power Off") }],
+                       label:  C_("button", "Power Off") }],
     iconName: 'system-shutdown-symbolic',
     iconStyleClass: 'end-session-dialog-shutdown-icon',
     showOtherSessions: true,
@@ -82,7 +94,7 @@ const restartDialogContent = {
     },
     showBatteryWarning: false,
     confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label: C_("button", "Restart") }],
+                       label:  C_("button", "Restart") }],
     iconName: 'view-refresh-symbolic',
     iconStyleClass: 'end-session-dialog-shutdown-icon',
     showOtherSessions: true,
@@ -98,7 +110,7 @@ const restartUpdateDialogContent = {
     },
     showBatteryWarning: true,
     confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label: C_("button", "Restart & Install") }],
+                       label:  C_("button", "Restart & Install") }],
     unusedFutureButtonForTranslation: C_("button", "Install & Power Off"),
     unusedFutureCheckBoxForTranslation: C_("checkbox", "Power off after updates are installed"),
     iconName: 'view-refresh-symbolic',
@@ -118,18 +130,18 @@ const restartUpgradeDialogContent = {
     disableTimer: true,
     showBatteryWarning: false,
     confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label: C_("button", "Restart & Install") }],
+                       label:  C_("button", "Restart & Install") }],
     iconName: 'view-refresh-symbolic',
     iconStyleClass: 'end-session-dialog-shutdown-icon',
     showOtherSessions: true,
 };
 
 const DialogType = {
-    LOGOUT: 0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */,
+  LOGOUT: 0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */,
-    SHUTDOWN: 1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */,
+  SHUTDOWN: 1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */,
-    RESTART: 2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */,
+  RESTART: 2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */,
-    UPDATE_RESTART: 3,
+  UPDATE_RESTART: 3,
-    UPGRADE_RESTART: 4
+  UPGRADE_RESTART: 4
 };
 
 const DialogContent = {
@@ -155,7 +167,7 @@ function findAppFromInhibitor(inhibitor) {
     let desktopFile;
     try {
         [desktopFile] = inhibitor.GetAppIdSync();
-    } catch (e) {
+    } catch(e) {
         // XXX -- sometimes JIT inhibitors generated by gnome-session
         // get removed too soon. Don't fail in this case.
         log('gnome-session gave us a dead inhibitor: %s'.format(inhibitor.get_object_path()));
@@ -219,25 +231,25 @@ function init() {
     // This always returns the same singleton object
     // By instantiating it initially, we register the
     // bus object, etc.
-    (new EndSessionDialog());
+    _endSessionDialog = new EndSessionDialog();
 }
 
-var EndSessionDialog = GObject.registerClass(
+var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
-class EndSessionDialog extends ModalDialog.ModalDialog {
+    constructor() {
-    _init() {
+        super({ styleClass: 'end-session-dialog',
-        super._init({ styleClass: 'end-session-dialog',
+                destroyOnClose: false });
-                      destroyOnClose: false });
 
         this._loginManager = LoginManager.getLoginManager();
         this._userManager = AccountsService.UserManager.get_default();
         this._user = this._userManager.get_user(GLib.get_user_name());
-        this._updatesPermission = null;
 
         this._pkOfflineProxy = new PkOfflineProxy(Gio.DBus.system,
                                                   'org.freedesktop.PackageKit',
                                                   '/org/freedesktop/PackageKit',
-                                                  this._onPkOfflineProxyCreated.bind(this));
+                                                  (proxy, error) => {
-
+                                                      if (error)
+                                                          log(error.message);
+                                                  });
         this._powerProxy = new UPowerProxy(Gio.DBus.system,
                                            'org.freedesktop.UPower',
                                            '/org/freedesktop/UPower',
@@ -271,8 +283,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
 
         this._iconBin = new St.Bin();
         mainContentLayout.add(this._iconBin,
-                              { x_fill: true,
+                              { x_fill:  true,
-                                y_fill: false,
+                                y_fill:  false,
                                 x_align: St.Align.END,
                                 y_align: St.Align.START });
 
@@ -285,7 +297,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
 
         messageLayout.add(this._subjectLabel,
                           { x_fill: false,
-                            y_fill: false,
+                            y_fill:  false,
                             x_align: St.Align.START,
                             y_align: St.Align.START });
 
@@ -294,7 +306,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         this._descriptionLabel.clutter_text.line_wrap = true;
 
         messageLayout.add(this._descriptionLabel,
-                          { y_fill: true,
+                          { y_fill:  true,
                             y_align: St.Align.START });
 
         this._checkBox = new CheckBox.CheckBox();
@@ -308,7 +320,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         messageLayout.add(this._batteryWarning);
 
         this._scrollView = new St.ScrollView({ style_class: 'end-session-dialog-list' });
-        this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
+        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         this.contentLayout.add(this._scrollView,
                                { x_fill: true,
                                  y_fill: true });
@@ -332,31 +344,14 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         this._inhibitorSection.add_actor(this._sessionHeader);
         this._inhibitorSection.add_actor(this._sessionList);
 
-        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
-        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
-    }
-
-    _onPkOfflineProxyCreated(proxy, error) {
-        if (error) {
-            log(error.message);
-            return;
-        }
-
-        // Creating a D-Bus proxy won't propagate SERVICE_UNKNOWN or NAME_HAS_NO_OWNER
-        // errors if PackageKit is not available, but the GIO implementation will make
-        // sure in that case that the proxy's g-name-owner is set to null, so check that.
-        if (this._pkOfflineProxy.g_name_owner === null) {
-            this._pkOfflineProxy = null;
-            return;
-        }
-
-        // It only makes sense to check for this permission if PackageKit is available.
         try {
-            this._updatesPermission = Polkit.Permission.new_sync(
+            this._updatesPermission = Polkit.Permission.new_sync("org.freedesktop.packagekit.trigger-offline-update", null, null);
-                "org.freedesktop.packagekit.trigger-offline-update", null, null);
         } catch(e) {
             log('No permission to trigger offline updates: %s'.format(e.toString()));
         }
+
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
     }
 
     _onDestroy() {
@@ -403,8 +398,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         }
 
         // Use a different description when we are installing a system upgrade
-        // if the PackageKit proxy is available (i.e. PackageKit is available).
+        if (dialogContent.upgradeDescription) {
-        if (this._pkOfflineProxy && dialogContent.upgradeDescription) {
             let name = this._pkOfflineProxy.PreparedUpgrade['name'].deep_unpack();
             let version = this._pkOfflineProxy.PreparedUpgrade['version'].deep_unpack();
 
@@ -441,8 +435,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
     _updateButtons() {
         let dialogContent = DialogContent[this._type];
         let buttons = [{ action: this.cancel.bind(this),
-                         label: _("Cancel"),
+                         label:  _("Cancel"),
-                         key: Clutter.Escape }];
+                         key:    Clutter.Escape }];
 
         for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
             let signal = dialogContent.confirmButtons[i].signal;
@@ -489,19 +483,19 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         // Trigger the offline update as requested
         if (this._checkBox.actor.checked) {
             switch (signal) {
-            case "ConfirmedReboot":
+                case "ConfirmedReboot":
-                this._triggerOfflineUpdateReboot(callback);
+                    this._triggerOfflineUpdateReboot(callback);
-                break;
+                    break;
-            case "ConfirmedShutdown":
+                case "ConfirmedShutdown":
-                // To actually trigger the offline update, we need to
+                    // To actually trigger the offline update, we need to
-                // reboot to do the upgrade. When the upgrade is complete,
+                    // reboot to do the upgrade. When the upgrade is complete,
-                // the computer will shut down automatically.
+                    // the computer will shut down automatically.
-                signal = "ConfirmedReboot";
+                    signal = "ConfirmedReboot";
-                this._triggerOfflineUpdateShutdown(callback);
+                    this._triggerOfflineUpdateShutdown(callback);
-                break;
+                    break;
-            default:
+                default:
-                callback();
+                    callback();
-                break;
+                    break;
             }
         } else {
             this._triggerOfflineUpdateCancel(callback);
@@ -513,12 +507,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
     }
 
     _triggerOfflineUpdateReboot(callback) {
-        // Handle this gracefully if PackageKit is not available.
-        if (!this._pkOfflineProxy) {
-            callback();
-            return;
-        }
-
         this._pkOfflineProxy.TriggerRemote('reboot', (result, error) => {
             if (error)
                 log(error.message);
@@ -528,12 +516,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
     }
 
     _triggerOfflineUpdateShutdown(callback) {
-        // Handle this gracefully if PackageKit is not available.
-        if (!this._pkOfflineProxy) {
-            callback();
-            return;
-        }
-
         this._pkOfflineProxy.TriggerRemote('power-off', (result, error) => {
             if (error)
                 log(error.message);
@@ -543,12 +525,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
     }
 
     _triggerOfflineUpdateCancel(callback) {
-        // Handle this gracefully if PackageKit is not available.
-        if (!this._pkOfflineProxy) {
-            callback();
-            return;
-        }
-
         this._pkOfflineProxy.CancelRemote((result, error) => {
             if (error)
                 log(error.message);
@@ -616,7 +592,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
     }
 
     _onInhibitorLoaded(inhibitor) {
-        if (!this._applications.includes(inhibitor)) {
+        if (this._applications.indexOf(inhibitor) < 0) {
             // Stale inhibitor
             return;
         }
@@ -668,7 +644,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         this._loginManager.listSessions(result => {
             let n = 0;
             for (let i = 0; i < result.length; i++) {
-                let [id, uid, userName, seat, sessionPath] = result[i];
+                let[id, uid, userName, seat, sessionPath] = result[i];
                 let proxy = new LogindSession(Gio.DBus.system, 'org.freedesktop.login1', sessionPath);
 
                 if (proxy.Class != 'user')
@@ -711,8 +687,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         this._totalSecondsToStayOpen = totalSecondsToStayOpen;
         this._type = type;
 
-        // Only consider updates and upgrades if PackageKit is available.
+        if (this._type == DialogType.RESTART) {
-        if (this._pkOfflineProxy && this._type == DialogType.RESTART) {
             if (this._pkOfflineProxy.UpdateTriggered)
                 this._type = DialogType.UPDATE_RESTART;
             else if (this._pkOfflineProxy.UpgradeTriggered)
@@ -744,9 +719,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         if (dialogContent.showOtherSessions)
             this._loadSessions();
 
-        // Only consider updates and upgrades if PackageKit is available.
+        let updateTriggered = this._pkOfflineProxy.UpdateTriggered;
-        let updateTriggered = this._pkOfflineProxy ? this._pkOfflineProxy.UpdateTriggered : false;
+        let updatePrepared = this._pkOfflineProxy.UpdatePrepared;
-        let updatePrepared = this._pkOfflineProxy ? this._pkOfflineProxy.UpdatePrepared : false;
         let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
 
         _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText || '');
@@ -781,4 +755,4 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
     Close(parameters, invocation) {
         this.close();
     }
-});
+};