[arch-commits] Commit in lightdm-gtk3-greeter/trunk (PKGBUILD fix-null-username.patch)

[Maxime Gauduin]

    Date: Sunday, February 2, 2014 @ 12:18:34
  Author: alucryd
Revision: 105172

FS#38716: lightdm-gtk3-greeter 1:1.6.1-2

Added:
  lightdm-gtk3-greeter/trunk/fix-null-username.patch
Modified:
  lightdm-gtk3-greeter/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   14 ++++++-
 fix-null-username.patch |   83 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-02 11:07:34 UTC (rev 105171)
+++ PKGBUILD	2014-02-02 11:18:34 UTC (rev 105172)
@@ -4,7 +4,7 @@
 
 pkgname=lightdm-gtk3-greeter
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="GTK+ greeter for LightDM"
 arch=('i686' 'x86_64')
@@ -15,9 +15,17 @@
 provides=("${pkgname/3/}")
 conflicts=("${pkgname/3/2}")
 backup=('etc/lightdm/lightdm-gtk-greeter.conf')
-source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz")
-sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9')
+source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz"
+        'fix-null-username.patch')
+sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9'
+            '27e1ec5f73f963ea5fbc69d4b380dbfa47a4066b35fa1a00341203568d9aa64d')
 
+prepare() {
+  cd ${pkgname/3/}-${pkgver}
+
+  patch -Np0 -i ../fix-null-username.patch
+}
+
 build() {
   cd ${pkgname/3/}-${pkgver}
 

Added: fix-null-username.patch
===================================================================
--- fix-null-username.patch	                        (rev 0)
+++ fix-null-username.patch	2014-02-02 11:18:34 UTC (rev 105172)
@@ -0,0 +1,83 @@
+=== modified file 'src/lightdm-gtk-greeter.c'
+--- src/lightdm-gtk-greeter.c	2014-01-07 11:02:12 +0000
++++ src/lightdm-gtk-greeter.c	2014-01-08 00:21:56 +0000
+@@ -333,7 +333,7 @@
+             gchar *s;
+             gboolean matched;
+             s = g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "session-key"));
+-            matched = strcmp (s, session) == 0;
++            matched = g_strcmp0 (s, session) == 0;
+             g_free (s);
+             if (matched)
+             {
+@@ -402,7 +402,7 @@
+             gchar *s;
+             gboolean matched;
+             s = g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "language-code"));
+-            matched = strcmp (s, language) == 0;
++            matched = g_strcmp0 (s, language) == 0;
+             g_free (s);
+             if (matched)
+             {
+@@ -423,7 +423,7 @@
+ static void
+ set_message_label (const gchar *text)
+ {
+-    gtk_widget_set_visible (GTK_WIDGET (info_bar), strcmp (text, "") != 0);
++    gtk_widget_set_visible (GTK_WIDGET (info_bar), g_strcmp0 (text, "") != 0);
+     gtk_label_set_text (message_label, text);
+ }
+ 
+@@ -633,13 +633,13 @@
+     }
+     g_free (data);
+ 
+-    if (strcmp (username, "*other") == 0)
++    if (g_strcmp0 (username, "*other") == 0)
+     {
+         gtk_widget_show (GTK_WIDGET (username_entry));
+         gtk_widget_show (GTK_WIDGET (cancel_button));
+         lightdm_greeter_authenticate (greeter, NULL);
+     }
+-    else if (strcmp (username, "*guest") == 0)
++    else if (g_strcmp0 (username, "*guest") == 0)
+     {
+         lightdm_greeter_authenticate_as_guest (greeter);
+     }
+@@ -689,7 +689,7 @@
+         gchar *user;
+ 
+         gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &user, -1);
+-        other = (strcmp (user, "*other") == 0);
++        other = (g_strcmp0 (user, "*other") == 0);
+         g_free (user);
+     }
+ 
+@@ -964,7 +964,7 @@
+ 
+         gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &user, -1);
+ 
+-        if (strcmp (user, "*other") == 0)
++        if (g_strcmp0 (user, "*other") == 0)
+         {
+             gtk_widget_show (GTK_WIDGET (username_entry));
+             gtk_widget_show (GTK_WIDGET (cancel_button));
+@@ -1463,7 +1463,7 @@
+             do
+             {
+                 gtk_tree_model_get (model, &iter, 0, &name, -1);
+-                matched = strcmp (name, selected_user) == 0;
++                matched = g_strcmp0 (name, selected_user) == 0;
+                 g_free (name);
+                 if (matched)
+                 {
+@@ -1954,7 +1954,7 @@
+         g_object_set (gtk_settings_get_default (), "gtk-xft-dpi", (int) (1024 * atof (value)), NULL);
+     value = g_key_file_get_value (config, "greeter", "xft-antialias", NULL);
+     if (value)
+-        g_object_set (gtk_settings_get_default (), "gtk-xft-antialias", strcmp (value, "true") == 0, NULL);
++        g_object_set (gtk_settings_get_default (), "gtk-xft-antialias", g_strcmp0 (value, "true") == 0, NULL);
+     g_free (value);
+     value = g_key_file_get_value (config, "greeter", "xft-hintstyle", NULL);
+     if (value)
+