View | Details | Raw Unified
Collapse All | Expand All

(-) xca-0.5.1.org/widgets/MainWindow.cpp (+5 lines)
 Lines 451-456   void MainWindow::dberr(const char *errpf Link Here  
	Error(e);
	Error(e);
}
}

            

              
              
void MainWindow::dberrEnv(const DbEnv *dbEnv, const char *errpfx, const char *msg)

            

            

              
              
{

            

            

              
              
    dberr(errpfx, (char *) msg);

            

            

              
              
}

            

            

              
              

            

        
QString MainWindow::getPath()
QString MainWindow::getPath()

        
{
{

        
	QString x = settings->getString("workingdir");
	QString x = settings->getString("workingdir");



(-) xca-0.5.1.org/widgets/MainWindow.h
      (+1 lines)




  

    

    

       Lines 105-110
      class MainWindow: public MainWindow_UI 
    
  Link Here 
    

  

        
	static int passRead(char *buf, int size, int rwflag, void *userdata);
	static int passRead(char *buf, int size, int rwflag, void *userdata);

        
	static int passWrite(char *buf, int size, int rwflag, void *userdata);
	static int passWrite(char *buf, int size, int rwflag, void *userdata);

        
	static void dberr(const char *errpfx, char *msg);
	static void dberr(const char *errpfx, char *msg);

            

              
              
	static void dberrEnv(const DbEnv *dbEnv, const char *errpfx, const char *msg); // db4.3 API change

            

        
	static NewX509 *newX509();
	static NewX509 *newX509();

        
	static QString md5passwd(const char *pass);
	static QString md5passwd(const char *pass);

        
	static void Error(errorEx &err);
	static void Error(errorEx &err);



(-) xca-0.5.1.org/widgets/MW_database.cpp
      (+7 lines)




  

    

    

       Lines 63-78
      void MainWindow::init_database() { 
    
  Link Here 
    

  

        
	if (dbenv) return; // already initialized....
	if (dbenv) return; // already initialized....

        
	try {
	try {

        
		global_tid = NULL;
		global_tid = NULL;

            

              
              

            

        
		dbenv = new DbEnv(0);
		dbenv = new DbEnv(0);

            

              
              
#if DB_VERSION_MINOR < 3

            

        
		dbenv->set_errcall(&MainWindow::dberr);
		dbenv->set_errcall(&MainWindow::dberr);

            

              
              
#else

            

            

              
              
		dbenv->set_errcall(&MainWindow::dberrEnv);

            

            

              
              
#endif

            

        
		dbenv->open(QFile::encodeName(baseDir), DB_RECOVER | DB_INIT_TXN | \
		dbenv->open(QFile::encodeName(baseDir), DB_RECOVER | DB_INIT_TXN | \

        
				DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_LOCK | \
				DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_LOCK | \

        
				DB_CREATE | DB_PRIVATE , 0600 );
				DB_CREATE | DB_PRIVATE , 0600 );

            

              
              

            

        
		dbenv->txn_begin(NULL, &global_tid, 0);
		dbenv->txn_begin(NULL, &global_tid, 0);

        
#ifndef DB_AUTO_COMMIT
#ifndef DB_AUTO_COMMIT

        
#define DB_AUTO_COMMIT 0
#define DB_AUTO_COMMIT 0

        
#endif
#endif

        
		dbenv->set_flags(DB_AUTO_COMMIT,1);
		dbenv->set_flags(DB_AUTO_COMMIT,1);

            

              
              

            

        
	}
	}

        
	catch (DbException &err) {
	catch (DbException &err) {

        
		QString e = err.what();
		QString e = err.what();