From f83716b6bd72ef9eda8af2b6665db594be9a68fc Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 4 May 2016 17:28:25 -0400 Subject: [PATCH] Drag and drop on Family Tree Manager fixes --- gramps/cli/clidbman.py | 7 ++++--- gramps/gui/dbman.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gramps/cli/clidbman.py b/gramps/cli/clidbman.py index e2157743c..6a347e7bd 100644 --- a/gramps/cli/clidbman.py +++ b/gramps/cli/clidbman.py @@ -312,7 +312,7 @@ class CLIDbManager(object): last, tval, False, "", dbid)) return new_path, title - def _create_new_db(self, title=None, dbid=None): + def _create_new_db(self, title=None, dbid=None, edit_entry=False): """ Create a new database, do extra stuff needed """ @@ -365,12 +365,13 @@ class CLIDbManager(object): for plugin in pmgr.get_import_plugins(): if format == plugin.get_extension(): - new_path, name = self._create_new_db(name) + new_path, name = self._create_new_db(name, edit_entry=False) # Create a new database self.__start_cursor(_("Importing data...")) - dbid = config.get('behavior.database-backend') + ## Use bsddb, for now, because we assumed that above. + dbid = "bsddb" ## config.get('behavior.database-backend') dbase = self.dbstate.make_database(dbid) dbase.load(new_path, user.callback) diff --git a/gramps/gui/dbman.py b/gramps/gui/dbman.py index a6b6a07cc..b6b5f5815 100644 --- a/gramps/gui/dbman.py +++ b/gramps/gui/dbman.py @@ -986,7 +986,7 @@ class DbManager(CLIDbManager): """ Handle the reception of drag data """ - drag_value = selection.get_data() + drag_value = selection.get_data().decode() fname = None type = None title = None