summaryrefslogtreecommitdiff
path: root/src/controller.cpp
diff options
context:
space:
mode:
authorGravatar Alexander Batischev <eual.jp@gmail.com> 2017-09-19 21:50:05 +0300
committerGravatar Alexander Batischev <eual.jp@gmail.com> 2017-09-20 21:26:53 +0300
commitc63d571089453bf4fe4d765f84a5ca47f826e280 (patch)
tree4a5469e7024f05c769d3071f26d06d68d14d7f17 /src/controller.cpp
parentf5c68cd8e00b3c83e8fb047a1bac3cfda3b1f9e2 (diff)
downloadnewsboat-c63d571089453bf4fe4d765f84a5ca47f826e280.tar.gz
newsboat-c63d571089453bf4fe4d765f84a5ca47f826e280.tar.zst
newsboat-c63d571089453bf4fe4d765f84a5ca47f826e280.zip
Drop "XDG: conf dir not accessible" message
Rationale: - people using the dotdir don't need constant reminders about the alternative; - people using the XDG dirs never see this message anyway. See also #3.
Diffstat (limited to '')
-rw-r--r--src/controller.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/controller.cpp b/src/controller.cpp
index 482b2b66..fe337c28 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -94,7 +94,7 @@ controller::controller() : v(0), urlcfg(0), rsscache(0), url_file("urls"), cache
*
* returns false, if that fails
*/
-bool controller::setup_dirs_xdg(const char *env_home, bool silent) {
+bool controller::setup_dirs_xdg(const char *env_home) {
const char *env_xdg_config;
const char *env_xdg_data;
std::string xdg_config_dir;
@@ -129,16 +129,6 @@ bool controller::setup_dirs_xdg(const char *env_home, bool silent) {
bool config_dir_exists = 0 == access(xdg_config_dir.c_str(), R_OK | X_OK);
if (!config_dir_exists) {
- if (!silent) {
- std::cerr
- << strprintf::fmt(
- _("XDG: configuration directory '%s' not accessible, "
- "using '%s' instead."),
- xdg_config_dir,
- config_dir)
- << std::endl;
- }
-
return false;
}
@@ -163,7 +153,7 @@ bool controller::setup_dirs_xdg(const char *env_home, bool silent) {
return true;
}
-void controller::setup_dirs(bool silent) {
+void controller::setup_dirs() {
const char * env_home;
if (!(env_home = ::getenv("HOME"))) {
struct passwd * spw = ::getpwuid(::getuid());
@@ -180,7 +170,7 @@ void controller::setup_dirs(bool silent) {
config_dir.append(NEWSBEUTER_PATH_SEP);
config_dir.append(NEWSBOAT_CONFIG_SUBDIR);
- if (setup_dirs_xdg(env_home, silent))
+ if (setup_dirs_xdg(env_home))
return;
url_file = config_dir + std::string(NEWSBEUTER_PATH_SEP) + url_file;
@@ -309,7 +299,7 @@ void controller::migrate_data_from_newsbeuter(bool silent) {
cache_file = "cache.db";
config_file = "config";
queue_file = "queue";
- setup_dirs(silent);
+ setup_dirs();
} else {
migrate_data_from_newsbeuter_simple(env_home, silent);
}
@@ -378,7 +368,7 @@ void controller::run(int argc, char * argv[]) {
}
}
- setup_dirs(silent);
+ setup_dirs();
bool using_nonstandard_configs = false;