copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

little cleanup

This commit is contained in:
Yann Leboulanger 2005-03-10 09:48:05 +00:00
parent 1cd5da4b2c
commit 7011d687a6
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
plugins/gtkgui/gtkgui.py
View File

@ -640,8 +640,12 @@ class tabbed_chat_window:
return return
elif word.startswith('mailto:'): elif word.startswith('mailto:'):
#it's a mail #it's a mail
tag += '_mail' if len(word) > 7:
text = word[7:] tag += '_mail'
text = word[7:]
else:
text = word
tag = None
elif self.plugin.sth_at_sth_dot_sth_re.match(word): # returns match object or None elif self.plugin.sth_at_sth_dot_sth_re.match(word): # returns match object or None
#it's a mail too #it's a mail too
tag += '_mail' tag += '_mail'
@ -660,11 +664,22 @@ class tabbed_chat_window:
text = word[1:-1] text = word[1:-1]
else: else:
#it's an url #it's an url
tag += '_url' if word.startswith('http://'):
text = word if len(word) > 7:
text = word[7:]
tag += '_url'
else:
text = word
tag = None
else:
tag += '_url'
text = word
end_iter = conversation_buffer.get_end_iter() end_iter = conversation_buffer.get_end_iter()
conversation_buffer.insert_with_tags_by_name(end_iter, text, tag) if tag:
conversation_buffer.insert_with_tags_by_name(end_iter, text, tag)
else:
conversation_buffer.insert(end_iter, text)
def print_conversation(self, text, jid, contact = '', tim = None): def print_conversation(self, text, jid, contact = '', tim = None):
"""Print a line in the conversation : """Print a line in the conversation :
@ -712,27 +727,18 @@ class tabbed_chat_window:
if self.plugin.config['useemoticons']: # search for emoticons & urls if self.plugin.config['useemoticons']: # search for emoticons & urls
my_re = sre.compile(self.plugin.emot_and_url_pattern, sre.IGNORECASE) my_re = sre.compile(self.plugin.emot_and_url_pattern, sre.IGNORECASE)
iterator = my_re.finditer(otext) iterator = my_re.finditer(otext)
for match in iterator:
start, end = match.span()
special_word = otext[start:end]
if start != 0:
text_before_special_word = otext[index:start]
end_iter = conversation_buffer.get_end_iter()
conversation_buffer.insert(end_iter, text_before_special_word)
self.print_special_word(special_word, jid, contact)
index = end # update index
else: # search for just urls else: # search for just urls
my_re = sre.compile(self.plugin.url_pattern, sre.IGNORECASE) my_re = sre.compile(self.plugin.url_pattern, sre.IGNORECASE)
iterator = my_re.finditer(otext) iterator = my_re.finditer(otext)
for match in iterator: for match in iterator:
start, end = match.span() start, end = match.span()
special_word = otext[start:end] special_word = otext[start:end]
if start != 0: if start != 0:
text_before_special_word = otext[index:start] text_before_special_word = otext[index:start]
end_iter = conversation_buffer.get_end_iter() end_iter = conversation_buffer.get_end_iter()
conversation_buffer.insert(end_iter, text_before_special_word) conversation_buffer.insert(end_iter, text_before_special_word)
self.print_special_word(special_word, jid, contact) self.print_special_word(special_word, jid, contact)
index = end # update index index = end # update index
#add the rest in the index and after #add the rest in the index and after
end_iter = conversation_buffer.get_end_iter() end_iter = conversation_buffer.get_end_iter()