[arch-commits] Commit in lightdm/trunk (PKGBUILD lightdm-desktop-names.patch)

[Maxime Gauduin]

    Date: Friday, October 17, 2014 @ 16:27:14
  Author: alucryd
Revision: 120877

FS#42420: lightdm 1:1.12.0-2

Added:
  lightdm/trunk/lightdm-desktop-names.patch
Modified:
  lightdm/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |    5 ++++-
 lightdm-desktop-names.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-17 14:18:43 UTC (rev 120876)
+++ PKGBUILD	2014-10-17 14:27:14 UTC (rev 120877)
@@ -5,7 +5,7 @@
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
 pkgver=1.12.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='A lightweight display manager'
 arch=('i686' 'x86_64')
@@ -20,6 +20,7 @@
         'lightdm-autologin.pam'
         'lightdm.rules'
         'lightdm-default-config.patch'
+        'lightdm-desktop-names.patch'
         'Xsession')
 sha256sums=('eee3e440c329fddf969b6a76c2717ae1c758972adad5c6ffa1038626de303f5f'
             '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
@@ -28,11 +29,13 @@
             '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
             'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
             'ed3dca57ef19d32499b72668bc78eaff0d9e772718b76f3816c5ee5f816b1891'
+            'b750b805e4a87bf3d764255085d49be093c48acb1c5bb2e94b5a1d4c464d99d5'
             '4d5674906742200b3c171f978457e943560f2c10a2b9156fcd44da3796d185a2')
 
 prepare() {
   cd lightdm-${pkgver}
 
+  patch -Np0 -i ../lightdm-desktop-names.patch
   patch -Np1 -i ../lightdm-default-config.patch
 }
 

Added: lightdm-desktop-names.patch
===================================================================
--- lightdm-desktop-names.patch	                        (rev 0)
+++ lightdm-desktop-names.patch	2014-10-17 14:27:14 UTC (rev 120877)
@@ -0,0 +1,34 @@
+=== modified file 'src/session-config.c'
+--- src/session-config.c	2014-09-11 23:50:44 +0000
++++ src/session-config.c	2014-10-17 05:54:58 +0000
+@@ -34,6 +34,7 @@
+     GKeyFile *desktop_file;
+     SessionConfig *config;
+     gchar *command;
++    gchar **desktop_names;
+ 
+     desktop_file = g_key_file_new ();
+     if (!g_key_file_load_from_file (desktop_file, filename, G_KEY_FILE_NONE, error))
+@@ -54,7 +55,12 @@
+     if (!config->priv->session_type)
+         config->priv->session_type = g_strdup ("x");
+ 
+-    config->priv->desktop_name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "DesktopNames", NULL);
++    desktop_names = g_key_file_get_string_list (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "DesktopNames", NULL, NULL);
++    if (desktop_names != NULL)
++    {
++        config->priv->desktop_name = g_strjoinv (":", desktop_names);
++        g_strfreev (desktop_names);
++    }
+     if (!config->priv->desktop_name)
+         config->priv->desktop_name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-DesktopName", NULL);
+     config->priv->compositor_command = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-System-Compositor-Command", NULL);
+@@ -96,6 +102,7 @@
+ session_config_init (SessionConfig *config)
+ {
+     config->priv = G_TYPE_INSTANCE_GET_PRIVATE (config, SESSION_CONFIG_TYPE, SessionConfigPrivate);
++    config->priv->desktop_name = NULL;
+ }
+ 
+ static void
+