From d56bd75967cc3802fa6d353ca4b6538a7300473b Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Fri, 31 Jan 2014 12:53:07 +0000
Subject: [PATCH] lightdm-gtk-greeter: Update to 1.6.1

---
 .../lightdm-gtk-greeter/default.nix            |  7 ++++---
 .../lightdm-gtk-greeter.patch                  | 18 +++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 0b8863752d2..0e75005d13b 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -10,18 +10,18 @@
 
 let
   ver_branch = "1.6";
-  version = "1.5.1"; # 1.5.2 and 1.6.0 result into infinite cycling of X in restarts
+  version = "1.6.1";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-gtk-greeter-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
-    sha256 = "08fnsbnay5jhd7ps8n91i6c227zq6xizpyn34qhqzykrga8pxkpc";
+    sha256 = "1nb8ljrbrp1zga083g3b633xi3izxxm4jipw1qgial1x16mqc0hz";
   };
 
   patches = [ ./lightdm-gtk-greeter.patch ];
-  patchFlags = "-p0";
+  patchFlags = "-p1";
 
   buildInputs = [ pkgconfig lightdm intltool ]
     ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]);
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://launchpad.net/lightdm-gtk-greeter;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
   };
 }
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
index 5ae5603b4dd..ea9e0eaec93 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
@@ -1,13 +1,13 @@
-=== modified file 'src/lightdm-gtk-greeter.c'
---- src/lightdm-gtk-greeter.c	2013-02-09 23:20:39 +0000
-+++ src/lightdm-gtk-greeter.c	2013-03-29 12:21:34 +0000
-@@ -1273,7 +1273,7 @@
-     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (session_combo), renderer, TRUE);
-     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (session_combo), renderer, "text", 0);
-     model = gtk_combo_box_get_model (session_combo);
+diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c
+index cc5f9e1..d615dc1 100644
+--- a/src/lightdm-gtk-greeter.c
++++ b/src/lightdm-gtk-greeter.c
+@@ -1716,7 +1716,7 @@ main (int argc, char **argv)
+     gtk_container_add (GTK_CONTAINER (menuitem), image);
+     gtk_widget_show (GTK_WIDGET (menuitem));
+     
 -    items = lightdm_get_sessions ();
 +    items = lightdm_get_sessions (greeter);
+     GSList *sessions = NULL;
      for (item = items; item; item = item->next)
      {
-         LightDMSession *session = item->data;
-