In the meantime, you could always just disable auto-connect. Not ideal, I know, but connecting manually to a network of your choice only takes a couple of seconds.

I think the option of having to confirm would be a good thing, but there was one time that feature really impressed me -- I was sitting on a streetcar that was stopped for a red light, just listening to the radio on the N900 not even thinking about it when all of a sudden it pinged in my ear and gave a quick vibrate.. I pulled it out of my pocket thinking it must have been a text, but there was the purple light blinking for an email.. WTF?? I don't have a mobile data plan..

But there was a Starbucks outside on the corner. In the time the streetcar was stopped at the light, the N900 had connected to their network and checked checked my email for me

The phone really earned its keep that day.