error about size too big should not come after we close fchooser
This commit is contained in:
parent
c2042e8689
commit
0d3be44948
15
src/vcard.py
15
src/vcard.py
|
@ -193,8 +193,15 @@ class VcardWindow:
|
||||||
f = dialog.get_filename()
|
f = dialog.get_filename()
|
||||||
try:
|
try:
|
||||||
f = f.decode(sys.getfilesystemencoding())
|
f = f.decode(sys.getfilesystemencoding())
|
||||||
except:
|
except UnicodeError:
|
||||||
pass
|
pass
|
||||||
|
else:
|
||||||
|
filesize = os.path.getsize(f) # in bytes
|
||||||
|
if filesize > 8192: # 8 kb
|
||||||
|
dialogs.ErrorDialog(_('The filesize of image "%s" is too large')\
|
||||||
|
% os.path.basename(f),
|
||||||
|
_('The file must not be more than 8 kilobytes.')).get_response()
|
||||||
|
continue
|
||||||
if self.image_is_ok(f):
|
if self.image_is_ok(f):
|
||||||
ok = True
|
ok = True
|
||||||
else:
|
else:
|
||||||
|
@ -202,12 +209,6 @@ class VcardWindow:
|
||||||
dialog.destroy()
|
dialog.destroy()
|
||||||
|
|
||||||
if f:
|
if f:
|
||||||
filesize = os.path.getsize(f) # in bytes
|
|
||||||
if filesize > 8192: # 8 kb
|
|
||||||
dialogs.ErrorDialog(_('The filesize of image "%s" is too large')\
|
|
||||||
% os.path.basename(f),
|
|
||||||
_('The file must not be more than 8 kilobytes.')).get_response()
|
|
||||||
return
|
|
||||||
fd = open(f, 'rb')
|
fd = open(f, 'rb')
|
||||||
data = fd.read()
|
data = fd.read()
|
||||||
pixbuf = gtkgui_helpers.get_pixbuf_from_data(data)
|
pixbuf = gtkgui_helpers.get_pixbuf_from_data(data)
|
||||||
|
|
Loading…
Reference in New Issue