Fix bug #469759. Patch by Dave Fincher <finchair@yahoo.com>. 1. CDATA

2007-08-25  Brian Cameron <brian.cameron@sun.com>

        * gui/greeter/greeter.dtd: Fix bug #469759.  Patch by Dave
          Fincher <finchair@yahoo.com>.
          1. CDATA #IMPLIED" properties
          2. Added "background (true | false) #IMPLIED to item ATTLIST
             properties
          3. Added "everywhere" and "nowhere" to list of modes for the
             show ATTLIST
        * gui/greeter/themes/happygnome-list/Makefile.am,
          gui/greeter/themes/happygnome-list/happygnome-list.xml: Removed
          an error where max-width was used as a property for a box
          element. The max-width property is a property of the pos
          element specifically dealing with a label item type: Rename
          happygnome.xml to happygnome-list.xml.  Fixes bug #469741.
          Patch by Dave Fincher <finchair@yahoo.com>.
        * gui/greeter/themes/happygnome-list/happygnome-xml: Deleted.
        * gui/greeter/themes/happygnome-list/happygnome-list.xml: Added.

svn path=/trunk/; revision=5187

4 files changed, 6 insertions, 4 deletions

diff --git a/gui/greeter/greeter.dtd b/gui/greeter/greeter.dtd
index a2b47259..f4647d2a 100644
--- a/gui/greeter/greeter.dtd
+++ b/gui/greeter/greeter.dtd
@@ -22,11 +22,13 @@
 
 <!-- internal id's are one of (user-pw-entry | caps-lock-warning | clock | pam-error | pam-message | pam-prompt | pam-warning | timed-label | language_button | disconnect_button | reboot_button | halt_button | session_button | suspend_button | system_button | config_button | chooser_button | userlist | ok_button | cancel_button | pam-error-logo | options_button)
      but there can be other id's -->
+
 <!ATTLIST item
 	type (rect | entry | pixmap | label | svg | list | button) #REQUIRED
 	id CDATA #IMPLIED
 	button (true | false) #IMPLIED
 	combo (true | false) #IMPLIED
+	background (true | false) #IMPLIED
 >
 <!ATTLIST pos
 	x CDATA #IMPLIED
@@ -59,7 +61,7 @@
 	min-height CDATA #IMPLIED
 	homogeneous (true | false) #IMPLIED
 >
-<!-- console,console-fixed,console-flexi,remote-flexi,flexi,remote-->
+<!-- console,console-fixed,console-flexi,remote-flexi,flexi,remote,everywhere,nowhere-->
 <!ATTLIST show
 	modes CDATA #IMPLIED
 	type (config | chooser | system | halt | reboot | suspend | timed) #IMPLIED
diff --git a/gui/greeter/themes/happygnome-list/GdmGreeterTheme.desktop.in b/gui/greeter/themes/happygnome-list/GdmGreeterTheme.desktop.in
index 908c6c7e..ec7d6535 100644
--- a/gui/greeter/themes/happygnome-list/GdmGreeterTheme.desktop.in
+++ b/gui/greeter/themes/happygnome-list/GdmGreeterTheme.desktop.in
@@ -3,7 +3,7 @@
 
 [GdmGreeterTheme]
 Encoding=UTF-8
-Greeter=happygnome.xml
+Greeter=happygnome-list.xml
 _Name=Happy GNOME with Browser
 _Description=GNOME Art variation of Circles with a Face Browser
 _Author=GNOME Artists
diff --git a/gui/greeter/themes/happygnome-list/Makefile.am b/gui/greeter/themes/happygnome-list/Makefile.am
index 42ba140f..65177a60 100644
--- a/gui/greeter/themes/happygnome-list/Makefile.am
+++ b/gui/greeter/themes/happygnome-list/Makefile.am
@@ -1,7 +1,7 @@
 happygnomedir = $(datadir)/gdm/themes/happygnome-list
 happygnome_DATA = \
 	GdmGreeterTheme.desktop \
-	happygnome.xml \
+	happygnome-list.xml \
 	background.svg \
 	gnome-logo.svg  \
 	options.png \
diff --git a/gui/greeter/themes/happygnome-list/happygnome.xml b/gui/greeter/themes/happygnome-list/happygnome.xml
index 1c06ec7f..7b9f2ea8 100644
--- a/gui/greeter/themes/happygnome-list/happygnome.xml
+++ b/gui/greeter/themes/happygnome-list/happygnome.xml
@@ -67,7 +67,7 @@
   <item type="rect" id="userlist-rect">
     <normal color="#FFFFFF" alpha="0.5" font="Sans 14"/>
     <pos anchor="c" x="25%" y="50%" width="box" height="box"/>
-    <box orientation="vertical" min-width="440" max-width="440" min-height="100" xpadding="4" ypadding="4" spacing="0">
+    <box orientation="vertical" min-width="440" min-height="100" xpadding="4" ypadding="4" spacing="0">
       <item type="list" id="userlist">
         <pos anchor="nw" x="0" y="0" height="550" width="440"/>
         <color iconcolor="#ACBFDD" labelcolor="#ACBFDD"/>