Installed Ubuntu, wiped out Windows boot

[DeadTaco]

First let me explain the situation before I installed ubuntu.
I had Windows Vista on one partition, and Windows XP on the other. I find vista to be useless, so I installed Ubuntu over it. Unfortunately, as I later found out, I think that partition was controlling the boot menu. Now Grub can't see my Windows XP partition at all.

EDIT: Forgot an important note. When I select windows from the menu, it gives the error:
Error 12: Invalid Device Requested


I've done tons of forum and net searching, and came to many solutions -- none have worked. I made sure boot.ini, ntldr, and ntdetect.com were all on the partition with windows XP. I've tried setting the bootable flag with Gparted, and that didn't work. I've tweaked the grub menu.lst file without any success.

Here is my current fdisk -lu

   Device Boot      Start         End      Blocks   Id  System
/dev/sda1            2048   187510679    93754316   83  Linux
/dev/sda2       187510680   398283479   105386400    f  W95 Ext'd (LBA)
/dev/sda5   *   193505823   398275919   102385048+   7  HPFS/NTFS
/dev/sda6       187510806   193502924     2996059+  82  Linux swap / Solaris

I tried to use KGrubEditor to add a Windows boot option, and failed there as well.

Here is the windows line from my menu.lst

title Windows XP
root (hd0,4)
chainloader +1
savedefault
makeactive

I have removed the 'makeactive' line after setting the bootable flag in Gparted, but it didn't seem to make a difference.

Any suggestions?
Thanks!

EDIT #2: Do I have to tweak the boot.ini file in the Windows folder? Currently, it says:

[boot loader]

timeout=1

default=multi(0)disk(0)rdisk(0)partition(2)\WINDOWS

[operating systems]

multi(0)disk(0)rdisk(0)partition(2)\WINDOWS="Microsoft Windows XP Professional" /noexecute=optin /fastdetect

Since I added a swap partition and ubuntu root partition where the vista partition used to be, then did the partition numbers change?