summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2012-04-05 14:34:33 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2012-04-05 14:34:33 (GMT)
commit496829bfd8d6b1293fbb7474d40f3c66da2f57e7 (patch)
tree46b12ab905890d863d0cdbf24accec2e12bdfab3
parentcb330910db7affb14ab2410f936623d3111994ce (diff)
downloadlibkolabxml-496829bfd8d6b1293fbb7474d40f3c66da2f57e7.tar.gz
Strip urn::uuid from uid, and fix comparator which is supposed ot check the property.
-rw-r--r--src/kolabcontainers.h2
-rw-r--r--src/xcalconversions.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/kolabcontainers.h b/src/kolabcontainers.h
index adf6d90..7ed1fab 100644
--- a/src/kolabcontainers.h
+++ b/src/kolabcontainers.h
@@ -188,7 +188,7 @@ struct ContactReference {
bool operator==(const ContactReference &other) const { return mType == other.mType &&
mEmail == other.mEmail &&
mName == other.mName &&
- mUid == mUid;
+ mUid == other.mUid;
};
bool isValid() const { return mType != Invalid; };
diff --git a/src/xcalconversions.h b/src/xcalconversions.h
index b6e9522..3b16168 100644
--- a/src/xcalconversions.h
+++ b/src/xcalconversions.h
@@ -379,7 +379,7 @@ Kolab::ContactReference toContactReference(const icalendar_2_0::CalAddressProper
continue;
}
if (const icalendar_2_0::DirParamType * tz = dynamic_cast<const icalendar_2_0::DirParamType*> (&*it)) {
- uid = tz->uri();
+ uid = fromURN(tz->uri());
continue;
}
}