Changeset 9898 for trunk/src/conversation_textview.py

Timestamp:

07/08/08 20:49:51 (5 months ago)

Author:

steve-e

Message:

[Florob] Improved URL matching.

We don't match all valid URIs like blub:blaa but include common used (non)-urls like www.google.de

Files:

• trunk/src/conversation_textview.py (modified) (3 diffs)

trunk/src/conversation_textview.py

@@ -908 +908 @@
                         # add with possible animation
                         self.tv.add_child_at_anchor(img, anchor)
-                #FIXME: one day, somehow sync with regexp in gajim.py
-                elif special_text.startswith('http://') or \
-                        special_text.startswith('www.') or \
-                        special_text.startswith('ftp://') or \
-                        special_text.startswith('ftp.') or \
-                        special_text.startswith('https://') or \
-                        special_text.startswith('gopher://') or \
-                        special_text.startswith('news://') or \
-                        special_text.startswith('ed2k://') or \
-                        special_text.startswith('irc://') or \
-                        special_text.startswith('sip:') or \
-                        special_text.startswith('magnet:'):
-                        # it's a url
+                elif special_text.startswith('www.') or \
+                special_text.startswith('ftp.'):
                         tags.append('url')
                         use_other_tags = False
@@ -992 +981 @@
                         use_other_tags = False
                 else:
-                        #it's a url
-                        tags.append('url')
-                        use_other_tags = False
+                        # Check if we accept this as an uri
+                        schemes = gajim.config.get('uri_schemes').split()
+                        for scheme in schemes:
+                                if special_text.startswith(scheme + ':'):
+                                        tags.append('url')
+                                        use_other_tags = False
+                        # It's not a accepted uri
+                        if use_other_tags:
+                                end_iter = buffer.get_end_iter()
+                                buffer.insert_with_tags_by_name(end_iter, special_text, *other_tags)
 
                 if len(tags) > 0:
@@ -1172 +1168 @@
                 if name and (text.startswith('/me ') or text.startswith('/me\n')):
                         text = '* ' + name + text[3:]
+                        text_tags.append('italic')
                 # detect urls formatting and if the user has it on emoticons
                 index = self.detect_and_print_special_text(text, text_tags)