Mercurial > hg > bitcoin

changeset 2653:ece2b86750e0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #1329 from laanwj/2012_05_addrremovewhitespace Filter out whitespace and zero-width non-breaking spaces in address field validator
author Wladimir J. van der Laan <laanwj@gmail.com>
date Mon, 21 May 2012 09:54:24 -0700
parents b48498ff6921 (diff) 7b289e24d638 (current diff)
children 9ff50025a639
files
diffstat 2 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -76,6 +76,10 @@
     if (fCreate)
         nFlags |= DB_CREATE;
 
+    unsigned int nEnvFlags = 0;
+    if (GetBoolArg("-privdb", true))
+        nEnvFlags |= DB_PRIVATE;
+
     {
         LOCK(cs_db);
         if (!fDbEnvInit)
@@ -106,7 +110,8 @@
                              DB_INIT_MPOOL |
                              DB_INIT_TXN   |
                              DB_THREAD     |
-                             DB_RECOVER,
+                             DB_RECOVER    |
+                             nEnvFlags,
                              S_IRUSR | S_IWUSR);
             if (ret > 0)
                 throw runtime_error(strprintf("CDB() : error %d opening database environment", ret));
--- a/src/qt/forms/askpassphrasedialog.ui
+++ b/src/qt/forms/askpassphrasedialog.ui
@@ -41,49 +41,49 @@
      <property name="fieldGrowthPolicy">
       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
      </property>
-     <item row="1" column="0">
+     <item row="0" column="0">
       <widget class="QLabel" name="passLabel1">
        <property name="text">
         <string>Enter passphrase</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="0" column="1">
       <widget class="QLineEdit" name="passEdit1">
        <property name="echoMode">
         <enum>QLineEdit::Password</enum>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="1" column="0">
       <widget class="QLabel" name="passLabel2">
        <property name="text">
         <string>New passphrase</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="1" column="1">
       <widget class="QLineEdit" name="passEdit2">
        <property name="echoMode">
         <enum>QLineEdit::Password</enum>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="2" column="0">
       <widget class="QLabel" name="passLabel3">
        <property name="text">
         <string>Repeat new passphrase</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="2" column="1">
       <widget class="QLineEdit" name="passEdit3">
        <property name="echoMode">
         <enum>QLineEdit::Password</enum>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
+     <item row="3" column="1">
       <widget class="QLabel" name="capsLabel">
        <property name="font">
         <font>