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

revert unwanted change

This commit is contained in:
Yann Leboulanger 2012-04-01 19:47:11 +02:00
parent 794a66e435
commit aec9f53c2d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/chat_control.py
View File

@ -1649,15 +1649,15 @@ class ChatControl(ChatControlBase):
self.restore_conversation() self.restore_conversation()
self.msg_textview.grab_focus() self.msg_textview.grab_focus()
# change tooltip text for audio and video buttons if python-farstream is # change tooltip text for audio and video buttons if python-farsight is
# not installed # not installed
if not gajim.HAVE_FARSTREAM: if not gajim.HAVE_FARSIGHT:
tooltip_text = self._audio_button.get_tooltip_text() tooltip_text = self._audio_button.get_tooltip_text()
self._audio_button.set_tooltip_text( self._audio_button.set_tooltip_text(
'%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) '%s\n%s' % (tooltip_text, _('Requires python-farsight.')))
tooltip_text = self._video_button.get_tooltip_text() tooltip_text = self._video_button.get_tooltip_text()
self._video_button.set_tooltip_text( self._video_button.set_tooltip_text(
'%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) '%s\n%s' % (tooltip_text, _('Requires python-farsight.')))
gajim.ged.register_event_handler('pep-received', ged.GUI1, gajim.ged.register_event_handler('pep-received', ged.GUI1,
self._nec_pep_received) self._nec_pep_received)
@ -1705,7 +1705,7 @@ class ChatControl(ChatControlBase):
# Jingle detection # Jingle detection
if self.contact.supports(NS_JINGLE_ICE_UDP) and \ if self.contact.supports(NS_JINGLE_ICE_UDP) and \
gajim.HAVE_FARSTREAM and self.contact.resource: gajim.HAVE_FARSIGHT and self.contact.resource:
self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO)
self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO)
else: else: