From 4e10e30c2f99d552239871aa1b27a08a6c18f1a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 5 Jun 2016 04:23:39 +0200
Subject: Imported Upstream version 0.23.1

---
 src/PhotoPage.vala | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/PhotoPage.vala')

diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index c4175a3..ce57c2f 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.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.
@@ -1136,6 +1136,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
                 
                 set_pixbuf(pixbuf, photo.get_dimensions());
             } catch (GLib.Error err) {
+                set_pixbuf(new Gdk.Pixbuf(Gdk.Colorspace.RGB, false, 8, 1, 1), photo.get_dimensions());
                 warning("%s", err.message);
             }
         }
@@ -1159,11 +1160,8 @@ public abstract class EditingHostPage : SinglePhotoPage {
             }
         }
         if (pixbuf == null) {
-            // Create empty pixbuf.
-            pixbuf = AppWindow.get_instance().render_icon("image-missing", 
-                Gtk.IconSize.DIALOG, null);
+            pixbuf = get_placeholder_pixbuf();
             get_canvas_scaling().perform_on_pixbuf(pixbuf, Gdk.InterpType.NEAREST, true);
-            
         }
         return pixbuf;
     }
-- 
cgit v1.2.3