From 8318453bf9d4fd50b137ff6c6fc8d1fd22aa6395 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:07:15 +0200
Subject: 3.7

---
 ui/SmallDialogs.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'ui/SmallDialogs.h')

diff --git a/ui/SmallDialogs.h b/ui/SmallDialogs.h
index 73e4d13a..74c12f33 100644
--- a/ui/SmallDialogs.h
+++ b/ui/SmallDialogs.h
@@ -30,8 +30,7 @@ void showHelpDialog();
 
 DefaultReturnCode::Response showFilterDialog(bool isGlobalFilter,
         Zstring& filterIncl,
-        Zstring& filterExcl,
-        bool filterActive);
+        Zstring& filterExcl);
 
 DefaultReturnCode::Response showDeleteDialog(
     const std::vector<FileSystemObject*>& rowsOnLeft,
@@ -47,7 +46,12 @@ DefaultReturnCode::Response showSyncPreviewDlg(
     const SyncStatistics& statistics,
     bool& dontShowAgain);
 
-DefaultReturnCode::Response showCompareCfgDialog(const wxPoint& position, CompareVariant& cmpVar);
+DefaultReturnCode::Response showCompareCfgDialog(
+    const wxPoint& position,
+    CompareVariant& cmpVar,
+    bool& processSymlinks,
+    bool& traverseDirectorySymlinks,
+    bool& copyFileSymlinks);
 
 DefaultReturnCode::Response showGlobalSettingsDlg(xmlAccess::XmlGlobalSettings& globalSettings);
 }
-- 
cgit