[lightdm-gtk] 1.8.2 (#1047209)

[Rex Dieter]

commit cd72a41eb24d60712c1a6b55cb0cb1e8655cec63
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Mar 4 10:21:04 2014 -0600

    1.8.2 (#1047209)

 .gitignore                                 |    2 +-
 lightdm-gtk-greeter-1.5.2-bg_crash.patch   |   12 --------
 lightdm-gtk-greeter-1.8.2-bg_crash.patch   |   12 ++++++++
 lightdm-gtk-greeter-validate_session.patch |   41 ----------------------------
 lightdm-gtk.spec                           |   11 +++----
 sources                                    |    2 +-
 6 files changed, 19 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c35a78..d65a855 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lightdm-gtk-greeter-1.8.1.tar.gz
+/lightdm-gtk-greeter-1.8.2.tar.gz
diff --git a/lightdm-gtk-greeter-1.8.2-bg_crash.patch b/lightdm-gtk-greeter-1.8.2-bg_crash.patch
new file mode 100644
index 0000000..d2bdd35
--- /dev/null
+++ b/lightdm-gtk-greeter-1.8.2-bg_crash.patch
@@ -0,0 +1,12 @@
+diff -up lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c.bg_crash lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c
+--- lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c.bg_crash	2014-03-02 08:45:24.000000000 -0600
++++ lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c	2014-03-04 10:19:37.933758554 -0600
+@@ -2088,7 +2088,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 dee8b4d..c192bf7 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -3,7 +3,7 @@
 
 Summary:        LightDM GTK+ Greeter
 Name:           lightdm-gtk
-Version:        1.8.1
+Version:        1.8.2
 Release:        1%{?dist}
 
 License:        GPLv3+
@@ -16,10 +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.5.2-bg_crash.patch
-# lightdm-gtk-greeter segfaults if session last used is uninstalled (and has a silly cache location)
-# http://bugzilla.redhat.com/1002782
-Patch51:        lightdm-gtk-greeter-validate_session.patch
+Patch50:        lightdm-gtk-greeter-1.8.2-bg_crash.patch
 
 
 ## upstream patches
@@ -54,7 +51,6 @@ A LightDM greeter that uses the GTK+ toolkit.
 
 %patch1 -p1 -b .fedora
 %patch50 -p1 -b .bg_crash
-%patch51 -p1 -b .validate_session
 
 
 %build
@@ -106,6 +102,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Tue Mar 04 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.2-1
+- 1.8.2 (#1047209)
+
 * Thu Feb 20 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.1-1
 - 1.8.1
 
diff --git a/sources b/sources
index a52f5e6..c863b9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40a1c7305cf2281e3f49d5ce5d82b649  lightdm-gtk-greeter-1.8.1.tar.gz
+5fce1dc5a691fe8a12a6e7af3152220f  lightdm-gtk-greeter-1.8.2.tar.gz