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

':' spacing. always set a status message

This commit is contained in:
Dimitur Kirov 2005-08-01 16:14:35 +00:00
parent 8c7d818eca
commit 3c46c13d8d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/connection.py
View File

@ -1003,11 +1003,9 @@ class Connection:
# We didn't set a passphrase # We didn't set a passphrase
self.dispatch('ERROR', (_('OpenPGP Key was not given'), self.dispatch('ERROR', (_('OpenPGP Key was not given'),
_('You will be connected to %s without OpenPGP.') % self.name)) _('You will be connected to %s without OpenPGP.') % self.name))
else: if self.connected >= 2
if not msg: if not msg:
lowered_uf_status_msg = helpers.get_uf_show(show).lower() 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 msg = _("I'm %s") % lowered_uf_status_msg
signed = self.gpg.sign(msg, keyID) signed = self.gpg.sign(msg, keyID)
if signed == 'BAD_PASSPHRASE': if signed == 'BAD_PASSPHRASE':

6
src/dialogs.py
View File

@ -623,7 +623,9 @@ class StatusTable:
if status: if status:
status = status.strip() status = status.strip()
if status != '': if status != '':
status = self.strip_text(status, 50) 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 str_status += ' - ' + status
return gtkgui_helpers.escape_for_pango_markup(str_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:]] file_props = self.files_props[sid[0]][sid[1:]]
if self.is_transfer_paused(file_props): if self.is_transfer_paused(file_props):
file_props['paused'] = False 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]]) self.set_status(file_props['type'], file_props['sid'], types[sid[0]])
widget.set_label(_('Pause')) widget.set_label(_('Pause'))
elif self.is_transfer_active(file_props): elif self.is_transfer_active(file_props):