#
#
# patch "src/view/dialogs/DatabaseDialogManager.cpp"
#  from [747825f29d1f4430ee9f7ffa78cc34a19d0b651a]
#    to [3eb4490f834d4871a9c146f26925857c35b91be8]
# 
# patch "src/view/dialogs/DialogManager.cpp"
#  from [7b7c3060381080175c064450c3ec1dcb4a7e343f]
#    to [d8c5b876be4fba486bc85e0a9450a41f17720c2f]
# 
# patch "src/view/dialogs/WorkspaceDialogManager.cpp"
#  from [eae62066f3c403f953ed505b0ee3e6fc503a97a4]
#    to [1c442ec7dbeb866fd0736d880c1a79b946b725d9]
#
============================================================
--- src/view/dialogs/DatabaseDialogManager.cpp	747825f29d1f4430ee9f7ffa78cc34a19d0b651a
+++ src/view/dialogs/DatabaseDialogManager.cpp	3eb4490f834d4871a9c146f26925857c35b91be8
@@ -22,8 +22,44 @@ DatabaseDialogManager::DatabaseDialogMan
 #include "vocab.h"
 
 DatabaseDialogManager::DatabaseDialogManager(QWidget * parent)
-  : DialogManager(parent)
+  : DialogManager(parent), changesetBrowser(0), checkoutRevision(0),
+    fileDiff(0), fileHistory(0), generateKeypair(0), keyManagement(0),
+    revisionDiff(0), revisionManifest(0), selectRevision(0) {}
+
+DatabaseDialogManager::~DatabaseDialogManager()
 {
+    cleanup();
+}
+
+void DatabaseDialogManager::cleanup()
+{
+    if (changesetBrowser)   delete changesetBrowser;
+    if (checkoutRevision)   delete checkoutRevision;
+    if (fileDiff)           delete fileDiff;
+    if (fileHistory)        delete fileHistory;
+    if (generateKeypair)    delete generateKeypair;
+    if (keyManagement)      delete keyManagement;
+    if (revisionDiff)       delete revisionDiff;
+    if (revisionManifest)   delete revisionManifest;
+    if (selectRevision)     delete selectRevision;
+}
+
+void DatabaseDialogManager::init(const DatabaseFile & db)
+{
+    databaseFile = db;
+    cleanup();
+
+    QWidget * parentWidget = reinterpret_cast<QWidget *>(parent());
+    changesetBrowser    = new ChangesetBrowser(parentWidget, databaseFile);
+    checkoutRevision    = new CheckoutRevision(parentWidget, databaseFile);
+    fileDiff            = new FileDiff(parentWidget);
+    fileHistory         = new FileHistory(parentWidget, databaseFile);
+    generateKeypair     = new GenerateKeypair(parentWidget, databaseFile);
+    keyManagement       = new KeyManagement(parentWidget, databaseFile);
+    revisionDiff        = new RevisionDiff(parentWidget);
+    revisionManifest    = new RevisionManifest(parentWidget, databaseFile);
+    selectRevision      = new SelectRevision(parentWidget, databaseFile);
+
     connect(
         changesetBrowser, SIGNAL(revisionManifest(const QString &)),
         this, SLOT(showRevisionManifest(const QString &))
@@ -80,42 +116,8 @@ DatabaseDialogManager::DatabaseDialogMan
         checkoutRevision, SIGNAL(revisionCheckedOut(const QString &)),
         this, SIGNAL(revisionCheckedOut(const QString &))
     );
-}
 
