summaryrefslogtreecommitdiffstats
path: root/src/Daemon/Daemon.cpp
diff options
context:
space:
mode:
authorJiri Moskovcak <jmoskovc@redhat.com>2009-08-24 17:41:09 +0200
committerJiri Moskovcak <jmoskovc@redhat.com>2009-08-24 17:41:09 +0200
commit18d048afff2d14a9c2b7bf0b64e973eda5b40954 (patch)
tree5743f5ae5b1ebd280437fd758620d98efa166971 /src/Daemon/Daemon.cpp
parentd4a40899c270d825ff5d602fcdd5941b3fd7bd77 (diff)
parent951fb690f1cde250f4d3cc6565ec4fc63f5df8fa (diff)
downloadabrt-18d048afff2d14a9c2b7bf0b64e973eda5b40954.tar.gz
abrt-18d048afff2d14a9c2b7bf0b64e973eda5b40954.tar.xz
abrt-18d048afff2d14a9c2b7bf0b64e973eda5b40954.zip
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src/Daemon/Daemon.cpp')
-rw-r--r--src/Daemon/Daemon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 00c07c2..47a963c 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -581,7 +581,7 @@ int main(int argc, char** argv)
if (inotify_add_watch(inotify_fd, DEBUG_DUMPS_DIR, IN_CREATE) == -1)
perror_msg_and_die("inotify_add_watch failed on '%s'", DEBUG_DUMPS_DIR);
/* (comment here) */
- LoadSettings(std::string(CONF_DIR) + "/abrt.conf");
+ LoadSettings(CONF_DIR"/abrt.conf");
/* (comment here) */
g_pMainloop = g_main_loop_new(NULL, FALSE);
/* (comment here) */