Changeset 9170

Timestamp:

12/18/07 05:09:04 (8 months ago)

Author:

nicfit

Message:

Merged revisions 9156-9161,9163-9169 via svnmerge from
svn://88.191.11.156/gajim/trunk

........

r9165 | asterix | 2007-12-17 13:15:06 -0700 (Mon, 17 Dec 2007) | 2 lines

remove 'dh' from version name. Was from pep branch

........

r9166 | jim++ | 2007-12-17 14:54:18 -0700 (Mon, 17 Dec 2007) | 2 lines

Highlight on (nick/muc_highlight_words) that contains a space too. Fixes #3624.

........

Location:

branches/one_window

Files:

• . (modified) (1 prop)
• src/common/gajim.py (modified) (1 diff)
• src/groupchat_control.py (modified) (1 diff)

branches/one_window/src/common/gajim.py

@@ -57 +57 @@
 interface = None # The actual interface (the gtk one for the moment)
 config = config.Config()
-version = config.get('version') + 'dh'
+version = config.get('version')
 connections = {} # 'account name': 'account (connection.Connection) instance'
 verbose = False

branches/one_window/src/groupchat_control.py

@@ -814 +814 @@
                                         else: # Special word == word, no char after in word
                                                 return True 
+                for special_word in special_words:
+                        if special_word.find(' ') > -1: 
+                                # There is a space in this special word, do a global search
+                                # without splitting by words as previously
+                                # We don't search this in all cases so we don't loose time
+                                if text.find(special_word) > -1:
+                                        return True 
                 return False