Which of the following sentences is correct:
Cindy's very pleased with herself. She has finally given up smoking. She's (she has) been trying to give up for years.
Cindy's very pleased with herself. She has finally given up smoking. She'd (she had) been trying to give up for years.
I think #1 is correct if Cindy has just given up now - the present moment. #2 would be correct if she had given a few days ago (in the recent past). My student disagrees with me and I can't convince him. Am I correct?