Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge trunk from 19853 to 19947

Browse Source 
svn: r19949
This commit is contained in:
Benny Malengier
2012-07-05 00:38:18 +00:00
parent aba47d38cb e73eec36aa
commit 226a3eee2b
360 changed files with 9231 additions and 4315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/dbloader.py
View File

@@ -57,7 +57,7 @@ from gi.repository import GObject
from cli.grampscli import CLIDbLoader
from gen.config import config
import gen.db
import Utils
from gen.utils.file import get_unicode_path_from_file_chooser
from gui.pluginmanager import GuiPluginManager
from gui.dialog import (DBErrorDialog, ErrorDialog, QuestionDialog2,
WarningDialog)
@@ -162,7 +162,7 @@ class DbLoader(CLIDbLoader):
if response == Gtk.ResponseType.CANCEL:
break
elif response == Gtk.ResponseType.OK:
filename = Utils.get_unicode_path_from_file_chooser(import_dialog.get_filename())
filename = get_unicode_path_from_file_chooser(import_dialog.get_filename())
if self.check_errors(filename):
# displays errors if any
continue