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

fix indentation

Browse source
This commit is contained in:
Yann Leboulanger 2008-11-20 15:47:20 +00:00
parent 8bde5748f9
commit 7e14a4dd31
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/chat_control.py
View file

@ -747,12 +747,12 @@ class ChatControlBase(MessageControl):
def on_formattings_button_clicked(self, widget): def on_formattings_button_clicked(self, widget):
'''popup formattings menu''' '''popup formattings menu'''
menu = gtk.Menu() menu = gtk.Menu()
menuitems = ((_('Bold'), 'bold'), menuitems = ((_('Bold'), 'bold'),
(_('Italic'), 'italic'), (_('Italic'), 'italic'),
(_('Underline'), 'underline'), (_('Underline'), 'underline'),
(_('Strike'), 'strike')) (_('Strike'), 'strike'))
active_tags = self.msg_textview.get_active_tags() active_tags = self.msg_textview.get_active_tags()
@ -1299,9 +1299,9 @@ class ChatControl(ChatControlBase):
self._mood_image.hide() self._mood_image.hide()
def update_activity(self): def update_activity(self):
activity = None activity = None
subactivity = None subactivity = None
text = None text = None
if isinstance(self.contact, GC_Contact): if isinstance(self.contact, GC_Contact):
return return
@ -1353,7 +1353,7 @@ class ChatControl(ChatControlBase):
def update_tune(self): def update_tune(self):
artist = None artist = None
title = None title = None
source = None source = None
if isinstance(self.contact, GC_Contact): if isinstance(self.contact, GC_Contact):
@ -1804,8 +1804,7 @@ class ChatControl(ChatControlBase):
composing_xep = composing_xep, composing_xep = composing_xep,
process_command = process_command, xhtml = xhtml) process_command = process_command, xhtml = xhtml)
if id: if id:
# XXX: Once we have fallback to disco, remove # XXX: Once we have fallback to disco, remove notexistant check
# notexistant check
if gajim.capscache.is_supported(contact, NS_RECEIPTS) \ if gajim.capscache.is_supported(contact, NS_RECEIPTS) \
and not gajim.capscache.is_supported(contact, and not gajim.capscache.is_supported(contact,
'notexistant') and gajim.config.get_per('accounts', 'notexistant') and gajim.config.get_per('accounts',
@ -2416,8 +2415,7 @@ class ChatControl(ChatControlBase):
want_e2e = not e2e_is_active and not self.gpg_is_active \ want_e2e = not e2e_is_active and not self.gpg_is_active \
and e2e_pref and e2e_pref
# XXX: Once we have fallback to disco, remove # XXX: Once we have fallback to disco, remove notexistant check
# notexistant check
if want_e2e and not self.no_autonegotiation \ if want_e2e and not self.no_autonegotiation \
and gajim.HAVE_PYCRYPTO \ and gajim.HAVE_PYCRYPTO \
and gajim.capscache.is_supported(self.contact, and gajim.capscache.is_supported(self.contact,