Changeset 3526

Timestamp:

09/08/05 13:25:47 (3 years ago)

Author:

asterix

Message:

[multani] emots are sorted by length so :qwe is tested before :q

Files:

• trunk/src/gajim.py (modified) (2 diffs)

trunk/src/gajim.py

@@ -920 +920 @@
                 
                 emoticons_pattern = ''
-                for emoticon in self.emoticons: # travel thru emoticons list
+                # sort keys by length so :qwe emot is checked before :q
+                keys = self.self.emoticons.keys()
+                sorted_keys = keys.sort(self.on_emoticon_sort)
+                for emoticon in sorted_keys: # travel thru emoticons list
                         emoticon_escaped = sre.escape(emoticon) # espace regexp metachars
                         emoticons_pattern += emoticon_escaped + '|'# | means or in regexp
@@ -930 +933 @@
                 # at least one character in 3 parts (before @, after @, after .)
                 self.sth_at_sth_dot_sth_re = sre.compile(r'\S+@\S+\.\S*[^\s)?]')
+
+        def on_emoticon_sort (self, emot1, emot2):
+                len1 = len(emot1)
+                len2 = len(emot2)
+                if len1 < len2:
+                        return 1
+                elif len1 > len2:
+                        return -1
+                return 0
 
         def on_launch_browser_mailer(self, widget, url, kind):