See what the BBC reports about the meeting yesterday between Blair and Aznar : http://news.bbc.co.uk/hi/english/uk_politics/newsid_1997000/1997536.stm
???? So nothing concrete yet.
As for the comparison with the Canary Islands, it is not very fortunate. Gibraltar was lost as a result of a war, as sanctioned in the Utrecht treaty, as well as Menorca and Florida which later returned to Spanish rule. Later England took more territory than agreed to build the airport.
On the other hand, the Canary Islands did not belong to any other country when the Castilians conquered them. If they were to be separated from Spain, to whom should they go? The original natives have mixed with inmigrants from Spain since long ago, and I am not sure if they would be for autodetermination. It is a similar situation to the UK has with many of its islands in the Atlantic, from the Orkneys to the South Georgians.
As for Ceuta, it is under Iberian domination since the XIV century. At that time Spain, the UK or Morocco did not exist. The population is mostly Spanish. I do not see how Morocco has any right over it. Melilla is similar, but it is Spanish "only" since the XVI century.