[Xfce4-commits] r29384 - in xfce4-session/trunk: . xfce4-session

[Brian Tarricone]

Author: kelnos
Date: 2009-01-26 09:50:20 +0000 (Mon, 26 Jan 2009)
New Revision: 29384

Modified:
   xfce4-session/trunk/ChangeLog
   xfce4-session/trunk/NEWS
   xfce4-session/trunk/xfce4-session/main.c
Log:
	* xfce4-session/main.c: Respect the ICEAUTHORITY environment
	  variable (bug 4369).

Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog	2009-01-26 01:38:57 UTC (rev 29383)
+++ xfce4-session/trunk/ChangeLog	2009-01-26 09:50:20 UTC (rev 29384)
@@ -1,3 +1,8 @@
+2009-10-26	Brian Tarricone <bjt23 at cornell.edu>
+
+	* xfce4-session/main.c: Respect the ICEAUTHORITY environment
+	  variable (bug 4369).
+
 2009-01-26	Jannis Pohlmann <jannis at xfce.org>
 
 	* == Released 4.5.99.1 ==

Modified: xfce4-session/trunk/NEWS
===================================================================
--- xfce4-session/trunk/NEWS	2009-01-26 01:38:57 UTC (rev 29383)
+++ xfce4-session/trunk/NEWS	2009-01-26 09:50:20 UTC (rev 29384)
@@ -1,5 +1,11 @@
+4.5.99.2 (Xfce 4.6rc2)
+======================
+
+- Respect the ICEAUTHORITY env var (bug 4369).
+
 4.5.99.1 (Xfce 4.6rc1)
 ======================
+
 - Translation updates: cs, da, fr, nb_NO, pt_BR, sv, zh_CN.
 
 4.5.93 (Xfce 4.6beta3)

Modified: xfce4-session/trunk/xfce4-session/main.c
===================================================================
--- xfce4-session/trunk/xfce4-session/main.c	2009-01-26 01:38:57 UTC (rev 29383)
+++ xfce4-session/trunk/xfce4-session/main.c	2009-01-26 09:50:20 UTC (rev 29384)
@@ -99,8 +99,11 @@
       xfce_unsetenv ("GDM_LANG");
     }
 
-  /* check access to $HOME/.ICEauthority */
-  authfile = xfce_get_homefile (".ICEauthority", NULL);
+  /* check access to $ICEAUTHORITY or $HOME/.ICEauthority if unset */
+  if (g_getenv ("ICEAUTHORITY"))
+    authfile = g_strdup (g_getenv ("ICEAUTHORITY"));
+  else
+    authfile = xfce_get_homefile (".ICEauthority", NULL);
   fd = open (authfile, O_RDWR | O_CREAT, 0600);
   if (fd < 0)
     {