From 3be4bed1ac236af772aedc81daf8c2c9e97032ae Mon Sep 17 00:00:00 2001
From: George Lebl <jirka@5z.com>
Date: Wed, 24 Sep 2003 20:23:42 +0000
Subject: don't exec chooser/greeter in shell that's kind of evil and resets
 too

Wed Sep 24 13:21:43 2003  George Lebl <jirka@5z.com>

	* daemon/slave.c: don't exec chooser/greeter in shell that's kind of
	  evil and resets too many env vars.  Instead reset to the original
	  env first and then setup our env vars and exec the greeter or
	  chooser.

	* gui/greeter/greeter.c, gui/greeter/greeter_canvas_item.[ch],
	  gui/greeter/greeter_events.c, gui/greeter/greeter_geometry.c,
	  gui/greeter/greeter_item.[ch],
	  gui/greeter/greeter_item_customlist.c,
	  gui/greeter/greeter_item_pam.c, gui/greeter/greeter_parser.c:
	  Fix bug #123017 with use of evil hacks (as if the original
	  text code was not evil). Check max-width and
	  max-screen-percent-width attributes for label pos elements.
	  Wrap text if it goes over it's width or the max-width
	  (Mental note: the greeter layout stuff is on complete crack
	  and should be rewritten with great prejudice).  Also while
	  at it save an extra 112 bytes off every element by using
	  more appropriate types and some unions, adds up to about
	  5k for Bluecurve so it's not much actually.  Also fix
	  the enriched string parsing to understand \n just like
	  gdmlogin does

	* gui/greeter/themes/circles/circles.xml.in,
	  gui/greeter/themes/happygnome/happygnome.xml.in,
	  gui/greeter/themes/happygnome-list/happygnome.xml.in:
	  For some reason the canvas now gives me larger fonts, so
	  use smaller fonts and tweak the layout a bit.

	* docs/C/gdm.xml: update the docs a bit
---
 gui/greeter/themes/circles/circles.xml.in            | 8 ++++----
 gui/greeter/themes/happygnome-list/happygnome.xml.in | 2 +-
 gui/greeter/themes/happygnome/happygnome.xml.in      | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'gui/greeter/themes')

diff --git a/gui/greeter/themes/circles/circles.xml.in b/gui/greeter/themes/circles/circles.xml.in
index 4bad8629..21f69e9c 100644
--- a/gui/greeter/themes/circles/circles.xml.in
+++ b/gui/greeter/themes/circles/circles.xml.in
@@ -149,7 +149,7 @@
   <item type="rect">
     <normal color="#FFFFFF" alpha="0.5"/>
     <pos anchor="c" x="50%" y="50%" width="box" height="box"/>
-    <box orientation="vertical" min-width="300" xpadding="30" ypadding="30" spacing="10">
+    <box orientation="vertical" min-width="340" xpadding="30" ypadding="30" spacing="10">
       <item type="label">
         <pos anchor="n" x="50%"/>
         <normal color="#000000" font="Sans 18"/>
@@ -158,7 +158,7 @@
       </item>
       <item type="label" id="pam-prompt">
         <pos anchor="nw" x="10%"/>
-        <normal color="#000000" font="Sans 16"/>
+        <normal color="#000000" font="Sans 14"/>
 	<!-- Stock label for: Username: -->
 	<stock type="username-label"/>
       </item>
@@ -173,14 +173,14 @@
       </item>
       <item type="label" id="pam-message">
         <pos anchor="n" x="50%"/>
-        <normal color="#000000" font="Sans 16"/>
+        <normal color="#000000" font="Sans 14"/>
 	<text></text>
       </item>
     </box>
     <fixed>
       <item type="label" id="pam-error">
         <pos anchor="n" x="50%" y="110%"/>
-        <normal color="#000000" font="Sans 16"/>
+        <normal color="#000000" font="Sans 14"/>
         <text></text>
       </item>
     </fixed>
diff --git a/gui/greeter/themes/happygnome-list/happygnome.xml.in b/gui/greeter/themes/happygnome-list/happygnome.xml.in
index 643bf6a9..015048b5 100644
--- a/gui/greeter/themes/happygnome-list/happygnome.xml.in
+++ b/gui/greeter/themes/happygnome-list/happygnome.xml.in
@@ -165,7 +165,7 @@
   <item type="rect">
     <normal color="#FFFFFF" alpha="0.5"/>
     <pos anchor="c" x="75%" y="50%" width="box" height="box"/>
-    <box orientation="vertical" min-width="300" xpadding="30" ypadding="30" spacing="10">
+    <box orientation="vertical" min-width="340" xpadding="30" ypadding="30" spacing="10">
       <item type="label">
         <pos anchor="n" x="50%"/>
         <normal color="#000000" font="Sans 18"/>
diff --git a/gui/greeter/themes/happygnome/happygnome.xml.in b/gui/greeter/themes/happygnome/happygnome.xml.in
index 8452a428..87927368 100644
--- a/gui/greeter/themes/happygnome/happygnome.xml.in
+++ b/gui/greeter/themes/happygnome/happygnome.xml.in
@@ -149,7 +149,7 @@
   <item type="rect">
     <normal color="#FFFFFF" alpha="0.5"/>
     <pos anchor="c" x="50%" y="50%" width="box" height="box"/>
-    <box orientation="vertical" min-width="300" xpadding="30" ypadding="30" spacing="10">
+    <box orientation="vertical" min-width="340" xpadding="30" ypadding="30" spacing="10">
       <item type="label">
         <pos anchor="n" x="50%"/>
         <normal color="#000000" font="Sans 18"/>
@@ -158,7 +158,7 @@
       </item>
       <item type="label" id="pam-prompt">
         <pos anchor="nw" x="10%"/>
-        <normal color="#000000" font="Sans 16"/>
+        <normal color="#000000" font="Sans 14"/>
 	<!-- Stock label for: Username: -->
 	<stock type="username-label"/>
       </item>
@@ -173,7 +173,7 @@
       </item>
       <item type="label" id="pam-message">
         <pos anchor="n" x="50%"/>
-        <normal color="#000000" font="Sans 16"/>
+        <normal color="#000000" font="Sans 14"/>
 	<text></text>
       </item>
     </box>
-- 
cgit v1.2.1