-DatabaseDialogManager::~DatabaseDialogManager()
-{
-    cleanup();
-}
-
-void DatabaseDialogManager::cleanup()
-{
-    if (changesetBrowser)   delete changesetBrowser;
-    if (checkoutRevision)   delete checkoutRevision;
-    if (fileDiff)           delete fileDiff;
-    if (fileHistory)        delete fileHistory;
-    if (generateKeypair)    delete generateKeypair;
-    if (keyManagement)      delete keyManagement;
-    if (revisionDiff)       delete revisionDiff;
-    if (revisionManifest)   delete revisionManifest;
-    if (selectRevision)     delete selectRevision;
-}
-
-void DatabaseDialogManager::init(const DatabaseFile & db)
-{
     DialogManager::init();
-    databaseFile = db;
-    cleanup();
-
-    QWidget * parentWidget = reinterpret_cast<QWidget *>(parent());
-    changesetBrowser    = new ChangesetBrowser(parentWidget, databaseFile);
-    checkoutRevision    = new CheckoutRevision(parentWidget, databaseFile);
-    fileDiff            = new FileDiff(parentWidget);
-    fileHistory         = new FileHistory(parentWidget, databaseFile);
-    generateKeypair     = new GenerateKeypair(parentWidget, databaseFile);
-    keyManagement       = new KeyManagement(parentWidget, databaseFile);
-    revisionDiff        = new RevisionDiff(parentWidget);
-    revisionManifest    = new RevisionManifest(parentWidget, databaseFile);
-    selectRevision      = new SelectRevision(parentWidget, databaseFile);
 }
 
 void DatabaseDialogManager::showChangesetBrowser()
============================================================
--- src/view/dialogs/DialogManager.cpp	7b7c3060381080175c064450c3ec1dcb4a7e343f
+++ src/view/dialogs/DialogManager.cpp	d8c5b876be4fba486bc85e0a9450a41f17720c2f
@@ -21,7 +21,8 @@
 #include "DialogManager.h"
 #include "vocab.h"
 
-DialogManager::DialogManager(QWidget * parentWidget) : QObject(parentWidget) {}
+DialogManager::DialogManager(QWidget * parentWidget) : QObject(parentWidget),
+  about(0), preferences(0) {}
 
 DialogManager::~DialogManager()
 {
============================================================
--- src/view/dialogs/WorkspaceDialogManager.cpp	eae62066f3c403f953ed505b0ee3e6fc503a97a4
+++ src/view/dialogs/WorkspaceDialogManager.cpp	1c442ec7dbeb866fd0736d880c1a79b946b725d9
@@ -22,25 +22,9 @@ WorkspaceDialogManager::WorkspaceDialogM
 #include "Guitone.h"
 
 WorkspaceDialogManager::WorkspaceDialogManager(QWidget * parent)
-  : DatabaseDialogManager(parent)
-{
-    connect(
-        updateWorkspace, SIGNAL(selectRevisionFromSelector(const QString &)),
-        this, SLOT(showSelectRevision(const QString &))
-    );
+  : DatabaseDialogManager(parent), commitRevision(0),
+    unaccountedRenames(0), updateWorkspace(0) {}
 
-    connect(
-        selectRevision, SIGNAL(revisionSelected(const QString &)),
-        updateWorkspace, SLOT(setSelectedRevision(const QString &))
-    );
-
-    // delegate this further
-    connect(
-        commitRevision, SIGNAL(revisionCommitted(const QString &)),
-        this, SIGNAL(revisionCommitted(const QString &))
-    );
-}
-
 WorkspaceDialogManager::~WorkspaceDialogManager()
 {
     cleanup();
@@ -55,7 +39,6 @@ void WorkspaceDialogManager::init(const 
 
 void WorkspaceDialogManager::init(const WorkspacePath & path)
 {
-    DatabaseDialogManager::init(APP->manager()->getDatabaseFilePath(path));
     workspacePath = path;
     cleanup();
 
@@ -63,6 +46,24 @@ void WorkspaceDialogManager::init(const 
     commitRevision      = new CommitRevision(parentWidget, workspacePath);
     updateWorkspace     = new UpdateWorkspace(parentWidget, workspacePath);
     unaccountedRenames  = new UnaccountedRenames(parentWidget);
+
+    connect(
+        updateWorkspace, SIGNAL(selectRevisionFromSelector(const QString &)),
+        this, SLOT(showSelectRevision(const QString &))
+    );
+
+    connect(
+        selectRevision, SIGNAL(revisionSelected(const QString &)),
+        updateWorkspace, SLOT(setSelectedRevision(const QString &))
+    );
+
+    // delegate this further
+    connect(
+        commitRevision, SIGNAL(revisionCommitted(const QString &)),
+        this, SIGNAL(revisionCommitted(const QString &))
+    );
+
+    DatabaseDialogManager::init(APP->manager()->getDatabaseFilePath(path));
 }
 
 void WorkspaceDialogManager::showCommitRevision()