':' spacing. always set a status message
This commit is contained in:
parent
8c7d818eca
commit
3c46c13d8d
|
@ -1003,11 +1003,9 @@ class Connection:
|
|||
# We didn't set a passphrase
|
||||
self.dispatch('ERROR', (_('OpenPGP Key was not given'),
|
||||
_('You will be connected to %s without OpenPGP.') % self.name))
|
||||
else:
|
||||
if self.connected >= 2
|
||||
if not msg:
|
||||
lowered_uf_status_msg = helpers.get_uf_show(show).lower()
|
||||
# FIXME: so, I will have an empty message, not: "I'm online",
|
||||
# because I have a gpg
|
||||
msg = _("I'm %s") % lowered_uf_status_msg
|
||||
signed = self.gpg.sign(msg, keyID)
|
||||
if signed == 'BAD_PASSPHRASE':
|
||||
|
|
|
@ -623,6 +623,8 @@ class StatusTable:
|
|||
if status:
|
||||
status = status.strip()
|
||||
if status != '':
|
||||
if gtk.gtk_version < (2, 6, 0) or gtk.pygtk_version < (2, 6, 0):
|
||||
# FIXME: check and do the same if we have more than one \n
|
||||
status = self.strip_text(status, 50)
|
||||
str_status += ' - ' + status
|
||||
return gtkgui_helpers.escape_for_pango_markup(str_status)
|
||||
|
@ -1628,7 +1630,7 @@ class FileTransfersWindow:
|
|||
file_props = self.files_props[sid[0]][sid[1:]]
|
||||
if self.is_transfer_paused(file_props):
|
||||
file_props['paused'] = False
|
||||
types = {'r':'download', 's':'upload'}
|
||||
types = {'r' : 'download', 's' : 'upload'}
|
||||
self.set_status(file_props['type'], file_props['sid'], types[sid[0]])
|
||||
widget.set_label(_('Pause'))
|
||||
elif self.is_transfer_active(file_props):
|
||||
|
|
Loading…
Reference in New Issue