From b96b4bb86d39d36733fb4e3b7292d5d67074231d Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Sun, 10 Feb 2013 23:24:30 +0100 Subject: [PATCH] XMPPPresence: Treat no priority element as a priority of 0 --- src/XMPPPresence.m | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/XMPPPresence.m b/src/XMPPPresence.m index 51be8c1..79b40b7 100644 --- a/src/XMPPPresence.m +++ b/src/XMPPPresence.m @@ -211,6 +211,7 @@ static int show_to_int(OFString *show) - (of_comparison_result_t)compare: (id )object { XMPPPresence *otherPresence; + OFNumber *otherPriority; OFString *otherShow; of_comparison_result_t priorityOrder; @@ -223,8 +224,15 @@ static int show_to_int(OFString *show) selector: _cmd]; otherPresence = (XMPPPresence*)object; + otherPriority = [otherPresence priority]; + if (otherPriority == nil) + otherPriority = [OFNumber numberWithInt8: 0]; - priorityOrder = [priority compare: [otherPresence priority]]; + if (priority != nil) + priorityOrder = [priority compare: otherPriority]; + else + priorityOrder = + [[OFNumber numberWithInt8: 0] compare: otherPriority]; if (priorityOrder != OF_ORDERED_SAME) return priorityOrder;