Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/chat/box.py
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@sugarlabs.org>2012-03-07 01:56:43 (GMT)
committer Aleksey Lim <alsroot@sugarlabs.org>2012-03-07 02:23:44 (GMT)
commit799bb41fa85ad38eec300cc3423d0a5eb37d2c66 (patch)
tree3456b47b2337752947e0e36119c651ccdc46dc6a /chat/box.py
parent41aab371714697534752241b44fc3304696c9c1c (diff)
Revert icons parser and cache removed in TextVew patch
Diffstat (limited to 'chat/box.py')
-rw-r--r--chat/box.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/chat/box.py b/chat/box.py
index 6218092..b850c92 100644
--- a/chat/box.py
+++ b/chat/box.py
@@ -219,12 +219,12 @@ class TextBox(gtk.TextView):
self.get_buffer().insert_with_tags(self.iter_text, word, tag,
self.fg_tag)
else:
- smile_pxb = smilies.get_pixbuf(word)
- if smile_pxb is not None:
- self.get_buffer().insert_pixbuf(self.iter_text, smile_pxb)
- else:
- self.get_buffer().insert_with_tags(self.iter_text, word,
- self.fg_tag)
+ for i in smilies.parse(word):
+ if isinstance(i, gtk.gdk.Pixbuf):
+ self.get_buffer().insert_pixbuf(self.iter_text, i)
+ else:
+ self.get_buffer().insert_with_tags(self.iter_text, i,
+ self.fg_tag)
self.get_buffer().insert_with_tags(self.iter_text, ' ',
self.fg_tag)