summaryrefslogtreecommitdiff
path: root/src/Resources.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2019-04-28 16:45:51 +0200
committerJörg Frings-Fürst <debian@jff.email>2019-04-28 16:45:51 +0200
commit7385922cd37e4ffe65f4af34b2795307a76670c4 (patch)
tree2d908584bfb663268004e19a23e02ce6c65034c5 /src/Resources.vala
parent6dd5e6966c6ec10d38d4b620a053ae262ac60d86 (diff)
parent6710aa856175300e598b23b701c0d2741f2cb6b3 (diff)
Update upstream source from tag 'upstream/0.30.4'
Update to upstream version '0.30.4' with Debian dir 2d4b66e5f883875fb1420e1b17811073c8065d44
Diffstat (limited to 'src/Resources.vala')
-rw-r--r--src/Resources.vala14
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)