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

add , and not : when autocompleting nicks in GC

This commit is contained in:
Nikos Kouremenos 2005-06-11 17:02:53 +00:00
parent 5f2c0faa83
commit a516bbcab5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/groupchat_window.py
View File

@ -303,7 +303,6 @@ class GroupchatWindow(chat.Chat):
for bookmark in gajim.connections[self.account].bookmarks: for bookmark in gajim.connections[self.account].bookmarks:
if bookmark['jid'] == bm['jid']: if bookmark['jid'] == bm['jid']:
room_name = bm['jid'].split('@')[0]
dialogs.ErrorDialog( dialogs.ErrorDialog(
_('Bookmark already set'), _('Bookmark already set'),
_('Room "%s" is already in your bookmarks.') %bm['jid']).get_response() _('Room "%s" is already in your bookmarks.') %bm['jid']).get_response()
@ -350,7 +349,7 @@ class GroupchatWindow(chat.Chat):
if len(splitted_text): # if there are any words if len(splitted_text): # if there are any words
begin = splitted_text[-1] # last word we typed begin = splitted_text[-1] # last word we typed
if len(self.nick_hits[room_jid]) and self.nick_hits[room_jid][0].startswith(begin.replace(':', '')) \ if len(self.nick_hits[room_jid]) and self.nick_hits[room_jid][0].startswith(begin.replace(',', '')) \
and self.last_key_tabs[room_jid]: # we should cycle and self.last_key_tabs[room_jid]: # we should cycle
self.nick_hits[room_jid].append(self.nick_hits[room_jid][0]) self.nick_hits[room_jid].append(self.nick_hits[room_jid][0])
self.nick_hits[room_jid].pop(0) self.nick_hits[room_jid].pop(0)
@ -361,11 +360,11 @@ class GroupchatWindow(chat.Chat):
self.nick_hits[room_jid].append(nick) self.nick_hits[room_jid].append(nick)
if len(self.nick_hits[room_jid]): if len(self.nick_hits[room_jid]):
if len(splitted_text) == 1: # This is the 1st word of the line if len(splitted_text) == 1: # This is the 1st word of the line
add = ': ' add = ', '
else: else:
add = ' ' add = ' '
start_iter = end_iter.copy() start_iter = end_iter.copy()
if self.last_key_tabs[room_jid] and begin.endswith(': '): if self.last_key_tabs[room_jid] and begin.endswith(', '):
start_iter.backward_chars(len(begin) + 2) # have to accomodate for the added space from last completion start_iter.backward_chars(len(begin) + 2) # have to accomodate for the added space from last completion
elif self.last_key_tabs[room_jid]: elif self.last_key_tabs[room_jid]:
start_iter.backward_chars(len(begin) + 1) # have to accomodate for the added space from last completion start_iter.backward_chars(len(begin) + 1) # have to accomodate for the added space from last completion
@ -449,7 +448,7 @@ class GroupchatWindow(chat.Chat):
kind = 'status' kind = 'status'
if kind == 'incoming' and (self.nicks[room_jid].lower() in \ if kind == 'incoming' and (self.nicks[room_jid].lower() in \
text.lower().split() or self.nicks[room_jid].lower() + ':' in \ text.lower().split() or self.nicks[room_jid].lower() + ',' in \
text.lower().split()): text.lower().split()):
other_tags_for_name.append('bold') other_tags_for_name.append('bold')