a couple of extra tooltips for editor preferences

[ardour.git] / gtk2_ardour / nag.cc

diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc
index 7a7a4aadbb8cc92106d735adc4d77164db5f74f6..5d93d132677dc5048f831c0b8b36aac6be46fb78 100644 (file)
--- 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"
@@ -91,11 +90,11 @@ NagScreen::nag ()
 NagScreen*
 NagScreen::maybe_nag (std::string why)
 {
-       Glib::ustring path;
+       std::string path;
        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;
@@ -113,9 +112,9 @@ NagScreen::maybe_nag (std::string why)
 void
 NagScreen::mark_never_again ()
 {
-       Glib::ustring path;
+       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());
 }
@@ -123,9 +122,9 @@ NagScreen::mark_never_again ()
 void
 NagScreen::mark_subscriber ()
 {
-       Glib::ustring path;
+       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());
 }
@@ -133,9 +132,9 @@ NagScreen::mark_subscriber ()
 void
 NagScreen::mark_affirmed_subscriber ()
 {
-       Glib::ustring path;
+       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());
 }
@@ -143,7 +142,7 @@ NagScreen::mark_affirmed_subscriber ()
 bool
 NagScreen::is_subscribed (bool& really)
 {
-       Glib::ustring path;
+       std::string path;
 
        really = false;
 
@@ -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.
@@ -185,7 +184,7 @@ void
 NagScreen::offer_to_subscribe ()
 {
        const char* uri = "http://ardour.org/subscribe";
-        
+
        if (PBD::open_uri (uri)) {
                mark_subscriber ();
        }