diff options
author | js <js-gajim@webkeks.org> | 2008-07-23 17:33:23 +0400 |
---|---|---|
committer | js <js-gajim@webkeks.org> | 2008-07-23 17:33:23 +0400 |
commit | 8abacfdb8f393e3c9099f997960e1a3fada7ecce (patch) | |
tree | f094af0f87d4dcabab8c81c0a16223df26c2ca15 | |
parent | 4fdef4728bf1a81185a5c58e8a0dd2950b811b4d (diff) |
A few new files were added with the new Gtk+. Update NSIS.
-rw-r--r-- | gajim.nsi | 7 | ||||
-rw-r--r-- | src/conversation_textview.py | 18 |
2 files changed, 17 insertions, 8 deletions
@@ -201,6 +201,10 @@ Section "Gtk+ 2" SecGtk File /r "bin\gtk\lib\gtk-2.0\2.10.0\loaders"
SetOutPath "$INSTDIR\bin\gtk\lib"
File /r "bin\gtk\lib\pango"
+ File "bin\gtk\lib\charset.alias"
+ SetOutPath "$INSTDIR\bin\gtk\share"
+ File /r "bin\gtk\share\gtkthemeselector"
+ File /r "bin\gtk\share\xml"
SectionEnd
SectionGroup $(NAME_Emoticons)
@@ -508,6 +512,7 @@ Section "Uninstall" RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0"
RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0"
RMDir /r "$INSTDIR\bin\gtk\lib\pango"
+ Delete "$INSTDIR\bin\gtk\lib\charset.alias"
RMDir "$INSTDIR\bin\gtk\lib"
RMDir /r "$INSTDIR\bin\gtk\share\locale\de"
RMDir /r "$INSTDIR\bin\gtk\share\locale\en_GB"
@@ -616,6 +621,8 @@ Section "Uninstall" RMDir /r "$INSTDIR\bin\gtk\share\themes\Glossy-js"
RMDir /r "$INSTDIR\bin\gtk\share\themes\MS-Windows"
RMDir "$INSTDIR\bin\gtk\share\themes"
+ RMDir /r "$INSTDIR\bin\gtk\share\gtkthemeselector"
+ RMDir /r "$INSTDIR\bin\gtk\share\xml"
RMDir "$INSTDIR\bin\gtk\share"
RMDir "$INSTDIR\bin\gtk"
Delete "$INSTDIR\bin\_cairo.pyd"
diff --git a/src/conversation_textview.py b/src/conversation_textview.py index 25199f162..a5fcdb5fb 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -946,10 +946,17 @@ class ConversationTextview: special text (emots, links, formatting)''' tags = [] use_other_tags = True + text_is_valid_uri = False show_ascii_formatting_chars = \ gajim.config.get('show_ascii_formatting_chars') buffer = self.tv.get_buffer() + # Check if we accept this as an uri + schemes = gajim.config.get('uri_schemes').split() + for scheme in schemes: + if special_text.startswith(scheme + ':'): + text_is_valid_uri = True + possible_emot_ascii_caps = special_text.upper() # emoticons keys are CAPS if gajim.config.get('emoticons_theme') and \ possible_emot_ascii_caps in gajim.interface.emoticons.keys(): @@ -968,7 +975,8 @@ class ConversationTextview: # add with possible animation self.tv.add_child_at_anchor(img, anchor) elif special_text.startswith('www.') or \ - special_text.startswith('ftp.'): + special_text.startswith('ftp.') or \ + text_is_valid_uri: tags.append('url') use_other_tags = False elif special_text.startswith('mailto:') or \ @@ -1040,13 +1048,7 @@ class ConversationTextview: buffer.insert(end_iter, special_text) use_other_tags = False else: - # 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 + # It's nothing special if use_other_tags: end_iter = buffer.get_end_iter() buffer.insert_with_tags_by_name(end_iter, special_text, *other_tags) |