Bump version to 3.30.2

Update NEWS.

.gitignore

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

.gitlab-ci.yml

@@ -1,86 +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:v1
-    stage: review
-    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/gnome-shell/master:v1
-    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/gnome-shell/master:v1
-    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/gnome-shell/master:v1
-    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

@@ -1,19 +0,0 @@
-FROM registry.gitlab.gnome.org/gnome/mutter/master:v1
-
-RUN dnf -y update && dnf -y upgrade && \
-    dnf install -y 'dnf-command(copr)' && \
-    dnf copr enable -y fmuellner/gnome-shell-ci && \
-    dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \
-
-    # bt only exports HAVE_BLUETOOTH to js, rest are outdated build-requires
-    dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel \
-                  upower-devel python3-devel && \
-
-    # We'll build mutter ourselves
-    dnf remove -y --noautoremove mutter mutter-devel && \
-
-    # Needed for tests
-    dnf install -y '*/xvfb-run' gdm-lib accountsservice-libs && \
-
-    dnf clean all && \
-    rm -rf /var/cache/dnf

.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,31 +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 $merge_request_remote $merge_request_branch >/dev/null 2>&1; then
-    mutter_target=FETCH_HEAD
-  fi
-fi
-
-if [ -z "$mutter_target" ]; then
-  mutter_target=$(git branch -r -l $shell_branch)
-  mutter_target=${mutter_target:-origin/master}
-  echo Using $mutter_target instead
-fi
-
-git checkout $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

@@ -10,15 +10,15 @@ Life isn't fun if you can't break the rules. If a rule seems unnecessarily
 restrictive while you're coding, ignore it, and let the patch reviewer decide
 what to do.
 
-## Indentation, braces and whitespace
+## Indentation and whitespace
 
-* Use four-space indents.
-* Braces are on the same line as their associated statements.
-* You should only omit braces if *both* sides of the statement are on one line.
-* One space after the `function` keyword.
-* No space between the function name in a declaration or a call.
-* One space before the parens in the `if` statements, or `while`, or `for` loops.
+Use four-space indents. Braces are on the same line as their associated
+statements.  You should only omit braces if *both* sides of the statement are
+on one line.
 
+* One space after the `function` keyword.  No space between the function name
+* in a declaration or a call.  One space before the parens in the `if`
+* statements, or `while`, or `for` loops.
 ```javascript
     function foo(a, b) {
         let bar;
@@ -80,7 +80,10 @@ 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 Lang = imports.lang;
+    const St = imports.gi.St;
 
     const Main = imports.ui.main;
     const Params = imports.misc.params;
@@ -118,53 +121,60 @@ See [What's new in JavaScript 1.7](https://developer.mozilla.org/en/JavaScript/N
 
 ## Classes
 
-There are many approaches to classes in JavaScript. We use standard ES6 classes
-whenever possible, that is when not inheriting from GObjects.
+There are many approaches to classes in JavaScript. We use our own class framework
+(sigh), which is built in gjs. The advantage is that it supports inheriting from
+GObjects, although this feature isn't used very often in the Shell itself.
 ```javascript
-    var IconLabelMenuItem = class extends PopupMenu.PopupMenuBaseItem {
-        constructor(icon, label) {
-            super({ reactive: false });
+    var IconLabelMenuItem = new Lang.Class({
+        Name: 'IconLabelMenuItem',
+        Extends: PopupMenu.PopupMenuBaseItem,
+
+        _init(icon, label) {
+            this.parent({ reactive: false });
             this.actor.add_child(icon);
             this.actor.add_child(label);
-        }
+        },
 
         open() {
             log("menu opened!");
         }
-    };
-```
-
-For GObject inheritence, we use the GObject.registerClass() function provided
-by gjs.
-```javascript
-    var MyActor = GObject.registerClass(
-    class MyActor extends Clutter.Actor {
-        _init(params) {
-            super._init(params);
-
-            this.name = 'MyCustomActor';
-        }
     });
 ```
 
+* 'Name' is required. 'Extends' is optional. If you leave it out, you will
+  automatically inherit from Object.
+
+* Leave a blank line between the "class header" (Name, Extends, and other
+  things)  and the "class body" (methods). Leave a blank line between each
+  method.
+
+* No space before the colon, one space after.
+
+* No trailing comma after the last item.
+
+* Make sure to use a semicolon after the closing paren to the class. It's
+  still a giant function call, even though it may resemble a more
+  conventional syntax.
+
 ## GObject Introspection
 
 GObject Introspection is a powerful feature that allows us to have native
 bindings for almost any library built around GObject. If a library requires
 you to inherit from a type to use it, you can do so:
 ```javascript
-    var MyClutterActor = GObject.registerClass(
-    class MyClutterActor extends Clutter.Actor {
+    var MyClutterActor = new Lang.Class({
+        Name: '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,
@@ -197,18 +207,20 @@ that has a property called `actor`. We call this wrapper class the "delegate".
 We sometimes use expando properties to set a property called `_delegate` on
 the actor itself:
 ```javascript
-    var MyClass = class {
-        constructor() {
+    var MyClass = new Lang.Class({
+        Name: 'MyClass',
+
+        _init() {
             this.actor = new St.Button({ text: "This is a button" });
             this.actor._delegate = this;
 
             this.actor.connect('clicked', this._onClicked.bind(this));
-        }
+        },
 
         _onClicked(actor) {
             actor.set_label("You clicked the button!");
         }
-    };
+    });
 ```
 
 The 'delegate' property is important for anything which trying to get the
@@ -234,6 +246,8 @@ variable that can be captured in closures.
 All closures should be wrapped with Function.prototype.bind or use arrow
 notation.
 ```javascript
+    const Lang = imports.lang;
+
     let closure1 = () => { this._fnorbate(); };
     let closure2 = this._fnorbate.bind(this);
 ```
@@ -241,18 +255,19 @@ notation.
 A more realistic example would be connecting to a signal on a method of a
 prototype:
 ```javascript
+    const Lang = imports.lang;
     const FnorbLib = imports.fborbLib;
 
-    var MyClass = class {
+    var MyClass = new Lang.Class({
         _init() {
             let fnorb = new FnorbLib.Fnorb();
             fnorb.connect('frobate', this._onFnorbFrobate.bind(this));
-        }
+        },
 
         _onFnorbFrobate(fnorb) {
             this._updateFnorb();
         }
-    };
+    });
 ```
 
 ## Object literal syntax
@@ -286,21 +301,23 @@ property.
 ```javascript
     var ANIMATION_TIME = 2000;
 
-    var MyClass = class {
-        constructor() {
+    var MyClass = new Lang.Class({
+        Name: 'MyClass',
+
+        _init() {
             this.actor = new St.BoxLayout();
             this._position = 0;
-        }
+        },
 
         get position() {
             return this._position;
-        }
+        },
 
         set position(value) {
             this._position = value;
             this.actor.set_position(value, value);
         }
-    };
+    });
 
     let myThing = new MyClass();
     Tweener.addTween(myThing,

NEWS

@@ -1,143 +1,23 @@
-3.32.0
+3.30.2
 ======
-* 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]
-* Remove browser plugin [Michael; #766776]
-* Add DBus API for introspecting the application state [Jonas, Olivier; !326]
-* Always allow leaving the overview via the hot-corner [Pascal; #429]
-* Misc. bug fixes [Florian, Jasper, Andrea, Sam, Dani, Cosimo, Jonas, Carlos;
-  #643595, #673767, !293, #783, #781, !298, !297, #782, !301, !314, !305, #799,
-  #632, !327]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Michael Catanzaro, Cosimo Cecchi, daniruiz,
-  Olivier Fourdan, Carlos Garnacho, Sam Hewitt, Andre Klapper, Florian Müllner,
-  Pascal Nowack, Jasper St. Pierre, RyuzakiKK, Marco Trevisan (Treviño),
-  João Paulo Rechi Vita, Daniel van Vugt
-
-Translators:
-  Kristjan SCHMIDT [eo], Matej Urbančič [sl], Daniel Mustieles [es],
-  Fabio Tomat [fur], Emin Tufan Çetin [tr], Anders Jonsson [sv],
-  Ryuta Fujii [ja]
-
-3.31.2
-======
-* Port away from and remove ShellGenericContainer [Georges; !153]
 * popupMenu: Fix keyboard activation when numlock is active [Andrea; #550]
 * Do not block all shortcuts while app folders are expanded [Florian; #648]
 * Fix regression in handling new input sources [Carlos; #691]
-* Reask password after udisk errors for no/wrong passwords [Sebastian; #640]
 * Improve performance of app icon animations [Daniel; !253, !261]
-* Avoid focus changes when updating keyboard options [Takao; #391]
-* notifications: Support icon theme names in 'image-path' hint [Marco; !285]
 * Respect natural-scroll setting for workspace swipe gesture [Erik; #516]
+* notifications: Support icon theme names in 'image-path' hint [Marco; !285]
 * Confine window preview titles to workspace area [Florian; !214]
-* Misc. bug fixes [Florian, Carmen, Georges, Cosimo, Carlos; #602, #693,
-  #666, #647, !66, #768, #430, !286, !258, !287, gtk#1447]
+* Misc. bug fixes [Florian, Cosimo; #602, #693, #768, #430, !286]
 
 Contributors:
-  Andrea Azzarone, Carmen Bianca Bakker, Cosimo Cecchi, Sergio Costas,
-  Erik Duxstad, Takao Fujiwara, Carlos Garnacho, Florian Müllner,
-  Georges Basile Stavracas Neto, Sebastian Pinnau, Didier Roche, Jakub Steiner,
-  Marco Trevisan (Treviño), verdre, Daniel van Vugt
+  Andrea Azzarone, Cosimo Cecchi, Erik Duxstad, Carlos Garnacho,
+  Florian Müllner, Didier Roche, Marco Trevisan (Treviño), verdre,
+  Daniel van Vugt
 
 Translators:
-  Kristjan SCHMIDT [eo], Dušan Kazik [sk], Matej Urbančič [sl],
-  Anish Sheela [ml], Rafael Fontenelle [pt_BR], Daniel Mustieles [es]
+  Rūdolfs Mazurs [lv], Kristjan SCHMIDT [eo], Milo Casagrande [it],
+  Dušan Kazik [sk], gogo [hr], Anish Sheela [ml], Rafael Fontenelle [pt_BR],
+  Daniel Mustieles [es]
 
 3.30.1
 ======

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.
-

browser-plugin/README.md

@@ -0,0 +1,17 @@
+The GNOME Shell Browser Plugin provides integration with gnome-shell and the
+corresponding extensions repository, codenamed "SweetTooth". The plugin allows
+the extensions repository to provide good integration, letting the website
+know which extensions are enabled and disabled, and allowing the website to
+enable, disable and install them.
+
+Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
+
+## License
+The GNOME Shell Browser Plugin, like GNOME Shell itself is distributed under
+the GNU General Public License, version 2 or later. The plugin also contains
+header files from the "NPAPI SDK" project, tri-licensed under MPL 1.1, GPL 2.0
+and LGPL 2.1. These headers are third-party sources and can be retrieved from:
+
+  http://code.google.com/p/npapi-sdk/
+
+[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell/issues

browser-plugin/meson.build

@@ -0,0 +1,19 @@
+plugin_sources = [
+  'browser-plugin.c',
+  'npapi/npapi.h',
+  'npapi/npfunctions.h',
+  'npapi/npruntime.h',
+  'npapi/nptypes.h'
+]
+
+shared_module('gnome-shell-browser-plugin', plugin_sources,
+  dependencies: [gio_dep, json_glib_dep],
+  c_args: ['-DG_LOG_DOMAIN="GnomeShellBrowserPlugin"'],
+  # Browsers can unload and reload the module while browsing, which is not
+  # supported by GObject.
+  # We pass -Wl,-z,nodelete to the linker to ensure the module is never
+  # unloaded. See https://bugzilla.gnome.org/show_bug.cgi?id=737932.
+  link_args: ['-Wl,-z,nodelete'],
+  install: true,
+  install_dir: plugindir
+)

browser-plugin/npapi/npapi.h

@@ -0,0 +1,893 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef npapi_h_
+#define npapi_h_
+
+#if defined(__OS2__)
+#pragma pack(1)
+#endif
+
+#include "nptypes.h"
+
+#if defined(__OS2__) || defined(OS2)
+#ifndef XP_OS2
+#define XP_OS2 1
+#endif
+#endif
+
+#if defined(_WIN32) && !defined(__SYMBIAN32__)
+#include <windef.h>
+#ifndef XP_WIN
+#define XP_WIN 1
+#endif
+#endif
+
+#if defined(__SYMBIAN32__)
+#ifndef XP_SYMBIAN
+#define XP_SYMBIAN 1
+#undef XP_WIN
+#endif
+#endif
+
+#if defined(__APPLE_CC__) && !defined(XP_UNIX)
+#ifndef XP_MACOSX
+#define XP_MACOSX 1
+#endif
+#endif
+
+#if defined(XP_MACOSX) && defined(__LP64__)
+#define NP_NO_QUICKDRAW
+#define NP_NO_CARBON
+#endif
+
+#if defined(XP_MACOSX)
+#include <ApplicationServices/ApplicationServices.h>
+#include <OpenGL/OpenGL.h>
+#ifndef NP_NO_CARBON
+#include <Carbon/Carbon.h>
+#endif
+#endif
+
+#if defined(XP_UNIX)
+#include <stdio.h>
+#if defined(MOZ_X11)
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#endif
+#endif
+
+#if defined(XP_SYMBIAN)
+#include <QEvent>
+#include <QRegion>
+#endif
+
+/*----------------------------------------------------------------------*/
+/*                        Plugin Version Constants                      */
+/*----------------------------------------------------------------------*/
+
+#define NP_VERSION_MAJOR 0
+#define NP_VERSION_MINOR 27
+
+
+/* The OS/2 version of Netscape uses RC_DATA to define the
+   mime types, file extensions, etc that are required.
+   Use a vertical bar to separate types, end types with \0.
+   FileVersion and ProductVersion are 32bit ints, all other
+   entries are strings that MUST be terminated with a \0.
+
+AN EXAMPLE:
+
+RCDATA NP_INFO_ProductVersion { 1,0,0,1,}
+
+RCDATA NP_INFO_MIMEType    { "video/x-video|",
+                             "video/x-flick\0" }
+RCDATA NP_INFO_FileExtents { "avi|",
+                             "flc\0" }
+RCDATA NP_INFO_FileOpenName{ "MMOS2 video player(*.avi)|",
+                             "MMOS2 Flc/Fli player(*.flc)\0" }
+
+RCDATA NP_INFO_FileVersion       { 1,0,0,1 }
+RCDATA NP_INFO_CompanyName       { "Netscape Communications\0" }
+RCDATA NP_INFO_FileDescription   { "NPAVI32 Extension DLL\0"
+RCDATA NP_INFO_InternalName      { "NPAVI32\0" )
+RCDATA NP_INFO_LegalCopyright    { "Copyright Netscape Communications \251 1996\0"
+RCDATA NP_INFO_OriginalFilename  { "NVAPI32.DLL" }
+RCDATA NP_INFO_ProductName       { "NPAVI32 Dynamic Link Library\0" }
+*/
+/* RC_DATA types for version info - required */
+#define NP_INFO_ProductVersion      1
+#define NP_INFO_MIMEType            2
+#define NP_INFO_FileOpenName        3
+#define NP_INFO_FileExtents         4
+/* RC_DATA types for version info - used if found */
+#define NP_INFO_FileDescription     5
+#define NP_INFO_ProductName         6
+/* RC_DATA types for version info - optional */
+#define NP_INFO_CompanyName         7
+#define NP_INFO_FileVersion         8
+#define NP_INFO_InternalName        9
+#define NP_INFO_LegalCopyright      10
+#define NP_INFO_OriginalFilename    11
+
+#ifndef RC_INVOKED
+
+/*----------------------------------------------------------------------*/
+/*                       Definition of Basic Types                      */
+/*----------------------------------------------------------------------*/
+
+typedef unsigned char NPBool;
+typedef int16_t       NPError;
+typedef int16_t       NPReason;
+typedef char*         NPMIMEType;
+
+/*----------------------------------------------------------------------*/
+/*                       Structures and definitions                     */
+/*----------------------------------------------------------------------*/
+
+#if !defined(__LP64__)
+#if defined(XP_MACOSX)
+#pragma options align=mac68k
+#endif
+#endif /* __LP64__ */
+
+/*
+ *  NPP is a plug-in's opaque instance handle
+ */
+typedef struct _NPP
+{
+  void* pdata;      /* plug-in private data */
+  void* ndata;      /* netscape private data */
+} NPP_t;
+
+typedef NPP_t*  NPP;
+
+typedef struct _NPStream
+{
+  void*    pdata; /* plug-in private data */
+  void*    ndata; /* netscape private data */
+  const    char* url;
+  uint32_t end;
+  uint32_t lastmodified;
+  void*    notifyData;
+  const    char* headers; /* Response headers from host.
+                           * Exists only for >= NPVERS_HAS_RESPONSE_HEADERS.
+                           * Used for HTTP only; NULL for non-HTTP.
+                           * Available from NPP_NewStream onwards.
+                           * Plugin should copy this data before storing it.
+                           * Includes HTTP status line and all headers,
+                           * preferably verbatim as received from server,
+                           * headers formatted as in HTTP ("Header: Value"),
+                           * and newlines (\n, NOT \r\n) separating lines.
+                           * Terminated by \n\0 (NOT \n\n\0). */
+} NPStream;
+
+typedef struct _NPByteRange
+{
+  int32_t  offset; /* negative offset means from the end */
+  uint32_t length;
+  struct _NPByteRange* next;
+} NPByteRange;
+
+typedef struct _NPSavedData
+{
+  int32_t len;
+  void*   buf;
+} NPSavedData;
+
+typedef struct _NPRect
+{
+  uint16_t top;
+  uint16_t left;
+  uint16_t bottom;
+  uint16_t right;
+} NPRect;
+
+typedef struct _NPSize
+{
+  int32_t width;
+  int32_t height;
+} NPSize;
+
+typedef enum {
+  NPFocusNext = 0,
+  NPFocusPrevious = 1
+} NPFocusDirection;
+
+/* Return values for NPP_HandleEvent */
+#define kNPEventNotHandled 0
+#define kNPEventHandled 1
+/* Exact meaning must be spec'd in event model. */
+#define kNPEventStartIME 2
+
+#if defined(XP_UNIX)
+/*
+ * Unix specific structures and definitions
+ */
+
+/*
+ * Callback Structures.
+ *
+ * These are used to pass additional platform specific information.
+ */
+enum {
+  NP_SETWINDOW = 1,
+  NP_PRINT
+};
+
+typedef struct
+{
+  int32_t type;
+} NPAnyCallbackStruct;
+
+typedef struct
+{
+  int32_t      type;
+#if defined(MOZ_X11)
+  Display*     display;
+  Visual*      visual;
+  Colormap     colormap;
+  unsigned int depth;
+#endif
+} NPSetWindowCallbackStruct;
+
+typedef struct
+{
+  int32_t type;
+  FILE* fp;
+} NPPrintCallbackStruct;
+
+#endif /* XP_UNIX */
+
+#if defined(XP_MACOSX)
+typedef enum {
+#ifndef NP_NO_QUICKDRAW
+  NPDrawingModelQuickDraw = 0,
+#endif
+  NPDrawingModelCoreGraphics = 1,
+  NPDrawingModelOpenGL = 2,
+  NPDrawingModelCoreAnimation = 3,
+  NPDrawingModelInvalidatingCoreAnimation = 4
+} NPDrawingModel;
+
+typedef enum {
+#ifndef NP_NO_CARBON
+  NPEventModelCarbon = 0,
+#endif
+  NPEventModelCocoa = 1
+} NPEventModel;
+#endif
+
+/*
+ *   The following masks are applied on certain platforms to NPNV and
+ *   NPPV selectors that pass around pointers to COM interfaces. Newer
+ *   compilers on some platforms may generate vtables that are not
+ *   compatible with older compilers. To prevent older plugins from
+ *   not understanding a new browser's ABI, these masks change the
+ *   values of those selectors on those platforms. To remain backwards
+ *   compatible with different versions of the browser, plugins can
+ *   use these masks to dynamically determine and use the correct C++
+ *   ABI that the browser is expecting. This does not apply to Windows
+ *   as Microsoft's COM ABI will likely not change.
+ */
+
+#define NP_ABI_GCC3_MASK  0x10000000
+/*
+ *   gcc 3.x generated vtables on UNIX and OSX are incompatible with
+ *   previous compilers.
+ */
+#if (defined(XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3))
+#define _NP_ABI_MIXIN_FOR_GCC3 NP_ABI_GCC3_MASK
+#else
+#define _NP_ABI_MIXIN_FOR_GCC3 0
+#endif
+
+#if defined(XP_MACOSX)
+#define NP_ABI_MACHO_MASK 0x01000000
+#define _NP_ABI_MIXIN_FOR_MACHO NP_ABI_MACHO_MASK
+#else
+#define _NP_ABI_MIXIN_FOR_MACHO 0
+#endif
+
+#define NP_ABI_MASK (_NP_ABI_MIXIN_FOR_GCC3 | _NP_ABI_MIXIN_FOR_MACHO)
+
+/*
+ * List of variable names for which NPP_GetValue shall be implemented
+ */
+typedef enum {
+  NPPVpluginNameString = 1,
+  NPPVpluginDescriptionString,
+  NPPVpluginWindowBool,
+  NPPVpluginTransparentBool,
+  NPPVjavaClass,
+  NPPVpluginWindowSize,
+  NPPVpluginTimerInterval,
+  NPPVpluginScriptableInstance = (10 | NP_ABI_MASK),
+  NPPVpluginScriptableIID = 11,
+  NPPVjavascriptPushCallerBool = 12,
+  NPPVpluginKeepLibraryInMemory = 13,
+  NPPVpluginNeedsXEmbed         = 14,
+
+  /* Get the NPObject for scripting the plugin. Introduced in NPAPI minor version 14.
+   */
+  NPPVpluginScriptableNPObject  = 15,
+
+  /* Get the plugin value (as \0-terminated UTF-8 string data) for
+   * form submission if the plugin is part of a form. Use
+   * NPN_MemAlloc() to allocate memory for the string data. Introduced
+   * in NPAPI minor version 15.
+   */
+  NPPVformValue = 16,
+
+  NPPVpluginUrlRequestsDisplayedBool = 17,
+
+  /* Checks if the plugin is interested in receiving the http body of
+   * all http requests (including failed ones, http status != 200).
+   */
+  NPPVpluginWantsAllNetworkStreams = 18,
+
+  /* Browsers can retrieve a native ATK accessibility plug ID via this variable. */
+  NPPVpluginNativeAccessibleAtkPlugId = 19,
+
+  /* Checks to see if the plug-in would like the browser to load the "src" attribute. */
+  NPPVpluginCancelSrcStream = 20,
+
+  NPPVsupportsAdvancedKeyHandling = 21,
+
+  NPPVpluginUsesDOMForCursorBool = 22
+
+#if defined(XP_MACOSX)
+  /* Used for negotiating drawing models */
+  , NPPVpluginDrawingModel = 1000
+  /* Used for negotiating event models */
+  , NPPVpluginEventModel = 1001
+  /* In the NPDrawingModelCoreAnimation drawing model, the browser asks the plug-in for a Core Animation layer. */
+  , NPPVpluginCoreAnimationLayer = 1003
+#endif
+
+#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
+  , NPPVpluginWindowlessLocalBool = 2002
+#endif
+} NPPVariable;
+
+/*
+ * List of variable names for which NPN_GetValue should be implemented.
+ */
+typedef enum {
+  NPNVxDisplay = 1,
+  NPNVxtAppContext,
+  NPNVnetscapeWindow,
+  NPNVjavascriptEnabledBool,
+  NPNVasdEnabledBool,
+  NPNVisOfflineBool,
+
+  NPNVserviceManager = (10 | NP_ABI_MASK),
+  NPNVDOMElement     = (11 | NP_ABI_MASK),
+  NPNVDOMWindow      = (12 | NP_ABI_MASK),
+  NPNVToolkit        = (13 | NP_ABI_MASK),
+  NPNVSupportsXEmbedBool = 14,
+
+  /* Get the NPObject wrapper for the browser window. */
+  NPNVWindowNPObject = 15,
+
+  /* Get the NPObject wrapper for the plugins DOM element. */
+  NPNVPluginElementNPObject = 16,
+
+  NPNVSupportsWindowless = 17,
+
+  NPNVprivateModeBool = 18,
+
+  NPNVsupportsAdvancedKeyHandling = 21
+
+#if defined(XP_MACOSX)
+  /* Used for negotiating drawing models */
+  , NPNVpluginDrawingModel = 1000
+#ifndef NP_NO_QUICKDRAW
+  , NPNVsupportsQuickDrawBool = 2000
+#endif
+  , NPNVsupportsCoreGraphicsBool = 2001
+  , NPNVsupportsOpenGLBool = 2002
+  , NPNVsupportsCoreAnimationBool = 2003
+  , NPNVsupportsInvalidatingCoreAnimationBool = 2004
+#ifndef NP_NO_CARBON
+  , NPNVsupportsCarbonBool = 3000 /* TRUE if the browser supports the Carbon event model */
+#endif
+  , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
+  , NPNVsupportsUpdatedCocoaTextInputBool = 3002 /* TRUE if the browser supports the updated
+                                                    Cocoa text input specification. */
+  , NPNVsupportsCompositingCoreAnimationPluginsBool = 74656 /* TRUE if the browser supports
+                                                               CA model compositing */
+#endif
+#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
+  , NPNVSupportsWindowlessLocal = 2002
+#endif
+} NPNVariable;
+
+typedef enum {
+  NPNURLVCookie = 501,
+  NPNURLVProxy
+} NPNURLVariable;
+
+/*
+ * The type of Toolkit the widgets use
+ */
+typedef enum {
+  NPNVGtk12 = 1,
+  NPNVGtk2
+} NPNToolkitType;
+
+/*
+ * The type of a NPWindow - it specifies the type of the data structure
+ * returned in the window field.
+ */
+typedef enum {
+  NPWindowTypeWindow = 1,
+  NPWindowTypeDrawable
+} NPWindowType;
+
+typedef struct _NPWindow
+{
+  void* window;  /* Platform specific window handle */
+                 /* OS/2: x - Position of bottom left corner */
+                 /* OS/2: y - relative to visible netscape window */
+  int32_t  x;      /* Position of top left corner relative */
+  int32_t  y;      /* to a netscape page. */
+  uint32_t width;  /* Maximum window size */
+  uint32_t height;
+  NPRect   clipRect; /* Clipping rectangle in port coordinates */
+#if (defined(XP_UNIX) || defined(XP_SYMBIAN)) && !defined(XP_MACOSX)
+  void * ws_info; /* Platform-dependent additional data */
+#endif /* XP_UNIX */
+  NPWindowType type; /* Is this a window or a drawable? */
+} NPWindow;
+
+typedef struct _NPImageExpose
+{
+  char*    data;       /* image pointer */
+  int32_t  stride;     /* Stride of data image pointer */
+  int32_t  depth;      /* Depth of image pointer */
+  int32_t  x;          /* Expose x */
+  int32_t  y;          /* Expose y */
+  uint32_t width;      /* Expose width */
+  uint32_t height;     /* Expose height */
+  NPSize   dataSize;   /* Data buffer size */
+  float    translateX; /* translate X matrix value */
+  float    translateY; /* translate Y matrix value */
+  float    scaleX;     /* scale X matrix value */
+  float    scaleY;     /* scale Y matrix value */
+} NPImageExpose;
+
+typedef struct _NPFullPrint
+{
+  NPBool pluginPrinted;/* Set TRUE if plugin handled fullscreen printing */
+  NPBool printOne;     /* TRUE if plugin should print one copy to default
+                          printer */
+  void* platformPrint; /* Platform-specific printing info */
+} NPFullPrint;
+
+typedef struct _NPEmbedPrint
+{
+  NPWindow window;
+  void* platformPrint; /* Platform-specific printing info */
+} NPEmbedPrint;
+
+typedef struct _NPPrint
+{
+  uint16_t mode;               /* NP_FULL or NP_EMBED */
+  union
+  {
+    NPFullPrint fullPrint;   /* if mode is NP_FULL */
+    NPEmbedPrint embedPrint; /* if mode is NP_EMBED */
+  } print;
+} NPPrint;
+
+#if defined(XP_MACOSX)
+#ifndef NP_NO_CARBON
+typedef EventRecord NPEvent;
+#endif
+#elif defined(XP_SYMBIAN)
+typedef QEvent NPEvent;
+#elif defined(XP_WIN)
+typedef struct _NPEvent
+{
+  uint16_t event;
+  uintptr_t wParam;
+  uintptr_t lParam;
+} NPEvent;
+#elif defined(XP_OS2)
+typedef struct _NPEvent
+{
+  uint32_t event;
+  uint32_t wParam;
+  uint32_t lParam;
+} NPEvent;
+#elif defined(XP_UNIX) && defined(MOZ_X11)
+typedef XEvent NPEvent;
+#else
+typedef void*  NPEvent;
+#endif
+
+#if defined(XP_MACOSX)
+typedef void* NPRegion;
+#ifndef NP_NO_QUICKDRAW
+typedef RgnHandle NPQDRegion;
+#endif
+typedef CGPathRef NPCGRegion;
+#elif defined(XP_WIN)
+typedef HRGN NPRegion;
+#elif defined(XP_UNIX) && defined(MOZ_X11)
+typedef Region NPRegion;
+#elif defined(XP_SYMBIAN)
+typedef QRegion* NPRegion;
+#else
+typedef void *NPRegion;
+#endif
+
+typedef struct _NPNSString NPNSString;
+typedef struct _NPNSWindow NPNSWindow;
+typedef struct _NPNSMenu   NPNSMenu;
+
+#if defined(XP_MACOSX)
+typedef NPNSMenu NPMenu;
+#else
+typedef void *NPMenu;
+#endif
+
+typedef enum {
+  NPCoordinateSpacePlugin = 1,
+  NPCoordinateSpaceWindow,
+  NPCoordinateSpaceFlippedWindow,
+  NPCoordinateSpaceScreen,
+  NPCoordinateSpaceFlippedScreen
+} NPCoordinateSpace;
+
+#if defined(XP_MACOSX)
+
+#ifndef NP_NO_QUICKDRAW
+typedef struct NP_Port
+{
+  CGrafPtr port;
+  int32_t portx; /* position inside the topmost window */
+  int32_t porty;
+} NP_Port;
+#endif /* NP_NO_QUICKDRAW */
+
+/*
+ * NP_CGContext is the type of the NPWindow's 'window' when the plugin specifies NPDrawingModelCoreGraphics
+ * as its drawing model.
+ */
+
+typedef struct NP_CGContext
+{
+  CGContextRef context;
+  void *window; /* A WindowRef under the Carbon event model. */
+} NP_CGContext;
+
+/*
+ * NP_GLContext is the type of the NPWindow's 'window' when the plugin specifies NPDrawingModelOpenGL as its
+ * drawing model.
+ */
+
+typedef struct NP_GLContext
+{
+  CGLContextObj context;
+#ifdef NP_NO_CARBON
+  NPNSWindow *window;
+#else
+  void *window; /* Can be either an NSWindow or a WindowRef depending on the event model */
+#endif
+} NP_GLContext;
+
+typedef enum {
+  NPCocoaEventDrawRect = 1,
+  NPCocoaEventMouseDown,
+  NPCocoaEventMouseUp,
+  NPCocoaEventMouseMoved,
+  NPCocoaEventMouseEntered,
+  NPCocoaEventMouseExited,
+  NPCocoaEventMouseDragged,
+  NPCocoaEventKeyDown,
+  NPCocoaEventKeyUp,
+  NPCocoaEventFlagsChanged,
+  NPCocoaEventFocusChanged,
+  NPCocoaEventWindowFocusChanged,
+  NPCocoaEventScrollWheel,
+  NPCocoaEventTextInput
+} NPCocoaEventType;
+
+typedef struct _NPCocoaEvent {
+  NPCocoaEventType type;
+  uint32_t version;
+  union {
+    struct {
+      uint32_t modifierFlags;
+      double   pluginX;
+      double   pluginY;
+      int32_t  buttonNumber;
+      int32_t  clickCount;
+      double   deltaX;
+      double   deltaY;
+      double   deltaZ;
+    } mouse;
+    struct {
+      uint32_t    modifierFlags;
+      NPNSString *characters;
+      NPNSString *charactersIgnoringModifiers;
+      NPBool      isARepeat;
+      uint16_t    keyCode;
+    } key;
+    struct {
+      CGContextRef context;
+      double x;
+      double y;
+      double width;
+      double height;
+    } draw;
+    struct {
+      NPBool hasFocus;
+    } focus;
+    struct {
+      NPNSString *text;
+    } text;
+  } data;
+} NPCocoaEvent;
+
+#ifndef NP_NO_CARBON
+/* Non-standard event types that can be passed to HandleEvent */
+enum NPEventType {
+  NPEventType_GetFocusEvent = (osEvt + 16),
+  NPEventType_LoseFocusEvent,
+  NPEventType_AdjustCursorEvent,
+  NPEventType_MenuCommandEvent,
+  NPEventType_ClippingChangedEvent,
+  NPEventType_ScrollingBeginsEvent = 1000,
+  NPEventType_ScrollingEndsEvent
+};
+#endif /* NP_NO_CARBON */
+
+#endif /* XP_MACOSX */
+
+/*
+ * Values for mode passed to NPP_New:
+ */
+#define NP_EMBED 1
+#define NP_FULL  2
+
+/*
+ * Values for stream type passed to NPP_NewStream:
+ */
+#define NP_NORMAL     1
+#define NP_SEEK       2
+#define NP_ASFILE     3
+#define NP_ASFILEONLY 4
+
+#define NP_MAXREADY (((unsigned)(~0)<<1)>>1)
+
+/*
+ * Flags for NPP_ClearSiteData.
+ */
+#define NP_CLEAR_ALL   0
+#define NP_CLEAR_CACHE (1 << 0)
+
+#if !defined(__LP64__)
+#if defined(XP_MACOSX)
+#pragma options align=reset
+#endif
+#endif /* __LP64__ */
+
+/*----------------------------------------------------------------------*/
+/*       Error and Reason Code definitions                              */
+/*----------------------------------------------------------------------*/
+
+/*
+ * Values of type NPError:
+ */
+#define NPERR_BASE                         0
+#define NPERR_NO_ERROR                    (NPERR_BASE + 0)
+#define NPERR_GENERIC_ERROR               (NPERR_BASE + 1)
+#define NPERR_INVALID_INSTANCE_ERROR      (NPERR_BASE + 2)
+#define NPERR_INVALID_FUNCTABLE_ERROR     (NPERR_BASE + 3)
+#define NPERR_MODULE_LOAD_FAILED_ERROR    (NPERR_BASE + 4)
+#define NPERR_OUT_OF_MEMORY_ERROR         (NPERR_BASE + 5)
+#define NPERR_INVALID_PLUGIN_ERROR        (NPERR_BASE + 6)
+#define NPERR_INVALID_PLUGIN_DIR_ERROR    (NPERR_BASE + 7)
+#define NPERR_INCOMPATIBLE_VERSION_ERROR  (NPERR_BASE + 8)
+#define NPERR_INVALID_PARAM               (NPERR_BASE + 9)
+#define NPERR_INVALID_URL                 (NPERR_BASE + 10)
+#define NPERR_FILE_NOT_FOUND              (NPERR_BASE + 11)
+#define NPERR_NO_DATA                     (NPERR_BASE + 12)
+#define NPERR_STREAM_NOT_SEEKABLE         (NPERR_BASE + 13)
+#define NPERR_TIME_RANGE_NOT_SUPPORTED    (NPERR_BASE + 14)
+#define NPERR_MALFORMED_SITE              (NPERR_BASE + 15)
+
+/*
+ * Values of type NPReason:
+ */
+#define NPRES_BASE          0
+#define NPRES_DONE         (NPRES_BASE + 0)
+#define NPRES_NETWORK_ERR  (NPRES_BASE + 1)
+#define NPRES_USER_BREAK   (NPRES_BASE + 2)
+
+/*
+ * Don't use these obsolete error codes any more.
+ */
+#define NP_NOERR  NP_NOERR_is_obsolete_use_NPERR_NO_ERROR
+#define NP_EINVAL NP_EINVAL_is_obsolete_use_NPERR_GENERIC_ERROR
+#define NP_EABORT NP_EABORT_is_obsolete_use_NPRES_USER_BREAK
+
+/*
+ * Version feature information
+ */
+#define NPVERS_HAS_STREAMOUTPUT             8
+#define NPVERS_HAS_NOTIFICATION             9
+#define NPVERS_HAS_LIVECONNECT              9
+#define NPVERS_68K_HAS_LIVECONNECT          11
+#define NPVERS_HAS_WINDOWLESS               11
+#define NPVERS_HAS_XPCONNECT_SCRIPTING      13
+#define NPVERS_HAS_NPRUNTIME_SCRIPTING      14
+#define NPVERS_HAS_FORM_VALUES              15
+#define NPVERS_HAS_POPUPS_ENABLED_STATE     16
+#define NPVERS_HAS_RESPONSE_HEADERS         17
+#define NPVERS_HAS_NPOBJECT_ENUM            18
+#define NPVERS_HAS_PLUGIN_THREAD_ASYNC_CALL 19
+#define NPVERS_HAS_ALL_NETWORK_STREAMS      20
+#define NPVERS_HAS_URL_AND_AUTH_INFO        21
+#define NPVERS_HAS_PRIVATE_MODE             22
+#define NPVERS_MACOSX_HAS_COCOA_EVENTS      23
+#define NPVERS_HAS_ADVANCED_KEY_HANDLING    25
+#define NPVERS_HAS_URL_REDIRECT_HANDLING    26
+#define NPVERS_HAS_CLEAR_SITE_DATA          27
+
+/*----------------------------------------------------------------------*/
+/*                        Function Prototypes                           */
+/*----------------------------------------------------------------------*/
+
+#if defined(__OS2__)
+#define NP_LOADDS _System
+#else
+#define NP_LOADDS
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* NPP_* functions are provided by the plugin and called by the navigator. */
+
+#if defined(XP_UNIX)
+const char* NPP_GetMIMEDescription(void);
+#endif
+
+NPError NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
+                          uint16_t mode, int16_t argc, char* argn[],
+                          char* argv[], NPSavedData* saved);
+NPError NP_LOADDS NPP_Destroy(NPP instance, NPSavedData** save);
+NPError NP_LOADDS NPP_SetWindow(NPP instance, NPWindow* window);
+NPError NP_LOADDS NPP_NewStream(NPP instance, NPMIMEType type,
+                                NPStream* stream, NPBool seekable,
+                                uint16_t* stype);
+NPError NP_LOADDS NPP_DestroyStream(NPP instance, NPStream* stream,
+                                    NPReason reason);
+int32_t NP_LOADDS NPP_WriteReady(NPP instance, NPStream* stream);
+int32_t NP_LOADDS NPP_Write(NPP instance, NPStream* stream, int32_t offset,
+                            int32_t len, void* buffer);
+void    NP_LOADDS NPP_StreamAsFile(NPP instance, NPStream* stream,
+                                   const char* fname);
+void    NP_LOADDS NPP_Print(NPP instance, NPPrint* platformPrint);
+int16_t NP_LOADDS NPP_HandleEvent(NPP instance, void* event);
+void    NP_LOADDS NPP_URLNotify(NPP instance, const char* url,
+                                NPReason reason, void* notifyData);
+NPError NP_LOADDS NPP_GetValue(NPP instance, NPPVariable variable, void *value);
+NPError NP_LOADDS NPP_SetValue(NPP instance, NPNVariable variable, void *value);
+NPBool  NP_LOADDS NPP_GotFocus(NPP instance, NPFocusDirection direction);
+void    NP_LOADDS NPP_LostFocus(NPP instance);
+void    NP_LOADDS NPP_URLRedirectNotify(NPP instance, const char* url, int32_t status, void* notifyData);
+NPError NP_LOADDS NPP_ClearSiteData(const char* site, uint64_t flags, uint64_t maxAge);
+char**  NP_LOADDS NPP_GetSitesWithData(void);
+
+/* NPN_* functions are provided by the navigator and called by the plugin. */
+void        NP_LOADDS NPN_Version(int* plugin_major, int* plugin_minor,
+                                  int* netscape_major, int* netscape_minor);
+NPError     NP_LOADDS NPN_GetURLNotify(NPP instance, const char* url,
+                                       const char* target, void* notifyData);
+NPError     NP_LOADDS NPN_GetURL(NPP instance, const char* url,
+                                 const char* target);
+NPError     NP_LOADDS NPN_PostURLNotify(NPP instance, const char* url,
+                                        const char* target, uint32_t len,
+                                        const char* buf, NPBool file,
+                                        void* notifyData);
+NPError     NP_LOADDS NPN_PostURL(NPP instance, const char* url,
+                                  const char* target, uint32_t len,
+                                  const char* buf, NPBool file);
+NPError     NP_LOADDS NPN_RequestRead(NPStream* stream, NPByteRange* rangeList);
+NPError     NP_LOADDS NPN_NewStream(NPP instance, NPMIMEType type,
+                                    const char* target, NPStream** stream);
+int32_t     NP_LOADDS NPN_Write(NPP instance, NPStream* stream, int32_t len,
+                                void* buffer);
+NPError     NP_LOADDS NPN_DestroyStream(NPP instance, NPStream* stream,
+                                        NPReason reason);
+void        NP_LOADDS NPN_Status(NPP instance, const char* message);
+const char* NP_LOADDS NPN_UserAgent(NPP instance);
+void*       NP_LOADDS NPN_MemAlloc(uint32_t size);
+void        NP_LOADDS NPN_MemFree(void* ptr);
+uint32_t    NP_LOADDS NPN_MemFlush(uint32_t size);
+void        NP_LOADDS NPN_ReloadPlugins(NPBool reloadPages);
+NPError     NP_LOADDS NPN_GetValue(NPP instance, NPNVariable variable,
+                                   void *value);
+NPError     NP_LOADDS NPN_SetValue(NPP instance, NPPVariable variable,
+                                   void *value);
+void        NP_LOADDS NPN_InvalidateRect(NPP instance, NPRect *invalidRect);
+void        NP_LOADDS NPN_InvalidateRegion(NPP instance,
+                                           NPRegion invalidRegion);
+void        NP_LOADDS NPN_ForceRedraw(NPP instance);
+void        NP_LOADDS NPN_PushPopupsEnabledState(NPP instance, NPBool enabled);
+void        NP_LOADDS NPN_PopPopupsEnabledState(NPP instance);
+void        NP_LOADDS NPN_PluginThreadAsyncCall(NPP instance,
+                                                void (*func) (void *),
+                                                void *userData);
+NPError     NP_LOADDS NPN_GetValueForURL(NPP instance, NPNURLVariable variable,
+                                         const char *url, char **value,
+                                         uint32_t *len);
+NPError     NP_LOADDS NPN_SetValueForURL(NPP instance, NPNURLVariable variable,
+                                         const char *url, const char *value,
+                                         uint32_t len);
+NPError     NP_LOADDS NPN_GetAuthenticationInfo(NPP instance,
+                                                const char *protocol,
+                                                const char *host, int32_t port,
+                                                const char *scheme,
+                                                const char *realm,
+                                                char **username, uint32_t *ulen,
+                                                char **password,
+                                                uint32_t *plen);
+uint32_t    NP_LOADDS NPN_ScheduleTimer(NPP instance, uint32_t interval, NPBool repeat, void (*timerFunc)(NPP npp, uint32_t timerID));
+void        NP_LOADDS NPN_UnscheduleTimer(NPP instance, uint32_t timerID);
+NPError     NP_LOADDS NPN_PopUpContextMenu(NPP instance, NPMenu* menu);
+NPBool      NP_LOADDS NPN_ConvertPoint(NPP instance, double sourceX, double sourceY, NPCoordinateSpace sourceSpace, double *destX, double *destY, NPCoordinateSpace destSpace);
+NPBool      NP_LOADDS NPN_HandleEvent(NPP instance, void *event, NPBool handled);
+NPBool      NP_LOADDS NPN_UnfocusInstance(NPP instance, NPFocusDirection direction);
+void        NP_LOADDS NPN_URLRedirectResponse(NPP instance, void* notifyData, NPBool allow);
+
+#ifdef __cplusplus
+}  /* end extern "C" */
+#endif
+
+#endif /* RC_INVOKED */
+#if defined(__OS2__)
+#pragma pack()
+#endif
+
+#endif /* npapi_h_ */

browser-plugin/npapi/npfunctions.h

@@ -0,0 +1,322 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef npfunctions_h_
+#define npfunctions_h_
+
+#ifdef __OS2__
+#pragma pack(1)
+#define NP_LOADDS _System
+#else
+#define NP_LOADDS
+#endif
+
+#include "npapi.h"
+#include "npruntime.h"
+
+typedef NPError      (* NP_LOADDS NPP_NewProcPtr)(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
+typedef NPError      (* NP_LOADDS NPP_DestroyProcPtr)(NPP instance, NPSavedData** save);
+typedef NPError      (* NP_LOADDS NPP_SetWindowProcPtr)(NPP instance, NPWindow* window);
+typedef NPError      (* NP_LOADDS NPP_NewStreamProcPtr)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype);
+typedef NPError      (* NP_LOADDS NPP_DestroyStreamProcPtr)(NPP instance, NPStream* stream, NPReason reason);
+typedef int32_t      (* NP_LOADDS NPP_WriteReadyProcPtr)(NPP instance, NPStream* stream);
+typedef int32_t      (* NP_LOADDS NPP_WriteProcPtr)(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer);
+typedef void         (* NP_LOADDS NPP_StreamAsFileProcPtr)(NPP instance, NPStream* stream, const char* fname);
+typedef void         (* NP_LOADDS NPP_PrintProcPtr)(NPP instance, NPPrint* platformPrint);
+typedef int16_t      (* NP_LOADDS NPP_HandleEventProcPtr)(NPP instance, void* event);
+typedef void         (* NP_LOADDS NPP_URLNotifyProcPtr)(NPP instance, const char* url, NPReason reason, void* notifyData);
+/* Any NPObjects returned to the browser via NPP_GetValue should be retained
+   by the plugin on the way out. The browser is responsible for releasing. */
+typedef NPError      (* NP_LOADDS NPP_GetValueProcPtr)(NPP instance, NPPVariable variable, void *ret_value);
+typedef NPError      (* NP_LOADDS NPP_SetValueProcPtr)(NPP instance, NPNVariable variable, void *value);
+typedef NPBool       (* NP_LOADDS NPP_GotFocusPtr)(NPP instance, NPFocusDirection direction);
+typedef void         (* NP_LOADDS NPP_LostFocusPtr)(NPP instance);
+typedef void         (* NP_LOADDS NPP_URLRedirectNotifyPtr)(NPP instance, const char* url, int32_t status, void* notifyData);
+typedef NPError      (* NP_LOADDS NPP_ClearSiteDataPtr)(const char* site, uint64_t flags, uint64_t maxAge);
+typedef char**       (* NP_LOADDS NPP_GetSitesWithDataPtr)(void);
+
+typedef NPError      (*NPN_GetValueProcPtr)(NPP instance, NPNVariable variable, void *ret_value);
+typedef NPError      (*NPN_SetValueProcPtr)(NPP instance, NPPVariable variable, void *value);
+typedef NPError      (*NPN_GetURLNotifyProcPtr)(NPP instance, const char* url, const char* window, void* notifyData);
+typedef NPError      (*NPN_PostURLNotifyProcPtr)(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData);
+typedef NPError      (*NPN_GetURLProcPtr)(NPP instance, const char* url, const char* window);
+typedef NPError      (*NPN_PostURLProcPtr)(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file);
+typedef NPError      (*NPN_RequestReadProcPtr)(NPStream* stream, NPByteRange* rangeList);
+typedef NPError      (*NPN_NewStreamProcPtr)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
+typedef int32_t      (*NPN_WriteProcPtr)(NPP instance, NPStream* stream, int32_t len, void* buffer);
+typedef NPError      (*NPN_DestroyStreamProcPtr)(NPP instance, NPStream* stream, NPReason reason);
+typedef void         (*NPN_StatusProcPtr)(NPP instance, const char* message);
+/* Browser manages the lifetime of the buffer returned by NPN_UserAgent, don't
+   depend on it sticking around and don't free it. */
+typedef const char*  (*NPN_UserAgentProcPtr)(NPP instance);
+typedef void*        (*NPN_MemAllocProcPtr)(uint32_t size);
+typedef void         (*NPN_MemFreeProcPtr)(void* ptr);
+typedef uint32_t     (*NPN_MemFlushProcPtr)(uint32_t size);
+typedef void         (*NPN_ReloadPluginsProcPtr)(NPBool reloadPages);
+typedef void*        (*NPN_GetJavaEnvProcPtr)(void);
+typedef void*        (*NPN_GetJavaPeerProcPtr)(NPP instance);
+typedef void         (*NPN_InvalidateRectProcPtr)(NPP instance, NPRect *rect);
+typedef void         (*NPN_InvalidateRegionProcPtr)(NPP instance, NPRegion region);
+typedef void         (*NPN_ForceRedrawProcPtr)(NPP instance);
+typedef NPIdentifier (*NPN_GetStringIdentifierProcPtr)(const NPUTF8* name);
+typedef void         (*NPN_GetStringIdentifiersProcPtr)(const NPUTF8** names, int32_t nameCount, NPIdentifier* identifiers);
+typedef NPIdentifier (*NPN_GetIntIdentifierProcPtr)(int32_t intid);
+typedef bool         (*NPN_IdentifierIsStringProcPtr)(NPIdentifier identifier);
+typedef NPUTF8*      (*NPN_UTF8FromIdentifierProcPtr)(NPIdentifier identifier);
+typedef int32_t      (*NPN_IntFromIdentifierProcPtr)(NPIdentifier identifier);
+typedef NPObject*    (*NPN_CreateObjectProcPtr)(NPP npp, NPClass *aClass);
+typedef NPObject*    (*NPN_RetainObjectProcPtr)(NPObject *obj);
+typedef void         (*NPN_ReleaseObjectProcPtr)(NPObject *obj);
+typedef bool         (*NPN_InvokeProcPtr)(NPP npp, NPObject* obj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result);
+typedef bool         (*NPN_InvokeDefaultProcPtr)(NPP npp, NPObject* obj, const NPVariant *args, uint32_t argCount, NPVariant *result);
+typedef bool         (*NPN_EvaluateProcPtr)(NPP npp, NPObject *obj, NPString *script, NPVariant *result);
+typedef bool         (*NPN_GetPropertyProcPtr)(NPP npp, NPObject *obj, NPIdentifier propertyName, NPVariant *result);
+typedef bool         (*NPN_SetPropertyProcPtr)(NPP npp, NPObject *obj, NPIdentifier propertyName, const NPVariant *value);
+typedef bool         (*NPN_RemovePropertyProcPtr)(NPP npp, NPObject *obj, NPIdentifier propertyName);
+typedef bool         (*NPN_HasPropertyProcPtr)(NPP npp, NPObject *obj, NPIdentifier propertyName);
+typedef bool         (*NPN_HasMethodProcPtr)(NPP npp, NPObject *obj, NPIdentifier propertyName);
+typedef void         (*NPN_ReleaseVariantValueProcPtr)(NPVariant *variant);
+typedef void         (*NPN_SetExceptionProcPtr)(NPObject *obj, const NPUTF8 *message);
+typedef void         (*NPN_PushPopupsEnabledStateProcPtr)(NPP npp, NPBool enabled);
+typedef void         (*NPN_PopPopupsEnabledStateProcPtr)(NPP npp);
+typedef bool         (*NPN_EnumerateProcPtr)(NPP npp, NPObject *obj, NPIdentifier **identifier, uint32_t *count);
+typedef void         (*NPN_PluginThreadAsyncCallProcPtr)(NPP instance, void (*func)(void *), void *userData);
+typedef bool         (*NPN_ConstructProcPtr)(NPP npp, NPObject* obj, const NPVariant *args, uint32_t argCount, NPVariant *result);
+typedef NPError      (*NPN_GetValueForURLPtr)(NPP npp, NPNURLVariable variable, const char *url, char **value, uint32_t *len);
+typedef NPError      (*NPN_SetValueForURLPtr)(NPP npp, NPNURLVariable variable, const char *url, const char *value, uint32_t len);
+typedef NPError      (*NPN_GetAuthenticationInfoPtr)(NPP npp, const char *protocol, const char *host, int32_t port, const char *scheme, const char *realm, char **username, uint32_t *ulen, char **password, uint32_t *plen);
+typedef uint32_t     (*NPN_ScheduleTimerPtr)(NPP instance, uint32_t interval, NPBool repeat, void (*timerFunc)(NPP npp, uint32_t timerID));
+typedef void         (*NPN_UnscheduleTimerPtr)(NPP instance, uint32_t timerID);
+typedef NPError      (*NPN_PopUpContextMenuPtr)(NPP instance, NPMenu* menu);
+typedef NPBool       (*NPN_ConvertPointPtr)(NPP instance, double sourceX, double sourceY, NPCoordinateSpace sourceSpace, double *destX, double *destY, NPCoordinateSpace destSpace);
+typedef NPBool       (*NPN_HandleEventPtr)(NPP instance, void *event, NPBool handled);
+typedef NPBool       (*NPN_UnfocusInstancePtr)(NPP instance, NPFocusDirection direction);
+typedef void         (*NPN_URLRedirectResponsePtr)(NPP instance, void* notifyData, NPBool allow);
+
+typedef struct _NPPluginFuncs {
+  uint16_t size;
+  uint16_t version;
+  NPP_NewProcPtr newp;
+  NPP_DestroyProcPtr destroy;
+  NPP_SetWindowProcPtr setwindow;
+  NPP_NewStreamProcPtr newstream;
+  NPP_DestroyStreamProcPtr destroystream;
+  NPP_StreamAsFileProcPtr asfile;
+  NPP_WriteReadyProcPtr writeready;
+  NPP_WriteProcPtr write;
+  NPP_PrintProcPtr print;
+  NPP_HandleEventProcPtr event;
+  NPP_URLNotifyProcPtr urlnotify;
+  void* javaClass;
+  NPP_GetValueProcPtr getvalue;
+  NPP_SetValueProcPtr setvalue;
+  NPP_GotFocusPtr gotfocus;
+  NPP_LostFocusPtr lostfocus;
+  NPP_URLRedirectNotifyPtr urlredirectnotify;
+  NPP_ClearSiteDataPtr clearsitedata;
+  NPP_GetSitesWithDataPtr getsiteswithdata;
+} NPPluginFuncs;
+
+typedef struct _NPNetscapeFuncs {
+  uint16_t size;
+  uint16_t version;
+  NPN_GetURLProcPtr geturl;
+  NPN_PostURLProcPtr posturl;
+  NPN_RequestReadProcPtr requestread;
+  NPN_NewStreamProcPtr newstream;
+  NPN_WriteProcPtr write;
+  NPN_DestroyStreamProcPtr destroystream;
+  NPN_StatusProcPtr status;
+  NPN_UserAgentProcPtr uagent;
+  NPN_MemAllocProcPtr memalloc;
+  NPN_MemFreeProcPtr memfree;
+  NPN_MemFlushProcPtr memflush;
+  NPN_ReloadPluginsProcPtr reloadplugins;
+  NPN_GetJavaEnvProcPtr getJavaEnv;
+  NPN_GetJavaPeerProcPtr getJavaPeer;
+  NPN_GetURLNotifyProcPtr geturlnotify;
+  NPN_PostURLNotifyProcPtr posturlnotify;
+  NPN_GetValueProcPtr getvalue;
+  NPN_SetValueProcPtr setvalue;
+  NPN_InvalidateRectProcPtr invalidaterect;
+  NPN_InvalidateRegionProcPtr invalidateregion;
+  NPN_ForceRedrawProcPtr forceredraw;
+  NPN_GetStringIdentifierProcPtr getstringidentifier;
+  NPN_GetStringIdentifiersProcPtr getstringidentifiers;
+  NPN_GetIntIdentifierProcPtr getintidentifier;
+  NPN_IdentifierIsStringProcPtr identifierisstring;
+  NPN_UTF8FromIdentifierProcPtr utf8fromidentifier;
+  NPN_IntFromIdentifierProcPtr intfromidentifier;
+  NPN_CreateObjectProcPtr createobject;
+  NPN_RetainObjectProcPtr retainobject;
+  NPN_ReleaseObjectProcPtr releaseobject;
+  NPN_InvokeProcPtr invoke;
+  NPN_InvokeDefaultProcPtr invokeDefault;
+  NPN_EvaluateProcPtr evaluate;
+  NPN_GetPropertyProcPtr getproperty;
+  NPN_SetPropertyProcPtr setproperty;
+  NPN_RemovePropertyProcPtr removeproperty;
+  NPN_HasPropertyProcPtr hasproperty;
+  NPN_HasMethodProcPtr hasmethod;
+  NPN_ReleaseVariantValueProcPtr releasevariantvalue;
+  NPN_SetExceptionProcPtr setexception;
+  NPN_PushPopupsEnabledStateProcPtr pushpopupsenabledstate;
+  NPN_PopPopupsEnabledStateProcPtr poppopupsenabledstate;
+  NPN_EnumerateProcPtr enumerate;
+  NPN_PluginThreadAsyncCallProcPtr pluginthreadasynccall;
+  NPN_ConstructProcPtr construct;
+  NPN_GetValueForURLPtr getvalueforurl;
+  NPN_SetValueForURLPtr setvalueforurl;
+  NPN_GetAuthenticationInfoPtr getauthenticationinfo;
+  NPN_ScheduleTimerPtr scheduletimer;
+  NPN_UnscheduleTimerPtr unscheduletimer;
+  NPN_PopUpContextMenuPtr popupcontextmenu;
+  NPN_ConvertPointPtr convertpoint;
+  NPN_HandleEventPtr handleevent;
+  NPN_UnfocusInstancePtr unfocusinstance;
+  NPN_URLRedirectResponsePtr urlredirectresponse;
+} NPNetscapeFuncs;
+
+#ifdef XP_MACOSX
+/*
+ * Mac OS X version(s) of NP_GetMIMEDescription(const char *)
+ * These can be called to retreive MIME information from the plugin dynamically
+ *
+ * Note: For compatibility with Quicktime, BPSupportedMIMEtypes is another way
+ *       to get mime info from the plugin only on OSX and may not be supported
+ *       in furture version -- use NP_GetMIMEDescription instead
+ */
+enum
+{
+ kBPSupportedMIMETypesStructVers_1    = 1
+};
+typedef struct _BPSupportedMIMETypes
+{
+ SInt32    structVersion;      /* struct version */
+ Handle    typeStrings;        /* STR# formated handle, allocated by plug-in */
+ Handle    infoStrings;        /* STR# formated handle, allocated by plug-in */
+} BPSupportedMIMETypes;
+OSErr BP_GetSupportedMIMETypes(BPSupportedMIMETypes *mimeInfo, UInt32 flags);
+#define NP_GETMIMEDESCRIPTION_NAME "NP_GetMIMEDescription"
+typedef const char* (*NP_GetMIMEDescriptionProcPtr)(void);
+typedef OSErr (*BP_GetSupportedMIMETypesProcPtr)(BPSupportedMIMETypes*, UInt32);
+#endif
+
+#if defined(_WIN32)
+#define OSCALL WINAPI
+#else
+#if defined(__OS2__)
+#define OSCALL _System
+#else
+#define OSCALL
+#endif
+#endif
+
+#if defined(XP_UNIX)
+/* GCC 3.3 and later support the visibility attribute. */
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
+#define NP_VISIBILITY_DEFAULT __attribute__((visibility("default")))
+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+#define NP_VISIBILITY_DEFAULT __global
+#else
+#define NP_VISIBILITY_DEFAULT
+#endif
+#define NP_EXPORT(__type) NP_VISIBILITY_DEFAULT __type
+#endif
+
+#if defined(_WIN32) || defined (__OS2__)
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* plugin meta member functions */
+#if defined(__OS2__)
+typedef struct _NPPluginData {   /* Alternate OS2 Plugin interface */
+  char *pMimeTypes;
+  char *pFileExtents;
+  char *pFileOpenTemplate;
+  char *pProductName;
+  char *pProductDescription;
+  unsigned long dwProductVersionMS;
+  unsigned long dwProductVersionLS;
+} NPPluginData;
+typedef NPError     (*NP_GetPluginDataFunc)(NPPluginData*);
+NPError OSCALL      NP_GetPluginData(NPPluginData * pPluginData);
+#endif
+typedef NPError     (*NP_GetEntryPointsFunc)(NPPluginFuncs*);
+NPError OSCALL      NP_GetEntryPoints(NPPluginFuncs* pFuncs);
+typedef NPError     (*NP_InitializeFunc)(NPNetscapeFuncs*);
+NPError OSCALL      NP_Initialize(NPNetscapeFuncs* bFuncs);
+typedef NPError     (*NP_ShutdownFunc)(void);
+NPError OSCALL      NP_Shutdown(void);
+typedef const char* (*NP_GetMIMEDescriptionFunc)(void);
+const char*         NP_GetMIMEDescription(void);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#if defined(__OS2__)
+#pragma pack()
+#endif
+
+#ifdef XP_UNIX
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef char*          (*NP_GetPluginVersionFunc)(void);
+NP_EXPORT(char*)       NP_GetPluginVersion(void);
+typedef const char*    (*NP_GetMIMEDescriptionFunc)(void);
+NP_EXPORT(const char*) NP_GetMIMEDescription(void);
+#ifdef XP_MACOSX
+typedef NPError        (*NP_InitializeFunc)(NPNetscapeFuncs*);
+NP_EXPORT(NPError)     NP_Initialize(NPNetscapeFuncs* bFuncs);
+typedef NPError        (*NP_GetEntryPointsFunc)(NPPluginFuncs*);
+NP_EXPORT(NPError)     NP_GetEntryPoints(NPPluginFuncs* pFuncs);
+#else
+typedef NPError        (*NP_InitializeFunc)(NPNetscapeFuncs*, NPPluginFuncs*);
+NP_EXPORT(NPError)     NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs);
+#endif
+typedef NPError        (*NP_ShutdownFunc)(void);
+NP_EXPORT(NPError)     NP_Shutdown(void);
+typedef NPError        (*NP_GetValueFunc)(void *, NPPVariable, void *);
+NP_EXPORT(NPError)     NP_GetValue(void *future, NPPVariable aVariable, void *aValue);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#endif /* npfunctions_h_ */

browser-plugin/npapi/npruntime.h

@@ -0,0 +1,393 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright (c) 2004, Apple Computer, Inc. and The Mozilla Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of Apple Computer, Inc. ("Apple") or The Mozilla
+ * Foundation ("Mozilla") nor the names of their contributors may be used
+ * to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE, MOZILLA OR
+ * THEIR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#ifndef _NP_RUNTIME_H_
+#define _NP_RUNTIME_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "nptypes.h"
+
+/*
+    This API is used to facilitate binding code written in C to script
+    objects.  The API in this header does not assume the presence of a
+    user agent.  That is, it can be used to bind C code to scripting
+    environments outside of the context of a user agent.
+
+    However, the normal use of the this API is in the context of a
+    scripting environment running in a browser or other user agent.
+    In particular it is used to support the extended Netscape
+    script-ability API for plugins (NP-SAP).  NP-SAP is an extension
+    of the Netscape plugin API.  As such we have adopted the use of
+    the "NP" prefix for this API.
+
+    The following NP{N|P}Variables were added to the Netscape plugin
+    API (in npapi.h):
+
+    NPNVWindowNPObject
+    NPNVPluginElementNPObject
+    NPPVpluginScriptableNPObject
+
+    These variables are exposed through NPN_GetValue() and
+    NPP_GetValue() (respectively) and are used to establish the
+    initial binding between the user agent and native code.  The DOM
+    objects in the user agent can be examined and manipulated using
+    the NPN_ functions that operate on NPObjects described in this
+    header.
+
+    To the extent possible the assumptions about the scripting
+    language used by the scripting environment have been minimized.
+*/
+
+#define NP_BEGIN_MACRO  do {
+#define NP_END_MACRO    } while (0)
+
+/*
+    Objects (non-primitive data) passed between 'C' and script is
+    always wrapped in an NPObject.  The 'interface' of an NPObject is
+    described by an NPClass.
+*/
+typedef struct NPObject NPObject;
+typedef struct NPClass NPClass;
+
+typedef char NPUTF8;
+typedef struct _NPString {
+    const NPUTF8 *UTF8Characters;
+    uint32_t UTF8Length;
+} NPString;
+
+typedef enum {
+    NPVariantType_Void,
+    NPVariantType_Null,
+    NPVariantType_Bool,
+    NPVariantType_Int32,
+    NPVariantType_Double,
+    NPVariantType_String,
+    NPVariantType_Object
+} NPVariantType;
+
+typedef struct _NPVariant {
+    NPVariantType type;
+    union {
+        bool boolValue;
+        int32_t intValue;
+        double doubleValue;
+        NPString stringValue;
+        NPObject *objectValue;
+    } value;
+} NPVariant;
+
+/*
+    NPN_ReleaseVariantValue is called on all 'out' parameters
+    references.  Specifically it is to be called on variants that own
+    their value, as is the case with all non-const NPVariant*
+    arguments after a successful call to any methods (except this one)
+    in this API.
+
+    After calling NPN_ReleaseVariantValue, the type of the variant
+    will be NPVariantType_Void.
+*/
+void NPN_ReleaseVariantValue(NPVariant *variant);
+
+#define NPVARIANT_IS_VOID(_v)    ((_v).type == NPVariantType_Void)
+#define NPVARIANT_IS_NULL(_v)    ((_v).type == NPVariantType_Null)
+#define NPVARIANT_IS_BOOLEAN(_v) ((_v).type == NPVariantType_Bool)
+#define NPVARIANT_IS_INT32(_v)   ((_v).type == NPVariantType_Int32)
+#define NPVARIANT_IS_DOUBLE(_v)  ((_v).type == NPVariantType_Double)
+#define NPVARIANT_IS_STRING(_v)  ((_v).type == NPVariantType_String)
+#define NPVARIANT_IS_OBJECT(_v)  ((_v).type == NPVariantType_Object)
+
+#define NPVARIANT_TO_BOOLEAN(_v) ((_v).value.boolValue)
+#define NPVARIANT_TO_INT32(_v)   ((_v).value.intValue)
+#define NPVARIANT_TO_DOUBLE(_v)  ((_v).value.doubleValue)
+#define NPVARIANT_TO_STRING(_v)  ((_v).value.stringValue)
+#define NPVARIANT_TO_OBJECT(_v)  ((_v).value.objectValue)
+
+#define VOID_TO_NPVARIANT(_v)                                                 \
+NP_BEGIN_MACRO                                                                \
+    (_v).type = NPVariantType_Void;                                           \
+    (_v).value.objectValue = NULL;                                            \
+NP_END_MACRO
+
+#define NULL_TO_NPVARIANT(_v)                                                 \
+NP_BEGIN_MACRO                                                                \
+    (_v).type = NPVariantType_Null;                                           \
+    (_v).value.objectValue = NULL;                                            \
+NP_END_MACRO
+
+#define BOOLEAN_TO_NPVARIANT(_val, _v)                                        \
+NP_BEGIN_MACRO                                                                \
+    (_v).type = NPVariantType_Bool;                                           \
+    (_v).value.boolValue = !!(_val);                                          \
+NP_END_MACRO
+
+#define INT32_TO_NPVARIANT(_val, _v)                                          \
+NP_BEGIN_MACRO                                                                \
+    (_v).type = NPVariantType_Int32;                                          \
+    (_v).value.intValue = _val;                                               \
+NP_END_MACRO
+
+#define DOUBLE_TO_NPVARIANT(_val, _v)                                         \
+NP_BEGIN_MACRO                                                                \
+    (_v).type = NPVariantType_Double;                                         \
+    (_v).value.doubleValue = _val;                                            \
+NP_END_MACRO
+
+#define STRINGZ_TO_NPVARIANT(_val, _v)                                        \
+NP_BEGIN_MACRO                                                                \
+    (_v).type = NPVariantType_String;                                         \
+    NPString str = { _val, (uint32_t)(strlen(_val)) };                        \
+    (_v).value.stringValue = str;                                             \
+NP_END_MACRO
+
+#define STRINGN_TO_NPVARIANT(_val, _len, _v)                                  \
+NP_BEGIN_MACRO                                                                \
+    (_v).type = NPVariantType_String;                                         \
+    NPString str = { _val, (uint32_t)(_len) };                                \
+    (_v).value.stringValue = str;                                             \
+NP_END_MACRO
+
+#define OBJECT_TO_NPVARIANT(_val, _v)                                         \
+NP_BEGIN_MACRO                                                                \
+    (_v).type = NPVariantType_Object;                                         \
+    (_v).value.objectValue = _val;                                            \
+NP_END_MACRO
+
+
+/*
+  Type mappings (JavaScript types have been used for illustration
+    purposes):
+
+  JavaScript       to             C (NPVariant with type:)
+  undefined                       NPVariantType_Void
+  null                            NPVariantType_Null
+  Boolean                         NPVariantType_Bool
+  Number                          NPVariantType_Double or NPVariantType_Int32
+  String                          NPVariantType_String
+  Object                          NPVariantType_Object
+
+  C (NPVariant with type:)   to   JavaScript
+  NPVariantType_Void              undefined
+  NPVariantType_Null              null
+  NPVariantType_Bool              Boolean
+  NPVariantType_Int32             Number
+  NPVariantType_Double            Number
+  NPVariantType_String            String
+  NPVariantType_Object            Object
+*/
+
+typedef void *NPIdentifier;
+
+/*
+    NPObjects have methods and properties.  Methods and properties are
+    identified with NPIdentifiers.  These identifiers may be reflected
+    in script.  NPIdentifiers can be either strings or integers, IOW,
+    methods and properties can be identified by either strings or
+    integers (i.e. foo["bar"] vs foo[1]). NPIdentifiers can be
+    compared using ==.  In case of any errors, the requested
+    NPIdentifier(s) will be NULL. NPIdentifier lifetime is controlled
+    by the browser. Plugins do not need to worry about memory management
+    with regards to NPIdentifiers.
+*/
+NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name);
+void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount,
+                              NPIdentifier *identifiers);
+NPIdentifier NPN_GetIntIdentifier(int32_t intid);
+bool NPN_IdentifierIsString(NPIdentifier identifier);
+
+/*
+    The NPUTF8 returned from NPN_UTF8FromIdentifier SHOULD be freed.
+*/
+NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier);
+
+/*
+    Get the integer represented by identifier. If identifier is not an
+    integer identifier, the behaviour is undefined.
+*/
+int32_t NPN_IntFromIdentifier(NPIdentifier identifier);
+
+/*
+    NPObject behavior is implemented using the following set of
+    callback functions.
+
+    The NPVariant *result argument of these functions (where
+    applicable) should be released using NPN_ReleaseVariantValue().
+*/
+typedef NPObject *(*NPAllocateFunctionPtr)(NPP npp, NPClass *aClass);
+typedef void (*NPDeallocateFunctionPtr)(NPObject *npobj);
+typedef void (*NPInvalidateFunctionPtr)(NPObject *npobj);
+typedef bool (*NPHasMethodFunctionPtr)(NPObject *npobj, NPIdentifier name);
+typedef bool (*NPInvokeFunctionPtr)(NPObject *npobj, NPIdentifier name,
+                                    const NPVariant *args, uint32_t argCount,
+                                    NPVariant *result);
+typedef bool (*NPInvokeDefaultFunctionPtr)(NPObject *npobj,
+                                           const NPVariant *args,
+                                           uint32_t argCount,
+                                           NPVariant *result);
+typedef bool (*NPHasPropertyFunctionPtr)(NPObject *npobj, NPIdentifier name);
+typedef bool (*NPGetPropertyFunctionPtr)(NPObject *npobj, NPIdentifier name,
+                                         NPVariant *result);
+typedef bool (*NPSetPropertyFunctionPtr)(NPObject *npobj, NPIdentifier name,
+                                         const NPVariant *value);
+typedef bool (*NPRemovePropertyFunctionPtr)(NPObject *npobj,
+                                            NPIdentifier name);
+typedef bool (*NPEnumerationFunctionPtr)(NPObject *npobj, NPIdentifier **value,
+                                         uint32_t *count);
+typedef bool (*NPConstructFunctionPtr)(NPObject *npobj,
+                                       const NPVariant *args,
+                                       uint32_t argCount,
+                                       NPVariant *result);
+
+/*
+    NPObjects returned by create, retain, invoke, and getProperty pass
+    a reference count to the caller.  That is, the callee adds a
+    reference count which passes to the caller.  It is the caller's
+    responsibility to release the returned object.
+
+    NPInvokeFunctionPtr function may return 0 to indicate a void
+    result.
+
+    NPInvalidateFunctionPtr is called by the scripting environment
+    when the native code is shutdown.  Any attempt to message a
+    NPObject instance after the invalidate callback has been
+    called will result in undefined behavior, even if the native code
+    is still retaining those NPObject instances.  (The runtime
+    will typically return immediately, with 0 or NULL, from an attempt
+    to dispatch to a NPObject, but this behavior should not be
+    depended upon.)
+
+    The NPEnumerationFunctionPtr function may pass an array of
+    NPIdentifiers back to the caller. The callee allocs the memory of
+    the array using NPN_MemAlloc(), and it's the caller's responsibility
+    to release it using NPN_MemFree().
+*/
+struct NPClass
+{
+    uint32_t structVersion;
+    NPAllocateFunctionPtr allocate;
+    NPDeallocateFunctionPtr deallocate;
+    NPInvalidateFunctionPtr invalidate;
+    NPHasMethodFunctionPtr hasMethod;
+    NPInvokeFunctionPtr invoke;
+    NPInvokeDefaultFunctionPtr invokeDefault;
+    NPHasPropertyFunctionPtr hasProperty;
+    NPGetPropertyFunctionPtr getProperty;
+    NPSetPropertyFunctionPtr setProperty;
+    NPRemovePropertyFunctionPtr removeProperty;
+    NPEnumerationFunctionPtr enumerate;
+    NPConstructFunctionPtr construct;
+};
+
+#define NP_CLASS_STRUCT_VERSION      3
+
+#define NP_CLASS_STRUCT_VERSION_ENUM 2
+#define NP_CLASS_STRUCT_VERSION_CTOR 3
+
+#define NP_CLASS_STRUCT_VERSION_HAS_ENUM(npclass)   \
+        ((npclass)->structVersion >= NP_CLASS_STRUCT_VERSION_ENUM)
+
+#define NP_CLASS_STRUCT_VERSION_HAS_CTOR(npclass)   \
+        ((npclass)->structVersion >= NP_CLASS_STRUCT_VERSION_CTOR)
+
+struct NPObject {
+    NPClass *_class;
+    uint32_t referenceCount;
+    /*
+     * Additional space may be allocated here by types of NPObjects
+     */
+};
+
+/*
+    If the class has an allocate function, NPN_CreateObject invokes
+    that function, otherwise a NPObject is allocated and
+    returned. This method will initialize the referenceCount member of
+    the NPObject to 1.
+*/
+NPObject *NPN_CreateObject(NPP npp, NPClass *aClass);
+
+/*
+    Increment the NPObject's reference count.
+*/
+NPObject *NPN_RetainObject(NPObject *npobj);
+
+/*
+    Decremented the NPObject's reference count.  If the reference
+    count goes to zero, the class's destroy function is invoke if
+    specified, otherwise the object is freed directly.
+*/
+void NPN_ReleaseObject(NPObject *npobj);
+
+/*
+    Functions to access script objects represented by NPObject.
+
+    Calls to script objects are synchronous.  If a function returns a
+    value, it will be supplied via the result NPVariant
+    argument. Successful calls will return true, false will be
+    returned in case of an error.
+
+    Calls made from plugin code to script must be made from the thread
+    on which the plugin was initialized.
+*/
+
+bool NPN_Invoke(NPP npp, NPObject *npobj, NPIdentifier methodName,
+                const NPVariant *args, uint32_t argCount, NPVariant *result);
+bool NPN_InvokeDefault(NPP npp, NPObject *npobj, const NPVariant *args,
+                       uint32_t argCount, NPVariant *result);
+bool NPN_Evaluate(NPP npp, NPObject *npobj, NPString *script,
+                  NPVariant *result);
+bool NPN_GetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName,
+                     NPVariant *result);
+bool NPN_SetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName,
+                     const NPVariant *value);
+bool NPN_RemoveProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName);
+bool NPN_HasProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName);
+bool NPN_HasMethod(NPP npp, NPObject *npobj, NPIdentifier methodName);
+bool NPN_Enumerate(NPP npp, NPObject *npobj, NPIdentifier **identifier,
+                   uint32_t *count);
+bool NPN_Construct(NPP npp, NPObject *npobj, const NPVariant *args,
+                   uint32_t argCount, NPVariant *result);
+
+/*
+    NPN_SetException may be called to trigger a script exception upon
+    return from entry points into NPObjects.  Typical usage:
+
+    NPN_SetException (npobj, message);
+*/
+void NPN_SetException(NPObject *npobj, const NPUTF8 *message);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

browser-plugin/npapi/nptypes.h

@@ -0,0 +1,121 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Johnny Stenback <jst@mozilla.org> (Original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nptypes_h_
+#define nptypes_h_
+
+/*
+ * Header file for ensuring that C99 types ([u]int32_t, [u]int64_t and bool) and
+ * true/false macros are available.
+ */
+
+#if defined(WIN32) || defined(OS2)
+  /*
+   * Win32 and OS/2 don't know C99, so define [u]int_16/32/64 here. The bool
+   * is predefined tho, both in C and C++.
+   */
+  typedef short int16_t;
+  typedef unsigned short uint16_t;
+  typedef int int32_t;
+  typedef unsigned int uint32_t;
+  typedef long long int64_t;
+  typedef unsigned long long uint64_t;
+#elif defined(_AIX) || defined(__sun) || defined(__osf__) || defined(IRIX) || defined(HPUX)
+  /*
+   * AIX and SunOS ship a inttypes.h header that defines [u]int32_t,
+   * but not bool for C.
+   */
+  #include <inttypes.h>
+
+  #ifndef __cplusplus
+    typedef int bool;
+    #define true   1
+    #define false  0
+  #endif
+#elif defined(bsdi) || defined(FREEBSD) || defined(OPENBSD)
+  /*
+   * BSD/OS, FreeBSD, and OpenBSD ship sys/types.h that define int32_t and
+   * u_int32_t.
+   */
+  #include <sys/types.h>
+
+  /*
+   * BSD/OS ships no header that defines uint32_t, nor bool (for C)
+   */
+  #if defined(bsdi)
+  typedef u_int32_t uint32_t;
+  typedef u_int64_t uint64_t;
+
+  #if !defined(__cplusplus)
+    typedef int bool;
+    #define true   1
+    #define false  0
+  #endif
+  #else
+  /*
+   * FreeBSD and OpenBSD define uint32_t and bool.
+   */
+    #include <inttypes.h>
+    #include <stdbool.h>
+  #endif
+#elif defined(BEOS)
+  #include <inttypes.h>
+#else
+  /*
+   * For those that ship a standard C99 stdint.h header file, include
+   * it. Can't do the same for stdbool.h tho, since some systems ship
+   * with a stdbool.h file that doesn't compile!
+   */
+  #include <stdint.h>
+
+  #ifndef __cplusplus
+    #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
+      #include <stdbool.h>
+    #else
+      /*
+       * GCC 2.91 can't deal with a typedef for bool, but a #define
+       * works.
+       */
+      #define bool int
+      #define true   1
+      #define false  0
+    #endif
+  #endif
+#endif
+
+#endif /* nptypes_h_ */

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/meson.build

@@ -1,6 +1,5 @@
 dbus_interfaces = [
   'org.gnome.Shell.Extensions.xml',
-  'org.gnome.Shell.Introspect.xml',
   'org.gnome.Shell.PadOsd.xml',
   'org.gnome.Shell.Screencast.xml',
   'org.gnome.Shell.Screenshot.xml',

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.Introspect.xml

@@ -1,61 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-
-  <!--
-      org.gnome.Shell.Introspect:
-      @short_description: Introspection interface
-
-      The interface used to introspect the state of Shell, such as running
-      applications, currently active application, etc.
-  -->
-  <interface name="org.gnome.Shell.Introspect">
-
-    <!--
-        RunningApplicationsChanged:
-        @short_description: Notifies when the running applications changes
-    -->
-    <signal name="RunningApplicationsChanged" />
-
-    <!--
-        GetRunningApplications:
-        @short_description: Retrieves the description of all running applications
-
-        Each application is associated by an application ID. The details of
-        each application consists of a varlist of keys and values. Available
-        keys are listed below.
-
-        'active-on-seats' - (as)   list of seats the application is active on
-                                   (a seat only has at most one active
-                                   application)
-    -->
-    <method name="GetRunningApplications">
-      <arg name="apps" direction="out" type="a{sa{sv}}" />
-    </method>
-
-    <!--
-        GetWindows:
-        @short_description: Retrieves the current list of windows and their properties
-
-        A window is exposed as:
-        * t ID: unique ID of the window
-        * a{sv} properties: high-level properties
-
-          Known properties:
-
-          - "title"       (s): (readonly) title of the window
-          - "app-id"      (s): (readonly) application ID of the window
-          - "wm-class"    (s): (readonly) class of the window
-          - "client-type" (u): (readonly) 0 for Wayland, 1 for X11
-          - "is-hidden"   (b): (readonly) if the window is currently hidden
-          - "has-focus"   (b): (readonly) if the window currently have
-                                          keyboard focus
-          - "width"       (u): (readonly) width of the window
-          - "height"      (u): (readonly) height of the window
-    -->
-    <method name="GetWindows">
-      <arg name="windows" direction="out" type="a{ta{sv}}" />
-    </method>
-  </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="grabFlags"/>
+      <arg type="u" direction="in" name="flags"/>
       <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,9 +39,7 @@
     <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>
     <file preprocess="xml-stripblanks">org.gnome.Shell.PerfHelper.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.PortalHelper.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

@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/shell/theme">
+    <file>calendar-arrow-left.svg</file>
+    <file>calendar-arrow-right.svg</file>
     <file>calendar-today.svg</file>
     <file>checkbox-focused.svg</file>
     <file>checkbox-off-focused.svg</file>
     <file>checkbox-off.svg</file>
     <file>checkbox.svg</file>
+    <file>close-window.svg</file>
+    <file>close-window-active.svg</file>
+    <file>close-window-hover.svg</file>
+    <file>corner-ripple-ltr.png</file>
+    <file>corner-ripple-rtl.png</file>
     <file>dash-placeholder.svg</file>
     <file>gnome-shell.css</file>
     <file>gnome-shell-high-contrast.css</file>
@@ -20,6 +27,10 @@
     <file>no-notifications.svg</file>
     <file>noise-texture.png</file>
     <file>pad-osd.css</file>
+    <file>page-indicator-active.svg</file>
+    <file>page-indicator-inactive.svg</file>
+    <file>page-indicator-checked.svg</file>
+    <file>page-indicator-hover.svg</file>
     <file>process-working.svg</file>
     <file>toggle-off-us.svg</file>
     <file>toggle-off-intl.svg</file>

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

@@ -90,14 +90,6 @@
         adapter is ever seen not to have devices associated to it.
       </description>
     </key>
-    <key name="introspect" type="b">
-      <default>false</default>
-      <summary>Enable introspection API</summary>
-      <description>
-        Enables a D-Bus API that allows to introspect the application state of
-        the shell.
-      </description>
-    </key>
     <child name="keybindings" schema="org.gnome.shell.keybindings"/>
     <child name="keyboard" schema="org.gnome.shell.keyboard"/>
   </schema>
@@ -145,42 +137,6 @@
       <summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</summary>
       <description></description>
     </key>
-    <key name="switch-to-application-1" type="as">
-      <default>["&lt;Super&gt;1"]</default>
-      <summary>Switch to application 1</summary>
-    </key>
-    <key name="switch-to-application-2" type="as">
-      <default>["&lt;Super&gt;2"]</default>
-      <summary>Switch to application 2</summary>
-    </key>
-    <key name="switch-to-application-3" type="as">
-      <default>["&lt;Super&gt;3"]</default>
-      <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>
 
   <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"

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",
-  "name": "French"
+  "locale": "fr-CA",
+  "name": "French Canada"
 }

data/theme/calendar-arrow-left.svg

@@ -0,0 +1,82 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r9942 custom"
+   sodipodi:docname="New document 4">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="8.984481"
+     inkscape:cy="5.6224906"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="930"
+     inkscape:window-height="681"
+     inkscape:window-x="1892"
+     inkscape:window-y="272"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid17403"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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(0,-1036.3622)">
+    <path
+       sodipodi:type="star"
+       style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.43015847;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="path18028"
+       sodipodi:sides="3"
+       sodipodi:cx="84.5"
+       sodipodi:cy="337.5"
+       sodipodi:r1="5"
+       sodipodi:r2="2.5"
+       sodipodi:arg1="0.52359878"
+       sodipodi:arg2="1.5707963"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 88.830127,340 80.169873,340 84.5,332.5 z"
+       transform="matrix(0,1.3621708,0.99186247,0,-325.48222,929.32667)" />
+  </g>
+</svg>

data/theme/calendar-arrow-right.svg

@@ -0,0 +1,82 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r9942 custom"
+   sodipodi:docname="arrow-left.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="7.7366092"
+     inkscape:cy="6.4536271"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="930"
+     inkscape:window-height="681"
+     inkscape:window-x="1892"
+     inkscape:window-y="272"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid17403"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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(0,-1036.3622)">
+    <path
+       sodipodi:type="star"
+       style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.43015847;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="path18028"
+       sodipodi:sides="3"
+       sodipodi:cx="84.5"
+       sodipodi:cy="337.5"
+       sodipodi:r1="5"
+       sodipodi:r2="2.5"
+       sodipodi:arg1="0.52359878"
+       sodipodi:arg2="1.5707963"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 88.830127,340 80.169873,340 84.5,332.5 z"
+       transform="matrix(0,1.3621708,-0.99186247,0,342.48324,929.32667)" />
+  </g>
+</svg>

data/theme/close-window-active.svg

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<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"
+   version="1.0"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="close-window-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+     id="metadata2399"><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><defs
+     id="defs2397"><linearGradient
+       id="linearGradient3173"><stop
+         style="stop-color:#c4c4c4;stop-opacity:1;"
+         offset="0"
+         id="stop3175" /><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3177" /></linearGradient><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 11 : 1"
+       inkscape:vp_y="0 : 1375 : 0"
+       inkscape:vp_z="22 : 11 : 1"
+       inkscape:persp3d-origin="11 : 7.3333334 : 1"
+       id="perspective2401" /></defs><sodipodi:namedview
+     inkscape:window-height="1106"
+     inkscape:window-width="1700"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#797979"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="28.483745"
+     inkscape:cy="67.714004"
+     inkscape:window-x="1427"
+     inkscape:window-y="127"
+     inkscape:current-layer="Foreground"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"><inkscape:grid
+       type="xygrid"
+       id="grid11246"
+       empspacing="32"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><path
+     d="m 4.4362021,16 c 0,-6.410121 5.1728276,-11.60728 11.5529359,-11.60728 6.380109,0 11.552937,5.197159 11.552937,11.60728 0,6.410122 -5.172828,11.607281 -11.552937,11.607281 C 9.6090297,27.607281 4.4362021,22.410122 4.4362021,16 Z"
+     id="path883"
+     style="color:#000000;clip-rule:evenodd;display:inline;overflow:visible;visibility:visible;fill:#a5c8ec;fill-opacity:1;fill-rule:nonzero;stroke:#2975c4;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" /><path
+     d="m 11.718386,11.764547 h 1.055207 c 0.01091,-1.26e-4 0.02193,-4.86e-4 0.03298,0 0.269026,0.01183 0.538019,0.135679 0.725455,0.329752 l 2.407192,2.407192 2.440166,-2.407192 c 0.28029,-0.243226 0.471333,-0.322366 0.725455,-0.329752 h 1.055207 v 1.055208 c 0,0.302285 -0.03623,0.581049 -0.263801,0.791405 l -2.407191,2.407191 2.374217,2.374216 c 0.198577,0.198559 0.296768,0.478484 0.296775,0.758432 v 1.055206 h -1.055211 c -0.279947,-10e-6 -0.559877,-0.09824 -0.75843,-0.296777 l -2.407192,-2.407192 -2.407192,2.407192 c -0.198551,0.198579 -0.478493,0.296777 -0.758429,0.296777 H 11.71839 v -1.055206 c -3e-6,-0.279936 0.0982,-0.559873 0.296777,-0.758432 L 14.422359,16.018351 12.015167,13.61116 C 11.79279,13.405784 11.69527,13.116003 11.71839,12.819755 Z"
+     inkscape:connector-curvature="0"
+     id="path887"
+     style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#4a90d9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87958801;marker:none;enable-background:new"
+     sodipodi:nodetypes="ccsccccccccccccccccccccccc" /></svg>

data/theme/close-window-hover.svg

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<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"
+   version="1.0"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="close-window-hover.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+     id="metadata2399"><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><defs
+     id="defs2397"><linearGradient
+       id="linearGradient3173"><stop
+         style="stop-color:#c4c4c4;stop-opacity:1;"
+         offset="0"
+         id="stop3175" /><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3177" /></linearGradient><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 11 : 1"
+       inkscape:vp_y="0 : 1375 : 0"
+       inkscape:vp_z="22 : 11 : 1"
+       inkscape:persp3d-origin="11 : 7.3333334 : 1"
+       id="perspective2401" /></defs><sodipodi:namedview
+     inkscape:window-height="1106"
+     inkscape:window-width="1700"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#797979"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="28.483745"
+     inkscape:cy="67.714004"
+     inkscape:window-x="1427"
+     inkscape:window-y="127"
+     inkscape:current-layer="Foreground"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"><inkscape:grid
+       type="xygrid"
+       id="grid11246"
+       empspacing="32"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><path
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csssc"
+     style="color:#000000;clip-rule:evenodd;display:inline;overflow:visible;visibility:visible;fill:#2975c4;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path822"
+     d="m 4.4362021,16 c 0,-6.410121 5.1728276,-11.60728 11.5529359,-11.60728 6.380109,0 11.552937,5.197159 11.552937,11.60728 0,6.410122 -5.172828,11.607281 -11.552937,11.607281 C 9.6090297,27.607281 4.4362021,22.410122 4.4362021,16 Z" /><path
+     sodipodi:nodetypes="ccsccccccccccccccccccccccc"
+     style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87958801;marker:none;enable-background:new"
+     id="path826"
+     inkscape:connector-curvature="0"
+     d="m 11.718386,11.764547 h 1.055207 c 0.01091,-1.26e-4 0.02193,-4.86e-4 0.03298,0 0.269026,0.01183 0.538019,0.135679 0.725455,0.329752 l 2.407192,2.407192 2.440166,-2.407192 c 0.28029,-0.243226 0.471333,-0.322366 0.725455,-0.329752 h 1.055207 v 1.055208 c 0,0.302285 -0.03623,0.581049 -0.263801,0.791405 l -2.407191,2.407191 2.374217,2.374216 c 0.198577,0.198559 0.296768,0.478484 0.296775,0.758432 v 1.055206 h -1.055211 c -0.279947,-10e-6 -0.559877,-0.09824 -0.75843,-0.296777 l -2.407192,-2.407192 -2.407192,2.407192 c -0.198551,0.198579 -0.478493,0.296777 -0.758429,0.296777 H 11.71839 v -1.055206 c -3e-6,-0.279936 0.0982,-0.559873 0.296777,-0.758432 L 14.422359,16.018351 12.015167,13.61116 C 11.79279,13.405784 11.69527,13.116003 11.71839,12.819755 Z" /></svg>

data/theme/close-window.svg

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<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"
+   version="1.0"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="close-window.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+     id="metadata2399"><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><defs
+     id="defs2397"><linearGradient
+       id="linearGradient3173"><stop
+         style="stop-color:#c4c4c4;stop-opacity:1;"
+         offset="0"
+         id="stop3175" /><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3177" /></linearGradient><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 11 : 1"
+       inkscape:vp_y="0 : 1375 : 0"
+       inkscape:vp_z="22 : 11 : 1"
+       inkscape:persp3d-origin="11 : 7.3333334 : 1"
+       id="perspective2401" /></defs><sodipodi:namedview
+     inkscape:window-height="1106"
+     inkscape:window-width="1700"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#797979"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="28.483745"
+     inkscape:cy="67.714004"
+     inkscape:window-x="1427"
+     inkscape:window-y="127"
+     inkscape:current-layer="Foreground"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"><inkscape:grid
+       type="xygrid"
+       id="grid11246"
+       empspacing="32"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><path
+     d="m 4.4362021,15.860384 c 0,-6.410121 5.1728276,-11.60728 11.5529359,-11.60728 6.380109,0 11.552937,5.197159 11.552937,11.60728 0,6.410122 -5.172828,11.607281 -11.552937,11.607281 -6.3801083,0 -11.5529359,-5.197159 -11.5529359,-11.607281 z"
+     id="path2394-32"
+     style="color:#000000;clip-rule:evenodd;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#2975c4;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" /><path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.49900004;fill:#4a90d9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.74932218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 6.4654832,15.001321 c -0.025906,0.288419 -0.044417,0.579469 -0.044417,0.874662 0,5.313347 4.2883848,9.621271 9.5768588,9.621271 5.288466,0 9.575143,-4.307924 9.575143,-9.621271 0,-0.295193 -0.01852,-0.586243 -0.04441,-0.874662 -0.440376,4.903023 -4.536071,8.746611 -9.53073,8.746611 -4.994659,0 -9.0920617,-3.843588 -9.5324391,-8.746611 z"
+     id="path2561"
+     inkscape:connector-curvature="0" /><path
+     d="m 11.718386,11.639547 h 1.055207 c 0.01091,-1.26e-4 0.02193,-4.86e-4 0.03298,0 0.269026,0.01183 0.538019,0.135679 0.725455,0.329752 l 2.407192,2.407192 2.440166,-2.407192 c 0.28029,-0.243226 0.471333,-0.322366 0.725455,-0.329752 h 1.055207 v 1.055208 c 0,0.302285 -0.03623,0.581049 -0.263801,0.791405 l -2.407191,2.407191 2.374217,2.374216 c 0.198577,0.198559 0.296768,0.478484 0.296775,0.758432 v 1.055206 h -1.055211 c -0.279947,-10e-6 -0.559877,-0.09824 -0.75843,-0.296777 l -2.407192,-2.407192 -2.407192,2.407192 c -0.198551,0.198579 -0.478493,0.296777 -0.758429,0.296777 H 11.71839 v -1.055206 c -3e-6,-0.279936 0.0982,-0.559873 0.296777,-0.758432 L 14.422359,15.893351 12.015167,13.48616 C 11.79279,13.280784 11.69527,12.991003 11.71839,12.694755 Z"
+     inkscape:connector-curvature="0"
+     id="path27279-0-5"
+     style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#4a90d9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87958801;marker:none;enable-background:new"
+     sodipodi:nodetypes="ccsccccccccccccccccccccccc" /></svg>

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

@@ -2,26 +2,29 @@
 // it gets @if ed depending on $variant
 
 
-$base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
-$bg_color: if($variant == 'light', #f6f5f4, desaturate(#3d3846, 10%));
-$fg_color: if($variant == 'light', #2e3436, #eeeeec);
+$base_color: if($variant =='light', #ffffff, #292929);
+$bg_color: if($variant =='light', #ededed, #393f3f);
+$fg_color: if($variant =='light', #2e3436, #eeeeec);
 
 $selected_fg_color: #ffffff;
-$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%));
-$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
-$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
-$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
-$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%));
+$selected_bg_color: if($variant == 'light', #4a90d9, darken(#4a90d9,20%));
+$selected_borders_color: if($variant=='light', darken($selected_bg_color, 30%),
+                                               darken($selected_bg_color, 20%));
+$borders_color: if($variant =='light', darken($bg_color,30%), darken($bg_color,12%));
+$borders_edge: if($variant =='light', white, transparentize($fg_color, 0.9));
+$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;
-$success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
-$destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
+$error_color: #cc0000;
+$success_color: if($variant =='light', #73d216, darken(#73d216,10%));
+$destructive_color: if($variant =='light', #ef2929, darken(#ef2929,10%));
 
 $osd_fg_color: #eeeeec;
-$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 15%),0.3);
+$osd_bg_color: #2e3436;
 $osd_borders_color: transparentize(black, 0.3);
 $osd_outer_borders_color: transparentize(white, 0.9);
 

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

@@ -29,7 +29,7 @@ $panel-corner-radius: 6px;
 /* GLOBALS */
 $font-size: 11;
 $font-family: Cantarell, Sans-Serif;
-$_bubble_bg_color: $osd_bg_color;
+$_bubble_bg_color: opacify($osd_bg_color,0.25);
 $_bubble_fg_color: $osd_fg_color;
 $_bubble_borders_color: transparentize($osd_fg_color,0.8);
 
@@ -57,8 +57,8 @@ stage {
   border-right-width: 1px;
   @include button(normal);
   &:insensitive { @include button(insensitive); }
-  &:hover { @include button(hover); }
   &:focus { @include button(focus); }
+  &:hover { @include button(hover); }
   &:active { @include button(active); }
   padding: 12px;
 
@@ -184,7 +184,7 @@ StScrollBar {
 .modal-dialog {
   border-radius: 9px;
   color: $osd_fg_color;
-  background-color: $osd_bg_color;
+  background-color: transparentize(darken($osd_bg_color,10%),0.05);
   border: 1px solid $_bubble_borders_color;
   .modal-dialog-content-box {
     padding: 24px;
@@ -267,7 +267,8 @@ StScrollBar {
   }
 
   .end-session-dialog-logout-icon {
-    border-radius: 99px;
+    //border: 2px solid #8b8b8b;
+    border-radius: 5px;
     width: 48px;
     height: 48px;
     background-size: contain;
@@ -392,7 +393,7 @@ StScrollBar {
 
   .prompt-dialog-error-label {
     font-size: 10pt;
-    color: $warning_color;
+    color: $error_color;
     padding-bottom: 8px;
   }
 
@@ -427,7 +428,7 @@ StScrollBar {
   }
 
   .polkit-dialog-user-icon {
-    border-radius: 99px;
+    border-radius: 5px;
     background-size: contain;
     width: 48px;
     height: 48px;
@@ -507,7 +508,6 @@ StScrollBar {
 
   .popup-menu-arrow { } //defined globally in the TOP BAR
   .popup-sub-menu {
-    padding-bottom: 1px;
     background-color: darken($bg_color,2%);
     box-shadow: inset 0 -1px 0px lighten($borders_color,5%);
   }
@@ -729,7 +729,9 @@ StScrollBar {
 /* TOP BAR */
 
 #panel {
-  background-color: black;
+  background-color: rgba(0, 0, 0, 0.35);
+  /* transition from solid to transparent */
+  transition-duration: 500ms;
   font-weight: bold;
   height: 1.86em;
   font-feature-settings: "tnum";
@@ -746,7 +748,7 @@ StScrollBar {
 
   .panel-corner {
     -panel-corner-radius: $panel-corner-radius;
-    -panel-corner-background-color: black;
+    -panel-corner-background-color: rgba(0, 0, 0, 0.35);
     -panel-corner-border-width: 2px;
     -panel-corner-border-color: transparent;
 
@@ -765,7 +767,9 @@ StScrollBar {
     -natural-hpadding: 12px;
     -minimum-hpadding: 6px;
     font-weight: bold;
-    color: #ccc;
+    color: #eee;
+    text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.9);
+    transition-duration: 100ms;
 
     .app-menu-icon {
       -st-icon-style: symbolic;
@@ -774,8 +778,21 @@ StScrollBar {
       //dimensions of the icon are hardcoded
     }
 
+    .system-status-icon,
+    .app-menu-icon > StIcon,
+    .popup-menu-arrow {
+      icon-shadow: 0px 1px 2px rgba(0, 0, 0, 0.9);
+    }
+
     &:hover {
       color: lighten($fg_color, 10%);
+      text-shadow: 0px 1px 6px rgba(0, 0, 0, 1);
+
+      .system-status-icon,
+      .app-menu-icon > StIcon,
+      .popup-menu-arrow {
+        icon-shadow: 0px 1px 6px rgba(0, 0, 0, 1);
+      }
     }
 
     &:active, &:overview, &:focus, &:checked {
@@ -784,6 +801,8 @@ StScrollBar {
       background-color: rgba(0, 0, 0, 0.01);
       box-shadow: inset 0 -2px 0px lighten($selected_bg_color,5%);
       color: lighten($fg_color,10%);
+
+      & > .system-status-icon { icon-shadow: black 0 2px 2px; }
     }
 
     .system-status-icon { icon-size: 1.09em; padding: 0 5px; }
@@ -808,6 +827,31 @@ StScrollBar {
   .screencast-indicator { color: $warning_color; }
 
   .remote-access-indicator { color: $warning_color; }
+
+  &.solid {
+    background-color: black;
+    /* transition from transparent to solid */
+    transition-duration: 300ms;
+
+    .panel-corner {
+      -panel-corner-background-color: black;
+    }
+
+    .panel-button {
+      color: #ccc;
+      text-shadow: none;
+
+      &:hover, &:active, &:overview, &:focus, &:checked {
+        color: lighten($fg_color, 10%);
+      }
+    }
+
+    .system-status-icon,
+    .app-menu-icon > StIcon,
+    .popup-menu-arrow {
+      icon-shadow: none;
+    }
+  }
 }
 
   // calendar popover
@@ -878,47 +922,14 @@ StScrollBar {
       font-weight: bold;
     }
 
-    .weather-header.location {
-      font-weight: normal;
-      font-size: 0.9em;
-    }
-
-    .world-clocks-grid,
-    .weather-grid {
+    .world-clocks-grid {
       spacing-rows: 0.4em;
-      spacing-columns: 0.8em;
     }
 
     .weather-box {
       spacing: 0.4em;
     }
 
-    .world-clocks-city {
-      font-weight: bold;
-      font-size: 0.9em;
-    }
-
-    .world-clocks-time {
-      color: darken($fg_color,20%);
-      font-feature-settings: "tnum";
-      font-size: 1.2em;
-    }
-
-    .world-clocks-timezone {
-      color: darken($fg_color,40%);
-      font-feature-settings: "tnum";
-      font-size: 0.9em;
-    }
-
-    .weather-forecast-icon {
-      icon-size: 2.18em;
-    }
-
-    .weather-forecast-time {
-      color: darken($fg_color,40%);
-      font-size: 0.8em;
-    }
-
     .calendar-month-label {
       color: darken($fg_color,5%);
       font-weight: bold;
@@ -927,6 +938,7 @@ StScrollBar {
     }
 
     .pager-button {
+      color: white;
       background-color: transparent;
       width: 32px;
       border-radius: 4px;
@@ -934,8 +946,13 @@ StScrollBar {
       &:active { background-color: transparentize($bg_color,0.95); }
     }
 
-      .calendar-change-month-back StIcon, .calendar-change-month-forward StIcon { // arrows
-        icon-size: 1.09em;
+      .calendar-change-month-back { //arrow back
+        background-image: url("resource:///org/gnome/shell/theme/calendar-arrow-left.svg");
+        &:rtl { background-image: url("resource:///org/gnome/shell/theme/calendar-arrow-right.svg"); }
+      }
+      .calendar-change-month-forward { //arrow foreward
+        background-image: url("resource:///org/gnome/shell/theme/calendar-arrow-right.svg");
+        &:rtl { background-image: url("resource:///org/gnome/shell/theme/calendar-arrow-left.svg"); }
       }
 
     .calendar-day-base {
@@ -1031,11 +1048,6 @@ StScrollBar {
             -st-icon-style: symbolic;
           }
 
-          .message-icon-bin > .fallback-window-icon {
-            width: 1.09em;
-            height: 1.09em;
-          }
-
           .message-secondary-bin {
             padding: 0 0.82em;;
           }
@@ -1078,14 +1090,18 @@ StScrollBar {
               background-color: $bg_color;
               border: 2px solid $bg_color;
               border-radius: 2px;
-              icon-size: 32px !important;
-              padding: 6px; }
+              icon-size: 16px;
+              padding: 8px; }
           }
 
 
   // a little unstructured mess:
 
-  .system-switch-user-submenu-icon {
+  .system-switch-user-submenu-icon.user-icon {
+    icon-size: 20px;
+    padding: 0 2px;
+  }
+  .system-switch-user-submenu-icon.default-icon {
     icon-size: 16px;
     padding: 0 4px;
   }
@@ -1097,11 +1113,6 @@ StScrollBar {
     .label-shadow { color: transparent; }
   }
 
-  .app-menu,
-  .app-well-menu {
-    max-width: 27.25em;
-  }
-
   .aggregate-menu {
     min-width: 21em;
     .popup-menu-icon { padding: 0 4px; }
@@ -1131,50 +1142,33 @@ StScrollBar {
     & > StIcon { icon-size: 16px; }
   }
 
-// Activities Ripples
+//Activities Ripples
 .ripple-box {
   width: 52px;
   height: 52px;
-  border-radius: 0 0 52px 0; // radius the size of the box give us the curve
-  background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
-  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
+  background-image: url("resource:///org/gnome/shell/theme/corner-ripple-ltr.png");
+  background-size: contain;
 }
 
-.ripple-box:rtl { border-radius: 0 0 0 52px; } // just a simple change to the border radius position
-
-// Rubberband for select-area screenshots
-.select-area-rubberband {
-  background-color: transparentize($selected_bg_color,0.7);
-  border: 1px solid $selected_bg_color;
+.ripple-box:rtl {
+  background-image: url("resource:///org/gnome/shell/theme/corner-ripple-rtl.png");
 }
 
 // not really top bar only
-.popup-menu-arrow { icon-size: 1.09em; }
+.popup-menu-arrow { width: 16px; height: 16px; }
 .popup-menu-icon { icon-size: 1.09em; }
 
 //close buttons
 
 .window-close {
-  background-color: white;
-  border-radius: 24px;
-  border: 4px solid $selected_bg_color;
-  box-shadow: inset 0 -4px 0 0 transparentize($selected_bg_color, 0.5);
-  color: $selected_bg_color;
-  height: 24px;
-  width: 24px;
-  -shell-close-overlap: 14px;
+  background-image: url("resource:///org/gnome/shell/theme/close-window.svg");
+  background-size: 32px;
+  height: 32px;
+  width: 32px;
+  -shell-close-overlap: 16px;
 
-  &:hover {
-    background-color: $selected_bg_color;
-    border-color: white;
-    color: white;
-  }
-
-  &:active {
-    background-color: mix(white, $selected_bg_color, 75%);
-    border-color: $selected_bg_color;
-    color: $selected_bg_color;
-  }
+  &:hover { background-image: url("resource:///org/gnome/shell/theme/close-window-hover.svg"); }
+  &:active { background-image: url("resource:///org/gnome/shell/theme/close-window-active.svg"); }
 }
 
 /* NETWORK DIALOGS */
@@ -1295,8 +1289,6 @@ StScrollBar {
 
   .search-section-separator { height: 2px; background-color: rgba(255, 255, 255, 0.2); }
 
-  .search-section:last-child .search-section-separator { background-color: transparent; }
-
   .list-search-result-content { spacing: 30px; }
   .list-search-result-title { color: darken($osd_fg_color,5%); spacing: 12px; }
   .list-search-result-description { color: transparentize(darken($osd_fg_color,15%), 0.5); }
@@ -1455,17 +1447,15 @@ StScrollBar {
     padding: 15px 20px;
 
     .page-indicator-icon {
-      width: 12px;
-      height: 12px;
-      background-color: transparent;
-      border: 2px solid rgba(255, 255, 255, 0.4);
-      border-radius: 12px;
+      width: 18px;
+      height: 18px;
+      background-image: url(resource:///org/gnome/shell/theme/page-indicator-inactive.svg);
     }
 
-    &:hover .page-indicator-icon { border-color: white; }
-    &:active .page-indicator-icon { border: none; margin: 2px; background-color: white; }
+    &:hover .page-indicator-icon { background-image: url(resource:///org/gnome/shell/theme/page-indicator-hover.svg); }
+    &:active .page-indicator-icon { background-image: url(resource:///org/gnome/shell/theme/page-indicator-active.svg); }
     &:checked .page-indicator-icon,
-    &:checked:active .page-indicator-icon { background-color: white;}
+    &:checked:active { background-image: url(resource:///org/gnome/shell/theme/page-indicator-checked.svg); }
   }
 
   .no-frequent-applications-label { @extend %status_text; }
@@ -1649,15 +1639,6 @@ StScrollBar {
 
 #keyboard {
     background-color: transparentize($osd_bg_color, 0.3);
-
-    .page-indicator {
-        padding: 4px 4px;
-
-        .page-indicator-icon {
-            width: 6px;
-            height: 6px
-        }
-    }
 }
 
   .key-container {
@@ -1667,8 +1648,8 @@ StScrollBar {
 
   .keyboard-key {
     background-color: #393f3f;
-    min-height: 1.2em;
-    min-width: 1.2em;
+    min-height: 2em;
+    min-width: 2em;
     font-size: 16pt;
     border-radius: 3px;
     border: 1px solid #464d4d;
@@ -1719,20 +1700,6 @@ StScrollBar {
     -boxpointer-gap: 5px;
   }
 
-.emoji-page {
-  .keyboard-key {
-    background-color: transparent;
-    border: none;
-  }
-}
-
-.emoji-panel {
-  .keyboard-key:latched {
-    border-color: #005684;
-    background-color: #006098;
-  }
-}
-
 // IBus Candidate Popup
 
 .candidate-popup-content {
@@ -1767,11 +1734,13 @@ StScrollBar {
 
 /* Auth Dialogs & Screen Shield */
 
-.user-icon {
+.framed-user-icon {
   background-size: contain;
+  border: 2px solid $osd_fg_color;
   color: $osd_fg_color;
-  border-radius: 99px;
+  border-radius: 3px;
   &:hover {
+    border-color: lighten($osd_fg_color,30%);
     color: lighten($osd_fg_color,30%);
   }
 }

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

@@ -111,7 +111,7 @@
   }
 }
 
-@mixin button($t, $c:opacify(lighten($osd_bg_color, 5%),1.0), $tc:$fg_color, $edge: $borders_edge) {
+@mixin button($t, $c:$osd_bg_color, $tc:$fg_color, $edge: $borders_edge) {
 //
 // Button drawing function
 //
@@ -136,7 +136,8 @@
   //
   // normal button
   //
-    $_bg: $c;
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
+                            $osd_bg_color);
 
     color: $osd_fg_color;
     background-color: $_bg;
@@ -149,7 +150,8 @@
   //
   // focused button
   //
-    $_bg: lighten($c,3%);
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+                          lighten($osd_bg_color,3%));
 
     color: $osd_fg_color;
     text-shadow: 0 1px black;
@@ -161,7 +163,8 @@
   //
   // active osd button
   //
-    $_bg: lighten($c,3%);
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+                            lighten($osd_bg_color,3%));
 
     color: white;
     border-color: $osd_borders_color;

data/theme/page-indicator-active.svg

@@ -0,0 +1,71 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="18"
+   height="18"
+   id="svg4703"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="page-indicator-pushed.svg">
+  <defs
+     id="defs4705" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.392433"
+     inkscape:cx="1.0245308"
+     inkscape:cy="13.3715"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="2560"
+     inkscape:window-height="1374"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid6140" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4708">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,2)">
+    <path
+       transform="matrix(0.54617904,0,0,0.62523128,-1131.9904,-392.39214)"
+       d="m 2099.9808,638.83099 a 10.985409,9.5964489 0 1 1 -21.9708,0 10.985409,9.5964489 0 1 1 21.9708,0 z"
+       sodipodi:ry="9.5964489"
+       sodipodi:rx="10.985409"
+       sodipodi:cy="638.83099"
+       sodipodi:cx="2088.9954"
+       id="path4711"
+       style="fill:#fdffff;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+  </g>
+</svg>

data/theme/page-indicator-checked.svg

@@ -0,0 +1,67 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="18"
+   height="18"
+   id="svg4703"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="page-indicator-active.svg">
+  <defs
+     id="defs4705" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="2.1522887"
+     inkscape:cy="16.782904"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4708">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,2)">
+    <path
+       transform="matrix(0.72823872,0,0,0.8336417,-1512.2872,-525.55618)"
+       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
+       sodipodi:ry="9.5964489"
+       sodipodi:rx="10.985409"
+       sodipodi:cy="638.83099"
+       sodipodi:cx="2088.9954"
+       id="path4711"
+       style="fill:#fdffff;fill-opacity:0.94117647;stroke:none"
+       sodipodi:type="arc" />
+  </g>
+</svg>

data/theme/page-indicator-hover.svg

@@ -0,0 +1,67 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="18"
+   height="18"
+   id="svg5266"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="page-indicator-inactive.svg">
+  <defs
+     id="defs5268" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-2.307566"
+     inkscape:cy="17.859535"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="2560"
+     inkscape:window-height="1374"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5271">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,2)">
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5274"
+       sodipodi:cx="2088.9954"
+       sodipodi:cy="638.83099"
+       sodipodi:rx="10.985409"
+       sodipodi:ry="9.5964489"
+       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
+       transform="matrix(0.63720887,0,0,0.72943648,-1322.1264,-458.98661)" />
+  </g>
+</svg>

data/theme/page-indicator-inactive.svg

@@ -0,0 +1,67 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="18"
+   height="18"
+   id="svg5266"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="page-indicator-inactive.svg">
+  <defs
+     id="defs5268" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-2.307566"
+     inkscape:cy="17.859535"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="2560"
+     inkscape:window-height="1374"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5271">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,2)">
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:0.39215686000000000;stroke-dasharray:none"
+       id="path5274"
+       sodipodi:cx="2088.9954"
+       sodipodi:cy="638.83099"
+       sodipodi:rx="10.985409"
+       sodipodi:ry="9.5964489"
+       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
+       transform="matrix(0.63720887,0,0,0.72943648,-1322.1264,-458.98661)" />
+  </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

docs/reference/shell/shell-docs.sgml

@@ -17,6 +17,7 @@
 
   <chapter>
     <title>Actors</title>
+    <xi:include href="xml/shell-generic-container.xml"/>
     <xi:include href="xml/shell-stack.xml"/>
   </chapter>
   <chapter>

gnome-shell.doap

@@ -25,7 +25,7 @@ its dependencies to build from tarballs.</description>
   <homepage rdf:resource="https://wiki.gnome.org/Projects/GnomeShell" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
   <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell/" />
-  <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gnome-shell/issues/" />
+  <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=gnome-shell" />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
   <programming-language>JavaScript</programming-language>

js/extensionPrefs/main.js

@@ -1,5 +1,12 @@
+
+const Lang = imports.lang;
 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;
@@ -17,8 +24,9 @@ function stripPrefix(string, prefix) {
     return string;
 }
 
-var Application = class {
-    constructor() {
+var Application = new Lang.Class({
+    Name: 'Application',
+    _init() {
         GLib.set_prgname('gnome-shell-extension-prefs');
         this.application = new Gtk.Application({
             application_id: 'org.gnome.shell.ExtensionPrefs',
@@ -34,7 +42,7 @@ var Application = class {
         this._startupUuid = null;
         this._loaded = false;
         this._skipMainWindow = false;
-    }
+    },
 
     _extensionAvailable(uuid) {
         let extension = ExtensionUtils.extensions[uuid];
@@ -46,7 +54,7 @@ var Application = class {
             return false;
 
         return true;
-    }
+    },
 
     _getExtensionPrefsModule(extension) {
         let uuid = extension.metadata.uuid;
@@ -61,7 +69,7 @@ var Application = class {
 
         this._extensionPrefsModules[uuid] = prefsModule;
         return prefsModule;
-    }
+    },
 
     _selectExtension(uuid) {
         if (!this._extensionAvailable(uuid))
@@ -96,115 +104,33 @@ var Application = class {
         dialog.set_default_size(600, 400);
         dialog.add(widget);
         dialog.show();
-    }
+    },
 
     _buildErrorUI(extension, exc) {
-        let scroll = new Gtk.ScrolledWindow({
-            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 box = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
         let label = new Gtk.Label({
-            label: '<span size="x-large">%s</span>'.format(_("Something’s gone wrong")),
-            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
+            label: _("There was an error loading the preferences dialog for %s:").format(extension.metadata.name)
         });
         box.add(label);
 
-        let expander = new Expander({
-            label: _("Technical Details"),
-            margin_top: 12
-        });
-        box.add(expander);
+        let errortext = '';
+        errortext += exc;
+        errortext += '\n\n';
+        errortext += 'Stack trace:\n';
 
-        let errortext = `${exc}\n\nStack trace:\n${
-            // Indent stack trace.
-            exc.stack.split('\n').map(line => `  ${line}`).join('\n')
-        }`;
+        // Indent stack trace.
+        errortext += 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({
-            buffer: buffer,
-            wrap_mode: Gtk.WrapMode.WORD,
-            monospace: true,
-            editable: false,
-            top_margin: 12,
-            bottom_margin: 12,
-            left_margin: 12,
-            right_margin: 12
-        });
+        let textview = new Gtk.TextView({ buffer: buffer });
+        textview.override_font(Pango.font_description_from_string('monospace'));
+        scroll.add(textview);
+        box.add(scroll);
 
-        let toolbar = new Gtk.Toolbar();
-        let provider = new Gtk.CssProvider();
-        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());
-            let backticks = '```';
-            clipboard.set_text(
-                // markdown for pasting in gitlab issues
-                `The settings of extension ${extension.uuid} had an error:\n${
-                backticks}\n${exc}\n${backticks}\n\nStack trace:\n${
-                backticks}\n${exc.stack}${backticks}\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;
-    }
+        box.show_all();
+        return box;
+    },
 
     _buildUI(app) {
         this._window = new Gtk.ApplicationWindow({ application: app,
@@ -224,12 +150,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));
@@ -237,8 +159,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]) => {
@@ -247,13 +167,13 @@ var Application = class {
         });
 
         this._window.show_all();
-    }
+    },
 
     _sortList(row1, row2) {
         let name1 = ExtensionUtils.extensions[row1.uuid].metadata.name;
         let name2 = ExtensionUtils.extensions[row2.uuid].metadata.name;
         return name1.localeCompare(name2);
-    }
+    },
 
     _updateHeader(row, before) {
         if (!before || row.get_header())
@@ -261,14 +181,14 @@ var Application = class {
 
         let sep = new Gtk.Separator({ orientation: Gtk.Orientation.HORIZONTAL });
         row.set_header(sep);
-    }
+    },
 
     _scanExtensions() {
         let finder = new ExtensionUtils.ExtensionFinder();
         finder.connect('extension-found', this._extensionFound.bind(this));
         finder.scanExtensions();
         this._extensionsLoaded();
-    }
+    },
 
     _extensionFound(finder, extension) {
         let row = new ExtensionRow(extension.uuid);
@@ -280,29 +200,24 @@ var Application = class {
 
         row.show_all();
         this._extensionSelector.add(row);
-    }
+    },
 
     _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;
         this._skipMainWindow = false;
         this._loaded = true;
-    }
+    },
 
     _onActivate() {
         this._window.present();
-    }
+    },
 
     _onStartup(app) {
         this._buildUI(app);
         this._scanExtensions();
-    }
+    },
 
     _onCommandLine(app, commandLine) {
         app.activate();
@@ -325,187 +240,26 @@ var Application = class {
         }
         return 0;
     }
-};
-
-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
-        });
+var DescriptionLabel = new Lang.Class({
+    Name: 'DescriptionLabel',
+    Extends: Gtk.Label,
 
-        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) {
         // Hack: Request the maximum height allowed by the line limit
         if (this.lines > 0)
-            return super.vfunc_get_preferred_height_for_width(0);
-        return super.vfunc_get_preferred_height_for_width(width);
+            return this.parent(0);
+        return this.parent(width);
     }
 });
 
-var ExtensionRow = GObject.registerClass(
-class ExtensionRow extends Gtk.ListBoxRow {
+var ExtensionRow = new Lang.Class({
+    Name: 'ExtensionRow',
+    Extends: Gtk.ListBoxRow,
+
     _init(uuid) {
-        super._init();
+        this.parent();
 
         this.uuid = uuid;
 
@@ -523,7 +277,7 @@ class ExtensionRow extends Gtk.ListBoxRow {
             });
 
         this._buildUI();
-    }
+    },
 
     _buildUI() {
         let extension = ExtensionUtils.extensions[this.uuid];
@@ -551,9 +305,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',
-                                         icon_size: Gtk.IconSize.BUTTON,
-                                         visible: true }));
+        button.add(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
+                                   icon_size: Gtk.IconSize.BUTTON,
+                                   visible: true }));
         button.get_style_context().add_class('circular');
         hbox.add(button);
 
@@ -570,7 +324,7 @@ class ExtensionRow extends Gtk.ListBoxRow {
         });
         this._switch.connect('state-set', () => true);
         hbox.add(this._switch);
-    }
+    },
 
     _canEnable() {
         let extension = ExtensionUtils.extensions[this.uuid];
@@ -578,12 +332,12 @@ class ExtensionRow extends Gtk.ListBoxRow {
 
         return !this._settings.get_boolean('disable-user-extensions') &&
                !(checkVersion && ExtensionUtils.isOutOfDate(extension));
-    }
+    },
 
     _isEnabled() {
         let extensions = this._settings.get_strv('enabled-extensions');
         return extensions.indexOf(this.uuid) != -1;
-    }
+    },
 
     _enable() {
         let extensions = this._settings.get_strv('enabled-extensions');
@@ -592,7 +346,7 @@ class ExtensionRow extends Gtk.ListBoxRow {
 
         extensions.push(this.uuid);
         this._settings.set_strv('enabled-extensions', extensions);
-    }
+    },
 
     _disable() {
         let extensions = this._settings.get_strv('enabled-extensions');

js/gdm/authPrompt.js

@@ -1,7 +1,11 @@
 // -*- 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 Lang = imports.lang;
+const Pango = imports.gi.Pango;
 const Signals = imports.signals;
+const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const Batch = imports.gdm.batch;
@@ -34,8 +38,10 @@ var BeginRequestType = {
     DONT_PROVIDE_USERNAME: 1
 };
 
-var AuthPrompt = class {
-    constructor(gdmClient, mode) {
+var AuthPrompt = new Lang.Class({
+    Name: 'AuthPrompt',
+
+    _init(gdmClient, mode) {
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
 
         this._gdmClient = gdmClient;
@@ -93,7 +99,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,
@@ -121,16 +127,17 @@ var AuthPrompt = class {
 
         this._initButtons();
 
-        this._spinner = new Animation.Spinner(DEFAULT_BUTTON_WELL_ICON_SIZE);
+        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
+        this._spinner = new Animation.AnimatedIcon(spinnerIcon, DEFAULT_BUTTON_WELL_ICON_SIZE);
         this._spinner.actor.opacity = 0;
         this._spinner.actor.show();
         this._defaultButtonWell.add_child(this._spinner.actor);
-    }
+    },
 
     _onDestroy() {
         this._userVerifier.destroy();
         this._userVerifier = null;
-    }
+    },
 
     _initButtons() {
         this.cancelButton = new St.Button({ style_class: 'modal-dialog-button button',
@@ -178,7 +185,7 @@ var AuthPrompt = class {
             if (this.nextButton.reactive)
                 this.emit('next');
         });
-    }
+    },
 
     _onAskQuestion(verifier, serviceName, question, passwordChar) {
         if (this._queryingService)
@@ -204,12 +211,12 @@ var AuthPrompt = class {
 
         this.updateSensitivity(true);
         this.emit('prompted');
-    }
+    },
 
     _onOVirtUserAuthenticated() {
         if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
             this.reset();
-    }
+    },
 
     _onSmartcardStatusChanged() {
         this.smartcardDetected = this._userVerifier.smartcardDetected;
@@ -228,12 +235,12 @@ var AuthPrompt = class {
 
         if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
             this.reset();
-    }
+    },
 
     _onShowMessage(userVerifier, message, type) {
         this.setMessage(message, type);
         this.emit('prompted');
-    }
+    },
 
     _onVerificationFailed(userVerifier, canRetry) {
         this._queryingService = null;
@@ -242,22 +249,22 @@ var AuthPrompt = class {
         this.updateSensitivity(canRetry);
         this.setActorInDefaultButtonWell(null);
         this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
-    }
+    },
 
     _onVerificationComplete() {
         this.setActorInDefaultButtonWell(null);
         this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
         this.cancelButton.reactive = false;
-    }
+    },
 
     _onReset() {
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
         this.reset();
-    }
+    },
 
     addActorToDefaultButtonWell(actor) {
         this._defaultButtonWell.add_child(actor);
-    }
+    },
 
     setActorInDefaultButtonWell(actor, animate) {
         if (!this._defaultButtonWellActor &&
@@ -321,25 +328,25 @@ var AuthPrompt = class {
         }
 
         this._defaultButtonWellActor = actor;
-    }
+    },
 
     startSpinning() {
         this.setActorInDefaultButtonWell(this._spinner.actor, true);
-    }
+    },
 
     stopSpinning() {
         this.setActorInDefaultButtonWell(null, false);
-    }
+    },
 
     clear() {
         this._entry.text = '';
         this.stopSpinning();
-    }
+    },
 
     setPasswordChar(passwordChar) {
         this._entry.clutter_text.set_password_char(passwordChar);
         this._entry.menu.isPassword = passwordChar != '';
-    }
+    },
 
     setQuestion(question) {
         this._label.set_text(question);
@@ -348,7 +355,7 @@ var AuthPrompt = class {
         this._entry.show();
 
         this._entry.grab_key_focus();
-    }
+    },
 
     getAnswer() {
         let text;
@@ -361,7 +368,7 @@ var AuthPrompt = class {
         }
 
         return text;
-    }
+    },
 
     _fadeOutMessage() {
         if (this._message.opacity == 0)
@@ -372,7 +379,7 @@ var AuthPrompt = class {
                            time: MESSAGE_FADE_OUT_ANIMATION_TIME,
                            transition: 'easeOutQuad'
                          });
-    }
+    },
 
     setMessage(message, type) {
         if (type == GdmUtil.MessageType.ERROR)
@@ -392,18 +399,18 @@ var AuthPrompt = class {
         } else {
             this._message.opacity = 0;
         }
-    }
+    },
 
     _updateNextButtonSensitivity(sensitive) {
         this.nextButton.reactive = sensitive;
         this.nextButton.can_focus = sensitive;
-    }
+    },
 
     updateSensitivity(sensitive) {
         this._updateNextButtonSensitivity(sensitive && (this._entry.text.length > 0 || this.verificationStatus == AuthPromptStatus.VERIFYING));
         this._entry.reactive = sensitive;
         this._entry.clutter_text.editable = sensitive;
-    }
+    },
 
     hide() {
         this.setActorInDefaultButtonWell(null, true);
@@ -414,7 +421,7 @@ var AuthPrompt = class {
 
         this.updateSensitivity(true);
         this._entry.set_text('');
-    }
+    },
 
     setUser(user) {
         let oldChild = this._userWell.get_child();
@@ -425,7 +432,7 @@ var AuthPrompt = class {
             let userWidget = new UserWidget.UserWidget(user);
             this._userWell.set_child(userWidget.actor);
         }
-    }
+    },
 
     reset() {
         let oldStatus = this.verificationStatus;
@@ -463,7 +470,7 @@ var AuthPrompt = class {
         }
 
         this.emit('reset', beginRequestType);
-    }
+    },
 
     addCharacter(unichar) {
         if (!this._entry.visible)
@@ -471,7 +478,7 @@ var AuthPrompt = class {
 
         this._entry.grab_key_focus();
         this._entry.clutter_text.insert_unichar(unichar);
-    }
+    },
 
     begin(params) {
         params = Params.parse(params, { userName: null,
@@ -485,7 +492,7 @@ var AuthPrompt = class {
 
         this._userVerifier.begin(params.userName, hold);
         this.verificationStatus = AuthPromptStatus.VERIFYING;
-    }
+    },
 
     finish(onComplete) {
         if (!this._userVerifier.hasPendingMessages) {
@@ -499,7 +506,7 @@ var AuthPrompt = class {
             this._userVerifier.clear();
             onComplete();
         });
-    }
+    },
 
     cancel() {
         if (this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED) {
@@ -508,5 +515,5 @@ var AuthPrompt = class {
         this.reset();
         this.emit('cancelled');
     }
-};
+});
 Signals.addSignalMethods(AuthPrompt.prototype);

js/gdm/batch.js

@@ -44,39 +44,45 @@
  * replaced by something else.
  */
 
+const Lang = imports.lang;
 const Signals = imports.signals;
 
-var Task = class {
-    constructor(scope, handler) {
+var Task = new Lang.Class({
+    Name: 'Task',
+
+    _init(scope, handler) {
         if (scope)
             this.scope = scope;
         else
             this.scope = this;
 
         this.handler = handler;
-    }
+    },
 
     run() {
         if (this.handler)
             return this.handler.call(this.scope);
 
         return null;
-    }
-};
+    },
+});
 Signals.addSignalMethods(Task.prototype);
 
-var Hold = class extends Task {
-    constructor() {
-        super(null, () => this);
+var Hold = new Lang.Class({
+    Name: 'Hold',
+    Extends: Task,
+
+    _init() {
+        this.parent(this, () => this);
 
         this._acquisitions = 1;
-    }
+    },
 
     acquire() {
         if (this._acquisitions <= 0)
             throw new Error("Cannot acquire hold after it's been released");
         this._acquisitions++;
-    }
+    },
 
     acquireUntilAfter(hold) {
         if (!hold.isAcquired())
@@ -87,24 +93,27 @@ var Hold = class extends Task {
             hold.disconnect(signalId);
             this.release();
         });
-    }
+    },
 
     release() {
         this._acquisitions--;
 
         if (this._acquisitions == 0)
             this.emit('release');
-    }
+    },
 
     isAcquired() {
         return this._acquisitions > 0;
     }
-};
+});
 Signals.addSignalMethods(Hold.prototype);
 
-var Batch = class extends Task {
-    constructor(scope, tasks) {
-        super();
+var Batch = new Lang.Class({
+    Name: 'Batch',
+    Extends: Task,
+
+    _init(scope, tasks) {
+        this.parent();
 
         this.tasks = [];
 
@@ -121,11 +130,11 @@ var Batch = class extends Task {
 
             this.tasks.push(task);
         }
-    }
+    },
 
     process() {
         throw new Error('Not implemented');
-    }
+    },
 
     runTask() {
         if (!(this._currentTaskIndex in this.tasks)) {
@@ -133,11 +142,11 @@ var Batch = class extends Task {
         }
 
         return this.tasks[this._currentTaskIndex].run();
-    }
+    },
 
     _finish() {
         this.hold.release();
-    }
+    },
 
     nextTask() {
         this._currentTaskIndex++;
@@ -150,7 +159,7 @@ var Batch = class extends Task {
         }
 
         this.process();
-    }
+    },
 
     _start() {
         // acquire a hold to get released when the entire
@@ -158,7 +167,7 @@ var Batch = class extends Task {
         this.hold = new Hold();
         this._currentTaskIndex = 0;
         this.process();
-    }
+    },
 
     run() {
         this._start();
@@ -166,15 +175,18 @@ var Batch = class extends Task {
         // hold may be destroyed at this point
         // if we're already done running
         return this.hold;
-    }
+    },
 
     cancel() {
         this.tasks = this.tasks.splice(0, this._currentTaskIndex + 1);
     }
-};
+});
 Signals.addSignalMethods(Batch.prototype);
 
-var ConcurrentBatch = class extends Batch {
+var ConcurrentBatch = new Lang.Class({
+    Name: 'ConcurrentBatch',
+    Extends: Batch,
+
     process() {
        let hold = this.runTask();
 
@@ -187,10 +199,13 @@ var ConcurrentBatch = class extends Batch {
        // concurrently.
        this.nextTask();
     }
-};
+});
 Signals.addSignalMethods(ConcurrentBatch.prototype);
 
-var ConsecutiveBatch = class extends Batch {
+var ConsecutiveBatch = new Lang.Class({
+    Name: 'ConsecutiveBatch',
+    Extends: Batch,
+
     process() {
        let hold = this.runTask();
 
@@ -207,5 +222,5 @@ var ConsecutiveBatch = class extends Batch {
            this.nextTask();
        }
     }
-};
+});
 Signals.addSignalMethods(ConsecutiveBatch.prototype);

js/gdm/fingerprint.js

@@ -1,6 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
 
 const FprintManagerIface = `
 <node>

js/gdm/loginDialog.js

@@ -16,9 +16,20 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-const { AccountsService, Atk, Clutter, Gdm, Gio,
-        GLib, GObject, Meta, Pango, Shell, St } = imports.gi;
+const AccountsService = imports.gi.AccountsService;
+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 Lang = imports.lang;
+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;
@@ -39,8 +50,10 @@ const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
 const _LOGO_ICON_HEIGHT = 48;
 const _MAX_BOTTOM_MENU_ITEMS = 5;
 
-var UserListItem = class {
-    constructor(user) {
+var UserListItem = new Lang.Class({
+    Name: 'UserListItem',
+
+    _init(user) {
         this.user = user;
         this._userChangedId = this.user.connect('changed',
                                                  this._onUserChanged.bind(this));
@@ -78,26 +91,26 @@ var UserListItem = class {
 
         this.actor.connect('clicked', this._onClicked.bind(this));
         this._onUserChanged();
-    }
+    },
 
     _onUserChanged() {
         this._updateLoggedIn();
-    }
+    },
 
     _updateLoggedIn() {
         if (this.user.is_logged_in())
             this.actor.add_style_pseudo_class('logged-in');
         else
             this.actor.remove_style_pseudo_class('logged-in');
-    }
+    },
 
     _onDestroy() {
         this.user.disconnect(this._userChangedId);
-    }
+    },
 
     _onClicked() {
         this.emit('activate');
-    }
+    },
 
     _setSelected(selected) {
         if (selected) {
@@ -106,7 +119,7 @@ var UserListItem = class {
         } else {
             this.actor.remove_style_pseudo_class('selected');
         }
-    }
+    },
 
     showTimedLoginIndicator(time) {
         let hold = new Batch.Hold();
@@ -134,7 +147,7 @@ var UserListItem = class {
         GLib.Source.set_name_by_id(this._timedLoginTimeoutId, '[gnome-shell] this._timedLoginTimeoutId');
 
         return hold;
-    }
+    },
 
     hideTimedLoginIndicator() {
         if (this._timedLoginTimeoutId) {
@@ -145,14 +158,16 @@ var UserListItem = class {
         this._timedLoginIndicator.visible = false;
         this._timedLoginIndicator.scale_x = 0.;
     }
-};
+});
 Signals.addSignalMethods(UserListItem.prototype);
 
-var UserList = class {
-    constructor() {
+var UserList = new Lang.Class({
+    Name: 'UserList',
+
+    _init() {
         this.actor = new St.ScrollView({ style_class: 'login-dialog-user-list-view'});
-        this.actor.set_policy(St.PolicyType.NEVER,
-                              St.PolicyType.AUTOMATIC);
+        this.actor.set_policy(Gtk.PolicyType.NEVER,
+                              Gtk.PolicyType.AUTOMATIC);
 
         this._box = new St.BoxLayout({ vertical: true,
                                        style_class: 'login-dialog-user-list',
@@ -162,7 +177,7 @@ var UserList = class {
         this._items = {};
 
         this.actor.connect('key-focus-in', this._moveFocusToItems.bind(this));
-    }
+    },
 
     _moveFocusToItems() {
         let hasItems = Object.keys(this._items).length > 0;
@@ -173,18 +188,18 @@ 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();
                 return false;
             });
         }
-    }
+    },
 
     _onItemActivated(activatedItem) {
         this.emit('activate', activatedItem);
-    }
+    },
 
     updateStyle(isExpanded) {
         let tasks = [];
@@ -198,7 +213,7 @@ var UserList = class {
             let item = this._items[userName];
             item.actor.sync_hover();
         }
-    }
+    },
 
     scrollToItem(item) {
         let box = item.actor.get_allocation_box();
@@ -211,7 +226,7 @@ var UserList = class {
                           { value: value,
                             time: _SCROLL_ANIMATION_TIME,
                             transition: 'easeOutQuad' });
-    }
+    },
 
     jumpToItem(item) {
         let box = item.actor.get_allocation_box();
@@ -221,7 +236,7 @@ var UserList = class {
         let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
 
         adjustment.set_value(value);
-    }
+    },
 
     getItemFromUserName(userName) {
         let item = this._items[userName];
@@ -230,11 +245,11 @@ var UserList = class {
             return null;
 
         return item;
-    }
+    },
 
     containsUser(user) {
         return this._items[user.get_user_name()] != null;
-    }
+    },
 
     addUser(user) {
         if (!user.is_loaded)
@@ -266,7 +281,7 @@ var UserList = class {
         this._moveFocusToItems();
 
         this.emit('item-added', item);
-    }
+    },
 
     removeUser(user) {
         if (!user.is_loaded)
@@ -284,16 +299,18 @@ var UserList = class {
 
         item.actor.destroy();
         delete this._items[userName];
-    }
+    },
 
     numItems() {
         return Object.keys(this._items).length;
     }
-};
+});
 Signals.addSignalMethods(UserList.prototype);
 
-var SessionMenuButton = class {
-    constructor() {
+var SessionMenuButton = new Lang.Class({
+    Name: 'SessionMenuButton',
+
+    _init() {
         let gearIcon = new St.Icon({ icon_name: 'emblem-system-symbolic' });
         this._button = new St.Button({ style_class: 'login-dialog-session-list-button',
                                        reactive: true,
@@ -325,8 +342,7 @@ var SessionMenuButton = class {
                  this._button.remove_style_pseudo_class('active');
         });
 
-        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button },
-                                                       { actionMode: Shell.ActionMode.NONE });
+        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button });
         this._manager.addMenu(this._menu);
 
         this._button.connect('clicked', () => { this._menu.toggle(); });
@@ -334,13 +350,13 @@ var SessionMenuButton = class {
         this._items = {};
         this._activeSessionId = null;
         this._populate();
-    }
+    },
 
     updateSensitivity(sensitive) {
         this._button.reactive = sensitive;
         this._button.can_focus = sensitive;
         this._menu.close(BoxPointer.PopupAnimation.NONE);
-    }
+    },
 
     _updateOrnament() {
         let itemIds = Object.keys(this._items);
@@ -350,7 +366,7 @@ var SessionMenuButton = class {
             else
                 this._items[itemIds[i]].setOrnament(PopupMenu.Ornament.NONE);
         }
-    }
+    },
 
     setActiveSession(sessionId) {
          if (sessionId == this._activeSessionId)
@@ -358,11 +374,11 @@ var SessionMenuButton = class {
 
          this._activeSessionId = sessionId;
          this._updateOrnament();
-    }
+    },
 
     close() {
         this._menu.close();
-    }
+    },
 
     _populate() {
         let ids = Gdm.get_session_ids();
@@ -387,21 +403,21 @@ var SessionMenuButton = class {
             });
         }
     }
-};
+});
 Signals.addSignalMethods(SessionMenuButton.prototype);
 
-var LoginDialog = GObject.registerClass({
-    Signals: { 'failed': {} },
-}, class LoginDialog extends St.Widget {
+var LoginDialog = new Lang.Class({
+    Name: 'LoginDialog',
+
     _init(parentActor) {
-        super._init({ style_class: 'login-dialog',
-                      visible: false });
+        this.actor = new Shell.GenericContainer({ style_class: 'login-dialog',
+                                                  visible: false });
+        this.actor.get_accessible().set_role(Atk.Role.WINDOW);
 
-        this.get_accessible().set_role(Atk.Role.WINDOW);
-
-        this.add_constraint(new Layout.MonitorConstraint({ primary: true }));
-        this.connect('destroy', this._onDestroy.bind(this));
-        parentActor.add_child(this);
+        this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
+        this.actor.connect('allocate', this._onAllocate.bind(this));
+        this.actor.connect('destroy', this._onDestroy.bind(this));
+        parentActor.add_child(this.actor);
 
         this._userManager = AccountsService.UserManager.get_default()
         this._gdmClient = new Gdm.Client();
@@ -426,7 +442,7 @@ var LoginDialog = GObject.registerClass({
                                                     y_align: Clutter.ActorAlign.CENTER,
                                                     vertical: true,
                                                     visible: false });
-        this.add_child(this._userSelectionBox);
+        this.actor.add_child(this._userSelectionBox);
 
         this._userList = new UserList();
         this._userSelectionBox.add(this._userList.actor,
@@ -438,7 +454,7 @@ var LoginDialog = GObject.registerClass({
         this._authPrompt.connect('prompted', this._onPrompted.bind(this));
         this._authPrompt.connect('reset', this._onReset.bind(this));
         this._authPrompt.hide();
-        this.add_child(this._authPrompt.actor);
+        this.actor.add_child(this._authPrompt.actor);
 
         // translators: this message is shown below the user list on the
         // login screen. It can be activated to reveal an entry for
@@ -464,9 +480,9 @@ var LoginDialog = GObject.registerClass({
 
         this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',
                                                opacity: 0,
-                                               vscrollbar_policy: St.PolicyType.AUTOMATIC,
-                                               hscrollbar_policy: St.PolicyType.NEVER });
-        this.add_child(this._bannerView);
+                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,
+                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
+        this.actor.add_child(this._bannerView);
 
         let bannerBox = new St.BoxLayout({ vertical: true });
 
@@ -481,10 +497,7 @@ 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.actor.add_child(this._logoBin);
         this._updateLogo();
 
         this._userList.connect('activate', (userList, item) => {
@@ -515,7 +528,7 @@ var LoginDialog = GObject.registerClass({
         // focus later
         this._startupCompleteId = Main.layoutManager.connect('startup-complete',
                                                              this._updateDisableUserList.bind(this));
-    }
+    },
 
     _getBannerAllocation(dialogBox) {
         let actorBox = new Clutter.ActorBox();
@@ -529,7 +542,7 @@ var LoginDialog = GObject.registerClass({
         actorBox.y2 = actorBox.y1 + natHeight;
 
         return actorBox;
-    }
+    },
 
     _getLogoBinAllocation(dialogBox) {
         let actorBox = new Clutter.ActorBox();
@@ -543,7 +556,7 @@ var LoginDialog = GObject.registerClass({
         actorBox.y2 = actorBox.y1 + natHeight;
 
         return actorBox;
-    }
+    },
 
     _getCenterActorAllocation(dialogBox, actor) {
         let actorBox = new Clutter.ActorBox();
@@ -561,14 +574,9 @@ var LoginDialog = GObject.registerClass({
         actorBox.y2 = actorBox.y1 + natHeight;
 
         return actorBox;
-    }
-
-    vfunc_allocate(dialogBox, flags) {
-        this.set_allocation(dialogBox, flags);
-
-        let themeNode = this.get_theme_node();
-        dialogBox = themeNode.get_content_box(dialogBox);
+    },
 
+    _onAllocate(actor, dialogBox, flags) {
         let dialogWidth = dialogBox.x2 - dialogBox.x1;
         let dialogHeight = dialogBox.y2 - dialogBox.y1;
 
@@ -704,7 +712,7 @@ var LoginDialog = GObject.registerClass({
 
         if (logoAllocation)
             this._logoBin.allocate(logoAllocation, flags);
-    }
+    },
 
     _ensureUserListLoaded() {
         if (!this._userManager.is_loaded) {
@@ -720,7 +728,7 @@ var LoginDialog = GObject.registerClass({
             let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, this._loadUserList.bind(this));
             GLib.Source.set_name_by_id(id, '[gnome-shell] _loadUserList');
         }
-    }
+    },
 
     _updateDisableUserList() {
         let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY);
@@ -735,7 +743,7 @@ var LoginDialog = GObject.registerClass({
             if (this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
                 this._authPrompt.reset();
         }
-    }
+    },
 
     _updateCancelButton() {
         let cancelVisible;
@@ -748,7 +756,7 @@ var LoginDialog = GObject.registerClass({
             cancelVisible = true;
 
         this._authPrompt.cancelButton.visible = cancelVisible;
-    }
+    },
 
     _updateBanner() {
         let enabled = this._settings.get_boolean(GdmUtil.BANNER_MESSAGE_KEY);
@@ -760,7 +768,7 @@ var LoginDialog = GObject.registerClass({
         } else {
             this._bannerLabel.hide();
         }
-    }
+    },
 
     _fadeInBannerView() {
         this._bannerView.show();
@@ -768,34 +776,33 @@ var LoginDialog = GObject.registerClass({
                          { opacity: 255,
                            time: _FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad' });
-    }
+    },
 
     _hideBannerView() {
         Tweener.removeTweens(this._bannerView);
         this._bannerView.opacity = 0;
         this._bannerView.hide();
-    }
+    },
 
     _updateLogoTexture(cache, file) {
         if (this._logoFile && !this._logoFile.equal(file))
             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,
-                                                                       this._logoBin.resource_scale));
+                                                                       scaleFactor));
         }
-    }
+    },
 
     _updateLogo() {
         let path = this._settings.get_string(GdmUtil.LOGO_KEY);
 
         this._logoFile = path ? Gio.file_new_for_path(path) : null;
         this._updateLogoTexture(this._textureCache, this._logoFile);
-    }
+    },
 
     _onPrompted() {
         if (this._shouldShowSessionMenuButton()) {
@@ -805,7 +812,7 @@ var LoginDialog = GObject.registerClass({
             this._sessionMenuButton.updateSensitivity(false);
         }
         this._showPrompt();
-    }
+    },
 
     _resetGreeterProxy() {
         if (GLib.getenv('GDM_GREETER_TEST') != '1') {
@@ -821,7 +828,7 @@ var LoginDialog = GObject.registerClass({
             this._timedLoginRequestedId = this._greeter.connect('timed-login-requested',
                                                                 this._onTimedLoginRequested.bind(this));
         }
-    }
+    },
 
     _onReset(authPrompt, beginRequest) {
         this._resetGreeterProxy();
@@ -842,11 +849,11 @@ var LoginDialog = GObject.registerClass({
         } else {
             this._hideUserListAndBeginVerification();
         }
-    }
+    },
 
     _onDefaultSessionChanged(client, sessionId) {
         this._sessionMenuButton.setActiveSession(sessionId);
-    }
+    },
 
     _shouldShowSessionMenuButton() {
         if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFYING &&
@@ -857,7 +864,7 @@ var LoginDialog = GObject.registerClass({
           return false;
 
         return true;
-    }
+    },
 
     _showPrompt() {
         if (this._authPrompt.actor.visible)
@@ -869,7 +876,7 @@ var LoginDialog = GObject.registerClass({
                            time: _FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad' });
         this._fadeInBannerView();
-    }
+    },
 
     _showRealmLoginHint(realmManager, hint) {
         if (!hint)
@@ -882,7 +889,7 @@ var LoginDialog = GObject.registerClass({
         // Translators: this message is shown below the username entry field
         // to clue the user in on how to login to the local network realm
         this._authPrompt.setMessage(_("(e.g., user or %s)").format(hint), GdmUtil.MessageType.HINT);
-    }
+    },
 
     _askForUsernameAndBeginVerification() {
         this._authPrompt.setPasswordChar('');
@@ -909,13 +916,13 @@ var LoginDialog = GObject.registerClass({
         this._sessionMenuButton.updateSensitivity(false);
         this._authPrompt.updateSensitivity(true);
         this._showPrompt();
-    }
+    },
 
     _loginScreenSessionActivated() {
-        if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+        if (this.actor.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
             return;
 
-        Tweener.addTween(this,
+        Tweener.addTween(this.actor,
                          { opacity: 255,
                            time: _FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad',
@@ -924,7 +931,7 @@ var LoginDialog = GObject.registerClass({
 
                                for (let i = 0; i < children.length; i++) {
                                    if (children[i] != Main.layoutManager.screenShieldGroup)
-                                       children[i].opacity = this.opacity;
+                                       children[i].opacity = this.actor.opacity;
                                }
                            },
                            onUpdateScope: this,
@@ -933,7 +940,7 @@ var LoginDialog = GObject.registerClass({
                                    this._authPrompt.reset();
                            },
                            onCompleteScope: this });
-    }
+    },
 
     _gotGreeterSessionProxy(proxy) {
         this._greeterSessionProxy = proxy;
@@ -942,10 +949,10 @@ var LoginDialog = GObject.registerClass({
                 if (proxy.Active)
                     this._loginScreenSessionActivated();
             });
-    }
+    },
 
     _startSession(serviceName) {
-        Tweener.addTween(this,
+        Tweener.addTween(this.actor,
                          { opacity: 0,
                            time: _FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad',
@@ -954,7 +961,7 @@ var LoginDialog = GObject.registerClass({
 
                                for (let i = 0; i < children.length; i++) {
                                    if (children[i] != Main.layoutManager.screenShieldGroup)
-                                       children[i].opacity = this.opacity;
+                                       children[i].opacity = this.actor.opacity;
                                }
                            },
                            onUpdateScope: this,
@@ -962,11 +969,11 @@ var LoginDialog = GObject.registerClass({
                                this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
                            },
                            onCompleteScope: this });
-    }
+    },
 
     _onSessionOpened(client, serviceName) {
         this._authPrompt.finish(() => { this._startSession(serviceName); });
-    }
+    },
 
     _waitForItemForUser(userName) {
         let item = this._userList.getItemFromUserName(userName);
@@ -986,7 +993,7 @@ var LoginDialog = GObject.registerClass({
         hold.connect('release', () => { this._userList.disconnect(signalId); });
 
         return hold;
-    }
+    },
 
     _blockTimedLoginUntilIdle() {
         let hold = new Batch.Hold();
@@ -999,7 +1006,7 @@ var LoginDialog = GObject.registerClass({
             });
         GLib.Source.set_name_by_id(this._timedLoginIdleTimeOutId, '[gnome-shell] this._timedLoginIdleTimeOutId');
         return hold;
-    }
+    },
 
     _startTimedLogin(userName, delay) {
         let firstRun = true;
@@ -1072,7 +1079,7 @@ var LoginDialog = GObject.registerClass({
         this._timedLoginBatch = new Batch.ConsecutiveBatch(this, tasks);
 
         return this._timedLoginBatch.run();
-    }
+    },
 
     _onTimedLoginRequested(client, userName, seconds) {
         if (this._timedLoginBatch)
@@ -1089,28 +1096,28 @@ var LoginDialog = GObject.registerClass({
 
            return Clutter.EVENT_PROPAGATE;
         });
-    }
+    },
 
     _setUserListExpanded(expanded) {
         this._userList.updateStyle(expanded);
         this._userSelectionBox.visible = expanded;
-    }
+    },
 
     _hideUserList() {
         this._setUserListExpanded(false);
         if (this._userSelectionBox.visible)
             GdmUtil.cloneAndFadeOutActor(this._userSelectionBox);
-    }
+    },
 
     _hideUserListAskForUsernameAndBeginVerification() {
         this._hideUserList();
         this._askForUsernameAndBeginVerification();
-    }
+    },
 
     _hideUserListAndBeginVerification() {
         this._hideUserList();
         this._authPrompt.begin();
-    }
+    },
 
     _showUserList() {
         this._ensureUserListLoaded();
@@ -1120,7 +1127,7 @@ var LoginDialog = GObject.registerClass({
         this._setUserListExpanded(true);
         this._notListedButton.show();
         this._userList.actor.grab_key_focus();
-    }
+    },
 
     _beginVerificationForItem(item) {
         this._authPrompt.setUser(item.user);
@@ -1131,7 +1138,7 @@ var LoginDialog = GObject.registerClass({
         this._authPrompt.begin({ userName: userName,
                                  hold: hold });
         return hold;
-    }
+    },
 
     _onUserListActivated(activatedItem) {
         this._user = activatedItem.user;
@@ -1141,7 +1148,7 @@ var LoginDialog = GObject.registerClass({
         let batch = new Batch.ConcurrentBatch(this, [GdmUtil.cloneAndFadeOutActor(this._userSelectionBox),
                                                      this._beginVerificationForItem(activatedItem)]);
         batch.run();
-    }
+    },
 
     _onDestroy() {
         if (this._userManagerLoadedId) {
@@ -1182,7 +1189,7 @@ var LoginDialog = GObject.registerClass({
             this._realmManager.release();
             this._realmManager = null;
         }
-    }
+    },
 
     _loadUserList() {
         if (this._userListLoaded)
@@ -1220,41 +1227,42 @@ var LoginDialog = GObject.registerClass({
             });
 
         return GLib.SOURCE_REMOVE;
-    }
+    },
 
     open() {
-        Main.ctrlAltTabManager.addGroup(this,
+        Main.ctrlAltTabManager.addGroup(this.actor,
                                         _("Login Window"),
                                         'dialog-password-symbolic',
                                         { sortGroup: CtrlAltTab.SortGroup.MIDDLE });
         this._userList.actor.grab_key_focus();
-        this.show();
-        this.opacity = 0;
+        this.actor.show();
+        this.actor.opacity = 0;
 
-        Main.pushModal(this, { actionMode: Shell.ActionMode.LOGIN_SCREEN });
+        Main.pushModal(this.actor, { actionMode: Shell.ActionMode.LOGIN_SCREEN });
 
-        Tweener.addTween(this,
+        Tweener.addTween(this.actor,
                          { opacity: 255,
                            time: 1,
                            transition: 'easeInQuad' });
 
         return true;
-    }
+    },
 
     close() {
-        Main.popModal(this);
-        Main.ctrlAltTabManager.removeGroup(this);
-    }
+        Main.popModal(this.actor);
+        Main.ctrlAltTabManager.removeGroup(this.actor);
+    },
 
     cancel() {
         this._authPrompt.cancel();
-    }
+    },
 
     addCharacter(unichar) {
         // Don't allow type ahead at the login screen
-    }
+    },
 
     finish(onComplete) {
         this._authPrompt.finish(onComplete);
-    }
+    },
 });
+Signals.addSignalMethods(LoginDialog.prototype);

js/gdm/oVirt.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
+const Lang = imports.lang;
 const Signals = imports.signals;
 
 const OVirtCredentialsIface = `
@@ -27,32 +28,33 @@ function OVirtCredentials() {
     return self;
 }
 
-var OVirtCredentialsManager = class {
-    constructor() {
+var OVirtCredentialsManager = new Lang.Class({
+    Name: 'OVirtCredentialsManager',
+    _init() {
         this._token = null;
 
         this._credentials = new OVirtCredentials();
         this._credentials.connectSignal('UserAuthenticated',
                                         this._onUserAuthenticated.bind(this));
-    }
+    },
 
     _onUserAuthenticated(proxy, sender, [token]) {
         this._token = token;
         this.emit('user-authenticated', token);
-    }
+    },
 
     hasToken() {
         return this._token != null;
-    }
+    },
 
     getToken() {
         return this._token;
-    }
+    },
 
     resetToken() {
         this._token = null;
     }
-};
+});
 Signals.addSignalMethods(OVirtCredentialsManager.prototype);
 
 function getOVirtCredentialsManager() {

js/gdm/realmd.js

@@ -1,6 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
@@ -14,8 +16,10 @@ const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface);
 const RealmIface = loadInterfaceXML("org.freedesktop.realmd.Realm");
 const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface);
 
-var Manager = class {
-    constructor(parentActor) {
+var Manager = new Lang.Class({
+    Name: 'Manager',
+
+    _init(parentActor) {
         this._aggregateProvider = Provider(Gio.DBus.system,
                                            'org.freedesktop.realmd',
                                            '/org/freedesktop/realmd',
@@ -27,7 +31,7 @@ var Manager = class {
                 if ('Realms' in properties.deep_unpack())
                     this._reloadRealms();
             });
-    }
+    },
 
     _reloadRealms() {
         let realmPaths = this._aggregateProvider.Realms;
@@ -41,7 +45,7 @@ var Manager = class {
                               realmPaths[i],
                               this._onRealmLoaded.bind(this));
         }
-    }
+    },
 
     _reloadRealm(realm) {
         if (!realm.Configured) {
@@ -54,7 +58,7 @@ var Manager = class {
         this._realms[realm.get_object_path()] = realm;
 
         this._updateLoginFormat();
-    }
+    },
 
     _onRealmLoaded(realm, error) {
         if (error)
@@ -66,7 +70,7 @@ var Manager = class {
             if ('Configured' in properties.deep_unpack())
                 this._reloadRealm(realm);
         });
-    }
+    },
 
     _updateLoginFormat() {
         let newLoginFormat;
@@ -83,7 +87,7 @@ var Manager = class {
             this._loginFormat = newLoginFormat;
             this.emit('login-format-changed', newLoginFormat);
         }
-    }
+    },
 
     get loginFormat() {
         if (this._loginFormat !== undefined)
@@ -92,7 +96,7 @@ var Manager = class {
         this._updateLoginFormat();
 
         return this._loginFormat;
-    }
+    },
 
     release() {
         Service(Gio.DBus.system,
@@ -103,5 +107,5 @@ var Manager = class {
         this._realms = { };
         this._updateLoginFormat();
     }
-};
+});
 Signals.addSignalMethods(Manager.prototype)

js/gdm/util.js

@@ -1,13 +1,19 @@
 // -*- 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 Lang = imports.lang;
+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;
 
@@ -113,8 +119,10 @@ function cloneAndFadeOutActor(actor) {
     return hold;
 }
 
-var ShellUserVerifier = class {
-    constructor(client, params) {
+var ShellUserVerifier = new Lang.Class({
+    Name: 'ShellUserVerifier',
+
+    _init(client, params) {
         params = Params.parse(params, { reauthenticationOnly: false });
         this._reauthOnly = params.reauthenticationOnly;
 
@@ -157,7 +165,7 @@ var ShellUserVerifier = class {
 
         this._oVirtUserAuthenticatedId = this._oVirtCredentialsManager.connect('user-authenticated',
                                                                                this._oVirtUserAuthenticated.bind(this));
-    }
+    },
 
     begin(userName, hold) {
         this._cancellable = new Gio.Cancellable();
@@ -175,7 +183,7 @@ var ShellUserVerifier = class {
         } else {
             this._client.get_user_verifier(this._cancellable, this._userVerifierGot.bind(this));
         }
-    }
+    },
 
     cancel() {
         if (this._cancellable)
@@ -185,14 +193,14 @@ var ShellUserVerifier = class {
             this._userVerifier.call_cancel_sync(null);
             this.clear();
         }
-    }
+    },
 
     _clearUserVerifier() {
         if (this._userVerifier) {
             this._userVerifier.run_dispose();
             this._userVerifier = null;
         }
-    }
+    },
 
     clear() {
         if (this._cancellable) {
@@ -202,7 +210,7 @@ var ShellUserVerifier = class {
 
         this._clearUserVerifier();
         this._clearMessageQueue();
-    }
+    },
 
     destroy() {
         this.clear();
@@ -216,7 +224,7 @@ var ShellUserVerifier = class {
 
         this._oVirtCredentialsManager.disconnect(this._oVirtUserAuthenticatedId);
         this._oVirtCredentialsManager = null;
-    }
+    },
 
     answerQuery(serviceName, answer) {
         if (!this.hasPendingMessages) {
@@ -227,12 +235,12 @@ var ShellUserVerifier = class {
                 this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
             });
         }
-    }
+    },
 
     _getIntervalForMessage(message) {
         // We probably could be smarter here
         return message.length * USER_READ_TIME;
-    }
+    },
 
     finishMessageQueue() {
         if (!this.hasPendingMessages)
@@ -242,7 +250,7 @@ var ShellUserVerifier = class {
 
         this.hasPendingMessages = false;
         this.emit('no-more-messages');
-    }
+    },
 
     _queueMessageTimeout() {
         if (this._messageQueue.length == 0) {
@@ -265,7 +273,7 @@ var ShellUserVerifier = class {
                                                            return GLib.SOURCE_REMOVE;
                                                        });
         GLib.Source.set_name_by_id(this._messageQueueTimeoutId, '[gnome-shell] this._queueMessageTimeout');
-    }
+    },
 
     _queueMessage(message, messageType) {
         let interval = this._getIntervalForMessage(message);
@@ -273,7 +281,7 @@ var ShellUserVerifier = class {
         this.hasPendingMessages = true;
         this._messageQueue.push({ text: message, type: messageType, interval: interval });
         this._queueMessageTimeout();
-    }
+    },
 
     _clearMessageQueue() {
         this.finishMessageQueue();
@@ -283,7 +291,7 @@ var ShellUserVerifier = class {
             this._messageQueueTimeoutId = 0;
         }
         this.emit('show-message', null, MessageType.NONE);
-    }
+    },
 
     _checkForFingerprintReader() {
         this._haveFingerprintReader = false;
@@ -301,12 +309,12 @@ var ShellUserVerifier = class {
                     this._updateDefaultService();
                 }
             });
-    }
+    },
 
     _oVirtUserAuthenticated(token) {
         this._preemptingService = OVIRT_SERVICE_NAME;
         this.emit('ovirt-user-authenticated');
-    }
+    },
 
     _checkForSmartcard() {
         let smartcardDetected;
@@ -328,7 +336,7 @@ var ShellUserVerifier = class {
 
             this.emit('smartcard-status-changed');
         }
-    }
+    },
 
     _reportInitError(where, error) {
         logError(error, where);
@@ -336,7 +344,7 @@ var ShellUserVerifier = class {
 
         this._queueMessage(_("Authentication error"), MessageType.ERROR);
         this._verificationFailed(false);
-    }
+    },
 
     _reauthenticationChannelOpened(client, result) {
         try {
@@ -363,7 +371,7 @@ var ShellUserVerifier = class {
         this._connectSignals();
         this._beginVerification();
         this._hold.release();
-    }
+    },
 
     _userVerifierGot(client, result) {
         try {
@@ -379,7 +387,7 @@ var ShellUserVerifier = class {
         this._connectSignals();
         this._beginVerification();
         this._hold.release();
-    }
+    },
 
     _connectSignals() {
         this._userVerifier.connect('info', this._onInfo.bind(this));
@@ -389,22 +397,22 @@ var ShellUserVerifier = class {
         this._userVerifier.connect('conversation-stopped', this._onConversationStopped.bind(this));
         this._userVerifier.connect('reset', this._onReset.bind(this));
         this._userVerifier.connect('verification-complete', this._onVerificationComplete.bind(this));
-    }
+    },
 
     _getForegroundService() {
         if (this._preemptingService)
             return this._preemptingService;
 
         return this._defaultService;
-    }
+    },
 
     serviceIsForeground(serviceName) {
         return serviceName == this._getForegroundService();
-    }
+    },
 
     serviceIsDefault(serviceName) {
         return serviceName == this._defaultService;
-    }
+    },
 
     _updateDefaultService() {
         if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
@@ -418,7 +426,7 @@ var ShellUserVerifier = class {
             log("no authentication service is enabled, using password authentication");
             this._defaultService = PASSWORD_SERVICE_NAME;
         }
-    }
+    },
 
     _startService(serviceName) {
         this._hold.acquire();
@@ -454,14 +462,14 @@ var ShellUserVerifier = class {
                this._hold.release();
            });
         }
-    }
+    },
 
     _beginVerification() {
         this._startService(this._getForegroundService());
 
         if (this._userName && this._haveFingerprintReader && !this.serviceIsForeground(FINGERPRINT_SERVICE_NAME))
             this._startService(FINGERPRINT_SERVICE_NAME);
-    }
+    },
 
     _onInfo(client, serviceName, info) {
         if (this.serviceIsForeground(serviceName)) {
@@ -476,21 +484,21 @@ var ShellUserVerifier = class {
             // to indicate the user can swipe their finger instead
             this._queueMessage(_("(or swipe finger)"), MessageType.HINT);
         }
-    }
+    },
 
     _onProblem(client, serviceName, problem) {
         if (!this.serviceIsForeground(serviceName))
             return;
 
         this._queueMessage(problem, MessageType.ERROR);
-    }
+    },
 
     _onInfoQuery(client, serviceName, question) {
         if (!this.serviceIsForeground(serviceName))
             return;
 
         this.emit('ask-question', serviceName, question, '');
-    }
+    },
 
     _onSecretInfoQuery(client, serviceName, secretQuestion) {
         if (!this.serviceIsForeground(serviceName))
@@ -503,7 +511,7 @@ var ShellUserVerifier = class {
         }
 
         this.emit('ask-question', serviceName, secretQuestion, '\u25cf');
-    }
+    },
 
     _onReset() {
         // Clear previous attempts to authenticate
@@ -511,20 +519,20 @@ var ShellUserVerifier = class {
         this._updateDefaultService();
 
         this.emit('reset');
-    }
+    },
 
     _onVerificationComplete() {
         this.emit('verification-complete');
-    }
+    },
 
     _cancelAndReset() {
         this.cancel();
         this._onReset();
-    }
+    },
 
     _retry() {
         this.begin(this._userName, new Batch.Hold());
-    }
+    },
 
     _verificationFailed(retry) {
         // For Not Listed / enterprise logins, immediately reset
@@ -559,7 +567,7 @@ var ShellUserVerifier = class {
         }
 
         this.emit('verification-failed', canRetry);
-    }
+    },
 
     _onConversationStopped(client, serviceName) {
         // If the login failed with the preauthenticated oVirt credentials
@@ -578,6 +586,6 @@ var ShellUserVerifier = class {
         if (this.serviceIsForeground(serviceName)) {
             this._verificationFailed(true);
         }
-    }
-};
+    },
+});
 Signals.addSignalMethods(ShellUserVerifier.prototype);

js/js-resources.gresource.xml

@@ -16,7 +16,6 @@
     <file>misc/history.js</file>
     <file>misc/ibusManager.js</file>
     <file>misc/inputMethod.js</file>
-    <file>misc/introspect.js</file>
     <file>misc/jsParse.js</file>
     <file>misc/keyboardManager.js</file>
     <file>misc/loginManager.js</file>
@@ -78,11 +77,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/pointerWatcher.js</file>
     <file>ui/popupMenu.js</file>
+    <file>ui/remoteMenu.js</file>
     <file>ui/remoteSearch.js</file>
     <file>ui/runDialog.js</file>
     <file>ui/screenShield.js</file>

js/misc/extensionUtils.js

@@ -3,7 +3,7 @@
 // Common utils for the extension system and the extension
 // preferences tool
 
-const Gettext = imports.gettext;
+const Lang = imports.lang;
 const Signals = imports.signals;
 
 const Gio = imports.gi.Gio;
@@ -64,66 +64,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
@@ -220,7 +160,9 @@ function installImporter(extension) {
     imports.searchPath = oldSearchPath;
 }
 
-var ExtensionFinder = class {
+var ExtensionFinder = new Lang.Class({
+    Name: 'ExtensionFinder',
+
     _loadExtension(extensionDir, info, perUserDir) {
         let fileType = info.get_file_type();
         if (fileType != Gio.FileType.DIRECTORY)
@@ -242,7 +184,7 @@ var ExtensionFinder = class {
             return;
         }
         this.emit('extension-found', extension);
-    }
+    },
 
     scanExtensions() {
         let perUserDir = Gio.File.new_for_path(global.userdatadir);
@@ -250,5 +192,5 @@ var ExtensionFinder = class {
             this._loadExtension(dir, info, perUserDir);
         });
     }
-};
+});
 Signals.addSignalMethods(ExtensionFinder.prototype);

js/misc/fileUtils.js

@@ -1,7 +1,10 @@
 // -*- 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 Lang = imports.lang;
 const Config = imports.misc.config;
+const Params = imports.misc.params;
 
 function collectFromDatadirs(subdir, includeUserDir, processFile) {
     let dataDirs = GLib.get_system_data_dirs();

js/misc/gnomeSession.js

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

js/misc/history.js

@@ -1,13 +1,16 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const Lang = imports.lang;
 const Signals = imports.signals;
 const Clutter = imports.gi.Clutter;
 const Params = imports.misc.params;
 
 var DEFAULT_LIMIT = 512;
 
-var HistoryManager = class {
-    constructor(params) {
+var HistoryManager = new Lang.Class({
+    Name: 'HistoryManager',
+
+    _init(params) {
         params = Params.parse(params, { gsettingsKey: null,
                                         limit: DEFAULT_LIMIT,
                                         entry: null });
@@ -31,12 +34,12 @@ var HistoryManager = class {
             this._entry.connect('key-press-event', 
                                 this._onEntryKeyPress.bind(this));
         }
-    }
+    },
 
     _historyChanged() {
         this._history = global.settings.get_strv(this._key);
         this._historyIndex = this._history.length;
-    }
+    },
 
     _setPrevItem(text) {
         if (this._historyIndex <= 0)
@@ -47,7 +50,7 @@ var HistoryManager = class {
         this._historyIndex--;
         this._indexChanged();
         return true;
-    }
+    },
 
     _setNextItem(text) {
         if (this._historyIndex >= this._history.length)
@@ -58,7 +61,7 @@ var HistoryManager = class {
         this._historyIndex++;
         this._indexChanged();
         return true;
-    }
+    },
 
     lastItem() {
         if (this._historyIndex != this._history.length) {
@@ -67,7 +70,7 @@ var HistoryManager = class {
         }
 
         return this._historyIndex ? this._history[this._historyIndex -1] : null;
-    }
+    },
 
     addItem(input) {
         if (this._history.length == 0 ||
@@ -78,7 +81,7 @@ var HistoryManager = class {
             this._save();
         }
         this._historyIndex = this._history.length;
-    }
+    },
 
     _onEntryKeyPress(entry, event) {
         let symbol = event.get_key_symbol();
@@ -88,7 +91,7 @@ var HistoryManager = class {
             return this._setNextItem(entry.get_text());
         }
         return Clutter.EVENT_PROPAGATE;
-    }
+    },
 
     _indexChanged() {
         let current = this._history[this._historyIndex] || '';
@@ -96,7 +99,7 @@ var HistoryManager = class {
 
         if (this._entry)
             this._entry.set_text(current);
-    }
+    },
 
     _save() {
         if (this._history.length > this._limit)
@@ -105,5 +108,5 @@ var HistoryManager = class {
         if (this._key)
             global.settings.set_strv(this._key, this._history);
     }
-};
+});
 Signals.addSignalMethods(HistoryManager.prototype);

js/misc/ibusManager.js

@@ -1,9 +1,12 @@
 // -*- 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 Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 
+const IBus = imports.gi.IBus;
 const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
 
 // Ensure runtime version matches
@@ -29,16 +32,17 @@ function getIBusManager() {
     return _ibusManager;
 }
 
-var IBusManager = class {
-    constructor() {
+var IBusManager = new Lang.Class({
+    Name: 'IBusManager',
+
+    // This is the longest we'll keep the keyboard frozen until an input
+    // source is active.
+    _MAX_INPUT_SOURCE_ACTIVATION_TIME: 4000, // ms
+    _PRELOAD_ENGINES_DELAY_TIME: 30, // sec
+
+    _init() {
         IBus.init();
 
-        // This is the longest we'll keep the keyboard frozen until an input
-        // source is active.
-        this._MAX_INPUT_SOURCE_ACTIVATION_TIME = 4000; // ms
-        this._PRELOAD_ENGINES_DELAY_TIME = 30; // sec
-
-
         this._candidatePopup = new IBusCandidatePopup.CandidatePopup();
 
         this._panelService = null;
@@ -56,7 +60,7 @@ var IBusManager = class {
         this._ibus.connect('global-engine-changed', this._engineChanged.bind(this));
 
         this._spawn();
-    }
+    },
 
     _spawn() {
         try {
@@ -65,7 +69,7 @@ var IBusManager = class {
         } catch(e) {
             log('Failed to launch ibus-daemon: ' + e.message);
         }
-    }
+    },
 
     _clear() {
         if (this._panelService)
@@ -81,7 +85,7 @@ var IBusManager = class {
         this.emit('ready', false);
 
         this._spawn();
-    }
+    },
 
     _onConnected() {
         this._ibus.list_engines_async(-1, null, this._initEngines.bind(this));
@@ -89,7 +93,7 @@ var IBusManager = class {
                                       IBus.BusNameFlag.REPLACE_EXISTING,
                                       -1, null,
                                       this._initPanelService.bind(this));
-    }
+    },
 
     _initEngines(ibus, result) {
         let enginesList = this._ibus.list_engines_async_finish(result);
@@ -102,7 +106,7 @@ var IBusManager = class {
         } else {
             this._clear();
         }
-    }
+    },
 
     _initPanelService(ibus, result) {
         let success = this._ibus.request_name_async_finish(result);
@@ -147,13 +151,13 @@ var IBusManager = class {
         } else {
             this._clear();
         }
-    }
+    },
 
     _updateReadiness() {
         this._ready = (Object.keys(this._engines).length > 0 &&
                        this._panelService != null);
         this.emit('ready', this._ready);
-    }
+    },
 
     _engineChanged(bus, engineName) {
         if (!this._ready)
@@ -174,26 +178,26 @@ var IBusManager = class {
 
                 this.emit('properties-registered', this._currentEngineName, props);
             });
-    }
+    },
 
     _updateProperty(panel, prop) {
         this.emit('property-updated', this._currentEngineName, prop);
-    }
+    },
 
     _setContentType(panel, purpose, hints) {
         this.emit('set-content-type', purpose, hints);
-    }
+    },
 
     activateProperty(key, state) {
         this._panelService.property_activate(key, state);
-    }
+    },
 
     getEngineDesc(id) {
         if (!this._ready || !this._engines.hasOwnProperty(id))
             return null;
 
         return this._engines[id];
-    }
+    },
 
     setEngine(id, callback) {
         // Send id even if id == this._currentEngineName
@@ -206,8 +210,8 @@ var IBusManager = class {
         }
 
         this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
-                                           null, callback || null);
-    }
+                                           null, callback);
+    },
 
     preloadEngines(ids) {
         if (!this._ibus || ids.length == 0)
@@ -229,6 +233,6 @@ var IBusManager = class {
                                              this._preloadEnginesId = 0;
                                              return GLib.SOURCE_REMOVE;
                                          });
-    }
-};
+    },
+});
 Signals.addSignalMethods(IBusManager.prototype);

js/misc/inputMethod.js

@@ -1,21 +1,22 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-const { Clutter, GLib, GObject, IBus } = imports.gi;
-
+const Clutter = imports.gi.Clutter;
+const IBus = imports.gi.IBus;
 const Keyboard = imports.ui.status.keyboard;
+const Lang = imports.lang;
+const Signals = imports.signals;
 
-var HIDE_PANEL_TIME = 50;
+var InputMethod = new Lang.Class({
+    Name: 'InputMethod',
+    Extends: Clutter.InputMethod,
 
-var InputMethod = GObject.registerClass(
-class InputMethod extends Clutter.InputMethod {
     _init() {
-        super._init();
+        this.parent();
         this._hints = 0;
         this._purpose = 0;
+        this._enabled = true;
         this._currentFocus = null;
         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));
@@ -28,11 +29,11 @@ class InputMethod extends Clutter.InputMethod {
 
         if (this._ibus.is_connected())
             this._onConnected();
-    }
+    },
 
     get currentFocus() {
         return this._currentFocus;
-    }
+    },
 
     _updateCapabilities() {
         let caps = 0;
@@ -47,19 +48,21 @@ class InputMethod extends Clutter.InputMethod {
 
         if (this._context)
             this._context.set_capabilities(caps);
-    }
+    },
 
     _onSourceChanged() {
         this._currentSource = this._inputSourceManager.currentSource;
-    }
+    },
 
     _onConnected() {
         this._ibus.create_input_context_async ('gnome-shell', -1, null,
                                                this._setContext.bind(this));
-    }
+    },
 
     _setContext(bus, res) {
         this._context = this._ibus.create_input_context_async_finish(res);
+        this._context.connect('enabled', () => { this._enabled = true });
+        this._context.connect('disabled', () => { this._enabled = false });
         this._context.connect('commit-text', this._onCommitText.bind(this));
         this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
         this._context.connect('update-preedit-text', this._onUpdatePreeditText.bind(this));
@@ -68,55 +71,48 @@ class InputMethod extends Clutter.InputMethod {
         this._context.connect('forward-key-event', this._onForwardKeyEvent.bind(this));
 
         this._updateCapabilities();
-    }
+    },
 
     _clear() {
         this._context = null;
         this._hints = 0;
         this._purpose = 0;
+        this._enabled = false;
         this._preeditStr = ''
         this._preeditPos = 0;
-        this._preeditVisible = false;
-    }
+    },
 
     _emitRequestSurrounding() {
         if (this._context.needs_surrounding_text())
             this.emit('request-surrounding');
-    }
+    },
 
     _onCommitText(context, text) {
         this.commit(text.get_text());
-    }
+    },
 
     _onDeleteSurroundingText(context) {
         this.delete_surrounding();
-    }
+    },
 
     _onUpdatePreeditText(context, text, pos, visible) {
         if (text == null)
             return;
-
-        let preedit = text.get_text();
-
-        if (visible)
-            this.set_preedit_text(preedit, pos);
-        else if (this._preeditVisible)
-            this.set_preedit_text(null, pos);
-
-        this._preeditStr = preedit;
+        this._preeditStr = text.get_text();
         this._preeditPos = pos;
-        this._preeditVisible = visible;
-    }
+        if (visible)
+            this.set_preedit_text(this._preeditStr, pos);
+        else
+            this.set_preedit_text(null, pos);
+    },
 
     _onShowPreeditText(context) {
-        this._preeditVisible = true;
         this.set_preedit_text(this._preeditStr, this._preeditPos);
-    }
+    },
 
     _onHidePreeditText(context) {
         this.set_preedit_text(null, this._preeditPos);
-        this._preeditVisible = false;
-    }
+    },
 
     _onForwardKeyEvent(context, keyval, keycode, state) {
         let press = (state & IBus.ModifierType.RELEASE_MASK) == 0;
@@ -130,7 +126,7 @@ class InputMethod extends Clutter.InputMethod {
             time = global.display.get_current_time_roundtrip();
 
         this.forward_key(keyval, keycode + 8, state & Clutter.ModifierType.MODIFIER_MASK, time, press);
-    }
+    },
 
     vfunc_focus_in(focus) {
         this._currentFocus = focus;
@@ -139,12 +135,7 @@ class InputMethod extends Clutter.InputMethod {
             this._updateCapabilities();
             this._emitRequestSurrounding();
         }
-
-        if (this._hidePanelId) {
-            GLib.source_remove(this._hidePanelId);
-            this._hidePanelId = 0;
-        }
-    }
+    },
 
     vfunc_focus_out() {
         this._currentFocus = null;
@@ -153,18 +144,9 @@ class InputMethod extends Clutter.InputMethod {
             this._updateCapabilities();
         }
 
-        if (this._preeditStr) {
-            // Unset any preedit text
-            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;
-        });
-    }
+        // Unset any preedit text
+        this.set_preedit_text(null, 0);
+    },
 
     vfunc_reset() {
         if (this._context) {
@@ -172,12 +154,9 @@ class InputMethod extends Clutter.InputMethod {
             this._emitRequestSurrounding();
         }
 
-        if (this._preeditStr) {
-            // Unset any preedit text
-            this.set_preedit_text(null, 0);
-            this._preeditStr = null;
-        }
-    }
+        // Unset any preedit text
+        this.set_preedit_text(null, 0);
+    },
 
     vfunc_set_cursor_location(rect) {
         if (this._context) {
@@ -185,7 +164,7 @@ class InputMethod extends Clutter.InputMethod {
                                               rect.get_width(), rect.get_height());
             this._emitRequestSurrounding();
         }
-    }
+    },
 
     vfunc_set_surrounding(text, cursor, anchor) {
         if (!this._context || !text)
@@ -193,7 +172,7 @@ class InputMethod extends Clutter.InputMethod {
 
         let ibusText = IBus.Text.new_from_string(text);
         this._context.set_surrounding_text(ibusText, cursor, anchor);
-    }
+    },
 
     vfunc_update_content_hints(hints) {
         let ibusHints = 0;
@@ -213,7 +192,7 @@ class InputMethod extends Clutter.InputMethod {
         this._hints = ibusHints;
         if (this._context)
             this._context.set_content_type(this._purpose, this._hints);
-    }
+    },
 
     vfunc_update_content_purpose(purpose) {
         let ibusPurpose = 0;
@@ -239,10 +218,10 @@ class InputMethod extends Clutter.InputMethod {
         this._purpose = ibusPurpose;
         if (this._context)
             this._context.set_content_type(this._purpose, this._hints);
-    }
+    },
 
     vfunc_filter_key_event(event) {
-        if (!this._context)
+        if (!this._context || !this._enabled)
             return false;
         if (!this._currentSource)
             return false;
@@ -266,5 +245,5 @@ class InputMethod extends Clutter.InputMethod {
                                                   }
                                               });
         return true;
-    }
+    },
 });

js/misc/introspect.js

@@ -1,160 +0,0 @@
-const { Gio, GLib, Meta, Shell } = imports.gi;
-
-const INTROSPECT_SCHEMA = 'org.gnome.shell';
-const INTROSPECT_KEY = 'introspect';
-const APP_WHITELIST = ['org.freedesktop.impl.portal.desktop.gtk'];
-
-const { loadInterfaceXML } = imports.misc.fileUtils;
-
-const IntrospectDBusIface = loadInterfaceXML('org.gnome.Shell.Introspect');
-
-var IntrospectService = class {
-    constructor() {
-        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(IntrospectDBusIface,
-                                                             this);
-        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell/Introspect');
-        Gio.DBus.session.own_name('org.gnome.Shell.Introspect',
-                                  Gio.BusNameOwnerFlags.REPLACE,
-                                  null, null);
-
-        this._runningApplications = {};
-        this._runningApplicationsDirty = true;
-        this._activeApplication = null;
-        this._activeApplicationDirty = true;
-
-        this._appSystem = Shell.AppSystem.get_default();
-        this._appSystem.connect('app-state-changed',
-                                () => {
-                                    this._runningApplicationsDirty = true;
-                                    this._syncRunningApplications();
-                                });
-
-        this._settings = new Gio.Settings({ schema_id: INTROSPECT_SCHEMA });
-
-        let tracker = Shell.WindowTracker.get_default();
-        tracker.connect('notify::focus-app',
-                        () => {
-                            this._activeApplicationDirty = true;
-                            this._syncRunningApplications();
-                        });
-
-        this._syncRunningApplications();
-    }
-
-    _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);
-    }
-
-    _isSenderWhitelisted(sender) {
-       return APP_WHITELIST.includes(sender);
-    }
-
-    _syncRunningApplications() {
-        let tracker = Shell.WindowTracker.get_default();
-        let apps = this._appSystem.get_running();
-        let seatName = "seat0";
-        let newRunningApplications = {};
-
-        let newActiveApplication = null;
-        let focusedApp = tracker.focus_app;
-
-        for (let app of apps) {
-            let appInfo = {};
-            let isAppActive = (focusedApp == app);
-
-            if (!this._isStandaloneApp(app))
-                continue;
-
-            if (isAppActive) {
-                appInfo['active-on-seats'] = new GLib.Variant('as', [seatName]);
-                newActiveApplication = app.get_id();
-            }
-
-            newRunningApplications[app.get_id()] = appInfo;
-        }
-
-        if (this._runningApplicationsDirty ||
-            (this._activeApplicationDirty &&
-             this._activeApplication != newActiveApplication)) {
-            this._runningApplications = newRunningApplications;
-            this._activeApplication = newActiveApplication;
-
-            this._dbusImpl.emit_signal('RunningApplicationsChanged', null);
-        }
-        this._runningApplicationsDirty = false;
-        this._activeApplicationDirty = false;
-    }
-
-    _isEligibleWindow(window) {
-        if (window.is_override_redirect())
-            return false;
-
-        let type = window.get_window_type();
-        return (type == Meta.WindowType.NORMAL ||
-                type == Meta.WindowType.DIALOG ||
-                type == Meta.WindowType.MODAL_DIALOG ||
-                type == Meta.WindowType.UTILITY);
-    }
-
-    GetRunningApplicationsAsync(params, invocation) {
-        if (!this._isIntrospectEnabled() &&
-            !this._isSenderWhitelisted(invocation.get_sender())) {
-            invocation.return_error_literal(Gio.DBusError,
-                                            Gio.DBusError.ACCESS_DENIED,
-                                            'App introspection not allowed');
-            return;
-        }
-
-        invocation.return_value(new GLib.Variant('(a{sa{sv}})', [this._runningApplications]));
-    }
-
-    GetWindowsAsync(params, invocation) {
-        let focusWindow = global.display.get_focus_window();
-        let apps = this._appSystem.get_running();
-        let windowsList = {};
-
-        if (!this._isIntrospectEnabled()) {
-            invocation.return_error_literal(Gio.DBusError,
-                                            Gio.DBusError.ACCESS_DENIED,
-                                            'App introspection not allowed');
-            return;
-        }
-
-        for (let app of apps) {
-            let windows = app.get_windows();
-            for (let window of windows) {
-
-                if (!this._isEligibleWindow(window))
-                    continue;
-
-                let windowId = window.get_id();
-                let frameRect = window.get_frame_rect();
-                let title = window.get_title();
-                let wmClass = window.get_wm_class();
-
-                windowsList[windowId] = {
-                    'app-id': GLib.Variant.new('s', app.get_id()),
-                    'client-type': GLib.Variant.new('u', window.get_client_type()),
-                    'is-hidden': GLib.Variant.new('b', window.is_hidden()),
-                    'has-focus': GLib.Variant.new('b', (window == focusWindow)),
-                    'width': GLib.Variant.new('u', frameRect.width),
-                    'height': GLib.Variant.new('u', frameRect.height)
-                };
-
-                // These properties may not be available for all windows:
-                if (title != null)
-                    windowsList[windowId]['title'] = GLib.Variant.new('s', title);
-
-                if (wmClass != null)
-                    windowsList[windowId]['wm-class'] = GLib.Variant.new('s', wmClass);
-            }
-        }
-        invocation.return_value(new GLib.Variant('(a{ta{sv}})', [windowsList]));
-    }
-};

js/misc/keyboardManager.js

@@ -1,6 +1,9 @@
 // -*- 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 Lang = imports.lang;
+const Meta = imports.gi.Meta;
 
 const Main = imports.ui.main;
 
@@ -35,20 +38,22 @@ function holdKeyboard() {
     global.display.freeze_keyboard(global.get_current_time());
 }
 
-var KeyboardManager = class {
-    constructor() {
-        // The XKB protocol doesn't allow for more that 4 layouts in a
-        // keymap. Wayland doesn't impose this limit and libxkbcommon can
-        // handle up to 32 layouts but since we need to support X clients
-        // even as a Wayland compositor, we can't bump this.
-        this.MAX_LAYOUTS_PER_GROUP = 4;
+var KeyboardManager = new Lang.Class({
+    Name: 'KeyboardManager',
 
+    // The XKB protocol doesn't allow for more that 4 layouts in a
+    // keymap. Wayland doesn't impose this limit and libxkbcommon can
+    // handle up to 32 layouts but since we need to support X clients
+    // even as a Wayland compositor, we can't bump this.
+    MAX_LAYOUTS_PER_GROUP: 4,
+
+    _init() {
         this._xkbInfo = getXkbInfo();
         this._current = null;
         this._localeLayoutInfo = this._getLocaleLayout();
         this._layoutInfos = {};
         this._currentKeymap = null;
-    }
+    },
 
     _applyLayoutGroup(group) {
         let options = this._buildOptionsString();
@@ -62,11 +67,11 @@ var KeyboardManager = class {
 
         this._currentKeymap = {layouts, variants, options};
         Meta.get_backend().set_keymap(layouts, variants, options);
-    }
+    },
 
     _applyLayoutGroupIndex(idx) {
         Meta.get_backend().lock_layout_group(idx);
-    }
+    },
 
     apply(id) {
         let info = this._layoutInfos[id];
@@ -82,7 +87,7 @@ var KeyboardManager = class {
         }
 
         this._current = info;
-    }
+    },
 
     reapply() {
         if (!this._current)
@@ -90,7 +95,7 @@ var KeyboardManager = class {
 
         this._applyLayoutGroup(this._current.group);
         this._applyLayoutGroupIndex(this._current.groupIndex);
-    }
+    },
 
     setUserLayouts(ids) {
         this._current = null;
@@ -121,7 +126,7 @@ var KeyboardManager = class {
 
             i += 1;
         }
-    }
+    },
 
     _getLocaleLayout() {
         let locale = GLib.get_language_names()[0];
@@ -138,21 +143,21 @@ var KeyboardManager = class {
             return { layout: _layout, variant: _variant };
         else
             return { layout: DEFAULT_LAYOUT, variant: DEFAULT_VARIANT };
-    }
+    },
 
     _buildGroupStrings(_group) {
         let group = _group.concat(this._localeLayoutInfo);
         let layouts = group.map(g => g.layout).join(',');
         let variants = group.map(g => g.variant).join(',');
         return [layouts, variants];
-    }
+    },
 
     setKeyboardOptions(options) {
         this._xkbOptions = options;
-    }
+    },
 
     _buildOptionsString() {
         let options = this._xkbOptions.join(',');
         return options;
     }
-};
+});

js/misc/loginManager.js

@@ -1,6 +1,10 @@
 // -*- 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 Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
@@ -66,8 +70,10 @@ function getLoginManager() {
     return _loginManager;
 }
 
-var LoginManagerSystemd = class {
-    constructor() {
+var LoginManagerSystemd = new Lang.Class({
+    Name: 'LoginManagerSystemd',
+
+    _init() {
         this._proxy = new SystemdLoginManager(Gio.DBus.system,
                                               'org.freedesktop.login1',
                                               '/org/freedesktop/login1');
@@ -76,7 +82,7 @@ var LoginManagerSystemd = class {
                                                '/org/freedesktop/login1/user/self');
         this._proxy.connectSignal('PrepareForSleep',
                                   this._prepareForSleep.bind(this));
-    }
+    },
 
     getCurrentSessionProxy(callback) {
         if (this._currentSession) {
@@ -123,7 +129,7 @@ var LoginManagerSystemd = class {
                 callback(this._currentSession);
             }
         });
-    }
+    },
 
     canSuspend(asyncCallback) {
         this._proxy.CanSuspendRemote((result, error) => {
@@ -135,7 +141,7 @@ var LoginManagerSystemd = class {
                 asyncCallback(canSuspend, needsAuth);
             }
         });
-    }
+    },
 
     listSessions(asyncCallback) {
         this._proxy.ListSessionsRemote((result, error) => {
@@ -144,11 +150,11 @@ var LoginManagerSystemd = class {
             else
                 asyncCallback(result[0]);
         });
-    }
+    },
 
     suspend() {
         this._proxy.SuspendRemote(true);
-    }
+    },
 
     inhibit(reason, callback) {
         let inVariant = GLib.Variant.new('(ssss)',
@@ -168,36 +174,38 @@ var LoginManagerSystemd = class {
                     callback(null);
                 }
             });
-    }
+    },
 
     _prepareForSleep(proxy, sender, [aboutToSuspend]) {
         this.emit('prepare-for-sleep', aboutToSuspend);
     }
-};
+});
 Signals.addSignalMethods(LoginManagerSystemd.prototype);
 
-var LoginManagerDummy = class {
+var LoginManagerDummy = new Lang.Class({
+    Name: 'LoginManagerDummy',
+
     getCurrentSessionProxy(callback) {
         // we could return a DummySession object that fakes whatever callers
         // expect (at the time of writing: connect() and connectSignal()
         // methods), but just never calling the callback should be safer
-    }
+    },
 
     canSuspend(asyncCallback) {
         asyncCallback(false, false);
-    }
+    },
 
     listSessions(asyncCallback) {
         asyncCallback([]);
-    }
+    },
 
     suspend() {
         this.emit('prepare-for-sleep', true);
         this.emit('prepare-for-sleep', false);
-    }
+    },
 
     inhibit(reason, callback) {
         callback(null);
     }
-};
+});
 Signals.addSignalMethods(LoginManagerDummy.prototype);

js/misc/modemManager.js

@@ -1,6 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Gio, NMA } = imports.gi;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const NMA = imports.gi.NMA;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
@@ -98,8 +100,10 @@ const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInter
 const ModemCdmaInterface = loadInterfaceXML('org.freedesktop.ModemManager.Modem.Cdma');
 const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
 
-var ModemGsm = class {
-    constructor(path) {
+var ModemGsm = new Lang.Class({
+    Name: 'ModemGsm',
+
+    _init(path) {
         this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
 
         this.signal_quality = 0;
@@ -135,11 +139,13 @@ var ModemGsm = class {
             this.emit('notify::signal-quality');
         });
     }
-};
+});
 Signals.addSignalMethods(ModemGsm.prototype);
 
-var ModemCdma = class {
-    constructor(path) {
+var ModemCdma = new Lang.Class({
+    Name: 'ModemCdma',
+
+    _init(path) {
         this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
 
         this.signal_quality = 0;
@@ -163,7 +169,7 @@ var ModemCdma = class {
             }
             this.emit('notify::signal-quality');
         });
-    }
+    },
 
     _refreshServingSystem() {
         this._proxy.GetServingSystemRemote(([result], err) => {
@@ -178,7 +184,7 @@ var ModemCdma = class {
             this.emit('notify::operator-name');
         });
     }
-};
+});
 Signals.addSignalMethods(ModemCdma.prototype);
 
 
@@ -195,8 +201,10 @@ const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gp
 const BroadbandModemCdmaInterface = loadInterfaceXML('org.freedesktop.ModemManager1.Modem.ModemCdma');
 const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface);
 
-var BroadbandModem = class {
-    constructor(path, capabilities) {
+var BroadbandModem = new Lang.Class({
+    Name: 'BroadbandModem',
+
+    _init(path, capabilities) {
         this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
         this._proxy_3gpp = new BroadbandModem3gppProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
         this._proxy_cdma = new BroadbandModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
@@ -221,13 +229,13 @@ var BroadbandModem = class {
                 this._reloadCdmaOperatorName();
         });
         this._reloadCdmaOperatorName();
-    }
+    },
 
     _reloadSignalQuality() {
         let [quality, recent] = this._proxy.SignalQuality;
         this.signal_quality = quality;
         this.emit('notify::signal-quality');
-    }
+    },
 
     _reloadOperatorName() {
         let new_name = "";
@@ -242,19 +250,19 @@ var BroadbandModem = class {
 
         this.operator_name = new_name;
         this.emit('notify::operator-name');
-    }
+    },
 
     _reload3gppOperatorName() {
         let name = this._proxy_3gpp.OperatorName;
         let code = this._proxy_3gpp.OperatorCode;
         this.operator_name_3gpp = _findProviderForMccMnc(name, code);
         this._reloadOperatorName();
-    }
+    },
 
     _reloadCdmaOperatorName() {
         let sid = this._proxy_cdma.Sid;
         this.operator_name_cdma = _findProviderForSid(sid);
         this._reloadOperatorName();
     }
-};
+});
 Signals.addSignalMethods(BroadbandModem.prototype);

js/misc/objectManager.js

@@ -1,6 +1,8 @@
 // -*- 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 Lang = imports.lang;
 const Params = imports.misc.params;
 const Signals = imports.signals;
 
@@ -25,8 +27,9 @@ const ObjectManagerIface = `
 
 const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface);
 
-var ObjectManager = class {
-    constructor(params) {
+var ObjectManager = new Lang.Class({
+    Name: 'ObjectManager',
+    _init(params) {
         params = Params.parse(params, { connection: null,
                                         name: null,
                                         objectPath: null,
@@ -60,7 +63,7 @@ var ObjectManager = class {
         this._managerProxy.init_async(GLib.PRIORITY_DEFAULT,
                                       this._cancellable,
                                       this._onManagerProxyLoaded.bind(this));
-    }
+    },
 
     _tryToCompleteLoad() {
         if (this._numLoadInhibitors == 0)
@@ -71,7 +74,7 @@ var ObjectManager = class {
             if (this._onLoaded)
                 this._onLoaded();
         }
-    }
+    },
 
     _addInterface(objectPath, interfaceName, onFinished) {
         let info = this._interfaceInfos[interfaceName];
@@ -126,7 +129,7 @@ var ObjectManager = class {
                if (onFinished)
                    onFinished();
         });
-    }
+    },
 
     _removeInterface(objectPath, interfaceName) {
         if (!this._objects[objectPath])
@@ -152,14 +155,14 @@ var ObjectManager = class {
             delete this._objects[objectPath];
             this.emit('object-removed', objectPath);
         }
-    }
+    },
 
     _onManagerProxyLoaded(initable, result) {
         let error = null;
         try {
             initable.init_finish(result);
         } 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;
@@ -191,7 +194,7 @@ var ObjectManager = class {
 
         if (this._managerProxy.g_name_owner)
             this._onNameAppeared();
-    }
+    },
 
     _onNameAppeared() {
         this._managerProxy.GetManagedObjectsRemote((result, error) => {
@@ -229,7 +232,7 @@ var ObjectManager = class {
             }
             this._tryToCompleteLoad();
         });
-    }
+    },
 
     _onNameVanished() {
         let objectPaths = Object.keys(this._objects);
@@ -245,14 +248,14 @@ var ObjectManager = class {
                     this._removeInterface(objectPath, interfaceName);
             }
         }
-    }
+    },
 
     _registerInterfaces(interfaces) {
         for (let i = 0; i < interfaces.length; i++) {
             let info = Gio.DBusInterfaceInfo.new_for_xml(interfaces[i]);
             this._interfaceInfos[info.name] = info;
         }
-    }
+    },
 
     getProxy(objectPath, interfaceName) {
         let object = this._objects[objectPath];
@@ -261,7 +264,7 @@ var ObjectManager = class {
             return null;
 
         return object[interfaceName];
-    }
+    },
 
     getProxiesForInterface(interfaceName) {
         let proxyList = this._interfaces[interfaceName];
@@ -270,7 +273,7 @@ var ObjectManager = class {
             return [];
 
         return proxyList;
-    }
+    },
 
     getAllProxies() {
         let proxies = [];
@@ -280,8 +283,8 @@ var ObjectManager = class {
             let object = this._objects[objectPaths];
 
             let interfaceNames = Object.keys(object);
-            for (let j = 0; j < interfaceNames.length; j++) {
-                let interfaceName = interfaceNames[j];
+            for (let j = 0; i < interfaceNames.length; i++) {
+                let interfaceName = interfaceNames[i];
                 if (object[interfaceName])
                     proxies.push(object(interfaceName));
             }
@@ -289,5 +292,5 @@ var ObjectManager = class {
 
         return proxies;
     }
-};
+});
 Signals.addSignalMethods(ObjectManager.prototype);

js/misc/smartcardManager.js

@@ -1,6 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const ObjectManager = imports.misc.objectManager;
@@ -24,8 +26,9 @@ function getSmartcardManager() {
     return _smartcardManager;
 }
 
-var SmartcardManager = class {
-    constructor() {
+var SmartcardManager = new Lang.Class({
+    Name: 'SmartcardManager',
+    _init() {
         this._objectManager = new ObjectManager.ObjectManager({ connection: Gio.DBus.session,
                                                                 name: "org.gnome.SettingsDaemon.Smartcard",
                                                                 objectPath: '/org/gnome/SettingsDaemon/Smartcard',
@@ -33,7 +36,7 @@ var SmartcardManager = class {
                                                                 onLoaded: this._onLoaded.bind(this) });
         this._insertedTokens = {};
         this._loginToken = null;
-    }
+    },
 
     _onLoaded() {
         let tokens = this._objectManager.getProxiesForInterface('org.gnome.SettingsDaemon.Smartcard.Token');
@@ -50,7 +53,7 @@ var SmartcardManager = class {
             if (interfaceName == 'org.gnome.SettingsDaemon.Smartcard.Token')
                 this._removeToken(proxy);
         });
-    }
+    },
 
     _updateToken(token) {
         let objectPath = token.get_object_path();
@@ -62,7 +65,7 @@ var SmartcardManager = class {
 
         if (token.UsedToLogin)
             this._loginToken = token;
-    }
+    },
 
     _addToken(token) {
         this._updateToken(token);
@@ -82,7 +85,7 @@ var SmartcardManager = class {
         // Emit a smartcard-inserted at startup if it's already plugged in
         if (token.IsInserted)
             this.emit('smartcard-inserted', token);
-    }
+    },
 
     _removeToken(token) {
         let objectPath = token.get_object_path();
@@ -96,11 +99,11 @@ var SmartcardManager = class {
             this._loginToken = null;
 
         token.disconnectAll();
-    }
+    },
 
     hasInsertedTokens() {
         return Object.keys(this._insertedTokens).length > 0;
-    }
+    },
 
     hasInsertedLoginToken() {
         if (!this._loginToken)
@@ -112,5 +115,5 @@ var SmartcardManager = class {
         return true;
     }
 
-};
+});
 Signals.addSignalMethods(SmartcardManager.prototype);

js/misc/systemActions.js

@@ -1,4 +1,11 @@
-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 Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const GObject = imports.gi.GObject;
 
 const GnomeSession = imports.misc.gnomeSession;
 const LoginManager = imports.misc.loginManager;
@@ -37,7 +44,9 @@ function getDefault() {
     return _singleton;
 }
 
-const SystemActions = GObject.registerClass({
+const SystemActions = new Lang.Class({
+    Name: 'SystemActions',
+    Extends: GObject.Object,
     Properties: {
         'can-power-off': GObject.ParamSpec.boolean('can-power-off',
                                                    'can-power-off',
@@ -74,10 +83,10 @@ const SystemActions = GObject.registerClass({
                                                           'orientation-lock-icon',
                                                           GObject.ParamFlags.READWRITE,
                                                           null)
-    }
-}, class SystemActions extends GObject.Object {
+    },
+
     _init() {
-        super._init();
+        this.parent();
 
         this._canHavePowerOff = true;
         this._canHaveSuspend = true;
@@ -177,35 +186,35 @@ const SystemActions = GObject.registerClass({
 
         Main.sessionMode.connect('updated', () => { this._sessionUpdated(); });
         this._sessionUpdated();
-    }
+    },
 
     get can_power_off() {
         return this._actions.get(POWER_OFF_ACTION_ID).available;
-    }
+    },
 
     get can_suspend() {
         return this._actions.get(SUSPEND_ACTION_ID).available;
-    }
+    },
 
     get can_lock_screen() {
         return this._actions.get(LOCK_SCREEN_ACTION_ID).available;
-    }
+    },
 
     get can_switch_user() {
         return this._actions.get(SWITCH_USER_ACTION_ID).available;
-    }
+    },
 
     get can_logout() {
         return this._actions.get(LOGOUT_ACTION_ID).available;
-    }
+    },
 
     get can_lock_orientation() {
         return this._actions.get(LOCK_ORIENTATION_ACTION_ID).available;
-    }
+    },
 
     get orientation_lock_icon() {
         return this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName;
-    }
+    },
 
     _sensorProxyAppeared() {
         this._sensorProxy = new SensorProxy(Gio.DBus.system, SENSOR_BUS_NAME, SENSOR_OBJECT_PATH,
@@ -218,7 +227,7 @@ const SystemActions = GObject.registerClass({
                                           () => { this._updateOrientationLock(); });
                 this._updateOrientationLock();
             });
-    }
+    },
 
     _updateOrientationLock() {
         let available = false;
@@ -229,7 +238,7 @@ const SystemActions = GObject.registerClass({
         this._actions.get(LOCK_ORIENTATION_ACTION_ID).available = available;
 
         this.notify('can-lock-orientation');
-    }
+    },
 
     _updateOrientationLockIcon() {
         let locked = this._orientationSettings.get_boolean('orientation-lock');
@@ -238,14 +247,14 @@ const SystemActions = GObject.registerClass({
         this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName = iconName;
 
         this.notify('orientation-lock-icon');
-    }
+    },
 
     _sessionUpdated() {
         this._updateLockScreen();
         this._updatePowerOff();
         this._updateSuspend();
         this._updateMultiUser();
-    }
+    },
 
     forceUpdate() {
         // Whether those actions are available or not depends on both lockdown
@@ -253,7 +262,7 @@ const SystemActions = GObject.registerClass({
         // latter, so their value may be outdated; force an update now
         this._updateHaveShutdown();
         this._updateHaveSuspend();
-    }
+    },
 
     getMatchingActions(terms) {
         // terms is a list of strings
@@ -266,15 +275,15 @@ const SystemActions = GObject.registerClass({
                 results.push(key);
 
         return results;
-    }
+    },
 
     getName(id) {
         return this._actions.get(id).name;
-    }
+    },
 
     getIconName(id) {
         return this._actions.get(id).iconName;
-    }
+    },
 
     activateAction(id) {
         switch (id) {
@@ -297,14 +306,14 @@ const SystemActions = GObject.registerClass({
                 this.activateLockOrientation();
                 break;
         }
-    }
+    },
 
     _updateLockScreen() {
         let showLock = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
         let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
         this._actions.get(LOCK_SCREEN_ACTION_ID).available = showLock && allowLockScreen && LoginManager.canLock();
         this.notify('can-lock-screen');
-    }
+    },
 
     _updateHaveShutdown() {
         this._session.CanShutdownRemote((result, error) => {
@@ -314,7 +323,7 @@ const SystemActions = GObject.registerClass({
             this._canHavePowerOff = result[0];
             this._updatePowerOff();
         });
-    }
+    },
 
     _updatePowerOff() {
         let disabled = Main.sessionMode.isLocked ||
@@ -322,7 +331,7 @@ const SystemActions = GObject.registerClass({
                         this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
         this._actions.get(POWER_OFF_ACTION_ID).available = this._canHavePowerOff && !disabled;
         this.notify('can-power-off');
-    }
+    },
 
     _updateHaveSuspend() {
         this._loginManager.canSuspend(
@@ -331,7 +340,7 @@ const SystemActions = GObject.registerClass({
                 this._suspendNeedsAuth = needsAuth;
                 this._updateSuspend();
             });
-    }
+    },
 
     _updateSuspend() {
         let disabled = (Main.sessionMode.isLocked &&
@@ -340,12 +349,12 @@ const SystemActions = GObject.registerClass({
                         this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
         this._actions.get(SUSPEND_ACTION_ID).available = this._canHaveSuspend && !disabled;
         this.notify('can-suspend');
-    }
+    },
 
     _updateMultiUser() {
         this._updateLogout();
         this._updateSwitchUser();
-    }
+    },
 
     _updateSwitchUser() {
         let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
@@ -357,7 +366,7 @@ const SystemActions = GObject.registerClass({
         this.notify('can-switch-user');
 
         return visible;
-    }
+    },
 
     _updateLogout() {
         let user = this._userManager.get_user(GLib.get_user_name());
@@ -375,7 +384,7 @@ const SystemActions = GObject.registerClass({
         this.notify('can-logout');
 
         return visible;
-    }
+    },
 
     activateLockOrientation() {
         if (!this._actions.get(LOCK_ORIENTATION_ACTION_ID).available)
@@ -383,14 +392,14 @@ const SystemActions = GObject.registerClass({
 
         let locked = this._orientationSettings.get_boolean('orientation-lock');
         this._orientationSettings.set_boolean('orientation-lock', !locked);
-    }
+    },
 
     activateLockScreen() {
         if (!this._actions.get(LOCK_SCREEN_ACTION_ID).available)
             throw new Error('The lock-screen action is not available!');
 
         Main.screenShield.lock(true);
-    }
+    },
 
     activateSwitchUser() {
         if (!this._actions.get(SWITCH_USER_ACTION_ID).available)
@@ -403,7 +412,7 @@ const SystemActions = GObject.registerClass({
             Gdm.goto_login_session_sync(null);
             return false;
         });
-    }
+    },
 
     activateLogout() {
         if (!this._actions.get(LOGOUT_ACTION_ID).available)
@@ -411,14 +420,14 @@ const SystemActions = GObject.registerClass({
 
         Main.overview.hide();
         this._session.LogoutRemote(0);
-    }
+    },
 
     activatePowerOff() {
         if (!this._actions.get(POWER_OFF_ACTION_ID).available)
             throw new Error('The power-off action is not available!');
 
         this._session.ShutdownRemote(0);
-    }
+    },
 
     activateSuspend() {
         if (!this._actions.get(SUSPEND_ACTION_ID).available)

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 Lang = imports.lang;
 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;
@@ -238,13 +243,13 @@ function formatTime(time, params) {
              followed by a time string in 24h format.
              i.e. "May 25, 14:30" */
             // xgettext:no-c-format
-            format = N_("%B %-d, %H\u2236%M");
+            format = N_("%B %d, %H\u2236%M");
         else
             /* Translators: this is the month name, day number, year
              number followed by a time string in 24h format.
              i.e. "May 25 2012, 14:30" */
             // xgettext:no-c-format
-            format = N_("%B %-d %Y, %H\u2236%M");
+            format = N_("%B %d %Y, %H\u2236%M");
     } else {
         // Show only the time if date is on today
         if (daysAgo < 1 || params.timeOnly)
@@ -267,13 +272,13 @@ function formatTime(time, params) {
              followed by a time string in 12h format.
              i.e. "May 25, 2:30 pm" */
             // xgettext:no-c-format
-            format = N_("%B %-d, %l\u2236%M %p");
+            format = N_("%B %d, %l\u2236%M %p");
         else
             /* Translators: this is the month name, day number, year
              number followed by a time string in 12h format.
              i.e. "May 25 2012, 2:30 pm"*/
             // xgettext:no-c-format
-            format = N_("%B %-d %Y, %l\u2236%M %p");
+            format = N_("%B %d %Y, %l\u2236%M %p");
     }
 
     let formattedTime = date.format(Shell.util_translate_time_string(format));
@@ -343,10 +348,12 @@ function insertSorted(array, val, cmp) {
     return pos;
 }
 
-var CloseButton = GObject.registerClass(
-class CloseButton extends St.Button {
+var CloseButton = new Lang.Class({
+    Name: 'CloseButton',
+    Extends: St.Button,
+
     _init(boxpointer) {
-        super._init({ style_class: 'notification-close'});
+        this.parent({ 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
@@ -363,7 +370,7 @@ class CloseButton extends St.Button {
         this._boxPointer = boxpointer;
         if (boxpointer)
             this._boxPointer.connect('arrow-side-changed', this._sync.bind(this));
-    }
+    },
 
     _computeBoxPointerOffset() {
         if (!this._boxPointer || !this._boxPointer.actor.get_stage())
@@ -374,7 +381,7 @@ class CloseButton extends St.Button {
             return this._boxPointer.getArrowHeight();
         else
             return 0;
-    }
+    },
 
     _sync() {
         let themeNode = this.get_theme_node();
@@ -382,12 +389,12 @@ class CloseButton extends St.Button {
         let offY = this._computeBoxPointerOffset();
         this.translation_x = themeNode.get_length('-shell-close-overlap-x')
         this.translation_y = themeNode.get_length('-shell-close-overlap-y') + offY;
-    }
+    },
 
     vfunc_style_changed() {
         this._sync();
-        super.vfunc_style_changed();
-    }
+        this.parent();
+    },
 });
 
 function makeCloseButton(boxpointer) {
@@ -430,8 +437,10 @@ function ensureActorVisibleInScrollView(scrollView, actor) {
                        transition: 'easeOutQuad' });
 }
 
-var AppSettingsMonitor = class {
-    constructor(appId, schemaId) {
+var AppSettingsMonitor = new Lang.Class({
+    Name: 'AppSettingsMonitor',
+
+    _init(appId, schemaId) {
         this._appId = appId;
         this._schemaId = schemaId;
 
@@ -445,23 +454,23 @@ var AppSettingsMonitor = class {
         this._appSystem.connect('installed-changed',
                                 this._onInstalledChanged.bind(this));
         this._onInstalledChanged();
-    }
+    },
 
     get available() {
         return this._app != null && this._settings != null;
-    }
+    },
 
     activateApp() {
         if (this._app)
             this._app.activate();
-    }
+    },
 
     watchSetting(key, callback) {
         let handler = { id: 0, key: key, callback: callback };
         this._handlers.push(handler);
 
         this._connectHandler(handler);
-    }
+    },
 
     _connectHandler(handler) {
         if (!this._settings || handler.id > 0)
@@ -470,13 +479,13 @@ var AppSettingsMonitor = class {
         handler.id = this._settings.connect('changed::' + handler.key,
                                             handler.callback);
         handler.callback(this._settings, handler.key);
-    }
+    },
 
     _disconnectHandler(handler) {
         if (this._settings && handler.id > 0)
             this._settings.disconnect(handler.id);
         handler.id = 0;
-    }
+    },
 
     _onInstalledChanged() {
         let hadApp = (this._app != null);
@@ -490,7 +499,7 @@ var AppSettingsMonitor = class {
             this._checkSettings();
         else
             this._setSettings(null);
-    }
+    },
 
     _setSettings(settings) {
         this._handlers.forEach((handler) => { this._disconnectHandler(handler); });
@@ -503,7 +512,7 @@ var AppSettingsMonitor = class {
 
         if (hadSettings != haveSettings)
             this.emit('available-changed');
-    }
+    },
 
     _checkSettings() {
         let schema = this._schemaSource.lookup(this._schemaId, true);
@@ -516,5 +525,5 @@ var AppSettingsMonitor = class {
             });
         }
     }
-};
+});
 Signals.addSignalMethods(AppSettingsMonitor.prototype);

js/misc/weather.js

@@ -1,6 +1,10 @@
 // -*- 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 Lang = imports.lang;
 const Signals = imports.signals;
 
 const PermissionStore = imports.misc.permissionStore;
@@ -9,8 +13,10 @@ const Util = imports.misc.util;
 // Minimum time between updates to show loading indication
 var UPDATE_THRESHOLD = 10 * GLib.TIME_SPAN_MINUTE;
 
-var WeatherClient = class {
-    constructor() {
+var WeatherClient = new Lang.Class({
+    Name: 'WeatherClient',
+
+    _init() {
         this._loading = false;
         this._locationValid = false;
         this._lastUpdate = GLib.DateTime.new_from_unix_local(0);
@@ -30,14 +36,6 @@ var WeatherClient = class {
                 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);
@@ -66,34 +64,34 @@ var WeatherClient = class {
             this.emit('changed');
         });
 
-        this._weatherAppMon = new Util.AppSettingsMonitor('org.gnome.Weather.desktop',
-                                                          'org.gnome.Weather');
+        this._weatherAppMon = new Util.AppSettingsMonitor('org.gnome.Weather.Application.desktop',
+                                                          'org.gnome.Weather.Application');
         this._weatherAppMon.connect('available-changed', () => { this.emit('changed'); });
         this._weatherAppMon.watchSetting('automatic-location',
                                          this._onAutomaticLocationChanged.bind(this));
         this._weatherAppMon.watchSetting('locations',
                                          this._onLocationsChanged.bind(this));
-    }
+    },
 
     get available() {
         return this._weatherAppMon.available;
-    }
+    },
 
     get loading() {
         return this._loading;
-    }
+    },
 
     get hasLocation() {
         return this._locationValid;
-    }
+    },
 
     get info() {
         return this._weatherInfo;
-    }
+    },
 
     activateApp() {
         this._weatherAppMon.activateApp();
-    }
+    },
 
     update() {
         if (!this._locationValid)
@@ -106,13 +104,13 @@ var WeatherClient = class {
             this._weatherInfo.update();
         else
             this._loadInfo();
-    }
+    },
 
     get _useAutoLocation() {
         return this._autoLocationRequested &&
                this._locationSettings.get_boolean('enabled') &&
                this._weatherAuthorized;
-    }
+    },
 
     _loadInfo() {
         let id = this._weatherInfo.connect('updated', () => {
@@ -124,7 +122,7 @@ var WeatherClient = class {
         this.emit('changed');
 
         this._weatherInfo.update();
-    }
+    },
 
     _locationsEqual(loc1, loc2) {
         if (loc1 == loc2)
@@ -134,7 +132,7 @@ var WeatherClient = class {
             return false;
 
         return loc1.equal(loc2);
-    }
+    },
 
     _setLocation(location) {
         if (this._locationsEqual(this._weatherInfo.location, location))
@@ -150,7 +148,7 @@ var WeatherClient = class {
             this._loadInfo();
         else
             this.emit('changed');
-    }
+    },
 
     _updateLocationMonitoring() {
         if (this._useAutoLocation) {
@@ -166,7 +164,7 @@ var WeatherClient = class {
                 this._gclueService.disconnect(this._gclueLocationChangedId);
             this._gclueLocationChangedId = 0;
         }
-    }
+    },
 
     _startGClueService() {
         if (this._gclueStarting)
@@ -187,7 +185,7 @@ var WeatherClient = class {
                 this._gclueService.get_client().distance_threshold = 100;
                 this._updateLocationMonitoring();
             });
-    }
+    },
 
     _onGClueLocationChanged() {
         let geoLocation = this._gclueService.location;
@@ -196,7 +194,7 @@ var WeatherClient = class {
                                                       geoLocation.latitude,
                                                       geoLocation.longitude);
         this._setLocation(location);
-    }
+    },
 
     _onAutomaticLocationChanged(settings, key) {
         let useAutoLocation = settings.get_boolean(key);
@@ -206,7 +204,7 @@ var WeatherClient = class {
         this._autoLocationRequested = useAutoLocation;
 
         this._updateAutoLocation();
-    }
+    },
 
     _updateAutoLocation() {
         this._updateLocationMonitoring();
@@ -215,7 +213,7 @@ var WeatherClient = class {
             this._startGClueService();
         else
             this._setLocation(this._mostRecentLocation);
-    }
+    },
 
     _onLocationsChanged(settings, key) {
         let serialized = settings.get_value(key).deep_unpack().shift();
@@ -231,7 +229,7 @@ var WeatherClient = class {
 
         if (!this._useAutoLocation || !this._gclueStarted)
             this._setLocation(this._mostRecentLocation);
-    }
+    },
 
     _onPermStoreChanged(proxy, sender, params) {
         let [table, id, deleted, data, perms] = params;
@@ -239,11 +237,11 @@ 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';
 
         this._updateAutoLocation();
     }
-};
+});
 Signals.addSignalMethods(WeatherClient.prototype);

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" },
@@ -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");

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" },
@@ -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({
-        schema_id: 'org.gnome.desktop.interface'
-    });
-    interfaceSettings.set_boolean('enable-animations', false);
+    Gtk.Settings.get_default().gtk_enable_animations = false;
 
     Scripting.scriptEvent('overviewShowStart');
     Main.overview.show();
@@ -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;

js/portalHelper/main.js

@@ -1,6 +1,13 @@
 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 Lang = imports.lang;
+const Pango = imports.gi.Pango;
+const Soup = imports.gi.Soup;
+const WebKit = imports.gi.WebKit2;
 
 const _ = Gettext.gettext;
 
@@ -26,10 +33,12 @@ const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
 
 const HelperDBusInterface = loadInterfaceXML('org.gnome.Shell.PortalHelper');
 
-var PortalHeaderBar = GObject.registerClass(
-class PortalHeaderBar extends Gtk.HeaderBar {
+var PortalHeaderBar = new Lang.Class({
+    Name: 'PortalHeaderBar',
+    Extends: Gtk.HeaderBar,
+
     _init() {
-        super._init({ show_close_button: true });
+        this.parent({ show_close_button: true });
 
         // See ephy-title-box.c in epiphany for the layout
         let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL,
@@ -64,11 +73,11 @@ class PortalHeaderBar extends Gtk.HeaderBar {
         hbox.add(this.subtitleLabel);
 
         vbox.show_all();
-    }
+    },
 
     setSubtitle(label) {
         this.subtitleLabel.set_text(label);
-    }
+    },
 
     setSecurityIcon(securityLevel) {
         switch (securityLevel) {
@@ -86,13 +95,15 @@ class PortalHeaderBar extends Gtk.HeaderBar {
             this._lockImage.set_tooltip_text(_('Your connection to this hotspot login is not secure. Passwords or other information you enter on this page can be viewed by people nearby.'));
             break;
         }
-    }
+    },
 });
 
-var PortalWindow = GObject.registerClass(
-class PortalWindow extends Gtk.ApplicationWindow {
+var PortalWindow = new Lang.Class({
+    Name: 'PortalWindow',
+    Extends: Gtk.ApplicationWindow,
+
     _init(application, url, timestamp, doneCallback) {
-        super._init({ application: application });
+        this.parent({ application: application });
 
         this.connect('delete-event', this.destroyWindow.bind(this));
         this._headerBar = new PortalHeaderBar();
@@ -133,11 +144,11 @@ class PortalWindow extends Gtk.ApplicationWindow {
         this.present_with_time(timestamp);
 
         this.application.set_accels_for_action('app.quit', ['<Primary>q', '<Primary>w']);
-    }
+    },
 
     destroyWindow() {
         this.destroy();
-    }
+    },
 
     _syncUri() {
         let uri = this._webView.uri;
@@ -145,12 +156,12 @@ class PortalWindow extends Gtk.ApplicationWindow {
             this._headerBar.setSubtitle(GLib.uri_unescape_string(uri, null));
         else
             this._headerBar.setSubtitle('');
-    }
+    },
 
     refresh() {
         this._everSeenRedirect = false;
         this._webView.load_uri(this._originalUrl);
-    }
+    },
 
     vfunc_delete_event(event) {
         if (this._recheckAtExit)
@@ -158,7 +169,7 @@ class PortalWindow extends Gtk.ApplicationWindow {
         else
             this._doneCallback(PortalHelperResult.CANCELLED);
         return false;
-    }
+    },
 
     _onLoadChanged(view, loadEvent) {
         if (loadEvent == WebKit.LoadEvent.STARTED) {
@@ -172,11 +183,11 @@ class PortalWindow extends Gtk.ApplicationWindow {
             else
                 this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.INSECURE);
         }
-    }
+    },
 
     _onInsecureContentDetected() {
         this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.INSECURE);
-    }
+    },
 
     _onLoadFailedWithTlsErrors(view, failingURI, certificate, errors) {
         this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.INSECURE);
@@ -184,7 +195,7 @@ class PortalWindow extends Gtk.ApplicationWindow {
         this._webContext.allow_tls_certificate_for_host(certificate, uri.get_host());
         this._webView.load_uri(failingURI);
         return true;
-    }
+    },
 
     _onDecidePolicy(view, decision, type) {
         if (type == WebKit.PolicyDecisionType.NEW_WINDOW_ACTION) {
@@ -251,13 +262,15 @@ class PortalWindow extends Gtk.ApplicationWindow {
 
         decision.use();
         return true;
-    }
+    },
 });
 
-var WebPortalHelper = GObject.registerClass(
-class WebPortalHelper extends Gtk.Application {
+var WebPortalHelper = new Lang.Class({
+    Name: 'WebPortalHelper',
+    Extends: Gtk.Application,
+
     _init() {
-        super._init({ application_id: 'org.gnome.Shell.PortalHelper',
+        this.parent({ application_id: 'org.gnome.Shell.PortalHelper',
                       flags: Gio.ApplicationFlags.IS_SERVICE,
                       inactivity_timeout: 30000 });
 
@@ -267,30 +280,30 @@ class WebPortalHelper extends Gtk.Application {
         let action = new Gio.SimpleAction({ name: 'quit' });
         action.connect('activate', () => { this.active_window.destroyWindow(); });
         this.add_action(action);
-    }
+    },
 
     vfunc_dbus_register(connection, path) {
         this._dbusImpl.export(connection, path);
-        super.vfunc_dbus_register(connection, path);
+        this.parent(connection, path);
         return true;
-    }
+    },
 
     vfunc_dbus_unregister(connection, path) {
         this._dbusImpl.unexport_from_connection(connection);
-        super.vfunc_dbus_unregister(connection, path);
-    }
+        this.parent(connection, path);
+    },
 
     vfunc_activate() {
         // If launched manually (for example for testing), force a dummy authentication
         // session with the default url
         this.Authenticate('/org/gnome/dummy', '', 0);
-    }
+    },
 
     Authenticate(connection, url, timestamp) {
         this._queue.push({ connection: connection, url: url, timestamp: timestamp });
 
         this._processQueue();
-    }
+    },
 
     Close(connection) {
         for (let i = 0; i < this._queue.length; i++) {
@@ -305,7 +318,7 @@ class WebPortalHelper extends Gtk.Application {
         }
 
         this._processQueue();
-    }
+    },
 
     Refresh(connection) {
         for (let i = 0; i < this._queue.length; i++) {
@@ -317,7 +330,7 @@ class WebPortalHelper extends Gtk.Application {
                 break;
             }
         }
-    }
+    },
 
     _processQueue() {
         if (this._queue.length == 0)
@@ -330,7 +343,7 @@ class WebPortalHelper extends Gtk.Application {
         top.window = new PortalWindow(this, top.url, top.timestamp, result => {
             this._dbusImpl.emit_signal('Done', new GLib.Variant('(ou)', [top.connection, result]));
         });
-    }
+    },
 });
 
 function initEnvironment() {

js/ui/accessDialog.js

@@ -1,4 +1,10 @@
-const { Clutter, Gio, GLib, Shell } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+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,9 +21,12 @@ var DialogResponse = {
     CLOSED: 2
 };
 
-var AccessDialog = class extends ModalDialog.ModalDialog {
-    constructor(invocation, handle, title, subtitle, body, options) {
-        super({ styleClass: 'access-dialog' });
+var AccessDialog = new Lang.Class({
+    Name: 'AccessDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init(invocation, handle, title, subtitle, body, options) {
+        this.parent({ styleClass: 'access-dialog' });
 
         this._invocation = invocation;
         this._handle = handle;
@@ -29,7 +38,7 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
             options[option] = options[option].deep_unpack();
 
         this._buildLayout(title, subtitle, body, options);
-    }
+    },
 
     _buildLayout(title, subtitle, body, options) {
         // No support for non-modal system dialogs, so ignore the option
@@ -69,14 +78,14 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
                          action: () => {
                              this._sendResponse(DialogResponse.OK);
                          }});
-    }
+    },
 
     open() {
-        super.open();
+        this.parent();
 
         let connection = this._invocation.get_connection();
         this._requestExported = this._request.export(connection, this._handle);
-    }
+    },
 
     CloseAsync(invocation, params) {
         if (this._invocation.get_sender() != invocation.get_sender()) {
@@ -87,7 +96,7 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
         }
 
         this._sendResponse(DialogResponse.CLOSED);
-    }
+    },
 
     _sendResponse(response) {
         if (this._requestExported)
@@ -109,10 +118,12 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
         });
         this.close();
     }
-};
+});
 
-var AccessDialogDBus = class {
-    constructor() {
+var AccessDialogDBus = new Lang.Class({
+    Name: 'AccessDialogDBus',
+
+    _init() {
         this._accessDialog = null;
 
         this._windowTracker = Shell.WindowTracker.get_default();
@@ -121,7 +132,7 @@ var AccessDialogDBus = class {
         this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/portal/desktop');
 
         Gio.DBus.session.own_name('org.freedesktop.impl.portal.desktop.gnome', Gio.BusNameOwnerFlags.REPLACE, null, null);
-    }
+    },
 
     AccessDialogAsync(params, invocation) {
         if (this._accessDialog) {
@@ -149,4 +160,4 @@ var AccessDialogDBus = class {
 
         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 Lang = imports.lang;
 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;
@@ -51,10 +58,12 @@ function getWindows(workspace) {
     }).filter((w, i, a) => !w.skip_taskbar && a.indexOf(w) == i);
 }
 
-var AppSwitcherPopup = GObject.registerClass(
-class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
+var AppSwitcherPopup = new Lang.Class({
+    Name: 'AppSwitcherPopup',
+    Extends: SwitcherPopup.SwitcherPopup,
+
     _init() {
-        super._init();
+        this.parent();
 
         this._thumbnails = null;
         this._thumbnailTimeoutId = 0;
@@ -69,45 +78,45 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
 
         this._switcherList = new AppSwitcher(apps, this);
         this._items = this._switcherList.icons;
-    }
+    },
 
-    vfunc_allocate(box, flags) {
-        super.vfunc_allocate(box, flags);
+    _allocate(actor, box, flags) {
+        this.parent(actor, box, flags);
 
         // Allocate the thumbnails
         // We try to avoid overflowing the screen so we base the resulting size on
         // those calculations
         if (this._thumbnails) {
-            let childBox = this._switcherList.get_allocation_box();
+            let childBox = this._switcherList.actor.get_allocation_box();
             let primary = Main.layoutManager.primaryMonitor;
 
-            let leftPadding = this.get_theme_node().get_padding(St.Side.LEFT);
-            let rightPadding = this.get_theme_node().get_padding(St.Side.RIGHT);
-            let bottomPadding = this.get_theme_node().get_padding(St.Side.BOTTOM);
+            let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
+            let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
+            let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
             let hPadding = leftPadding + rightPadding;
 
-            let icon = this._items[this._selectedIndex];
+            let icon = this._items[this._selectedIndex].actor;
             let [posX, posY] = icon.get_transformed_position();
             let thumbnailCenter = posX + icon.width / 2;
-            let [childMinWidth, childNaturalWidth] = this._thumbnails.get_preferred_width(-1);
+            let [childMinWidth, childNaturalWidth] = this._thumbnails.actor.get_preferred_width(-1);
             childBox.x1 = Math.max(primary.x + leftPadding, Math.floor(thumbnailCenter - childNaturalWidth / 2));
             if (childBox.x1 + childNaturalWidth > primary.x + primary.width - hPadding) {
                 let offset = childBox.x1 + childNaturalWidth - primary.width + hPadding;
                 childBox.x1 = Math.max(primary.x + leftPadding, childBox.x1 - offset - hPadding);
             }
 
-            let spacing = this.get_theme_node().get_length('spacing');
+            let spacing = this.actor.get_theme_node().get_length('spacing');
 
             childBox.x2 = childBox.x1 +  childNaturalWidth;
             if (childBox.x2 > primary.x + primary.width - rightPadding)
                 childBox.x2 = primary.x + primary.width - rightPadding;
-            childBox.y1 = this._switcherList.allocation.y2 + spacing;
+            childBox.y1 = this._switcherList.actor.allocation.y2 + spacing;
             this._thumbnails.addClones(primary.y + primary.height - bottomPadding - childBox.y1);
-            let [childMinHeight, childNaturalHeight] = this._thumbnails.get_preferred_height(-1);
+            let [childMinHeight, childNaturalHeight] = this._thumbnails.actor.get_preferred_height(-1);
             childBox.y2 = childBox.y1 + childNaturalHeight;
-            this._thumbnails.allocate(childBox, flags);
+            this._thumbnails.actor.allocate(childBox, flags);
         }
-    }
+    },
 
     _initialSelection(backward, binding) {
         if (binding == 'switch-group') {
@@ -130,7 +139,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         } else {
             this._select(1);
         }
-    }
+    },
 
     _nextWindow() {
         // We actually want the second window if we're in the unset state
@@ -138,15 +147,14 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             this._currentWindow = 0;
         return SwitcherPopup.mod(this._currentWindow + 1,
                                  this._items[this._selectedIndex].cachedWindows.length);
-    }
-
+    },
     _previousWindow() {
         // Also assume second window here
         if (this._currentWindow == -1)
             this._currentWindow = 1;
         return SwitcherPopup.mod(this._currentWindow - 1,
                                  this._items[this._selectedIndex].cachedWindows.length);
-    }
+    },
 
     _closeAppWindow(appIndex, windowIndex) {
         let appIcon = this._items[appIndex];
@@ -158,7 +166,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             return;
 
         window.delete(global.get_current_time());
-    }
+    },
 
     _quitApplication(appIndex) {
         let appIcon = this._items[appIndex];
@@ -166,7 +174,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             return;
 
         appIcon.app.request_quit();
-    }
+    },
 
     _keyPressHandler(keysym, action) {
         if (action == Meta.KeyBindingAction.SWITCH_GROUP) {
@@ -205,7 +213,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         }
 
         return Clutter.EVENT_STOP;
-    }
+    },
 
     _scrollHandler(direction) {
         if (direction == Clutter.ScrollDirection.UP) {
@@ -235,7 +243,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
                     this._select(this._next());
             }
         }
-    }
+    },
 
     _itemActivatedHandler(n) {
         // If the user clicks on the selected app, activate the
@@ -245,24 +253,24 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             this._select(n, this._currentWindow);
         else
             this._select(n);
-    }
+    },
 
     _itemEnteredHandler(n) {
         this._select(n);
-    }
+    },
 
     _windowActivated(thumbnailList, n) {
         let appIcon = this._items[this._selectedIndex];
         Main.activateWindow(appIcon.cachedWindows[n]);
-        this.fadeAndDestroy();
-    }
+        this.destroy();
+    },
 
     _windowEntered(thumbnailList, n) {
         if (!this.mouseActive)
             return;
 
         this._select(this._selectedIndex, n);
-    }
+    },
 
     _windowRemoved(thumbnailList, n) {
         let appIcon = this._items[this._selectedIndex];
@@ -273,7 +281,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             let newIndex = Math.min(n, appIcon.cachedWindows.length - 1);
             this._select(this._selectedIndex, newIndex);
         }
-    }
+    },
 
     _finish(timestamp) {
         let appIcon = this._items[this._selectedIndex];
@@ -282,17 +290,17 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         else if (appIcon.cachedWindows[this._currentWindow])
             Main.activateWindow(appIcon.cachedWindows[this._currentWindow], timestamp);
 
-        super._finish(timestamp);
-    }
+        this.parent();
+    },
 
     _onDestroy() {
-        super._onDestroy();
+        this.parent();
 
         if (this._thumbnails)
             this._destroyThumbnails();
         if (this._thumbnailTimeoutId != 0)
             Mainloop.source_remove(this._thumbnailTimeoutId);
-    }
+    },
 
     /**
      * _select:
@@ -348,7 +356,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
                 this._timeoutPopupThumbnails.bind(this));
             GLib.Source.set_name_by_id(this._thumbnailTimeoutId, '[gnome-shell] this._timeoutPopupThumbnails');
         }
-    }
+    },
 
     _timeoutPopupThumbnails() {
         if (!this._thumbnails)
@@ -356,10 +364,10 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         this._thumbnailTimeoutId = 0;
         this._thumbnailsFocused = false;
         return GLib.SOURCE_REMOVE;
-    }
+    },
 
     _destroyThumbnails() {
-        let thumbnailsActor = this._thumbnails;
+        let thumbnailsActor = this._thumbnails.actor;
         Tweener.addTween(thumbnailsActor,
                          { opacity: 0,
                            time: THUMBNAIL_FADE_TIME,
@@ -370,28 +378,28 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
                            }
                          });
         this._thumbnails = null;
-        if (this._switcherList._items[this._selectedIndex])
+        if  (this._switcherList._items[this._selectedIndex])
             this._switcherList._items[this._selectedIndex].remove_accessible_state (Atk.StateType.EXPANDED);
-    }
+    },
 
     _createThumbnails() {
         this._thumbnails = new ThumbnailList (this._items[this._selectedIndex].cachedWindows);
         this._thumbnails.connect('item-activated', this._windowActivated.bind(this));
         this._thumbnails.connect('item-entered', this._windowEntered.bind(this));
         this._thumbnails.connect('item-removed', this._windowRemoved.bind(this));
-        this._thumbnails.connect('destroy', () => {
+        this._thumbnails.actor.connect('destroy', () => {
             this._thumbnails = null;
             this._thumbnailsFocused = false;
         });
 
-        this.add_actor(this._thumbnails);
+        this.actor.add_actor(this._thumbnails.actor);
 
         // Need to force an allocation so we can figure out whether we
         // need to scroll when selecting
-        this._thumbnails.get_allocation_box();
+        this._thumbnails.actor.get_allocation_box();
 
-        this._thumbnails.opacity = 0;
-        Tweener.addTween(this._thumbnails,
+        this._thumbnails.actor.opacity = 0;
+        Tweener.addTween(this._thumbnails.actor,
                          { opacity: 255,
                            time: THUMBNAIL_FADE_TIME,
                            transition: 'easeOutQuad',
@@ -402,8 +410,10 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
     }
 });
 
-class CyclerHighlight {
-    constructor() {
+var CyclerHighlight = new Lang.Class({
+    Name: 'CyclerHighlight',
+
+    _init() {
         this._window = null;
 
         this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout() });
@@ -423,7 +433,7 @@ class CyclerHighlight {
         this.actor.connect('notify::allocation',
                            this._onAllocationChanged.bind(this));
         this.actor.connect('destroy', this._onDestroy.bind(this));
-    }
+    },
 
     set window(w) {
         if (this._window == w)
@@ -441,7 +451,7 @@ class CyclerHighlight {
             windowActor.hide();
 
         this._clone.source = windowActor;
-    }
+    },
 
     _onAllocationChanged() {
         if (!this._window) {
@@ -454,33 +464,20 @@ class CyclerHighlight {
             this._highlight.set_position(rect.x - x, rect.y - y);
             this._highlight.show();
         }
-    }
+    },
 
     _onDestroy() {
         this.window = null;
     }
-};
-
-// We don't show an actual popup, so just provide what SwitcherPopup
-// expects instead of inheriting from SwitcherList
-var CyclerList = GObject.registerClass({
-    Signals: { 'item-activated': { param_types: [GObject.TYPE_INT] },
-               'item-entered': { param_types: [GObject.TYPE_INT] },
-               'item-removed': { param_types: [GObject.TYPE_INT] },
-               'item-highlighted': { param_types: [GObject.TYPE_INT] } },
-}, class CyclerList extends St.Widget {
-    highlight(index, justOutline) {
-        this.emit('item-highlighted', index);
-    }
 });
 
-var CyclerPopup = GObject.registerClass(
-class CyclerPopup extends SwitcherPopup.SwitcherPopup {
-    _init() {
-        if (new.target === CyclerPopup)
-            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
+var CyclerPopup = new Lang.Class({
+    Name: 'CyclerPopup',
+    Extends: SwitcherPopup.SwitcherPopup,
+    Abstract: true,
 
-        super._init();
+    _init() {
+        this.parent();
 
         this._items = this._getWindows();
 
@@ -490,16 +487,17 @@ class CyclerPopup extends SwitcherPopup.SwitcherPopup {
         this._highlight = new CyclerHighlight();
         global.window_group.add_actor(this._highlight.actor);
 
-        this._switcherList = new CyclerList();
-        this._switcherList.connect('item-highlighted', (list, index) => {
-            this._highlightItem(index);
-        });
-    }
+        // We don't show an actual popup, so just provide what SwitcherPopup
+        // expects instead of inheriting from SwitcherList
+        this._switcherList = { actor: new St.Widget(),
+                               highlight: this._highlightItem.bind(this),
+                               connect() {} };
+    },
 
     _highlightItem(index, justOutline) {
         this._highlight.window = this._items[index];
         global.window_group.set_child_above_sibling(this._highlight.actor, null);
-    }
+    },
 
     _finish() {
         let window = this._items[this._selectedIndex];
@@ -524,23 +522,25 @@ class CyclerPopup extends SwitcherPopup.SwitcherPopup {
             Main.wm.actionMoveWindow(window, ws);
         }
 
-        super._finish();
-    }
+        this.parent();
+    },
 
     _onDestroy() {
         this._highlight.actor.destroy();
 
-        super._onDestroy();
+        this.parent();
     }
 });
 
 
-var GroupCyclerPopup = GObject.registerClass(
-class GroupCyclerPopup extends CyclerPopup {
+var GroupCyclerPopup = new Lang.Class({
+    Name: 'GroupCyclerPopup',
+    Extends: CyclerPopup,
+
     _getWindows() {
         let app = Shell.WindowTracker.get_default().focus_app;
         return app ? app.get_windows() : [];
-    }
+    },
 
     _keyPressHandler(keysym, action) {
         if (action == Meta.KeyBindingAction.CYCLE_GROUP)
@@ -554,10 +554,12 @@ class GroupCyclerPopup extends CyclerPopup {
     }
 });
 
-var WindowSwitcherPopup = GObject.registerClass(
-class WindowSwitcherPopup extends SwitcherPopup.SwitcherPopup {
+var WindowSwitcherPopup = new Lang.Class({
+    Name: 'WindowSwitcherPopup',
+    Extends: SwitcherPopup.SwitcherPopup,
+
     _init() {
-        super._init();
+        this.parent();
         this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
 
         let windows = this._getWindowList();
@@ -568,7 +570,7 @@ class WindowSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         let mode = this._settings.get_enum('app-icon-mode');
         this._switcherList = new WindowList(windows, mode);
         this._items = this._switcherList.icons;
-    }
+    },
 
     _getWindowList() {
         let workspace = null;
@@ -580,7 +582,7 @@ class WindowSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         }
 
         return getWindows(workspace);
-    }
+    },
 
     _closeWindow(windowIndex) {
         let windowIcon = this._items[windowIndex];
@@ -588,7 +590,7 @@ class WindowSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             return;
 
         windowIcon.window.delete(global.get_current_time());
-    }
+    },
 
     _keyPressHandler(keysym, action) {
         if (action == Meta.KeyBindingAction.SWITCH_WINDOWS) {
@@ -607,21 +609,23 @@ class WindowSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         }
 
         return Clutter.EVENT_STOP;
-    }
+    },
 
     _finish() {
         Main.activateWindow(this._items[this._selectedIndex].window);
 
-        super._finish();
+        this.parent();
     }
 });
 
-var WindowCyclerPopup = GObject.registerClass(
-class WindowCyclerPopup extends CyclerPopup {
+var WindowCyclerPopup = new Lang.Class({
+    Name: 'WindowCyclerPopup',
+    Extends: CyclerPopup,
+
     _init() {
         this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
-        super._init();
-    }
+        this.parent();
+    },
 
     _getWindows() {
         let workspace = null;
@@ -633,7 +637,7 @@ class WindowCyclerPopup extends CyclerPopup {
         }
 
         return getWindows(workspace);
-    }
+    },
 
     _keyPressHandler(keysym, action) {
         if (action == Meta.KeyBindingAction.CYCLE_WINDOWS)
@@ -647,39 +651,33 @@ class WindowCyclerPopup extends CyclerPopup {
     }
 });
 
-var AppIcon = GObject.registerClass(
-class AppIcon extends St.BoxLayout {
-    _init(app) {
-        super._init({ style_class: 'alt-tab-app',
-                      vertical: true });
+var AppIcon = new Lang.Class({
+    Name: 'AppIcon',
 
+    _init(app) {
         this.app = app;
+        this.actor = new St.BoxLayout({ style_class: 'alt-tab-app',
+                                         vertical: true });
         this.icon = null;
         this._iconBin = new St.Bin({ x_fill: true, y_fill: true });
 
-        this.add(this._iconBin, { x_fill: false, y_fill: false } );
+        this.actor.add(this._iconBin, { x_fill: false, y_fill: false } );
         this.label = new St.Label({ text: this.app.get_name() });
-        this.add(this.label, { x_fill: false });
-    }
+        this.actor.add(this.label, { x_fill: false });
+    },
 
     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];
     }
 });
 
-var AppSwitcher = GObject.registerClass(
-class AppSwitcher extends SwitcherPopup.SwitcherList {
+var AppSwitcher = new Lang.Class({
+    Name: 'AppSwitcher',
+    Extends: SwitcherPopup.SwitcherList,
+
     _init(apps, altTabPopup) {
-        super._init(true);
+        this.parent(true);
 
         this.icons = [];
         this._arrows = [];
@@ -709,11 +707,12 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
         }
 
         this._curApp = -1;
+        this._iconSize = 0;
         this._altTabPopup = altTabPopup;
         this._mouseTimeOutId = 0;
 
-        this.connect('destroy', this._onDestroy.bind(this));
-    }
+        this.actor.connect('destroy', this._onDestroy.bind(this));
+    },
 
     _onDestroy() {
         if (this._mouseTimeOutId != 0)
@@ -722,7 +721,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
         this.icons.forEach(icon => {
             icon.app.disconnect(icon._stateChangedId);
         });
-    }
+    },
 
     _setIconSize() {
         let j = 0;
@@ -739,16 +738,17 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
 
         // We just assume the whole screen here due to weirdness happing with the passed width
         let primary = Main.layoutManager.primaryMonitor;
-        let parentPadding = this.get_parent().get_theme_node().get_horizontal_padding();
-        let availWidth = primary.width - parentPadding - this.get_theme_node().get_horizontal_padding();
+        let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
+        let availWidth = primary.width - parentPadding - this.actor.get_theme_node().get_horizontal_padding();
 
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
         let iconSizes = baseIconSizes.map(s => s * scaleFactor);
-        let iconSize = baseIconSizes[0];
 
-        if (this._items.length > 1) {
+        if (this._items.length == 1) {
+            this._iconSize = baseIconSizes[0];
+        } else {
             for(let i =  0; i < baseIconSizes.length; i++) {
-                iconSize = baseIconSizes[i];
+                this._iconSize = baseIconSizes[i];
                 let height = iconSizes[i] + iconSpacing;
                 let w = height * this._items.length + totalSpacing;
                 if (w <= availWidth)
@@ -756,40 +756,36 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
             }
         }
 
-        this._iconSize = iconSize;
-
         for(let i = 0; i < this.icons.length; i++) {
             if (this.icons[i].icon != null)
                 break;
-            this.icons[i].set_size(iconSize);
+            this.icons[i].set_size(this._iconSize);
         }
-    }
+    },
 
-    vfunc_get_preferred_height(forWidth) {
+    _getPreferredHeight(actor, forWidth, alloc) {
         this._setIconSize();
-        return super.vfunc_get_preferred_height(forWidth);
-    }
+        this.parent(actor, forWidth, alloc);
+    },
 
-    vfunc_allocate(box, flags) {
+    _allocate(actor, box, flags) {
         // Allocate the main list items
-        super.vfunc_allocate(box, flags);
+        this.parent(actor, box, flags);
 
-        let contentBox = this.get_theme_node().get_content_box(box);
-
-        let arrowHeight = Math.floor(this.get_theme_node().get_padding(St.Side.BOTTOM) / 3);
+        let arrowHeight = Math.floor(this.actor.get_theme_node().get_padding(St.Side.BOTTOM) / 3);
         let arrowWidth = arrowHeight * 2;
 
         // Now allocate each arrow underneath its item
         let childBox = new Clutter.ActorBox();
         for (let i = 0; i < this._items.length; i++) {
             let itemBox = this._items[i].allocation;
-            childBox.x1 = contentBox.x1 + Math.floor(itemBox.x1 + (itemBox.x2 - itemBox.x1 - arrowWidth) / 2);
+            childBox.x1 = Math.floor(itemBox.x1 + (itemBox.x2 - itemBox.x1 - arrowWidth) / 2);
             childBox.x2 = childBox.x1 + arrowWidth;
-            childBox.y1 = contentBox.y1 + itemBox.y2 + arrowHeight;
+            childBox.y1 = itemBox.y2 + arrowHeight;
             childBox.y2 = childBox.y1 + arrowHeight;
             this._arrows[i].allocate(childBox, flags);
         }
-    }
+    },
 
     // We override SwitcherList's _onItemEnter method to delay
     // activation when the thumbnail list is open
@@ -806,14 +802,14 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
             GLib.Source.set_name_by_id(this._mouseTimeOutId, '[gnome-shell] this._enterItem');
         } else
            this._itemEntered(index);
-    }
+    },
 
     _enterItem(index) {
         let [x, y, mask] = global.get_pointer();
         let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y);
         if (this._items[index].contains(pickedActor))
             this._itemEntered(index);
-    }
+    },
 
     // We override SwitcherList's highlight() method to also deal with
     // the AppSwitcher->ThumbnailList arrows. Apps with only 1 window
@@ -830,7 +826,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
                 this._arrows[this._curApp].remove_style_pseudo_class('highlighted');
         }
 
-        super.highlight(n, justOutline);
+        this.parent(n, justOutline);
         this._curApp = n;
 
         if (this._curApp != -1) {
@@ -839,11 +835,11 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
             else
                 this._arrows[this._curApp].add_style_pseudo_class('highlighted');
         }
-    }
+    },
 
     _addIcon(appIcon) {
         this.icons.push(appIcon);
-        let item = this.addItem(appIcon, appIcon.label);
+        let item = this.addItem(appIcon.actor, appIcon.label);
 
         appIcon._stateChangedId = appIcon.app.connect('notify::state', app => {
             if (app.state != Shell.AppState.RUNNING)
@@ -853,14 +849,14 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
         let n = this._arrows.length;
         let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
         arrow.connect('repaint', () => { SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM); });
-        this.add_actor(arrow);
+        this._list.add_actor(arrow);
         this._arrows.push(arrow);
 
         if (appIcon.cachedWindows.length == 1)
             arrow.hide();
         else
             item.add_accessible_state (Atk.StateType.EXPANDABLE);
-    }
+    },
 
     _removeIcon(app) {
         let index = this.icons.findIndex(icon => {
@@ -871,13 +867,15 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
 
         this.icons.splice(index, 1);
         this.removeItem(index);
-    }
+    },
 });
 
-var ThumbnailList = GObject.registerClass(
-class ThumbnailList extends SwitcherPopup.SwitcherList {
+var ThumbnailList = new Lang.Class({
+    Name: 'ThumbnailList',
+    Extends: SwitcherPopup.SwitcherList,
+
     _init(windows) {
-        super._init(false);
+        this.parent(false);
 
         this._labels = new Array();
         this._thumbnailBins = new Array();
@@ -909,21 +907,21 @@ class ThumbnailList extends SwitcherPopup.SwitcherList {
 
         }
 
-        this.connect('destroy', this._onDestroy.bind(this));
-    }
+        this.actor.connect('destroy', this._onDestroy.bind(this));
+    },
 
     addClones(availHeight) {
         if (!this._thumbnailBins.length)
             return;
         let totalPadding = this._items[0].get_theme_node().get_horizontal_padding() + this._items[0].get_theme_node().get_vertical_padding();
-        totalPadding += this.get_theme_node().get_horizontal_padding() + this.get_theme_node().get_vertical_padding();
+        totalPadding += this.actor.get_theme_node().get_horizontal_padding() + this.actor.get_theme_node().get_vertical_padding();
         let [labelMinHeight, labelNaturalHeight] = this._labels[0].get_preferred_height(-1);
         let spacing = this._items[0].child.get_theme_node().get_length('spacing');
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
         let thumbnailSize = THUMBNAIL_DEFAULT_SIZE * scaleFactor;
 
         availHeight = Math.min(availHeight - labelNaturalHeight - totalPadding - spacing, thumbnailSize);
-        let binHeight = availHeight + this._items[0].get_theme_node().get_vertical_padding() + this.get_theme_node().get_vertical_padding() - spacing;
+        let binHeight = availHeight + this._items[0].get_theme_node().get_vertical_padding() + this.actor.get_theme_node().get_vertical_padding() - spacing;
         binHeight = Math.min(thumbnailSize, binHeight);
 
         for (let i = 0; i < this._thumbnailBins.length; i++) {
@@ -943,7 +941,7 @@ class ThumbnailList extends SwitcherPopup.SwitcherList {
 
         // Make sure we only do this once
         this._thumbnailBins = new Array();
-    }
+    },
 
     _removeThumbnail(source, clone) {
         let index = this._clones.indexOf(clone);
@@ -958,28 +956,29 @@ class ThumbnailList extends SwitcherPopup.SwitcherList {
         if (this._clones.length > 0)
             this.highlight(SwitcherPopup.mod(index, this._clones.length));
         else
-            this.destroy();
-    }
+            this.actor.destroy();
+    },
 
     _onDestroy() {
         this._clones.forEach(clone => {
             if (clone.source)
                 clone.source.disconnect(clone._destroyId);
         });
-    }
+    },
+
 });
 
-var WindowIcon = GObject.registerClass(
-class WindowIcon extends St.BoxLayout {
-    _init(window, mode) {
-        super._init({ style_class: 'alt-tab-app',
-                      vertical: true });
+var WindowIcon = new Lang.Class({
+    Name: 'WindowIcon',
 
+    _init(window, mode) {
         this.window = window;
 
+        this.actor = new St.BoxLayout({ style_class: 'alt-tab-app',
+                                        vertical: true });
         this._icon = new St.Widget({ layout_manager: new Clutter.BinLayout() });
 
-        this.add(this._icon, { x_fill: false, y_fill: false } );
+        this.actor.add(this._icon, { x_fill: false, y_fill: false } );
         this.label = new St.Label({ text: window.get_title() });
 
         let tracker = Shell.WindowTracker.get_default();
@@ -1013,7 +1012,7 @@ class WindowIcon extends St.BoxLayout {
         }
 
         this._icon.set_size(size * scaleFactor, size * scaleFactor);
-    }
+    },
 
     _createAppIcon(app, size) {
         let appIcon = app ? app.create_icon_texture(size)
@@ -1026,14 +1025,16 @@ class WindowIcon extends St.BoxLayout {
     }
 });
 
-var WindowList = GObject.registerClass(
-class WindowList extends SwitcherPopup.SwitcherList {
+var WindowList = new Lang.Class({
+    Name: 'WindowList',
+    Extends: SwitcherPopup.SwitcherList,
+
     _init(windows, mode) {
-        super._init(true);
+        this.parent(true);
 
         this._label = new St.Label({ x_align: Clutter.ActorAlign.CENTER,
                                      y_align: Clutter.ActorAlign.CENTER });
-        this.add_actor(this._label);
+        this.actor.add_actor(this._label);
 
         this.windows = windows;
         this.icons = [];
@@ -1042,7 +1043,7 @@ class WindowList extends SwitcherPopup.SwitcherList {
             let win = windows[i];
             let icon = new WindowIcon(win, mode);
 
-            this.addItem(icon, icon.label);
+            this.addItem(icon.actor, icon.label);
             this.icons.push(icon);
 
             icon._unmanagedSignalId = icon.window.connect('unmanaged', (window) => {
@@ -1050,56 +1051,42 @@ class WindowList extends SwitcherPopup.SwitcherList {
             });
         }
 
-        this.connect('destroy', this._onDestroy.bind(this));
-    }
+        this.actor.connect('destroy', () => { this._onDestroy(); });
+    },
 
     _onDestroy() {
         this.icons.forEach(icon => {
             icon.window.disconnect(icon._unmanagedSignalId);
         });
-    }
+    },
 
-    vfunc_get_preferred_height(forWidth) {
-        let [minHeight, natHeight] = super.vfunc_get_preferred_height(forWidth);
+    _getPreferredHeight(actor, forWidth, alloc) {
+        this.parent(actor, forWidth, alloc);
 
-        let spacing = this.get_theme_node().get_padding(St.Side.BOTTOM);
+        let spacing = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
         let [labelMin, labelNat] = this._label.get_preferred_height(-1);
+        alloc.min_size += labelMin + spacing;
+        alloc.natural_size += labelNat + spacing;
+    },
 
-        minHeight += labelMin + spacing;
-        natHeight += labelNat + spacing;
-
-        return [minHeight, natHeight];
-    }
-
-    vfunc_allocate(box, flags) {
-        let themeNode = this.get_theme_node();
-        let contentBox = themeNode.get_content_box(box);
-
+    _allocateTop(actor, box, flags) {
         let childBox = new Clutter.ActorBox();
-        childBox.x1 = contentBox.x1;
-        childBox.x2 = contentBox.x2;
-        childBox.y2 = contentBox.y2;
+        childBox.x1 = box.x1;
+        childBox.x2 = box.x2;
+        childBox.y2 = box.y2;
         childBox.y1 = childBox.y2 - this._label.height;
         this._label.allocate(childBox, flags);
 
-        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM)
-        childBox.x1 = box.x1;
-        childBox.x2 = box.x2;
-        childBox.y1 = box.y1;
-        childBox.y2 = box.y2 - totalLabelHeight;
-        super.vfunc_allocate(childBox, flags);
-
-        // Hooking up the parent vfunc will call this.set_allocation() with
-        // the height without the label height, so call it again with the
-        // correct size here.
-        this.set_allocation(box, flags);
-    }
+        let spacing = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
+        box.y2 -= this._label.height + spacing;
+        this.parent(actor, box, flags);
+    },
 
     highlight(index, justOutline) {
-        super.highlight(index, justOutline);
+        this.parent(index, justOutline);
 
         this._label.set_text(index == -1 ? '' : this.icons[index].label.text);
-    }
+    },
 
     _removeWindow(window) {
         let index = this.icons.findIndex(icon => {

js/ui/animation.js

@@ -1,27 +1,20 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { GLib, Gio, St } = imports.gi;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-
-const Tweener = imports.ui.tweener;
+const St = imports.gi.St;
+const Signals = imports.signals;
+const Atk = imports.gi.Atk;
 
 var ANIMATED_ICON_UPDATE_TIMEOUT = 16;
-var SPINNER_ANIMATION_TIME = 0.3;
-var SPINNER_ANIMATION_DELAY = 1.0;
 
-var Animation = class {
-    constructor(file, width, height, speed) {
+var Animation = new Lang.Class({
+    Name: 'Animation',
+
+    _init(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,8 +22,11 @@ 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() {
         if (this._isLoaded && this._timeoutId == 0) {
@@ -42,7 +38,7 @@ var Animation = class {
         }
 
         this._isPlaying = true;
-    }
+    },
 
     stop() {
         if (this._timeoutId > 0) {
@@ -51,24 +47,7 @@ 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 texture_cache = St.TextureCache.get_default();
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._animations = texture_cache.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);
@@ -80,94 +59,30 @@ var Animation = class {
         let newFrameActor = this._animations.get_child_at_index(this._frame);
         if (newFrameActor)
             newFrameActor.show();
-    }
+    },
 
     _update() {
         this._showFrame(this._frame + 1);
         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;
     }
-};
+});
 
-var AnimatedIcon = class extends Animation {
-    constructor(file, size) {
-        super(file, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
+var AnimatedIcon = new Lang.Class({
+    Name: 'AnimatedIcon',
+    Extends: Animation,
+
+    _init(file, size) {
+        this.parent(file, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
     }
-};
-
-var Spinner = class extends AnimatedIcon {
-    constructor(size, animate=false) {
-        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
-        super(file, size);
-
-        this.actor.opacity = 0;
-        this._animate = animate;
-    }
-
-    _onDestroy() {
-        this._animate = false;
-        super._onDestroy();
-    }
-
-    play() {
-        Tweener.removeTweens(this.actor);
-
-        if (this._animate) {
-            super.play();
-            Tweener.addTween(this.actor, {
-                opacity: 255,
-                delay: SPINNER_ANIMATION_DELAY,
-                time: SPINNER_ANIMATION_TIME,
-                transition: 'linear'
-            });
-        } else {
-            this.actor.opacity = 255;
-            super.play();
-        }
-    }
-
-    stop() {
-        Tweener.removeTweens(this.actor);
-
-        if (this._animate) {
-            Tweener.addTween(this.actor, {
-                opacity: 0,
-                time: SPINNER_ANIMATION_TIME,
-                transition: 'linear',
-                onComplete: () => {
-                    this.stop(false);
-                }
-            });
-        } else {
-            this.actor.opacity = 0;
-            super.stop();
-        }
-    }
-};
+});

js/ui/appFavorites.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Shell = imports.gi.Shell;
+const Lang = imports.lang;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;
@@ -14,63 +15,53 @@ 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',
-    'glines.desktop': 'org.gnome.five-or-more.desktop',
-    'gnect.desktop': 'org.gnome.Four-in-a-row.desktop',
+    'glchess.desktop': 'gnome-chess.desktop',
+    'glines.desktop': 'five-or-more.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',
-    'gnomine.desktop': 'org.gnome.Mines.desktop',
-    'gnotravex.desktop': 'org.gnome.Tetravex.desktop',
-    'gnotski.desktop': 'org.gnome.Klotski.desktop',
-    'gtali.desktop': 'org.gnome.Tali.desktop',
-    'iagno.desktop': 'org.gnome.Reversi.desktop',
+    'gnome-weather.desktop': 'org.gnome.Weather.Application.desktop',
+    'gnomine.desktop': 'gnome-mines.desktop',
+    'gnotravex.desktop': 'gnome-tetravex.desktop',
+    'gnotski.desktop': 'gnome-klotski.desktop',
+    'gtali.desktop': 'tali.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',
 };
 
-class AppFavorites {
-    constructor() {
-        this.FAVORITE_APPS_KEY = 'favorite-apps';
+var AppFavorites = new Lang.Class({
+    Name: 'AppFavorites',
+
+    FAVORITE_APPS_KEY: 'favorite-apps',
+
+    _init() {
         this._favorites = {};
         global.settings.connect('changed::' + this.FAVORITE_APPS_KEY, this._onFavsChanged.bind(this));
         this.reload();
-    }
+    },
 
     _onFavsChanged() {
         this.reload();
         this.emit('changed');
-    }
+    },
 
     reload() {
         let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY);
@@ -98,29 +89,29 @@ class AppFavorites {
             let app = apps[i];
             this._favorites[app.get_id()] = app;
         }
-    }
+    },
 
     _getIds() {
         let ret = [];
         for (let id in this._favorites)
             ret.push(id);
         return ret;
-    }
+    },
 
     getFavoriteMap() {
         return this._favorites;
-    }
+    },
 
     getFavorites() {
         let ret = [];
         for (let id in this._favorites)
             ret.push(this._favorites[id]);
         return ret;
-    }
+    },
 
     isFavorite(appId) {
         return appId in this._favorites;
-    }
+    },
 
     _addFavorite(appId, pos) {
         if (appId in this._favorites)
@@ -138,7 +129,7 @@ class AppFavorites {
             ids.splice(pos, 0, appId);
         global.settings.set_strv(this.FAVORITE_APPS_KEY, ids);
         return true;
-    }
+    },
 
     addFavoriteAtPos(appId, pos) {
         if (!this._addFavorite(appId, pos))
@@ -152,25 +143,25 @@ class AppFavorites {
                                        this._removeFavorite(appId);
                                    }
                                  });
-    }
+    },
 
     addFavorite(appId) {
         this.addFavoriteAtPos(appId, -1);
-    }
+    },
 
     moveFavoriteToPos(appId, pos) {
         this._removeFavorite(appId);
         this._addFavorite(appId, pos);
-    }
+    },
 
     _removeFavorite(appId) {
-        if (!(appId in this._favorites))
+        if (!appId in this._favorites)
             return false;
 
         let ids = this._getIds().filter(id => id != appId);
         global.settings.set_strv(this.FAVORITE_APPS_KEY, ids);
         return true;
-    }
+    },
 
     removeFavorite(appId) {
         let ids = this._getIds();
@@ -187,7 +178,7 @@ class AppFavorites {
                                    }
                                  });
     }
-};
+});
 Signals.addSignalMethods(AppFavorites.prototype);
 
 var appFavoritesInstance = null;

js/ui/audioDeviceSelection.js

@@ -1,4 +1,10 @@
-const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
@@ -13,10 +19,12 @@ var AudioDevice = {
 
 const AudioDeviceSelectionIface = loadInterfaceXML('org.gnome.Shell.AudioDeviceSelection');
 
-var AudioDeviceSelectionDialog =
-class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
-    constructor(devices) {
-        super({ styleClass: 'audio-device-selection-dialog' });
+var AudioDeviceSelectionDialog = new Lang.Class({
+    Name: 'AudioDeviceSelectionDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init(devices) {
+        this.parent({ styleClass: 'audio-device-selection-dialog' });
 
         this._deviceItems = {};
 
@@ -31,11 +39,11 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
 
         if (this._selectionBox.get_n_children() < 2)
             throw new Error('Too few devices for a selection');
-    }
+    },
 
     destroy() {
-        super.destroy();
-    }
+        this.parent();
+    },
 
     _buildLayout(devices) {
         let title = new St.Label({ style_class: 'audio-selection-title',
@@ -48,13 +56,12 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
         this._selectionBox = new St.BoxLayout({ style_class: 'audio-selection-box' });
         this.contentLayout.add(this._selectionBox, { expand: true });
 
-        if (Main.sessionMode.allowSettings)
-            this.addButton({ action: this._openSettings.bind(this),
-                             label: _("Sound Settings") });
+        this.addButton({ action: this._openSettings.bind(this),
+                         label: _("Sound Settings") });
         this.addButton({ action: this.close.bind(this),
                          label: _("Cancel"),
                          key: Clutter.Escape });
-    }
+    },
 
     _getDeviceLabel(device) {
         switch(device) {
@@ -67,7 +74,7 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
             default:
                 return null;
         }
-    }
+    },
 
     _getDeviceIcon(device) {
         switch(device) {
@@ -80,7 +87,7 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
             default:
                 return null;
         }
-    }
+    },
 
     _addDevice(device) {
         let box = new St.BoxLayout({ style_class: 'audio-selection-device-box',
@@ -110,7 +117,7 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
             this.close();
             Main.overview.hide();
         });
-    }
+    },
 
     _openSettings() {
         let desktopFile = 'gnome-sound-panel.desktop'
@@ -125,21 +132,23 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
         Main.overview.hide();
         app.activate();
     }
-};
+});
 
-var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
-    constructor() {
+var AudioDeviceSelectionDBus = new Lang.Class({
+    Name: 'AudioDeviceSelectionDBus',
+
+    _init() {
         this._audioSelectionDialog = null;
 
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(AudioDeviceSelectionIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell/AudioDeviceSelection');
 
         Gio.DBus.session.own_name('org.gnome.Shell.AudioDeviceSelection', Gio.BusNameOwnerFlags.REPLACE, null, null);
-    }
+    },
 
     _onDialogClosed() {
         this._audioSelectionDialog = null;
-    }
+    },
 
     _onDeviceSelected(dialog, device) {
         let connection = this._dbusImpl.get_connection();
@@ -152,7 +161,7 @@ var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
                                info ? info.name : null,
                                'DeviceSelected',
                                GLib.Variant.new('(s)', [deviceName]));
-    }
+    },
 
     OpenAsync(params, invocation) {
         if (this._audioSelectionDialog) {
@@ -180,7 +189,7 @@ var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
 
         this._audioSelectionDialog = dialog;
         invocation.return_value(null);
-    }
+    },
 
     CloseAsync(params, invocation) {
         if (this._audioSelectionDialog &&
@@ -189,4 +198,4 @@ var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
 
         invocation.return_value(null);
     }
-};
+});

js/ui/background.js

@@ -93,7 +93,13 @@
 //     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 Lang = imports.lang;
+const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 
 const LoginManager = imports.misc.loginManager;
@@ -132,12 +138,14 @@ function _fileEqual0(file1, file2) {
     return file1.equal(file2);
 }
 
-var BackgroundCache = class BackgroundCache {
-    constructor() {
+var BackgroundCache = new Lang.Class({
+    Name: 'BackgroundCache',
+
+    _init() {
         this._fileMonitors = {};
         this._backgroundSources = {};
         this._animations = {};
-    }
+    },
 
     monitorFile(file) {
         let key = file.hash();
@@ -155,7 +163,7 @@ var BackgroundCache = class BackgroundCache {
                         });
 
         this._fileMonitors[key] = monitor;
-    }
+    },
 
     getAnimation(params) {
         params = Params.parse(params, { file: null,
@@ -187,7 +195,7 @@ var BackgroundCache = class BackgroundCache {
                 GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
             }
         });
-    }
+    },
 
     getBackgroundSource(layoutManager, settingsSchema) {
         // The layoutManager is always the same one; we pass in it since
@@ -201,7 +209,7 @@ var BackgroundCache = class BackgroundCache {
         }
 
         return this._backgroundSources[settingsSchema];
-    }
+    },
 
     releaseBackgroundSource(settingsSchema) {
         if (settingsSchema in this._backgroundSources) {
@@ -213,7 +221,7 @@ var BackgroundCache = class BackgroundCache {
             }
         }
     }
-};
+});
 Signals.addSignalMethods(BackgroundCache.prototype);
 
 function getBackgroundCache() {
@@ -222,8 +230,10 @@ function getBackgroundCache() {
     return _backgroundCache;
 }
 
-var Background = class Background {
-    constructor(params) {
+var Background = new Lang.Class({
+    Name: 'Background',
+
+    _init(params) {
         params = Params.parse(params, { monitorIndex: 0,
                                         layoutManager: Main.layoutManager,
                                         settings: null,
@@ -262,7 +272,7 @@ var Background = class Background {
         });
 
         this._load();
-    }
+    },
 
     destroy() {
         this._cancellable.cancel();
@@ -288,12 +298,12 @@ var Background = class Background {
         if (this._settingsChangedSignalId != 0)
             this._settings.disconnect(this._settingsChangedSignalId);
         this._settingsChangedSignalId = 0;
-    }
+    },
 
     updateResolution() {
         if (this._animation)
             this._refreshAnimation();
-    }
+    },
 
     _refreshAnimation() {
         if (!this._animation)
@@ -301,7 +311,7 @@ var Background = class Background {
 
         this._removeAnimationTimeout();
         this._updateAnimation();
-    }
+    },
 
     _setLoaded() {
         if (this.isLoaded)
@@ -314,7 +324,7 @@ var Background = class Background {
             return GLib.SOURCE_REMOVE;
         });
         GLib.Source.set_name_by_id(id, '[gnome-shell] this.emit');
-    }
+    },
 
     _loadPattern() {
         let colorString, res, color, secondColor;
@@ -330,7 +340,7 @@ var Background = class Background {
             this.background.set_color(color);
         else
             this.background.set_gradient(shadingType, color, secondColor);
-    }
+    },
 
     _watchFile(file) {
         let key = file.hash();
@@ -347,14 +357,14 @@ var Background = class Background {
                                                }
                                            });
         this._fileWatches[key] = signalId;
-    }
+    },
 
     _removeAnimationTimeout() {
         if (this._updateAnimationTimeoutId) {
             GLib.source_remove(this._updateAnimationTimeoutId);
             this._updateAnimationTimeoutId = 0;
         }
-    }
+    },
 
     _updateAnimation() {
         this._updateAnimationTimeoutId = 0;
@@ -394,7 +404,7 @@ var Background = class Background {
                 });
             }
         }
-    }
+    },
 
     _queueUpdateAnimation() {
         if (this._updateAnimationTimeoutId != 0)
@@ -423,7 +433,7 @@ var Background = class Background {
                                                           return GLib.SOURCE_REMOVE;
                                                       });
         GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
-    }
+    },
 
     _loadAnimation(file) {
         this._cache.getAnimation({ file: file,
@@ -440,7 +450,7 @@ var Background = class Background {
                                        this._watchFile(file);
                                    }
                                  });
-    }
+    },
 
     _loadImage(file) {
         this.background.set_file(file, this._style);
@@ -456,14 +466,14 @@ var Background = class Background {
                 image.disconnect(id);
             });
         }
-    }
+    },
 
     _loadFile(file) {
         if (file.get_basename().endsWith('.xml'))
             this._loadAnimation(file);
         else
             this._loadImage(file);
-    }
+    },
 
     _load() {
         this._cache = getBackgroundCache();
@@ -476,14 +486,16 @@ var Background = class Background {
         }
 
         this._loadFile(this._file);
-    }
-};
+    },
+});
 Signals.addSignalMethods(Background.prototype);
 
 let _systemBackground;
 
-var SystemBackground = class SystemBackground {
-    constructor() {
+var SystemBackground = new Lang.Class({
+    Name: 'SystemBackground',
+
+    _init() {
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
 
         if (_systemBackground == null) {
@@ -512,12 +524,14 @@ var SystemBackground = class SystemBackground {
                 image = null;
             });
         }
-    }
-};
+    },
+});
 Signals.addSignalMethods(SystemBackground.prototype);
 
-var BackgroundSource = class BackgroundSource {
-    constructor(layoutManager, settingsSchema) {
+var BackgroundSource = new Lang.Class({
+    Name: 'BackgroundSource',
+
+    _init(layoutManager, settingsSchema) {
         // Allow override the background image setting for performance testing
         this._layoutManager = layoutManager;
         this._overrideImage = GLib.getenv('SHELL_BACKGROUND_IMAGE');
@@ -528,7 +542,7 @@ var BackgroundSource = class BackgroundSource {
         this._monitorsChangedId =
             monitorManager.connect('monitors-changed',
                                    this._onMonitorsChanged.bind(this));
-    }
+    },
 
     _onMonitorsChanged() {
         for (let monitorIndex in this._backgrounds) {
@@ -542,7 +556,7 @@ var BackgroundSource = class BackgroundSource {
                 delete this._backgrounds[monitorIndex];
             }
         }
-    }
+    },
 
     getBackground(monitorIndex) {
         let file = null;
@@ -589,7 +603,7 @@ var BackgroundSource = class BackgroundSource {
         }
 
         return this._backgrounds[monitorIndex];
-    }
+    },
 
     destroy() {
         let monitorManager = Meta.MonitorManager.get();
@@ -603,10 +617,12 @@ var BackgroundSource = class BackgroundSource {
 
         this._backgrounds = null;
     }
-};
+});
 
-var Animation = class Animation {
-    constructor(params) {
+var Animation = new Lang.Class({
+    Name: 'Animation',
+
+    _init(params) {
         params = Params.parse(params, { file: null });
 
         this.file = params.file;
@@ -614,7 +630,7 @@ var Animation = class Animation {
         this.transitionProgress = 0.0;
         this.transitionDuration = 0.0;
         this.loaded = false;
-    }
+    },
 
     load(callback) {
         this._show = new GnomeDesktop.BGSlideShow({ filename: this.file.get_path() });
@@ -624,7 +640,7 @@ var Animation = class Animation {
             if (callback)
                 callback();
         });
-    }
+    },
 
     update(monitor) {
         this.keyFrameFiles = [];
@@ -645,12 +661,14 @@ var Animation = class Animation {
 
         if (filename2)
             this.keyFrameFiles.push(Gio.File.new_for_path(filename2));
-    }
-};
+    },
+});
 Signals.addSignalMethods(Animation.prototype);
 
-var BackgroundManager = class BackgroundManager {
-    constructor(params) {
+var BackgroundManager = new Lang.Class({
+    Name: 'BackgroundManager',
+
+    _init(params) {
         params = Params.parse(params, { container: null,
                                         layoutManager: Main.layoutManager,
                                         monitorIndex: null,
@@ -670,7 +688,7 @@ var BackgroundManager = class BackgroundManager {
 
         this.backgroundActor = this._createBackgroundActor();
         this._newBackgroundActor = null;
-    }
+    },
 
     destroy() {
         let cache = getBackgroundCache();
@@ -686,7 +704,7 @@ var BackgroundManager = class BackgroundManager {
             this.backgroundActor.destroy();
             this.backgroundActor = null;
         }
-    }
+    },
 
     _swapBackgroundActor() {
         let oldBackgroundActor = this.backgroundActor;
@@ -703,7 +721,7 @@ var BackgroundManager = class BackgroundManager {
                                oldBackgroundActor.destroy();
                            }
                          });
-    }
+    },
 
     _updateBackgroundActor() {
         if (this._newBackgroundActor) {
@@ -732,7 +750,7 @@ var BackgroundManager = class BackgroundManager {
                     this._swapBackgroundActor();
                 });
         }
-    }
+    },
 
     _createBackgroundActor() {
         let background = this._backgroundSource.getBackground(this._monitorIndex);
@@ -746,8 +764,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();
         }
@@ -767,6 +787,6 @@ var BackgroundManager = class BackgroundManager {
         });
 
         return backgroundActor;
-    }
-};
+    },
+});
 Signals.addSignalMethods(BackgroundManager.prototype);

js/ui/backgroundMenu.js

@@ -1,14 +1,20 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 
-var BackgroundMenu = class BackgroundMenu extends PopupMenu.PopupMenu {
-    constructor(layoutManager) {
-        super(layoutManager.dummyCursor, 0, St.Side.TOP);
+var BackgroundMenu = new Lang.Class({
+    Name: 'BackgroundMenu',
+    Extends: PopupMenu.PopupMenu,
+
+    _init(layoutManager) {
+        this.parent(layoutManager.dummyCursor, 0, St.Side.TOP);
 
         this.addSettingsAction(_("Change Background…"), 'gnome-background-panel.desktop');
         this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@@ -20,7 +26,7 @@ var BackgroundMenu = class BackgroundMenu extends PopupMenu.PopupMenu {
         layoutManager.uiGroup.add_actor(this.actor);
         this.actor.hide();
     }
-};
+});
 
 function addBackgroundMenu(actor, layoutManager) {
     actor.reactive = true;

js/ui/barLevel.js

@@ -1,10 +1,16 @@
 /* -*- 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 Lang = imports.lang;
+const St = imports.gi.St;
 const Signals = imports.signals;
 
-var BarLevel = class {
-    constructor(value, params) {
+var BarLevel = new Lang.Class({
+    Name: "BarLevel",
+
+    _init(value, params) {
         if (isNaN(value))
             // Avoid spreading NaNs around
             throw TypeError('The bar level value must be a number');
@@ -34,7 +40,7 @@ var BarLevel = class {
         this._customAccessible.connect('set-current-value', this._setCurrentValue.bind(this));
 
         this.connect('value-changed', this._valueChanged.bind(this));
-    }
+    },
 
     setValue(value) {
         if (isNaN(value))
@@ -42,7 +48,7 @@ var BarLevel = class {
 
         this._value = Math.max(Math.min(value, this._maxValue), 0);
         this.actor.queue_repaint();
-    }
+    },
 
     setMaximumValue(value) {
         if (isNaN(value))
@@ -51,7 +57,7 @@ var BarLevel = class {
         this._maxValue = Math.max(value, 1);
         this._overdriveStart = Math.min(this._overdriveStart, this._maxValue);
         this.actor.queue_repaint();
-    }
+    },
 
     setOverdriveStart(value) {
         if (isNaN(value))
@@ -63,7 +69,7 @@ var BarLevel = class {
         this._overdriveStart = value;
         this._value = Math.max(Math.min(value, this._maxValue), 0);
         this.actor.queue_repaint();
-    }
+    },
 
     _barLevelRepaint(area) {
         let cr = area.get_context();
@@ -170,34 +176,35 @@ var BarLevel = class {
         }
 
         cr.$dispose();
-    }
+    },
 
     _getCurrentValue(actor) {
         return this._value;
-    }
+    },
 
     _getOverdriveStart(actor) {
         return this._overdriveStart;
-    }
+    },
 
     _getMinimumValue(actor) {
         return 0;
-    }
+    },
 
     _getMaximumValue(actor) {
         return this._maxValue;
-    }
+    },
 
     _setCurrentValue(actor, value) {
         this._value = value;
-    }
+    },
 
     _valueChanged(barLevel, value, property) {
         this._customAccessible.notify("accessible-value");
-    }
+    },
 
     get value() {
         return this._value;
     }
-};
+});
+
 Signals.addSignalMethods(BarLevel.prototype);

js/ui/boxpointer.js

@@ -1,6 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+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,83 +29,59 @@ 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({
-    Signals: { 'arrow-side-changed': {} },
-}, class BoxPointer extends St.Widget {
+var BoxPointer = new Lang.Class({
+    Name: 'BoxPointer',
+
     _init(arrowSide, binProperties) {
-        super._init();
-
-        this.actor = this;
-
-        this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
-
         this._arrowSide = arrowSide;
         this._userArrowSide = arrowSide;
         this._arrowOrigin = 0;
         this._arrowActor = null;
+        this.actor = new St.Bin({ x_fill: true,
+                                  y_fill: true });
+        this._container = new Shell.GenericContainer();
+        this.actor.set_child(this._container);
+        this.actor.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
+        this._container.connect('get-preferred-width', this._getPreferredWidth.bind(this));
+        this._container.connect('get-preferred-height', this._getPreferredHeight.bind(this));
+        this._container.connect('allocate', this._allocate.bind(this));
         this.bin = new St.Bin(binProperties);
-        this.add_actor(this.bin);
+        this._container.add_actor(this.bin);
         this._border = new St.DrawingArea();
         this._border.connect('repaint', this._drawBorder.bind(this));
-        this.add_actor(this._border);
+        this._container.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();
-    }
+    },
 
     get arrowSide() {
         return this._arrowSide;
-    }
+    },
 
     _muteInput() {
         if (this._capturedEventId == 0)
-            this._capturedEventId = this.connect('captured-event',
-                                                 () => Clutter.EVENT_STOP);
-    }
+            this._capturedEventId = this.actor.connect('captured-event',
+                                                       () => Clutter.EVENT_STOP);
+    },
 
     _unmuteInput() {
         if (this._capturedEventId != 0) {
-            this.disconnect(this._capturedEventId);
+            this.actor.disconnect(this._capturedEventId);
             this._capturedEventId = 0;
         }
-    }
+    },
 
-    // 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 themeNode = this.actor.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
         let animationTime = (animate & PopupAnimation.FULL) ? POPUP_ANIMATION_TIME : 0;
 
@@ -109,28 +90,28 @@ var BoxPointer = GObject.registerClass({
         else
             this.opacity = 255;
 
-        this.show();
+        this.actor.show();
 
         if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
                 case St.Side.TOP:
-                    this.translation_y = -rise;
+                    this.yOffset = -rise;
                     break;
                 case St.Side.BOTTOM:
-                    this.translation_y = rise;
+                    this.yOffset = rise;
                     break;
                 case St.Side.LEFT:
-                    this.translation_x = -rise;
+                    this.xOffset = -rise;
                     break;
                 case St.Side.RIGHT:
-                    this.translation_x = rise;
+                    this.xOffset = rise;
                     break;
             }
         }
 
         Tweener.addTween(this, { opacity: 255,
-                                 translation_x: 0,
-                                 translation_y: 0,
+                                 xOffset: 0,
+                                 yOffset: 0,
                                  transition: 'linear',
                                  onComplete: () => {
                                      this._unmuteInput();
@@ -138,15 +119,15 @@ var BoxPointer = GObject.registerClass({
                                          onComplete();
                                  },
                                  time: animationTime });
-    }
+    },
 
-    close(animate, onComplete) {
-        if (!this.visible)
+    hide(animate, onComplete) {
+        if (!this.actor.visible)
             return;
 
-        let translationX = 0;
-        let translationY = 0;
-        let themeNode = this.get_theme_node();
+        let xOffset = 0;
+        let yOffset = 0;
+        let themeNode = this.actor.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
         let fade = (animate & PopupAnimation.FADE);
         let animationTime = (animate & PopupAnimation.FULL) ? POPUP_ANIMATION_TIME : 0;
@@ -154,16 +135,16 @@ var BoxPointer = GObject.registerClass({
         if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
                 case St.Side.TOP:
-                    translationY = rise;
+                    yOffset = rise;
                     break;
                 case St.Side.BOTTOM:
-                    translationY = -rise;
+                    yOffset = -rise;
                     break;
                 case St.Side.LEFT:
-                    translationX = rise;
+                    xOffset = rise;
                     break;
                 case St.Side.RIGHT:
-                    translationX = -rise;
+                    xOffset = -rise;
                     break;
             }
         }
@@ -172,63 +153,52 @@ var BoxPointer = GObject.registerClass({
 
         Tweener.removeTweens(this);
         Tweener.addTween(this, { opacity: fade ? 0 : 255,
-                                 translation_x: translationX,
-                                 translation_y: translationY,
+                                 xOffset: xOffset,
+                                 yOffset: yOffset,
                                  transition: 'linear',
                                  time: animationTime,
                                  onComplete: () => {
-                                     this.hide();
+                                     this.actor.hide();
                                      this.opacity = 0;
-                                     this.translation_x = 0;
-                                     this.translation_y = 0;
+                                     this.xOffset = 0;
+                                     this.yOffset = 0;
                                      if (onComplete)
                                          onComplete();
                                  }
                                });
-    }
+    },
 
-    _adjustAllocationForArrow(isWidth, minSize, natSize) {
-        let themeNode = this.get_theme_node();
+    _adjustAllocationForArrow(isWidth, alloc) {
+        let themeNode = this.actor.get_theme_node();
         let borderWidth = themeNode.get_length('-arrow-border-width');
-        minSize += borderWidth * 2;
-        natSize += borderWidth * 2;
+        alloc.min_size += borderWidth * 2;
+        alloc.natural_size += borderWidth * 2;
         if ((!isWidth && (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM))
             || (isWidth && (this._arrowSide == St.Side.LEFT || this._arrowSide == St.Side.RIGHT))) {
             let rise = themeNode.get_length('-arrow-rise');
-            minSize += rise;
-            natSize += rise;
+            alloc.min_size += rise;
+            alloc.natural_size += rise;
         }
+    },
 
-        return [minSize, natSize];
-    }
+    _getPreferredWidth(actor, forHeight, alloc) {
+        let [minInternalSize, natInternalSize] = this.bin.get_preferred_width(forHeight);
+        alloc.min_size = minInternalSize;
+        alloc.natural_size = natInternalSize;
+        this._adjustAllocationForArrow(true, alloc);
+    },
 
-    vfunc_get_preferred_width(forHeight) {
-        let themeNode = this.get_theme_node();
-        forHeight = themeNode.adjust_for_height(forHeight);
-
-        let width = this.bin.get_preferred_width(forHeight);
-        width = this._adjustAllocationForArrow(true, ...width);
-
-        return themeNode.adjust_preferred_width(...width);
-    }
-
-    vfunc_get_preferred_height(forWidth) {
-        let themeNode = this.get_theme_node();
+    _getPreferredHeight(actor, forWidth, alloc) {
+        let themeNode = this.actor.get_theme_node();
         let borderWidth = themeNode.get_length('-arrow-border-width');
-        forWidth = themeNode.adjust_for_width(forWidth);
-
-        let height = this.bin.get_preferred_height(forWidth - 2 * borderWidth);
-        height = this._adjustAllocationForArrow(false, ...height);
-
-        return themeNode.adjust_preferred_height(...height);
-    }
-
-    vfunc_allocate(box, flags) {
-        this.set_allocation(box, flags);
-
-        let themeNode = this.get_theme_node();
-        box = themeNode.get_content_box(box);
+        let [minSize, naturalSize] = this.bin.get_preferred_height(forWidth - 2 * borderWidth);
+        alloc.min_size = minSize;
+        alloc.natural_size = naturalSize;
+        this._adjustAllocationForArrow(false, alloc);
+    },
 
+    _allocate(actor, box, flags) {
+        let themeNode = this.actor.get_theme_node();
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let rise = themeNode.get_length('-arrow-rise');
         let childBox = new Clutter.ActorBox();
@@ -265,15 +235,15 @@ var BoxPointer = GObject.registerClass({
             this._reposition();
             this._updateFlip();
         }
-    }
+    },
 
     _drawBorder(area) {
-        let themeNode = this.get_theme_node();
+        let themeNode = this.actor.get_theme_node();
 
         if (this._arrowActor) {
             let [sourceX, sourceY] = this._arrowActor.get_transformed_position();
             let [sourceWidth, sourceHeight] = this._arrowActor.get_transformed_size();
-            let [absX, absY] = this.get_transformed_position();
+            let [absX, absY] = this.actor.get_transformed_position();
 
             if (this._arrowSide == St.Side.TOP ||
                 this._arrowSide == St.Side.BOTTOM) {
@@ -447,19 +417,19 @@ var BoxPointer = GObject.registerClass({
         }
 
         cr.$dispose();
-    }
+    },
 
     setPosition(sourceActor, alignment) {
         // We need to show it now to force an allocation,
         // so that we can query the correct size.
-        this.show();
+        this.actor.show();
 
         this._sourceActor = sourceActor;
         this._arrowAlignment = alignment;
 
         this._reposition();
         this._updateFlip();
-    }
+    },
 
     setSourceAlignment(alignment) {
         this._sourceAlignment = alignment;
@@ -468,29 +438,25 @@ var BoxPointer = GObject.registerClass({
             return;
 
         this.setPosition(this._sourceActor, this._arrowAlignment);
-    }
+    },
 
     _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();
+        let [minWidth, minHeight, natWidth, natHeight] = this.actor.get_preferred_size();
 
         // 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 themeNode = this.get_theme_node();
+        let monitor = Main.layoutManager.findMonitorForActor(sourceActor);
+        let themeNode = this.actor.get_theme_node();
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let arrowBase = themeNode.get_length('-arrow-base');
         let borderRadius = themeNode.get_length('-arrow-border-radius');
@@ -539,8 +505,8 @@ var BoxPointer = GObject.registerClass({
         case St.Side.BOTTOM:
             resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
 
-            resX = Math.max(resX, workarea.x + padding);
-            resX = Math.min(resX, workarea.x + workarea.width - (padding + natWidth));
+            resX = Math.max(resX, monitor.x + padding);
+            resX = Math.min(resX, monitor.x + monitor.width - (padding + natWidth));
 
             arrowOrigin = sourceCenterX - resX;
             if (arrowOrigin <= (x1 + (borderRadius + halfBase))) {
@@ -558,8 +524,8 @@ var BoxPointer = GObject.registerClass({
         case St.Side.RIGHT:
             resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
 
-            resY = Math.max(resY, workarea.y + padding);
-            resY = Math.min(resY, workarea.y + workarea.height - (padding + natHeight));
+            resY = Math.max(resY, monitor.y + padding);
+            resY = Math.min(resY, monitor.y + monitor.height - (padding + natHeight));
 
             arrowOrigin = sourceCenterY - resY;
             if (arrowOrigin <= (y1 + (borderRadius + halfBase))) {
@@ -576,17 +542,17 @@ var BoxPointer = GObject.registerClass({
 
         this.setArrowOrigin(arrowOrigin);
 
-        let parent = this.get_parent();
+        let parent = this.actor.get_parent();
         let success, x, y;
         while (!success) {
             [success, x, y] = parent.transform_stage_point(resX, resY);
             parent = parent.get_parent();
         }
 
-        // Actually set the position
-        this.x = Math.floor(x);
-        this.y = Math.floor(y);
-    }
+        this._xPosition = Math.floor(x);
+        this._yPosition = Math.floor(y);
+        this._shiftActor();
+    },
 
     // @origin: Coordinate specifying middle of the arrow, along
     // the Y axis for St.Side.LEFT, St.Side.RIGHT from the top and X axis from
@@ -596,7 +562,7 @@ var BoxPointer = GObject.registerClass({
             this._arrowOrigin = origin;
             this._border.queue_repaint();
         }
-    }
+    },
 
     // @actor: an actor relative to which the arrow is positioned.
     // Differently from setPosition, this will not move the boxpointer itself,
@@ -606,38 +572,52 @@ var BoxPointer = GObject.registerClass({
             this._arrowActor = actor;
             this._border.queue_repaint();
         }
-    }
+    },
+
+    _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.actor.set_anchor_point(-(this._xPosition + this._xOffset),
+                                    -(this._yPosition + this._yOffset));
+    },
 
     _calculateArrowSide(arrowSide) {
-        let sourceAllocation = this._sourceAllocation;
-        let [minWidth, minHeight, boxWidth, boxHeight] = this.get_preferred_size();
-        let workarea = this._workArea;
+        let sourceAllocation = Shell.util_get_transformed_allocation(this._sourceActor);
+        let [minWidth, minHeight, boxWidth, boxHeight] = this._container.get_preferred_size();
+        let monitorActor = this.sourceActor;
+        if (!monitorActor)
+            monitorActor = this.actor;
+        let monitor = Main.layoutManager.findMonitorForActor(monitorActor);
 
         switch (arrowSide) {
         case St.Side.TOP:
-            if (sourceAllocation.y2 + boxHeight > workarea.y + workarea.height &&
-                boxHeight < sourceAllocation.y1 - workarea.y)
+            if (sourceAllocation.y2 + boxHeight > monitor.y + monitor.height &&
+                boxHeight < sourceAllocation.y1 - monitor.y)
                 return St.Side.BOTTOM;
             break;
         case St.Side.BOTTOM:
-            if (sourceAllocation.y1 - boxHeight < workarea.y &&
-                boxHeight < workarea.y + workarea.height - sourceAllocation.y2)
+            if (sourceAllocation.y1 - boxHeight < monitor.y &&
+                boxHeight < monitor.y + monitor.height - sourceAllocation.y2)
                 return St.Side.TOP;
             break;
         case St.Side.LEFT:
-            if (sourceAllocation.x2 + boxWidth > workarea.x + workarea.width &&
-                boxWidth < sourceAllocation.x1 - workarea.x)
+            if (sourceAllocation.x2 + boxWidth > monitor.x + monitor.width &&
+                boxWidth < sourceAllocation.x1 - monitor.x)
                 return St.Side.RIGHT;
             break;
         case St.Side.RIGHT:
-            if (sourceAllocation.x1 - boxWidth < workarea.x &&
-                boxWidth < workarea.x + workarea.width - sourceAllocation.x2)
+            if (sourceAllocation.x1 - boxWidth < monitor.x &&
+                boxWidth < monitor.x + monitor.width - sourceAllocation.x2)
                 return St.Side.LEFT;
             break;
         }
 
         return arrowSide;
-    }
+    },
 
     _updateFlip() {
         let arrowSide = this._calculateArrowSide(this._userArrowSide);
@@ -645,26 +625,53 @@ var BoxPointer = GObject.registerClass({
             this._arrowSide = arrowSide;
             this._reposition();
             Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
-                this.queue_relayout();
+                this._container.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;
+    },
+
+    set opacity(opacity) {
+        this.actor.opacity = opacity;
+    },
+
+    get opacity() {
+        return this.actor.opacity;
+    },
 
     updateArrowSide(side) {
         this._arrowSide = side;
         this._border.queue_repaint();
 
         this.emit('arrow-side-changed');
-    }
+    },
 
     getPadding(side) {
         return this.bin.get_theme_node().get_padding(side);
-    }
+    },
 
     getArrowHeight() {
-        return this.get_theme_node().get_length('-arrow-rise');
+        return this.actor.get_theme_node().get_length('-arrow-rise');
     }
 });
+Signals.addSignalMethods(BoxPointer.prototype);

js/ui/calendar.js

@@ -1,7 +1,13 @@
 // -*- 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 Lang = imports.lang;
+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,8 +15,6 @@ 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';
@@ -85,45 +89,64 @@ function _getCalendarDayAbbreviation(dayNumber) {
 
 // Abstraction for an appointment/event in a calendar
 
-var CalendarEvent = class CalendarEvent {
-    constructor(id, date, end, summary, allDay) {
+var CalendarEvent = new Lang.Class({
+    Name: 'CalendarEvent',
+
+    _init(id, date, end, summary, allDay) {
         this.id = id;
         this.date = date;
         this.end = end;
         this.summary = summary;
         this.allDay = allDay;
     }
-};
+});
 
 // Interface for appointments/events - e.g. the contents of a calendar
 //
 
 // First, an implementation with no events
-var EmptyEventSource = class EmptyEventSource {
-    constructor() {
+var EmptyEventSource = new Lang.Class({
+    Name: 'EmptyEventSource',
+
+    _init() {
         this.isLoading = false;
         this.isDummy = true;
         this.hasCalendars = false;
-    }
+    },
 
     destroy() {
-    }
+    },
+
+    ignoreEvent(event) {
+    },
 
     requestRange(begin, end) {
-    }
+    },
 
     getEvents(begin, end) {
         let result = [];
         return result;
-    }
+    },
 
     hasEvents(day) {
         return false;
     }
-};
+});
 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);
 
@@ -154,12 +177,22 @@ function _dateIntervalsOverlap(a0, a1, b0, b1)
 }
 
 // an implementation that reads data from a session bus service
-var DBusEventSource = class DBusEventSource {
-    constructor() {
+var DBusEventSource = new Lang.Class({
+    Name: 'DBusEventSource',
+
+    _init() {
         this._resetCache();
         this.isLoading = false;
         this.isDummy = false;
 
+        this._ignoredEvents = new Map();
+
+        let savedState = global.get_persistent_state('as', 'ignored_events');
+        if (savedState)
+            savedState.deep_unpack().forEach(eventId => {
+                this._ignoredEvents.set(eventId, true);
+            });
+
         this._initialized = false;
         this._dbusProxy = new CalendarServer();
         this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, (object, result) => {
@@ -202,39 +235,39 @@ var DBusEventSource = class DBusEventSource {
                 this._onNameAppeared();
             }
         });
-    }
+    },
 
     destroy() {
         this._dbusProxy.run_dispose();
-    }
+    },
 
     get hasCalendars() {
         if (this._initialized)
             return this._dbusProxy.HasCalendars;
         else
             return false;
-    }
+    },
 
     _resetCache() {
         this._events = [];
         this._lastRequestBegin = null;
         this._lastRequestEnd = null;
-    }
+    },
 
     _onNameAppeared(owner) {
         this._initialized = true;
         this._resetCache();
         this._loadEvents(true);
-    }
+    },
 
     _onNameVanished(oldOwner) {
         this._resetCache();
         this.emit('changed');
-    }
+    },
 
     _onChanged() {
         this._loadEvents(false);
-    }
+    },
 
     _onEventsReceived(results, error) {
         let newEvents = [];
@@ -256,7 +289,7 @@ var DBusEventSource = class DBusEventSource {
         this._events = newEvents;
         this.isLoading = false;
         this.emit('changed');
-    }
+    },
 
     _loadEvents(forceReload) {
         // Ignore while loading
@@ -270,7 +303,17 @@ var DBusEventSource = class DBusEventSource {
                                             this._onEventsReceived.bind(this),
                                             Gio.DBusCallFlags.NONE);
         }
-    }
+    },
+
+    ignoreEvent(event) {
+        if (this._ignoredEvents.get(event.id))
+            return;
+
+        this._ignoredEvents.set(event.id, true);
+        let savedState = new GLib.Variant('as', [...this._ignoredEvents.keys()]);
+        global.set_persistent_state('ignored_events', savedState);
+        this.emit('changed');
+    },
 
     requestRange(begin, end) {
         if (!(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
@@ -281,13 +324,16 @@ var DBusEventSource = class DBusEventSource {
             this._curRequestEnd = end;
             this._loadEvents(false);
         }
-    }
+    },
 
     getEvents(begin, end) {
         let result = [];
         for(let n = 0; n < this._events.length; n++) {
             let event = this._events[n];
 
+            if (this._ignoredEvents.has(event.id))
+                continue;
+
             if (_dateIntervalsOverlap (event.date, event.end, begin, end)) {
                 result.push(event);
             }
@@ -299,7 +345,7 @@ var DBusEventSource = class DBusEventSource {
             return d1.getTime() - d2.getTime();
         });
         return result;
-    }
+    },
 
     hasEvents(day) {
         let dayBegin = _getBeginningOfDay(day);
@@ -312,11 +358,13 @@ var DBusEventSource = class DBusEventSource {
 
         return true;
     }
-};
+});
 Signals.addSignalMethods(DBusEventSource.prototype);
 
-var Calendar = class Calendar {
-    constructor() {
+var Calendar = new Lang.Class({
+    Name: 'Calendar',
+
+    _init() {
         this._weekStart = Shell.util_get_week_start();
         this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.calendar' });
 
@@ -354,7 +402,7 @@ var Calendar = class Calendar {
                            this._onScroll.bind(this));
 
         this._buildHeader ();
-    }
+    },
 
     // @eventSource: is an object implementing the EventSource API, e.g. the
     // requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
@@ -366,7 +414,7 @@ var Calendar = class Calendar {
         });
         this._rebuildCalendar();
         this._update();
-    }
+    },
 
     // Sets the calendar to show a specific date
     setDate(date) {
@@ -376,14 +424,14 @@ var Calendar = class Calendar {
         this._selectedDate = date;
         this._update();
         this.emit('selected-date-changed', new Date(this._selectedDate));
-    }
+    },
 
     updateTimeZone() {
         // The calendar need to be rebuilt after a time zone update because
         // the date might have changed.
         this._rebuildCalendar();
         this._update();
-    }
+    },
 
     _buildHeader() {
         let layout = this.actor.layout_manager;
@@ -398,7 +446,6 @@ var Calendar = class Calendar {
         this._backButton = new St.Button({ style_class: 'calendar-change-month-back pager-button',
                                            accessible_name: _("Previous month"),
                                            can_focus: true });
-        this._backButton.add_actor(new St.Icon({ icon_name: 'pan-start-symbolic' }));
         this._topBox.add(this._backButton);
         this._backButton.connect('clicked', this._onPrevMonthButtonClicked.bind(this));
 
@@ -409,7 +456,6 @@ var Calendar = class Calendar {
         this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward pager-button',
                                               accessible_name: _("Next month"),
                                               can_focus: true });
-        this._forwardButton.add_actor(new St.Icon({ icon_name: 'pan-end-symbolic' }));
         this._topBox.add(this._forwardButton);
         this._forwardButton.connect('clicked', this._onNextMonthButtonClicked.bind(this));
 
@@ -440,7 +486,7 @@ var Calendar = class Calendar {
 
         // All the children after this are days, and get removed when we update the calendar
         this._firstDayIndex = this.actor.get_n_children();
-    }
+    },
 
     _onScroll(actor, event) {
         switch (event.get_scroll_direction()) {
@@ -454,7 +500,7 @@ var Calendar = class Calendar {
             break;
         }
         return Clutter.EVENT_PROPAGATE;
-    }
+    },
 
     _onPrevMonthButtonClicked() {
         let newDate = new Date(this._selectedDate);
@@ -478,7 +524,7 @@ var Calendar = class Calendar {
         this._backButton.grab_key_focus();
 
         this.setDate(newDate);
-    }
+    },
 
     _onNextMonthButtonClicked() {
         let newDate = new Date(this._selectedDate);
@@ -502,14 +548,14 @@ var Calendar = class Calendar {
         this._forwardButton.grab_key_focus();
 
         this.setDate(newDate);
-    }
+    },
 
     _onSettingsChange() {
         this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
         this._buildHeader();
         this._rebuildCalendar();
         this._update();
-    }
+    },
 
     _rebuildCalendar() {
         let now = new Date();
@@ -630,7 +676,7 @@ var Calendar = class Calendar {
         // Signal to the event source that we are interested in events
         // only from this date range
         this._eventSource.requestRange(beginDate, iter);
-    }
+    },
 
     _update() {
         let now = new Date();
@@ -653,17 +699,18 @@ var Calendar = class Calendar {
                 button.remove_style_pseudo_class('selected');
         });
     }
-};
+});
 Signals.addSignalMethods(Calendar.prototype);
 
-var EventMessage = class EventMessage extends MessageList.Message {
-    constructor(event, date) {
-        super('', event.summary);
+var EventMessage = new Lang.Class({
+    Name: 'EventMessage',
+    Extends: MessageList.Message,
 
+    _init(event, date) {
         this._event = event;
         this._date = date;
 
-        this.setTitle(this._formatEventTime());
+        this.parent(this._formatEventTime(), event.summary);
 
         this._icon = new St.Icon({ icon_name: 'x-office-calendar-symbolic' });
         this.setIcon(this._icon);
@@ -672,7 +719,7 @@ var EventMessage = class EventMessage extends MessageList.Message {
             let iconVisible = this.actor.get_parent().has_style_pseudo_class('first-child');
             this._icon.opacity = (iconVisible ? 255 : 0);
         });
-    }
+    },
 
     _formatEventTime() {
         let periodBegin = _getBeginningOfDay(this._date);
@@ -705,33 +752,36 @@ var EventMessage = class EventMessage extends MessageList.Message {
                 title = title + ELLIPSIS_CHAR;
         }
         return title;
+    },
+
+    canClose() {
+        return isToday(this._date);
     }
-};
+});
 
-var NotificationMessage =
-class NotificationMessage extends MessageList.Message {
-    constructor(notification) {
-        super(notification.title, notification.bannerBodyText);
-        this.setUseBodyMarkup(notification.bannerBodyMarkup);
+var NotificationMessage = new Lang.Class({
+    Name: 'NotificationMessage',
+    Extends: MessageList.Message,
 
+    _init(notification) {
         this.notification = notification;
 
+        this.parent(notification.title, notification.bannerBodyText);
+        this.setUseBodyMarkup(notification.bannerBodyMarkup);
+
         this.setIcon(this._getIcon());
 
         this.connect('close', () => {
             this._closed = true;
-            if (this.notification)
-                this.notification.destroy(MessageTray.NotificationDestroyedReason.DISMISSED);
+            this.notification.destroy(MessageTray.NotificationDestroyedReason.DISMISSED);
         });
         this._destroyId = notification.connect('destroy', () => {
-            this._disconnectNotificationSignals();
-            this.notification = null;
             if (!this._closed)
                 this.close();
         });
         this._updatedId = notification.connect('updated',
                                                this._onUpdated.bind(this));
-    }
+    },
 
     _getIcon() {
         if (this.notification.gicon)
@@ -739,25 +789,22 @@ class NotificationMessage extends MessageList.Message {
                                  icon_size: MESSAGE_ICON_SIZE });
         else
             return this.notification.source.createIcon(MESSAGE_ICON_SIZE);
-    }
+    },
 
     _onUpdated(n, clear) {
         this.setIcon(this._getIcon());
         this.setTitle(n.title);
         this.setBody(n.bannerBodyText);
         this.setUseBodyMarkup(n.bannerBodyMarkup);
-    }
+    },
 
     _onClicked() {
         this.notification.activate();
-    }
+    },
 
     _onDestroy() {
-        super._onDestroy();
-        this._disconnectNotificationSignals();
-    }
+        this.parent();
 
-    _disconnectNotificationSignals() {
         if (this._updatedId)
             this.notification.disconnect(this._updatedId);
         this._updatedId = 0;
@@ -766,22 +813,21 @@ class NotificationMessage extends MessageList.Message {
             this.notification.disconnect(this._destroyId);
         this._destroyId = 0;
     }
+});
 
-    canClose() {
-        return true;
-    }
-};
-
-var EventsSection = class EventsSection extends MessageList.MessageListSection {
-    constructor() {
-        super();
+var EventsSection = new Lang.Class({
+    Name: 'EventsSection',
+    Extends: MessageList.MessageListSection,
 
+    _init() {
         this._desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
         this._desktopSettings.connect('changed', this._reloadEvents.bind(this));
         this._eventSource = new EmptyEventSource();
 
         this._messageById = new Map();
 
+        this.parent();
+
         this._title = new St.Button({ style_class: 'events-section-title',
                                       label: '',
                                       x_align: St.Align.START,
@@ -794,16 +840,20 @@ var EventsSection = class EventsSection extends MessageList.MessageListSection {
         Shell.AppSystem.get_default().connect('installed-changed',
                                               this._appInstalledChanged.bind(this));
         this._appInstalledChanged();
-    }
+    },
+
+    _ignoreEvent(event) {
+        this._eventSource.ignoreEvent(event);
+    },
 
     setEventSource(eventSource) {
         this._eventSource = eventSource;
         this._eventSource.connect('changed', this._reloadEvents.bind(this));
-    }
+    },
 
     get allowed() {
         return Main.sessionMode.showCalendarEvents;
-    }
+    },
 
     _updateTitle() {
         this._title.visible = !isToday(this._date);
@@ -816,13 +866,13 @@ var EventsSection = class EventsSection extends MessageList.MessageListSection {
         if (sameYear(this._date, now))
             /* Translators: Shown on calendar heading when selected day occurs on current year */
             dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
-                                                             "%A, %B %-d"));
+                                                             "%A, %B %d"));
         else
             /* Translators: Shown on calendar heading when selected day occurs on different year */
             dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
-                                                             "%A, %B %-d, %Y"));
+                                                             "%A, %B %d, %Y"));
         this._title.label = this._date.toLocaleFormat(dayFormat);
-    }
+    },
 
     _reloadEvents() {
         if (this._eventSource.isLoading)
@@ -848,6 +898,9 @@ var EventsSection = class EventsSection extends MessageList.MessageListSection {
             let message = this._messageById.get(event.id);
             if (!message) {
                 message = new EventMessage(event, this._date);
+                message.connect('close', () => {
+                    this._ignoreEvent(event);
+                });
                 this._messageById.set(event.id, message);
                 this.addMessage(message, false);
             } else {
@@ -857,12 +910,12 @@ var EventsSection = class EventsSection extends MessageList.MessageListSection {
 
         this._reloading = false;
         this._sync();
-    }
+    },
 
     _appInstalledChanged() {
         this._calendarApp = undefined;
         this._title.reactive = (this._getCalendarApp() != null);
-    }
+    },
 
     _getCalendarApp() {
         if (this._calendarApp !== undefined)
@@ -877,7 +930,7 @@ var EventsSection = class EventsSection extends MessageList.MessageListSection {
             this._calendarApp = null;
         }
         return this._calendarApp;
-    }
+    },
 
     _onTitleClicked() {
         Main.overview.hide();
@@ -887,30 +940,32 @@ var EventsSection = class EventsSection extends MessageList.MessageListSection {
         if (app.get_id() == 'evolution.desktop')
             app = Gio.DesktopAppInfo.new('evolution-calendar.desktop');
         app.launch([], global.create_app_launch_context(0, -1));
-    }
+    },
 
     setDate(date) {
-        super.setDate(date);
+        this.parent(date);
         this._updateTitle();
         this._reloadEvents();
-    }
+    },
 
     _shouldShow() {
         return !this.empty || !isToday(this._date);
-    }
+    },
 
     _sync() {
         if (this._reloading)
             return;
 
-        super._sync();
+        this.parent();
     }
-};
+});
 
-var NotificationSection =
-class NotificationSection extends MessageList.MessageListSection {
-    constructor() {
-        super();
+var NotificationSection = new Lang.Class({
+    Name: 'NotificationSection',
+    Extends: MessageList.MessageListSection,
+
+    _init() {
+        this.parent();
 
         this._sources = new Map();
         this._nUrgent = 0;
@@ -921,12 +976,12 @@ class NotificationSection extends MessageList.MessageListSection {
         });
 
         this.actor.connect('notify::mapped', this._onMapped.bind(this));
-    }
+    },
 
     get allowed() {
         return Main.sessionMode.hasNotifications &&
                !Main.sessionMode.isGreeter;
-    }
+    },
 
     _createTimeLabel(datetime) {
         let label = new St.Label({ style_class: 'event-time',
@@ -937,7 +992,7 @@ class NotificationSection extends MessageList.MessageListSection {
                 label.text = Util.formatTimeSpan(datetime);
         });
         return label;
-    }
+    },
 
     _sourceAdded(tray, source) {
         let obj = {
@@ -952,7 +1007,7 @@ class NotificationSection extends MessageList.MessageListSection {
                                                  this._onNotificationAdded.bind(this));
 
         this._sources.set(source, obj);
-    }
+    },
 
     _onNotificationAdded(source, notification) {
         let message = new NotificationMessage(notification);
@@ -983,14 +1038,14 @@ class NotificationSection extends MessageList.MessageListSection {
 
         let index = isUrgent ? 0 : this._nUrgent;
         this.addMessageAtIndex(message, index, this.actor.mapped);
-    }
+    },
 
     _onSourceDestroy(source, obj) {
         source.disconnect(obj.destroyId);
         source.disconnect(obj.notificationAddedId);
 
         this._sources.delete(source);
-    }
+    },
 
     _onMapped() {
         if (!this.actor.mapped)
@@ -999,15 +1054,17 @@ class NotificationSection extends MessageList.MessageListSection {
         for (let message of this._messages.keys())
             if (message.notification.urgency != MessageTray.Urgency.CRITICAL)
                 message.notification.acknowledged = true;
-    }
+    },
 
     _shouldShow() {
         return !this.empty && isToday(this._date);
     }
-};
+});
 
-var Placeholder = class Placeholder {
-    constructor() {
+var Placeholder = new Lang.Class({
+    Name: 'Placeholder',
+
+    _init() {
         this.actor = new St.BoxLayout({ style_class: 'message-list-placeholder',
                                         vertical: true });
 
@@ -1025,14 +1082,14 @@ var Placeholder = class Placeholder {
         this.actor.add_actor(this._label);
 
         this._sync();
-    }
+    },
 
     setDate(date) {
         if (sameDay(this._date, date))
             return;
         this._date = date;
         this._sync();
-    }
+    },
 
     _sync() {
         let today = isToday(this._date);
@@ -1049,10 +1106,12 @@ var Placeholder = class Placeholder {
             this._label.text = _("No Events");
         }
     }
-};
+});
 
-var CalendarMessageList = class CalendarMessageList {
-    constructor() {
+var CalendarMessageList = new Lang.Class({
+    Name: 'CalendarMessageList',
+
+    _init() {
         this.actor = new St.Widget({ style_class: 'message-list',
                                      layout_manager: new Clutter.BinLayout(),
                                      x_expand: true, y_expand: true });
@@ -1068,11 +1127,11 @@ 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',
-                                            label: _("Clear"),
+                                            label: _("Clear All"),
                                             can_focus: true });
         this._clearButton.set_x_align(Clutter.ActorAlign.END);
         this._clearButton.connect('clicked', () => {
@@ -1098,7 +1157,7 @@ var CalendarMessageList = class CalendarMessageList {
         this._addSection(this._eventsSection);
 
         Main.sessionMode.connect('updated', this._sync.bind(this));
-    }
+    },
 
     _addSection(section) {
         let obj = {
@@ -1123,7 +1182,7 @@ var CalendarMessageList = class CalendarMessageList {
         this._sections.set(section, obj);
         this._sectionList.add_actor(section.actor);
         this._sync();
-    }
+    },
 
     _removeSection(section) {
         let obj = this._sections.get(section);
@@ -1136,11 +1195,11 @@ var CalendarMessageList = class CalendarMessageList {
         this._sections.delete(section);
         this._sectionList.remove_actor(section.actor);
         this._sync();
-    }
+    },
 
     _onKeyFocusIn(section, actor) {
         Util.ensureActorVisibleInScrollView(this._scrollView, actor);
-    }
+    },
 
     _sync() {
         let sections = [...this._sections.keys()];
@@ -1155,15 +1214,15 @@ var CalendarMessageList = class CalendarMessageList {
 
         let canClear = sections.some(s => s.canClear && s.actor.visible);
         this._clearButton.reactive = canClear;
-    }
+    },
 
     setEventSource(eventSource) {
         this._eventsSection.setEventSource(eventSource);
-    }
+    },
 
     setDate(date) {
         for (let section of this._sections.keys())
             section.setDate(date);
         this._placeholder.setDate(date);
     }
-};
+});

js/ui/checkBox.js

@@ -1,7 +1,13 @@
-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) {
+const Lang = imports.lang;
+
+var CheckBox = new Lang.Class({
+    Name: 'CheckBox',
+
+    _init(label) {
         let container = new St.BoxLayout();
         this.actor = new St.Button({ style_class: 'check-box',
                                      child: container,
@@ -22,13 +28,13 @@ var CheckBox = class CheckBox {
 
         if (label)
             this.setLabel(label);
-    }
+    },
 
     setLabel(label) {
         this._label.set_text(label);
-    }
+    },
 
     getLabelActor() {
         return this._label;
     }
-};
+});

js/ui/closeDialog.js

@@ -1,6 +1,12 @@
 // -*- 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 Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
@@ -10,29 +16,31 @@ var FROZEN_WINDOW_BRIGHTNESS = -0.3
 var DIALOG_TRANSITION_TIME = 0.15
 var ALIVE_TIMEOUT = 5000;
 
-var CloseDialog = GObject.registerClass({
+var CloseDialog = new Lang.Class({
+    Name: 'CloseDialog',
+    Extends: GObject.Object,
     Implements: [ Meta.CloseDialog ],
     Properties: {
         'window': GObject.ParamSpec.override('window', Meta.CloseDialog)
     },
-}, class CloseDialog extends GObject.Object {
+
     _init(window) {
-        super._init();
+        this.parent();
         this._window = window;
         this._dialog = null;
         this._tracked = undefined;
         this._timeoutId = 0;
         this._windowFocusChangedId = 0;
         this._keyFocusChangedId = 0;
-    }
+    },
 
     get window() {
         return this._window;
-    }
+    },
 
     set window(window) {
         this._window = window;
-    }
+    },
 
     _createDialogContent() {
         let tracker = Shell.WindowTracker.get_default();
@@ -44,7 +52,7 @@ var CloseDialog = GObject.registerClass({
                          "continue or force the application to quit entirely.");
         let icon = new Gio.ThemedIcon({ name: 'dialog-warning-symbolic' });
         return new Dialog.MessageDialogContent({ icon, title, subtitle });
-    }
+    },
 
     _initDialog() {
         if (this._dialog)
@@ -64,7 +72,7 @@ var CloseDialog = GObject.registerClass({
                                  key:    Clutter.Escape });
 
         global.focus_manager.add_group(this._dialog);
-    }
+    },
 
     _addWindowEffect() {
         // We set the effect on the surface actor, so the dialog itself
@@ -75,21 +83,21 @@ var CloseDialog = GObject.registerClass({
         let effect = new Clutter.BrightnessContrastEffect();
         effect.set_brightness(FROZEN_WINDOW_BRIGHTNESS);
         surfaceActor.add_effect_with_name("gnome-shell-frozen-window", effect);
-    }
+    },
 
     _removeWindowEffect() {
         let windowActor = this._window.get_compositor_private();
         let surfaceActor = windowActor.get_first_child();
         surfaceActor.remove_effect_by_name("gnome-shell-frozen-window");
-    }
+    },
 
     _onWait() {
         this.response(Meta.CloseDialogResponse.WAIT);
-    }
+    },
 
     _onClose() {
         this.response(Meta.CloseDialogResponse.FORCE_CLOSE);
-    }
+    },
 
     _onFocusChanged() {
         if (Meta.is_wayland_compositor())
@@ -120,7 +128,7 @@ var CloseDialog = GObject.registerClass({
         });
 
         this._tracked = shouldTrack;
-    }
+    },
 
     vfunc_show() {
         if (this._dialog != null)
@@ -154,7 +162,7 @@ var CloseDialog = GObject.registerClass({
                            time: DIALOG_TRANSITION_TIME,
                            onComplete: this._onFocusChanged.bind(this)
                          });
-    }
+    },
 
     vfunc_hide() {
         if (this._dialog == null)
@@ -183,7 +191,7 @@ var CloseDialog = GObject.registerClass({
                                dialog.destroy();
                            }
                          });
-    }
+    },
 
     vfunc_focus() {
         if (this._dialog)

js/ui/components/__init__.js

@@ -1,13 +1,17 @@
+
+const Lang = imports.lang;
 const Main = imports.ui.main;
 
-var ComponentManager = class {
-    constructor() {
+var ComponentManager = new Lang.Class({
+    Name: 'ComponentManager',
+
+    _init() {
         this._allComponents = {};
         this._enabledComponents = [];
 
         Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
         this._sessionUpdated();
-    }
+    },
 
     _sessionUpdated() {
         let newEnabledComponents = Main.sessionMode.components;
@@ -25,12 +29,12 @@ var ComponentManager = class {
         });
 
         this._enabledComponents = newEnabledComponents;
-    }
+    },
 
     _importComponent(name) {
         let module = imports.ui.components[name];
         return module.Component;
-    }
+    },
 
     _ensureComponent(name) {
         let component = this._allComponents[name];
@@ -44,13 +48,13 @@ var ComponentManager = class {
         component = new constructor();
         this._allComponents[name] = component;
         return component;
-    }
+    },
 
     _enableComponent(name) {
         let component = this._ensureComponent(name);
 	if (component)
             component.enable();
-    }
+    },
 
     _disableComponent(name) {
         let component = this._allComponents[name];
@@ -58,4 +62,4 @@ var ComponentManager = class {
             return;
         component.disable();
     }
-};
+});

js/ui/components/automountManager.js

@@ -1,10 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Gio, GLib } = imports.gi;
+const Lang = imports.lang;
 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;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
 var GNOME_SESSION_AUTOMOUNT_INHIBIT = 16;
@@ -15,8 +19,10 @@ const SETTING_ENABLE_AUTOMOUNT = 'automount';
 
 var AUTORUN_EXPIRE_TIMEOUT_SECS = 10;
 
-var AutomountManager = class {
-    constructor() {
+var AutomountManager = new Lang.Class({
+    Name: 'AutomountManager',
+
+    _init() {
         this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA });
         this._volumeQueue = [];
         this._activeOperations = new Map();
@@ -28,7 +34,7 @@ var AutomountManager = class {
         this._inhibited = false;
 
         this._volumeMonitor = Gio.VolumeMonitor.get();
-    }
+    },
 
     enable() {
         this._volumeAddedId = this._volumeMonitor.connect('volume-added', this._onVolumeAdded.bind(this));
@@ -39,7 +45,7 @@ var AutomountManager = class {
 
         this._mountAllId = Mainloop.idle_add(this._startupMountAll.bind(this));
         GLib.Source.set_name_by_id(this._mountAllId, '[gnome-shell] this._startupMountAll');
-    }
+    },
 
     disable() {
         this._volumeMonitor.disconnect(this._volumeAddedId);
@@ -52,7 +58,7 @@ var AutomountManager = class {
             Mainloop.source_remove(this._mountAllId);
             this._mountAllId = 0;
         }
-    }
+    },
 
     _InhibitorsChanged(object, senderName, [inhibtor]) {
         this._session.IsInhibitedRemote(GNOME_SESSION_AUTOMOUNT_INHIBIT,
@@ -61,7 +67,7 @@ var AutomountManager = class {
                     this._inhibited = result[0];
                 }
             });
-    }
+    },
 
     _startupMountAll() {
         let volumes = this._volumeMonitor.get_volumes();
@@ -73,7 +79,7 @@ var AutomountManager = class {
 
         this._mountAllId = 0;
         return GLib.SOURCE_REMOVE;
-    }
+    },
 
     _onDriveConnected() {
         // if we're not in the current ConsoleKit session,
@@ -81,11 +87,10 @@ var AutomountManager = class {
         if (!this._session.SessionIsActive)
             return;
 
-        let player = global.display.get_sound_player();
-        player.play_from_theme('device-added-media',
-                               _("External drive connected"),
-                               null);
-    }
+        global.play_theme_sound(0, 'device-added-media',
+                                _("External drive connected"),
+                                null);
+    },
 
     _onDriveDisconnected() {
         // if we're not in the current ConsoleKit session,
@@ -93,11 +98,10 @@ var AutomountManager = class {
         if (!this._session.SessionIsActive)
             return;
 
-        let player = global.display.get_sound_player();
-        player.play_from_theme('device-removed-media',
-                               _("External drive disconnected"),
-                               null);
-    }
+        global.play_theme_sound(0, 'device-removed-media',
+                                _("External drive disconnected"),
+                                null);
+    },
 
     _onDriveEjectButton(monitor, drive) {
         // TODO: this code path is not tested, as the GVfs volume monitor
@@ -128,11 +132,11 @@ var AutomountManager = class {
                      }
                  });
         }
-    }
+    },
 
     _onVolumeAdded(monitor, volume) {
         this._checkAndMountVolume(volume);
-    }
+    },
 
     _checkAndMountVolume(volume, params) {
         params = Params.parse(params, { checkSession: true,
@@ -172,7 +176,7 @@ var AutomountManager = class {
         } else {
             this._mountVolume(volume, null, params.allowAutorun);
         }
-    }
+    },
 
     _mountVolume(volume, operation, allowAutorun) {
         if (allowAutorun)
@@ -183,7 +187,7 @@ var AutomountManager = class {
 
         volume.mount(0, mountOp, null,
                      this._onVolumeMounted.bind(this));
-    }
+    },
 
     _onVolumeMounted(volume, res) {
         this._allowAutorunExpire(volume);
@@ -193,13 +197,9 @@ var AutomountManager = class {
             this._closeOperation(volume);
         } catch (e) {
             // FIXME: we will always get G_IO_ERROR_FAILED from the gvfs udisks
-            // backend, see https://bugs.freedesktop.org/show_bug.cgi?id=51271
-            // To reask the password if the user input was empty or wrong, we
-            // will check for corresponding error messages. However, these
-            // 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)
-                e.message.includes('Error unlocking')) {                       // udisks (wrong password)
+            // backend in this case, see 
+            // https://bugs.freedesktop.org/show_bug.cgi?id=51271
+            if (e.message.indexOf('No key available with this passphrase') != -1) {
                 this._reaskPassword(volume);
             } else {
                 if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
@@ -208,7 +208,7 @@ var AutomountManager = class {
                 this._closeOperation(volume);
             }
         }
-    }
+    },
 
     _onVolumeRemoved(monitor, volume) {
         if (volume._allowAutorunExpireId && volume._allowAutorunExpireId > 0) {
@@ -217,7 +217,7 @@ var AutomountManager = class {
         }
         this._volumeQueue = 
             this._volumeQueue.filter(element => (element != volume));
-    }
+    },
 
     _reaskPassword(volume) {
         let prevOperation = this._activeOperations.get(volume);
@@ -226,7 +226,7 @@ var AutomountManager = class {
             new ShellMountOperation.ShellMountOperation(volume,
                                                         { existingDialog: existingDialog });
         this._mountVolume(volume, operation);
-    }
+    },
 
     _closeOperation(volume) {
         let operation = this._activeOperations.get(volume);
@@ -234,11 +234,11 @@ var AutomountManager = class {
             return;
         operation.close();
         this._activeOperations.delete(volume);
-    }
+    },
 
     _allowAutorun(volume) {
         volume.allowAutorun = true;
-    }
+    },
 
     _allowAutorunExpire(volume) {
         let id = Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, () => {
@@ -249,5 +249,5 @@ var AutomountManager = class {
         volume._allowAutorunExpireId = id;
         GLib.Source.set_name_by_id(id, '[gnome-shell] volume.allowAutorun');
     }
-};
+});
 var Component = AutomountManager;

js/ui/components/autorunManager.js

@@ -1,6 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Gio, St } = imports.gi;
+const Lang = imports.lang;
+const Gio = imports.gi.Gio;
+const St = imports.gi.St;
 
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
@@ -82,11 +84,13 @@ function HotplugSniffer() {
                                    '/org/gnome/Shell/HotplugSniffer');
 }
 
-var ContentTypeDiscoverer = class {
-    constructor(callback) {
+var ContentTypeDiscoverer = new Lang.Class({
+    Name: 'ContentTypeDiscoverer',
+
+    _init(callback) {
         this._callback = callback;
         this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA });
-    }
+    },
 
     guessContentTypes(mount) {
         let autorunEnabled = !this._settings.get_boolean(SETTING_DISABLE_AUTORUN);
@@ -99,7 +103,7 @@ var ContentTypeDiscoverer = class {
         } else {
             this._emitCallback(mount, []);
         }
-    }
+    },
 
     _onContentTypeGuessed(mount, res) {
         let contentTypes = [];
@@ -122,7 +126,7 @@ var ContentTypeDiscoverer = class {
                      this._emitCallback(mount, contentTypes);
                  });
         }
-    }
+    },
 
     _emitCallback(mount, contentTypes) {
         if (!contentTypes)
@@ -146,25 +150,27 @@ var ContentTypeDiscoverer = class {
 
         this._callback(mount, apps, contentTypes);
     }
-};
+});
 
-var AutorunManager = class {
-    constructor() {
+var AutorunManager = new Lang.Class({
+    Name: 'AutorunManager',
+
+    _init() {
         this._session = new GnomeSession.SessionManager();
         this._volumeMonitor = Gio.VolumeMonitor.get();
 
         this._dispatcher = new AutorunDispatcher(this);
-    }
+    },
 
     enable() {
         this._mountAddedId = this._volumeMonitor.connect('mount-added', this._onMountAdded.bind(this));
         this._mountRemovedId = this._volumeMonitor.connect('mount-removed', this._onMountRemoved.bind(this));
-    }
+    },
 
     disable() {
         this._volumeMonitor.disconnect(this._mountAddedId);
         this._volumeMonitor.disconnect(this._mountRemovedId);
-    }
+    },
 
     _onMountAdded(monitor, mount) {
         // don't do anything if our session is not the currently
@@ -176,19 +182,21 @@ var AutorunManager = class {
             this._dispatcher.addMount(mount, apps, contentTypes);
         });
         discoverer.guessContentTypes(mount);
-    }
+    },
 
     _onMountRemoved(monitor, mount) {
         this._dispatcher.removeMount(mount);
     }
-};
+});
 
-var AutorunDispatcher = class {
-    constructor(manager) {
+var AutorunDispatcher = new Lang.Class({
+    Name: 'AutorunDispatcher',
+
+    _init(manager) {
         this._manager = manager;
         this._sources = [];
         this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA });
-    }
+    },
 
     _getAutorunSettingForType(contentType) {
         let runApp = this._settings.get_strv(SETTING_START_APP);
@@ -204,7 +212,7 @@ var AutorunDispatcher = class {
             return AutorunSetting.FILES;
 
         return AutorunSetting.ASK;
-    }
+    },
 
     _getSourceForMount(mount) {
         let filtered = this._sources.filter(source => (source.mount == mount));
@@ -216,7 +224,7 @@ var AutorunDispatcher = class {
             return filtered[0];
 
         return null;
-    }
+    },
 
     _addSource(mount, apps) {
         // if we already have a source showing for this 
@@ -226,7 +234,7 @@ var AutorunDispatcher = class {
      
         // add a new source
         this._sources.push(new AutorunSource(this._manager, mount, apps));
-    }
+    },
 
     addMount(mount, apps, contentTypes) {
         // if autorun is disabled globally, return
@@ -264,7 +272,7 @@ var AutorunDispatcher = class {
         // but we failed launching the default app or the default file manager
         if (!success)
             this._addSource(mount, apps);
-    }
+    },
 
     removeMount(mount) {
         let source = this._getSourceForMount(mount);
@@ -276,39 +284,45 @@ var AutorunDispatcher = class {
         // destroy the notification source
         source.destroy();
     }
-};
+});
 
-var AutorunSource = class extends MessageTray.Source {
-    constructor(manager, mount, apps) {
-        super(mount.get_name());
+var AutorunSource = new Lang.Class({
+    Name: 'AutorunSource',
+    Extends: MessageTray.Source,
 
+    _init(manager, mount, apps) {
         this._manager = manager;
         this.mount = mount;
         this.apps = apps;
 
+        this.parent(mount.get_name());
+
         this._notification = new AutorunNotification(this._manager, this);
 
         // add ourselves as a source, and popup the notification
         Main.messageTray.add(this);
         this.notify(this._notification);
-    }
+    },
 
     getIcon() {
         return this.mount.get_icon();
-    }
+    },
 
     _createPolicy() {
         return new MessageTray.NotificationApplicationPolicy('org.gnome.Nautilus');
     }
-};
+});
 
-var AutorunNotification = class extends MessageTray.Notification {
-    constructor(manager, source) {
-        super(source, source.title);
+var AutorunNotification = new Lang.Class({
+    Name: 'AutorunNotification',
+    Extends: MessageTray.Notification,
+
+    _init(manager, source) {
+        this.parent(source, source.title);
 
         this._manager = manager;
         this._mount = source.mount;
-    }
+    },
 
     createBanner() {
         let banner = new MessageTray.NotificationBanner(this);
@@ -321,7 +335,7 @@ var AutorunNotification = class extends MessageTray.Notification {
         });
 
         return banner;
-    }
+    },
 
     _buttonForApp(app) {
         let box = new St.BoxLayout();
@@ -348,14 +362,14 @@ var AutorunNotification = class extends MessageTray.Notification {
         });
 
         return button;
-    }
+    },
 
     activate() {
-        super.activate();
+        this.parent();
 
         let app = Gio.app_info_get_default_for_type('inode/directory', false);
         startAppForMount(app, this._mount);
     }
-};
+});
 
 var Component = AutorunManager;

js/ui/components/keyring.js

@@ -1,18 +1,31 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gcr, Gio, GObject, Pango, Shell, St } = imports.gi;
+const Lang = imports.lang;
+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 WORK_SPINNER_ANIMATION_DELAY = 1.0;
+var WORK_SPINNER_ANIMATION_TIME = 0.3;
 
-var KeyringDialog = class extends ModalDialog.ModalDialog {
-    constructor() {
-        super({ styleClass: 'prompt-dialog' });
+var KeyringDialog = new Lang.Class({
+    Name: 'KeyringDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init() {
+        this.parent({ styleClass: 'prompt-dialog' });
 
         this.prompt = new Shell.KeyringPrompt();
         this.prompt.connect('show-password', this._onShowPassword.bind(this));
@@ -50,17 +63,34 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
 
         this.prompt.bind_property('cancel-label', this._cancelButton, 'label', GObject.BindingFlags.SYNC_CREATE);
         this.prompt.bind_property('continue-label', this._continueButton, 'label', GObject.BindingFlags.SYNC_CREATE);
-    }
+    },
 
     _setWorking(working) {
         if (!this._workSpinner)
             return;
 
-        if (working)
+        Tweener.removeTweens(this._workSpinner.actor);
+        if (working) {
             this._workSpinner.play();
-        else
-            this._workSpinner.stop();
-    }
+            Tweener.addTween(this._workSpinner.actor,
+                             { opacity: 255,
+                               delay: WORK_SPINNER_ANIMATION_DELAY,
+                               time: WORK_SPINNER_ANIMATION_TIME,
+                               transition: 'linear'
+                             });
+        } else {
+            Tweener.addTween(this._workSpinner.actor,
+                             { opacity: 0,
+                               time: WORK_SPINNER_ANIMATION_TIME,
+                               transition: 'linear',
+                               onCompleteScope: this,
+                               onComplete() {
+                                   if (this._workSpinner)
+                                       this._workSpinner.stop();
+                               }
+                             });
+        }
+    },
 
     _buildControlTable() {
         let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
@@ -84,7 +114,9 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
             ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
             this._passwordEntry.clutter_text.connect('activate', this._onPasswordActivate.bind(this));
 
-            this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, true);
+            let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
+            this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
+            this._workSpinner.actor.opacity = 0;
 
             if (rtl) {
                 layout.attach(this._workSpinner.actor, 0, row, 1, 1);
@@ -151,7 +183,7 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
 
         this._controlTable = table;
         this._content.messageBox.add(table, { x_fill: true, y_fill: true });
-    }
+    },
 
     _updateSensitivity(sensitive) {
         if (this._passwordEntry) {
@@ -167,7 +199,7 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
         this._continueButton.can_focus = sensitive;
         this._continueButton.reactive = sensitive;
         this._setWorking(!sensitive);
-    }
+    },
 
     _ensureOpen() {
         // NOTE: ModalDialog.open() is safe to call if the dialog is
@@ -185,61 +217,65 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
             ' Dismissing prompt request');
         this.prompt.cancel()
         return false;
-    }
+    },
 
     _onShowPassword(prompt) {
         this._buildControlTable();
         this._ensureOpen();
         this._updateSensitivity(true);
         this._passwordEntry.grab_key_focus();
-    }
+    },
 
     _onShowConfirm(prompt) {
         this._buildControlTable();
         this._ensureOpen();
         this._updateSensitivity(true);
         this._continueButton.grab_key_focus();
-    }
+    },
 
     _onHidePrompt(prompt) {
         this.close();
-    }
+    },
 
     _onPasswordActivate() {
         if (this.prompt.confirm_visible)
             this._confirmEntry.grab_key_focus();
         else
             this._onContinueButton();
-    }
+    },
 
     _onConfirmActivate() {
         this._onContinueButton();
-    }
+    },
 
     _onContinueButton() {
         this._updateSensitivity(false);
         this.prompt.complete();
-    }
+    },
 
     _onCancelButton() {
         this.prompt.cancel();
-    }
-};
+    },
+});
 
-var KeyringDummyDialog = class {
-    constructor() {
+var KeyringDummyDialog = new Lang.Class({
+    Name: 'KeyringDummyDialog',
+
+    _init() {
         this.prompt = new Shell.KeyringPrompt();
         this.prompt.connect('show-password', this._cancelPrompt.bind(this));
         this.prompt.connect('show-confirm', this._cancelPrompt.bind(this));
-    }
+    },
 
     _cancelPrompt() {
         this.prompt.cancel();
     }
-};
+});
 
-var KeyringPrompter = class {
-    constructor() {
+var KeyringPrompter = new Lang.Class({
+    Name: 'KeyringPrompter',
+
+    _init() {
         this._prompter = new Gcr.SystemPrompter();
         this._prompter.connect('new-prompt', () => {
             let dialog = this._enabled ? new KeyringDialog()
@@ -251,7 +287,7 @@ var KeyringPrompter = class {
         this._registered = false;
         this._enabled = false;
         this._currentPrompt = null;
-    }
+    },
 
     enable() {
         if (!this._registered) {
@@ -261,7 +297,7 @@ var KeyringPrompter = class {
             this._registered = true;
         }
         this._enabled = true;
-    }
+    },
 
     disable() {
         this._enabled = false;
@@ -270,6 +306,6 @@ var KeyringPrompter = class {
             this._currentPrompt.cancel();
         this._currentPrompt = null;
     }
-};
+});
 
 var Component = KeyringPrompter;

js/ui/components/networkAgent.js

@@ -1,20 +1,32 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, 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 Lang = imports.lang;
+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 = class extends ModalDialog.ModalDialog {
-    constructor(agent, requestId, connection, settingName, hints, flags, contentOverride) {
-        super({ styleClass: 'prompt-dialog' });
+var NetworkSecretDialog = new Lang.Class({
+    Name: 'NetworkSecretDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init(agent, requestId, connection, settingName, hints, contentOverride) {
+        this.parent({ styleClass: 'prompt-dialog' });
 
         this._agent = agent;
         this._requestId = requestId;
@@ -97,18 +109,6 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
 
         contentBox.messageBox.add(secretTable);
 
-        if (flags & NM.SecretAgentGetSecretsFlags.WPS_PBC_ACTIVE) {
-            let descriptionLabel = new St.Label({ style_class: 'prompt-dialog-description',
-                                                  text: _("Alternatively you can connect by pushing the “WPS” button on your router.") });
-            descriptionLabel.clutter_text.line_wrap = true;
-            descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-
-            contentBox.messageBox.add(descriptionLabel,
-                                      { y_fill:  true,
-                                        y_align: St.Align.START,
-                                        expand: true });
-        }
-
         this._okButton = { label:  _("Connect"),
                            action: this._onOk.bind(this),
                            default: true
@@ -121,7 +121,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
                          this._okButton]);
 
         this._updateOkButton();
-    }
+    },
 
     _updateOkButton() {
         let valid = true;
@@ -132,7 +132,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
 
         this._okButton.button.reactive = valid;
         this._okButton.button.can_focus = valid;
-    }
+    },
 
     _onOk() {
         let valid = true;
@@ -148,12 +148,12 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
             this.close(global.get_current_time());
         }
         // do nothing if not valid
-    }
+    },
 
     cancel() {
         this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
         this.close(global.get_current_time());
-    }
+    },
 
     _validateWpaPsk(secret) {
         let value = secret.value;
@@ -169,7 +169,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
         }
 
         return (value.length >= 8 && value.length <= 63);
-    }
+    },
 
     _validateStaticWep(secret) {
         let value = secret.value;
@@ -194,7 +194,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
 	        return false;
 	}
         return true;
-    }
+    },
 
     _getWirelessSecrets(secrets, wirelessSetting) {
         let wirelessSecuritySetting = this._connection.get_setting_wireless_security();
@@ -231,7 +231,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
         default:
             log('Invalid wireless key management: ' + wirelessSecuritySetting.key_mgmt);
         }
-    }
+    },
 
     _get8021xSecrets(secrets) {
         let ieee8021xSetting = this._connection.get_setting_802_1x();
@@ -274,7 +274,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
         default:
             log('Invalid EAP/IEEE802.1x method: ' + ieee8021xSetting.get_eap_method(0));
         }
-    }
+    },
 
     _getPPPoESecrets(secrets) {
         let pppoeSetting = this._connection.get_setting_pppoe();
@@ -284,7 +284,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
                        value: pppoeSetting.service || '', password: false });
         secrets.push({ label: _("Password: "), key: 'password',
                        value: pppoeSetting.password || '', password: true });
-    }
+    },
 
     _getMobileSecrets(secrets, connectionType) {
         let setting;
@@ -294,7 +294,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
             setting = this._connection.get_setting_by_name(connectionType);
         secrets.push({ label: _("Password: "), key: 'password',
                        value: setting.value || '', password: true });
-    }
+    },
 
     _getContent() {
         let connectionSetting = this._connection.get_setting_connection();
@@ -347,14 +347,15 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
 
         return content;
     }
-};
+});
 
-var VPNRequestHandler = class {
-    constructor(agent, requestId, authHelper, serviceType, connection, hints, flags) {
+var VPNRequestHandler = new Lang.Class({
+    Name: 'VPNRequestHandler',
+
+    _init(agent, requestId, authHelper, serviceType, connection, hints, flags) {
         this._agent = agent;
         this._requestId = requestId;
         this._connection = connection;
-        this._flags = flags;
         this._pluginOutBuffer = [];
         this._title = null;
         this._description = null;
@@ -411,7 +412,7 @@ var VPNRequestHandler = class {
 
             this._agent.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
         }
-    }
+    },
 
     cancel(respond) {
         if (respond)
@@ -427,7 +428,7 @@ var VPNRequestHandler = class {
         }
 
         this.destroy();
-    }
+    },
 
     destroy() {
         if (this._destroyed)
@@ -441,7 +442,7 @@ var VPNRequestHandler = class {
         // Stdout is closed when we finish reading from it
 
         this._destroyed = true;
-    }
+    },
 
     _vpnChildFinished(pid, status, requestObj) {
         this._childWatch = 0;
@@ -462,7 +463,7 @@ var VPNRequestHandler = class {
             this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
 
         this.destroy();
-    }
+    },
 
     _vpnChildProcessLineOldStyle(line) {
         if (this._previousLine != undefined) {
@@ -480,7 +481,7 @@ var VPNRequestHandler = class {
         } else {
             this._previousLine = line;
         }
-    }
+    },
 
     _readStdoutOldStyle() {
         this._dataStdout.read_line_async(GLib.PRIORITY_DEFAULT, null, (stream, result) => {
@@ -497,7 +498,7 @@ var VPNRequestHandler = class {
             // try to read more!
             this._readStdoutOldStyle();
         });
-    }
+    },
 
     _readStdoutNewStyle() {
         this._dataStdout.fill_async(-1, GLib.PRIORITY_DEFAULT, null, (stream, result) => {
@@ -515,7 +516,7 @@ var VPNRequestHandler = class {
             this._dataStdout.set_buffer_size(2 * this._dataStdout.get_buffer_size());
             this._readStdoutNewStyle();
         });
-    }
+    },
 
     _showNewStyleDialog() {
         let keyfile = new GLib.KeyFile();
@@ -573,13 +574,13 @@ var VPNRequestHandler = class {
 
         if (contentOverride && contentOverride.secrets.length) {
             // Only show the dialog if we actually have something to ask
-            this._shellDialog = new NetworkSecretDialog(this._agent, this._requestId, this._connection, 'vpn', [], this._flags, contentOverride);
+            this._shellDialog = new NetworkSecretDialog(this._agent, this._requestId, this._connection, 'vpn', [], contentOverride);
             this._shellDialog.open(global.get_current_time());
         } else {
             this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
             this.destroy();
         }
-    }
+    },
 
     _writeConnection() {
         let vpnSetting = this._connection.get_setting_vpn();
@@ -600,12 +601,14 @@ var VPNRequestHandler = class {
             this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
             this.destroy();
         }
-    }
-};
+    },
+});
 Signals.addSignalMethods(VPNRequestHandler.prototype);
 
-var NetworkAgent = class {
-    constructor() {
+var NetworkAgent = new Lang.Class({
+    Name: 'NetworkAgent',
+
+    _init() {
         this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent',
                                                 capabilities: NM.SecretAgentCapabilities.VPN_HINTS,
                                                 auto_register: false
@@ -636,7 +639,7 @@ var NetworkAgent = class {
                 logError(e, 'error initializing the NetworkManager Agent');
             }
         });
-    }
+    },
 
     enable() {
         if (!this._native)
@@ -645,7 +648,7 @@ var NetworkAgent = class {
         this._native.auto_register = true;
         if (this._initialized && !this._native.registered)
             this._native.register_async(null, null);
-    }
+    },
 
     disable() {
         let requestId;
@@ -668,7 +671,7 @@ var NetworkAgent = class {
         this._native.auto_register = false;
         if (this._initialized && this._native.registered)
             this._native.unregister_async(null, null);
-    }
+    },
 
     _showNotification(requestId, connection, settingName, hints, flags) {
         let source = new MessageTray.Source(_("Network Manager"), 'network-transmit-receive');
@@ -697,14 +700,14 @@ var NetworkAgent = class {
             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);
@@ -728,14 +731,14 @@ var NetworkAgent = class {
 
         Main.messageTray.add(source);
         source.notify(notification);
-    }
+    },
 
     _newRequest(agent, requestId, connection, settingName, hints, flags) {
         if (!(flags & NM.SecretAgentGetSecretsFlags.USER_REQUESTED))
             this._showNotification(requestId, connection, settingName, hints, flags);
         else
             this._handleRequest(requestId, connection, settingName, hints, flags);
-    }
+    },
 
     _handleRequest(requestId, connection, settingName, hints, flags) {
         if (settingName == 'vpn') {
@@ -743,13 +746,13 @@ var NetworkAgent = class {
             return;
         }
 
-        let dialog = new NetworkSecretDialog(this._native, requestId, connection, settingName, hints, flags);
+        let dialog = new NetworkSecretDialog(this._native, requestId, connection, settingName, hints);
         dialog.connect('destroy', () => {
             delete this._dialogs[requestId];
         });
         this._dialogs[requestId] = dialog;
         dialog.open(global.get_current_time());
-    }
+    },
 
     _cancelRequest(agent, requestId) {
         if (this._dialogs[requestId]) {
@@ -760,7 +763,7 @@ var NetworkAgent = class {
             this._vpnRequests[requestId].cancel(false);
             delete this._vpnRequests[requestId];
         }
-    }
+    },
 
     _vpnRequest(requestId, connection, hints, flags) {
         let vpnSetting = connection.get_setting_vpn();
@@ -782,7 +785,7 @@ var NetworkAgent = class {
             delete this._vpnRequests[requestId];
         });
         this._vpnRequests[requestId] = vpnRequest;
-    }
+    },
 
     _buildVPNServiceCache() {
         if (this._vpnCacheBuilt)
@@ -815,5 +818,5 @@ var NetworkAgent = class {
             }
         });
     }
-};
+});
 var Component = NetworkAgent;

js/ui/components/polkitAgent.js

@@ -1,23 +1,39 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { AccountsService, Clutter, Gio, GLib,
-        Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
+const Lang = imports.lang;
 const Signals = imports.signals;
+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 WORK_SPINNER_ANIMATION_DELAY = 1.0;
+var WORK_SPINNER_ANIMATION_TIME = 0.3;
 
-var AuthenticationDialog = class extends ModalDialog.ModalDialog {
-    constructor(actionId, body, cookie, userNames) {
-        super({ styleClass: 'prompt-dialog' });
+var AuthenticationDialog = new Lang.Class({
+    Name: 'AuthenticationDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init(actionId, body, cookie, userNames) {
+        this.parent({ styleClass: 'prompt-dialog' });
 
         this.actionId = actionId;
         this.message = body;
@@ -28,8 +44,6 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
             this._group.visible = !Main.sessionMode.isLocked;
         });
 
-        this.connect('closed', this._onDialogClosed.bind(this));
-
         let icon = new Gio.ThemedIcon({ name: 'dialog-password-symbolic' });
         let title = _("Authentication Required");
 
@@ -103,7 +117,10 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this._passwordBox.add(this._passwordEntry,
                               { expand: true });
 
-        this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, true);
+        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
+        this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
+        this._workSpinner.actor.opacity = 0;
+
         this._passwordBox.add(this._workSpinner.actor);
 
         this.setInitialKeyFocus(this._passwordEntry);
@@ -144,25 +161,50 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
 
         this._identityToAuth = Polkit.UnixUser.new_for_name(userName);
         this._cookie = cookie;
-    }
+    },
 
     _setWorking(working) {
-        if (working)
+        Tweener.removeTweens(this._workSpinner.actor);
+        if (working) {
             this._workSpinner.play();
-        else
-            this._workSpinner.stop();
-    }
+            Tweener.addTween(this._workSpinner.actor,
+                             { opacity: 255,
+                               delay: WORK_SPINNER_ANIMATION_DELAY,
+                               time: WORK_SPINNER_ANIMATION_TIME,
+                               transition: 'linear'
+                             });
+        } else {
+            Tweener.addTween(this._workSpinner.actor,
+                             { opacity: 0,
+                               time: WORK_SPINNER_ANIMATION_TIME,
+                               transition: 'linear',
+                               onCompleteScope: this,
+                               onComplete() {
+                                   if (this._workSpinner)
+                                       this._workSpinner.stop();
+                               }
+                             });
+        }
+    },
 
     performAuthentication() {
-        this._destroySession();
+        this.destroySession();
         this._session = new PolkitAgent.Session({ identity: this._identityToAuth,
                                                   cookie: this._cookie });
-        this._sessionCompletedId = this._session.connect('completed', this._onSessionCompleted.bind(this));
-        this._sessionRequestId = this._session.connect('request', this._onSessionRequest.bind(this));
-        this._sessionShowErrorId = this._session.connect('show-error', this._onSessionShowError.bind(this));
-        this._sessionShowInfoId = this._session.connect('show-info', this._onSessionShowInfo.bind(this));
+        this._session.connect('completed', this._onSessionCompleted.bind(this));
+        this._session.connect('request', this._onSessionRequest.bind(this));
+        this._session.connect('show-error', this._onSessionShowError.bind(this));
+        this._session.connect('show-info', this._onSessionShowInfo.bind(this));
         this._session.initiate();
-    }
+    },
+
+    close(timestamp) {
+        this.parent(timestamp);
+
+        if (this._sessionUpdatedId)
+            Main.sessionMode.disconnect(this._sessionUpdatedId);
+        this._sessionUpdatedId = 0;
+    },
 
     _ensureOpen() {
         // NOTE: ModalDialog.open() is safe to call if the dialog is
@@ -184,14 +226,14 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
                 ' cookie ' + this._cookie);
             this._emitDone(true);
         }
-    }
+    },
 
     _emitDone(dismissed) {
         if (!this._doneEmitted) {
             this._doneEmitted = true;
             this.emit('done', dismissed);
         }
-    }
+    },
 
     _updateSensitivity(sensitive) {
         this._passwordEntry.reactive = sensitive;
@@ -200,7 +242,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this._okButton.can_focus = sensitive;
         this._okButton.reactive = sensitive;
         this._setWorking(!sensitive);
-    }
+    },
 
     _onEntryActivate() {
         let response = this._passwordEntry.get_text();
@@ -211,11 +253,11 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this._errorMessageLabel.hide();
         this._infoMessageLabel.hide();
         this._nullMessageLabel.show();
-    }
+    },
 
     _onAuthenticateButtonPressed() {
         this._onEntryActivate();
-    }
+    },
 
     _onSessionCompleted(session, gainedAuthorization) {
         if (this._completed || this._doneEmitted)
@@ -247,7 +289,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
             /* Try and authenticate again */
             this.performAuthentication();
         }
-    }
+    },
 
     _onSessionRequest(session, request, echo_on) {
         // Cheap localization trick
@@ -266,7 +308,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this._passwordEntry.grab_key_focus();
         this._updateSensitivity(true);
         this._ensureOpen();
-    }
+    },
 
     _onSessionShowError(session, text) {
         this._passwordEntry.set_text('');
@@ -275,7 +317,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this._infoMessageLabel.hide();
         this._nullMessageLabel.hide();
         this._ensureOpen();
-    }
+    },
 
     _onSessionShowInfo(session, text) {
         this._passwordEntry.set_text('');
@@ -284,60 +326,43 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this._errorMessageLabel.hide();
         this._nullMessageLabel.hide();
         this._ensureOpen();
-    }
+    },
 
-    _destroySession() {
+    destroySession() {
         if (this._session) {
             if (!this._completed)
                 this._session.cancel();
             this._completed = false;
-
-            this._session.disconnect(this._sessionCompletedId);
-            this._session.disconnect(this._sessionRequestId);
-            this._session.disconnect(this._sessionShowErrorId);
-            this._session.disconnect(this._sessionShowInfoId);
             this._session = null;
         }
-    }
+    },
 
     _onUserChanged() {
         if (this._user.is_loaded && this._userAvatar) {
             this._userAvatar.update();
             this._userAvatar.actor.show();
         }
-    }
+    },
 
     cancel() {
         this._wasDismissed = true;
         this.close(global.get_current_time());
         this._emitDone(true);
-    }
-
-    _onDialogClosed() {
-        if (this._sessionUpdatedId)
-            Main.sessionMode.disconnect(this._sessionUpdatedId);
-        this._sessionUpdatedId = 0;
-
-        if (this._user) {
-            this._user.disconnect(this._userLoadedId);
-            this._user.disconnect(this._userChangedId);
-            this._user = null;
-        }
-
-        this._destroySession();
-    }
-};
+    },
+});
 Signals.addSignalMethods(AuthenticationDialog.prototype);
 
-var AuthenticationAgent = class {
-    constructor() {
+var AuthenticationAgent = new Lang.Class({
+    Name: 'AuthenticationAgent',
+
+    _init() {
         this._currentDialog = null;
         this._handle = null;
         this._native = new Shell.PolkitAuthenticationAgent();
         this._native.connect('initiate', this._onInitiate.bind(this));
         this._native.connect('cancel', this._onCancel.bind(this));
         this._sessionUpdatedId = 0;
-    }
+    },
 
     enable() {
         try {
@@ -345,7 +370,7 @@ var AuthenticationAgent = class {
         } catch(e) {
             log('Failed to register AuthenticationAgent');
         }
-    }
+    },
 
     disable() {
         try {
@@ -353,7 +378,7 @@ var AuthenticationAgent = class {
         } catch(e) {
             log('Failed to unregister AuthenticationAgent');
         }
-    }
+    },
 
     _onInitiate(nativeAgent, actionId, message, iconName, cookie, userNames) {
         // Don't pop up a dialog while locked
@@ -381,18 +406,19 @@ var AuthenticationAgent = class {
 
         this._currentDialog.connect('done', this._onDialogDone.bind(this));
         this._currentDialog.performAuthentication();
-    }
+    },
 
     _onCancel(nativeAgent) {
         this._completeRequest(false);
-    }
+    },
 
     _onDialogDone(dialog, dismissed) {
         this._completeRequest(dismissed);
-    }
+    },
 
     _completeRequest(dismissed) {
         this._currentDialog.close();
+        this._currentDialog.destroySession();
         this._currentDialog = null;
 
         if (this._sessionUpdatedId)
@@ -400,7 +426,7 @@ var AuthenticationAgent = class {
         this._sessionUpdatedId = 0;
 
         this._native.complete(dismissed);
-    }
-};
+    },
+});
 
 var Component = AuthenticationAgent;

js/ui/components/telepathyClient.js

@@ -1,13 +1,19 @@
 // -*- 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 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;
+    Tp = imports.gi.TelepathyGLib;
 } catch(e) {
     log('Telepathy is not available, chat integration will be disabled.');
 }
@@ -17,6 +23,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);
@@ -72,15 +79,17 @@ function makeMessageFromTplEvent(event) {
     };
 }
 
-var TelepathyComponent = class {
-    constructor() {
+var TelepathyComponent = new Lang.Class({
+    Name: 'TelepathyComponent',
+
+    _init() {
         this._client = null;
 
         if (!HAVE_TP)
             return; // Telepathy isn't available
 
         this._client = new TelepathyClient();
-    }
+    },
 
     enable() {
         if (!this._client)
@@ -94,7 +103,7 @@ var TelepathyComponent = class {
 
         if (!this._client.account_manager.is_prepared(Tp.AccountManager.get_feature_quark_core()))
             this._client.account_manager.prepare_async(null, null);
-    }
+    },
 
     disable() {
         if (!this._client)
@@ -102,10 +111,12 @@ var TelepathyComponent = class {
 
         this._client.unregister();
     }
-};
+});
+
+var TelepathyClient = HAVE_TP ? new Lang.Class({
+    Name: 'TelepathyClient',
+    Extends: Tp.BaseClient,
 
-var TelepathyClient = HAVE_TP ? GObject.registerClass(
-class TelepathyClient extends Tp.BaseClient {
     _init() {
         // channel path -> ChatSource
         this._chatSources = {};
@@ -129,7 +140,7 @@ class TelepathyClient extends Tp.BaseClient {
         // channel matching its filters is detected.
         // The second argument, recover, means _observeChannels will be run
         // for any existing channel as well.
-        super._init({ name: 'GnomeShell',
+        this.parent({ name: 'GnomeShell',
                       account_manager: this._accountManager,
                       uniquify_name: true });
 
@@ -147,7 +158,7 @@ class TelepathyClient extends Tp.BaseClient {
         // needed
         this.set_delegated_channels_callback(
             this._delegatedChannelsCb.bind(this));
-    }
+    },
 
     vfunc_observe_channels(account, conn, channels,
                                      dispatchOp, requests, context) {
@@ -168,7 +179,7 @@ class TelepathyClient extends Tp.BaseClient {
         }
 
         context.accept();
-    }
+    },
 
     _createChatSource(account, conn, channel, contact) {
         if (this._chatSources[channel.get_object_path()])
@@ -180,13 +191,13 @@ class TelepathyClient extends Tp.BaseClient {
         source.connect('destroy', () => {
             delete this._chatSources[channel.get_object_path()];
         });
-    }
+    },
 
     vfunc_handle_channels(account, conn, channels, requests,
                                     user_action_time, context) {
         this._handlingChannels(account, conn, channels, true);
         context.accept();
-    }
+    },
 
     _handlingChannels(account, conn, channels, notify) {
         let len = channels.length;
@@ -220,7 +231,7 @@ class TelepathyClient extends Tp.BaseClient {
                     source.notify();
             }
         }
-    }
+    },
 
     vfunc_add_dispatch_operation(account, conn, channels,
                                            dispatchOp, context) {
@@ -238,7 +249,7 @@ class TelepathyClient extends Tp.BaseClient {
         else
             context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
                                         message: 'Unsupported channel type' }));
-    }
+    },
 
     _approveTextChannel(account, conn, channel, dispatchOp, context) {
         let [targetHandle, targetHandleType] = channel.get_handle();
@@ -260,22 +271,25 @@ class TelepathyClient extends Tp.BaseClient {
         });
 
         context.accept();
-    }
+    },
 
     _delegatedChannelsCb(client, channels) {
         // Nothing to do as we don't make a distinction between observed and
         // handled channels.
-    }
+    },
 }) : null;
 
-var ChatSource = class extends MessageTray.Source {
-    constructor(account, conn, channel, contact, client) {
-        super(contact.get_alias());
+var ChatSource = new Lang.Class({
+    Name: 'ChatSource',
+    Extends: MessageTray.Source,
 
+    _init(account, conn, channel, contact, client) {
         this._account = account;
         this._contact = contact;
         this._client = client;
 
+        this.parent(contact.get_alias());
+
         this.isChat = true;
         this._pendingMessages = [];
 
@@ -299,7 +313,7 @@ var ChatSource = class extends MessageTray.Source {
         Main.messageTray.add(this);
 
         this._getLogMessages();
-    }
+    },
 
     _ensureNotification() {
         if (this._notification)
@@ -315,13 +329,13 @@ var ChatSource = class extends MessageTray.Source {
             this._notification = null;
         });
         this.pushNotification(this._notification);
-    }
+    },
 
     _createPolicy() {
         if (this._account.protocol_name == 'irc')
             return new MessageTray.NotificationApplicationPolicy('org.gnome.Polari');
         return new MessageTray.NotificationApplicationPolicy('empathy');
-    }
+    },
 
     createBanner() {
         this._banner = new ChatNotificationBanner(this._notification);
@@ -334,7 +348,7 @@ var ChatSource = class extends MessageTray.Source {
         });
 
         return this._banner;
-    }
+    },
 
     _updateAlias() {
         let oldAlias = this.title;
@@ -346,7 +360,7 @@ var ChatSource = class extends MessageTray.Source {
         this.setTitle(newAlias);
         if (this._notification)
             this._notification.appendAliasChange(oldAlias, newAlias);
-    }
+    },
 
     getIcon() {
         let file = this._contact.get_avatar_file();
@@ -355,7 +369,7 @@ var ChatSource = class extends MessageTray.Source {
         } else {
             return new Gio.ThemedIcon({ name: 'avatar-default' });
         }
-    }
+    },
 
     getSecondaryIcon() {
         let iconName;
@@ -384,7 +398,7 @@ var ChatSource = class extends MessageTray.Source {
                 iconName = 'user-offline';
        }
        return new Gio.ThemedIcon({ name: iconName });
-    }
+    },
 
     _updateAvatarIcon() {
         this.iconUpdated();
@@ -392,7 +406,7 @@ var ChatSource = class extends MessageTray.Source {
             this._notification.update(this._notification.title,
                                       this._notification.bannerBodyText,
                                       { gicon: this.getIcon() });
-    }
+    },
 
     open() {
         Main.overview.hide();
@@ -417,7 +431,7 @@ var ChatSource = class extends MessageTray.Source {
 
             cd.present_channel_async(this._channel, global.get_current_time(), null);
         }
-    }
+    },
 
     _getLogMessages() {
         let logManager = Tpl.LogManager.dup_singleton();
@@ -426,7 +440,7 @@ var ChatSource = class extends MessageTray.Source {
         logManager.get_filtered_events_async(this._account, entity,
                                              Tpl.EventTypeMask.TEXT, SCROLLBACK_HISTORY_LINES,
                                              null, this._displayPendingMessages.bind(this));
-    }
+    },
 
     _displayPendingMessages(logManager, result) {
         let [success, events] = logManager.get_filtered_events_finish(result);
@@ -479,7 +493,7 @@ var ChatSource = class extends MessageTray.Source {
 
         if (pendingMessages.length > 0)
             this.notify();
-    }
+    },
 
     destroy(reason) {
         if (this._client.is_handling_channel(this._channel)) {
@@ -513,25 +527,25 @@ var ChatSource = class extends MessageTray.Source {
         this._contact.disconnect(this._notifyAvatarId);
         this._contact.disconnect(this._presenceChangedId);
 
-        super.destroy(reason);
-    }
+        this.parent(reason);
+    },
 
     _channelClosed() {
         this.destroy(MessageTray.NotificationDestroyedReason.SOURCE_CLOSED);
-    }
+    },
 
     /* All messages are new messages for Telepathy sources */
     get count() {
         return this._pendingMessages.length;
-    }
+    },
 
     get unseenCount() {
         return this.count;
-    }
+    },
 
     get countVisible() {
         return this.count > 0;
-    }
+    },
 
     _messageReceived(channel, message) {
         if (message.get_message_type() == Tp.ChannelTextMessageType.DELIVERY_REPORT)
@@ -551,7 +565,7 @@ var ChatSource = class extends MessageTray.Source {
         this._notifyTimeoutId = Mainloop.timeout_add(500,
             this._notifyTimeout.bind(this));
         GLib.Source.set_name_by_id(this._notifyTimeoutId, '[gnome-shell] this._notifyTimeout');
-    }
+    },
 
     _notifyTimeout() {
         if (this._pendingMessages.length != 0)
@@ -560,7 +574,7 @@ var ChatSource = class extends MessageTray.Source {
         this._notifyTimeoutId = 0;
 
         return GLib.SOURCE_REMOVE;
-    }
+    },
 
     // This is called for both messages we send from
     // our client and other clients as well.
@@ -568,11 +582,11 @@ var ChatSource = class extends MessageTray.Source {
         this._ensureNotification();
         message = makeMessageFromTpMessage(message, NotificationDirection.SENT);
         this._notification.appendMessage(message);
-    }
+    },
 
     notify() {
-        super.notify(this._notification);
-    }
+        this.parent(this._notification);
+    },
 
     respond(text) {
         let type;
@@ -587,7 +601,7 @@ var ChatSource = class extends MessageTray.Source {
         this._channel.send_message_async(msg, 0, (src, result) => {
             this._channel.send_message_finish(result); 
         });
-    }
+    },
 
     setChatState(state) {
         // We don't want to send COMPOSING every time a letter is typed into
@@ -600,14 +614,14 @@ var ChatSource = class extends MessageTray.Source {
           this._chatState = state;
           this._channel.set_chat_state_async(state, null);
         }
-    }
+    },
 
     _presenceChanged(contact, presence, status, message) {
         if (this._notification)
             this._notification.update(this._notification.title,
                                       this._notification.bannerBodyText,
                                       { secondaryGIcon: this.getSecondaryIcon() });
-    }
+    },
 
     _pendingRemoved(channel, message) {
         let idx = this._pendingMessages.indexOf(message);
@@ -620,32 +634,35 @@ var ChatSource = class extends MessageTray.Source {
         if (this._pendingMessages.length == 0 &&
             this._banner && !this._banner.expanded)
             this._banner.hide();
-    }
+    },
 
     _ackMessages() {
         // Don't clear our messages here, tp-glib will send a
         // 'pending-message-removed' for each one.
         this._channel.ack_all_pending_messages_async(null);
     }
-};
+});
 
-var ChatNotification = class extends MessageTray.Notification {
-    constructor(source) {
-        super(source, source.title, null,
-              { secondaryGIcon: source.getSecondaryIcon() });
+var ChatNotification = new Lang.Class({
+    Name: 'ChatNotification',
+    Extends: MessageTray.Notification,
+
+    _init(source) {
+        this.parent(source, source.title, null,
+                    { secondaryGIcon: source.getSecondaryIcon() });
         this.setUrgency(MessageTray.Urgency.HIGH);
         this.setResident(true);
 
         this.messages = [];
         this._timestampTimeoutId = 0;
-    }
+    },
 
     destroy(reason) {
         if (this._timestampTimeoutId)
             Mainloop.source_remove(this._timestampTimeoutId);
         this._timestampTimeoutId = 0;
-        super.destroy(reason);
-    }
+        this.parent(reason);
+    },
 
     /**
      * appendMessage:
@@ -683,7 +700,7 @@ var ChatNotification = class extends MessageTray.Notification {
                        styles: styles,
                        timestamp: message.timestamp,
                        noTimestamp: noTimestamp });
-    }
+    },
 
     _filterMessages() {
         if (this.messages.length < 1)
@@ -708,7 +725,7 @@ var ChatNotification = class extends MessageTray.Notification {
             for (let i = 0; i < expired.length; i++)
                 this.emit('message-removed', expired[i]);
         }
-    }
+    },
 
     /**
      * _append:
@@ -756,7 +773,7 @@ var ChatNotification = class extends MessageTray.Notification {
         }
 
         this._filterMessages();
-    }
+    },
 
     appendTimestamp() {
         this._timestampTimeoutId = 0;
@@ -767,7 +784,7 @@ var ChatNotification = class extends MessageTray.Notification {
         this._filterMessages();
 
         return GLib.SOURCE_REMOVE;
-    }
+    },
 
     appendAliasChange(oldAlias, newAlias) {
         oldAlias = GLib.markup_escape_text(oldAlias, -1);
@@ -783,19 +800,24 @@ var ChatNotification = class extends MessageTray.Notification {
 
         this._filterMessages();
     }
-};
+});
+
+var ChatLineBox = new Lang.Class({
+    Name: 'ChatLineBox',
+    Extends: St.BoxLayout,
 
-var ChatLineBox = GObject.registerClass(
-class ChatLineBox extends St.BoxLayout {
     vfunc_get_preferred_height(forWidth) {
-        let [, natHeight] = super.vfunc_get_preferred_height(forWidth);
+        let [, natHeight] = this.parent(forWidth);
         return [natHeight, natHeight];
     }
 });
 
-var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
-    constructor(notification) {
-        super(notification);
+var ChatNotificationBanner = new Lang.Class({
+    Name: 'ChatNotificationBanner',
+    Extends: MessageTray.NotificationBanner,
+
+    _init(notification) {
+        this.parent(notification);
 
         this._responseEntry = new St.Entry({ style_class: 'chat-response',
                                              x_expand: true,
@@ -813,8 +835,8 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
         });
 
         this._scrollArea = new St.ScrollView({ style_class: 'chat-scrollview vfade',
-                                               vscrollbar_policy: St.PolicyType.AUTOMATIC,
-                                               hscrollbar_policy: St.PolicyType.NEVER,
+                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,
+                                               hscrollbar_policy: Gtk.PolicyType.NEVER,
                                                visible: this.expanded });
         this._contentArea = new St.BoxLayout({ style_class: 'chat-body',
                                                vertical: true });
@@ -858,14 +880,14 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
 
         for (let i = this.notification.messages.length - 1; i >= 0; i--)
             this._addMessage(this.notification.messages[i]);
-    }
+    },
 
     _onDestroy() {
-        super._onDestroy();
+        this.parent();
         this.notification.disconnect(this._messageAddedId);
         this.notification.disconnect(this._messageRemovedId);
         this.notification.disconnect(this._timestampChangedId);
-    }
+    },
 
     scrollTo(side) {
         let adjustment = this._scrollArea.vscroll.adjustment;
@@ -873,11 +895,11 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
             adjustment.value = adjustment.lower;
         else if (side == St.Side.BOTTOM)
             adjustment.value = adjustment.upper;
-    }
+    },
 
     hide() {
         this.emit('done-displaying');
-    }
+    },
 
     _addMessage(message) {
         let highlighter = new MessageList.URLHighlighter(message.body, true, true);
@@ -899,7 +921,7 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
         this._messageActors.set(message, lineBox);
 
         this._updateTimestamp(message);
-    }
+    },
 
     _updateTimestamp(message) {
         let actor = this._messageActors.get(message);
@@ -920,7 +942,7 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
 
             actor.add_actor(timeLabel);
         }
-    }
+    },
 
     _onEntryActivated() {
         let text = this._responseEntry.get_text();
@@ -933,7 +955,7 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
         // see Source._messageSent
         this._responseEntry.set_text('');
         this.notification.source.respond(text);
-    }
+    },
 
     _composingStopTimeout() {
         this._composingTimeoutId = 0;
@@ -941,7 +963,7 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
         this.notification.source.setChatState(Tp.ChannelChatState.PAUSED);
 
         return GLib.SOURCE_REMOVE;
-    }
+    },
 
     _onEntryChanged() {
         let text = this._responseEntry.get_text();
@@ -968,6 +990,6 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
             this.notification.source.setChatState(Tp.ChannelChatState.ACTIVE);
         }
     }
-};
+});
 
 var Component = TelepathyComponent;