diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2019-04-28 16:46:41 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2019-04-28 16:46:41 +0200 |
| commit | 6d3354ff2e7ce13feeae1b75d94a186d86f82d89 (patch) | |
| tree | 2d908584bfb663268004e19a23e02ce6c65034c5 /src/Resources.vala | |
| parent | 6dd5e6966c6ec10d38d4b620a053ae262ac60d86 (diff) | |
| parent | 7385922cd37e4ffe65f4af34b2795307a76670c4 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/Resources.vala')
| -rw-r--r-- | src/Resources.vala | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Resources.vala b/src/Resources.vala index 8fabbe4..801305c 100644 --- a/src/Resources.vala +++ b/src/Resources.vala @@ -88,7 +88,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc., public const int ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE = 16; public const int ICON_ZOOM_SCALE = 16; - public const string ICON_CAMERAS = "camera-photo"; + public const string ICON_CAMERAS = "camera-photo-symbolic"; public const string ICON_EVENTS = "multiple-events-symbolic"; public const string ICON_ONE_EVENT = "one-event-symbolic"; public const string ICON_NO_EVENT = "no-event-symbolic"; @@ -1038,11 +1038,13 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc., debug("Failed to find icon %s in theme, falling back to resources", name); } - try { - var path = "/org/gnome/Shotwell/icons/%s".printf(name); - pixbuf = new Gdk.Pixbuf.from_resource(path); - } catch (Error err) { - critical("Unable to load icon %s: %s", name, err.message); + if (pixbuf == null) { + try { + var path = "/org/gnome/Shotwell/icons/%s".printf(name); + pixbuf = new Gdk.Pixbuf.from_resource(path); + } catch (Error err) { + critical("Unable to load icon %s: %s", name, err.message); + } } if (pixbuf == null) |