svn to say 0.9 and removing some code for 0.8 only

This commit is contained in:
Nikos Kouremenos 2005-08-23 12:52:16 +00:00
parent 33d1536c25
commit 9b483b62ee
2 changed files with 5 additions and 6 deletions

View File

@ -24,7 +24,7 @@ import mutex
import common.config import common.config
import common.logger import common.logger
version = '0.8' version = '0.9'
config = common.config.Config() config = common.config.Config()
connections = {} connections = {}
verbose = False verbose = False

View File

@ -125,10 +125,8 @@ class FileTransfersWindow:
file_props['tt_account'], jid).name file_props['tt_account'], jid).name
sender = gtkgui_helpers.escape_for_pango_markup(sender_name) sender = gtkgui_helpers.escape_for_pango_markup(sender_name)
else: else:
if float(gajim.version) > 0.8: #You is a reply of who send a file
sender = 'You' # FIXME _(gettext this) sender = _('You')
else:
sender = file_props['tt_account']
sectext += '\n\t' +_('Sender: %s') % sender sectext += '\n\t' +_('Sender: %s') % sender
sectext += '\n\t' +_('Recipient: ') sectext += '\n\t' +_('Recipient: ')
if file_props['type'] == 's': if file_props['type'] == 's':
@ -147,7 +145,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_DIALOG_INFO, [
[_('_Open Containing Folder'), gtk.RESPONSE_ACCEPT],
[ gtk.STOCK_OK, gtk.RESPONSE_OK ]]) [ 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):