changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive)

git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 22 deletions

diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc
index 7ae1b6e809..7a7a4aadbb 100644
--- a/gtk2_ardour/nag.cc
+++ b/gtk2_ardour/nag.cc
@@ -5,6 +5,8 @@
 #include <fstream>
 #include <gtkmm/stock.h>
 
+#include "pbd/openuri.h"
+
 #include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 
@@ -176,35 +178,16 @@ NagScreen::offer_to_donate ()
 
 	/* we don't care if it fails */
 
-	open_uri (uri);
+        PBD::open_uri (uri);
 }
 
 void
 NagScreen::offer_to_subscribe ()
 {
 	const char* uri = "http://ardour.org/subscribe";
-
-	if (open_uri (uri)) {
+        
+	if (PBD::open_uri (uri)) {
 		mark_subscriber ();
 	}
 }
 
-bool
-NagScreen::open_uri (const char* uri)
-{
-#ifdef HAVE_GTK_OPEN_URI
-	GError* err;
-	return gtk_open_uri (0, uri, GDK_CURRENT_TIME, &err);
-#else
-#ifdef GTKOSX
-	extern bool cocoa_open_url (const char*);
-	return cocoa_open_url (uri);
-#else
-	std::string command = "xdg-open ";
-	command += uri;
-	spawn_command_line_async (command);
-
-	return true;
-#endif
-#endif
-}