Changeset 63cad66


Ignore:
Timestamp:
2015-11-25T02:49:24Z (4 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Children:
3fbce97
Parents:
7051acb (diff), 365b25a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'parson' of github.com:bitlbee/bitlbee into parson

File:
1 edited

Legend:

Unmodified
Added
Removed
  • python/wa.py

    r7051acb r63cad66  
    280280        def onStatusNotification(self, status):
    281281                print "New status for %s: %s" % (status.getFrom(), status.status)
    282                 self.bee.buddy_status_msg(status.getFrom(), status.status)
     282                self.cb.buddy_status_msg(status.getFrom(), status.status)
    283283       
    284284        def onGroupSubjectNotification(self, sub):
     
    493493
    494494                stack = (YowStackBuilder()
    495                          .pushDefaultLayers(False)
     495                         .pushDefaultLayers(True)
    496496                         .push(BitlBeeLayer)
    497497                         .build())
     
    527527                                lines.append(msg.getCaption())
    528528                        text = "\n".join(lines)
     529                else:
     530                        text = "Message of unknown type %r" % type(msg)
    529531
    530532                if msg.getParticipant():
Note: See TracChangeset for help on using the changeset viewer.