diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2019-07-12 16:16:34 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2019-07-12 16:16:34 +0200 |
| commit | e905afb102569e93e2f6ece9a9ab515ac1fd4f04 (patch) | |
| tree | 56c764f3a3fe3848ef2aa161d143f33cb2eaeb8e /src/Resources.vala | |
| parent | 71137cc5832110d91599d68790402cf196762ed3 (diff) | |
| parent | cb774d1baf242adcc03a1df5eed6d100f7e3bd55 (diff) | |
Merge branch 'release/debian/0.30.4-1'debian/0.30.4-1
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) |