Please don't commit when the tinderbox is not green (except to fix the
tree).
[email protected] wrote:
Revision
11958 <http://viewcvs.osafoundation.org/chandler?view=rev&rev=11958>
Author
grant
Date
2006-10-06 10:28:44 -0700 (Fri, 06 Oct 2006)
Log Message
Fix Bug 6920 <http://bugzilla.osafoundation.org/show_bug.cgi?id=6920>
(Error synching Office Calendar) r=jeffrey
Use .getMembershipItem() when adding/removing items to/from stamp
collections.
Modified Paths
* trunk/chandler/parcels/osaf/pim/stamping.py
<#trunkchandlerparcelsosafpimstampingpy>
Diff
Modified: trunk/chandler/parcels/osaf/pim/stamping.py (11957
=> 11958)
--- trunk/chandler/parcels/osaf/pim/stamping.py 2006-10-06 16:47:23 UTC (rev
11957)
+++ trunk/chandler/parcels/osaf/pim/stamping.py 2006-10-06 17:28:44 UTC (rev
11958)
@@ -107,7 +107,7 @@
stamped = self.collection
if stamped is not None:
- stamped.add(self.itsItem)
+ stamped.add(self.itsItem.getMembershipItem())
self.stamp_types = new_stamp_types
@@ -120,23 +120,24 @@
"Item %r doesn't have stamp %r" % (self.itsItem, self)
stamped = self.collection
+ item = self.itsItem.getMembershipItem()
# This is gross, and was in the old stamping code.
# Some items, like Mail messages, end up in the
# all collection by virtue of their stamp. So, we
# explicitly re-add the item to all after unstamping
# if necessary.
- all = schema.ns("osaf.pim", self.itsItem.itsView).allCollection
- inAllBeforeStamp = self.itsItem in all
+ all = schema.ns("osaf.pim", item.itsView).allCollection
+ inAllBeforeStamp = item in all
if stamped is not None:
- stamped.remove(self.itsItem)
+ stamped.remove(item)
self.stamp_types = new_stamp_types
- if inAllBeforeStamp and not self.itsItem in all:
- all.add(self.itsItem)
+ if inAllBeforeStamp and not item in all:
+ all.add(item)
@classmethod
------------------------------------------------------------------------
_______________________________________________
Commits mailing list
[email protected]
http://lists.osafoundation.org/mailman/listinfo/commits
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
Open Source Applications Foundation "chandler-dev" mailing list
http://lists.osafoundation.org/mailman/listinfo/chandler-dev
