summaryrefslogtreecommitdiffstats
path: root/src/daemon/Daemon.cpp
diff options
context:
space:
mode:
authorNikola Pajkovsky <npajkovs@redhat.com>2010-09-24 17:42:03 +0200
committerNikola Pajkovsky <npajkovs@redhat.com>2010-09-24 17:42:03 +0200
commite7aaba4e7b10e0412f4377a9f2f9ebf48aef8441 (patch)
tree766a7e1585de9b424349ea1643b1358ac0448c8c /src/daemon/Daemon.cpp
parentdd0ca509d0e06481ff2dcf1884cda381ec5861aa (diff)
downloadabrt-e7aaba4e7b10e0412f4377a9f2f9ebf48aef8441.tar.gz
abrt-e7aaba4e7b10e0412f4377a9f2f9ebf48aef8441.tar.xz
abrt-e7aaba4e7b10e0412f4377a9f2f9ebf48aef8441.zip
g_settings_sWatchCrashdumpArchiveDir uses char*
Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
Diffstat (limited to 'src/daemon/Daemon.cpp')
-rw-r--r--src/daemon/Daemon.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index 4cecae1d..6dd26ead 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -593,7 +593,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin
if (ext && strcmp(ext + 1, "working") == 0)
continue;
- const char *dir = g_settings_sWatchCrashdumpArchiveDir.c_str();
+ const char *dir = g_settings_sWatchCrashdumpArchiveDir;
log("Detected creation of file '%s' in upload directory '%s'", name, dir);
if (fork() == 0)
{
@@ -994,11 +994,11 @@ int main(int argc, char** argv)
/* Watching DEBUG_DUMPS_DIR for new files... */
if (inotify_add_watch(inotify_fd, DEBUG_DUMPS_DIR, IN_CREATE | IN_MOVED_TO) < 0)
perror_msg_and_die("inotify_add_watch failed on '%s'", DEBUG_DUMPS_DIR);
- if (!g_settings_sWatchCrashdumpArchiveDir.empty())
+ if (g_settings_sWatchCrashdumpArchiveDir)
{
- s_upload_watch = inotify_add_watch(inotify_fd, g_settings_sWatchCrashdumpArchiveDir.c_str(), IN_CLOSE_WRITE|IN_MOVED_TO);
+ s_upload_watch = inotify_add_watch(inotify_fd, g_settings_sWatchCrashdumpArchiveDir, IN_CLOSE_WRITE|IN_MOVED_TO);
if (s_upload_watch < 0)
- perror_msg_and_die("inotify_add_watch failed on '%s'", g_settings_sWatchCrashdumpArchiveDir.c_str());
+ perror_msg_and_die("inotify_add_watch failed on '%s'", g_settings_sWatchCrashdumpArchiveDir);
}
VERB1 log("Adding inotify watch to glib main loop");
channel_inotify = g_io_channel_unix_new(inotify_fd);