Bump version to 3.14.4

Update NEWS.
build: Work around distcheck issue
2015-03-23 19:36:31 +01:00 · 2015-03-23 19:36:31 +01:00 · 2015-03-20 10:23:47 +01:00 · 2015-03-17 10:27:16 +01:00 · 2015-03-14 16:58:33 +00:00 · 2015-03-06 17:25:44 +01:00
57 changed files with 2665 additions and 2560 deletions
--- a/.gitignore
+++ b/.gitignore
@ -23,7 +23,6 @@ data/gnome-shell-wayland.desktop
 data/gnome-shell-wayland.desktop.in
 data/gnome-shell-extension-prefs.desktop
 data/gnome-shell-extension-prefs.desktop.in
-data/gnome-shell-theme.gresource
 data/gschemas.compiled
 data/perf-background.xml
 data/org.gnome.shell.gschema.xml
--- a/55
+++ b/55
@ -1,19 +1,52 @@
-3.15.1
+3.14.4
 ======
-* Use GResources for theme loading [Cosimo; #736936]
-* Reset the OSK to primary on monitor changes [Rui; #738536]
-* Use LC_TIME locale for format string translations [Florian; #738640]
-* Summarize queued up notifications [Devyani; #702460]
-* Improve handling of multi-day events [Andreas; #727302]
-* Support EXTERNAL scroll policy type [Florian; #739379]
-* Misc. bugfixes [Owen, Rui; #738652, #739252]
+* Fix erroneous week numbers in calendar [Florian; #736722]
+* Make slider scrolling smoother [Adel; #742648]
+* Fix current day highlight on day change [Sebastian; #742492]
+* Do not wake up the screen for disabled notifications [Florian; #744114]
+* gdm: Fix user list accessibility [Florian; #729603]
+* Work around background corruption with NVIDIA driver [Rui; #739178]
+* Misc. bug fixes [Florian, Rui, Michele; #744575, #743993, #745245, #745570,
+  #737502]

 Contributors:
-  Andreas Brauchli, Cosimo Cecchi, Devyani Kota, Rui Matos, Florian Müllner,
-  Jasper St. Pierre, Owen W. Taylor
+  Michele, Adel Gadllah, Sebastian Keller, Rui Matos, Florian Müllner

 Translations:
-  Bahodir Mansurov [uz@cyrillic]
+  Matej Urbančič [sl], Samir Ribic [bs]
+
+3.14.3
+======
+* Properly remove network connections from list [Ryan; #740227]
+* Fix handling of cancel button on login screen [Ray; #740141]
+* Fix build when using dash as default shell [Alexander; #739241]
+* Make event list in calendar scrollable [Stalin; #705115]
+* Fix calendar-server crash on DBus timeout [Giovanni; #735308]
+* Fix gestures triggering erroneously [Florian; #740237]
+
+Contributors:
+  Giovanni Campagna, Ryan Lortie, Florian Müllner, Stalin Pereira, Ray Strode,
+  Alexander Tsoy
+
+3.14.2
+======
+* Do not hard-depend on latest NetworkManager [Florian; #738485]
+* Fix check for isToday in calendar [Darcy; #738725]
+* Fix workspace changes from app picker [Yuki; #737534]
+* Misc. bug fixes [Yuki; #739497]
+
+Contributors:
+  Darcy, Florian Müllner, Yuki
+
+3.14.1.5
+========
+* Fix handing of SystemBackground [Owen; #738652]
+* Summarize queued up notifications [Devyani; #702460]
+* Plug an animation object leak [Rui; #739252]
+* Improve handling of multi-day events [Andreas; #727302]
+
+Contributors:
+  Andreas Brauchli, Devyani Kota, Rui Matos, Owen W. Taylor

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

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -76,7 +76,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.15.90
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.15.1
+MUTTER_MIN_VERSION=3.14.4
 GTK_MIN_VERSION=3.13.2
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
@ -232,7 +232,9 @@ esac
 AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
 AC_SUBST(AM_CFLAGS)

-BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
+if test -z "${BROWSER_PLUGIN_DIR}"; then
+  BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins"
+fi
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])

 AC_CONFIG_FILES([
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -35,11 +35,44 @@ introspection_DATA =				\
 	org.gnome.ShellSearchProvider.xml	\
 	org.gnome.ShellSearchProvider2.xml

-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/theme --generate-dependencies $(srcdir)/gnome-shell-theme.gresource.xml)
-gnome-shell-theme.gresource: gnome-shell-theme.gresource.xml $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/theme $<
-resourcedir = $(pkgdatadir)
-resource_DATA = gnome-shell-theme.gresource
+themedir = $(pkgdatadir)/theme
+dist_theme_DATA =				\
+	theme/calendar-arrow-left.svg		\
+	theme/calendar-arrow-right.svg		\
+	theme/calendar-today.svg		\
+	theme/checkbox-focused.svg		\
+	theme/checkbox-off-focused.svg		\
+	theme/checkbox-off.svg			\
+	theme/checkbox.svg			\
+	theme/close-window.svg			\
+	theme/close.svg				\
+	theme/corner-ripple-ltr.png		\
+	theme/corner-ripple-rtl.png		\
+	theme/dash-placeholder.svg		\
+	theme/filter-selected-ltr.svg		\
+	theme/filter-selected-rtl.svg		\
+	theme/gnome-shell.css			\
+	theme/logged-in-indicator.svg		\
+	theme/message-tray-background.png	\
+	theme/more-results.svg			\
+	theme/noise-texture.png			\
+	theme/page-indicator-active.svg		\
+	theme/page-indicator-inactive.svg	\
+	theme/page-indicator-checked.svg	\
+	theme/page-indicator-hover.svg		\
+	theme/panel-button-border.svg		\
+	theme/panel-button-highlight-narrow.svg	\
+	theme/panel-button-highlight-wide.svg	\
+	theme/process-working.svg		\
+	theme/running-indicator.svg		\
+	theme/source-button-border.svg		\
+	theme/summary-counter.svg		\
+	theme/toggle-off-us.svg			\
+	theme/toggle-off-intl.svg		\
+	theme/toggle-on-us.svg			\
+	theme/toggle-on-intl.svg		\
+	theme/ws-switch-arrow-up.png		\
+	theme/ws-switch-arrow-down.png

 backgrounddir = $(pkgdatadir)
 background_DATA = perf-background.xml
@ -83,9 +116,7 @@ EXTRA_DIST =						\
 	perf-background.xml.in				\
 	org.gnome.Shell.PortalHelper.desktop.in		\
 	org.gnome.Shell.PortalHelper.service.in		\
-	org.gnome.shell.gschema.xml.in.in		\
-	gnome-shell-theme.gresource.xml 		\
-	$(resource_files)
+	org.gnome.shell.gschema.xml.in.in

 CLEANFILES +=						\
 	gnome-shell.desktop.in				\
@ -97,5 +128,4 @@ CLEANFILES +=						\
 	perf-background.xml				\
 	gschemas.compiled				\
 	org.gnome.shell.gschema.valid			\
-	org.gnome.shell.gschema.xml.in			\
-	gnome-shell-theme.gresource
+	org.gnome.shell.gschema.xml.in
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@ -1,41 +0,0 @@
-<?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.svg</file>
-    <file>corner-ripple-ltr.png</file>
-    <file>corner-ripple-rtl.png</file>
-    <file>dash-placeholder.svg</file>
-    <file>filter-selected-ltr.svg</file>
-    <file>filter-selected-rtl.svg</file>
-    <file>gnome-shell.css</file>
-    <file>logged-in-indicator.svg</file>
-    <file>message-tray-background.png</file>
-    <file>more-results.svg</file>
-    <file>noise-texture.png</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>panel-button-border.svg</file>
-    <file>panel-button-highlight-narrow.svg</file>
-    <file>panel-button-highlight-wide.svg</file>
-    <file>process-working.svg</file>
-    <file>running-indicator.svg</file>
-    <file>source-button-border.svg</file>
-    <file>summary-counter.svg</file>
-    <file>toggle-off-us.svg</file>
-    <file>toggle-off-intl.svg</file>
-    <file>toggle-on-us.svg</file>
-    <file>toggle-on-intl.svg</file>
-    <file>ws-switch-arrow-up.png</file>
-    <file>ws-switch-arrow-down.png</file>
-  </gresource>
-</gresources>
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const St = imports.gi.St;
@ -127,7 +126,7 @@ const AuthPrompt = new Lang.Class({

        this._initButtons();

-        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
+        let spinnerIcon = global.datadir + '/theme/process-working.svg';
        this._spinner = new Animation.AnimatedIcon(spinnerIcon, DEFAULT_BUTTON_WELL_ICON_SIZE);
        this._spinner.actor.opacity = 0;
        this._spinner.actor.show();
@ -261,6 +260,7 @@ const AuthPrompt = new Lang.Class({

    _onVerificationComplete: function() {
        this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
+	this.cancelButton.reactive = false;
    },

    _onReset: function() {
@ -432,6 +432,7 @@ const AuthPrompt = new Lang.Class({
    reset: function() {
        let oldStatus = this.verificationStatus;
        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
+        this.cancelButton.reactive = true;

        if (oldStatus == AuthPromptStatus.VERIFYING)
            this._userVerifier.cancel();
@ -500,6 +501,9 @@ const AuthPrompt = new Lang.Class({
    },

    cancel: function() {
+        if (this.verificationStatus == AuthPromptStatus.NOT_VERIFYING || this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED) {
+            return;
+        }
        this.reset();
        this.emit('cancelled');
    }
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -22,6 +22,7 @@ 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 Mainloop = imports.mainloop;
@ -70,6 +71,9 @@ const UserListItem = new Lang.Class({
        this._userWidget = new UserWidget.UserWidget(this.user);
        layout.add(this._userWidget.actor);

+        this._userWidget.actor.bind_property('label-actor', this.actor, 'label-actor',
+                                             GObject.BindingFlags.SYNC_CREATE);
+
        this._timedLoginIndicator = new St.Bin({ style_class: 'login-dialog-timed-login-indicator',
                                                 scale_x: 0 });
        layout.add(this._timedLoginIndicator);
@ -537,24 +541,24 @@ const LoginDialog = new Lang.Class({
        }
    },

-    _updateLogoTexture: function(cache, file) {
-        if (this._logoFile && !this._logoFile.equal(file))
+    _updateLogoTexture: function(cache, uri) {
+        if (this._logoFileUri != uri)
            return;

        this._logoBin.destroy_all_children();
-        if (this._logoFile) {
+        if (this._logoFileUri) {
            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.add_child(this._textureCache.load_uri_async(this._logoFileUri,
+                                                                      -1, _LOGO_ICON_HEIGHT,
+                                                                      scaleFactor));
        }
    },

    _updateLogo: function() {
        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);
+        this._logoFileUri = path ? Gio.file_new_for_path(path).get_uri() : null;
+        this._updateLogoTexture(this._textureCache, this._logoFileUri);
    },

    _onPrompted: function() {
@ -643,6 +647,8 @@ const LoginDialog = new Lang.Class({
                                                        realmManager.release();
                                                    }));
        this._updateCancelButton();
+
+        this._authPrompt.updateSensitivity(true);
        this._showPrompt();
    },

--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@ -35,7 +35,7 @@ function releaseKeyboard() {
 }

 function holdKeyboard() {
-    global.display.freeze_keyboard(global.get_current_time());
+    global.freeze_keyboard(global.get_current_time());
 }

 const KeyboardManager = new Lang.Class({
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@ -12,7 +12,7 @@ const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const Animation = new Lang.Class({
    Name: 'Animation',

-    _init: function(file, width, height, speed) {
+    _init: function(filename, width, height, speed) {
        this.actor = new St.Bin();
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
        this._speed = speed;
@ -23,7 +23,7 @@ const Animation = new Lang.Class({
        this._frame = 0;

        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._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height, scaleFactor,
                                                                            Lang.bind(this, this._animationsLoaded));
        this.actor.set_child(this._animations);
    },
@ -82,7 +82,7 @@ const AnimatedIcon = new Lang.Class({
    Name: 'AnimatedIcon',
    Extends: Animation,

-    _init: function(file, size) {
-        this.parent(file, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
+    _init: function(filename, size) {
+        this.parent(filename, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
    }
 });
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -379,7 +379,9 @@ const AllView = new Lang.Class({
        this.actor.add_actor(this._scrollView);

        this._scrollView.set_policy(Gtk.PolicyType.NEVER,
-                                    Gtk.PolicyType.EXTERNAL);
+                                    Gtk.PolicyType.AUTOMATIC);
+        // we are only using ScrollView for the fade effect, hide scrollbars
+        this._scrollView.vscroll.hide();
        this._adjustment = this._scrollView.vscroll.adjustment;

        this._pageIndicators = new PageIndicators();
@ -1562,10 +1564,11 @@ const AppIcon = new Lang.Class({
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        this._menuTimeoutId = 0;
-        this._stateChangedId = this.app.connect('notify::state',
-                                                Lang.bind(this,
-                                                          this._onStateChanged));
-        this._onStateChanged();
+        this._stateChangedId = this.app.connect('notify::state', Lang.bind(this,
+            function () {
+                this._updateRunningStyle();
+            }));
+        this._updateRunningStyle();
    },

    _onDestroy: function() {
@ -1586,7 +1589,7 @@ const AppIcon = new Lang.Class({
        }
    },

-    _onStateChanged: function() {
+    _updateRunningStyle: function() {
        if (this.app.state != Shell.AppState.STOPPED)
            this.actor.add_style_class_name('running');
        else
@ -1655,7 +1658,10 @@ const AppIcon = new Lang.Class({
                if (!isPoppedUp)
                    this._onMenuPoppedDown();
            }));
-            Main.overview.connect('hiding', Lang.bind(this, function () { this._menu.close(); }));
+            let id = Main.overview.connect('hiding', Lang.bind(this, function () { this._menu.close(); }));
+            this.actor.connect('destroy', function() {
+                Main.overview.disconnect(id);
+            });

            this._menuManager.addMenu(this._menu);
        }
--- a/js/ui/background.js
+++ b/js/ui/background.js
@ -127,16 +127,6 @@ const ANIMATION_MIN_WAKEUP_INTERVAL = 1.0;

 let _backgroundCache = null;

-function _fileEqual0(file1, file2) {
-    if (file1 == file2)
-        return true;
-
-    if (!file1 || !file2)
-        return false;
-
-    return file1.equal(file2);
-}
-
 const BackgroundCache = new Lang.Class({
    Name: 'BackgroundCache',

@ -146,25 +136,25 @@ const BackgroundCache = new Lang.Class({
        this._backgroundSources = {};
    },

-    monitorFile: function(file) {
-        let key = file.hash();
-        if (this._fileMonitors[key])
+    monitorFile: function(filename) {
+        if (this._fileMonitors[filename])
            return;

+        let file = Gio.File.new_for_path(filename);
        let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
        monitor.connect('changed',
                        Lang.bind(this, function() {
-                            this.emit('file-changed', file);
+                            this.emit('file-changed', filename);
                        }));

-        this._fileMonitors[key] = monitor;
+        this._fileMonitors[filename] = monitor;
    },

    getAnimation: function(params) {
-        params = Params.parse(params, { file: null,
+        params = Params.parse(params, { filename: null,
                                        onLoaded: null });

-        if (_fileEqual0(this._animationFile, params.file)) {
+        if (this._animationFilename == params.filename) {
            if (params.onLoaded) {
                let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
                    params.onLoaded(this._animation);
@ -175,10 +165,10 @@ const BackgroundCache = new Lang.Class({
            return;
        }

-        let animation = new Animation({ file: params.file });
+        let animation = new Animation({ filename: params.filename });

        animation.load(Lang.bind(this, function() {
-                           this._animationFile = params.file;
+                           this._animationFilename = params.filename;
                           this._animation = animation;

                           if (params.onLoaded) {
@ -231,14 +221,14 @@ const Background = new Lang.Class({
        params = Params.parse(params, { monitorIndex: 0,
                                        layoutManager: Main.layoutManager,
                                        settings: null,
-                                        file: null,
+                                        filename: null,
                                        style: null });

        this.background = new Meta.Background({ meta_screen: global.screen });
        this.background._delegate = this;

        this._settings = params.settings;
-        this._file = params.file;
+        this._filename = params.filename;
        this._style = params.style;
        this._monitorIndex = params.monitorIndex;
        this._layoutManager = params.layoutManager;
@ -305,21 +295,20 @@ const Background = new Lang.Class({
            this.background.set_gradient(shadingType, color, secondColor);
    },

-    _watchFile: function(file) {
-        let key = file.hash();
-        if (this._fileWatches[key])
+    _watchFile: function(filename) {
+        if (this._fileWatches[filename])
            return;

-        this._cache.monitorFile(file);
+        this._cache.monitorFile(filename);
        let signalId = this._cache.connect('file-changed',
                                           Lang.bind(this, function(cache, changedFile) {
-                                               if (changedFile.equal(file)) {
+                                               if (changedFile == filename) {
                                                   let imageCache = Meta.BackgroundImageCache.get_default();
                                                   imageCache.purge(changedFile);
                                                   this.emit('changed');
                                               }
                                           }));
-        this._fileWatches[key] = signalId;
+        this._fileWatches[filename] = signalId;
    },

    _removeAnimationTimeout: function() {
@ -342,9 +331,9 @@ const Background = new Lang.Class({
                                          this._animation.transitionProgress,
                                          this._style);
            } else if (files.length > 0) {
-                this.background.set_file(files[0], this._style);
+                this.background.set_filename(files[0], this._style);
            } else {
-                this.background.set_file(null, this._style);
+                this.background.set_filename(null, this._style);
            }
            this._queueUpdateAnimation();
        });
@ -401,28 +390,28 @@ const Background = new Lang.Class({
        GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
    },

-    _loadAnimation: function(file) {
-        this._cache.getAnimation({ file: file,
-                                         onLoaded: Lang.bind(this, function(animation) {
-                                             this._animation = animation;
+    _loadAnimation: function(filename) {
+        this._cache.getAnimation({ filename: filename,
+                                             onLoaded: Lang.bind(this, function(animation) {
+                                                 this._animation = animation;

-                                             if (!this._animation || this._cancellable.is_cancelled()) {
-                                                 this._setLoaded();
-                                                 return;
-                                             }
+                                                 if (!this._animation || this._cancellable.is_cancelled()) {
+                                                     this._setLoaded();
+                                                     return;
+                                                 }

-                                             this._updateAnimation();
-                                             this._watchFile(file);
-                                         })
-                                 });
+                                                 this._updateAnimation();
+                                                 this._watchFile(filename);
+                                             })
+                                           });
    },

-    _loadImage: function(file) {
-        this.background.set_file(file, this._style);
-        this._watchFile(file);
+    _loadImage: function(filename) {
+        this.background.set_filename(filename, this._style);
+        this._watchFile(filename);

        let cache = Meta.BackgroundImageCache.get_default();
-        let image = cache.load(file);
+        let image = cache.load(filename);
        if (image.is_loaded())
            this._setLoaded();
        else {
@ -434,11 +423,11 @@ const Background = new Lang.Class({
        }
    },

-    _loadFile: function(file) {
-        if (file.get_basename().endsWith('.xml'))
-            this._loadAnimation(file);
+    _loadFile: function(filename) {
+        if (filename.endsWith('.xml'))
+            this._loadAnimation(filename);
        else
-            this._loadImage(file);
+            this._loadImage(filename);
    },

    _load: function () {
@ -446,12 +435,12 @@ const Background = new Lang.Class({

        this._loadPattern();

-        if (!this._file) {
+        if (!this._filename) {
            this._setLoaded();
            return;
        }

-        this._loadFile(this._file);
+        this._loadFile(this._filename);
    },
 });
 Signals.addSignalMethods(Background.prototype);
@ -462,12 +451,12 @@ const SystemBackground = new Lang.Class({
    Name: 'SystemBackground',

    _init: function() {
-        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
+        let filename = global.datadir + '/theme/noise-texture.png';

        if (_systemBackground == null) {
            _systemBackground = new Meta.Background({ meta_screen: global.screen });
            _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
-            _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
+            _systemBackground.set_filename(filename, GDesktopEnums.BackgroundStyle.WALLPAPER);
        }

        this.actor = new Meta.BackgroundActor({ meta_screen: global.screen,
@ -475,7 +464,7 @@ const SystemBackground = new Lang.Class({
                                                background: _systemBackground });

        let cache = Meta.BackgroundImageCache.get_default();
-        let image = cache.load(file);
+        let image = cache.load(filename);
        if (image.is_loaded()) {
            image = null;
            let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
@ -524,17 +513,20 @@ const BackgroundSource = new Lang.Class({
    },

    getBackground: function(monitorIndex) {
-        let file = null;
+        let filename = null;
        let style;

        if (this._overrideImage != null) {
-            file = Gio.File.new_for_path(this._overrideImage);
+            filename = this._overrideImage;
            style = GDesktopEnums.BackgroundStyle.ZOOM; // Hardcode
        } else {
            style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
            if (style != GDesktopEnums.BackgroundStyle.NONE) {
                let uri = this._settings.get_string(PICTURE_URI_KEY);
-                file = Gio.File.new_for_commandline_arg(uri);
+                if (GLib.uri_parse_scheme(uri) != null)
+                    filename = Gio.File.new_for_uri(uri).get_path();
+                else
+                    filename = uri;
            }
        }

@ -542,7 +534,7 @@ const BackgroundSource = new Lang.Class({
        // they can have variants that depend on the aspect ratio and
        // size of the monitor; for other backgrounds we can use the
        // same background object for all monitors.
-        if (file == null || !file.get_basename().endsWith('.xml'))
+        if (filename == null || !filename.endsWith('.xml'))
            monitorIndex = 0;

        if (!(monitorIndex in this._backgrounds)) {
@ -550,7 +542,7 @@ const BackgroundSource = new Lang.Class({
                monitorIndex: monitorIndex,
                layoutManager: this._layoutManager,
                settings: this._settings,
-                file: file,
+                filename: filename,
                style: style
            });

@ -583,9 +575,9 @@ const Animation = new Lang.Class({
    Name: 'Animation',

    _init: function(params) {
-        params = Params.parse(params, { file: null });
+        params = Params.parse(params, { filename: null });

-        this.file = params.file;
+        this.filename = params.filename;
        this.keyFrameFiles = [];
        this.transitionProgress = 0.0;
        this.transitionDuration = 0.0;
@ -593,7 +585,9 @@ const Animation = new Lang.Class({
    },

    load: function(callback) {
-        this._show = new GnomeDesktop.BGSlideShow({ filename: this.file.get_path() });
+        let file = Gio.File.new_for_path(this.filename);
+
+        this._show = new GnomeDesktop.BGSlideShow({ filename: this.filename });

        this._show.load_async(null,
                              Lang.bind(this,
@ -613,16 +607,16 @@ const Animation = new Lang.Class({
        if (this._show.get_num_slides() < 1)
            return;

-        let [progress, duration, isFixed, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);
+        let [progress, duration, isFixed, file1, file2] = this._show.get_current_slide(monitor.width, monitor.height);

        this.transitionDuration = duration;
        this.transitionProgress = progress;

-        if (filename1)
-            this.keyFrameFiles.push(Gio.File.new_for_path(filename1));
+        if (file1)
+            this.keyFrameFiles.push(file1);

-        if (filename2)
-            this.keyFrameFiles.push(Gio.File.new_for_path(filename2));
+        if (file2)
+            this.keyFrameFiles.push(file2);
    },
 });
 Signals.addSignalMethods(Animation.prototype);
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -2,6 +2,7 @@

 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;
@ -17,7 +18,6 @@ const ELLIPSIS_CHAR = '\u2026';

 // alias to prevent xgettext from picking up strings translated in GTK+
 const gtk30_ = Gettext_gtk30.gettext;
-const NC_ = function(context, str) { return str; };

 // in org.gnome.desktop.interface
 const CLOCK_FORMAT_KEY        = 'clock-format';
@ -90,23 +90,6 @@ function _formatEventTime(event, clockFormat, periodBegin, periodEnd) {
    return ret;
 }

-function _getCalendarWeekForDate(date) {
-    // Based on the algorithms found here:
-    // http://en.wikipedia.org/wiki/Talk:ISO_week_date
-    let midnightDate = new Date(date.getFullYear(), date.getMonth(), date.getDate());
-    // Need to get Monday to be 1 ... Sunday to be 7
-    let dayOfWeek = 1 + ((midnightDate.getDay() + 6) % 7);
-    let nearestThursday = new Date(midnightDate.getFullYear(), midnightDate.getMonth(),
-                                   midnightDate.getDate() + (4 - dayOfWeek));
-
-    let jan1st = new Date(nearestThursday.getFullYear(), 0, 1);
-    let diffDate = nearestThursday - jan1st;
-    let dayNumber = Math.floor(Math.abs(diffDate) / MSECS_IN_DAY);
-    let weekNumber = Math.floor(dayNumber / 7) + 1;
-
-    return weekNumber;
-}
-
 function _getCalendarDayAbbreviation(dayNumber) {
    let abbreviations = [
        /* Translators: Calendar grid abbreviation for Sunday.
@ -252,11 +235,24 @@ const DBusEventSource = new Lang.Class({
        this._initialized = false;
        this._dbusProxy = new CalendarServer();
        this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(object, result) {
+            let loaded = false;
+
            try {
                this._dbusProxy.init_finish(result);
+                loaded = true;
            } catch(e) {
-                log('Error loading calendars: ' + e.message);
-                return;
+                if (e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) {
+                    // Ignore timeouts and install signals as normal, because with high
+                    // probability the service will appear later on, and we will get a
+                    // NameOwnerChanged which will finish loading
+                    //
+                    // (But still _initialized to false, because the proxy does not know
+                    // about the HasCalendars property and would cause an exception trying
+                    // to read it)
+                } else {
+                    log('Error loading calendars: ' + e.message);
+                    return;
+                }
            }

            this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
@ -272,9 +268,11 @@ const DBusEventSource = new Lang.Class({
                this.emit('notify::has-calendars');
            }));

-            this._initialized = true;
-            this.emit('notify::has-calendars');
-            this._onNameAppeared();
+            this._initialized = loaded;
+            if (loaded) {
+                this.emit('notify::has-calendars');
+                this._onNameAppeared();
+            }
        }));
    },

@ -296,6 +294,7 @@ const DBusEventSource = new Lang.Class({
    },

    _onNameAppeared: function(owner) {
+        this._initialized = true;
        this._resetCache();
        this._loadEvents(true);
    },
@ -604,6 +603,7 @@ const Calendar = new Lang.Class({
        beginDate.setHours(12);

        this._calendarBegin = new Date(beginDate);
+        this._markedAsToday = now;

        let year = beginDate.getYear();

@ -671,7 +671,7 @@ const Calendar = new Lang.Class({
            this._buttons.push(button);

            if (this._useWeekdate && iter.getDay() == 4) {
-                let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
+                let label = new St.Label({ text: iter.toLocaleFormat('%V'),
                                           style_class: 'calendar-day-base calendar-week-number'});
                layout.attach(label, rtl ? 7 : 0, row, 1, 1);
            }
@ -695,7 +695,7 @@ const Calendar = new Lang.Class({
        else
            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormat);

-        if (!this._calendarBegin || !_sameMonth(this._selectedDate, this._calendarBegin))
+        if (!this._calendarBegin || !_sameMonth(this._selectedDate, this._calendarBegin) || !_sameDay(now, this._markedAsToday))
            this._rebuildCalendar();

        this._buttons.forEach(Lang.bind(this, function(button) {
@ -732,6 +732,8 @@ const EventsList = new Lang.Class({
    },

    _addEvent: function(event, index, includeDayName, periodBegin, periodEnd) {
+        let eventBox = new St.BoxLayout();
+        eventBox.set_vertical(false);
        let dayString;
        if (includeDayName) {
            if (event.date >= periodBegin)
@ -752,7 +754,7 @@ const EventsList = new Lang.Class({
        let rtl = this.actor.get_text_direction() == Clutter.TextDirection.RTL;

        let layout = this.actor.layout_manager;
-        layout.attach(dayLabel, rtl ? 2 : 0, index, 1, 1);
+        eventBox.add_actor(dayLabel);
        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
        let timeString = _formatEventTime(event, clockFormat, periodBegin, periodEnd);
        let timeLabel = new St.Label({ style_class: 'events-day-time',
@ -772,11 +774,12 @@ const EventsList = new Lang.Class({
        if (event.allDay || event.end <= periodEnd)
            postEllipsisLabel.opacity = 0;

-        let timeLabelBoxLayout = new St.BoxLayout();
+        let timeLabelBoxLayout = new St.BoxLayout({ x_align: Clutter.ActorAlign.START });
        timeLabelBoxLayout.add(preEllipsisLabel);
        timeLabelBoxLayout.add(timeLabel);
        timeLabelBoxLayout.add(postEllipsisLabel);
-        layout.attach(timeLabelBoxLayout, 1, index, 1, 1);
+        timeLabelBoxLayout.set_size(50, 1);
+        eventBox.add_actor(timeLabelBoxLayout);

        let titleLabel = new St.Label({ style_class: 'events-day-task',
                                        text: event.summary,
@ -784,7 +787,8 @@ const EventsList = new Lang.Class({
        titleLabel.clutter_text.line_wrap = true;
        titleLabel.clutter_text.ellipsize = false;

-        layout.attach(titleLabel, rtl ? 0 : 2, index, 1, 1);
+        eventBox.add_actor(titleLabel);
+        this._eventListBox.add_actor(eventBox);
    },

    _addPeriod: function(header, index, periodBegin, periodEnd, includeDayName, showNothingScheduled) {
@ -794,8 +798,7 @@ const EventsList = new Lang.Class({
            return index;

        let label = new St.Label({ style_class: 'events-day-header', text: header });
-        let layout = this.actor.layout_manager;
-        layout.attach(label, 0, index, 3, 1);
+        this._eventListBox.add_actor(label);
        index++;

        for (let n = 0; n < events.length; n++) {
@ -814,27 +817,21 @@ const EventsList = new Lang.Class({
    },

    _showOtherDay: function(day) {
-        this.actor.destroy_all_children();
-
        let dayBegin = _getBeginningOfDay(day);
        let dayEnd = _getEndOfDay(day);

-        let dayFormat;
+        let dayString;
        let now = new Date();
        if (_sameYear(day, 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"));
+            dayString = day.toLocaleFormat(C_("calendar heading", "%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"));
-        let dayString = day.toLocaleFormat(dayFormat);
+            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
        this._addPeriod(dayString, 0, dayBegin, dayEnd, false, true);
    },

    _showToday: function() {
-        this.actor.destroy_all_children();
        let index = 0;

        let now = new Date();
@ -879,6 +876,24 @@ const EventsList = new Lang.Class({
        if (this._eventSource.isLoading)
            return;

+        this.actor.destroy_all_children();
+
+        let layout = this.actor.layout_manager;
+
+        this._eventListContainer = new St.BoxLayout({ x_expand: true, y_expand: true });
+        this._eventListContainer.set_vertical(true);
+
+        this._eventListBox = new St.BoxLayout();
+        this._eventListBox.set_vertical(true);
+
+        let eventScrollView = new St.ScrollView({style_class: 'vfade',
+                                                hscrollbar_policy: Gtk.PolicyType.NEVER,
+                                                vscrollbar_policy: Gtk.PolicyType.AUTOMATIC});
+        eventScrollView.add_actor(this._eventListBox);
+        this._eventListContainer.add_actor(eventScrollView);
+
+        layout.attach(this._eventListContainer, 0, 0, 1, 1);
+
        let today = new Date();
        if (_sameDay (this._date, today)) {
            this._showToday();
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@ -604,9 +604,15 @@ const NetworkAgent = new Lang.Class({
    Name: 'NetworkAgent',

    _init: function() {
-        this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent',
-                                                capabilities: NMClient.SecretAgentCapabilities.VPN_HINTS
-                                              });
+        try {
+            this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent',
+                                                    capabilities: NMClient.SecretAgentCapabilities.VPN_HINTS
+                                                  });
+        } catch(e) {
+            // Support older versions without NetworkAgent:capabilities
+            this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent'
+                                                  });
+        }

        this._dialogs = { };
        this._vpnRequests = { };
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@ -36,8 +36,6 @@ const NotificationDirection = {
    RECEIVED: 'chat-received'
 };

-const N_ = function(s) { return s; };
-
 function makeMessageFromTpMessage(tpMessage, direction) {
    let [text, flags] = tpMessage.to_text();

@ -952,70 +950,70 @@ const ChatNotification = new Lang.Class({
            // Show only the time if date is on today
            if(daysAgo < 1){
                /* Translators: Time in 24h format */
-                format = N_("%H\u2236%M");
+                format = _("%H\u2236%M");
            }
            // Show the word "Yesterday" and time if date is on yesterday
            else if(daysAgo <2){
                /* Translators: this is the word "Yesterday" followed by a
                 time string in 24h format. i.e. "Yesterday, 14:30" */
                // xgettext:no-c-format
-                format = N_("Yesterday, %H\u2236%M");
+                format = _("Yesterday, %H\u2236%M");
            }
            // Show a week day and time if date is in the last week
            else if (daysAgo < 7) {
                /* Translators: this is the week day name followed by a time
                 string in 24h format. i.e. "Monday, 14:30" */
                // xgettext:no-c-format
-                format = N_("%A, %H\u2236%M");
+                format = _("%A, %H\u2236%M");

            } else if (date.getYear() == now.getYear()) {
                /* Translators: this is the month name and day number
                 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 = _("%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 = _("%B %d %Y, %H\u2236%M");
            }
        } else {
            // Show only the time if date is on today
            if(daysAgo < 1){
                /* Translators: Time in 24h format */
-                format = N_("%l\u2236%M %p");
+                format = _("%l\u2236%M %p");
            }
            // Show the word "Yesterday" and time if date is on yesterday
            else if(daysAgo <2){
                /* Translators: this is the word "Yesterday" followed by a
                 time string in 12h format. i.e. "Yesterday, 2:30 pm" */
                // xgettext:no-c-format
-                format = N_("Yesterday, %l\u2236%M %p");
+                format = _("Yesterday, %l\u2236%M %p");
            }
            // Show a week day and time if date is in the last week
            else if (daysAgo < 7) {
                /* Translators: this is the week day name followed by a time
                 string in 12h format. i.e. "Monday, 2:30 pm" */
                // xgettext:no-c-format
-                format = N_("%A, %l\u2236%M %p");
+                format = _("%A, %l\u2236%M %p");

            } else if (date.getYear() == now.getYear()) {
                /* Translators: this is the month name and day number
                 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 = _("%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 = _("%B %d %Y, %l\u2236%M %p");
            }
        }
-        return date.toLocaleFormat(Shell.util_translate_time_string(format));
+        return date.toLocaleFormat(format);
    },

    appendTimestamp: function() {
@ -1266,8 +1264,9 @@ const SubscriptionRequestNotification = new Lang.Class({
        let file = contact.get_avatar_file();

        if (file) {
+            let uri = file.get_uri();
            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-            iconBox.child = textureCache.load_file_async(file, iconBox._size, iconBox._size, scaleFactor);
+            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size, scaleFactor);
        }
        else {
            iconBox.child = new St.Icon({ icon_name: 'avatar-default',
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -513,10 +513,13 @@ const Dash = new Lang.Class({
            this._syncLabel(item, appIcon);
        }));

-        Main.overview.connect('hiding', Lang.bind(this, function() {
+        let id = Main.overview.connect('hiding', Lang.bind(this, function() {
            this._labelShowing = false;
            item.hideLabel();
        }));
+        item.child.connect('destroy', function() {
+            Main.overview.disconnect(id);
+        });

        if (appIcon) {
            appIcon.connect('sync-tooltip', Lang.bind(this, function() {
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@ -59,7 +59,7 @@ const DateMenuButton = new Lang.Class({

        // Fill up the first column

-        vbox = new St.BoxLayout({vertical: true});
+        vbox = new St.BoxLayout({vertical: true, x_expand: true, y_expand: true });
        hbox.add(vbox);

        // Date
@ -96,11 +96,11 @@ const DateMenuButton = new Lang.Class({

        this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
        this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
-        vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+        vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: false, y_fill: false});

        this._openClocksItem = new PopupMenu.PopupMenuItem(_("Open Clocks"));
        this._openClocksItem.connect('activate', Lang.bind(this, this._onOpenClocksActivate));
-        vbox.add(this._openClocksItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+        vbox.add(this._openClocksItem.actor, {y_align: St.Align.END, expand: false, y_fill: false});

        Shell.AppSystem.get_default().connect('installed-changed',
                                              Lang.bind(this, this._appInstalledChanged));
@ -129,7 +129,7 @@ const DateMenuButton = new Lang.Class({
                /* Translators: This is the date format to use when the calendar popup is
                 * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
                 */
-                let dateFormat = Shell.util_translate_time_string ("%A %B %e, %Y");
+                let dateFormat = _("%A %B %e, %Y");
                this._date.set_label(now.toLocaleFormat(dateFormat));
            }
        }));
@ -147,7 +147,7 @@ const DateMenuButton = new Lang.Class({
        let now = new Date();
        return now.getYear() == date.getYear() &&
               now.getMonth() == date.getMonth() &&
-               now.getDay() == date.getDay();
+               now.getDate() == date.getDate();
    },

    _appInstalledChanged: function() {
--- a/js/ui/edgeDragAction.js
+++ b/js/ui/edgeDragAction.js
@ -6,6 +6,8 @@ const Meta = imports.gi.Meta;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

+const Main = imports.ui.main;
+
 const EDGE_THRESHOLD = 20;
 const DRAG_DISTANCE = 80;

@ -13,9 +15,10 @@ const EdgeDragAction = new Lang.Class({
    Name: 'EdgeDragAction',
    Extends: Clutter.GestureAction,

-    _init : function(side) {
+    _init : function(side, allowedModes) {
        this.parent();
        this._side = side;
+        this._allowedModes = allowedModes;
        this.set_n_touch_points(1);

        global.display.connect('grab-op-begin', Lang.bind(this, function() {
@ -34,6 +37,9 @@ const EdgeDragAction = new Lang.Class({
        if (this.get_n_current_points() == 0)
            return false;

+        if (!(this._allowedModes & Main.keybindingMode))
+            return false;
+
        let [x, y] = this.get_press_coords(0);
        let monitorRect = this._getMonitorRect(x, y);

--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -74,7 +74,7 @@ function disableExtension(uuid) {

    if (extension.stylesheet) {
        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-        theme.unload_stylesheet(extension.stylesheet);
+        theme.unload_stylesheet(extension.stylesheet.get_path());
    }

    try {
@ -118,7 +118,7 @@ function enableExtension(uuid) {
        let stylesheetFile = extension.dir.get_child(stylesheetNames[i]);
        if (stylesheetFile.query_exists(null)) {
            let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-            theme.load_stylesheet(stylesheetFile);
+            theme.load_stylesheet(stylesheetFile.get_path());
            extension.stylesheet = stylesheetFile;
            break;
        }
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@ -11,6 +11,7 @@ const St = imports.gi.St;

 const Background = imports.ui.background;
 const BackgroundMenu = imports.ui.backgroundMenu;
+const LoginManager = imports.misc.loginManager;

 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
@ -248,6 +249,18 @@ const LayoutManager = new Lang.Class({
        global.screen.connect('in-fullscreen-changed',
                              Lang.bind(this, this._updateFullscreen));
        this._monitorsChanged();
+
+        // NVIDIA drivers don't preserve FBO contents across
+        // suspend/resume, see
+        // https://bugzilla.gnome.org/show_bug.cgi?id=739178
+        if (Shell.util_need_background_refresh()) {
+            LoginManager.getLoginManager().connect('prepare-for-sleep',
+                                                   function(lm, suspending) {
+                                                       if (suspending)
+                                                           return;
+                                                       Meta.Background.refresh_all();
+                                                   });
+        }
    },

    // This is called by Main after everything else is constructed
@ -422,7 +435,10 @@ const LayoutManager = new Lang.Class({
        this.panelBox.set_position(this.primaryMonitor.x, this.primaryMonitor.y);
        this.panelBox.set_size(this.primaryMonitor.width, -1);

-        this.keyboardIndex = this.primaryIndex;
+        if (this.keyboardIndex < 0)
+            this.keyboardIndex = this.primaryIndex;
+        else
+            this._updateKeyboardBox();

        this.trayBox.set_position(this.bottomMonitor.x,
                                  this.bottomMonitor.y + this.bottomMonitor.height);
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -129,9 +129,6 @@ function _initializeUI() {
    Shell.WindowTracker.get_default();
    Shell.AppUsage.get_default();

-    let resource = Gio.Resource.load(global.datadir + '/gnome-shell-theme.gresource');
-    resource._register();
-
    _loadDefaultStylesheet();

    // Setup the stage hierarchy early
@ -225,26 +222,12 @@ function _initializeUI() {
    });
 }

-function _getDefaultStylesheet() {
-    let stylesheet;
-
-    stylesheet = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/' + sessionMode.stylesheetName);
-    if (stylesheet.query_exists(null))
-        return stylesheet;
-
-    stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + sessionMode.stylesheetName);
-    if (stylesheet.query_exists(null))
-        return stylesheet;
-
-    return null;
-}
-
 function _loadDefaultStylesheet() {
    if (!sessionMode.isPrimary)
        return;

-    let stylesheet = _getDefaultStylesheet();
-    if (_defaultCssStylesheet && _defaultCssStylesheet.equal(stylesheet))
+    let stylesheet = global.datadir + '/theme/' + sessionMode.stylesheetName;
+    if (_defaultCssStylesheet == stylesheet)
        return;

    _defaultCssStylesheet = stylesheet;
@ -271,7 +254,7 @@ function getThemeStylesheet() {
 * Set the theme CSS file that the shell will load
 */
 function setThemeStylesheet(cssStylesheet) {
-    _cssStylesheet = Gio.File.new_for_path(cssStylesheet);
+    _cssStylesheet = cssStylesheet;
 }

 /**
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -1951,7 +1951,9 @@ const MessageTray = new Lang.Class({
        this._messageTrayMenuButton.actor.connect('key-press-event',
                                                  Lang.bind(this, this._onTrayButtonKeyPress));

-        let gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM);
+        let gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM,
+                                                        Shell.KeyBindingMode.NORMAL |
+                                                        Shell.KeyBindingMode.OVERVIEW);
        gesture.connect('activated', Lang.bind(this, this.toggle));
        global.stage.add_action(gesture);
    },
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -194,7 +194,7 @@ const ModalDialog = new Lang.Class({
    },

    placeSpinner: function(layoutInfo) {
-        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
+        let spinnerIcon = global.datadir + '/theme/process-working.svg';
        this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
        this._workSpinner.actor.opacity = 0;
        this._workSpinner.actor.show();
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -273,7 +273,7 @@ const AppMenuButton = new Lang.Class({
    _onStyleChanged: function(actor) {
        let node = actor.get_theme_node();
        let [success, icon] = node.lookup_url('spinner-image', false);
-        if (!success || (this._spinnerIcon && this._spinnerIcon.equal(icon)))
+        if (!success || this._spinnerIcon == icon)
            return;
        this._spinnerIcon = icon;
        this._spinner = new Animation.AnimatedIcon(this._spinnerIcon, PANEL_ICON_SIZE);
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -85,8 +85,7 @@ const Clock = new Lang.Class({
        let date = new Date();
        /* Translators: This is a time format for a date in
           long format */
-        let dateFormat = Shell.util_translate_time_string("%A, %B %d");
-        this._date.text = date.toLocaleFormat(dateFormat);
+        this._date.text = date.toLocaleFormat(_("%A, %B %d"));
    },

    destroy: function() {
@ -302,7 +301,8 @@ const NotificationsBox = new Lang.Class({
                             });

            this._updateVisibility();
-            this.emit('wake-up-screen');
+            if (obj.sourceBox.visible)
+                this.emit('wake-up-screen');
        }
    },

--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@ -197,7 +197,7 @@ const Slider = new Lang.Class({
            let [dx, dy] = event.get_scroll_delta();
            // Even though the slider is horizontal, use dy to match
            // the UP/DOWN above.
-            delta = -dy / 10;
+            delta = -dy * SLIDER_SCROLL_STEP;
        }

        this._value = Math.min(Math.max(0, this._value + delta), 1);
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -876,8 +876,7 @@ const NMWirelessDialog = new Lang.Class({
                                                 x_align: Clutter.ActorAlign.CENTER,
                                                 y_align: Clutter.ActorAlign.CENTER });

-        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
-        this._noNetworksSpinner = new Animation.AnimatedIcon(file, 24, 24);
+        this._noNetworksSpinner = new Animation.AnimatedIcon(global.datadir + '/theme/process-working.svg', 24, 24);
        this._noNetworksBox.add_actor(this._noNetworksSpinner.actor);
        this._noNetworksBox.add_actor(new St.Label({ style_class: 'no-networks-label',
                                                     text: _("No Networks") }));
@ -1867,7 +1866,7 @@ const NMApplet = new Lang.Class({
    _connectionRemoved: function(connection) {
        let pos = this._connections.indexOf(connection);
        if (pos != -1)
-            this._connections.splice(connection, 1);
+            this._connections.splice(pos, 1);

        let section = connection._section;

--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@ -285,7 +285,7 @@ const Indicator = new Lang.Class({
        let disabled = Main.sessionMode.isLocked ||
                       (Main.sessionMode.isGreeter &&
                        this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
-        this._suspendAction.visible = this._haveShutdown && !disabled;
+        this._suspendAction.visible = this._haveSuspend && !disabled;
        this._updateActionsVisibility();
    },

--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@ -6,6 +6,7 @@ const Clutter = imports.gi.Clutter;
 const AccountsService = imports.gi.AccountsService;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const St = imports.gi.St;

@ -117,6 +118,7 @@ const UserWidgetLabel = new Lang.Class({
            this._currentLabel = this._realNameLabel;
        else
            this._currentLabel = this._userNameLabel;
+        this.label_actor = this._currentLabel;

        let childBox = new Clutter.ActorBox();
        childBox.x1 = 0;
@ -158,6 +160,9 @@ const UserWidget = new Lang.Class({
        this._label = new UserWidgetLabel(user);
        this.actor.add_child(this._label);

+        this._label.bind_property('label-actor', this.actor, 'label-actor',
+                                  GObject.BindingFlags.SYNC_CREATE);
+
        this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUser));
        this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUser));
        this._updateUser();
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -65,7 +65,8 @@ const ShowOverviewAction = new Lang.Class({
    },

    vfunc_gesture_prepare : function(action, actor) {
-        return this.get_n_current_points() == this.get_n_touch_points();
+        return Main.keybindingMode == Shell.KeyBindingMode.NORMAL &&
+               this.get_n_current_points() == this.get_n_touch_points();
    },

    _getBoundingRect : function(motion) {
@ -193,8 +194,10 @@ const ViewSelector = new Lang.Class({
                // the windows to animate, but now we no longer want to
                // show it given that we are now on the apps page or
                // search page.
-                if (this._activePage != this._workspacesPage)
+                if (this._activePage != this._workspacesPage) {
                    this._workspacesPage.opacity = 0;
+                    this._workspacesPage.hide();
+                }
            }));

        Main.wm.addKeybinding('toggle-application-view',
@ -211,9 +214,13 @@ const ViewSelector = new Lang.Class({
                              Shell.KeyBindingMode.OVERVIEW,
                              Lang.bind(Main.overview, Main.overview.toggle));

-        let gesture;
-
-        gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT);
+        let side;
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+            side = St.Side.RIGHT;
+        else
+            side = St.Side.LEFT;
+        let gesture = new EdgeDragAction.EdgeDragAction(side,
+                                                        Shell.KeyBindingMode.NORMAL);
        gesture.connect('activated', Lang.bind(this, function() {
            if (Main.overview.visible)
                Main.overview.hide();
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -478,7 +478,9 @@ const WorkspaceSwitchAction = new Lang.Class({
    },

    vfunc_gesture_prepare : function(action, actor) {
-        return this.get_n_current_points() == this.get_n_touch_points();
+        let allowedModes = Shell.KeyBindingMode.NORMAL | Shell.KeyBindingMode.OVERVIEW;
+        return this.get_n_current_points() == this.get_n_touch_points() &&
+               (allowedModes & Main.keybindingMode);
    },

    vfunc_gesture_end : function(action, actor) {
@ -526,7 +528,7 @@ const AppSwitchAction = new Lang.Class({
    },

    vfunc_gesture_prepare : function(action, actor) {
-        if (Main.overview.visible) {
+        if (Main.keybindingMode != Shell.KeyBindingMode.NORMAL) {
            this.cancel();
            return false;
        }
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -156,7 +156,6 @@ const WindowClone = new Lang.Class({
        this.actor.add_action(clickAction);
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPress));
-        this.actor.connect('enter-event', Lang.bind(this, this._onEnter));

        this._draggable = DND.makeDraggable(this.actor,
                                            { restoreOnSuccess: true,
@ -353,10 +352,6 @@ const WindowClone = new Lang.Class({
        return false;
    },

-    _onEnter: function() {
-        this.actor.grab_key_focus();
-    },
-
    _onClicked: function(action, actor) {
        this._activate();
    },
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -538,6 +538,7 @@ const WorkspacesDisplay = new Lang.Class({
        for (let i = 0; i < this._workspacesViews.length; i++)
            this._workspacesViews[i].destroy();

+        this._primaryIndex = Main.layoutManager.primaryIndex;
        this._workspacesViews = [];
        let monitors = Main.layoutManager.monitors;
        for (let i = 0; i < monitors.length; i++) {
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -7,6 +7,7 @@ be
 bg
 bn
 bn_IN
+bs
 ca
 ca@valencia
 cs
@ -68,7 +69,6 @@ th
 tr
 ug 
 uk
-uz@cyrillic
 vi
 zh_CN
 zh_HK
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@ -1,2 +1,4 @@
 data/org.gnome.shell.evolution.calendar.gschema.xml.in
 src/calendar-server/evolution-calendar.desktop.in
+# Meh, autofools :-(
+sub/src/calendar-server/evolution-calendar.desktop.in
--- a/po/bs.po
+++ b/po/bs.po
--- a/po/sl.po
+++ b/po/sl.po
@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-13 16:14+0000\n"
-"PO-Revision-Date: 2014-09-13 21:02+0100\n"
+"POT-Creation-Date: 2014-12-19 16:26+0000\n"
+"PO-Revision-Date: 2014-12-25 19:18+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: Slovenian\n"
@ -125,11 +125,11 @@ msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "App Picker View"
-msgstr ""
+msgstr "Pogled izbirnika programov"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:10
 msgid "Index of the currently selected view in the application picker."
-msgstr ""
+msgstr "Kazalo trenutno izbranega pogleda v izbirniku programa."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
@ -224,6 +224,8 @@ msgstr "Tipkovna bližnjica za prikaz dejavnega obvestila."
 msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
+"Tipkovna bližnjica,  ki omogoča ustavljanje in ponovni zagon vseh zagnanih "
+"programov  za razhroščevanje."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Which keyboard to use"
@ -242,6 +244,9 @@ msgid ""
 "If true, only applications that have windows on the current workspace are "
 "shown in the switcher. Otherwise, all applications are included."
 msgstr ""
+"Izbrana možnost določa, da bodo v trenutnem pogledu prikazana le okna, ki so "
+"v izbrani delovni površini v preklopniku. V nasprotnem primeru so prikazana "
+"vsa okna."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid "The application icon mode."
@ -262,6 +267,8 @@ msgid ""
 "If true, only windows from the current workspace are shown in the switcher. "
 "Otherwise, all windows are included."
 msgstr ""
+"Izbrana možnost določa, da bodo v trenutnem pogledu prikazana le okna v "
+"preklopniku. V nasprotnem primeru so prikazana vsa okna."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "Attach modal dialog to the parent window"
@ -293,7 +300,7 @@ msgstr ""

 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
 msgid "Captive Portal"
-msgstr ""
+msgstr "Združen pogled"

 #: ../js/extensionPrefs/main.js:123
 #, javascript-format
@ -304,54 +311,54 @@ msgstr "Prišlo je do napake med nalaganjem pogovornega okna z možnosti za %s:"
 msgid "GNOME Shell Extensions"
 msgstr "Razširitve lupine Gnome"

-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
+#: ../js/gdm/authPrompt.js:146 ../js/ui/components/networkAgent.js:143
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/network.js:915
 msgid "Cancel"
 msgstr "Prekliči"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:168 ../js/gdm/authPrompt.js:216
 msgid "Next"
 msgstr "Naslednji"

-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:212 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Odkleni"

-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:214
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prijava"

-#: ../js/gdm/loginDialog.js:269
+#: ../js/gdm/loginDialog.js:275
 msgid "Choose Session"
 msgstr "Izbor seje"

-#: ../js/gdm/loginDialog.js:429
+#: ../js/gdm/loginDialog.js:434
 msgid "Not listed?"
 msgstr "Ali je ni na seznamu?"

-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:619
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(na primer, uporabnika ali %s)"

-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:624 ../js/ui/components/networkAgent.js:269
 #: ../js/ui/components/networkAgent.js:287
 msgid "Username: "
 msgstr "Uporabniško ime: "

-#: ../js/gdm/loginDialog.js:922
+#: ../js/gdm/loginDialog.js:955
 msgid "Login Window"
 msgstr "Prijavno okno"

-#: ../js/gdm/util.js:323
+#: ../js/gdm/util.js:341
 msgid "Authentication error"
 msgstr "Napaka overitve"

-#: ../js/gdm/util.js:453
+#: ../js/gdm/util.js:473
 msgid "(or swipe finger)"
 msgstr "(ali pa povlecite prst)"

@ -384,28 +391,28 @@ msgstr "Pogosto"
 msgid "All"
 msgstr "Vse"

-#: ../js/ui/appDisplay.js:1789
+#: ../js/ui/appDisplay.js:1791
 msgid "New Window"
 msgstr "Novo okno"

-#: ../js/ui/appDisplay.js:1815 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1817 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Odstrani iz priljubljenih"

-#: ../js/ui/appDisplay.js:1821
+#: ../js/ui/appDisplay.js:1823
 msgid "Add to Favorites"
 msgstr "Dodaj med priljubljene"

-#: ../js/ui/appDisplay.js:1830
+#: ../js/ui/appDisplay.js:1832
 msgid "Show Details"
 msgstr "Pokaži besedilo"

-#: ../js/ui/appFavorites.js:124
+#: ../js/ui/appFavorites.js:132
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "Program \"%s\" je dodan med priljubljeno."

-#: ../js/ui/appFavorites.js:158
+#: ../js/ui/appFavorites.js:166
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "Program \"%s\" je odstranjen iz priljubljenih."
@ -422,14 +429,14 @@ msgstr "Spremeni ozadje ..."
 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
 #. */
-#: ../js/ui/calendar.js:67
+#: ../js/ui/calendar.js:70
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Celodnevno"

 #. Translators: Shown in calendar event list, if 24h format,
 #. \u2236 is a ratio character, similar to : */
-#: ../js/ui/calendar.js:73
+#: ../js/ui/calendar.js:77
 msgctxt "event list time"
 msgid "%H∶%M"
 msgstr "%H∶%M"
@ -437,7 +444,7 @@ msgstr "%H∶%M"
 #. Translators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space */
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:86
 msgctxt "event list time"
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
@ -447,43 +454,43 @@ msgstr "%l∶%M %p"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #. */
-#: ../js/ui/calendar.js:113
+#: ../js/ui/calendar.js:100
 msgctxt "grid sunday"
 msgid "S"
 msgstr "N"

 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:115
+#: ../js/ui/calendar.js:102
 msgctxt "grid monday"
 msgid "M"
 msgstr "P"

 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:117
+#: ../js/ui/calendar.js:104
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "T"

 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:119
+#: ../js/ui/calendar.js:106
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "S"

 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:121
+#: ../js/ui/calendar.js:108
 msgctxt "grid thursday"
 msgid "T"
 msgstr "Č"

 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:123
+#: ../js/ui/calendar.js:110
 msgctxt "grid friday"
 msgid "F"
 msgstr "P"

 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:125
+#: ../js/ui/calendar.js:112
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
@ -494,85 +501,85 @@ msgstr "S"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #. */
-#: ../js/ui/calendar.js:138
+#: ../js/ui/calendar.js:125
 msgctxt "list sunday"
 msgid "Su"
 msgstr "Ne"

 #. Translators: Event list abbreviation for Monday */
-#: ../js/ui/calendar.js:140
+#: ../js/ui/calendar.js:127
 msgctxt "list monday"
 msgid "M"
 msgstr "P"

 #. Translators: Event list abbreviation for Tuesday */
-#: ../js/ui/calendar.js:142
+#: ../js/ui/calendar.js:129
 msgctxt "list tuesday"
 msgid "T"
 msgstr "T"

 #. Translators: Event list abbreviation for Wednesday */
-#: ../js/ui/calendar.js:144
+#: ../js/ui/calendar.js:131
 msgctxt "list wednesday"
 msgid "W"
 msgstr "S"

 #. Translators: Event list abbreviation for Thursday */
-#: ../js/ui/calendar.js:146
+#: ../js/ui/calendar.js:133
 msgctxt "list thursday"
 msgid "Th"
 msgstr "Če"

 #. Translators: Event list abbreviation for Friday */
-#: ../js/ui/calendar.js:148
+#: ../js/ui/calendar.js:135
 msgctxt "list friday"
 msgid "F"
 msgstr "Pe"

 #. Translators: Event list abbreviation for Saturday */
-#: ../js/ui/calendar.js:150
+#: ../js/ui/calendar.js:137
 msgctxt "list saturday"
 msgid "S"
 msgstr "S"

-#: ../js/ui/calendar.js:453
+#: ../js/ui/calendar.js:462
 msgid "Previous month"
 msgstr "Predhodni mesec"

-#: ../js/ui/calendar.js:463
+#: ../js/ui/calendar.js:472
 msgid "Next month"
 msgstr "Naslednji mesec"

 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:810
 msgid "Nothing Scheduled"
 msgstr "Nič ni razporejeno"

 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:799
+#: ../js/ui/calendar.js:826
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d. %m."

 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:802
+#: ../js/ui/calendar.js:829
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"

-#: ../js/ui/calendar.js:813
+#: ../js/ui/calendar.js:839
 msgid "Today"
 msgstr "Danes"

-#: ../js/ui/calendar.js:817
+#: ../js/ui/calendar.js:843
 msgid "Tomorrow"
 msgstr "Jutri"

-#: ../js/ui/calendar.js:828
+#: ../js/ui/calendar.js:854
 msgid "This week"
 msgstr "Ta teden"

-#: ../js/ui/calendar.js:836
+#: ../js/ui/calendar.js:862
 msgid "Next week"
 msgstr "Naslednji teden"

@ -972,7 +979,7 @@ msgstr "Poglej račun"
 msgid "Unknown reason"
 msgstr "Neznan vzrok"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:154
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:155
 msgid "Windows"
 msgstr "Okna"

@ -984,22 +991,22 @@ msgstr "Pokaži programe"
 msgid "Dash"
 msgstr "Pregledna plošča"

-#: ../js/ui/dateMenu.js:96
+#: ../js/ui/dateMenu.js:97
 msgid "Open Calendar"
 msgstr "Odpri koledar"

-#: ../js/ui/dateMenu.js:100
+#: ../js/ui/dateMenu.js:101
 msgid "Open Clocks"
 msgstr "Odpri ure"

-#: ../js/ui/dateMenu.js:107
+#: ../js/ui/dateMenu.js:108
 msgid "Date & Time Settings"
 msgstr "Nastavitve časa in datuma"

 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #. */
-#: ../js/ui/dateMenu.js:204
+#: ../js/ui/dateMenu.js:132
 msgid "%A %B %e, %Y"
 msgstr "%a, %e. %b., %R"

@ -1155,7 +1162,7 @@ msgstr "Namesti"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Prejmi in namesti “%s” preko povezave na extensions.gnome.org?"

-#: ../js/ui/keyboard.js:692 ../js/ui/status/keyboard.js:523
+#: ../js/ui/keyboard.js:700 ../js/ui/status/keyboard.js:535
 msgid "Keyboard"
 msgstr "Tipkovnica"

@ -1211,48 +1218,40 @@ msgstr "Poglej vir"
 msgid "Web Page"
 msgstr "Spletna stran"

-#: ../js/ui/messageTray.js:1326
+#: ../js/ui/messageTray.js:1332
 msgid "Open"
 msgstr "Odpri"

-#: ../js/ui/messageTray.js:1333
+#: ../js/ui/messageTray.js:1339
 msgid "Remove"
 msgstr "Odstrani"

-#: ../js/ui/messageTray.js:1630
+#: ../js/ui/messageTray.js:1636
 msgid "Notifications"
 msgstr "Obvestila"

-#: ../js/ui/messageTray.js:1637
+#: ../js/ui/messageTray.js:1643
 msgid "Clear Messages"
 msgstr "Počisti sporočila"

-#: ../js/ui/messageTray.js:1656
+#: ../js/ui/messageTray.js:1662
 msgid "Notification Settings"
 msgstr "Nastavitve obvestil"

-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1715
 msgid "Tray Menu"
 msgstr "Meni sistemske vrstice"

-#: ../js/ui/messageTray.js:1926
+#: ../js/ui/messageTray.js:1939
 msgid "No Messages"
 msgstr "Ni sporočil"

-#: ../js/ui/messageTray.js:1968
+#: ../js/ui/messageTray.js:1986
 msgid "Message Tray"
 msgstr "Sporočilna vrstica"

-#: ../js/ui/messageTray.js:2971
-msgid "System Information"
-msgstr "Podrobnosti sistema"
-
-#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
-msgctxt "program"
-msgid "Unknown"
-msgstr "Neznano"
-
-#: ../js/ui/overviewControls.js:482 ../js/ui/screenShield.js:151
+#: ../js/ui/messageTray.js:2443 ../js/ui/overviewControls.js:483
+#: ../js/ui/screenShield.js:151
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1261,6 +1260,15 @@ msgstr[1] "%d novo sporočilo"
 msgstr[2] "%d novi sporočili"
 msgstr[3] "%d nova sporočila"

+#: ../js/ui/messageTray.js:3013
+msgid "System Information"
+msgstr "Podrobnosti sistema"
+
+#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
+msgctxt "program"
+msgid "Unknown"
+msgstr "Neznano"
+
 #: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Razveljavi"
@ -1330,19 +1338,19 @@ msgstr "Zakleni"
 msgid "GNOME needs to lock the screen"
 msgstr "Zakleniti je treba zaslon"

-#: ../js/ui/screenShield.js:833 ../js/ui/screenShield.js:1304
+#: ../js/ui/screenShield.js:833 ../js/ui/screenShield.js:1309
 msgid "Unable to lock"
 msgstr "Zaklep ni mogoč"

-#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1305
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1310
 msgid "Lock was blocked by an application"
 msgstr "Zaklep je preprečil program"

-#: ../js/ui/search.js:594
+#: ../js/ui/search.js:611
 msgid "Searching…"
 msgstr "Iskanje ..."

-#: ../js/ui/search.js:596
+#: ../js/ui/search.js:613
 msgid "No results."
 msgstr "Ni najdenih zadetkov."

@ -1446,7 +1454,7 @@ msgstr "Ni vzpostavljene povezave"
 msgid "Brightness"
 msgstr "Svetlost"

-#: ../js/ui/status/keyboard.js:547
+#: ../js/ui/status/keyboard.js:559
 msgid "Show Keyboard Layout"
 msgstr "Pokaži razporeditev tipkovnice"

@ -1701,11 +1709,11 @@ msgstr "Prijava kot drug uporabnik"
 msgid "Unlock Window"
 msgstr "Odkleni okno"

-#: ../js/ui/viewSelector.js:158
+#: ../js/ui/viewSelector.js:159
 msgid "Applications"
 msgstr "Programi"

-#: ../js/ui/viewSelector.js:162
+#: ../js/ui/viewSelector.js:163
 msgid "Search"
 msgstr "Poišči"

--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
--- a/src/calendar-server/calendar-sources.c
+++ b/src/calendar-server/calendar-sources.c
@ -176,18 +176,54 @@ static void
 calendar_sources_init (CalendarSources *sources)
 {
  GError *error = NULL;
+  GDBusConnection *session_bus;
+  GVariant *result;

  sources->priv = CALENDAR_SOURCES_GET_PRIVATE (sources);

-  /* XXX Not sure what to do if this fails.
-   *     Should this class implement GInitable or pass the
-   *     registry in as a G_PARAM_CONSTRUCT_ONLY property? */
-  sources->priv->registry = e_source_registry_new_sync (NULL, &error);
+  /* WORKAROUND: the hardcoded timeout for e_source_registry_new_sync()
+     (and other library calls that eventually call g_dbus_proxy_new[_sync]())
+     is 25 seconds. This has been shown to be too small for
+     evolution-source-registry in certain cases (slow disk, concurrent IO,
+     many configured sources), so we first ensure that the service
+     starts with a manual call and a higher timeout.
+
+     HACK: every time the DBus API is bumped in e-d-s we need
+     to update this!
+  */
+  session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+  if (session_bus == NULL)
+    {
+      g_error ("Failed to connect to the session bus: %s", error->message);
+    }
+
+  result = g_dbus_connection_call_sync (session_bus, "org.freedesktop.DBus",
+                                        "/", "org.freedesktop.DBus",
+                                        "StartServiceByName",
+                                        g_variant_new ("(su)",
+                                                       "org.gnome.evolution.dataserver.Sources3",
+                                                       0),
+                                        NULL,
+                                        G_DBUS_CALL_FLAGS_NONE,
+                                        60 * 1000,
+                                        NULL, &error);
+  if (result != NULL)
+    {
+      g_variant_unref (result);
+      sources->priv->registry = e_source_registry_new_sync (NULL, &error);
+    }
+
  if (error != NULL)
    {
-      g_error ("%s: %s", G_STRFUNC, error->message);
+      /* Any error is fatal, but we don't want to crash gnome-shell-calendar-server
+         because of e-d-s problems. So just exit here.
+      */
+      g_warning ("Failed to start evolution-source-registry: %s", error->message);
+      exit(EXIT_FAILURE);
    }

+  g_object_unref (session_bus);
+
  sources->priv->source_added_id   = g_signal_connect (sources->priv->registry,
                                                       "source-added",
                                                       G_CALLBACK (calendar_sources_registry_source_changed_cb),
--- a/src/shell-global.c
+++ b/src/shell-global.c
@ -1132,6 +1132,14 @@ shell_global_end_modal (ShellGlobal *global,
  sync_input_region (global);
 }

+void
+shell_global_freeze_keyboard (ShellGlobal *global,
+                              guint32      timestamp)
+{
+  if (global->stage_xwindow != None)
+    meta_display_freeze_keyboard (global->meta_display, global->stage_xwindow, timestamp);
+}
+
 /* Code to close all file descriptors before we exec; copied from gspawn.c in GLib.
 *
 * Authors: Padraig O'Briain, Matthias Clasen, Lennart Poettering
--- a/src/shell-global.h
+++ b/src/shell-global.h
@ -45,6 +45,8 @@ gboolean shell_global_begin_modal            (ShellGlobal         *global,
                                              MetaModalOptions    options);
 void     shell_global_end_modal              (ShellGlobal         *global,
                                              guint32              timestamp);
+void     shell_global_freeze_keyboard        (ShellGlobal         *global,
+                                              guint32              timestamp);

 void     shell_global_set_stage_input_region (ShellGlobal         *global,
                                              GSList              *rectangles);
--- a/src/shell-util.c
+++ b/src/shell-util.c
@ -5,6 +5,9 @@
 #include <sys/types.h>
 #include <sys/wait.h>

+#include <GL/gl.h>
+#include <cogl/cogl.h>
+
 #include "shell-util.h"
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
@ -12,7 +15,6 @@
 #include <gdk/gdkx.h>
 #include <X11/extensions/XTest.h>

-#include <locale.h>
 #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
 #include <langinfo.h>
 #endif
@ -209,32 +211,6 @@ shell_util_get_week_start ()
  return week_start;
 }

-/**
- * shell_util_translate_time_string:
- * @str: String to translate
- *
- * Translate @str according to the locale defined by LC_TIME; unlike
- * dcgettext(), the translations is still taken from the LC_MESSAGES
- * catalogue and not the LC_TIME one.
- *
- * Returns: the translated string
- */
-const char *
-shell_util_translate_time_string (const char *str)
-{
-  const char *locale = g_getenv ("LC_TIME");
-  const char *res;
-
-  if (locale)
-    setlocale (LC_MESSAGES, locale);
-
-  res = gettext (str);
-
-  setlocale (LC_MESSAGES, "");
-
-  return res;
-}
-
 /**
 * shell_write_string_to_stream:
 * @stream: a #GOutputStream
@ -357,3 +333,33 @@ shell_util_cursor_tracker_to_clutter (MetaCursorTracker *tracker,
      clutter_actor_hide (CLUTTER_ACTOR (texture));
    }
 }
+
+typedef const gchar *(*ShellGLGetString) (GLenum);
+
+static const gchar *
+get_gl_vendor (void)
+{
+  static const gchar *vendor = NULL;
+
+  if (!vendor)
+    {
+      ShellGLGetString gl_get_string;
+      gl_get_string = (ShellGLGetString) cogl_get_proc_address ("glGetString");
+      if (gl_get_string)
+        vendor = gl_get_string (GL_VENDOR);
+    }
+
+  return vendor;
+}
+
+gboolean
+shell_util_need_background_refresh (void)
+{
+  if (!clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+    return FALSE;
+
+  if (g_strcmp0 (get_gl_vendor (), "NVIDIA Corporation") == 0)
+    return TRUE;
+
+  return FALSE;
+}
--- a/src/shell-util.h
+++ b/src/shell-util.h
@ -21,7 +21,6 @@ int      shell_util_get_week_start             (void);

 char    *shell_util_format_date                (const char       *format,
                                                gint64            time_ms);
-const char *shell_util_translate_time_string   (const char *str);

 gboolean shell_write_string_to_stream          (GOutputStream    *stream,
                                                const char       *str,
@ -45,6 +44,8 @@ GdkPixbuf *shell_util_create_pixbuf_from_data (const guchar      *data,
 void    shell_util_cursor_tracker_to_clutter (MetaCursorTracker *tracker,
                                              ClutterTexture    *texture);

+gboolean shell_util_need_background_refresh (void);
+
 G_END_DECLS

 #endif /* __SHELL_UTIL_H__ */
--- a/src/st/st-border-image.c
+++ b/src/st/st-border-image.c
@ -27,7 +27,7 @@
 struct _StBorderImage {
  GObject parent;

-  GFile *file;
+  char *filename;
  int border_top;
  int border_right;
  int border_bottom;
@ -48,7 +48,7 @@ st_border_image_finalize (GObject *object)
 {
  StBorderImage *image = ST_BORDER_IMAGE (object);

-  g_object_unref (image->file);
+  g_free (image->filename);

  G_OBJECT_CLASS (st_border_image_parent_class)->finalize (object);
 }
@ -67,18 +67,18 @@ st_border_image_init (StBorderImage *image)
 }

 StBorderImage *
-st_border_image_new (GFile *file,
-                     int    border_top,
-                     int    border_right,
-                     int    border_bottom,
-                     int    border_left,
-                     int    scale_factor)
+st_border_image_new (const char *filename,
+                       int         border_top,
+                       int         border_right,
+                       int         border_bottom,
+                       int         border_left,
+                       int         scale_factor)
 {
  StBorderImage *image;

  image = g_object_new (ST_TYPE_BORDER_IMAGE, NULL);

-  image->file = g_object_ref (file);
+  image->filename = g_strdup (filename);
  image->border_top = border_top;
  image->border_right = border_right;
  image->border_bottom = border_bottom;
@ -88,18 +88,12 @@ st_border_image_new (GFile *file,
  return image;
 }

-/**
- * st_border_image_get_file:
- * @image: a #StBorder_Image
- *
- * Returns: (transfer none): the #GFile for the #StBorder_Image
- */
-GFile *
-st_border_image_get_file (StBorderImage *image)
+const char *
+st_border_image_get_filename (StBorderImage *image)
 {
  g_return_val_if_fail (ST_IS_BORDER_IMAGE (image), NULL);

-  return image->file;
+  return image->filename;
 }

 void
@ -141,5 +135,5 @@ st_border_image_equal (StBorderImage *image,
          image->border_right == other->border_right &&
          image->border_bottom == other->border_bottom &&
          image->border_left == other->border_left &&
-          g_file_equal (image->file, other->file));
+          strcmp (image->filename, other->filename) == 0);
 }
--- a/src/st/st-border-image.h
+++ b/src/st/st-border-image.h
@ -22,7 +22,6 @@
 #define __ST_BORDER_IMAGE_H__

 #include <glib-object.h>
-#include <gio/gio.h>

 G_BEGIN_DECLS

@ -40,14 +39,14 @@ typedef struct _StBorderImageClass StBorderImageClass;

 GType             st_border_image_get_type          (void) G_GNUC_CONST;

-StBorderImage *st_border_image_new (GFile      *file,
+StBorderImage *st_border_image_new (const char *filename,
                                    int         border_top,
                                    int         border_right,
                                    int         border_bottom,
                                    int         border_left,
                                    int         scale_factor);

-GFile      *st_border_image_get_file     (StBorderImage *image);
+const char *st_border_image_get_filename (StBorderImage *image);
 void        st_border_image_get_borders  (StBorderImage *image,
                                          int           *border_top,
                                          int           *border_right,
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@ -373,7 +373,6 @@ st_scroll_view_get_preferred_width (ClutterActor *actor,
      break;
    case GTK_POLICY_ALWAYS:
    case GTK_POLICY_AUTOMATIC:
-    case GTK_POLICY_EXTERNAL:
      /* Should theoretically use the min width of the hscrollbar,
       * but that's not cleanly defined at the moment */
      min_width = 0;
@ -383,7 +382,6 @@ st_scroll_view_get_preferred_width (ClutterActor *actor,
  switch (priv->vscrollbar_policy)
    {
    case GTK_POLICY_NEVER:
-    case GTK_POLICY_EXTERNAL:
      account_for_vscrollbar = FALSE;
      break;
    case GTK_POLICY_ALWAYS:
@ -445,7 +443,6 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
  switch (priv->vscrollbar_policy)
    {
    case GTK_POLICY_NEVER:
-    case GTK_POLICY_EXTERNAL:
      break;
    case GTK_POLICY_ALWAYS:
    case GTK_POLICY_AUTOMATIC:
@ -457,7 +454,6 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
  switch (priv->hscrollbar_policy)
    {
    case GTK_POLICY_NEVER:
-    case GTK_POLICY_EXTERNAL:
      account_for_hscrollbar = FALSE;
      break;
    case GTK_POLICY_ALWAYS:
@ -484,7 +480,6 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
      break;
    case GTK_POLICY_ALWAYS:
    case GTK_POLICY_AUTOMATIC:
-    case GTK_POLICY_EXTERNAL:
      /* Should theoretically use the min height of the vscrollbar,
       * but that's not cleanly defined at the moment */
      min_height = 0;
@ -572,7 +567,7 @@ st_scroll_view_allocate (ClutterActor          *actor,
            }
          else
            {
-              hscrollbar_visible = priv->hscrollbar_policy == GTK_POLICY_ALWAYS;
+              hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;

              /* try without a vertical scrollbar */
              clutter_actor_get_preferred_height (priv->child, avail_width, &child_min_height, NULL);
@ -581,20 +576,18 @@ st_scroll_view_allocate (ClutterActor          *actor,
        }
      else
        {
-          vscrollbar_visible = priv->vscrollbar_policy == GTK_POLICY_ALWAYS;
+          vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER;

          if (priv->hscrollbar_policy == GTK_POLICY_AUTOMATIC)
            hscrollbar_visible = child_min_width > avail_height - (vscrollbar_visible ? 0 : sb_width);
          else
-            hscrollbar_visible = priv->hscrollbar_policy == GTK_POLICY_ALWAYS;
+            hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;
        }
    }
  else
    {
-      hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER &&
-                           priv->hscrollbar_policy != GTK_POLICY_EXTERNAL;
-      vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER &&
-                           priv->vscrollbar_policy != GTK_POLICY_EXTERNAL;
+      hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;
+      vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER;
    }

  /* Whether or not we show the scrollbars, if the scrollbars are visible
@ -636,19 +629,15 @@ st_scroll_view_allocate (ClutterActor          *actor,

  clutter_actor_allocate (priv->hscroll, &child_box, flags);

-  /* In case the scrollbar policy is NEVER or EXTERNAL or scrollbars
-   * should be overlayed, we don't trim the content box allocation by
-   * the scrollbar size.
+  /* In case the scrollbar policy is NEVER or scrollbars should be
+   * overlayed, we don't trim the content box allocation by the
+   * scrollbar size.
   * Fold this into the scrollbar sizes to simplify the rest of the
   * computations.
   */
-  if (priv->hscrollbar_policy == GTK_POLICY_NEVER ||
-      priv->hscrollbar_policy == GTK_POLICY_EXTERNAL ||
-      priv->overlay_scrollbars)
+  if (priv->hscrollbar_policy == GTK_POLICY_NEVER || priv->overlay_scrollbars)
    sb_height = 0;
-  if (priv->vscrollbar_policy == GTK_POLICY_NEVER ||
-      priv->vscrollbar_policy == GTK_POLICY_EXTERNAL ||
-      priv->overlay_scrollbars)
+  if (priv->vscrollbar_policy == GTK_POLICY_NEVER || priv->overlay_scrollbars)
    sb_width = 0;

  /* Child */
--- a/src/st/st-texture-cache.c
+++ b/src/st/st-texture-cache.c
@ -28,8 +28,8 @@
 #include <glib.h>

 #define CACHE_PREFIX_ICON "icon:"
-#define CACHE_PREFIX_FILE "file:"
-#define CACHE_PREFIX_FILE_FOR_CAIRO "file-for-cairo:"
+#define CACHE_PREFIX_URI "uri:"
+#define CACHE_PREFIX_URI_FOR_CAIRO "uri-for-cairo:"

 struct _StTextureCachePrivate
 {
@ -101,7 +101,7 @@ st_texture_cache_class_init (StTextureCacheClass *klass)
                  G_SIGNAL_RUN_LAST,
                  0, /* no default handler slot */
                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, G_TYPE_FILE);
+                  G_TYPE_NONE, 1, G_TYPE_STRING);
 }

 /* Evicts all cached textures for named icons */
@ -147,7 +147,7 @@ st_texture_cache_init (StTextureCache *self)
                                                   g_free, cogl_object_unref);
  self->priv->outstanding_requests = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                            g_free, NULL);
-  self->priv->file_monitors = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
+  self->priv->file_monitors = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                     g_object_unref, g_object_unref);

 }
@ -268,7 +268,7 @@ typedef struct {

  GtkIconInfo *icon_info;
  StIconColors *colors;
-  GFile *file;
+  char *uri;
 } AsyncTextureLoadData;

 static void
@ -282,8 +282,8 @@ texture_load_data_free (gpointer p)
      if (data->colors)
        st_icon_colors_unref (data->colors);
    }
-  else if (data->file)
-    g_object_unref (data->file);
+  else if (data->uri)
+    g_free (data->uri);

  if (data->key)
    g_free (data->key);
@ -405,17 +405,83 @@ out:
  return rotated_pixbuf;
 }

+static GdkPixbuf*
+decode_image (const char *val)
+{
+  int i;
+  GError *error = NULL;
+  GdkPixbuf *res = NULL;
+  struct {
+    const char *prefix;
+    const char *mime_type;
+  } formats[] = {
+    { "data:image/x-icon;base64,", "image/x-icon" },
+    { "data:image/png;base64,", "image/png" }
+  };
+
+  g_return_val_if_fail (val, NULL);
+
+  for (i = 0; i < G_N_ELEMENTS (formats); i++)
+    {
+      if (g_str_has_prefix (val, formats[i].prefix))
+        {
+          gsize len;
+          guchar *data = NULL;
+          char *unescaped;
+
+          unescaped = g_uri_unescape_string (val + strlen (formats[i].prefix), NULL);
+          if (unescaped)
+            {
+              data = g_base64_decode (unescaped, &len);
+              g_free (unescaped);
+            }
+
+          if (data)
+            {
+              GdkPixbufLoader *loader;
+
+              loader = gdk_pixbuf_loader_new_with_mime_type (formats[i].mime_type, &error);
+              if (loader &&
+                  gdk_pixbuf_loader_write (loader, data, len, &error) &&
+                  gdk_pixbuf_loader_close (loader, &error))
+                {
+                  res = gdk_pixbuf_loader_get_pixbuf (loader);
+                  g_object_ref (res);
+                }
+              g_object_unref (loader);
+              g_free (data);
+            }
+        }
+    }
+  if (!res)
+    {
+      if (error)
+        {
+          g_warning ("%s\n", error->message);
+          g_error_free (error);
+        }
+      else
+        g_warning ("incorrect data uri");
+    }
+  return res;
+}
+
 static GdkPixbuf *
-impl_load_pixbuf_file (GFile          *file,
+impl_load_pixbuf_file (const char     *uri,
                       int             available_width,
                       int             available_height,
                       int             scale,
                       GError        **error)
 {
  GdkPixbuf *pixbuf = NULL;
+  GFile *file;
  char *contents = NULL;
  gsize size;

+  if (g_str_has_prefix (uri, "data:"))
+    return decode_image (uri);
+
+  file = g_file_new_for_uri (uri);
  if (g_file_load_contents (file, NULL, &contents, &size, NULL, error))
    {
      pixbuf = impl_load_pixbuf_data ((const guchar *) contents, size,
@ -424,6 +490,7 @@ impl_load_pixbuf_file (GFile          *file,
                                      error);
    }

+  g_object_unref (file);
  g_free (contents);

  return pixbuf;
@ -440,9 +507,9 @@ load_pixbuf_thread (GSimpleAsyncResult *result,

  data = g_async_result_get_user_data (G_ASYNC_RESULT (result));
  g_assert (data != NULL);
-  g_assert (data->file != NULL);
+  g_assert (data->uri != NULL);

-  pixbuf = impl_load_pixbuf_file (data->file, data->width, data->height, data->scale, &error);
+  pixbuf = impl_load_pixbuf_file (data->uri, data->width, data->height, data->scale, &error);

  if (error != NULL)
    {
@ -580,7 +647,7 @@ static void
 load_texture_async (StTextureCache       *cache,
                    AsyncTextureLoadData *data)
 {
-  if (data->file)
+  if (data->uri)
    {
      GSimpleAsyncResult *result;
      result = g_simple_async_result_new (G_OBJECT (cache), on_pixbuf_loaded, data, load_texture_async);
@ -947,43 +1014,46 @@ file_changed_cb (GFileMonitor      *monitor,
                 gpointer           user_data)
 {
  StTextureCache *cache = user_data;
-  char *key;
-  guint file_hash;
+  char *uri, *key;

  if (event_type != G_FILE_MONITOR_EVENT_CHANGED)
    return;

-  file_hash = g_file_hash (file);
+  uri = g_file_get_uri (file);

-  key = g_strdup_printf (CACHE_PREFIX_FILE "%u", file_hash);
+  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
  g_hash_table_remove (cache->priv->keyed_cache, key);
  g_free (key);

-  key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", file_hash);
+  key = g_strconcat (CACHE_PREFIX_URI_FOR_CAIRO, uri, NULL);
  g_hash_table_remove (cache->priv->keyed_cache, key);
  g_free (key);

-  g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, file);
+  g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, uri);
+
+  g_free (uri);
 }

 static void
-ensure_monitor_for_file (StTextureCache *cache,
-                         GFile          *file)
+ensure_monitor_for_uri (StTextureCache *cache,
+                        const gchar    *uri)
 {
  StTextureCachePrivate *priv = cache->priv;
+  GFile *file = g_file_new_for_uri (uri);

-  if (g_hash_table_lookup (priv->file_monitors, file) == NULL)
+  if (g_hash_table_lookup (priv->file_monitors, uri) == NULL)
    {
      GFileMonitor *monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE,
                                                   NULL, NULL);
      g_signal_connect (monitor, "changed",
                        G_CALLBACK (file_changed_cb), cache);
-      g_hash_table_insert (priv->file_monitors, g_object_ref (file), monitor);
+      g_hash_table_insert (priv->file_monitors, g_strdup (uri), monitor);
    }
+  g_object_unref (file);
 }

 typedef struct {
-  GFile *gfile;
+  gchar *path;
  gint   grid_width, grid_height;
  gint   scale_factor;
  ClutterActor *actor;
@ -995,7 +1065,7 @@ static void
 on_data_destroy (gpointer data)
 {
  AsyncImageData *d = (AsyncImageData *)data;
-  g_object_unref (d->gfile);
+  g_free (d->path);
  g_object_unref (d->actor);
  g_free (d);
 }
@ -1068,7 +1138,7 @@ load_sliced_image (GSimpleAsyncResult *result,
  loader = gdk_pixbuf_loader_new ();
  g_signal_connect (loader, "size-prepared", G_CALLBACK (on_loader_size_prepared), data);

-  if (!g_file_load_contents (data->gfile, NULL, &buffer, &length, NULL, NULL))
+  if (!g_file_get_contents (data->path, &buffer, &length, NULL))
    goto out;

  if (!gdk_pixbuf_loader_write (loader, (const guchar *) buffer, length, NULL))
@ -1103,7 +1173,7 @@ load_sliced_image (GSimpleAsyncResult *result,
 /**
 * st_texture_cache_load_sliced_image:
 * @cache: A #StTextureCache
- * @file: A #GFile
+ * @path: Path to a filename
 * @grid_width: Width in pixels
 * @grid_height: Height in pixels
 * @scale: Scale factor of the display
@ -1119,7 +1189,7 @@ load_sliced_image (GSimpleAsyncResult *result,
 */
 ClutterActor *
 st_texture_cache_load_sliced_image (StTextureCache *cache,
-                                    GFile          *file,
+                                    const gchar    *path,
                                    gint            grid_width,
                                    gint            grid_height,
                                    gint            scale,
@ -1134,7 +1204,7 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
  data->grid_width = grid_width;
  data->grid_height = grid_height;
  data->scale_factor = scale;
-  data->gfile = g_object_ref (file);
+  data->path = g_strdup (path);
  data->actor = actor;
  data->load_callback = load_callback;
  data->load_callback_data = user_data;
@ -1151,9 +1221,9 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
 }

 /**
- * st_texture_cache_load_file_async:
+ * st_texture_cache_load_uri_async:
 * @cache: The texture cache instance
- * @file: a #GFile of the image file from which to create a pixbuf
+ * @uri: uri of the image file from which to create a pixbuf
 * @available_width: available width for the image, can be -1 if not limited
 * @available_height: available height for the image, can be -1 if not limited
 * @scale: scale factor of the display
@ -1165,18 +1235,18 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
 * Return value: (transfer none): A new #ClutterActor with no image loaded initially.
 */
 ClutterActor *
-st_texture_cache_load_file_async (StTextureCache *cache,
-                                  GFile          *file,
-                                  int             available_width,
-                                  int             available_height,
-                                  int             scale)
+st_texture_cache_load_uri_async (StTextureCache *cache,
+                                 const gchar    *uri,
+                                 int             available_width,
+                                 int             available_height,
+                                 int             scale)
 {
  ClutterActor *texture;
  AsyncTextureLoadData *request;
  StTextureCachePolicy policy;
  gchar *key;

-  key = g_strdup_printf (CACHE_PREFIX_FILE "%u", g_file_hash (file));
+  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);

  policy = ST_TEXTURE_CACHE_POLICY_NONE; /* XXX */

@ -1194,7 +1264,7 @@ st_texture_cache_load_file_async (StTextureCache *cache,
      request->cache = cache;
      /* Transfer ownership of key */
      request->key = key;
-      request->file = g_object_ref (file);
+      request->uri = g_strdup (uri);
      request->policy = policy;
      request->width = available_width;
      request->height = available_height;
@ -1203,31 +1273,31 @@ st_texture_cache_load_file_async (StTextureCache *cache,
      load_texture_async (cache, request);
    }

-  ensure_monitor_for_file (cache, file);
+  ensure_monitor_for_uri (cache, uri);

  return CLUTTER_ACTOR (texture);
 }

 static CoglTexture *
-st_texture_cache_load_file_sync_to_cogl_texture (StTextureCache *cache,
-                                                 StTextureCachePolicy policy,
-                                                 GFile          *file,
-                                                 int             available_width,
-                                                 int             available_height,
-                                                 int             scale,
-                                                 GError         **error)
+st_texture_cache_load_uri_sync_to_cogl_texture (StTextureCache *cache,
+                                                StTextureCachePolicy policy,
+                                                const gchar    *uri,
+                                                int             available_width,
+                                                int             available_height,
+                                                int             scale,
+                                                GError         **error)
 {
  CoglTexture *texdata;
  GdkPixbuf *pixbuf;
  char *key;

-  key = g_strdup_printf (CACHE_PREFIX_FILE "%u", g_file_hash (file));
+  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);

  texdata = g_hash_table_lookup (cache->priv->keyed_cache, key);

  if (texdata == NULL)
    {
-      pixbuf = impl_load_pixbuf_file (file, available_width, available_height, scale, error);
+      pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, scale, error);
      if (!pixbuf)
        goto out;

@ -1243,7 +1313,7 @@ st_texture_cache_load_file_sync_to_cogl_texture (StTextureCache *cache,
  else
    cogl_object_ref (texdata);

-  ensure_monitor_for_file (cache, file);
+  ensure_monitor_for_uri (cache, uri);

 out:
  g_free (key);
@ -1251,25 +1321,25 @@ out:
 }

 static cairo_surface_t *
-st_texture_cache_load_file_sync_to_cairo_surface (StTextureCache        *cache,
-                                                  StTextureCachePolicy   policy,
-                                                  GFile                 *file,
-                                                  int                    available_width,
-                                                  int                    available_height,
-                                                  int                    scale,
-                                                  GError               **error)
+st_texture_cache_load_uri_sync_to_cairo_surface (StTextureCache        *cache,
+                                                 StTextureCachePolicy   policy,
+                                                 const gchar           *uri,
+                                                 int                    available_width,
+                                                 int                    available_height,
+                                                 int                    scale,
+                                                 GError               **error)
 {
  cairo_surface_t *surface;
  GdkPixbuf *pixbuf;
  char *key;

-  key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", g_file_hash (file));
+  key = g_strconcat (CACHE_PREFIX_URI_FOR_CAIRO, uri, NULL);

  surface = g_hash_table_lookup (cache->priv->keyed_cache, key);

  if (surface == NULL)
    {
-      pixbuf = impl_load_pixbuf_file (file, available_width, available_height, scale, error);
+      pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, scale, error);
      if (!pixbuf)
        goto out;

@ -1285,7 +1355,7 @@ st_texture_cache_load_file_sync_to_cairo_surface (StTextureCache        *cache,
  else
    cairo_surface_reference (surface);

-  ensure_monitor_for_file (cache, file);
+  ensure_monitor_for_uri (cache, uri);

 out:
  g_free (key);
@ -1295,7 +1365,7 @@ out:
 /**
 * st_texture_cache_load_file_to_cogl_texture: (skip)
 * @cache: A #StTextureCache
- * @file: A #GFile in supported image format
+ * @file_path: Path to a file in supported image format
 * @scale: Scale factor of the display
 *
 * This function synchronously loads the given file path
@ -1306,30 +1376,35 @@ out:
 */
 CoglTexture *
 st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
-                                            GFile          *file,
+                                            const gchar    *file_path,
                                            gint            scale)
 {
  CoglTexture *texture;
+  GFile *file;
+  char *uri;
  GError *error = NULL;

-  texture = st_texture_cache_load_file_sync_to_cogl_texture (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
-                                                             file, -1, -1, scale, &error);
+  file = g_file_new_for_path (file_path);
+  uri = g_file_get_uri (file);
+
+  texture = st_texture_cache_load_uri_sync_to_cogl_texture (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
+                                                            uri, -1, -1, scale, &error);
+  g_object_unref (file);
+  g_free (uri);

  if (texture == NULL)
    {
-      char *uri = g_file_get_uri (file);
-      g_warning ("Failed to load %s: %s", uri, error->message);
+      g_warning ("Failed to load %s: %s", file_path, error->message);
      g_clear_error (&error);
-      g_free (uri);
+      return NULL;
    }
-
  return texture;
 }

 /**
 * st_texture_cache_load_file_to_cairo_surface:
 * @cache: A #StTextureCache
- * @file: A #GFile in supported image format
+ * @file_path: Path to a file in supported image format
 * @scale: Scale factor of the display
 *
 * This function synchronously loads the given file path
@ -1340,23 +1415,28 @@ st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
 */
 cairo_surface_t *
 st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
-                                             GFile          *file,
+                                             const gchar    *file_path,
                                             gint            scale)
 {
  cairo_surface_t *surface;
+  GFile *file;
+  char *uri;
  GError *error = NULL;

-  surface = st_texture_cache_load_file_sync_to_cairo_surface (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
-                                                              file, -1, -1, scale, &error);
+  file = g_file_new_for_path (file_path);
+  uri = g_file_get_uri (file);
+
+  surface = st_texture_cache_load_uri_sync_to_cairo_surface (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
+                                                             uri, -1, -1, scale, &error);
+  g_object_unref (file);
+  g_free (uri);

  if (surface == NULL)
    {
-      char *uri = g_file_get_uri (file);
-      g_warning ("Failed to load %s: %s", uri, error->message);
+      g_warning ("Failed to load %s: %s", file_path, error->message);
      g_clear_error (&error);
-      g_free (uri);
+      return NULL;
    }
-
  return surface;
 }

--- a/src/st/st-texture-cache.h
+++ b/src/st/st-texture-cache.h
@ -70,7 +70,7 @@ StTextureCache* st_texture_cache_get_default (void);

 ClutterActor *
 st_texture_cache_load_sliced_image (StTextureCache *cache,
-                                    GFile          *file,
+                                    const gchar    *path,
                                    gint            grid_width,
                                    gint            grid_height,
                                    gint            scale,
@ -87,18 +87,18 @@ ClutterActor *st_texture_cache_load_gicon (StTextureCache *cache,
                                           gint            size,
                                           gint            scale);

-ClutterActor *st_texture_cache_load_file_async (StTextureCache    *cache,
-                                                GFile             *file,
-                                                int                available_width,
-                                                int                available_height,
-                                                int                scale);
+ClutterActor *st_texture_cache_load_uri_async (StTextureCache    *cache,
+                                               const gchar       *uri,
+                                               int                available_width,
+                                               int                available_height,
+                                               int                scale);

 CoglTexture     *st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
-                                                             GFile          *file,
+                                                             const gchar    *file_path,
                                                             gint            scale);

 cairo_surface_t *st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
-                                                              GFile          *file,
+                                                              const gchar    *file_path,
                                                              gint            scale);

 /**
--- a/src/st/st-theme-node-drawing.c
+++ b/src/st/st-theme-node-drawing.c
@ -600,7 +600,7 @@ create_cairo_pattern_of_background_image (StThemeNode *node,
  cairo_pattern_t *pattern;
  cairo_content_t  content;
  cairo_matrix_t   matrix;
-  GFile *file;
+  const char *file;

  StTextureCache *texture_cache;

@ -1037,7 +1037,7 @@ st_theme_node_prerender_background (StThemeNode *node,
    }
  else
    {
-      GFile *background_image;
+      const char *background_image;

      background_image = st_theme_node_get_background_image (node);

@ -1303,14 +1303,14 @@ st_theme_node_load_border_image (StThemeNode *node)
      if (border_image == NULL)
        goto out;

-      GFile *file;
-      file = st_border_image_get_file (border_image);
+      const char *filename;
+      filename = st_border_image_get_filename (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 (),
-                                                                                file, scale_factor);
+                                                                                filename, scale_factor);
      if (node->border_slices_texture == COGL_INVALID_HANDLE)
        goto out;

@ -1348,7 +1348,7 @@ st_theme_node_load_background_image (StThemeNode *node)
 {
  if (node->background_texture == COGL_INVALID_HANDLE)
    {
-      GFile *background_image;
+      const char *background_image;
      StShadow *background_image_shadow_spec;

      background_image = st_theme_node_get_background_image (node);
--- a/src/st/st-theme-node-private.h
+++ b/src/st/st-theme-node-private.h
@ -68,7 +68,7 @@ struct _StThemeNode {

  int transition_duration;

-  GFile *background_image;
+  char *background_image;
  StBorderImage *border_image;
  StShadow *box_shadow;
  StShadow *background_image_shadow;
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@ -158,10 +158,7 @@ st_theme_node_finalize (GObject *object)
    }

  if (node->background_image)
-    {
-      g_object_unref (node->background_image);
-      node->background_image = NULL;
-    }
+    g_free (node->background_image);

  if (node->background_texture != COGL_INVALID_HANDLE)
    cogl_handle_unref (node->background_texture);
@ -908,7 +905,7 @@ st_theme_node_get_double (StThemeNode *node,
 *   parent's parent, and so forth. Note that if the property has a
 *   value of 'inherit' it will be inherited even if %FALSE is passed
 *   in for @inherit; this only affects the default behavior for inheritance.
- * @file: (out) (transfer full): location to store the newly allocated value that was
+ * @value: (out): location to store the newly allocated value that was
 *   determined. If the property is not found, the value in this location
 *   will not be changed.
 *
@ -923,7 +920,7 @@ gboolean
 st_theme_node_lookup_url (StThemeNode  *node,
                          const char   *property_name,
                          gboolean      inherit,
-                          GFile       **file)
+                          char        **value)
 {
  gboolean result = FALSE;
  int i;
@ -938,6 +935,7 @@ st_theme_node_lookup_url (StThemeNode  *node,
        {
          CRTerm *term = decl->value;
          CRStyleSheet *base_stylesheet;
+          GFile *file;

          if (term->type != TERM_URI && term->type != TERM_STRING)
            continue;
@ -947,21 +945,23 @@ st_theme_node_lookup_url (StThemeNode  *node,
          else
            base_stylesheet = NULL;

-          *file = _st_theme_resolve_url (node->theme,
-                                         base_stylesheet,
-                                         decl->value->content.str->stryng->str);
+          file = _st_theme_resolve_url (node->theme,
+                                        base_stylesheet,
+                                        decl->value->content.str->stryng->str);
+          *value = g_file_get_path (file);
+          g_object_unref (file);
          result = TRUE;
          break;
        }
    }

  if (!result && inherit && node->parent_node)
-    result = st_theme_node_lookup_url (node->parent_node, property_name, inherit, file);
+    result = st_theme_node_lookup_url (node->parent_node, property_name, inherit, value);

  return result;
 }

-/**
+/*
 * st_theme_node_get_url:
 * @node: a #StThemeNode
 * @property_name: The name of the string property
@ -972,18 +972,18 @@ st_theme_node_lookup_url (StThemeNode  *node,
 * and lets you handle the case where the theme does not specify the
 * indicated value.
 *
- * Returns: (transfer full): the newly allocated value if found.
+ * Return value: the newly allocated value if found.
 *  If @property_name is not found, a warning will be logged and %NULL
 *  will be returned.
 */
-GFile *
+char *
 st_theme_node_get_url (StThemeNode *node,
                       const char  *property_name)
 {
-  GFile *file;
+  char *value;

-  if (st_theme_node_lookup_url (node, property_name, FALSE, &file))
-    return file;
+  if (st_theme_node_lookup_url (node, property_name, FALSE, &value))
+    return value;
  else
    {
      g_warning ("Did not find string property '%s'", property_name);
@ -1926,7 +1926,8 @@ _st_theme_node_ensure_background (StThemeNode *node)
          CRTerm *term;
          /* background: property sets all terms to specified or default values */
          node->background_color = TRANSPARENT_COLOR;
-          g_clear_object (&node->background_image);
+          g_free (node->background_image);
+          node->background_image = NULL;
          node->background_position_set = FALSE;
          node->background_size = ST_BACKGROUND_SIZE_AUTO;

@ -1942,7 +1943,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
                  if (node->parent_node)
                    {
                      st_theme_node_get_background_color (node->parent_node, &node->background_color);
-                      node->background_image = g_object_ref (st_theme_node_get_background_image (node->parent_node));
+                      node->background_image = g_strdup (st_theme_node_get_background_image (node->parent_node));
                    }
                }
              else if (term_is_none (term))
@ -1963,7 +1964,8 @@ _st_theme_node_ensure_background (StThemeNode *node)
                                                base_stylesheet,
                                                term->content.str->stryng->str);

-                  node->background_image = file;
+                  node->background_image = g_file_get_path (file);
+                  g_object_unref (file);
                }
            }
        }
@ -2060,25 +2062,30 @@ _st_theme_node_ensure_background (StThemeNode *node)
          if (decl->value->type == TERM_URI)
            {
              CRStyleSheet *base_stylesheet;
+              GFile *file;

              if (decl->parent_statement != NULL)
                base_stylesheet = decl->parent_statement->parent_sheet;
              else
                base_stylesheet = NULL;

-              g_clear_object (&node->background_image);
-              node->background_image = _st_theme_resolve_url (node->theme,
-                                                              base_stylesheet,
-                                                              decl->value->content.str->stryng->str);
+              g_free (node->background_image);
+              file = _st_theme_resolve_url (node->theme,
+                                            base_stylesheet,
+                                            decl->value->content.str->stryng->str);
+
+              node->background_image = g_file_get_path (file);
+              g_object_unref (file);
            }
          else if (term_is_inherit (decl->value))
            {
-              g_clear_object (&node->background_image);
-              node->background_image = g_object_ref (st_theme_node_get_background_image (node->parent_node));
+              g_free (node->background_image);
+              node->background_image = g_strdup (st_theme_node_get_background_image (node->parent_node));
            }
          else if (term_is_none (decl->value))
            {
-              g_clear_object (&node->background_image);
+              g_free (node->background_image);
+              node->background_image = NULL;
            }
        }
      else if (strcmp (property_name, "-gradient-direction") == 0)
@ -2135,13 +2142,7 @@ st_theme_node_get_background_color (StThemeNode  *node,
  *color = node->background_color;
 }

-/**
- * st_theme_node_get_background_image:
- * @node: a #StThemeNode
- *
- * Returns: (transfer none): @node's background image.
- */
-GFile *
+const char *
 st_theme_node_get_background_image (StThemeNode *node)
 {
  g_return_val_if_fail (ST_IS_THEME_NODE (node), NULL);
@ -2893,6 +2894,7 @@ st_theme_node_get_border_image (StThemeNode *node)
          int border_left;

          GFile *file;
+          char *filename;

          /* Support border-image: none; to suppress a previously specified border image */
          if (term_is_none (term))
@ -2971,15 +2973,17 @@ st_theme_node_get_border_image (StThemeNode *node)
            base_stylesheet = NULL;

          file = _st_theme_resolve_url (node->theme, base_stylesheet, url);
+          filename = g_file_get_path (file);
+          g_object_unref (file);

-          if (file == NULL)
+          if (filename == NULL)
            goto next_property;

-          node->border_image = st_border_image_new (file,
+          node->border_image = st_border_image_new (filename,
                                                    border_top, border_right, border_bottom, border_left,
                                                    scale_factor);

-          g_object_unref (file);
+          g_free (filename);

          return node->border_image;
        }
@ -3849,9 +3853,7 @@ st_theme_node_paint_equal (StThemeNode *node,
      !clutter_color_equal (&node->background_gradient_end, &other->background_gradient_end))
    return FALSE;

-  if ((node->background_image != NULL) &&
-      (other->background_image != NULL) &&
-      !g_file_equal (node->background_image, other->background_image))
+  if (g_strcmp0 (node->background_image, other->background_image) != 0)
    return FALSE;

  _st_theme_node_ensure_geometry (node);
--- a/src/st/st-theme-node.h
+++ b/src/st/st-theme-node.h
@ -162,7 +162,7 @@ gboolean st_theme_node_lookup_shadow (StThemeNode  *node,
 gboolean st_theme_node_lookup_url    (StThemeNode  *node,
                                      const char   *property_name,
                                      gboolean      inherit,
-                                      GFile       **file);
+                                      char        **value);

 /* Easier-to-use variants of the above, for application-level use */
 void          st_theme_node_get_color  (StThemeNode  *node,
@ -174,7 +174,7 @@ gdouble       st_theme_node_get_length (StThemeNode  *node,
                                        const char   *property_name);
 StShadow     *st_theme_node_get_shadow (StThemeNode  *node,
                                        const char   *property_name);
-GFile        *st_theme_node_get_url    (StThemeNode  *node,
+char         *st_theme_node_get_url    (StThemeNode  *node,
                                        const char   *property_name);

 /* Specific getters for particular properties: cached
@ -188,7 +188,7 @@ void st_theme_node_get_background_gradient (StThemeNode   *node,
                                            ClutterColor   *start,
                                            ClutterColor   *end);

-GFile *st_theme_node_get_background_image (StThemeNode *node);
+const char *st_theme_node_get_background_image (StThemeNode *node);

 int    st_theme_node_get_border_width  (StThemeNode  *node,
                                        StSide        side);
--- a/src/st/st-theme.c
+++ b/src/st/st-theme.c
@ -60,13 +60,13 @@ struct _StTheme
 {
  GObject parent;

-  GFile *application_stylesheet;
-  GFile *default_stylesheet;
-  GFile *theme_stylesheet;
+  char *application_stylesheet;
+  char *default_stylesheet;
+  char *theme_stylesheet;
  GSList *custom_stylesheets;

-  GHashTable *stylesheets_by_file;
-  GHashTable *files_by_stylesheet;
+  GHashTable *stylesheets_by_filename;
+  GHashTable *filenames_by_stylesheet;

  CRCascade *cascade;
 };
@ -98,25 +98,12 @@ G_DEFINE_TYPE (StTheme, st_theme, G_TYPE_OBJECT)
 #define strqcmp(str,lit,lit_len) \
  (strlen (str) != (lit_len) || memcmp (str, lit, lit_len))

-static gboolean
-file_equal0 (GFile *file1,
-             GFile *file2)
-{
-  if (file1 == file2)
-    return TRUE;
-
-  if ((file1 == NULL) || (file2 == NULL))
-    return FALSE;
-
-  return g_file_equal (file1, file2);
-}
-
 static void
 st_theme_init (StTheme *theme)
 {
-  theme->stylesheets_by_file = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
-                                                      (GDestroyNotify)g_object_unref, (GDestroyNotify)cr_stylesheet_unref);
-  theme->files_by_stylesheet = g_hash_table_new (g_direct_hash, g_direct_equal);
+  theme->stylesheets_by_filename = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                          (GDestroyNotify)g_free, (GDestroyNotify)cr_stylesheet_unref);
+  theme->filenames_by_stylesheet = g_hash_table_new (g_direct_hash, g_direct_equal);
 }

 static void
@ -137,10 +124,10 @@ st_theme_class_init (StThemeClass *klass)
   */
  g_object_class_install_property (object_class,
                                   PROP_APPLICATION_STYLESHEET,
-                                   g_param_spec_object ("application-stylesheet",
+                                   g_param_spec_string ("application-stylesheet",
                                                        "Application Stylesheet",
                                                        "Stylesheet with application-specific styling",
-                                                        G_TYPE_FILE,
+                                                        NULL,
                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));

  /**
@ -151,10 +138,10 @@ st_theme_class_init (StThemeClass *klass)
   */
  g_object_class_install_property (object_class,
                                   PROP_THEME_STYLESHEET,
-                                   g_param_spec_object ("theme-stylesheet",
+                                   g_param_spec_string ("theme-stylesheet",
                                                        "Theme Stylesheet",
                                                        "Stylesheet with theme-specific styling",
-                                                        G_TYPE_FILE,
+                                                        NULL,
                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));

  /**
@ -165,10 +152,10 @@ st_theme_class_init (StThemeClass *klass)
   */
  g_object_class_install_property (object_class,
                                   PROP_DEFAULT_STYLESHEET,
-                                   g_param_spec_object ("default-stylesheet",
+                                   g_param_spec_string ("default-stylesheet",
                                                        "Default Stylesheet",
                                                        "Stylesheet with global default styling",
-                                                        G_TYPE_FILE,
+                                                        NULL,
                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));

  signals[STYLESHEETS_CHANGED] =
@ -181,32 +168,23 @@ st_theme_class_init (StThemeClass *klass)
 }

 static CRStyleSheet *
-parse_stylesheet (GFile   *file,
-                  GError **error)
+parse_stylesheet (const char  *filename,
+                  GError     **error)
 {
  enum CRStatus status;
  CRStyleSheet *stylesheet;
-  char *contents;
-  gsize length;

-  if (file == NULL)
+  if (filename == NULL)
    return NULL;

-  if (!g_file_load_contents (file, NULL, &contents, &length, NULL, error))
-    return NULL;
-
-  status = cr_om_parser_simply_parse_buf ((const guchar *) contents,
-                                          length,
-                                          CR_UTF_8,
-                                          &stylesheet);
-  g_free (contents);
+  status = cr_om_parser_simply_parse_file ((const guchar *) filename,
+                                           CR_UTF_8,
+                                           &stylesheet);

  if (status != CR_OK)
    {
-      char *uri = g_file_get_uri (file);
      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Error parsing stylesheet '%s'; errcode:%d", uri, status);
-      g_free (uri);
+                   "Error parsing stylesheet '%s'; errcode:%d", filename, status);
      return NULL;
    }

@ -225,12 +203,12 @@ _st_theme_parse_declaration_list (const char *str)

 /* Just g_warning for now until we have something nicer to do */
 static CRStyleSheet *
-parse_stylesheet_nofail (GFile *file)
+parse_stylesheet_nofail (const char *filename)
 {
  GError *error = NULL;
  CRStyleSheet *result;

-  result = parse_stylesheet (file, &error);
+  result = parse_stylesheet (filename, &error);
  if (error)
    {
      g_warning ("%s", error->message);
@ -241,33 +219,35 @@ parse_stylesheet_nofail (GFile *file)

 static void
 insert_stylesheet (StTheme      *theme,
-                   GFile        *file,
+                   const char   *filename,
                   CRStyleSheet *stylesheet)
 {
+  char *filename_copy;
+
  if (stylesheet == NULL)
    return;

-  g_object_ref (file);
+  filename_copy = g_strdup(filename);
  cr_stylesheet_ref (stylesheet);

-  g_hash_table_insert (theme->stylesheets_by_file, file, stylesheet);
-  g_hash_table_insert (theme->files_by_stylesheet, stylesheet, file);
+  g_hash_table_insert (theme->stylesheets_by_filename, filename_copy, stylesheet);
+  g_hash_table_insert (theme->filenames_by_stylesheet, stylesheet, filename_copy);
 }

 gboolean
 st_theme_load_stylesheet (StTheme    *theme,
-                          GFile      *file,
+                          const char *path,
                          GError    **error)
 {
  CRStyleSheet *stylesheet;

-  stylesheet = parse_stylesheet (file, error);
+  stylesheet = parse_stylesheet (path, error);
  if (!stylesheet)
    return FALSE;

  stylesheet->app_data = GUINT_TO_POINTER (TRUE);

-  insert_stylesheet (theme, file, stylesheet);
+  insert_stylesheet (theme, path, stylesheet);
  cr_stylesheet_ref (stylesheet);
  theme->custom_stylesheets = g_slist_prepend (theme->custom_stylesheets, stylesheet);
  g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
@ -277,11 +257,11 @@ st_theme_load_stylesheet (StTheme    *theme,

 void
 st_theme_unload_stylesheet (StTheme    *theme,
-                            GFile      *file)
+                            const char *path)
 {
  CRStyleSheet *stylesheet;

-  stylesheet = g_hash_table_lookup (theme->stylesheets_by_file, file);
+  stylesheet = g_hash_table_lookup (theme->stylesheets_by_filename, path);
  if (!stylesheet)
    return;

@ -289,8 +269,8 @@ st_theme_unload_stylesheet (StTheme    *theme,
    return;

  theme->custom_stylesheets = g_slist_remove (theme->custom_stylesheets, stylesheet);
-  g_hash_table_remove (theme->stylesheets_by_file, file);
-  g_hash_table_remove (theme->files_by_stylesheet, stylesheet);
+  g_hash_table_remove (theme->stylesheets_by_filename, path);
+  g_hash_table_remove (theme->filenames_by_stylesheet, stylesheet);
  cr_stylesheet_unref (stylesheet);
  g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
 }
@ -299,7 +279,7 @@ st_theme_unload_stylesheet (StTheme    *theme,
 * st_theme_get_custom_stylesheets:
 * @theme: an #StTheme
 *
- * Returns: (transfer full) (element-type GFile): the list of stylesheet files
+ * Returns: (transfer full) (element-type utf8): the list of stylesheet filenames
 *          that were loaded with st_theme_load_stylesheet()
 */
 GSList*
@ -311,9 +291,9 @@ st_theme_get_custom_stylesheets (StTheme *theme)
  for (iter = theme->custom_stylesheets; iter; iter = iter->next)
    {
      CRStyleSheet *stylesheet = iter->data;
-      GFile *file = g_hash_table_lookup (theme->files_by_stylesheet, stylesheet);
+      gchar *filename = g_hash_table_lookup (theme->filenames_by_stylesheet, stylesheet);

-      result = g_slist_prepend (result, g_object_ref (file));
+      result = g_slist_prepend (result, g_strdup (filename));
    }

  return result;
@ -354,12 +334,12 @@ st_theme_finalize (GObject * object)
  g_slist_free (theme->custom_stylesheets);
  theme->custom_stylesheets = NULL;

-  g_hash_table_destroy (theme->stylesheets_by_file);
-  g_hash_table_destroy (theme->files_by_stylesheet);
+  g_hash_table_destroy (theme->stylesheets_by_filename);
+  g_hash_table_destroy (theme->filenames_by_stylesheet);

-  g_clear_object (&theme->application_stylesheet);
-  g_clear_object (&theme->theme_stylesheet);
-  g_clear_object (&theme->default_stylesheet);
+  g_free (theme->application_stylesheet);
+  g_free (theme->theme_stylesheet);
+  g_free (theme->default_stylesheet);

  if (theme->cascade)
    {
@ -382,39 +362,36 @@ st_theme_set_property (GObject      *object,
    {
    case PROP_APPLICATION_STYLESHEET:
      {
-        GFile *file = g_value_get_object (value);
+        const char *path = g_value_get_string (value);

-        if (!file_equal0 (file, theme->application_stylesheet))
+        if (path != theme->application_stylesheet)
          {
-            g_clear_object (&theme->application_stylesheet);
-            if (file != NULL)
-              theme->application_stylesheet = g_object_ref (file);
+            g_free (theme->application_stylesheet);
+            theme->application_stylesheet = g_strdup (path);
          }

        break;
      }
    case PROP_THEME_STYLESHEET:
      {
-        GFile *file = g_value_get_object (value);
+        const char *path = g_value_get_string (value);

-        if (!file_equal0 (file, theme->theme_stylesheet))
+        if (path != theme->theme_stylesheet)
          {
-            g_clear_object (&theme->theme_stylesheet);
-            if (file != NULL)
-              theme->theme_stylesheet = g_object_ref (file);
+            g_free (theme->theme_stylesheet);
+            theme->theme_stylesheet = g_strdup (path);
          }

        break;
      }
    case PROP_DEFAULT_STYLESHEET:
      {
-        GFile *file = g_value_get_object (value);
+        const char *path = g_value_get_string (value);

-        if (!file_equal0 (file, theme->default_stylesheet))
+        if (path != theme->default_stylesheet)
          {
-            g_clear_object (&theme->default_stylesheet);
-            if (file != NULL)
-              theme->default_stylesheet = g_object_ref (file);
+            g_free (theme->default_stylesheet);
+            theme->default_stylesheet = g_strdup (path);
          }

        break;
@ -436,13 +413,13 @@ st_theme_get_property (GObject    *object,
  switch (prop_id)
    {
    case PROP_APPLICATION_STYLESHEET:
-      g_value_set_object (value, theme->application_stylesheet);
+      g_value_set_string (value, theme->application_stylesheet);
      break;
    case PROP_THEME_STYLESHEET:
-      g_value_set_object (value, theme->theme_stylesheet);
+      g_value_set_string (value, theme->theme_stylesheet);
      break;
    case PROP_DEFAULT_STYLESHEET:
-      g_value_set_object (value, theme->default_stylesheet);
+      g_value_set_string (value, theme->default_stylesheet);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -462,9 +439,9 @@ st_theme_get_property (GObject    *object,
 * Return value: the newly created theme object
 **/
 StTheme *
-st_theme_new (GFile       *application_stylesheet,
-              GFile       *theme_stylesheet,
-              GFile       *default_stylesheet)
+st_theme_new (const char       *application_stylesheet,
+              const char       *theme_stylesheet,
+              const char       *default_stylesheet)
 {
  StTheme *theme = g_object_new (ST_TYPE_THEME,
                                    "application-stylesheet", application_stylesheet,
@ -875,19 +852,26 @@ add_matched_properties (StTheme      *a_this,

            if (import_rule->sheet == NULL)
              {
-                GFile *file = NULL;
+                char *filename = NULL;

                if (import_rule->url->stryng && import_rule->url->stryng->str)
                  {
+                    GFile *file;
+
                    file = _st_theme_resolve_url (a_this,
                                                  a_nodesheet,
                                                  import_rule->url->stryng->str);
-                    import_rule->sheet = parse_stylesheet (file, NULL);
+                    filename = g_file_get_path (file);
+
+                    g_object_unref (file);
                  }

+                if (filename)
+                  import_rule->sheet = parse_stylesheet (filename, NULL);
+
                if (import_rule->sheet)
                  {
-                    insert_stylesheet (a_this, file, import_rule->sheet);
+                    insert_stylesheet (a_this, filename, import_rule->sheet);
                    /* refcount of stylesheets starts off at zero, so we don't need to unref! */
                  }
                else
@ -898,8 +882,8 @@ add_matched_properties (StTheme      *a_this,
                    import_rule->sheet = (CRStyleSheet *) - 1;
                  }

-                if (file)
-                  g_object_unref (file);
+                if (filename)
+                  g_free (filename);
              }

            if (import_rule->sheet != (CRStyleSheet *) - 1)
@ -1024,8 +1008,8 @@ _st_theme_get_matched_properties (StTheme        *theme,
  return props;
 }

-/* Resolve an url from an url() reference in a stylesheet into a GFile,
- * if possible. The resolution here is distinctly lame and
+/* Resolve an url from an url() reference in a stylesheet into an absolute
+ * local filename, if possible. The resolution here is distinctly lame and
 * will fail on many examples.
 */
 GFile *
@ -1034,7 +1018,7 @@ _st_theme_resolve_url (StTheme      *theme,
                       const char   *url)
 {
  char *scheme;
-  GFile *resource;
+  GFile *stylesheet, *resource;

  if ((scheme = g_uri_parse_scheme (url)))
    {
@ -1043,18 +1027,21 @@ _st_theme_resolve_url (StTheme      *theme,
    }
  else if (base_stylesheet != NULL)
    {
-      GFile *base_file = NULL, *parent;
+      const char *base_filename = NULL;
+      char *dirname;

-      base_file = g_hash_table_lookup (theme->files_by_stylesheet, base_stylesheet);
+      base_filename = g_hash_table_lookup (theme->filenames_by_stylesheet, base_stylesheet);

      /* This is an internal function, if we get here with
         a bad @base_stylesheet we have a problem. */
-      g_assert (base_file);
+      g_assert (base_filename);

-      parent = g_file_get_parent (base_file);
-      resource = g_file_resolve_relative_path (parent, url);
+      dirname = g_path_get_dirname (base_filename);
+      stylesheet = g_file_new_for_path (dirname);
+      resource = g_file_resolve_relative_path (stylesheet, url);

-      g_object_unref (parent);
+      g_object_unref (stylesheet);
+      g_free (dirname);
    }
  else
    {
--- a/src/st/st-theme.h
+++ b/src/st/st-theme.h
@ -47,12 +47,12 @@ typedef struct _StThemeClass StThemeClass;

 GType  st_theme_get_type (void) G_GNUC_CONST;

-StTheme *st_theme_new (GFile *application_stylesheet,
-                       GFile *theme_stylesheet,
-                       GFile *default_stylesheet);
+StTheme *st_theme_new (const char *application_stylesheet,
+                       const char *theme_stylesheet,
+                       const char *default_stylesheet);

-gboolean  st_theme_load_stylesheet        (StTheme *theme, GFile *file, GError **error);
-void      st_theme_unload_stylesheet      (StTheme *theme, GFile *file);
+gboolean  st_theme_load_stylesheet        (StTheme *theme, const char *path, GError **error);
+void      st_theme_unload_stylesheet      (StTheme *theme, const char *path);
 GSList   *st_theme_get_custom_stylesheets (StTheme *theme);

 G_END_DECLS
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@ -277,26 +277,26 @@ current_paint_state (StWidget *widget)

 static void
 st_widget_texture_cache_changed (StTextureCache *cache,
-                                 GFile          *file,
+                                 const char     *uri,
                                 gpointer        user_data)
 {
  StWidget *actor = ST_WIDGET (user_data);
  StThemeNode *node = actor->priv->theme_node;
+  char *path;
  gboolean changed = FALSE;
-  GFile *theme_file;

  if (node == NULL)
    return;

-  theme_file = st_theme_node_get_background_image (node);
-  if ((theme_file != NULL) && g_file_equal (theme_file, file))
+  path = g_filename_from_uri (uri, NULL, NULL);
+
+  if (g_strcmp0 (st_theme_node_get_background_image (node), path) == 0)
    {
      st_theme_node_invalidate_background_image (node);
      changed = TRUE;
    }

-  theme_file = st_border_image_get_file (st_theme_node_get_border_image (node));
-  if ((theme_file != NULL) && g_file_equal (theme_file, file))
+  if (g_strcmp0 (st_border_image_get_filename (st_theme_node_get_border_image (node)), path) == 0)
    {
      st_theme_node_invalidate_border_image (node);
      changed = TRUE;
@ -317,6 +317,8 @@ st_widget_texture_cache_changed (StTextureCache *cache,
      if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (actor)))
        clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
    }
+
+  g_free (path);
 }

 static void
--- a/src/st/test-theme.c
+++ b/src/st/test-theme.c
@ -173,21 +173,17 @@ assert_background_image (StThemeNode *node,
 			 const char  *node_description,
 			 const char  *expected)
 {
-  GFile *value = st_theme_node_get_background_image (node);
-  GFile *expected_file;
+  const char *value = st_theme_node_get_background_image (node);
+  if (expected == NULL)
+    expected = "(null)";
+  if (value == NULL)
+    value = "(null)";

-  if (expected != NULL && value != NULL)
+  if (strcmp (expected, value) != 0)
    {
-      expected_file = g_file_new_for_path (expected);
-
-      if (!g_file_equal (expected_file, value))
-        {
-          char *uri = g_file_get_uri (expected_file);
-          g_print ("%s: %s.background-image: expected: %s, got: %s\n",
-                   test, node_description, expected, uri);
-          fail = TRUE;
-          g_free (uri);
-        }
+      g_print ("%s: %s.background-image: expected: %s, got: %s\n",
+	       test, node_description, expected, value);
+      fail = TRUE;
    }
 }

@ -430,16 +426,14 @@ main (int argc, char **argv)
  StTheme *theme;
  StThemeContext *context;
  PangoFontDescription *font_desc;
-  GFile *file;

  gtk_init (&argc, &argv);

  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
    return 1;

-  file = g_file_new_for_path ("st/test-theme.css");
-  theme = st_theme_new (file, NULL, NULL);
-  g_object_unref (file);
+  theme = st_theme_new ("st/test-theme.css",
+                        NULL, NULL);

  stage = clutter_stage_new ();
  context = st_theme_context_get_for_stage (CLUTTER_STAGE (stage));
--- a/tests/interactive/scroll-view-sizing.js
+++ b/tests/interactive/scroll-view-sizing.js
@ -312,9 +312,6 @@ function test() {
 	    button.label = 'NEVER';
 	    break;
        case 'NEVER':
-	    button.label = 'EXTERNAL';
-	    break;
-        case 'EXTERNAL':
 	    button.label = 'AUTOMATIC';
 	    break;
        }
--- a/tests/testcommon/ui.js
+++ b/tests/testcommon/ui.js
@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const St = imports.gi.St;

@ -11,7 +10,7 @@ function init(stage) {
    Environment.init();
    let context = St.ThemeContext.get_for_stage(stage);
    let stylesheetPath = GLib.getenv("GNOME_SHELL_TESTSDIR") + "/testcommon/test.css";
-    let theme = new St.Theme({ application_stylesheet: Gio.File.new_for_path(stylesheetPath) });
+    let theme = new St.Theme({ application_stylesheet: stylesheetPath });
    context.set_theme(theme);
 }
Author	SHA1	Message	Date
Florian Müllner	71daa39349	Bump version to 3.14.4 Update NEWS.	2015-03-23 19:36:31 +01:00
Florian Müllner	92e0cc1008	build: Work around distcheck issue	2015-03-23 19:36:31 +01:00
Rui Matos	d19e78af24	Refresh all background instances after suspend if needed NVIDIA drivers don't preserve FBO contents across suspend / resume cycles which results in broken backgrounds. We can work around that by forcing a refresh when coming out of suspend. https://bugzilla.gnome.org/show_bug.cgi?id=739178	2015-03-20 10:23:47 +01:00
Florian Müllner	4b0cbafdcd	viewSelector: Mirror open-app-view edge drag gesture for RTL It makes sense for the gesture to reflect the position of the activities button / dash. In RTL locales, those are located on the right rather than the left, so make the gesture apply to the opposite edge in that case. https://bugzilla.gnome.org/show_bug.cgi?id=737502	2015-03-17 10:27:16 +01:00
Samir Ribic	c01ec075ab	Added Bosnian translation	2015-03-14 16:58:33 +00:00
Florian Müllner	c4b2968f9f	loginDialog: Pass-through UserWidget's label-actor https://bugzilla.gnome.org/show_bug.cgi?id=729603	2015-03-06 17:25:44 +01:00
Michele	eab8ea9a1e	appDisplay: Fix leaking signal connections The overview has a longer life-time than dash items, so we are leaking a signal connection each time an item is destroyed. https://bugzilla.gnome.org/show_bug.cgi?id=745570	2015-03-04 12:57:43 +01:00
Rui Matos	6ecaf0e0fc	Revert "workspace: Grab the key focus when hovering over a window" Turns out this makes interaction with the OSK or candidate popups using a mouse basically impossible since they get dismissed when the key focus is captured by a window in the overview. This reverts commit `aeb9f5775f`. https://bugzilla.gnome.org/show_bug.cgi?id=745245	2015-03-02 15:56:32 +01:00
Rui Matos	840482c750	WorkspacesDisplay: update the primary monitor index too The primary monitor index might change so we need to update it too. https://bugzilla.gnome.org/show_bug.cgi?id=743993	2015-03-02 15:49:49 +01:00
Florian Müllner	681e1b2075	dash: Fix leaking signal connections The overview has a longer life-time than dash items, so we are leaking a signal connection each time an item is destroyed. Spotted by Michele (<micxgx@gmail.com>) https://bugzilla.gnome.org/show_bug.cgi?id=744575	2015-02-27 14:46:39 +01:00
Florian Müllner	bff6f71488	screenShield: Do not wake up screen after adding hidden source The screen should be woken up when a new notification is shown on the lock screen, but not when a notification arrives while disabled. Add a missing condition to fix. https://bugzilla.gnome.org/show_bug.cgi?id=744114	2015-02-27 14:45:53 +01:00
Florian Müllner	0adf3b84a7	system: Fix visibility of suspend button It depends on the availability of suspend, not shutdown ...	2015-02-04 12:24:08 +01:00
Sebastian Keller	fd635ba933	calendar: update current day highlight on day change https://bugzilla.gnome.org/show_bug.cgi?id=742492	2015-01-11 17:41:13 +01:00
Adel Gadllah	fd4f2f405f	slider: Don't hardcode scroll interval for smooth scrolling Use the SLIDER_SCROLL_STEP constant instead for consistency. https://bugzilla.gnome.org/show_bug.cgi?id=742648	2015-01-11 17:40:56 +01:00
Matej Urbančič	1a30f1b2f0	Updated Slovenian translation	2014-12-25 19:21:52 +01:00
Florian Müllner	412d40f844	calendar: Stop computing week number ourselves Correctly computing the ISO week number is tricky and we already have code in the platform to do it, so just refer its computation to GDateTime rather than doing it ourselves. https://bugzilla.gnome.org/show_bug.cgi?id=736722	2014-12-19 17:25:11 +01:00
Florian Müllner	3dff544396	Bump version to 3.14.3 Update NEWS.	2014-12-19 12:07:06 +01:00
Florian Müllner	7e7eab2bea	gestures: Restrict actions based on keybindingMode Just like keybindings and the message tray pointer barrier, gestures don't always make sense - for instance, swiping up the screen shield should not trigger the message tray just as the SelectArea action around the left edge should not open the overview. To avoid this, restrict gestures based on the current keybinding mode. https://bugzilla.gnome.org/show_bug.cgi?id=740237	2014-12-19 11:48:27 +01:00
Giovanni Campagna	c568b44997	Calendar: ignore timeouts starting the calendar-server In certain cases the timeout for starting the calendar helper can be reached but the calendar helper still loads fine. If so, just ignore the timeout and wait until we get a notification from dbus of the successful start. https://bugzilla.gnome.org/show_bug.cgi?id=735308	2014-12-14 17:19:12 -08:00
Giovanni Campagna	ce818c0ae5	calendar-server: activate evolution-source-registry manually at startup g_dbus_proxy_new() (and library calls that wrap it) has an hardcoded timeout of 25 seconds, which is insufficient for starting up e-s-r in certain setups. Avoid a timeout error by starting the service manually with a longer timeout before hand. Also demote the error to a warning + exit failure instead of a crash, to avoid triggering abrt reports. https://bugzilla.gnome.org/show_bug.cgi?id=735308	2014-12-14 17:19:12 -08:00
Stalin Pereira	ef2e301c08	Add ScrollView to calendar events Added single ScrollView to make the calendar events scrollable The calendar height will not go beyond the screen height Calendar events for all periods will be enclosed in a single ScrollView Moved the separator to top of the buttons while expanding https://bugzilla.gnome.org/show_bug.cgi?id=705115	2014-12-11 18:48:22 +01:00
Alexander Tsoy	ba274f42b2	build: Workaround quoting issues in configure script Default value of BROWSER_PLUGIN_DIR variable contains special symbols. Thus quoting and inlining it in parameter expansion is not portable. In particular it does not work in dash. Replace ${a:-b} parameter expansion with conditional statement. https://bugzilla.gnome.org/show_bug.cgi?id=739241	2014-11-29 16:37:54 +00:00
Ray Strode	2ceaa05a5a	gdm: fix sensitivity of auth prompt when cancelling early and user list is disabled If the user list is disabled and the user clicks cancel quickly enough after typing their username, they can get in a state where the auth prompt gets stuck in the insensitive state. This is because the login dialog code makes the prompt insensitive while while pam is processing the provided username, but the prompt only makes itself sensitive again when it is hidden. This commit makes it sensitive right before asking for a username again. https://bugzilla.gnome.org/show_bug.cgi?id=740141	2014-11-26 19:04:43 -06:00
Ray Strode	047e454a7c	gdm: disallow cancel after verification succeeds Once verification has succeeded, the train's already left the building and we shouldn't allow canceling. This commit renders the cancel button non-reactive and makes the cancel function be a noop after verification succeeds. https://bugzilla.gnome.org/show_bug.cgi?id=740141	2014-11-26 19:04:29 -06:00
Ryan Lortie	86618ce1f9	network: properly remove connections from list Due to a typo we were always removing the first (index 0) connection from the global list of connections instead of the correct one. This resulted in some connections remaining in the shell's connection list long after they were removed. In particular, this resulted in multiple copies of a bluetooth connection appearing after suspend/resume (when the device was readded and the cached connection list was rescanned). https://bugzilla.gnome.org/show_bug.cgi?id=740227	2014-11-26 16:08:17 -05:00
Florian Müllner	59724c5dd5	Bump version to 3.14.2 Update NEWS.	2014-11-12 19:30:14 +01:00
Yuki	3bb500fed4	viewSelector: Hide workspace page after animating to app picker WorkspacesDisplay relies on being hidden to disable workspace switches by scrolling or panning. Usually viewSelector will hide the previous page on page switch, but we currently miss the case when opening the overview at the app picker, where the workspaces page is still shown for the transition, but never hidden. Fix this by calling hide() in addition to setting the opacity to 0 at the end of the overview animation. https://bugzilla.gnome.org/show_bug.cgi?id=737534	2014-11-12 19:19:31 +01:00
Yuki	dcd3945bb7	Move style updates in AppIcon._onStateChanged out There is currently no simple way to inject into AppIcon's state change, so an extension that wants to do this has to destroy/remove/update all icons in the Shell (i.e. in the Dash, AllView, FrequentView) on enable() and disable() after updating AppIcon.prototype._onStateChange, or the extension must require a restart of the Shell. To solve this issue, we rename _onStateChanged to _updateRunningStyle, and connect the notify::state signal with an anonymous function that calls _updateRunningStyle. This extra function call should allow extensions to just extend the updateRunningStyle function in the prototype. https://bugzilla.gnome.org/show_bug.cgi?id=739497	2014-11-06 21:31:47 +01:00
Darcy	f414f616c4	dateMenu: Fix typo in _isToday() getDay() is the day of week, what we want there is getDate(). https://bugzilla.gnome.org/show_bug.cgi?id=738725	2014-11-03 15:05:59 +01:00
Florian Müllner	e21e90c5e6	networkAgent: Support NM versions without :capabilities Commit `926de53c0c` bumped the requirement for NetworkManager, which is problematic on a stable branch; optionally fall back to the previous code. https://bugzilla.gnome.org/show_bug.cgi?id=738485	2014-10-31 12:41:23 +00:00
Florian Müllner	1e7b2ef51f	Bump version to 3.14.1.5 Update NEWS	2014-10-30 11:22:27 +00:00
Andreas Brauchli	c291de7479	Calendar: Inline _ellipsizeEventTime into caller This patch inlines the function _ellipsizeEventTime into its only caller _addEvent. This also removes the need for the global const EventEllipses and is thus removed by this commit as well. https://bugzilla.gnome.org/show_bug.cgi?id=727302	2014-10-27 19:33:25 -05:00
Andreas Brauchli	aee1a18270	Calendar: sort multi-day events by ending day/time With commit dc6a60dde, the calendar displays the ending day and time of a continuing multi-day event on its ending day. This results in the list not appearing to be sorted. This patch sorts the list according to the displayed day/time. With the two appointments Thursday 0800-1000 Foo, and Wednesday 0900-Friday 1200 Bar and today being Monday, the rest of the week list currently displays: F ...1200 Bar T 0800 Foo With this patch, the displaying order is switched because Friday comes after Thursday. https://bugzilla.gnome.org/show_bug.cgi?id=727302	2014-10-27 19:33:25 -05:00
Andreas Brauchli	6c67f26e7d	Calendar: Show multi-day event continuation Currently, multi-day events are shown as individual appointments on each day. This patch ellipsizes multi-day events to indicate continuation on the prior or following day (or other time-period.) The time label spot is now replaced by a box layout that contains the prefix ellipsis label, the time label and the postfix ellipsis label. In order to keep the alignment, ellipses are merely invisible (zero opacity) when hidden. The ellipses are styled using the events-day-time-ellipses class which, by default, take the color of the event text. When RTL is used, the box contents are adjusted accordingly (clutter does that for us). An event spanning three days now displays "...All Day..." in the calendar on the second day. https://bugzilla.gnome.org/show_bug.cgi?id=727302	2014-10-27 19:33:25 -05:00
Rui Matos	deb651acbf	BackgroundCache: plug an Animation object leak We need to return early in case the animation file is the same, otherwise we'll create a new Animation object and leak the previous one. https://bugzilla.gnome.org/show_bug.cgi?id=739252	2014-10-27 18:28:39 +01:00
Devyani Kota	d2011f6d7f	messageTray: Summarize notifications when messages queue up It is really annoying for the user to acknowledge multiple notifications when they queue up. So, to prevent a notification flood that has to be handled by the user one-by-one, a summarized-notification feature is added which leaves a single summarized-notification for the user, replacing multiple notifications if the number exceeds 1, which they may or may not acknowledge. When this summarized-notification is acknowledged, the message-tray is opened where they can view the notifications that were summarized. This helps the user concentrate on his primary task simultaneously informing them about the new notifications. https://bugzilla.gnome.org/show_bug.cgi?id=702460	2014-10-27 18:22:36 +01:00
Owen W. Taylor	416adec904	Fix handling of SystemBackground Since the background rework, SystemBackground is no longer a transparent actor that you have to stack on top of a solid background, it is an opaque actor. Fix the color of the background actor, and remove places where we were setting the background color underneath the system background and expecting blending - in particular, we can always set no_clear_hint on the stage. https://bugzilla.gnome.org/show_bug.cgi?id=738652	2014-10-16 17:17:33 -04:00