Changeset 57:0d8b6cf41728 in ralphm-patches for copy_xmppim.patch


Ignore:
Timestamp:
Mar 28, 2012, 1:43:02 PM (10 years ago)
Author:
Ralph Meijer <ralphm@…>
Branch:
default
Message:

Wokkel 0.7.0 release, clean up various patches.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • copy_xmppim.patch

    r49 r57  
    11# HG changeset patch
    2 # Parent 2c8dc93fbef4f2d5b7115c7afdd1b7fb799d47c3
     2# Parent 4ce55e7a3bb2f881333a4c61e215ffd2e3248695
    33
    44diff --git a/wokkel/xmppim.py b/wokkel/im.py
     
    242242     """
    243243     Stanza of kind presence.
    244 @@ -605,6 +377,7 @@
     244@@ -633,6 +405,7 @@
    245245         self.groups = set()
    246246 
     
    250250     """
    251251     Client side XMPP roster protocol.
    252 @@ -614,6 +387,7 @@
     252@@ -642,6 +415,7 @@
    253253         ROSTER_SET = "/iq[@type='set']/query[@xmlns='%s']" % NS_ROSTER
    254254         self.xmlstream.addObserver(ROSTER_SET, self._onRosterSet)
     
    258258         jid = JID(element['jid'])
    259259         item = RosterItem(jid)
    260 @@ -628,6 +402,7 @@
     260@@ -656,6 +430,7 @@
    261261 
    262262         return item
     
    266266         """
    267267         Retrieve contact list.
    268 @@ -683,6 +458,7 @@
     268@@ -711,6 +486,7 @@
    269269             item = self._parseRosterItem(iq.query.item)
    270270             self.onRosterSet(item)
     
    274274         """
    275275         Called when a roster push for a new or update item was received.
    276 @@ -691,6 +467,7 @@
     276@@ -719,6 +495,7 @@
    277277         @type item: L{RosterItem}
    278278         """
     
    282282         """
    283283         Called when a roster push for the removal of an item was received.
    284 @@ -698,32 +475,3 @@
    285          @param entity: The entity for which the roster item has been removed.
    286          @type entity: L{JID}
    287          """
     284@@ -764,34 +541,3 @@
     285             element.addElement('subject', content=self.subject)
     286 
     287         return element
     288-
     289-
    288290-
    289291-class MessageProtocol(XMPPHandler):
Note: See TracChangeset for help on using the changeset viewer.