Bump version to 3.15.1

Update NEWS.

.gitignore

@@ -23,6 +23,7 @@ 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

NEWS

@@ -1,3 +1,20 @@
+3.15.1
+======
+* 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]
+
+Contributors:
+  Andreas Brauchli, Cosimo Cecchi, Devyani Kota, Rui Matos, Florian Müllner,
+  Jasper St. Pierre, Owen W. Taylor
+
+Translations:
+  Bahodir Mansurov [uz@cyrillic]
+
 3.14.1
 ======
 * Fix pulse animation for scrolled app folders [Florian; #736885]

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.14.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.15.1],[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.14.1
+MUTTER_MIN_VERSION=3.15.1
 GTK_MIN_VERSION=3.13.2
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3

data/Makefile.am

@@ -35,44 +35,11 @@ introspection_DATA =				\
 	org.gnome.ShellSearchProvider.xml	\
 	org.gnome.ShellSearchProvider2.xml
 
-themedir = $(pkgdatadir)/theme
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/theme --generate-dependencies $(srcdir)/gnome-shell-theme.gresource.xml)
-dist_theme_DATA =				\
+gnome-shell-theme.gresource: gnome-shell-theme.gresource.xml $(resource_files)
-	theme/calendar-arrow-left.svg		\
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/theme $<
-	theme/calendar-arrow-right.svg		\
+resourcedir = $(pkgdatadir)
-	theme/calendar-today.svg		\
+resource_DATA = gnome-shell-theme.gresource
-	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
@@ -116,7 +83,9 @@ 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
+	org.gnome.shell.gschema.xml.in.in		\
+	gnome-shell-theme.gresource.xml 		\
+	$(resource_files)
 
 CLEANFILES +=						\
 	gnome-shell.desktop.in				\
@@ -128,4 +97,5 @@ CLEANFILES +=						\
 	perf-background.xml				\
 	gschemas.compiled				\
 	org.gnome.shell.gschema.valid			\
-	org.gnome.shell.gschema.xml.in
+	org.gnome.shell.gschema.xml.in			\
+	gnome-shell-theme.gresource

data/gnome-shell-theme.gresource.xml

@@ -0,0 +1,41 @@
+<?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>

data/theme/gnome-shell.css

@@ -1494,6 +1494,10 @@ StScrollBar StButton#vhandle:active {
     text-align: right;
 }
 
+.events-day-time-ellipses {
+    color: rgba(153, 153, 153, 1.0);
+}
+
 .events-day-time:rtl {
     text-align: left;
 }

js/gdm/authPrompt.js

@@ -1,6 +1,7 @@
 // -*- 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;
