Yes, it has all the blocks, and I'm switching out wallets.  So running the window gui client like this:

bitcoin.exe -rescan

should work?