shell-global: import environment from $XDG_RUNTIME_DIR/gnome/environment

environment variables are normally propagated from parent to child, but they're used to convey information that's typically scoped to the session. gnome-shell needs to know about environment variables that are set in the session after it's already been started. gnome-session now exports its environment to $XDG_RUNTIME_DIR/gnome/environment so that programs in the session can pick up on the latest environment variables. This commit changes gnome-shell to propagate the gnome-session's latest environment when launching new children.
2015-09-16 21:14:48 -04:00
39 changed files with 3472 additions and 4038 deletions
--- a/8
+++ b/8
@ -1,11 +1,3 @@
-3.18.0
-======
-
-Translations:
-  Sendy Aditya Suryana [id], Kris Thomsen [da], Seán de Búrca [ga],
-  Andika Triwidada [id], Enrico Nicoletto [pt_BR], Anders Jonsson [sv],
-  Rūdolfs Mazurs [lv]
-
 3.17.92
 =======
 * Fix race when loading multiple background animations [Josselin; #741453]
--- a/configure.ac
+++ b/configure.ac
@ -1,6 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.18.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
-AX_IS_RELEASE([git-directory])
+AC_INIT([gnome-shell],[3.17.92],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -77,7 +76,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.21.5
 GOBJECT_INTROSPECTION_MIN_VERSION=1.45.4
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.18.0
+MUTTER_MIN_VERSION=3.17.92
 GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.45.3
 LIBECAL_MIN_VERSION=3.5.3
@ -221,7 +220,7 @@ if test "$enable_man" != no; then
 fi
 AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)

-AX_COMPILER_FLAGS()
+GNOME_COMPILE_WARNINGS([error])
 case "$WARN_CFLAGS" in
    *-Werror*)
        WARN_CFLAGS="$WARN_CFLAGS -Wno-error=deprecated-declarations"
@ -270,7 +269,7 @@ Build configuration:
       Prefix:                                 ${prefix}
       Source code location:                   ${srcdir}
       Compiler:                               ${CC}
-       Compiler Warnings:                      $ax_enable_compile_warnings
+       Compiler Warnings:                      $enable_compile_warnings

       Support for NetworkManager:             $have_networkmanager
       Support for GStreamer recording:        $build_recorder
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -1230,7 +1230,7 @@ const NotificationMessage = new Lang.Class({
                this._closed = true;
                this.notification.destroy(MessageTray.NotificationDestroyedReason.DISMISSED);
            }));