@@ -126,7 +127,7 @@ const AuthPrompt = new Lang.Class({
 
         this._initButtons();
 
-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
+        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
         this._spinner = new Animation.AnimatedIcon(spinnerIcon, DEFAULT_BUTTON_WELL_ICON_SIZE);
         this._spinner.actor.opacity = 0;
         this._spinner.actor.show();

js/gdm/loginDialog.js

@@ -537,14 +537,14 @@ const LoginDialog = new Lang.Class({
         }
     },
 
-    _updateLogoTexture: function(cache, uri) {
+    _updateLogoTexture: function(cache, file) {
-        if (this._logoFileUri != uri)
+        if (this._logoFile && !this._logoFile.equal(file))
             return;
 
         this._logoBin.destroy_all_children();
-        if (this._logoFileUri) {
+        if (this._logoFile) {
             let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-            this._logoBin.add_child(this._textureCache.load_uri_async(this._logoFileUri,
+            this._logoBin.add_child(this._textureCache.load_file_async(this._logoFile,
                                                                        -1, _LOGO_ICON_HEIGHT,
                                                                        scaleFactor));
         }
@@ -553,8 +553,8 @@ const LoginDialog = new Lang.Class({
     _updateLogo: function() {
         let path = this._settings.get_string(GdmUtil.LOGO_KEY);
 
-        this._logoFileUri = path ? Gio.file_new_for_path(path).get_uri() : null;
+        this._logoFile = path ? Gio.file_new_for_path(path) : null;
-        this._updateLogoTexture(this._textureCache, this._logoFileUri);
+        this._updateLogoTexture(this._textureCache, this._logoFile);
     },
 
     _onPrompted: function() {

js/misc/keyboardManager.js

@@ -35,7 +35,7 @@ function releaseKeyboard() {
 }
 
 function holdKeyboard() {
-    global.freeze_keyboard(global.get_current_time());
+    global.display.freeze_keyboard(global.get_current_time());
 }
 
 const KeyboardManager = new Lang.Class({

js/ui/animation.js

@@ -12,7 +12,7 @@ const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const Animation = new Lang.Class({
     Name: 'Animation',
 
-    _init: function(filename, width, height, speed) {
+    _init: function(file, 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 (filename, width, height, scaleFactor,
+        this._animations = St.TextureCache.get_default().load_sliced_image (file, 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(filename, size) {
+    _init: function(file, size) {
-        this.parent(filename, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
+        this.parent(file, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
     }
 });

js/ui/appDisplay.js

@@ -379,9 +379,7 @@ const AllView = new Lang.Class({
         this.actor.add_actor(this._scrollView);
 
         this._scrollView.set_policy(Gtk.PolicyType.NEVER,
-                                    Gtk.PolicyType.AUTOMATIC);
+                                    Gtk.PolicyType.EXTERNAL);
-        // 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();

js/ui/background.js

@@ -106,6 +106,8 @@ const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
+const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
+
 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
 const PRIMARY_COLOR_KEY = 'primary-color';
 const SECONDARY_COLOR_KEY = 'secondary-color';
@@ -125,6 +127,16 @@ 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',
 
@@ -134,25 +146,25 @@ const BackgroundCache = new Lang.Class({
         this._backgroundSources = {};
     },
 
-    monitorFile: function(filename) {
+    monitorFile: function(file) {
-        if (this._fileMonitors[filename])
+        let key = file.hash();
+        if (this._fileMonitors[key])
             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', filename);
+                            this.emit('file-changed', file);
                         }));
 
-        this._fileMonitors[filename] = monitor;
+        this._fileMonitors[key] = monitor;
     },
 
     getAnimation: function(params) {
-        params = Params.parse(params, { filename: null,
+        params = Params.parse(params, { file: null,
                                         onLoaded: null });
 
-        if (this._animationFilename == params.filename) {
+        if (_fileEqual0(this._animationFile, params.file)) {
             if (params.onLoaded) {
                 let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
                     params.onLoaded(this._animation);
@@ -160,12 +172,13 @@ const BackgroundCache = new Lang.Class({
                 }));
                 GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
             }
+            return;
         }
 
-        let animation = new Animation({ filename: params.filename });
+        let animation = new Animation({ file: params.file });
 
         animation.load(Lang.bind(this, function() {
-                           this._animationFilename = params.filename;
+                           this._animationFile = params.file;
                            this._animation = animation;
 
                            if (params.onLoaded) {
@@ -218,14 +231,14 @@ const Background = new Lang.Class({
         params = Params.parse(params, { monitorIndex: 0,
                                         layoutManager: Main.layoutManager,
                                         settings: null,
-                                        filename: null,
+                                        file: null,
                                         style: null });
 
         this.background = new Meta.Background({ meta_screen: global.screen });
         this.background._delegate = this;
 
         this._settings = params.settings;
-        this._filename = params.filename;
+        this._file = params.file;
         this._style = params.style;
         this._monitorIndex = params.monitorIndex;
         this._layoutManager = params.layoutManager;
@@ -292,20 +305,21 @@ const Background = new Lang.Class({
             this.background.set_gradient(shadingType, color, secondColor);
     },
 
-    _watchFile: function(filename) {
+    _watchFile: function(file) {
-        if (this._fileWatches[filename])
+        let key = file.hash();
+        if (this._fileWatches[key])
             return;
 
-        this._cache.monitorFile(filename);
+        this._cache.monitorFile(file);
         let signalId = this._cache.connect('file-changed',
                                            Lang.bind(this, function(cache, changedFile) {
-                                               if (changedFile == filename) {
+                                               if (changedFile.equal(file)) {
                                                    let imageCache = Meta.BackgroundImageCache.get_default();
                                                    imageCache.purge(changedFile);
                                                    this.emit('changed');
                                                }
                                            }));
-        this._fileWatches[filename] = signalId;
+        this._fileWatches[key] = signalId;
     },
 
     _removeAnimationTimeout: function() {
@@ -328,9 +342,9 @@ const Background = new Lang.Class({
                                           this._animation.transitionProgress,
                                           this._style);
             } else if (files.length > 0) {
-                this.background.set_filename(files[0], this._style);
+                this.background.set_file(files[0], this._style);
             } else {
-                this.background.set_filename(null, this._style);
+                this.background.set_file(null, this._style);
             }
             this._queueUpdateAnimation();
         });
@@ -387,8 +401,8 @@ const Background = new Lang.Class({
         GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
     },
 
-    _loadAnimation: function(filename) {
+    _loadAnimation: function(file) {
-        this._cache.getAnimation({ filename: filename,
+        this._cache.getAnimation({ file: file,
                                          onLoaded: Lang.bind(this, function(animation) {
                                              this._animation = animation;
 
@@ -398,17 +412,17 @@ const Background = new Lang.Class({
                                              }
 
                                              this._updateAnimation();
-                                                 this._watchFile(filename);
+                                             this._watchFile(file);
                                          })
                                  });
     },
 
-    _loadImage: function(filename) {
+    _loadImage: function(file) {
-        this.background.set_filename(filename, this._style);
+        this.background.set_file(file, this._style);
-        this._watchFile(filename);
+        this._watchFile(file);
 
         let cache = Meta.BackgroundImageCache.get_default();
-        let image = cache.load(filename);
+        let image = cache.load(file);
         if (image.is_loaded())
             this._setLoaded();
         else {
@@ -420,11 +434,11 @@ const Background = new Lang.Class({
         }
     },
 
-    _loadFile: function(filename) {
+    _loadFile: function(file) {
-        if (filename.endsWith('.xml'))
+        if (file.get_basename().endsWith('.xml'))
-            this._loadAnimation(filename);
+            this._loadAnimation(file);
         else
-            this._loadImage(filename);
+            this._loadImage(file);
     },
 
     _load: function () {
@@ -432,12 +446,12 @@ const Background = new Lang.Class({
 
         this._loadPattern();
 
-        if (!this._filename) {
+        if (!this._file) {
             this._setLoaded();
             return;
         }
 
-        this._loadFile(this._filename);
+        this._loadFile(this._file);
     },
 });
 Signals.addSignalMethods(Background.prototype);
@@ -448,11 +462,12 @@ const SystemBackground = new Lang.Class({
     Name: 'SystemBackground',
 
     _init: function() {
-        let filename = global.datadir + '/theme/noise-texture.png';
+        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
 
         if (_systemBackground == null) {
             _systemBackground = new Meta.Background({ meta_screen: global.screen });
-            _systemBackground.set_filename(filename, GDesktopEnums.BackgroundStyle.WALLPAPER);
+            _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
+            _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
         }
 
         this.actor = new Meta.BackgroundActor({ meta_screen: global.screen,
@@ -460,7 +475,7 @@ const SystemBackground = new Lang.Class({
                                                 background: _systemBackground });
 
         let cache = Meta.BackgroundImageCache.get_default();
-        let image = cache.load(filename);
+        let image = cache.load(file);
         if (image.is_loaded()) {
             image = null;
             let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
@@ -509,20 +524,17 @@ const BackgroundSource = new Lang.Class({
     },
 
     getBackground: function(monitorIndex) {
-        let filename = null;
+        let file = null;
         let style;
 
         if (this._overrideImage != null) {
-            filename = this._overrideImage;
+            file = Gio.File.new_for_path(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);
-                if (GLib.uri_parse_scheme(uri) != null)
+                file = Gio.File.new_for_commandline_arg(uri);
-                    filename = Gio.File.new_for_uri(uri).get_path();
-                else
-                    filename = uri;
             }
         }
 
@@ -530,7 +542,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 (filename == null || !filename.endsWith('.xml'))
+        if (file == null || !file.get_basename().endsWith('.xml'))
             monitorIndex = 0;
 
         if (!(monitorIndex in this._backgrounds)) {
@@ -538,7 +550,7 @@ const BackgroundSource = new Lang.Class({
                 monitorIndex: monitorIndex,
                 layoutManager: this._layoutManager,
                 settings: this._settings,
-                filename: filename,
+                file: file,
                 style: style
             });
 
@@ -571,9 +583,9 @@ const Animation = new Lang.Class({
     Name: 'Animation',
 
     _init: function(params) {
-        params = Params.parse(params, { filename: null });
+        params = Params.parse(params, { file: null });
 
-        this.filename = params.filename;
+        this.file = params.file;
         this.keyFrameFiles = [];
         this.transitionProgress = 0.0;
         this.transitionDuration = 0.0;
@@ -581,9 +593,7 @@ const Animation = new Lang.Class({
     },
 
     load: function(callback) {
-        let file = Gio.File.new_for_path(this.filename);
+        this._show = new GnomeDesktop.BGSlideShow({ filename: this.file.get_path() });
-
-        this._show = new GnomeDesktop.BGSlideShow({ filename: this.filename });
 
         this._show.load_async(null,
                               Lang.bind(this,
@@ -603,16 +613,16 @@ const Animation = new Lang.Class({
         if (this._show.get_num_slides() < 1)
             return;
 
-        let [progress, duration, isFixed, file1, file2] = this._show.get_current_slide(monitor.width, monitor.height);
+        let [progress, duration, isFixed, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);
 
         this.transitionDuration = duration;
         this.transitionProgress = progress;
 
-        if (file1)
+        if (filename1)
-            this.keyFrameFiles.push(file1);
+            this.keyFrameFiles.push(Gio.File.new_for_path(filename1));
 
-        if (file2)
+        if (filename2)
-            this.keyFrameFiles.push(file2);
+            this.keyFrameFiles.push(Gio.File.new_for_path(filename2));
     },
 });
 Signals.addSignalMethods(Animation.prototype);

js/ui/calendar.js

@@ -13,9 +13,11 @@ const Shell = imports.gi.Shell;
 
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';
+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';
@@ -58,19 +60,21 @@ function _getEndOfDay(date) {
     return ret;
 }
 
-function _formatEventTime(event, clockFormat) {
+function _formatEventTime(event, clockFormat, periodBegin, periodEnd) {
     let ret;
-    if (event.allDay) {
+    let allDay = (event.allDay || (event.date <= periodBegin && event.end >= periodEnd));
+    if (allDay) {
         /* Translators: Shown in calendar event list for all day events
          * Keep it short, best if you can use less then 10 characters
          */
         ret = C_("event list time", "All Day");
     } else {
+        let date = event.date >= periodBegin ? event.date : event.end;
         switch (clockFormat) {
         case '24h':
             /* Translators: Shown in calendar event list, if 24h format,
                \u2236 is a ratio character, similar to : */
-            ret = event.date.toLocaleFormat(C_("event list time", "%H\u2236%M"));
+            ret = date.toLocaleFormat(C_("event list time", "%H\u2236%M"));
             break;
 
         default:
@@ -79,7 +83,7 @@ function _formatEventTime(event, clockFormat) {
             /* Translators: Shown in calendar event list, if 12h format,
                \u2236 is a ratio character, similar to : and \u2009 is
                a thin space */
-            ret = event.date.toLocaleFormat(C_("event list time", "%l\u2236%M\u2009%p"));
+            ret = date.toLocaleFormat(C_("event list time", "%l\u2236%M\u2009%p"));
             break;
         }
     }
@@ -361,6 +365,12 @@ const DBusEventSource = new Lang.Class({
                 result.push(event);
             }
         }
+        result.sort(function(event1, event2) {
+            // sort events by end time on ending day
+            let d1 = event1.date < begin && event1.end <= end ? event1.end : event1.date;
+            let d2 = event2.date < begin && event2.end <= end ? event2.end : event2.date;
+            return d1.getTime() - d2.getTime();
+        });
         return result;
     },
 
@@ -721,12 +731,16 @@ const EventsList = new Lang.Class({
         this._eventSource.connect('changed', Lang.bind(this, this._update));
     },
 
-    _addEvent: function(event, index, includeDayName) {
+    _addEvent: function(event, index, includeDayName, periodBegin, periodEnd) {
         let dayString;
-        if (includeDayName)
+        if (includeDayName) {
+            if (event.date >= periodBegin)
                 dayString = _getEventDayAbbreviation(event.date.getDay());
-        else
+            else /* show event end day if it began earlier */
+                dayString = _getEventDayAbbreviation(event.end.getDay());
+        } else {
             dayString = '';
+        }
 
         let dayLabel = new St.Label({ style_class: 'events-day-dayname',
                                       text: dayString,
@@ -739,16 +753,30 @@ const EventsList = new Lang.Class({
 
         let layout = this.actor.layout_manager;
         layout.attach(dayLabel, rtl ? 2 : 0, index, 1, 1);
-
         let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
-        let timeString = _formatEventTime(event, clockFormat);
+        let timeString = _formatEventTime(event, clockFormat, periodBegin, periodEnd);
         let timeLabel = new St.Label({ style_class: 'events-day-time',
                                        text: timeString,
                                        y_align: Clutter.ActorAlign.START });
         timeLabel.clutter_text.line_wrap = false;
         timeLabel.clutter_text.ellipsize = false;
 
-        layout.attach(timeLabel, 1, index, 1, 1);
+        let preEllipsisLabel = new St.Label({ style_class: 'events-day-time-ellipses',
+                                              text: ELLIPSIS_CHAR,
+                                              y_align: Clutter.ActorAlign.START });
+        let postEllipsisLabel = new St.Label({ style_class: 'events-day-time-ellipses',
+                                               text: ELLIPSIS_CHAR,
+                                               y_align: Clutter.ActorAlign.START });
+        if (event.allDay || event.date >= periodBegin)
+            preEllipsisLabel.opacity = 0;
+        if (event.allDay || event.end <= periodEnd)
+            postEllipsisLabel.opacity = 0;
+
+        let timeLabelBoxLayout = new St.BoxLayout();
+        timeLabelBoxLayout.add(preEllipsisLabel);
+        timeLabelBoxLayout.add(timeLabel);
+        timeLabelBoxLayout.add(postEllipsisLabel);
+        layout.attach(timeLabelBoxLayout, 1, index, 1, 1);
 
         let titleLabel = new St.Label({ style_class: 'events-day-task',
                                         text: event.summary,
@@ -759,8 +787,8 @@ const EventsList = new Lang.Class({
         layout.attach(titleLabel, rtl ? 0 : 2, index, 1, 1);
     },
 
-    _addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) {
+    _addPeriod: function(header, index, periodBegin, periodEnd, includeDayName, showNothingScheduled) {
-        let events = this._eventSource.getEvents(begin, end);
+        let events = this._eventSource.getEvents(periodBegin, periodEnd);
 
         if (events.length == 0 && !showNothingScheduled)
             return index;
@@ -771,15 +799,14 @@ const EventsList = new Lang.Class({
         index++;
 
         for (let n = 0; n < events.length; n++) {
-            this._addEvent(events[n], index, includeDayName);
+            this._addEvent(events[n], index, includeDayName, periodBegin, periodEnd);
             index++;
         }
 
         if (events.length == 0 && showNothingScheduled) {
-            let now = new Date();
             /* Translators: Text to show if there are no events */
-            let nothingEvent = new CalendarEvent(now, now, _("Nothing Scheduled"), true);
+            let nothingEvent = new CalendarEvent(periodBegin, periodBegin, _("Nothing Scheduled"), true);
-            this._addEvent(nothingEvent, index, false);
+            this._addEvent(nothingEvent, index, false, periodBegin, periodEnd);
             index++;
         }
 
@@ -792,14 +819,17 @@ const EventsList = new Lang.Class({
         let dayBegin = _getBeginningOfDay(day);
         let dayEnd = _getEndOfDay(day);
 
-        let dayString;
+        let dayFormat;
         let now = new Date();
         if (_sameYear(day, now))
             /* Translators: Shown on calendar heading when selected day occurs on current year */
-            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d"));
+            dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
+                                                             "%A, %B %d"));
         else
             /* Translators: Shown on calendar heading when selected day occurs on different year */
-            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
+            dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
+                                                             "%A, %B %d, %Y"));
+        let dayString = day.toLocaleFormat(dayFormat);
         this._addPeriod(dayString, 0, dayBegin, dayEnd, false, true);
     },
 

js/ui/components/telepathyClient.js

@@ -36,6 +36,8 @@ const NotificationDirection = {
     RECEIVED: 'chat-received'
 };
 
+const N_ = function(s) { return s; };
+
 function makeMessageFromTpMessage(tpMessage, direction) {
     let [text, flags] = tpMessage.to_text();
 
@@ -950,70 +952,70 @@ const ChatNotification = new Lang.Class({
             // Show only the time if date is on today
             if(daysAgo < 1){
                 /* Translators: Time in 24h format */
-                format = _("%H\u2236%M");
+                format = N_("%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 = _("Yesterday, %H\u2236%M");
+                format = N_("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 = _("%A, %H\u2236%M");
+                format = N_("%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 = _("%B %d, %H\u2236%M");
+                format = N_("%B %d, %H\u2236%M");
             } else {
                 /* Translators: this is the month name, day number, year
                  number followed by a time string in 24h format.
                  i.e. "May 25 2012, 14:30" */
                 // xgettext:no-c-format
-                format = _("%B %d %Y, %H\u2236%M");
+                format = N_("%B %d %Y, %H\u2236%M");
             }
         } else {
             // Show only the time if date is on today
             if(daysAgo < 1){
                 /* Translators: Time in 24h format */
-                format = _("%l\u2236%M %p");
+                format = N_("%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 = _("Yesterday, %l\u2236%M %p");
+                format = N_("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 = _("%A, %l\u2236%M %p");
+                format = N_("%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 = _("%B %d, %l\u2236%M %p");
+                format = N_("%B %d, %l\u2236%M %p");
             } else {
                 /* Translators: this is the month name, day number, year
                  number followed by a time string in 12h format.
                  i.e. "May 25 2012, 2:30 pm"*/
                 // xgettext:no-c-format
-                format = _("%B %d %Y, %l\u2236%M %p");
+                format = N_("%B %d %Y, %l\u2236%M %p");
             }
         }
-        return date.toLocaleFormat(format);
+        return date.toLocaleFormat(Shell.util_translate_time_string(format));
     },
 
     appendTimestamp: function() {
@@ -1264,9 +1266,8 @@ 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_uri_async(uri, iconBox._size, iconBox._size, scaleFactor);
+            iconBox.child = textureCache.load_file_async(file, iconBox._size, iconBox._size, scaleFactor);
         }
         else {
             iconBox.child = new St.Icon({ icon_name: 'avatar-default',

js/ui/dateMenu.js

@@ -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 = _("%A %B %e, %Y");
+                let dateFormat = Shell.util_translate_time_string ("%A %B %e, %Y");
                 this._date.set_label(now.toLocaleFormat(dateFormat));
             }
         }));

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.get_path());
+        theme.unload_stylesheet(extension.stylesheet);
     }
 
     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.get_path());
+            theme.load_stylesheet(stylesheetFile);
             extension.stylesheet = stylesheetFile;
             break;
         }

js/ui/layout.js

@@ -20,7 +20,6 @@ const Tweener = imports.ui.tweener;
 const STARTUP_ANIMATION_TIME = 0.5;
 const KEYBOARD_ANIMATION_TIME = 0.15;
 const BACKGROUND_FADE_ANIMATION_TIME = 1.0;
-const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
 
 // The message tray takes this much pressure
 // in the pressure barrier at once to release it.
@@ -160,10 +159,10 @@ const LayoutManager = new Lang.Class({
         this._isPopupWindowVisible = false;
         this._startingUp = true;
 
-        // Normally, the stage is always covered so Clutter doesn't need to clear
+        // We don't want to paint the stage background color because either
-        // it; however it becomes visible during the startup animation
+        // the SystemBackground we create or the MetaBackgroundActor inside
-        // See the comment below for a longer explanation
+        // global.window_group covers the entirety of the screen.
-        global.stage.background_color = DEFAULT_BACKGROUND_COLOR;
+        global.stage.no_clear_hint = true;
 
         // Set up stage hierarchy to group all UI actors under one container.
         this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
@@ -423,10 +422,7 @@ const LayoutManager = new Lang.Class({
         this.panelBox.set_position(this.primaryMonitor.x, this.primaryMonitor.y);
         this.panelBox.set_size(this.primaryMonitor.width, -1);
 
-        if (this.keyboardIndex < 0)
         this.keyboardIndex = this.primaryIndex;
-        else
-            this._updateKeyboardBox();
 
         this.trayBox.set_position(this.bottomMonitor.x,
                                   this.bottomMonitor.y + this.bottomMonitor.height);
@@ -591,10 +587,6 @@ const LayoutManager = new Lang.Class({
     //
     // When starting a normal user session, we want to grow it out of the middle
     // of the screen.
-    //
-    // Usually, we don't want to paint the stage background color because the
-    // MetaBackgroundActor inside global.window_group covers the entirety of the
-    // screen. So, we set no_clear_hint at the end of the animation.
 
     _prepareStartupAnimation: function() {
         // During the initial transition, add a simple actor to block all events,
@@ -675,10 +667,6 @@ const LayoutManager = new Lang.Class({
     },
 
     _startupAnimationComplete: function() {
-        // At this point, the UI group is covering everything, so
-        // we no longer need to clear the stage
-        global.stage.no_clear_hint = true;
-
         this._coverPane.destroy();
         this._coverPane = null;
 

js/ui/magnifier.js

@@ -1198,12 +1198,7 @@ const ZoomRegion = new Lang.Class({
 
         // Add a background for when the magnified uiGroup is scrolled
         // out of view (don't want to see desktop showing through).
-        this._background = new Clutter.Actor({ background_color: Main.DEFAULT_BACKGROUND_COLOR,
+        this._background = (new Background.SystemBackground()).actor;
-                                               layout_manager: new Clutter.BinLayout(),
-                                               width: global.screen_width,
-                                               height: global.screen_height });
-        let noiseTexture = (new Background.SystemBackground()).actor;
-        this._background.add_actor(noiseTexture);
         mainGroup.add_actor(this._background);
 
         // Clone the group that contains all of UI on the screen.  This is the

js/ui/main.js

@@ -40,8 +40,6 @@ const Magnifier = imports.ui.magnifier;
 const XdndHandler = imports.ui.xdndHandler;
 const Util = imports.misc.util;
 
-const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
-
 const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
 const STICKY_KEYS_ENABLE = 'stickykeys-enable';
 const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a';
@@ -131,6 +129,9 @@ 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
@@ -224,12 +225,26 @@ 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 = global.datadir + '/theme/' + sessionMode.stylesheetName;
+    let stylesheet = _getDefaultStylesheet();
-    if (_defaultCssStylesheet == stylesheet)
+    if (_defaultCssStylesheet && _defaultCssStylesheet.equal(stylesheet))
         return;
 
     _defaultCssStylesheet = stylesheet;
@@ -256,7 +271,7 @@ function getThemeStylesheet() {
  * Set the theme CSS file that the shell will load
  */
 function setThemeStylesheet(cssStylesheet) {
-    _cssStylesheet = cssStylesheet;
+    _cssStylesheet = Gio.File.new_for_path(cssStylesheet);
 }
 
 /**

js/ui/messageTray.js

@@ -2432,9 +2432,23 @@ const MessageTray = new Lang.Class({
             if (shouldShowNotification && nextNotification) {
                 let limited = this._busy || Main.layoutManager.bottomMonitor.inFullscreen;
                 let showNextNotification = (!limited || nextNotification.forFeedback || nextNotification.urgency == Urgency.CRITICAL);
-                if (showNextNotification)
+                if (showNextNotification) {
+                    let len = this._notificationQueue.length;
+                    if (len > 1) {
+                        this._notificationQueue.length = 0;
+                        let source = new SystemNotificationSource();
+                        this.add(source);
+                        let notification = new Notification(source, ngettext("%d new message", "%d new messages", len).format(len));
+                        notification.setTransient(true);
+                        notification.connect('clicked', Lang.bind(this, function() {
+                            this.openTray();
+                        }));
+                        source.notify(notification);
+                    } else {
                         this._showNotification();
                     }
+                }
+            }
         } else if (this._notificationState == State.SHOWN) {
             let expired = (this._userActiveWhileNotificationShown &&
                            this._notificationTimeoutId == 0 &&

js/ui/modalDialog.js

@@ -194,7 +194,7 @@ const ModalDialog = new Lang.Class({
     },
 
     placeSpinner: function(layoutInfo) {
-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
+        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
         this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
         this._workSpinner.actor.opacity = 0;
         this._workSpinner.actor.show();

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 == icon)
+        if (!success || (this._spinnerIcon && this._spinnerIcon.equal(icon)))
             return;
         this._spinnerIcon = icon;
         this._spinner = new Animation.AnimatedIcon(this._spinnerIcon, PANEL_ICON_SIZE);

js/ui/screenShield.js

@@ -85,7 +85,8 @@ const Clock = new Lang.Class({
         let date = new Date();
         /* Translators: This is a time format for a date in
            long format */
-        this._date.text = date.toLocaleFormat(_("%A, %B %d"));
+        let dateFormat = Shell.util_translate_time_string("%A, %B %d");
+        this._date.text = date.toLocaleFormat(dateFormat);
     },
 
     destroy: function() {

js/ui/status/network.js

@@ -876,7 +876,8 @@ const NMWirelessDialog = new Lang.Class({
                                                  x_align: Clutter.ActorAlign.CENTER,
                                                  y_align: Clutter.ActorAlign.CENTER });
 
-        this._noNetworksSpinner = new Animation.AnimatedIcon(global.datadir + '/theme/process-working.svg', 24, 24);
+        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
+        this._noNetworksSpinner = new Animation.AnimatedIcon(file, 24, 24);
         this._noNetworksBox.add_actor(this._noNetworksSpinner.actor);
         this._noNetworksBox.add_actor(new St.Label({ style_class: 'no-networks-label',
                                                      text: _("No Networks") }));

po/LINGUAS

@@ -68,6 +68,7 @@ th
 tr
 ug 
 uk
+uz@cyrillic
 vi
 zh_CN
 zh_HK

src/shell-global.c

@@ -1132,14 +1132,6 @@ 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

src/shell-global.h

@@ -45,8 +45,6 @@ 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);

src/shell-util.c

@@ -12,6 +12,7 @@
 #include <gdk/gdkx.h>
 #include <X11/extensions/XTest.h>
 
+#include <locale.h>
 #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
 #include <langinfo.h>
 #endif
@@ -208,6 +209,32 @@ 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

src/shell-util.h

@@ -21,6 +21,7 @@ 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,

src/st/st-border-image.c

@@ -27,7 +27,7 @@
 struct _StBorderImage {
   GObject parent;
 
-  char *filename;
+  GFile *file;
   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_free (image->filename);
+  g_object_unref (image->file);
 
   G_OBJECT_CLASS (st_border_image_parent_class)->finalize (object);
 }
@@ -67,7 +67,7 @@ st_border_image_init (StBorderImage *image)
 }
 
 StBorderImage *
-st_border_image_new (const char *filename,
+st_border_image_new (GFile *file,
                      int    border_top,
                      int    border_right,
                      int    border_bottom,
@@ -78,7 +78,7 @@ st_border_image_new (const char *filename,
 
   image = g_object_new (ST_TYPE_BORDER_IMAGE, NULL);
 
-  image->filename = g_strdup (filename);
+  image->file = g_object_ref (file);
   image->border_top = border_top;
   image->border_right = border_right;
   image->border_bottom = border_bottom;
@@ -88,12 +88,18 @@ st_border_image_new (const char *filename,
   return image;
 }
 
-const char *
+/**
-st_border_image_get_filename (StBorderImage *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)
 {
   g_return_val_if_fail (ST_IS_BORDER_IMAGE (image), NULL);
 
-  return image->filename;
+  return image->file;
 }
 
 void
@@ -135,5 +141,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 &&
-          strcmp (image->filename, other->filename) == 0);
+          g_file_equal (image->file, other->file));
 }

src/st/st-border-image.h

@@ -22,6 +22,7 @@
 #define __ST_BORDER_IMAGE_H__
 
 #include <glib-object.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
@@ -39,14 +40,14 @@ typedef struct _StBorderImageClass StBorderImageClass;
 
 GType             st_border_image_get_type          (void) G_GNUC_CONST;
 
-StBorderImage *st_border_image_new (const char *filename,
+StBorderImage *st_border_image_new (GFile      *file,
                                     int         border_top,
                                     int         border_right,
                                     int         border_bottom,
                                     int         border_left,
                                     int         scale_factor);
 
-const char *st_border_image_get_filename (StBorderImage *image);
+GFile      *st_border_image_get_file     (StBorderImage *image);
 void        st_border_image_get_borders  (StBorderImage *image,
                                           int           *border_top,
                                           int           *border_right,

src/st/st-scroll-view.c

@@ -373,6 +373,7 @@ 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;
@@ -382,6 +383,7 @@ 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:
@@ -443,6 +445,7 @@ 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:
@@ -454,6 +457,7 @@ 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:
@@ -480,6 +484,7 @@ 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;
@@ -567,7 +572,7 @@ st_scroll_view_allocate (ClutterActor          *actor,
             }
           else
             {
-              hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;
+              hscrollbar_visible = priv->hscrollbar_policy == GTK_POLICY_ALWAYS;
 
               /* try without a vertical scrollbar */
               clutter_actor_get_preferred_height (priv->child, avail_width, &child_min_height, NULL);
@@ -576,18 +581,20 @@ st_scroll_view_allocate (ClutterActor          *actor,
         }
       else
         {
-          vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER;
+          vscrollbar_visible = priv->vscrollbar_policy == GTK_POLICY_ALWAYS;
 
           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_NEVER;
+            hscrollbar_visible = priv->hscrollbar_policy == GTK_POLICY_ALWAYS;
         }
     }
   else
     {
-      hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;
+      hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER &&
-      vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER;
+                           priv->hscrollbar_policy != GTK_POLICY_EXTERNAL;
+      vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER &&
+                           priv->vscrollbar_policy != GTK_POLICY_EXTERNAL;
     }
 
   /* Whether or not we show the scrollbars, if the scrollbars are visible
@@ -629,15 +636,19 @@ st_scroll_view_allocate (ClutterActor          *actor,
 
   clutter_actor_allocate (priv->hscroll, &child_box, flags);
 
-  /* In case the scrollbar policy is NEVER or scrollbars should be
+  /* In case the scrollbar policy is NEVER or EXTERNAL or scrollbars
-   * overlayed, we don't trim the content box allocation by the
+   * should be overlayed, we don't trim the content box allocation by
-   * scrollbar size.
+   * the scrollbar size.
    * Fold this into the scrollbar sizes to simplify the rest of the
    * computations.
    */
-  if (priv->hscrollbar_policy == GTK_POLICY_NEVER || priv->overlay_scrollbars)
+  if (priv->hscrollbar_policy == GTK_POLICY_NEVER ||
+      priv->hscrollbar_policy == GTK_POLICY_EXTERNAL ||
+      priv->overlay_scrollbars)
     sb_height = 0;
-  if (priv->vscrollbar_policy == GTK_POLICY_NEVER || priv->overlay_scrollbars)
+  if (priv->vscrollbar_policy == GTK_POLICY_NEVER ||
+      priv->vscrollbar_policy == GTK_POLICY_EXTERNAL ||
+      priv->overlay_scrollbars)
     sb_width = 0;
 
   /* Child */

src/st/st-texture-cache.c

@@ -28,8 +28,8 @@
 #include <glib.h>
 
 #define CACHE_PREFIX_ICON "icon:"
-#define CACHE_PREFIX_URI "uri:"
+#define CACHE_PREFIX_FILE "file:"
-#define CACHE_PREFIX_URI_FOR_CAIRO "uri-for-cairo:"
+#define CACHE_PREFIX_FILE_FOR_CAIRO "file-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_STRING);
+                  G_TYPE_NONE, 1, G_TYPE_FILE);
 }
 
 /* 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_str_hash, g_str_equal,
+  self->priv->file_monitors = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
                                                      g_object_unref, g_object_unref);
 
 }
@@ -268,7 +268,7 @@ typedef struct {
 
   GtkIconInfo *icon_info;
   StIconColors *colors;
-  char *uri;
+  GFile *file;
 } 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->uri)
+  else if (data->file)
-    g_free (data->uri);
+    g_object_unref (data->file);
 
   if (data->key)
     g_free (data->key);
@@ -405,83 +405,17 @@ 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 (const char     *uri,
+impl_load_pixbuf_file (GFile          *file,
                        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,
@@ -490,7 +424,6 @@ impl_load_pixbuf_file (const char     *uri,
                                       error);
     }
 
-  g_object_unref (file);
   g_free (contents);
 
   return pixbuf;
@@ -507,9 +440,9 @@ load_pixbuf_thread (GSimpleAsyncResult *result,
 
   data = g_async_result_get_user_data (G_ASYNC_RESULT (result));
   g_assert (data != NULL);
-  g_assert (data->uri != NULL);
+  g_assert (data->file != NULL);
 
-  pixbuf = impl_load_pixbuf_file (data->uri, data->width, data->height, data->scale, &error);
+  pixbuf = impl_load_pixbuf_file (data->file, data->width, data->height, data->scale, &error);
 
   if (error != NULL)
     {
@@ -647,7 +580,7 @@ static void
 load_texture_async (StTextureCache       *cache,
                     AsyncTextureLoadData *data)
 {
-  if (data->uri)
+  if (data->file)
     {
       GSimpleAsyncResult *result;
       result = g_simple_async_result_new (G_OBJECT (cache), on_pixbuf_loaded, data, load_texture_async);
@@ -1014,46 +947,43 @@ file_changed_cb (GFileMonitor      *monitor,
                  gpointer           user_data)
 {
   StTextureCache *cache = user_data;
-  char *uri, *key;
+  char *key;
+  guint file_hash;
 
   if (event_type != G_FILE_MONITOR_EVENT_CHANGED)
     return;
 
-  uri = g_file_get_uri (file);
+  file_hash = g_file_hash (file);
 
-  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
+  key = g_strdup_printf (CACHE_PREFIX_FILE "%u", file_hash);
   g_hash_table_remove (cache->priv->keyed_cache, key);
   g_free (key);
 
-  key = g_strconcat (CACHE_PREFIX_URI_FOR_CAIRO, uri, NULL);
+  key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", file_hash);
   g_hash_table_remove (cache->priv->keyed_cache, key);
   g_free (key);
 
-  g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, uri);
+  g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, file);
-
-  g_free (uri);
 }
 
 static void
-ensure_monitor_for_uri (StTextureCache *cache,
+ensure_monitor_for_file (StTextureCache *cache,
-                        const gchar    *uri)
+                         GFile          *file)
 {
   StTextureCachePrivate *priv = cache->priv;
-  GFile *file = g_file_new_for_uri (uri);
 
-  if (g_hash_table_lookup (priv->file_monitors, uri) == NULL)
+  if (g_hash_table_lookup (priv->file_monitors, file) == 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_strdup (uri), monitor);
+      g_hash_table_insert (priv->file_monitors, g_object_ref (file), monitor);
     }
-  g_object_unref (file);
 }
 
 typedef struct {
-  gchar *path;
+  GFile *gfile;
   gint   grid_width, grid_height;
   gint   scale_factor;
   ClutterActor *actor;
@@ -1065,7 +995,7 @@ static void
 on_data_destroy (gpointer data)
 {
   AsyncImageData *d = (AsyncImageData *)data;
-  g_free (d->path);
+  g_object_unref (d->gfile);
   g_object_unref (d->actor);
   g_free (d);
 }
@@ -1138,7 +1068,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_get_contents (data->path, &buffer, &length, NULL))
+  if (!g_file_load_contents (data->gfile, NULL, &buffer, &length, NULL, NULL))
     goto out;
 
   if (!gdk_pixbuf_loader_write (loader, (const guchar *) buffer, length, NULL))
@@ -1173,7 +1103,7 @@ load_sliced_image (GSimpleAsyncResult *result,
 /**
  * st_texture_cache_load_sliced_image:
  * @cache: A #StTextureCache
- * @path: Path to a filename
+ * @file: A #GFile
  * @grid_width: Width in pixels
  * @grid_height: Height in pixels
  * @scale: Scale factor of the display
@@ -1189,7 +1119,7 @@ load_sliced_image (GSimpleAsyncResult *result,
  */
 ClutterActor *
 st_texture_cache_load_sliced_image (StTextureCache *cache,
-                                    const gchar    *path,
+                                    GFile          *file,
                                     gint            grid_width,
                                     gint            grid_height,
                                     gint            scale,
@@ -1204,7 +1134,7 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
   data->grid_width = grid_width;
   data->grid_height = grid_height;
   data->scale_factor = scale;
-  data->path = g_strdup (path);
+  data->gfile = g_object_ref (file);
   data->actor = actor;
   data->load_callback = load_callback;
   data->load_callback_data = user_data;
@@ -1221,9 +1151,9 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
 }
 
 /**
- * st_texture_cache_load_uri_async:
+ * st_texture_cache_load_file_async:
  * @cache: The texture cache instance
- * @uri: uri of the image file from which to create a pixbuf
+ * @file: a #GFile 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
@@ -1235,8 +1165,8 @@ 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_uri_async (StTextureCache *cache,
+st_texture_cache_load_file_async (StTextureCache *cache,
-                                 const gchar    *uri,
+                                  GFile          *file,
                                   int             available_width,
                                   int             available_height,
                                   int             scale)
@@ -1246,7 +1176,7 @@ st_texture_cache_load_uri_async (StTextureCache *cache,
   StTextureCachePolicy policy;
   gchar *key;
 
-  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
+  key = g_strdup_printf (CACHE_PREFIX_FILE "%u", g_file_hash (file));
 
   policy = ST_TEXTURE_CACHE_POLICY_NONE; /* XXX */
 
@@ -1264,7 +1194,7 @@ st_texture_cache_load_uri_async (StTextureCache *cache,
       request->cache = cache;
       /* Transfer ownership of key */
       request->key = key;
-      request->uri = g_strdup (uri);
+      request->file = g_object_ref (file);
       request->policy = policy;
       request->width = available_width;
       request->height = available_height;
@@ -1273,15 +1203,15 @@ st_texture_cache_load_uri_async (StTextureCache *cache,
       load_texture_async (cache, request);
     }
 
-  ensure_monitor_for_uri (cache, uri);
+  ensure_monitor_for_file (cache, file);
 
   return CLUTTER_ACTOR (texture);
 }
 
 static CoglTexture *
-st_texture_cache_load_uri_sync_to_cogl_texture (StTextureCache *cache,
+st_texture_cache_load_file_sync_to_cogl_texture (StTextureCache *cache,
                                                  StTextureCachePolicy policy,
-                                                const gchar    *uri,
+                                                 GFile          *file,
                                                  int             available_width,
                                                  int             available_height,
                                                  int             scale,
@@ -1291,13 +1221,13 @@ st_texture_cache_load_uri_sync_to_cogl_texture (StTextureCache *cache,
   GdkPixbuf *pixbuf;
   char *key;
 
-  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
+  key = g_strdup_printf (CACHE_PREFIX_FILE "%u", g_file_hash (file));
 
   texdata = g_hash_table_lookup (cache->priv->keyed_cache, key);
 
   if (texdata == NULL)
     {
-      pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, scale, error);
+      pixbuf = impl_load_pixbuf_file (file, available_width, available_height, scale, error);
       if (!pixbuf)
         goto out;
 
@@ -1313,7 +1243,7 @@ st_texture_cache_load_uri_sync_to_cogl_texture (StTextureCache *cache,
   else
     cogl_object_ref (texdata);
 
-  ensure_monitor_for_uri (cache, uri);
+  ensure_monitor_for_file (cache, file);
 
 out:
   g_free (key);
@@ -1321,9 +1251,9 @@ out:
 }
 
 static cairo_surface_t *
-st_texture_cache_load_uri_sync_to_cairo_surface (StTextureCache        *cache,
+st_texture_cache_load_file_sync_to_cairo_surface (StTextureCache        *cache,
                                                   StTextureCachePolicy   policy,
-                                                 const gchar           *uri,
+                                                  GFile                 *file,
                                                   int                    available_width,
                                                   int                    available_height,
                                                   int                    scale,
@@ -1333,13 +1263,13 @@ st_texture_cache_load_uri_sync_to_cairo_surface (StTextureCache        *cache,
   GdkPixbuf *pixbuf;
   char *key;
 
-  key = g_strconcat (CACHE_PREFIX_URI_FOR_CAIRO, uri, NULL);
+  key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", g_file_hash (file));
 
   surface = g_hash_table_lookup (cache->priv->keyed_cache, key);
 
   if (surface == NULL)
     {
-      pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, scale, error);
+      pixbuf = impl_load_pixbuf_file (file, available_width, available_height, scale, error);
       if (!pixbuf)
         goto out;
 
@@ -1355,7 +1285,7 @@ st_texture_cache_load_uri_sync_to_cairo_surface (StTextureCache        *cache,
   else
     cairo_surface_reference (surface);
 
-  ensure_monitor_for_uri (cache, uri);
+  ensure_monitor_for_file (cache, file);
 
 out:
   g_free (key);
@@ -1365,7 +1295,7 @@ out:
 /**
  * st_texture_cache_load_file_to_cogl_texture: (skip)
  * @cache: A #StTextureCache
- * @file_path: Path to a file in supported image format
+ * @file: A #GFile in supported image format
  * @scale: Scale factor of the display
  *
  * This function synchronously loads the given file path
@@ -1376,35 +1306,30 @@ out:
  */
 CoglTexture *
 st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
-                                            const gchar    *file_path,
+                                            GFile          *file,
                                             gint            scale)
 {
   CoglTexture *texture;
-  GFile *file;
-  char *uri;
   GError *error = NULL;
 
-  file = g_file_new_for_path (file_path);
+  texture = st_texture_cache_load_file_sync_to_cogl_texture (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
-  uri = g_file_get_uri (file);
+                                                             file, -1, -1, scale, &error);
-
-  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)
     {
-      g_warning ("Failed to load %s: %s", file_path, error->message);
+      char *uri = g_file_get_uri (file);
+      g_warning ("Failed to load %s: %s", uri, error->message);
       g_clear_error (&error);
-      return NULL;
+      g_free (uri);
     }
+
   return texture;
 }
 
 /**
  * st_texture_cache_load_file_to_cairo_surface:
  * @cache: A #StTextureCache
- * @file_path: Path to a file in supported image format
+ * @file: A #GFile in supported image format
  * @scale: Scale factor of the display
  *
  * This function synchronously loads the given file path
@@ -1415,28 +1340,23 @@ st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
  */
 cairo_surface_t *
 st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
-                                             const gchar    *file_path,
+                                             GFile          *file,
                                              gint            scale)
 {
   cairo_surface_t *surface;
-  GFile *file;
-  char *uri;
   GError *error = NULL;
 
-  file = g_file_new_for_path (file_path);
+  surface = st_texture_cache_load_file_sync_to_cairo_surface (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
-  uri = g_file_get_uri (file);
+                                                              file, -1, -1, scale, &error);
-
-  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)
     {
-      g_warning ("Failed to load %s: %s", file_path, error->message);
+      char *uri = g_file_get_uri (file);
+      g_warning ("Failed to load %s: %s", uri, error->message);
       g_clear_error (&error);
-      return NULL;
+      g_free (uri);
     }
+
   return surface;
 }
 

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,
-                                    const gchar    *path,
+                                    GFile          *file,
                                     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_uri_async (StTextureCache    *cache,
+ClutterActor *st_texture_cache_load_file_async (StTextureCache    *cache,
-                                               const gchar       *uri,
+                                                GFile             *file,
                                                 int                available_width,
                                                 int                available_height,
                                                 int                scale);
 
 CoglTexture     *st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
-                                                             const gchar    *file_path,
+                                                             GFile          *file,
                                                              gint            scale);
 
 cairo_surface_t *st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
-                                                              const gchar    *file_path,
+                                                              GFile          *file,
                                                               gint            scale);
 
 /**

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;
-  const char *file;
+  GFile *file;
 
   StTextureCache *texture_cache;
 
@@ -1037,7 +1037,7 @@ st_theme_node_prerender_background (StThemeNode *node,
     }
   else
     {
-      const char *background_image;
+      GFile *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;
 
-      const char *filename;
+      GFile *file;
-      filename = st_border_image_get_filename (border_image);
+      file = st_border_image_get_file (border_image);
 
       int scale_factor;
       g_object_get (node->context, "scale-factor", &scale_factor, NULL);
 
       node->border_slices_texture = st_texture_cache_load_file_to_cogl_texture (st_texture_cache_get_default (),
-                                                                                filename, scale_factor);
+                                                                                file, 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)
     {
-      const char *background_image;
+      GFile *background_image;
       StShadow *background_image_shadow_spec;
 
       background_image = st_theme_node_get_background_image (node);

src/st/st-theme-node-private.h

@@ -68,7 +68,7 @@ struct _StThemeNode {
 
   int transition_duration;
 
-  char *background_image;
+  GFile *background_image;
   StBorderImage *border_image;
   StShadow *box_shadow;
   StShadow *background_image_shadow;

src/st/st-theme-node.c

@@ -158,7 +158,10 @@ st_theme_node_finalize (GObject *object)
     }
 
   if (node->background_image)
-    g_free (node->background_image);
+    {
+      g_object_unref (node->background_image);
+      node->background_image = NULL;
+    }
 
   if (node->background_texture != COGL_INVALID_HANDLE)
     cogl_handle_unref (node->background_texture);
@@ -905,7 +908,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.
- * @value: (out): location to store the newly allocated value that was
+ * @file: (out) (transfer full): 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.
  *
@@ -920,7 +923,7 @@ gboolean
 st_theme_node_lookup_url (StThemeNode  *node,
                           const char   *property_name,
                           gboolean      inherit,
-                          char        **value)
+                          GFile       **file)
 {
   gboolean result = FALSE;
   int i;
@@ -935,7 +938,6 @@ 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;
@@ -945,23 +947,21 @@ st_theme_node_lookup_url (StThemeNode  *node,
           else
             base_stylesheet = NULL;
 
-          file = _st_theme_resolve_url (node->theme,
+          *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, value);
+    result = st_theme_node_lookup_url (node->parent_node, property_name, inherit, file);
 
   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.
  *
- * Return value: the newly allocated value if found.
+ * Returns: (transfer full): the newly allocated value if found.
  *  If @property_name is not found, a warning will be logged and %NULL
  *  will be returned.
  */
-char *
+GFile *
 st_theme_node_get_url (StThemeNode *node,
                        const char  *property_name)
 {
-  char *value;
+  GFile *file;
 
-  if (st_theme_node_lookup_url (node, property_name, FALSE, &value))
+  if (st_theme_node_lookup_url (node, property_name, FALSE, &file))
-    return value;
+    return file;
   else
     {
       g_warning ("Did not find string property '%s'", property_name);
@@ -1926,8 +1926,7 @@ _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_free (node->background_image);
+          g_clear_object (&node->background_image);
-          node->background_image = NULL;
           node->background_position_set = FALSE;
           node->background_size = ST_BACKGROUND_SIZE_AUTO;
 
@@ -1943,7 +1942,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_strdup (st_theme_node_get_background_image (node->parent_node));
+                      node->background_image = g_object_ref (st_theme_node_get_background_image (node->parent_node));
                     }
                 }
               else if (term_is_none (term))
@@ -1964,8 +1963,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
                                                 base_stylesheet,
                                                 term->content.str->stryng->str);
 
-                  node->background_image = g_file_get_path (file);
+                  node->background_image = file;
-                  g_object_unref (file);
                 }
             }
         }
@@ -2062,30 +2060,25 @@ _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_free (node->background_image);
+              g_clear_object (&node->background_image);
-              file = _st_theme_resolve_url (node->theme,
+              node->background_image = _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_free (node->background_image);
+              g_clear_object (&node->background_image);
-              node->background_image = g_strdup (st_theme_node_get_background_image (node->parent_node));
+              node->background_image = g_object_ref (st_theme_node_get_background_image (node->parent_node));
             }
           else if (term_is_none (decl->value))
             {
-              g_free (node->background_image);
+              g_clear_object (&node->background_image);
-              node->background_image = NULL;
             }
         }
       else if (strcmp (property_name, "-gradient-direction") == 0)
@@ -2142,7 +2135,13 @@ st_theme_node_get_background_color (StThemeNode  *node,
   *color = node->background_color;
 }
 
-const char *
+/**
+ * st_theme_node_get_background_image:
+ * @node: a #StThemeNode
+ *
+ * Returns: (transfer none): @node's background image.
+ */
+GFile *
 st_theme_node_get_background_image (StThemeNode *node)
 {
   g_return_val_if_fail (ST_IS_THEME_NODE (node), NULL);
@@ -2894,7 +2893,6 @@ 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))
@@ -2973,17 +2971,15 @@ 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 (filename == NULL)
+          if (file == NULL)
             goto next_property;
 
-          node->border_image = st_border_image_new (filename,
+          node->border_image = st_border_image_new (file,
                                                     border_top, border_right, border_bottom, border_left,
                                                     scale_factor);
 
-          g_free (filename);
+          g_object_unref (file);
 
           return node->border_image;
         }
@@ -3853,7 +3849,9 @@ st_theme_node_paint_equal (StThemeNode *node,
       !clutter_color_equal (&node->background_gradient_end, &other->background_gradient_end))
     return FALSE;
 
-  if (g_strcmp0 (node->background_image, other->background_image) != 0)
+  if ((node->background_image != NULL) &&
+      (other->background_image != NULL) &&
+      !g_file_equal (node->background_image, other->background_image))
     return FALSE;
 
   _st_theme_node_ensure_geometry (node);

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,
-                                      char        **value);
+                                      GFile       **file);
 
 /* 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);
-char         *st_theme_node_get_url    (StThemeNode  *node,
+GFile        *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);
 
-const char *st_theme_node_get_background_image (StThemeNode *node);
+GFile *st_theme_node_get_background_image (StThemeNode *node);
 
 int    st_theme_node_get_border_width  (StThemeNode  *node,
                                         StSide        side);

src/st/st-theme.c

@@ -60,13 +60,13 @@ struct _StTheme
 {
   GObject parent;
 
-  char *application_stylesheet;
+  GFile *application_stylesheet;
-  char *default_stylesheet;
+  GFile *default_stylesheet;
-  char *theme_stylesheet;
+  GFile *theme_stylesheet;
   GSList *custom_stylesheets;
 
-  GHashTable *stylesheets_by_filename;
+  GHashTable *stylesheets_by_file;
-  GHashTable *filenames_by_stylesheet;
+  GHashTable *files_by_stylesheet;
 
   CRCascade *cascade;
 };
@@ -98,12 +98,25 @@ 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_filename = g_hash_table_new_full (g_str_hash, g_str_equal,
+  theme->stylesheets_by_file = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
-                                                          (GDestroyNotify)g_free, (GDestroyNotify)cr_stylesheet_unref);
+                                                      (GDestroyNotify)g_object_unref, (GDestroyNotify)cr_stylesheet_unref);
-  theme->filenames_by_stylesheet = g_hash_table_new (g_direct_hash, g_direct_equal);
+  theme->files_by_stylesheet = g_hash_table_new (g_direct_hash, g_direct_equal);
 }
 
 static void
@@ -124,10 +137,10 @@ st_theme_class_init (StThemeClass *klass)
    */
   g_object_class_install_property (object_class,
                                    PROP_APPLICATION_STYLESHEET,
-                                   g_param_spec_string ("application-stylesheet",
+                                   g_param_spec_object ("application-stylesheet",
                                                         "Application Stylesheet",
                                                         "Stylesheet with application-specific styling",
-                                                        NULL,
+                                                        G_TYPE_FILE,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 
   /**
@@ -138,10 +151,10 @@ st_theme_class_init (StThemeClass *klass)
    */
   g_object_class_install_property (object_class,
                                    PROP_THEME_STYLESHEET,
-                                   g_param_spec_string ("theme-stylesheet",
+                                   g_param_spec_object ("theme-stylesheet",
                                                         "Theme Stylesheet",
                                                         "Stylesheet with theme-specific styling",
-                                                        NULL,
+                                                        G_TYPE_FILE,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 
   /**
@@ -152,10 +165,10 @@ st_theme_class_init (StThemeClass *klass)
    */
   g_object_class_install_property (object_class,
                                    PROP_DEFAULT_STYLESHEET,
-                                   g_param_spec_string ("default-stylesheet",
+                                   g_param_spec_object ("default-stylesheet",
                                                         "Default Stylesheet",
                                                         "Stylesheet with global default styling",
-                                                        NULL,
+                                                        G_TYPE_FILE,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 
   signals[STYLESHEETS_CHANGED] =
@@ -168,23 +181,32 @@ st_theme_class_init (StThemeClass *klass)
 }
 
 static CRStyleSheet *
-parse_stylesheet (const char  *filename,
+parse_stylesheet (GFile   *file,
                   GError **error)
 {
   enum CRStatus status;
   CRStyleSheet *stylesheet;
+  char *contents;
+  gsize length;
 
-  if (filename == NULL)
+  if (file == NULL)
     return NULL;
 
-  status = cr_om_parser_simply_parse_file ((const guchar *) filename,
+  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);
 
   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", filename, status);
+                   "Error parsing stylesheet '%s'; errcode:%d", uri, status);
+      g_free (uri);
       return NULL;
     }
 
@@ -203,12 +225,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 (const char *filename)
+parse_stylesheet_nofail (GFile *file)
 {
   GError *error = NULL;
   CRStyleSheet *result;
 
-  result = parse_stylesheet (filename, &error);
+  result = parse_stylesheet (file, &error);
   if (error)
     {
       g_warning ("%s", error->message);
@@ -219,35 +241,33 @@ parse_stylesheet_nofail (const char *filename)
 
 static void
 insert_stylesheet (StTheme      *theme,
-                   const char   *filename,
+                   GFile        *file,
                    CRStyleSheet *stylesheet)
 {
-  char *filename_copy;
-
   if (stylesheet == NULL)
     return;
 
-  filename_copy = g_strdup(filename);
+  g_object_ref (file);
   cr_stylesheet_ref (stylesheet);
 
-  g_hash_table_insert (theme->stylesheets_by_filename, filename_copy, stylesheet);
+  g_hash_table_insert (theme->stylesheets_by_file, file, stylesheet);
-  g_hash_table_insert (theme->filenames_by_stylesheet, stylesheet, filename_copy);
+  g_hash_table_insert (theme->files_by_stylesheet, stylesheet, file);
 }
 
 gboolean
 st_theme_load_stylesheet (StTheme    *theme,
-                          const char *path,
+                          GFile      *file,
                           GError    **error)
 {
   CRStyleSheet *stylesheet;
 
-  stylesheet = parse_stylesheet (path, error);
+  stylesheet = parse_stylesheet (file, error);
   if (!stylesheet)
     return FALSE;
 
   stylesheet->app_data = GUINT_TO_POINTER (TRUE);
 
-  insert_stylesheet (theme, path, stylesheet);
+  insert_stylesheet (theme, file, stylesheet);
   cr_stylesheet_ref (stylesheet);
   theme->custom_stylesheets = g_slist_prepend (theme->custom_stylesheets, stylesheet);
   g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
@@ -257,11 +277,11 @@ st_theme_load_stylesheet (StTheme    *theme,
 
 void
 st_theme_unload_stylesheet (StTheme    *theme,
-                            const char *path)
+                            GFile      *file)
 {
   CRStyleSheet *stylesheet;
 
-  stylesheet = g_hash_table_lookup (theme->stylesheets_by_filename, path);
+  stylesheet = g_hash_table_lookup (theme->stylesheets_by_file, file);
   if (!stylesheet)
     return;
 
@@ -269,8 +289,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_filename, path);
+  g_hash_table_remove (theme->stylesheets_by_file, file);
-  g_hash_table_remove (theme->filenames_by_stylesheet, stylesheet);
+  g_hash_table_remove (theme->files_by_stylesheet, stylesheet);
   cr_stylesheet_unref (stylesheet);
   g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
 }
@@ -279,7 +299,7 @@ st_theme_unload_stylesheet (StTheme    *theme,
  * st_theme_get_custom_stylesheets:
  * @theme: an #StTheme
  *
- * Returns: (transfer full) (element-type utf8): the list of stylesheet filenames
+ * Returns: (transfer full) (element-type GFile): the list of stylesheet files
  *          that were loaded with st_theme_load_stylesheet()
  */
 GSList*
@@ -291,9 +311,9 @@ st_theme_get_custom_stylesheets (StTheme *theme)
   for (iter = theme->custom_stylesheets; iter; iter = iter->next)
     {
       CRStyleSheet *stylesheet = iter->data;
-      gchar *filename = g_hash_table_lookup (theme->filenames_by_stylesheet, stylesheet);
+      GFile *file = g_hash_table_lookup (theme->files_by_stylesheet, stylesheet);
 
-      result = g_slist_prepend (result, g_strdup (filename));
+      result = g_slist_prepend (result, g_object_ref (file));
     }
 
   return result;
@@ -334,12 +354,12 @@ st_theme_finalize (GObject * object)
   g_slist_free (theme->custom_stylesheets);
   theme->custom_stylesheets = NULL;
 
-  g_hash_table_destroy (theme->stylesheets_by_filename);
+  g_hash_table_destroy (theme->stylesheets_by_file);
-  g_hash_table_destroy (theme->filenames_by_stylesheet);
+  g_hash_table_destroy (theme->files_by_stylesheet);
 
-  g_free (theme->application_stylesheet);
+  g_clear_object (&theme->application_stylesheet);
-  g_free (theme->theme_stylesheet);
+  g_clear_object (&theme->theme_stylesheet);
-  g_free (theme->default_stylesheet);
+  g_clear_object (&theme->default_stylesheet);
 
   if (theme->cascade)
     {
@@ -362,36 +382,39 @@ st_theme_set_property (GObject      *object,
     {
     case PROP_APPLICATION_STYLESHEET:
       {
-        const char *path = g_value_get_string (value);
+        GFile *file = g_value_get_object (value);
 
-        if (path != theme->application_stylesheet)
+        if (!file_equal0 (file, theme->application_stylesheet))
           {
-            g_free (theme->application_stylesheet);
+            g_clear_object (&theme->application_stylesheet);
-            theme->application_stylesheet = g_strdup (path);
+            if (file != NULL)
+              theme->application_stylesheet = g_object_ref (file);
           }
 
         break;
       }
     case PROP_THEME_STYLESHEET:
       {
-        const char *path = g_value_get_string (value);
+        GFile *file = g_value_get_object (value);
 
-        if (path != theme->theme_stylesheet)
+        if (!file_equal0 (file, theme->theme_stylesheet))
           {
-            g_free (theme->theme_stylesheet);
+            g_clear_object (&theme->theme_stylesheet);
-            theme->theme_stylesheet = g_strdup (path);
+            if (file != NULL)
+              theme->theme_stylesheet = g_object_ref (file);
           }
 
         break;
       }
     case PROP_DEFAULT_STYLESHEET:
       {
-        const char *path = g_value_get_string (value);
+        GFile *file = g_value_get_object (value);
 
-        if (path != theme->default_stylesheet)
+        if (!file_equal0 (file, theme->default_stylesheet))
           {
-            g_free (theme->default_stylesheet);
+            g_clear_object (&theme->default_stylesheet);
-            theme->default_stylesheet = g_strdup (path);
+            if (file != NULL)
+              theme->default_stylesheet = g_object_ref (file);
           }
 
         break;
@@ -413,13 +436,13 @@ st_theme_get_property (GObject    *object,
   switch (prop_id)
     {
     case PROP_APPLICATION_STYLESHEET:
-      g_value_set_string (value, theme->application_stylesheet);
+      g_value_set_object (value, theme->application_stylesheet);
       break;
     case PROP_THEME_STYLESHEET:
-      g_value_set_string (value, theme->theme_stylesheet);
+      g_value_set_object (value, theme->theme_stylesheet);
       break;
     case PROP_DEFAULT_STYLESHEET:
-      g_value_set_string (value, theme->default_stylesheet);
+      g_value_set_object (value, theme->default_stylesheet);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -439,9 +462,9 @@ st_theme_get_property (GObject    *object,
  * Return value: the newly created theme object
  **/
 StTheme *
-st_theme_new (const char       *application_stylesheet,
+st_theme_new (GFile       *application_stylesheet,
-              const char       *theme_stylesheet,
+              GFile       *theme_stylesheet,
-              const char       *default_stylesheet)
+              GFile       *default_stylesheet)
 {
   StTheme *theme = g_object_new (ST_TYPE_THEME,
                                     "application-stylesheet", application_stylesheet,
@@ -852,26 +875,19 @@ add_matched_properties (StTheme      *a_this,
 
             if (import_rule->sheet == NULL)
               {
-                char *filename = NULL;
+                GFile *file = 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);
-                    filename = g_file_get_path (file);
+                    import_rule->sheet = parse_stylesheet (file, NULL);
-
-                    g_object_unref (file);
                   }
 
-                if (filename)
-                  import_rule->sheet = parse_stylesheet (filename, NULL);
-
                 if (import_rule->sheet)
                   {
-                    insert_stylesheet (a_this, filename, import_rule->sheet);
+                    insert_stylesheet (a_this, file, import_rule->sheet);
                     /* refcount of stylesheets starts off at zero, so we don't need to unref! */
                   }
                 else
@@ -882,8 +898,8 @@ add_matched_properties (StTheme      *a_this,
                     import_rule->sheet = (CRStyleSheet *) - 1;
                   }
 
-                if (filename)
+                if (file)
-                  g_free (filename);
+                  g_object_unref (file);
               }
 
             if (import_rule->sheet != (CRStyleSheet *) - 1)
@@ -1008,8 +1024,8 @@ _st_theme_get_matched_properties (StTheme        *theme,
   return props;
 }
 
-/* Resolve an url from an url() reference in a stylesheet into an absolute
+/* Resolve an url from an url() reference in a stylesheet into a GFile,
- * local filename, if possible. The resolution here is distinctly lame and
+ * if possible. The resolution here is distinctly lame and
  * will fail on many examples.
  */
 GFile *
@@ -1018,7 +1034,7 @@ _st_theme_resolve_url (StTheme      *theme,
                        const char   *url)
 {
   char *scheme;
-  GFile *stylesheet, *resource;
+  GFile *resource;
 
   if ((scheme = g_uri_parse_scheme (url)))
     {
@@ -1027,21 +1043,18 @@ _st_theme_resolve_url (StTheme      *theme,
     }
   else if (base_stylesheet != NULL)
     {
-      const char *base_filename = NULL;
+      GFile *base_file = NULL, *parent;
-      char *dirname;
 
-      base_filename = g_hash_table_lookup (theme->filenames_by_stylesheet, base_stylesheet);
+      base_file = g_hash_table_lookup (theme->files_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_filename);
+      g_assert (base_file);
 
-      dirname = g_path_get_dirname (base_filename);
+      parent = g_file_get_parent (base_file);
-      stylesheet = g_file_new_for_path (dirname);
+      resource = g_file_resolve_relative_path (parent, url);
-      resource = g_file_resolve_relative_path (stylesheet, url);
 
-      g_object_unref (stylesheet);
+      g_object_unref (parent);
-      g_free (dirname);
     }
   else
     {

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 (const char *application_stylesheet,
+StTheme *st_theme_new (GFile *application_stylesheet,
-                       const char *theme_stylesheet,
+                       GFile *theme_stylesheet,
-                       const char *default_stylesheet);
+                       GFile *default_stylesheet);
 
-gboolean  st_theme_load_stylesheet        (StTheme *theme, const char *path, GError **error);
+gboolean  st_theme_load_stylesheet        (StTheme *theme, GFile *file, GError **error);
-void      st_theme_unload_stylesheet      (StTheme *theme, const char *path);
+void      st_theme_unload_stylesheet      (StTheme *theme, GFile *file);
 GSList   *st_theme_get_custom_stylesheets (StTheme *theme);
 
 G_END_DECLS

src/st/st-widget.c

@@ -277,26 +277,26 @@ current_paint_state (StWidget *widget)
 
 static void
 st_widget_texture_cache_changed (StTextureCache *cache,
-                                 const char     *uri,
+                                 GFile          *file,
                                  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;
 
-  path = g_filename_from_uri (uri, NULL, NULL);
+  theme_file = st_theme_node_get_background_image (node);
-
+  if ((theme_file != NULL) && g_file_equal (theme_file, file))
-  if (g_strcmp0 (st_theme_node_get_background_image (node), path) == 0)
     {
       st_theme_node_invalidate_background_image (node);
       changed = TRUE;
     }
 
-  if (g_strcmp0 (st_border_image_get_filename (st_theme_node_get_border_image (node)), path) == 0)
+  theme_file = st_border_image_get_file (st_theme_node_get_border_image (node));
+  if ((theme_file != NULL) && g_file_equal (theme_file, file))
     {
       st_theme_node_invalidate_border_image (node);
       changed = TRUE;
@@ -317,8 +317,6 @@ 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

src/st/test-theme.c

@@ -173,17 +173,21 @@ assert_background_image (StThemeNode *node,
 			 const char  *node_description,
 			 const char  *expected)
 {
-  const char *value = st_theme_node_get_background_image (node);
+  GFile *value = st_theme_node_get_background_image (node);
-  if (expected == NULL)
+  GFile *expected_file;
-    expected = "(null)";
-  if (value == NULL)
-    value = "(null)";
 
-  if (strcmp (expected, value) != 0)
+  if (expected != NULL && value != NULL)
     {
+      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, value);
+                   test, node_description, expected, uri);
           fail = TRUE;
+          g_free (uri);
+        }
     }
 }
 
@@ -426,14 +430,16 @@ 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;
 
-  theme = st_theme_new ("st/test-theme.css",
+  file = g_file_new_for_path ("st/test-theme.css");
-                        NULL, NULL);
+  theme = st_theme_new (file, NULL, NULL);
+  g_object_unref (file);
 
   stage = clutter_stage_new ();
   context = st_theme_context_get_for_stage (CLUTTER_STAGE (stage));

tests/interactive/scroll-view-sizing.js

@@ -312,6 +312,9 @@ function test() {
 	    button.label = 'NEVER';
 	    break;
         case 'NEVER':
+	    button.label = 'EXTERNAL';
+	    break;
+        case 'EXTERNAL':
 	    button.label = 'AUTOMATIC';
 	    break;
         }

tests/testcommon/ui.js

@@ -1,6 +1,7 @@
 // -*- 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;
 
@@ -10,7 +11,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: stylesheetPath });
+    let theme = new St.Theme({ application_stylesheet: Gio.File.new_for_path(stylesheetPath) });
     context.set_theme(theme);
 }