[arch-commits] Commit in gdm/trunk (2 files)

[Ionut Biru]

    Date: Monday, December 6, 2010 @ 21:03:59
  Author: ibiru
Revision: 102250

upgpkg: gdm 2.32.0-4
fix version display in login window. patch sent upstream

Added:
  gdm/trunk/0001-Fix-version-in-login-window-when-file-is-empty.patch
Modified:
  gdm/trunk/PKGBUILD

-----------------------------------------------------------+
 0001-Fix-version-in-login-window-when-file-is-empty.patch |   28 ++++++++++++
 PKGBUILD                                                  |    5 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

Added: 0001-Fix-version-in-login-window-when-file-is-empty.patch
===================================================================
--- 0001-Fix-version-in-login-window-when-file-is-empty.patch	                        (rev 0)
+++ 0001-Fix-version-in-login-window-when-file-is-empty.patch	2010-12-07 02:03:59 UTC (rev 102250)
@@ -0,0 +1,28 @@
+From d4b48de2495068d9b635a7ab475ace06476d5a42 Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru at archlinux.org>
+Date: Mon, 6 Dec 2010 17:44:44 -0800
+Subject: [PATCH] Fix version in login window when file is empty
+
+fgets return NULL and there is no point duplicating the line with random
+value from buf.
+
+Signed-off-by: Ionut Biru <ibiru at archlinux.org>
+---
+ gui/simple-greeter/gdm-greeter-login-window.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
+index ca170a5..0823a3c 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.c
++++ b/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -1096,6 +1096,7 @@ file_read_one_line (const char *filename)
+ 
+         if (fgets (buf, sizeof (buf), f) == NULL) {
+                 g_warning ("Unable to read from file %s", filename);
++                goto out;
+         }
+ 
+         line = g_strdup (buf);
+-- 
+1.7.3.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-07 00:02:20 UTC (rev 102249)
+++ PKGBUILD	2010-12-07 02:03:59 UTC (rev 102250)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gdm
 pkgver=2.32.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -20,6 +20,7 @@
         04_fix_external_program_directories.patch
         gdm-vt-allocation-hack.patch
         0001-port-to-libpanel-applet-3.0.patch
+        0001-Fix-version-in-login-window-when-file-is-empty.patch
         gdm.pam
         gdm-autologin.pam
         gdm)
@@ -27,6 +28,7 @@
             'cb585c39c6671387b5a25f21a99c97e3a20eaf4188fea1b62871681a1ebf8bff'
             '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
             '41ca4b2408d61776ab42c50834374a90664d43d33ad7034c7c52862d9bf3234a'
+            '9bcdb1a977e93824ef5f693610a964790befa3dd7e7662746fb8ba1212ecdefd'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
             '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
             '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
@@ -36,6 +38,7 @@
   patch -Np1 -i "${srcdir}/04_fix_external_program_directories.patch"
   patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
   patch -Np1 -i "${srcdir}/0001-port-to-libpanel-applet-3.0.patch"
+  patch -Np1 -i "${srcdir}/0001-Fix-version-in-login-window-when-file-is-empty.patch"
   autoreconf -fi
 
   ./configure --prefix=/usr --sysconfdir=/etc \