Did the Prophet (peace be upon him) contract his marriage to Lady Khadijah through Waraqa ibn Nawfal, and was that done in the Christian manner?

Khadijah's uncle, Amr ibn Asad, was the one who solemnized the marriage contract of the Prophet, peace and blessings be upon him, with Khadijah, and not Waraqah ibn Nawfal. This is what the majority of historians and biographers have favored. Islam has affirmed marriage contracts that took place during the جاهلية (pre-Islamic era of ignorance), and the Prophet, peace and blessings be upon him, did not order their renewal.