Changeset 10008

Timestamp:

07/23/08 15:33:23 (4 months ago)

Author:

js

Message:

A few new files were added with the new Gtk+. Update NSIS.

Location:

trunk

Files:

• gajim.nsi (modified) (3 diffs)
• src/conversation_textview.py (modified) (3 diffs)

trunk/gajim.nsi

@@ -202 +202 @@
         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
 
@@ -509 +513 @@
         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"
@@ -617 +622 @@
         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"

trunk/src/conversation_textview.py

@@ -947 +947 @@
                 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
@@ -969 +976 @@
                         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
@@ -1041 +1049 @@
                         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()