diff options
| author | Denis Fomin <fominde@gmail.com> | 2011-09-30 10:46:22 +0400 |
|---|---|---|
| committer | Denis Fomin <fominde@gmail.com> | 2011-09-30 10:46:22 +0400 |
| commit | 0cb11c7e10933864cab114bf88ad68cc6e644f54 (patch) | |
| tree | 2dfd6703d87d0c0773fc9973577d8f339914cc30 | |
| parent | 83506314802184f07cc1709fef1d27ad5a7f8e78 (diff) | |
Juick, Url image preview. Use gajim.thread_interface
| -rw-r--r-- | juick/manifest.ini | 2 | ||||
| -rw-r--r-- | juick/plugin.py | 4 | ||||
| -rw-r--r-- | url_image_preview/manifest.ini | 2 | ||||
| -rw-r--r-- | url_image_preview/url_image_preview.py | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/juick/manifest.ini b/juick/manifest.ini index c7b8e5a..4b793ff 100644 --- a/juick/manifest.ini +++ b/juick/manifest.ini @@ -1,7 +1,7 @@ [info] name: Juick short_name: Juick -version: 0.5 +version: 0.6 description: Clickable juick links , juick nics, preview juick picturs. The key combination alt + up in the textbox allow insert the number of last message (comment or topic). authors: Denis Fomin <fominde@gmail.com>, evgen <drujebober@gmail.com> diff --git a/juick/plugin.py b/juick/plugin.py index 7e17106..ed4c67a 100644 --- a/juick/plugin.py +++ b/juick/plugin.py @@ -10,7 +10,6 @@ from string import upper from string import rstrip import locale import sqlite3 -import gobject from common import helpers from common import gajim @@ -376,7 +375,8 @@ class Base(object): buffer_.insert_with_tags(iter_, special_text, tag) uid = special_text.split('/')[-1] url = "http://i.juick.com/photos-512/%s" % uid - gobject.idle_add(self.insert_pic_preview, mark, special_text, url) + gajim.thread_interface(self.insert_pic_preview, [mark, special_text, + url]) def insert_pic_preview(self, mark, special_text, url): pixbuf = self.get_pixbuf_from_url( url, self.plugin.config[ diff --git a/url_image_preview/manifest.ini b/url_image_preview/manifest.ini index 772e016..158c991 100644 --- a/url_image_preview/manifest.ini +++ b/url_image_preview/manifest.ini @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.1 +version: 0.2 description: Url image preview in chatbox. Based on patch in ticket #5300: http://trac.gajim.org/attachment/ticket/5300. diff --git a/url_image_preview/url_image_preview.py b/url_image_preview/url_image_preview.py index cf31583..f173398 100644 --- a/url_image_preview/url_image_preview.py +++ b/url_image_preview/url_image_preview.py @@ -3,9 +3,7 @@ import gtk import re import os - import urllib -import gobject from common import gajim from plugins import GajimPlugin @@ -84,7 +82,8 @@ class Base(object): buffer_ = self.textview.tv.get_buffer() iter_ = buffer_.get_end_iter() mark = buffer_.create_mark(None, iter_, True) - gobject.idle_add(self.insert_pic_preview, mark, special_text, special_text) + gajim.thread_interface(self.insert_pic_preview, [mark, special_text, + special_text]) def insert_pic_preview(self, mark, special_text, url): pixbuf = self.get_pixbuf_from_url( url, self.plugin.config[ |