That's correct, and I agree that participating in civil disobedience, by nature, requires being willing to "do the time" as part of making a point.
Whistleblowers, however, are a different story. I don't believe that Snowden was trying to be a martyr for Americans' right to privacy; I think he saw something that he wanted to be revealed (or that he thought needed to be, if you're arguing his side of the story) and leaked it.