diff options
-rw-r--r-- | NEWS | 6 | ||||
-rw-r--r-- | activity.py | 12 | ||||
-rw-r--r-- | activity/activity.info | 2 |
3 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,9 @@ +75 + +- Scroll the chat log #2782 (Manuel Kaufmann) +- Don't treat the whole word as an URL (Manuel Kaufmann) +- Update translations + 74 - Remove use of hippo (Gonzalo Odiard) diff --git a/activity.py b/activity.py index dac1b26..b885842 100644 --- a/activity.py +++ b/activity.py @@ -50,12 +50,12 @@ SMILIES_COLUMNS = 5 class Chat(activity.Activity): def __init__(self, handle): - super(Chat, self).__init__(handle) - smilies.init() + self.chatbox = ChatBox() + + super(Chat, self).__init__(handle) self.entry = None - self.chatbox = None root = self.make_root() self.set_canvas(root) @@ -267,8 +267,6 @@ class Chat(activity.Activity): entry.connect('key-press-event', self.entry_key_press_cb) self.entry = entry - self.chatbox = ChatBox() - hbox = gtk.HBox() hbox.add(entry) @@ -418,6 +416,10 @@ class TextChannelWrapper(object): Converts sender to a Buddy. Calls self._activity_cb which is a callback to the activity. """ + if type_ != 0: + # Exclude any auxiliary messages + return + if self._activity_cb: try: self._text_chan[CHANNEL_INTERFACE_GROUP] diff --git a/activity/activity.info b/activity/activity.info index d028849..84bfd5a 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -12,7 +12,7 @@ icon = activity-icon exec = sugar-activity activity.Chat # original activity.info options -activity_version = 74 +activity_version = 75 bundle_id = org.laptop.Chat [Package] |