Removed "background" and all related stuff.

8 files changed, 4 insertions, 21 deletions

diff --git a/README b/README
index b43f45b..0cf9f67 100644
--- a/README
+++ b/README
@@ -15,13 +15,9 @@ To install everything you have two options:
 To compile the packages, you'll need these packages:
 git-core build-essential pkg-config libcairo2-dev fakeroot
 
-To install mdm, you'll need this package:
-xloadimage
-
 To build the patched libx11-6, you'll need to download its building dependencies
 too.
 
-
 = THE EASY WAY =
 
 Change to the "compiled" directory.
diff --git a/TODO b/TODO
index 58a3aef..ecf9397 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,7 @@
 On-going tasks:
 
 Aramis: adding support for cards with multiple outputs
-Lucas: fixing a bug with the "xephyr parent window"
+Lucas: Creating new Live-CD
 Paulo: documenting, TODO editing, small fixes
 
 -----------------
@@ -10,10 +10,6 @@ Easy/small tasks:
 
 - Fix the ugly Makefiles
 - Add internationalization support to the messages written on the screen.
-- Don't use the "background" or integrate it to "write-message.c" (it is useless
-  for now). For this, you'll have to remove code, fix make-tree.sh, remove the
-  image file, remove stuff from Debian control files, fix makefiles, fix every
-  possible document and other remaining stuff.
 - Add a script to detect the dependencies? (decide if needed)
 - Change the "/etc/init.d/gdm start" in mode xephyr-gdm because it makes the
   init-functions output ugly too
diff --git a/doc/compiling-dependencies b/doc/compiling-dependencies
index a3f1b8f..e0375f0 100644
--- a/doc/compiling-dependencies
+++ b/doc/compiling-dependencies
@@ -1,7 +1,7 @@
 What you'll need to compile/use the package:
 
 Using the package:
- - an X server, libcairo2, libx11, the 'xsetbg' binary, the 'discover' binary
+ - an X server, libcairo2, libx11, the 'discover' binary
 
 Compiling binaries:
 - gcc libcairo2-dev libx11-dev
@@ -23,6 +23,3 @@ For libx11-6:
 
 For compiling:
 # apt-get install git-core build-essential pkg-config libcairo2-dev fakeroot
-
-For using:
-# apt-get install xloadimage
diff --git a/mdm/distro/debian-lenny/DEBIAN/control b/mdm/distro/debian-lenny/DEBIAN/control
index 7b52275..9f037e0 100644
--- a/mdm/distro/debian-lenny/DEBIAN/control
+++ b/mdm/distro/debian-lenny/DEBIAN/control
@@ -3,6 +3,6 @@ Version: 0.0.1
 Section: universe/x11 
 Architecture: i386
 Priority: optional
-Depends: xserver-xorg-core, xserver-xephyr (>=1.4), xloadimage, discover (>=2.1), libx11-6, libxft2, libcairo2, libfreetype6, bash
+Depends: xserver-xorg-core, xserver-xephyr (>=1.4), discover (>=2.1), libx11-6, libxft2, libcairo2, libfreetype6, bash
 Maintainer: C3SL Multiseat team (multiterminal@c3sl.ufpr.br)
 Description: This package contains the "multiseat display manager", a manager that makes the computer a multiseat computer. More info at http://wiki.c3sl.ufpr.br/multiseat
diff --git a/mdm/distro/ubuntu-8.04/DEBIAN/control b/mdm/distro/ubuntu-8.04/DEBIAN/control
index 7b52275..9f037e0 100644
--- a/mdm/distro/ubuntu-8.04/DEBIAN/control
+++ b/mdm/distro/ubuntu-8.04/DEBIAN/control
@@ -3,6 +3,6 @@ Version: 0.0.1
 Section: universe/x11 
 Architecture: i386
 Priority: optional
-Depends: xserver-xorg-core, xserver-xephyr (>=1.4), xloadimage, discover (>=2.1), libx11-6, libxft2, libcairo2, libfreetype6, bash
+Depends: xserver-xorg-core, xserver-xephyr (>=1.4), discover (>=2.1), libx11-6, libxft2, libcairo2, libfreetype6, bash
 Maintainer: C3SL Multiseat team (multiterminal@c3sl.ufpr.br)
 Description: This package contains the "multiseat display manager", a manager that makes the computer a multiseat computer. More info at http://wiki.c3sl.ufpr.br/multiseat
diff --git a/mdm/misc/background.png b/mdm/misc/background.png
deleted file mode 100644
index 388c60e..0000000
--- a/mdm/misc/background.png
+++ /dev/null
diff --git a/mdm/misc/make-tree.sh b/mdm/misc/make-tree.sh
index 8a5895c..b015d53 100755
--- a/mdm/misc/make-tree.sh
+++ b/mdm/misc/make-tree.sh
@@ -59,7 +59,6 @@ cp src/xephyr-wrapper           $TARGET/$MDM_SCRIPTS/
 cp src/xephyr-parent-window     $TARGET/$MDM_SCRIPTS/
 cp src/read-devices             $TARGET/$MDM_SCRIPTS/
 cp src/discover-devices         $TARGET/$MDM_SCRIPTS/
-cp misc/background.png          $TARGET/$MDM_SHARE/
 cp -r modes                     $TARGET/$MDM_SHARE/
 cp config/mdm.conf              $TARGET/$MDM_ETC/
 
diff --git a/mdm/src/mdm-start-seat b/mdm/src/mdm-start-seat
index 94f6640..5e33808 100755
--- a/mdm/src/mdm-start-seat
+++ b/mdm/src/mdm-start-seat
@@ -30,8 +30,6 @@ source $MDM_INCLUDE
 
 READ_DEVICES=${MDM_SCRIPTS}/read-devices
 WRITE_MESSAGE=${MDM_SCRIPTS}/write-message
-IMAGE_FILE=${MDM_SHARE}/background.png
-PUT_IMAGE="xsetbg -fullscreen"
 
 SEAT_NUMBER=$1
 
@@ -229,9 +227,6 @@ while (( 1 )); do
     echo -e "\n--"
     echo "Configuring seat:"
 
-    # Put image on the background
-    $PUT_IMAGE $IMAGE_FILE
-
     echo "  selecting keyboard"
     select_keyboard
     echo "  selecting mouse"