merge

clickable_nicknames/manifest.ini

@@ -4,5 +4,5 @@ short_name: clickable_nicknames
 version: 0.1
 description: Clickable nicknames in the conversation textview.
 authors: Denis Fomin <fominde@gmail.com>
-homepage: http://bitbucket.org/dicson12/plugins/src/tip/clickable_nicknames/
+homepage: http://trac-plugins.gajim.org/wiki/ClickableNicknamesPlugin
 

juick/manifest.ini

@@ -5,5 +5,5 @@ version: 0.2
 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>
-homepage: http://bitbucket.org/dicson12/plugins/src/tip/juick/
+homepage: http://trac-plugins.gajim.org/wiki/JuickPlugin
 

juick/plugin.py

@@ -142,7 +142,7 @@ class Base(object):
             juick_nick = r'@[a-zA-Z0-9_@\.-]+:'
         else:
             juick_nick = r'@[a-zA-Z0-9_@:\.-]+'
-        juick_pic = r'http://i\.juick\.com/p/\d+\.jpg|http://i\.juick\.com/p/\d+\.JPG'
+        juick_pic = r'http://i\.juick\.com/.+/[0-9-]+\.[JPG|jpg]'
         interface = gajim.interface
         interface.sharp_slash_re = re.compile(sharp_slash)
         self.juick_nick_re = interface.juick_nick_re = re.compile(juick_nick)
@@ -340,7 +340,7 @@ class Base(object):
             buffer_, iter_, tag = self.get_iter_and_tag('url')
             mark = buffer_.create_mark(None, iter_, True)
             buffer_.insert_with_tags(iter_, special_text, tag)
-            uid = special_text.split('p/')[1]
+            uid = special_text.split('/')[-1]
             url = "http://i.juick.com/photos-512/%s" % uid
             pixbuf = self.get_pixbuf_from_url(
                                     url, self.plugin.config['PREVIEW_SIZE'])

set_location/manifest.ini

@@ -4,5 +4,5 @@ short_name: set_location
 version: 0.1
 description: Set information about the current geographical or physical location.
 authors: Denis Fomin <fominde@gmail.com>
-homepage: http://bitbucket.org/dicson12/plugins/src/tip/set_location/
+homepage: http://trac-plugins.gajim.org/wiki/SetLocalitionPlugin
 

wrong_layout/manifest.ini

@@ -4,5 +4,5 @@ short_name: Wrong Layout
 version: 0.1
 description: Press alt+r to convert chars typed in wrong layout Rus<>Eng
 authors: Denis Fomin <fominde@gmail.com>
-homepage: http://bitbucket.org/dicson12/plugins/src/tip/wrong_layout/
+homepage: http://trac-plugins.gajim.org/wiki/WrongLayoutPlugin