-        this._destroyId = notification.connect('destroy', Lang.bind(this,
+        notification.connect('destroy', Lang.bind(this,
            function() {
                if (!this._closed)
                    this.close();
@ -1262,10 +1262,6 @@ const NotificationMessage = new Lang.Class({
        if (this._updatedId)
            this.notification.disconnect(this._updatedId);
        this._updatedId = 0;
-
-        if (this._destroyId)
-            this.notification.disconnect(this._destroyId);
-        this._destroyId = 0;
    }
 });

--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -396,7 +396,6 @@ const PopupImageMenuItem = new Lang.Class({
        this.actor.add_child(this.label);
        this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
        this.actor.add_child(this._icon, { align: St.Align.END });
-        this.actor.label_actor = this.label;

        this.setIcon(iconName);
    },
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@ -20,9 +20,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-09-17 08:22+0000\n"
-"PO-Revision-Date: 2015-09-18 15:33-0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-08-10 20:07+0000\n"
+"PO-Revision-Date: 2015-08-10 20:38-0300\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@ -30,7 +31,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.7.3\n"
+"X-Generator: Poedit 1.6.4\n"
 "X-Project-Style: gnome\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
@ -61,7 +62,8 @@ msgstr "Abre o menu do aplicativo"
 msgid "GNOME Shell"
 msgstr "GNOME Shell"

-#: ../data/gnome-shell.desktop.in.in.h:2 ../data/gnome-shell-wayland.desktop.in.in.h:2
+#: ../data/gnome-shell.desktop.in.in.h:2
+#: ../data/gnome-shell-wayland.desktop.in.in.h:2
 msgid "Window management and application launching"
 msgstr "Gerenciamento de janelas e lançador de aplicativos"

@ -80,11 +82,17 @@ msgstr "GNOME Shell (compositor wayland)"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr "Habilitar ferramentas internas úteis para desenvolvedores e testadores a partir do Alt-F2"
+msgstr ""
+"Habilitar ferramentas internas úteis para desenvolvedores e testadores a "
+"partir do Alt-F2"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
-msgid "Allows access to internal debugging and monitoring tools using the Alt-F2 dialog."
-msgstr "Permite acesso a ferramentas internas de depuração e monitoramento usando o diálogo Alt-F2."
+msgid ""
+"Allows access to internal debugging and monitoring tools using the Alt-F2 "
+"dialog."
+msgstr ""
+"Permite acesso a ferramentas internas de depuração e monitoramento usando o "
+"diálogo Alt-F2."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "UUIDs of extensions to enable"
@ -92,13 +100,16 @@ msgstr "UUIDs das extensões para habilitar"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
 msgid ""
-"GNOME Shell extensions have a UUID property; this key lists extensions which should be loaded. Any extension that wants "
-"to be loaded needs to be in this list. You can also manipulate this list with the EnableExtension and DisableExtension D-"
-"Bus methods on org.gnome.Shell."
+"GNOME Shell extensions have a UUID property; this key lists extensions which "
+"should be loaded. Any extension that wants to be loaded needs to be in this "
+"list. You can also manipulate this list with the EnableExtension and "
+"DisableExtension D-Bus methods on org.gnome.Shell."
 msgstr ""
-"As extensões do GNOME Shell possuem uma propriedade UUID; esta chave lista as extensões que devem ser carregadas. "
-"Qualquer extensão que quiser ser carregada precisa estar nesta lista. Você também pode manipular esta lista com os "
-"métodos do DBus EnableExtension e DisableExtensions em org.gnome.Shell."
+"As extensões do GNOME Shell possuem uma propriedade UUID; esta chave lista "
+"as extensões que devem ser carregadas. Qualquer extensão que quiser ser "
+"carregada precisa estar nesta lista. Você também pode manipular esta lista "
+"com os métodos do DBus EnableExtension e DisableExtensions em org.gnome."
+"Shell."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Disables the validation of extension version compatibility"
@ -106,20 +117,27 @@ msgstr "Desabilita a validação de compatibilidade da versão da extensão"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:6
 msgid ""
-"GNOME Shell will only load extensions that claim to support the current running version. Enabling this option will "
-"disable this check and try to load all extensions regardless of the versions they claim to support."
+"GNOME Shell will only load extensions that claim to support the current "
+"running version. Enabling this option will disable this check and try to "
+"load all extensions regardless of the versions they claim to support."
 msgstr ""
-"O GNOME Shell somente carregará extensões que declaram possuir suporte a versão atual em execução. Ao habilitar esta "
-"opção, esta verificação será desabilitada e haverá tentativas de carregar todas as extensões independente das versões "
-"que estas declaram suportar."
+"O GNOME Shell somente carregará extensões que declaram possuir suporte a "
+"versão atual em execução. Ao habilitar esta opção, esta verificação será "
+"desabilitada e haverá tentativas de carregar todas as extensões independente "
+"das versões que estas declaram suportar."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
-msgstr "Lista dos IDs de arquivo de área de trabalho para os aplicativos favoritos"
+msgstr ""
+"Lista dos IDs de arquivo de área de trabalho para os aplicativos favoritos"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:8
-msgid "The applications corresponding to these identifiers will be displayed in the favorites area."
-msgstr "Os aplicativos correspondentes a estes identificadores serão exibidos na área de favoritos."
+msgid ""
+"The applications corresponding to these identifiers will be displayed in the "
+"favorites area."
+msgstr ""
+"Os aplicativos correspondentes a estes identificadores serão exibidos na "
+"área de favoritos."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "App Picker View"
@ -127,7 +145,8 @@ msgstr "Visualização do seletor de aplicativos"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:10
 msgid "Index of the currently selected view in the application picker."
-msgstr "Índice da visualização atualmente selecionada no seletor de aplicativos."
+msgstr ""
+"Índice da visualização atualmente selecionada no seletor de aplicativos."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
@ -143,23 +162,32 @@ msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "Sempre mostrar o item de menu \"Encerrar sessão\" no menu de usuário."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
-msgid "This key overrides the automatic hiding of the 'Log out' menu item in single-user, single-session situations."
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menu item in single-"
+"user, single-session situations."
 msgstr ""
-"Essa chave sobrescreve a ocultação automática do item de menu \"Encerrar sessão\" quando houver somente um usuário, em "
-"situações de somente uma sessão."
+"Essa chave sobrescreve a ocultação automática do item de menu \"Encerrar "
+"sessão\" quando houver somente um usuário, em situações de somente uma "
+"sessão."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:16
-msgid "Whether to remember password for mounting encrypted or remote filesystems"
-msgstr "Se lembra ou não as senhas para montar sistemas de arquivos criptografados ou remotos"
+msgid ""
+"Whether to remember password for mounting encrypted or remote filesystems"
+msgstr ""
+"Se lembra ou não as senhas para montar sistemas de arquivos criptografados "
+"ou remotos"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
-"The shell will request a password when an encrypted device or a remote filesystem is mounted. If the password can be "
-"saved for future use a 'Remember Password' checkbox will be present. This key sets the default state of the checkbox."
+"The shell will request a password when an encrypted device or a remote "
+"filesystem is mounted. If the password can be saved for future use a "
+"'Remember Password' checkbox will be present. This key sets the default "
+"state of the checkbox."
 msgstr ""
-"O shell irá pedir uma senha quando um dispositivo criptografado ou um sistema de arquivo remoto for montado. Caso a "
-"senha possa ser salva para uso posterior, a caixa de seleção 'Lembrar senha' estará presente. Esta chave ajusta o estado "
-"padrão da caixa de seleção."
+"O shell irá pedir uma senha quando um dispositivo criptografado ou um "
+"sistema de arquivo remoto for montado. Caso a senha possa ser salva para uso "
+"posterior, a caixa de seleção 'Lembrar senha' estará presente. Esta chave "
+"ajusta o estado padrão da caixa de seleção."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Show the week date in the calendar"
@ -182,8 +210,11 @@ msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Atalho de teclado para abrir a visualização \"Mostrar aplicativos\""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:23
-msgid "Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr "Atalho de teclado para abrir a visualização \"Mostrar aplicativos\" do panorama de atividades."
+msgid ""
+"Keybinding to open the \"Show Applications\" view of the Activities Overview."
+msgstr ""
+"Atalho de teclado para abrir a visualização \"Mostrar aplicativos\" do "
+"panorama de atividades."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "Keybinding to open the overview"
@ -199,7 +230,8 @@ msgstr "Atalho de teclado para alternar a visibilidade da lista de notificação

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the notification list."
-msgstr "Atalho de teclado para alternar a visibilidade da lista de notificação."
+msgstr ""
+"Atalho de teclado para alternar a visibilidade da lista de notificação."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification"
@ -211,8 +243,11 @@ msgstr "Atalho de teclado para ativar a notificação ativa."

 # Tween pode significar uma contração de Between ou se referir a um termo "in-between" usado em animação gráfica. -- Enrico
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
-msgid "Keybinding that pauses and resumes all running tweens, for debugging purposes"
-msgstr "Atalho de teclado que pausa e continua todos os intermediários em execução, a fim de depuração"
+msgid ""
+"Keybinding that pauses and resumes all running tweens, for debugging purposes"
+msgstr ""
+"Atalho de teclado que pausa e continua todos os intermediários em execução, "
+"a fim de depuração"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
@ -228,11 +263,12 @@ msgstr "Limitar o alternador ao espaço de trabalho atual."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
-"If true, only applications that have windows on the current workspace are shown in the switcher. Otherwise, all "
-"applications are included."
+"If true, only applications that have windows on the current workspace are "
+"shown in the switcher. Otherwise, all applications are included."
 msgstr ""
-"Se verdadeiro, o alternador mostrará somente os aplicativos que possuem janelas no espaço de trabalho atual. Caso "
-"contrário, todos os aplicativos serão incluídos."
+"Se verdadeiro, o alternador mostrará somente os aplicativos que possuem "
+"janelas no espaço de trabalho atual. Caso contrário, todos os aplicativos "
+"serão incluídos."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The application icon mode."
@ -240,29 +276,37 @@ msgstr "O modo ícone do aplicativo."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:36
 msgid ""
-"Configures how the windows are shown in the switcher. Valid possibilities are 'thumbnail-only' (shows a thumbnail of the "
-"window), 'app-icon-only' (shows only the application icon) or 'both'."
+"Configures how the windows are shown in the switcher. Valid possibilities "
+"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
+"only' (shows only the application icon) or 'both'."
 msgstr ""
-"Configura como as janelas são mostradas no alternador. As possibilidades válidas são 'thumbnail-only' (mostra uma "
-"miniatura da janela), 'app-icon-only' (mostra apenas o ícone do aplicativo) ou 'both'."
+"Configura como as janelas são mostradas no alternador. As possibilidades "
+"válidas são 'thumbnail-only' (mostra uma miniatura da janela), 'app-icon-"
+"only' (mostra apenas o ícone do aplicativo) ou 'both'."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
-msgid "If true, only windows from the current workspace are shown in the switcher. Otherwise, all windows are included."
+msgid ""
+"If true, only windows from the current workspace are shown in the switcher. "
+"Otherwise, all windows are included."
 msgstr ""
-"Se verdadeiro, o alternador mostrará somente as janelas do espaço de trabalho atual. Caso contrário, todos as janelas "
-"serão incluídas."
+"Se verdadeiro, o alternador mostrará somente as janelas do espaço de "
+"trabalho atual. Caso contrário, todos as janelas serão incluídas."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "Attach modal dialog to the parent window"
 msgstr "Anexar diálogo modal à janela pai"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:39
-msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr "Esta chave sobrescreve a chave em org.gnome.mutter ao executar o Shell do GNOME."
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+"Esta chave sobrescreve a chave em org.gnome.mutter ao executar o Shell do "
+"GNOME."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Habilitar contorno ladrilhado ao arrastar janelas sobre as bordas da tela"
+msgstr ""
+"Habilitar contorno ladrilhado ao arrastar janelas sobre as bordas da tela"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid "Workspaces are managed dynamically"
@ -289,17 +333,20 @@ msgstr "Ocorreu um erro ao carregar o dialogo de preferências para %s:"
 msgid "GNOME Shell Extensions"
 msgstr "Extensões do Shell do GNOME"

-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145 ../js/ui/components/polkitAgent.js:179
-#: ../js/ui/endSessionDialog.js:452 ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
+#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
+#: ../js/ui/components/polkitAgent.js:179 ../js/ui/endSessionDialog.js:452
+#: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "Cancelar"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215 ../js/gdm/authPrompt.js:447
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:435
 msgid "Next"
 msgstr "Próximo"

-#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:59
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
+#: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Desbloquear"

@ -316,16 +363,17 @@ msgstr "Escolher sessão"
 msgid "Not listed?"
 msgstr "Não está listado?"

-#: ../js/gdm/loginDialog.js:850
+#: ../js/gdm/loginDialog.js:847
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(ex.: usuário ou %s)"

-#: ../js/gdm/loginDialog.js:855 ../js/ui/components/networkAgent.js:271 ../js/ui/components/networkAgent.js:289
+#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Nome de usuário: "

-#: ../js/gdm/loginDialog.js:1184
+#: ../js/gdm/loginDialog.js:1181
 msgid "Login Window"
 msgstr "Janela de sessão"

@ -464,7 +512,8 @@ msgstr "Alterar plano de fundo…"
 msgid "Display Settings"
 msgstr "Configurações de exibição"

-#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650 ../js/ui/status/system.js:366
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:357
 msgid "Settings"
 msgstr "Configurações"

@ -591,13 +640,16 @@ msgstr "Senha:"
 msgid "Type again:"
 msgstr "Digite novamente:"

-#: ../js/ui/components/networkAgent.js:140 ../js/ui/status/network.js:269 ../js/ui/status/network.js:352
-#: ../js/ui/status/network.js:919
+#: ../js/ui/components/networkAgent.js:140 ../js/ui/status/network.js:277
+#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:919
 msgid "Connect"
 msgstr "Conectar"

-#: ../js/ui/components/networkAgent.js:233 ../js/ui/components/networkAgent.js:245 ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:293 ../js/ui/components/networkAgent.js:303
+#: ../js/ui/components/networkAgent.js:233
+#: ../js/ui/components/networkAgent.js:245
+#: ../js/ui/components/networkAgent.js:273
+#: ../js/ui/components/networkAgent.js:293
+#: ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "Senha: "

@ -617,16 +669,23 @@ msgstr "Senha da chave privada: "
 msgid "Service: "
 msgstr "Serviço: "

-#: ../js/ui/components/networkAgent.js:320 ../js/ui/components/networkAgent.js:658
+#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "Autenticação requisitada pela rede sem fio"

-#: ../js/ui/components/networkAgent.js:321 ../js/ui/components/networkAgent.js:659
+#: ../js/ui/components/networkAgent.js:321
+#: ../js/ui/components/networkAgent.js:659
 #, javascript-format
-msgid "Passwords or encryption keys are required to access the wireless network “%s”."
-msgstr "Senhas ou chaves criptografadas são necessárias para acessar a rede sem fio \"%s\"."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network "
+"“%s”."
+msgstr ""
+"Senhas ou chaves criptografadas são necessárias para acessar a rede sem fio "
+"\"%s\"."

-#: ../js/ui/components/networkAgent.js:325 ../js/ui/components/networkAgent.js:662
+#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "Autenticação 802.1X cabeada"

@ -634,15 +693,18 @@ msgstr "Autenticação 802.1X cabeada"
 msgid "Network name: "
 msgstr "Nome da rede: "

-#: ../js/ui/components/networkAgent.js:332 ../js/ui/components/networkAgent.js:666
+#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "Autenticação DSL"

-#: ../js/ui/components/networkAgent.js:339 ../js/ui/components/networkAgent.js:672
+#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "Código PIN requisitado"

-#: ../js/ui/components/networkAgent.js:340 ../js/ui/components/networkAgent.js:673
+#: ../js/ui/components/networkAgent.js:340
+#: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "O código PIN é necessário para o dispositivo móvel de banda larga"

@ -650,17 +712,20 @@ msgstr "O código PIN é necessário para o dispositivo móvel de banda larga"
 msgid "PIN: "
 msgstr "PIN: "

-#: ../js/ui/components/networkAgent.js:348 ../js/ui/components/networkAgent.js:679
+#: ../js/ui/components/networkAgent.js:348
+#: ../js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "Senha da rede de banda larga móvel"

-#: ../js/ui/components/networkAgent.js:349 ../js/ui/components/networkAgent.js:663 ../js/ui/components/networkAgent.js:667
+#: ../js/ui/components/networkAgent.js:349
+#: ../js/ui/components/networkAgent.js:663
+#: ../js/ui/components/networkAgent.js:667
 #: ../js/ui/components/networkAgent.js:680
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Uma senha é necessária para se conectar a \"%s\""

-#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1658
+#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1654
 msgid "Network Manager"
 msgstr "Gerenciador de rede"

@ -808,9 +873,14 @@ msgstr "Reiniciar & instalar atualizações"
 #: ../js/ui/endSessionDialog.js:121
 #, javascript-format
 msgid "The system will automatically restart and install updates in %d second."
-msgid_plural "The system will automatically restart and install updates in %d seconds."
-msgstr[0] "O sistema irá reiniciar e instalar atualizações automaticamente em %d segundo."
-msgstr[1] "O sistema irá reiniciar e instalar atualizações automaticamente em %d segundos."
+msgid_plural ""
+"The system will automatically restart and install updates in %d seconds."
+msgstr[0] ""
+"O sistema irá reiniciar e instalar atualizações automaticamente em %d "
+"segundo."
+msgstr[1] ""
+"O sistema irá reiniciar e instalar atualizações automaticamente em %d "
+"segundos."

 #: ../js/ui/endSessionDialog.js:127
 msgctxt "button"
@ -829,7 +899,9 @@ msgstr "Desligar após atualizações serem instaladas"

 #: ../js/ui/endSessionDialog.js:338
 msgid "Running on battery power: please plug in before installing updates."
-msgstr "Funcionando na bateria: por favor, conecte na tomada antes de instalar atualizações."
+msgstr ""
+"Funcionando na bateria: por favor, conecte na tomada antes de instalar "
+"atualizações."

 #: ../js/ui/endSessionDialog.js:355
 msgid "Some applications are busy or have unsaved work."
@ -891,13 +963,17 @@ msgstr "Ocultar erros"
 msgid "Show Errors"
 msgstr "Exibir erros"

-#: ../js/ui/lookingGlass.js:716
+#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:71
+#: ../js/ui/status/location.js:176
 msgid "Enabled"
 msgstr "Habilitado"

+#. Translators: this is for a network device that cannot be activated
+#. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:179
+#: ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Desabilitado"

@ -951,7 +1027,7 @@ msgstr "Sair"
 msgid "Activities"
 msgstr "Atividades"

-#: ../js/ui/panel.js:754
+#: ../js/ui/panel.js:755
 msgid "Top Bar"
 msgstr "Barra superior"

@ -991,7 +1067,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d nova notificação"
 msgstr[1] "%d novas notificações"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Bloquear"

@ -1083,9 +1159,14 @@ msgstr "Alto contraste"
 msgid "Large Text"
 msgstr "Texto grande"

-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178 ../js/ui/status/network.js:353
-#: ../js/ui/status/network.js:1279 ../js/ui/status/network.js:1394 ../js/ui/status/rfkill.js:90
-#: ../js/ui/status/rfkill.js:117
+#: ../js/ui/status/bluetooth.js:49
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
+#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1279
+#: ../js/ui/status/network.js:1390 ../js/ui/status/rfkill.js:91
+#: ../js/ui/status/rfkill.js:118
 msgid "Turn Off"
 msgstr "Desligar"

@ -1093,18 +1174,16 @@ msgstr "Desligar"
 msgid "Bluetooth Settings"
 msgstr "Configurações de Bluetooth"

-#. Translators: this is the number of connected bluetooth devices */
-#: ../js/ui/status/bluetooth.js:105
+#: ../js/ui/status/bluetooth.js:104
 #, javascript-format
-msgid "%d Connected"
-msgid_plural "%d Connected"
-msgstr[0] "%d conectado"
-msgstr[1] "%d conectados"
+msgid "%d Connected Device"
+msgid_plural "%d Connected Devices"
+msgstr[0] "%d dispositivo conectado"
+msgstr[1] "%d dispositivos conectados"

-# Livre no sentido de disponível, ou seja, não estar em uso --Enrico
-#: ../js/ui/status/bluetooth.js:107
-msgid "Not In Use"
-msgstr "Livre"
+#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1307
+msgid "Not Connected"
+msgstr "Não conectado"

 #: ../js/ui/status/brightness.js:44
 msgid "Brightness"
@ -1114,11 +1193,11 @@ msgstr "Brilho"
 msgid "Show Keyboard Layout"
 msgstr "Exibir disposição de teclado"

-#: ../js/ui/status/location.js:71 ../js/ui/status/location.js:177
-msgid "Location Enabled"
-msgstr "Localização habilitada"
+#: ../js/ui/status/location.js:65
+msgid "Location"
+msgstr "Localização"

-#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:178
+#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:177
 msgid "Disable"
 msgstr "Desabilitar"

@ -1127,14 +1206,10 @@ msgid "Privacy Settings"
 msgstr "Configurações de privacidade"

 #: ../js/ui/status/location.js:176
-msgid "Location In Use"
-msgstr "Localização em uso"
+msgid "In Use"
+msgstr "Em uso"

 #: ../js/ui/status/location.js:180
-msgid "Location Disabled"
-msgstr "Localização desabilitada"
-
-#: ../js/ui/status/location.js:181
 msgid "Enable"
 msgstr "Habilitar"

@ -1142,85 +1217,62 @@ msgstr "Habilitar"
 msgid "<unknown>"
 msgstr "<desconhecido>"

-#. Translators: %s is a network identifier */
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1308
-#, javascript-format
-msgid "%s Off"
-msgstr "%s desligado"
+#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1305
+#: ../js/ui/status/network.js:1509
+msgid "Off"
+msgstr "Off"

-#. Translators: %s is a network identifier */
-#: ../js/ui/status/network.js:454
-#, javascript-format
-msgid "%s Connected"
-msgstr "Conectado a %s"
+#: ../js/ui/status/network.js:459
+msgid "Connected"
+msgstr "Conectado"

 # Não gerenciável para transmitir a idéia que o Networkmanager não consegue gerenciar o dispositivo --Enrico
 #. Translators: this is for network devices that are physically present but are not
-#. under NetworkManager's control (and thus cannot be used in the menu);
-#. %s is a network identifier */
-#: ../js/ui/status/network.js:459
-#, javascript-format
-msgid "%s Unmanaged"
-msgstr "%s não é gerenciável"
+#. under NetworkManager's control (and thus cannot be used in the menu) */
+#: ../js/ui/status/network.js:463
+msgid "Unmanaged"
+msgstr "Não gerenciável"

-#. Translators: %s is a network identifier */
-#: ../js/ui/status/network.js:462
-#, javascript-format
-msgid "%s Disconnecting"
-msgstr "Desconectando de %s"
+#: ../js/ui/status/network.js:465
+msgid "Disconnecting"
+msgstr "Desconectando"

-#. Translators: %s is a network identifier */
-#: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1300
-#, javascript-format
-msgid "%s Connecting"
-msgstr "Conectando a %s"
+#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1299
+msgid "Connecting"
+msgstr "Conectando"

-#. Translators: this is for network connections that require some kind of key or password; %s is a network identifier */
-#: ../js/ui/status/network.js:472
-#, javascript-format
-msgid "%s Requires Authentication"
-msgstr "%s requer autenticação"
+#. Translators: this is for network connections that require some kind of key or password */
+#: ../js/ui/status/network.js:474
+msgid "Authentication required"
+msgstr "Autenticação necessária"

 #. Translators: this is for devices that require some kind of firmware or kernel
-#. module, which is missing; %s is a network identifier */
-#: ../js/ui/status/network.js:480
-#, javascript-format
-msgid "Firmware Missing For %s"
-msgstr "Firmware em falta para %s"
+#. module, which is missing */
+#: ../js/ui/status/network.js:482
+msgid "Firmware missing"
+msgstr "Firmware em falta"

 #. Translators: this is for a network device that cannot be activated (for example it
-#. is disabled by rfkill, or it has no coverage; %s is a network identifier */
-#: ../js/ui/status/network.js:484
-#, javascript-format
-msgid "%s Unavailable"
-msgstr "%s está indisponível"
+#. is disabled by rfkill, or it has no coverage */
+#: ../js/ui/status/network.js:486
+msgid "Unavailable"
+msgstr "Indisponível"

-#. Translators: %s is a network identifier */
-#: ../js/ui/status/network.js:487
-#, javascript-format
-msgid "%s Connection Failed"
-msgstr "Falha na conexão de %s"
+#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1693
+msgid "Connection failed"
+msgstr "Falha de conexão"

-#: ../js/ui/status/network.js:503
+#: ../js/ui/status/network.js:504
 msgid "Wired Settings"
 msgstr "Configurações da rede cabeada"

-#: ../js/ui/status/network.js:545 ../js/ui/status/network.js:624
+#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:624
 msgid "Mobile Broadband Settings"
 msgstr "Configurações de banda larga móvel"

-#. Translators: %s is a network identifier */
-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
-#, javascript-format
-msgid "%s Hardware Disabled"
-msgstr "Hardware de %s desabilitado"
-
-#. Translators: this is for a network device that cannot be activated
-#. because it's disabled by rfkill (airplane mode); %s is a network identifier */
-#: ../js/ui/status/network.js:592
-#, javascript-format
-msgid "%s Disabled"
-msgstr "%s está desabilitado"
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1303
+msgid "Hardware Disabled"
+msgstr "Hardware desabilitado"

 #: ../js/ui/status/network.js:632
 msgid "Use as Internet connection"
@ -1262,7 +1314,7 @@ msgstr "Selecione uma rede"
 msgid "No Networks"
 msgstr "Nenhuma rede"

-#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:115
+#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:116
 msgid "Use hardware switch to turn off"
 msgstr "Usar alternador de hardware para desligar"

@ -1278,52 +1330,36 @@ msgstr "Configurações de Wi-Fi"
 msgid "Turn On"
 msgstr "Ligar"

-#. Translators: %s is a network identifier */
 #: ../js/ui/status/network.js:1296
-#, javascript-format
-msgid "%s Hotspot Active"
-msgstr "Ponto de acesso %s está ativo"
+msgid "Hotspot Active"
+msgstr "Ponto de acesso ativo"

-#. Translators: %s is a network identifier */
-#: ../js/ui/status/network.js:1311
-#, javascript-format
-msgid "%s Not Connected"
-msgstr "%s não está conectado"
-
-#: ../js/ui/status/network.js:1411
+#: ../js/ui/status/network.js:1407
 msgid "connecting..."
 msgstr "conectando..."

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:1414
+#: ../js/ui/status/network.js:1410
 msgid "authentication required"
 msgstr "autenticação necessária"

-#: ../js/ui/status/network.js:1416
+#: ../js/ui/status/network.js:1412
 msgid "connection failed"
 msgstr "conexão falhou"

-#: ../js/ui/status/network.js:1482 ../js/ui/status/rfkill.js:93
+#: ../js/ui/status/network.js:1478 ../js/ui/status/rfkill.js:94
 msgid "Network Settings"
 msgstr "Configurações de rede"

-#: ../js/ui/status/network.js:1484
+#: ../js/ui/status/network.js:1480
 msgid "VPN Settings"
 msgstr "Configurações de VPN"

-#: ../js/ui/status/network.js:1503
+#: ../js/ui/status/network.js:1499
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1513
-msgid "VPN Off"
-msgstr "VPN desligada"
-
-#: ../js/ui/status/network.js:1697
-msgid "Connection failed"
-msgstr "Falha de conexão"
-
-#: ../js/ui/status/network.js:1698
+#: ../js/ui/status/network.js:1694
 msgid "Activation of network connection failed"
 msgstr "Falha ao ativar a conexão da rede"

@ -1349,31 +1385,41 @@ msgstr "%d:%02d restante(s) (%d%%)"
 msgid "%d∶%02d Until Full (%d%%)"
 msgstr "%d:%02d até completamente carregada (%d%%)"

-#: ../js/ui/status/rfkill.js:88
-msgid "Airplane Mode On"
-msgstr "Modo avião ligado"
+# UPS significa uninterruptible power supply, mas no Brasil vejo usando mais
+# "No-break", que é a mesma coisa, então optei pela segunda. -- Rafael Ferreira
+#: ../js/ui/status/power.js:119
+msgid "UPS"
+msgstr "No-break"

-#: ../js/ui/status/system.js:343
+#: ../js/ui/status/power.js:121
+msgid "Battery"
+msgstr "Bateria"
+
+#: ../js/ui/status/rfkill.js:88
+msgid "Airplane Mode"
+msgstr "Modo avião"
+
+#: ../js/ui/status/rfkill.js:90
+msgid "On"
+msgstr "On"
+
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Alternar usuário"

-#: ../js/ui/status/system.js:348
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Encerrar sessão"

-#: ../js/ui/status/system.js:353
-msgid "Account Settings"
-msgstr "Configurações de conta"
-
-#: ../js/ui/status/system.js:370
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Bloqueio da orientação"

-#: ../js/ui/status/system.js:378
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Suspender"

-#: ../js/ui/status/system.js:381
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Desligar"

@ -1472,10 +1518,12 @@ msgid "Always on Visible Workspace"
 msgstr "Sempre na área de trabalho visível"

 #: ../js/ui/windowMenu.js:105
+#| msgid "Move to Workspace Up"
 msgid "Move to Workspace Left"
 msgstr "Mover para a área de trabalho esquerda"

 #: ../js/ui/windowMenu.js:110
+#| msgid "Move to Workspace Up"
 msgid "Move to Workspace Right"
 msgstr "Mover para a área de trabalho direita"

@ -1567,34 +1615,6 @@ msgstr "A senha não pode estar em branco"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "O diálogo de autenticação foi descartado pelo usuário"

-#~ msgid "Bluetooth"
-#~ msgstr "Bluetooth"
-
-#~ msgid "%d Connected Device"
-#~ msgid_plural "%d Connected Devices"
-#~ msgstr[0] "%d dispositivo conectado"
-#~ msgstr[1] "%d dispositivos conectados"
-
-#~ msgid "Off"
-#~ msgstr "Off"
-
-#~ msgid "Authentication required"
-#~ msgstr "Autenticação necessária"
-
-# UPS significa uninterruptible power supply, mas no Brasil vejo usando mais
-# "No-break", que é a mesma coisa, então optei pela segunda. -- Rafael Ferreira
-#~ msgid "UPS"
-#~ msgstr "No-break"
-
-#~ msgid "Battery"
-#~ msgstr "Bateria"
-
-#~ msgid "Airplane Mode"
-#~ msgstr "Modo avião"
-
-#~ msgid "On"
-#~ msgstr "On"
-
 #~ msgctxt "event list time"
 #~ msgid "%H∶%M"
 #~ msgstr "%H∶%M"
@ -1693,8 +1713,10 @@ msgstr "O diálogo de autenticação foi descartado pelo usuário"
 #~ msgid "This account is already connected to the server"
 #~ msgstr "Esta conta já está conectada ao servidor"

-#~ msgid "Connection has been replaced by a new connection using the same resource"
-#~ msgstr "A conexão foi substituída por uma nova conexão usando o mesmo recurso"
+#~ msgid ""
+#~ "Connection has been replaced by a new connection using the same resource"
+#~ msgstr ""
+#~ "A conexão foi substituída por uma nova conexão usando o mesmo recurso"

 #~ msgid "The account already exists on the server"
 #~ msgstr "A conta já existe no servidor"
@ -1705,15 +1727,18 @@ msgstr "O diálogo de autenticação foi descartado pelo usuário"
 #~ msgid "Certificate has been revoked"
 #~ msgstr "O certificado foi revogado"

-#~ msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-#~ msgstr "O certificado usa um algoritmo de cifragem inseguro ou é criptograficamente fraco"
+#~ msgid ""
+#~ "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#~ msgstr ""
+#~ "O certificado usa um algoritmo de cifragem inseguro ou é "
+#~ "criptograficamente fraco"

 #~ msgid ""
-#~ "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the "
-#~ "cryptography library"
+#~ "The length of the server certificate, or the depth of the server "
+#~ "certificate chain, exceed the limits imposed by the cryptography library"
 #~ msgstr ""
-#~ "O comprimento do certificado do servidor, ou a profundidade da cadeia do certificado excedeu os limites impostos pela "
-#~ "biblioteca de criptografia"
+#~ "O comprimento do certificado do servidor, ou a profundidade da cadeia do "
+#~ "certificado excedeu os limites impostos pela biblioteca de criptografia"

 #~ msgid "Internal error"
 #~ msgstr "Erro interno"
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/src/gtkmenutracker.c
+++ b/src/gtkmenutracker.c
@ -176,15 +176,15 @@ gtk_menu_tracker_section_sync_separators (GtkMenuTrackerSection *section,

      if (subsection)
        {
-          gboolean section_could_have_separator;
+          gboolean could_have_separator;

-          section_could_have_separator = (section->with_separators && n_items > 0) || subsection->separator_label;
+          could_have_separator = (section->with_separators && n_items > 0) || subsection->separator_label;

          /* Only pass the parent_model and parent_index in case they may be used to create the separator. */
          n_items += gtk_menu_tracker_section_sync_separators (subsection, tracker, offset + n_items,
-                                                               section_could_have_separator,
-                                                               section_could_have_separator ? section->model : NULL,
-                                                               section_could_have_separator ? i : 0);
+                                                               could_have_separator,
+                                                               could_have_separator ? section->model : NULL,
+                                                               could_have_separator ? i : 0);
        }
      else
        n_items++;
@ -197,11 +197,11 @@ gtk_menu_tracker_section_sync_separators (GtkMenuTrackerSection *section,
  if (should_have_separator > section->has_separator)
    {
      /* Add a separator */
-      GtkMenuTrackerItem *menuitem;
+      GtkMenuTrackerItem *item;

-      menuitem = _gtk_menu_tracker_item_new (tracker->observable, parent_model, parent_index, NULL, TRUE);
-      (* tracker->insert_func) (menuitem, offset, tracker->user_data);
-      g_object_unref (menuitem);
+      item = _gtk_menu_tracker_item_new (tracker->observable, parent_model, parent_index, NULL, TRUE);
+      (* tracker->insert_func) (item, offset, tracker->user_data);
+      g_object_unref (item);

      section->has_separator = TRUE;
    }
--- a/src/gvc
+++ b/src/gvc
--- a/src/main.c
+++ b/src/main.c
@ -51,11 +51,11 @@ enum {
 static int _shell_debug;

 static void
-shell_dbus_acquire_name (GDBusProxy  *bus,
-                         guint32      request_name_flags,
-                         guint32     *request_name_result,
-                         const gchar *name,
-                         gboolean     fatal)
+shell_dbus_acquire_name (GDBusProxy *bus,
+                         guint32     request_name_flags,
+                         guint32    *request_name_result,
+                         gchar      *name,
+                         gboolean    fatal)
 {
  GError *error = NULL;
  GVariant *request_name_variant;
@ -68,27 +68,25 @@ shell_dbus_acquire_name (GDBusProxy  *bus,
                                                       NULL, /* cancellable */
                                                       &error)))
    {
-      g_printerr ("failed to acquire %s: %s\n", name, error ? error->message : "");
-      g_clear_error (&error);
+      g_printerr ("failed to acquire %s: %s\n", name, error->message);
      if (!fatal)
        return;
      exit (1);
    }
  g_variant_get (request_name_variant, "(u)", request_name_result);
-  g_variant_unref (request_name_variant);
 }

 static void
-shell_dbus_acquire_names (GDBusProxy  *bus,
-                          guint32      request_name_flags,
-                          const gchar *name,
-                          gboolean     fatal, ...) G_GNUC_NULL_TERMINATED;
+shell_dbus_acquire_names (GDBusProxy *bus,
+                          guint32     request_name_flags,
+                          gchar      *name,
+                          gboolean    fatal, ...) G_GNUC_NULL_TERMINATED;

 static void
-shell_dbus_acquire_names (GDBusProxy  *bus,
-                          guint32      request_name_flags,
-                          const gchar *name,
-                          gboolean     fatal, ...)
+shell_dbus_acquire_names (GDBusProxy *bus,
+                          guint32     request_name_flags,
+                          gchar      *name,
+                          gboolean    fatal, ...)
 {
  va_list al;
  guint32 request_name_result;
@ -132,12 +130,6 @@ shell_dbus_init (gboolean replace)
                               NULL, /* cancellable */
                               &error);

-  if (!bus)
-    {
-      g_printerr ("Failed to get a session bus proxy: %s", error->message);
-      exit (1);
-    }
-
  request_name_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT;
  if (replace)
    request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
@ -462,7 +454,7 @@ main (int argc, char **argv)

  /* Initialize the global object */
  if (session_mode == NULL)
-    session_mode = is_gdm_mode ? (char *)"gdm" : (char *)"user";
+    session_mode = is_gdm_mode ? "gdm" : "user";

  _shell_global_init ("session-mode", session_mode, NULL);

--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@ -182,7 +182,7 @@ shell_app_system_finalize (GObject *object)
 * Return Value: (transfer none): The global #ShellAppSystem singleton
 */
 ShellAppSystem *
-shell_app_system_get_default (void)
+shell_app_system_get_default ()
 {
  static ShellAppSystem *instance = NULL;

@ -348,9 +348,6 @@ _shell_app_system_notify_app_state_changed (ShellAppSystem *self,
    case SHELL_APP_STATE_STOPPED:
      g_hash_table_remove (self->priv->running_apps, app);
      break;
-    default:
-      g_warn_if_reached();
-      break;
    }
  g_signal_emit (self, signals[APP_STATE_CHANGED], 0, app);
 }
--- a/src/shell-app-usage.c
+++ b/src/shell-app-usage.c
@ -996,7 +996,7 @@ on_enable_monitoring_key_changed (GSettings     *settings,
 * Return Value: (transfer none): The global #ShellAppUsage instance
 */
 ShellAppUsage *
-shell_app_usage_get_default (void)
+shell_app_usage_get_default ()
 {
  static ShellAppUsage *instance;

--- a/src/shell-app.c
+++ b/src/shell-app.c
@ -491,9 +491,6 @@ shell_app_activate_full (ShellApp      *app,
      case SHELL_APP_STATE_RUNNING:
        shell_app_activate_window (app, NULL, timestamp);
        break;
-      default:
-        g_assert_not_reached();
-        break;
    }
 }

@ -702,7 +699,7 @@ static int
 shell_app_get_last_user_time (ShellApp *app)
 {
  GSList *iter;
-  guint32 last_user_time;
+  int last_user_time;

  last_user_time = 0;

@ -712,7 +709,7 @@ shell_app_get_last_user_time (ShellApp *app)
        last_user_time = MAX (last_user_time, meta_window_get_user_time (iter->data));
    }

-  return (int)last_user_time;
+  return last_user_time;
 }

 /**
--- a/src/shell-global.c
+++ b/src/shell-global.c
@ -1566,6 +1566,64 @@ shell_global_get_current_time (ShellGlobal *global)
  return clutter_get_current_event_time ();
 }

+static void
+import_session_environment_to_app_launch_context (ShellGlobal       *global,
+                                                  GAppLaunchContext *context)
+{
+  char *environment_dir, *environment_filename;
+  GMappedFile *environment_file;
+
+  environment_dir = g_build_filename (g_get_user_runtime_dir (), "gnome", NULL);
+  environment_filename = g_build_filename (environment_dir, "environment", NULL);
+  g_free (environment_dir);
+
+  environment_file = g_mapped_file_new (environment_filename, FALSE, NULL);
+  g_free (environment_filename);
+
+  if (environment_file != NULL)
+    {
+      GVariant *environment_variant;
+      const char **environment;
+      int i = 0;
+      gconstpointer environment_data;
+      gsize environment_size;
+
+      environment_data = g_mapped_file_get_contents (environment_file);
+      environment_size = g_mapped_file_get_length (environment_file);
+
+      environment_variant = g_variant_new_from_data (G_VARIANT_TYPE_BYTESTRING_ARRAY,
+                                                     environment_data,
+                                                     environment_size,
+                                                     FALSE,
+                                                     NULL,
+                                                     NULL);
+      environment = g_variant_get_bytestring_array (environment_variant, NULL);
+
+      if (environment != NULL)
+        {
+          for (i = 0; environment[i] != NULL; i++)
+            {
+              char **entry;
+              const char *key;
+              const char *value;
+
+              entry = g_strsplit (environment[i], "=", 2);
+              key = entry[0];
+              value = entry[1];
+
+              if (value != NULL)
+                  g_app_launch_context_setenv (context, key, value);
+
+              g_free (entry);
+            }
+
+          g_free (environment);
+        }
+      g_variant_unref (environment_variant);
+    }
+  g_mapped_file_unref (environment_file);
+}
+
 /**
 * shell_global_create_app_launch_context:
 * @global: A #ShellGlobal
@ -1586,6 +1644,8 @@ shell_global_create_app_launch_context (ShellGlobal *global,

  context = gdk_display_get_app_launch_context (global->gdk_display);

+  import_session_environment_to_app_launch_context (global, G_APP_LAUNCH_CONTEXT (context));
+
  if (timestamp == 0)
    timestamp = shell_global_get_current_time (global);
  gdk_app_launch_context_set_timestamp (context, timestamp);
--- a/src/shell-gtk-embed.c
+++ b/src/shell-gtk-embed.c
@ -68,6 +68,7 @@ shell_gtk_embed_window_created_cb (MetaDisplay   *display,
    {
      ClutterActor *window_actor =
        CLUTTER_ACTOR (meta_window_get_compositor_private (window));
+      MetaDisplay *display = shell_global_get_display (shell_global_get ());
      GCallback remove_cb = G_CALLBACK (shell_gtk_embed_remove_window_actor);
      cairo_region_t *empty_region;

--- a/src/shell-perf-helper.c
+++ b/src/shell-perf-helper.c
@ -125,9 +125,8 @@ on_window_draw (GtkWidget  *window,
                WindowInfo *info)
 {
  cairo_rectangle_int_t allocation;
-  double x_offset, y_offset;
-
  gtk_widget_get_allocation (window, &allocation);
+  double x_offset, y_offset;

  /* We draw an arbitrary pattern of red lines near the border of the
   * window to make it more clear than empty windows if something
--- a/src/shell-perf-log.c
+++ b/src/shell-perf-log.c
@ -626,7 +626,7 @@ shell_perf_log_collect_statistics (ShellPerfLog *perf_log)
 {
  gint64 event_time = get_time ();
  gint64 collection_time;
-  guint i;
+  int i;

  if (!perf_log->enabled)
    return;
@ -672,9 +672,6 @@ shell_perf_log_collect_statistics (ShellPerfLog *perf_log)
              statistic->recorded = TRUE;
            }
          break;
-        default:
-          g_warning ("Unsupported signature in event");
-          break;
        }
    }

@ -822,7 +819,7 @@ shell_perf_log_dump_events (ShellPerfLog   *perf_log,
                            GError        **error)
 {
  GString *output;
-  guint i;
+  int i;

  output = g_string_new (NULL);
  g_string_append (output, "[ ");
--- a/src/shell-recorder-src.c
+++ b/src/shell-recorder-src.c
@ -156,17 +156,17 @@ shell_recorder_src_send_event (GstElement * element, GstEvent * event)
  ShellRecorderSrc *src = SHELL_RECORDER_SRC (element);
  gboolean res;

-  if (GST_EVENT_TYPE (event) == GST_EVENT_EOS)
-    {
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_EOS:
      shell_recorder_src_close (src);
      gst_event_unref (event);
      res = TRUE;
-    }
-  else
-    {
+      break;
+    default:
      res = GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, send_event, (element,
              event), FALSE);
-    }
+      break;
+  }
  return res;
 }

--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@ -1182,20 +1182,23 @@ recorder_pipeline_bus_watch (GstBus     *bus,
 {
  RecorderPipeline *pipeline = data;

-  if (message->type == GST_MESSAGE_EOS)
+  switch (message->type)
    {
+    case GST_MESSAGE_EOS:
      recorder_pipeline_closed (pipeline);
      return FALSE; /* remove watch */
-    }
-  else if (message->type == GST_MESSAGE_ERROR)
-    {
-      GError *error;
+    case GST_MESSAGE_ERROR:
+      {
+        GError *error;

-      gst_message_parse_error (message, &error, NULL);
-      g_warning ("Error in recording pipeline: %s\n", error->message);
-      g_error_free (error);
-      recorder_pipeline_closed (pipeline);
-      return FALSE; /* remove watch */
+        gst_message_parse_error (message, &error, NULL);
+        g_warning ("Error in recording pipeline: %s\n", error->message);
+        g_error_free (error);
+        recorder_pipeline_closed (pipeline);
+        return FALSE; /* remove watch */
+      }
+    default:
+      break;
    }

  /* Leave the watch in place */
--- a/src/shell-util.c
+++ b/src/shell-util.c
@ -84,7 +84,7 @@ shell_util_get_transformed_allocation (ClutterActor    *actor,
   */
  ClutterVertex v[4];
  gfloat x_min, x_max, y_min, y_max;
-  guint i;
+  gint i;

  g_return_if_fail (CLUTTER_IS_ACTOR (actor));

@ -165,7 +165,7 @@ shell_util_format_date (const char *format,
 */
 /* Copied from gtkcalendar.c */
 int
-shell_util_get_week_start (void)
+shell_util_get_week_start ()
 {
  int week_start;
 #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@ -865,7 +865,7 @@ shell_startup_sequence_create_icon (ShellStartupSequence *sequence, guint size)
 * Return Value: (transfer none): The global #ShellWindowTracker instance
 */
 ShellWindowTracker *
-shell_window_tracker_get_default (void)
+shell_window_tracker_get_default ()
 {
  static ShellWindowTracker *instance;

--- a/src/st/st-button.c
+++ b/src/st/st-button.c
@ -801,6 +801,9 @@ struct _StButtonAccessibleClass
  StWidgetAccessibleClass parent_class;
 };

+static void st_button_accessible_class_init (StButtonAccessibleClass *klass);
+static void st_button_accessible_init       (StButtonAccessible *button);
+
 /* AtkObject */
 static void          st_button_accessible_initialize (AtkObject *obj,
                                                      gpointer   data);
--- a/src/st/st-drawing-area.c
+++ b/src/st/st-drawing-area.c
@ -94,8 +94,8 @@ st_drawing_area_paint (ClutterActor *self)
    }

  if (priv->texture != NULL &&
-      (width != (int)cogl_texture_get_width (priv->texture) ||
-       height != (int)cogl_texture_get_height (priv->texture)))
+      (width != cogl_texture_get_width (priv->texture) ||
+       height != cogl_texture_get_height (priv->texture)))
    {
      cogl_object_unref (priv->texture);
      priv->texture = NULL;
--- a/src/st/st-label.c
+++ b/src/st/st-label.c
@ -408,6 +408,9 @@ struct _StLabelAccessibleClass
  StWidgetAccessibleClass parent_class;
 };

+static void st_label_accessible_class_init (StLabelAccessibleClass *klass);
+static void st_label_accessible_init       (StLabelAccessible *label);
+
 /* AtkObject */
 static void          st_label_accessible_initialize (AtkObject *obj,
                                                     gpointer   data);
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@ -211,7 +211,7 @@ calculate_gaussian_kernel (gdouble   sigma,
 {
  gdouble *ret, sum;
  gdouble exp_divisor;
-  guint half, i;
+  gint half, i;

  g_return_val_if_fail (sigma > 0, NULL);

@ -383,6 +383,9 @@ _st_create_shadow_pipeline (StShadow    *shadow_spec,

  if (G_UNLIKELY (shadow_pipeline_template == NULL))
    {
+      CoglContext *ctx =
+        clutter_backend_get_cogl_context (clutter_get_default_backend ());
+
      shadow_pipeline_template = cogl_pipeline_new (ctx);

      /* We set up the pipeline to blend the shadow texture with the combine
--- a/src/st/st-scroll-bar.c
+++ b/src/st/st-scroll-bar.c
@ -450,7 +450,6 @@ adjust_with_direction (StAdjustment           *adj,
      delta = 1.0;
      break;
    case CLUTTER_SCROLL_SMOOTH:
-    default:
      g_assert_not_reached ();
      break;
    }
@ -486,9 +485,6 @@ st_scroll_bar_scroll_event (ClutterActor       *actor,
    case CLUTTER_SCROLL_RIGHT:
      adjust_with_direction (priv->adjustment, event->direction);
      break;
-    default:
-      g_return_val_if_reached (FALSE);
-      break;
    }

  return TRUE;
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@ -378,9 +378,6 @@ st_scroll_view_get_preferred_width (ClutterActor *actor,
       * but that's not cleanly defined at the moment */
      min_width = 0;
      break;
-    default:
-      g_warn_if_reached();
-      break;
    }

  switch (priv->vscrollbar_policy)
@ -399,9 +396,6 @@ st_scroll_view_get_preferred_width (ClutterActor *actor,
       */
      account_for_vscrollbar = !priv->overlay_scrollbars;
      break;
-    default:
-      g_warn_if_reached();
-      break;
    }

  if (account_for_vscrollbar)
@ -458,9 +452,6 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
      /* We've requested space for the scrollbar, subtract it back out */
      for_width -= sb_width;
      break;
-    default:
-      g_warn_if_reached();
-      break;
    }

  switch (priv->hscrollbar_policy)
@ -479,9 +470,6 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
       */
      account_for_hscrollbar = !priv->overlay_scrollbars;
      break;
-    default:
-      g_warn_if_reached();
-      break;
    }

  clutter_actor_get_preferred_height (priv->child, for_width,
@ -501,9 +489,6 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
       * but that's not cleanly defined at the moment */
      min_height = 0;
      break;
-    default:
-      g_warn_if_reached();
-      break;
    }

  if (account_for_hscrollbar)
@ -774,9 +759,6 @@ st_scroll_view_scroll_event (ClutterActor       *self,
    case CLUTTER_SCROLL_RIGHT:
      adjust_with_direction (priv->hadjustment, event->direction);
      break;
-    default:
-      g_warn_if_reached();
-      break;
    }

  return TRUE;
--- a/src/st/st-theme-node-drawing.c
+++ b/src/st/st-theme-node-drawing.c
@ -335,9 +335,6 @@ st_theme_node_get_corner_border_widths (StThemeNode *node,
        if (border_width_2)
            *border_width_2 = node->border_width[ST_SIDE_LEFT];
        break;
-      default:
-        g_assert_not_reached();
-        break;
    }
 }

@ -384,9 +381,6 @@ st_theme_node_lookup_corner (StThemeNode    *node,
        over (&node->border_color[ST_SIDE_BOTTOM], &corner.color, &corner.border_color_1);
        over (&node->border_color[ST_SIDE_LEFT], &corner.color, &corner.border_color_2);
        break;
-      default:
-        g_assert_not_reached();
-        break;
    }

  if (corner.color.alpha == 0 &&
@ -439,9 +433,6 @@ get_background_scale (StThemeNode *node,
        else if (node->background_size_h > -1)
          *scale_w = node->background_size_h / background_image_height;
        break;
-      default:
-        g_assert_not_reached();
-        break;
    }
  if (*scale_h < 0.0)
    *scale_h = *scale_w;
@ -969,7 +960,7 @@ st_theme_node_prerender_background (StThemeNode *node,
  gboolean draw_background_image_shadow = FALSE;
  gboolean has_visible_outline;
  ClutterColor border_color;
-  guint border_width[4];
+  int border_width[4];
  guint rowstride;
  guchar *data;
  ClutterActorBox actor_box;
@ -1307,15 +1298,15 @@ st_theme_node_load_border_image (StThemeNode *node)
  if (node->border_slices_texture == COGL_INVALID_HANDLE)
    {
      StBorderImage *border_image;
-      GFile *file;
-      int scale_factor;

      border_image = st_theme_node_get_border_image (node);
      if (border_image == NULL)
        goto out;

+      GFile *file;
      file = st_border_image_get_file (border_image);

+      int scale_factor;
      g_object_get (node->context, "scale-factor", &scale_factor, NULL);

      node->border_slices_texture = st_texture_cache_load_file_to_cogl_texture (st_texture_cache_get_default (),
@ -1359,12 +1350,12 @@ st_theme_node_load_background_image (StThemeNode *node)
    {
      GFile *background_image;
      StShadow *background_image_shadow_spec;
-      int scale_factor;

      background_image = st_theme_node_get_background_image (node);
      if (background_image == NULL)
        goto out;

+      int scale_factor;
      g_object_get (node->context, "scale-factor", &scale_factor, NULL);

      background_image_shadow_spec = st_theme_node_get_background_image_shadow (node);
@ -1597,10 +1588,10 @@ st_theme_node_paint_borders (StThemeNodePaintState *state,
 {
  StThemeNode *node = state->node;
  float width, height;
-  guint border_width[4];
+  int border_width[4];
  guint border_radius[4];
-  guint max_border_radius = 0;
-  guint max_width_radius[4];
+  int max_border_radius = 0;
+  int max_width_radius[4];
  int corner_id, side_id;
  ClutterColor border_color;
  guint8 alpha;
@ -1729,9 +1720,6 @@ st_theme_node_paint_borders (StThemeNodePaintState *state,
                                                    max_width_radius[ST_CORNER_BOTTOMLEFT], height,
                                                    0, 0.5, 0.5, 1);
                break;
-              default:
-                g_assert_not_reached();
-                break;
            }
        }
    }
@ -1826,9 +1814,6 @@ st_theme_node_paint_borders (StThemeNodePaintState *state,
                    verts[7] = height - border_width[ST_SIDE_BOTTOM];
                  }
                break;
-              default:
-                g_assert_not_reached();
-                break;
            }
          cogl_rectangles (verts, n_rects);
        }
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@ -30,8 +30,10 @@
 #include "st-theme-context.h"
 #include "st-theme-node-private.h"

+static void st_theme_node_init               (StThemeNode          *node);
+static void st_theme_node_class_init         (StThemeNodeClass     *klass);
 static void st_theme_node_dispose           (GObject                 *object);
-static void st_theme_node_finalize          (GObject                 *object);
+static void st_theme_node_finalize           (GObject                 *object);

 static const ClutterColor BLACK_COLOR = { 0, 0, 0, 0xff };
 static const ClutterColor TRANSPARENT_COLOR = { 0, 0, 0, 0 };
@ -594,9 +596,6 @@ get_color_from_rgba_term (CRTerm       *term,
        case 3:
          a = value;
          break;
-        default:
-          g_assert_not_reached();
-          break;
        }

      arg = arg->next;
@ -841,21 +840,26 @@ st_theme_node_lookup_time (StThemeNode *node,
      if (strcmp (decl->property->stryng->str, property_name) == 0)
        {
          CRTerm *term = decl->value;
-          int factor = 1;

          if (term->type != TERM_NUMBER)
            continue;

-          if (term->content.num->type != NUM_TIME_S ||
-              term->content.num->type != NUM_TIME_MS)
-            continue;
+          switch (term->content.num->type)
+            {
+            case NUM_TIME_S:
+              *value = 1000 * term->content.num->val;
+              result = TRUE;
+              break;
+            case NUM_TIME_MS:
+              *value = term->content.num->val;
+              result = TRUE;
+              break;
+            default:
+              ;
+            }

-          if (term->content.num->type == NUM_TIME_S)
-            factor = 1000;
-
-          *value = factor * term->content.num->val;
-          result = TRUE;
-          break;
+          if (result)
+            break;
        }
    }

@ -1105,7 +1109,6 @@ get_length_from_term (StThemeNode *node,
    case NUM_FREQ_KHZ:
    case NUM_UNKNOWN_TYPE:
    case NB_NUM_TYPE:
-    default:
      g_warning ("Ignoring invalid type of number of length property");
      return VALUE_NOT_FOUND;
    }
@ -3020,7 +3023,7 @@ st_theme_node_get_border_image (StThemeNode *node)
          CRStyleSheet *base_stylesheet;
          int borders[4];
          int n_borders = 0;
-          int j;
+          int i;

          const char *url;
          int border_top;
@ -3050,7 +3053,7 @@ st_theme_node_get_border_image (StThemeNode *node)
          /* Followed by 0 to 4 numbers or percentages. *Not lengths*. The interpretation
           * of a number is supposed to be pixels if the image is pixel based, otherwise CSS pixels.
           */
-          for (j = 0; j < 4; j++)
+          for (i = 0; i < 4; i++)
            {
              if (term == NULL)
                break;
@ -3254,9 +3257,6 @@ parse_shadow_property (StThemeNode       *node,
                                 "not allowed");
                  *spread = value;
                  break;
-                default:
-                  g_warning ("Ignoring excess values in shadow definition");
-                  break;
                }
              continue;
            }
@ -3633,9 +3633,6 @@ st_theme_node_get_icon_colors (StThemeNode *node)
            case SUCCESS:
              node->icon_colors->success = color;
              break;
-            default:
-              g_assert_not_reached();
-              break;
            }
        }
    }
--- a/src/st/st-theme.c
+++ b/src/st/st-theme.c
@ -615,9 +615,6 @@ additional_selector_matches_style (StTheme         *a_this,
          if (!pseudo_class_add_sel_matches_style (a_this, cur_add_sel, a_node))
            return FALSE;
          break;
-        default:
-          g_warning ("Unhandled selector type %d", cur_add_sel->type);
-          return FALSE;
        }
    }

@ -912,10 +909,6 @@ add_matched_properties (StTheme      *a_this,
              }
          }
          break;
-        case AT_RULE_STMT:
-        case AT_PAGE_RULE_STMT:
-        case AT_CHARSET_RULE_STMT:
-        case AT_FONT_FACE_RULE_STMT:
        default:
          break;
        }
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@ -349,7 +349,7 @@ static void
 st_widget_finalize (GObject *gobject)
 {
  StWidgetPrivate *priv = ST_WIDGET (gobject)->priv;
-  guint i;
+  int i;

  g_free (priv->style_class);
  g_free (priv->pseudo_class);
@ -623,9 +623,9 @@ st_widget_get_theme_node (StWidget *widget)
       * requiring separate style sheets.
       */
      if (clutter_actor_get_text_direction (CLUTTER_ACTOR (widget)) == CLUTTER_TEXT_DIRECTION_RTL)
-        direction_pseudo_class = (char *)"rtl";
+        direction_pseudo_class = "rtl";
      else
-        direction_pseudo_class = (char *)"ltr";
+        direction_pseudo_class = "ltr";

      if (priv->pseudo_class)
        pseudo_class = g_strconcat(priv->pseudo_class, " ",
@ -1495,7 +1495,7 @@ static void
 st_widget_init (StWidget *actor)
 {
  StWidgetPrivate *priv;
-  guint i;
+  int i;

  actor->priv = priv = ST_WIDGET_GET_PRIVATE (actor);
  priv->transition_animation = NULL;
@ -1849,8 +1849,6 @@ filter_by_position (GList            *children,
            continue;
          break;

-        case GTK_DIR_TAB_BACKWARD:
-        case GTK_DIR_TAB_FORWARD:
        default:
          g_return_val_if_reached (NULL);
        }
@ -2016,8 +2014,6 @@ st_widget_real_navigate_focus (StWidget         *widget,
            case GTK_DIR_RIGHT:
              sort_box.x2 = sort_box.x1;
              break;
-            case GTK_DIR_TAB_FORWARD:
-            case GTK_DIR_TAB_BACKWARD:
            default:
              g_warn_if_reached ();
            }
@ -2214,7 +2210,7 @@ st_set_slow_down_factor (gfloat factor)
 * Returns: the global factor applied to all animation durations
 */
 gfloat
-st_get_slow_down_factor (void)
+st_get_slow_down_factor ()
 {
  return st_slow_down_factor;
 }
@ -2434,6 +2430,8 @@ st_widget_remove_accessible_state (StWidget    *widget,

 /* GObject */

+static void st_widget_accessible_class_init (StWidgetAccessibleClass *klass);
+static void st_widget_accessible_init       (StWidgetAccessible *widget);
 static void st_widget_accessible_dispose    (GObject *gobject);

 /* AtkObject */
--- a/src/st/test-theme.c
+++ b/src/st/test-theme.c
@ -107,10 +107,8 @@ assert_foreground_color (StThemeNode *node,
 			 guint32      expected)
 {
  ClutterColor color;
-  guint32 value;
-
  st_theme_node_get_foreground_color (node, &color);
-  value = clutter_color_to_pixel (&color);
+  guint32 value = clutter_color_to_pixel (&color);

  if (expected != value)
    {
@ -126,10 +124,8 @@ assert_background_color (StThemeNode *node,
 			 guint32      expected)
 {
  ClutterColor color;
-  guint32 value;
-
  st_theme_node_get_background_color (node, &color);
-  value = clutter_color_to_pixel (&color);
+  guint32 value = clutter_color_to_pixel (&color);

  if (expected != value)
    {
@ -152,9 +148,9 @@ side_to_string (StSide side)
      return "bottom";
    case ST_SIDE_LEFT:
      return "left";
-    default:
-      return "<unknown>";
    }
+
+  return "<unknown>";
 }

 static void
@ -164,10 +160,8 @@ assert_border_color (StThemeNode *node,
                     guint32      expected)
 {
  ClutterColor color;
-  guint32 value;
-
  st_theme_node_get_border_color (node, side, &color);
-  value = clutter_color_to_pixel (&color);
+  guint32 value = clutter_color_to_pixel (&color);

  if (expected != value)
    {