diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-06-05 04:23:52 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-06-05 04:23:52 +0200 |
commit | bec5f87053759705fb77bae1aa378f2666c7d153 (patch) | |
tree | bd955b9777aa39b207fa161edf19a6609f822909 /src/camera/ImportPage.vala | |
parent | 1c99a41a296cda6647edc32437a813f6923cb1d0 (diff) | |
parent | 4e10e30c2f99d552239871aa1b27a08a6c18f1a4 (diff) |
Merge tag 'upstream/0.23.1'
Upstream version 0.23.1
Diffstat (limited to 'src/camera/ImportPage.vala')
-rw-r--r-- | src/camera/ImportPage.vala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala index ba66990..daece35 100644 --- a/src/camera/ImportPage.vala +++ b/src/camera/ImportPage.vala @@ -1,4 +1,4 @@ -/* Copyright 2009-2015 Yorba Foundation +/* Copyright 2016 Software Freedom Conservancy Inc. * * This software is licensed under the GNU LGPL (version 2.1 or later). * See the COPYING file in this distribution. @@ -289,8 +289,7 @@ class ImportPreview : MediaSourceItem { bool using_placeholder = (pixbuf == null); if (pixbuf == null) { if (placeholder_preview == null) { - placeholder_preview = AppWindow.get_instance().render_icon("image-missing", - Gtk.IconSize.DIALOG, null); + placeholder_preview = get_placeholder_pixbuf(); placeholder_preview = scale_pixbuf(placeholder_preview, MAX_SCALE, Gdk.InterpType.BILINEAR, true); } |