X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fnag.cc;h=5d93d132677dc5048f831c0b8b36aac6be46fb78;hb=737e40a56fa2d325b3b9dc2ca39f5b3b9be887a3;hp=8d9d75538ff300e0517340866af936e0b3c014fb;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git

diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc
index 8d9d75538f..5d93d13267 100644
--- a/gtk2_ardour/nag.cc
+++ b/gtk2_ardour/nag.cc
@@ -7,7 +7,6 @@
 
 #include "pbd/openuri.h"
 
-#include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 
 #include "nag.h"
@@ -95,7 +94,7 @@ NagScreen::maybe_nag (std::string why)
 	bool really_subscribed;
 	bool maybe_subscribed;
 
-	path = Glib::build_filename (user_config_directory().to_string(), ".nevernag");
+	path = Glib::build_filename (user_config_directory(), ".nevernag");
 
 	if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
 		return 0;
@@ -115,7 +114,7 @@ NagScreen::mark_never_again ()
 {
 	std::string path;
 
-	path = Glib::build_filename (user_config_directory().to_string(), ".nevernag");
+	path = Glib::build_filename (user_config_directory(), ".nevernag");
 
 	ofstream nagfile (path.c_str());
 }
@@ -125,7 +124,7 @@ NagScreen::mark_subscriber ()
 {
 	std::string path;
 
-	path = Glib::build_filename (user_config_directory().to_string(), ".askedaboutsub");
+	path = Glib::build_filename (user_config_directory(), ".askedaboutsub");
 
 	ofstream subsfile (path.c_str());
 }
@@ -135,7 +134,7 @@ NagScreen::mark_affirmed_subscriber ()
 {
 	std::string path;
 
-	path = Glib::build_filename (user_config_directory().to_string(), ".isubscribe");
+	path = Glib::build_filename (user_config_directory(), ".isubscribe");
 
 	ofstream subsfile (path.c_str());
 }
@@ -153,13 +152,13 @@ NagScreen::is_subscribed (bool& really)
 	   subscribed. we try to trust our users :)
 	*/
 
-	path = Glib::build_filename (user_config_directory().to_string(), ".isubscribe");
+	path = Glib::build_filename (user_config_directory(), ".isubscribe");
 	if (file_test (path, FILE_TEST_EXISTS)) {
 		really = true;
 		return true;
 	}
 
-	path = Glib::build_filename (user_config_directory().to_string(), ".askedaboutsub");
+	path = Glib::build_filename (user_config_directory(), ".askedaboutsub");
 	if (file_test (path, FILE_TEST_EXISTS)) {
 		/* they never said they were subscribed but they
 		   did once express an interest in it.