#
#
# patch "src/view/dialogs/DatabaseDialogManager.cpp"
#  from [48a2332538a87a9b068b8af053d9bee8eddd5398]
#    to [903fe5513823171829c2d7feaefc5996bcd05a7d]
# 
# patch "src/view/dialogs/DatabaseDialogManager.h"
#  from [39dfe4f5d0a25022399e0eaf7fa45319ff84ab9c]
#    to [532a5c5e04720356b89b3584d40833c422ed2a26]
# 
# patch "src/view/dialogs/DialogManager.h"
#  from [1c2a1058e045624b89b8281861727447366f7fb6]
#    to [eb6eec5ffed8e531e644cfa7da0c13f564339532]
# 
# patch "src/view/dialogs/WorkspaceDialogManager.cpp"
#  from [bd47881e7ff2475f0843c7219cf96a617bebd623]
#    to [ed9e9897de007f9b6e34d1dbae8e15562ff0b441]
# 
# patch "src/view/dialogs/WorkspaceDialogManager.h"
#  from [d6b72b390c5377e0e5f44a530a06495d927512d5]
#    to [b990af551a2bf1a0276f1fb386cd99c9c536ba48]
#
============================================================
--- src/view/dialogs/DatabaseDialogManager.cpp	48a2332538a87a9b068b8af053d9bee8eddd5398
+++ src/view/dialogs/DatabaseDialogManager.cpp	903fe5513823171829c2d7feaefc5996bcd05a7d
@@ -166,7 +166,7 @@ void DatabaseDialogManager::showKeyManag
     showDialog(keyManagement);
 }
 
-void DatabaseDialogManager::showRevisionDiff(const QString & file, const QString & base, const QString & target)
+void DatabaseDialogManager::showRevisionDiff(const QString & path, const QString & base, const QString & target)
 {
     if (!revisionDiff)
     {
@@ -178,7 +178,7 @@ void DatabaseDialogManager::showRevision
         );
     }
 
-    revisionDiff->forDatabase(databaseFile, file, base, target);
+    revisionDiff->forDatabase(databaseFile, path, base, target);
     showDialog(revisionDiff);
 }
 
============================================================
--- src/view/dialogs/DatabaseDialogManager.h	39dfe4f5d0a25022399e0eaf7fa45319ff84ab9c
+++ src/view/dialogs/DatabaseDialogManager.h	532a5c5e04720356b89b3584d40833c422ed2a26
@@ -37,24 +37,24 @@ public:
     DatabaseDialogManager(QWidget *);
     ~DatabaseDialogManager();
 
+    void init(const DatabaseFile &);
+    virtual void closeAllDialogs();
+
     //! delegated signals
 signals:
     void revisionCheckedOut(const QString &);
 
 public slots:
-    void init(const DatabaseFile &);
     void showChangesetBrowser();
     void showCheckoutRevision();
-    virtual void showFileDiff(const QString &, const QString &, const QString &);
-    void showFileHistory(const QString &, const QString &);
+    virtual void showFileDiff(const QString & file, const QString & base, const QString & target);
+    void showFileHistory(const QString & file, const QString & startRevision);
     void showGenerateKeypair();
     void showKeyManagement();
-    virtual void showRevisionDiff(const QString &, const QString &, const QString &);
-    void showRevisionManifest(const QString &);
-    void showSelectRevision(const QString &);
+    virtual void showRevisionDiff(const QString & path, const QString & base, const QString & target);
+    void showRevisionManifest(const QString & revision);
+    void showSelectRevision(const QString & selector);
 
-    virtual void closeAllDialogs();
-
 protected:
     ChangesetBrowser    * changesetBrowser;
     CheckoutRevision    * checkoutRevision;
============================================================
--- src/view/dialogs/DialogManager.h	1c2a1058e045624b89b8281861727447366f7fb6
+++ src/view/dialogs/DialogManager.h	eb6eec5ffed8e531e644cfa7da0c13f564339532
@@ -33,13 +33,13 @@ public:
     DialogManager(QWidget *);
     ~DialogManager();
 
+    virtual void closeAllDialogs();
+
 public slots:
     void showAbout();
     void showPreferences();
     void showCreateDatabase();
 
-    virtual void closeAllDialogs();
-
 signals:
     void databaseCreated(const QString &);
     void allDialogsClosed();
============================================================
--- src/view/dialogs/WorkspaceDialogManager.cpp	bd47881e7ff2475f0843c7219cf96a617bebd623
+++ src/view/dialogs/WorkspaceDialogManager.cpp	ed9e9897de007f9b6e34d1dbae8e15562ff0b441
@@ -101,7 +101,7 @@ void WorkspaceDialogManager::showFileHis
         MonotoneUtil::getBaseWorkspaceRevision(workspacePath));
 }
 
-void WorkspaceDialogManager::showRevisionDiff(const QString & file, const QString & base, const QString & target)
+void WorkspaceDialogManager::showRevisionDiff(const QString & path, const QString & base, const QString & target)
 {
     if (!revisionDiff)
     {
@@ -113,7 +113,7 @@ void WorkspaceDialogManager::showRevisio
         );
     }
 
-    revisionDiff->forWorkspace(workspacePath, file, base, target);
+    revisionDiff->forWorkspace(workspacePath, path, base, target);
     showDialog(revisionDiff);
 }
 
============================================================
--- src/view/dialogs/WorkspaceDialogManager.h	d6b72b390c5377e0e5f44a530a06495d927512d5
+++ src/view/dialogs/WorkspaceDialogManager.h	b990af551a2bf1a0276f1fb386cd99c9c536ba48
@@ -34,23 +34,23 @@ public:
     WorkspaceDialogManager(QWidget *);
     ~WorkspaceDialogManager();
 
+    void init(const WorkspacePath &);
+    void closeAllDialogs();
+
     //! delegated signals
 signals:
     void revisionCommitted(const QString &);
 
 public slots:
-    void init(const WorkspacePath &);
     void showCommitRevision();
-    void showCommitRevision(const QStringList &);
+    void showCommitRevision(const QStringList & paths);
     void checkForUnaccountedRenames();
     void showUpdateWorkspace();
-    void showFileDiff(const QString &);
-    void showFileDiff(const QString &, const QString &, const QString &);
-    void showFileHistory(const QString &);
-    void showRevisionDiff(const QString &, const QString &, const QString &);
+    void showFileDiff(const QString & file);
+    void showFileDiff(const QString & file, const QString & base, const QString & target);
+    void showFileHistory(const QString & file);
+    void showRevisionDiff(const QString & path, const QString & base, const QString & target);
 
-    void closeAllDialogs();
-
 protected:
     CommitRevision      * commitRevision;
     UnaccountedRenames  * unaccountedRenames;