summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-11-18 00:38:17 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-11-18 00:38:17 +0000
commit0fff4a363cebcef2680b33862b461ae576cf6e9d (patch)
treefa44cc60b32f88db9f09cc39ba3ae503fb6eb6d9 /gtk2_ardour
parent2ed2be3557d5331f0e3e5bc44ad4a84c72febb97 (diff)
working nag screen url opening on OS X
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4195 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/cocoacarbon.mm13
-rw-r--r--gtk2_ardour/nag.cc2
2 files changed, 11 insertions, 4 deletions
diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm
index 7e102845af..e4f833dd26 100644
--- a/gtk2_ardour/cocoacarbon.mm
+++ b/gtk2_ardour/cocoacarbon.mm
@@ -164,8 +164,15 @@ ARDOUR_UI::platform_setup ()
}
bool
-cocoa_open_uri (const char* uri)
+cocoa_open_url (const char* uri)
{
- NSURL* nsurl = [NSURL initWithString:uri];
- return [[NSWorkspace sharedWorkspace] openURL:nsurl];
+ NSString* struri = [[NSString alloc] initWithUTF8String:uri];
+ NSURL* nsurl = [[NSURL alloc] initWithString:struri];
+
+ bool ret = [[NSWorkspace sharedWorkspace] openURL:nsurl];
+
+ [struri release];
+ [nsurl release];
+
+ return ret;
}
diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc
index f3db2df46e..301dc2036a 100644
--- a/gtk2_ardour/nag.cc
+++ b/gtk2_ardour/nag.cc
@@ -198,7 +198,7 @@ NagScreen::open_uri (const char* uri)
return true;
#else
- extern bool cocoa_open_uri (const char*);
+ extern bool cocoa_open_url (const char*);
return cocoa_open_url (uri);
#endif
#endif