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

real_jid is changed to sender/receiver_name

This commit is contained in:
Dimitur Kirov 2005-08-17 15:35:36 +00:00
parent 2f0f52e49f
commit 21d0ca72a2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/filetransfers_window.py
View File

@ -120,9 +120,9 @@ class FileTransfersWindow:
helpers.convert_bytes(file_props['size']) helpers.convert_bytes(file_props['size'])
if file_props['type'] == 'r': if file_props['type'] == 'r':
jid = str(file_props['sender']).split('/')[0] jid = str(file_props['sender']).split('/')[0]
real_jid = gajim.get_first_contact_instance_from_jid( sender_name = gajim.get_first_contact_instance_from_jid(
file_props['tt_account'], jid).name file_props['tt_account'], jid).name
sender = gtkgui_helpers.escape_for_pango_markup(real_jid) sender = gtkgui_helpers.escape_for_pango_markup(sender_name)
else: else:
if float(gajim.version) > 0.8: if float(gajim.version) > 0.8:
sender = 'You' # FIXME _(gettext this) sender = 'You' # FIXME _(gettext this)
@ -132,9 +132,9 @@ class FileTransfersWindow:
sectext += '\n\t' +_('Recipient: ') sectext += '\n\t' +_('Recipient: ')
if file_props['type'] == 's': if file_props['type'] == 's':
jid = str(file_props['receiver']).split('/')[0] jid = str(file_props['receiver']).split('/')[0]
real_jid = gajim.get_first_contact_instance_from_jid( receiver_name = gajim.get_first_contact_instance_from_jid(
file_props['tt_account'], jid).name file_props['tt_account'], jid).name
recipient = gtkgui_helpers.escape_for_pango_markup(real_jid) recipient = gtkgui_helpers.escape_for_pango_markup(receiver_name)
else: else:
if float(gajim.version) > 0.8: if float(gajim.version) > 0.8:
recipient = 'You' # FIXME _(gettext this) recipient = 'You' # FIXME _(gettext this)
@ -146,7 +146,8 @@ class FileTransfersWindow:
sectext += '\n\t' +_('Saved in: %s') % \ sectext += '\n\t' +_('Saved in: %s') % \
gtkgui_helpers.escape_for_pango_markup(path) gtkgui_helpers.escape_for_pango_markup(path)
dialog = dialogs.HigDialog(None, _('File transfer completed'), sectext, dialog = dialogs.HigDialog(None, _('File transfer completed'), sectext,
gtk.STOCK_DIALOG_INFO, [[_('_Open Containing Folder'), gtk.RESPONSE_ACCEPT], [ gtk.STOCK_OK, gtk.RESPONSE_OK ]]) gtk.STOCK_DIALOG_INFO, [[_('_Open Containing Folder'), gtk.RESPONSE_ACCEPT],
[ gtk.STOCK_OK, gtk.RESPONSE_OK ]])
button = dialog.get_button(1) button = dialog.get_button(1)
if gtk.gtk_version >= (2, 6, 0) and gtk.pygtk_version >= (2, 6, 0): if gtk.gtk_version >= (2, 6, 0) and gtk.pygtk_version >= (2, 6, 0):
button.set_image(gtk.image_new_from_stock( button.set_image(gtk.image_new_from_stock(