use do_connect() instead of connect()
This commit is contained in:
parent
1456104382
commit
0afd8e2e70
|
@ -364,11 +364,7 @@ class fpdb:
|
||||||
|
|
||||||
self.db = fpdb_db.fpdb_db()
|
self.db = fpdb_db.fpdb_db()
|
||||||
#print "end of fpdb.load_profile, databaseName:",self.settings['db-databaseName']
|
#print "end of fpdb.load_profile, databaseName:",self.settings['db-databaseName']
|
||||||
self.db.connect(self.settings['db-backend'],
|
self.db.do_connect(self.config)
|
||||||
self.settings['db-host'],
|
|
||||||
self.settings['db-databaseName'],
|
|
||||||
self.settings['db-user'],
|
|
||||||
self.settings['db-password'])
|
|
||||||
if self.db.wrongDbVersion:
|
if self.db.wrongDbVersion:
|
||||||
diaDbVersionWarning = gtk.Dialog(title="Strong Warning - Invalid database version", parent=None, flags=0, buttons=(gtk.STOCK_OK,gtk.RESPONSE_OK))
|
diaDbVersionWarning = gtk.Dialog(title="Strong Warning - Invalid database version", parent=None, flags=0, buttons=(gtk.STOCK_OK,gtk.RESPONSE_OK))
|
||||||
|
|
||||||
|
@ -401,11 +397,7 @@ class fpdb:
|
||||||
def obtain_global_lock(self):
|
def obtain_global_lock(self):
|
||||||
print "\nTaking global lock ..."
|
print "\nTaking global lock ..."
|
||||||
self.fdb_lock = fpdb_db.fpdb_db()
|
self.fdb_lock = fpdb_db.fpdb_db()
|
||||||
self.fdb_lock.connect(self.settings['db-backend'],
|
self.fdb_lock.do_connect(self.config)
|
||||||
self.settings['db-host'],
|
|
||||||
self.settings['db-databaseName'],
|
|
||||||
self.settings['db-user'],
|
|
||||||
self.settings['db-password'])
|
|
||||||
return self.fdb_lock.get_global_lock()
|
return self.fdb_lock.get_global_lock()
|
||||||
#end def obtain_global_lock
|
#end def obtain_global_lock
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user