[lightdm-gtk] 1.8.5 (#1094437)

[Rex Dieter]

commit 3b0c7bbe488c853ad3372293a68aab48f973d5b1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon May 5 13:43:27 2014 -0500

    1.8.5 (#1094437)

 .gitignore                               |    2 +-
 lightdm-gtk-greeter-1.8.2-bg_crash.patch |   12 ------------
 lightdm-gtk-greeter-1.8.5-bg_crash.patch |   12 ++++++++++++
 lightdm-gtk.spec                         |    7 +++++--
 sources                                  |    2 +-
 5 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57a3308..4fb7c24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lightdm-gtk-greeter-1.8.4.tar.gz
+/lightdm-gtk-greeter-1.8.5.tar.gz
diff --git a/lightdm-gtk-greeter-1.8.5-bg_crash.patch b/lightdm-gtk-greeter-1.8.5-bg_crash.patch
new file mode 100644
index 0000000..1941edd
--- /dev/null
+++ b/lightdm-gtk-greeter-1.8.5-bg_crash.patch
@@ -0,0 +1,12 @@
+diff -up lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c.bg_crash lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c
+--- lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c.bg_crash	2014-05-05 13:39:10.833190035 -0500
++++ lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c	2014-05-05 13:41:53.725481558 -0500
+@@ -2060,7 +2060,7 @@ set_background (GdkPixbuf *new_bg)
+         {
+             gdk_screen_get_monitor_geometry (screen, monitor, &monitor_geometry);
+ 
+-            if (bg)
++            if (bg && (monitor_geometry.width > 0) && (monitor_geometry.height > 0))
+             {
+                 p_width = gdk_pixbuf_get_width (bg);
+                 p_height = gdk_pixbuf_get_height (bg);
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index ffe3d24..190eb82 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -3,7 +3,7 @@
 
 Summary:        LightDM GTK+ Greeter
 Name:           lightdm-gtk
-Version:        1.8.4
+Version:        1.8.5
 Release:        1%{?dist}
 
 License:        GPLv3+
@@ -16,7 +16,7 @@ Patch1:         lightdm-gtk-greeter-1.8.1-fedora.patch
 ## upstreamable patches
 # avoid setting background when given bogus screen geometry
 # http://bugzilla.redhat.com/915986
-Patch50:        lightdm-gtk-greeter-1.8.2-bg_crash.patch
+Patch50:        lightdm-gtk-greeter-1.8.5-bg_crash.patch
 
 
 ## upstream patches
@@ -106,6 +106,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Mon May 05 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-1
+- 1.8.5 (#1094437)
+
 * Mon Mar 31 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.4-1
 - 1.8.4 (#1076529)
 
diff --git a/sources b/sources
index beda0f1..5214f92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42d32b6504addcc7cd74058e901dbcc5  lightdm-gtk-greeter-1.8.4.tar.gz
+ce1384d6738a5757d26091792f29f1e1  lightdm-gtk-greeter-1.8.5.tar.gz