summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-09-01 08:18:10 +0200
committerMontel Laurent <[email protected]>2015-09-01 08:18:10 +0200
commit14e26245deffe364207293d3f16d42e0cc77d356 (patch)
treed41821a31e65e0b7c22f39b41676bd76d7d9bbc3
parent770729f065502cbf24d93a7c29c2c47e51d59b2f (diff)
Remove no gui settings
-rw-r--r--mailcommon/filter/filterlog.cpp2
-rw-r--r--messagecore/settings/messagecore.kcfg4
-rw-r--r--messageviewer/utils/util.cpp16
-rw-r--r--messageviewer/utils/util.h7
4 files changed, 0 insertions, 29 deletions
diff --git a/mailcommon/filter/filterlog.cpp b/mailcommon/filter/filterlog.cpp
index 9790c36..1779a08 100644
--- a/mailcommon/filter/filterlog.cpp
+++ b/mailcommon/filter/filterlog.cpp
@@ -210,8 +210,6 @@ bool FilterLog::saveToFile(const QString &fileName) const
return false;
}
- fchmod(file.handle(), MessageViewer::Util::getWritePermissions());
-
file.write("<html>\n<body>\n");
file.write("<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">\n");
foreach (const QString &entry, d->mLogEntries) {
diff --git a/messagecore/settings/messagecore.kcfg b/messagecore/settings/messagecore.kcfg
index e2c8483..b1e3d52 100644
--- a/messagecore/settings/messagecore.kcfg
+++ b/messagecore/settings/messagecore.kcfg
@@ -8,10 +8,6 @@
<include>QFontDatabase</include>
<group name="General">
- <entry name="disregardUmask" type="Bool">
- <label>Disregard the user's umask setting and use "read-write for the user only" instead</label>
- <default>false</default>
- </entry>
<entry name="dateFormat" type="Int">
<default code="true">int( KMime::DateFormatter::Fancy )</default>
</entry>
diff --git a/messageviewer/utils/util.cpp b/messageviewer/utils/util.cpp
index cfefdcf..69dffa3 100644
--- a/messageviewer/utils/util.cpp
+++ b/messageviewer/utils/util.cpp
@@ -384,12 +384,6 @@ bool Util::saveContent(QWidget *parent, KMime::Content *content, const QUrl &url
i18n("Error saving attachment"));
return false;
}
-
- const int permissions = MessageViewer::Util::getWritePermissions();
- if (permissions >= 0) {
- fchmod(file.handle(), permissions);
- }
-
ds.setDevice(&file);
} else {
// tmp file for upload
@@ -437,16 +431,6 @@ bool Util::saveContent(QWidget *parent, KMime::Content *content, const QUrl &url
return true;
}
-int Util::getWritePermissions()
-{
- // #79685, #232001 by default use the umask the user defined, but let it be configurable
- if (MessageCore::GlobalSettings::self()->disregardUmask()) {
- return S_IRUSR | S_IWUSR;
- } else {
- return -1;
- }
-}
-
bool Util::saveAttachments(const KMime::Content::List &contents, QWidget *parent, QUrl &currentFolder)
{
if (contents.isEmpty()) {
diff --git a/messageviewer/utils/util.h b/messageviewer/utils/util.h
index a48f82b..d5e052a 100644
--- a/messageviewer/utils/util.h
+++ b/messageviewer/utils/util.h
@@ -86,13 +86,6 @@ bool MESSAGEVIEWER_EXPORT checkOverwrite(const QUrl &url, QWidget *w);
*/
bool handleUrlWithQDesktopServices(const QUrl &url);
-/**
- * evaluates GlobalSettings->disregardUmask()
- * and returns resulting permissions for storing files
- * @return specific file permissions or -1 for default permissions
- */
-int MESSAGEVIEWER_EXPORT getWritePermissions();
-
KMime::Content::List allContents(const KMime::Content *message);
bool saveContents(QWidget *parent, const KMime::Content::List &contents, QUrl &currentFolder);