Changeset 63cad66

Timestamp:

2015-11-25T02:49:24Z (9 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:

• python/wa.py (modified) (3 diffs)

python/wa.py

@@ -280 +280 @@
         def onStatusNotification(self, status):
                 print "New status for %s: %s" % (status.getFrom(), status.status)
-                self.bee.buddy_status_msg(status.getFrom(), status.status)
+                self.cb.buddy_status_msg(status.getFrom(), status.status)
         
         def onGroupSubjectNotification(self, sub):
@@ -493 +493 @@
 
                 stack = (YowStackBuilder()
-                         .pushDefaultLayers(False)
+                         .pushDefaultLayers(True)
                          .push(BitlBeeLayer)
                          .build())
@@ -527 +527 @@
                                 lines.append(msg.getCaption())
                         text = "\n".join(lines)
+                else:
+                        text = "Message of unknown type %r" % type(msg)
 
                 if msg.getParticipant():