diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2011-10-03 16:49:55 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-10-03 16:49:55 +0000 |
commit | 817841eab3a59286908e3447b3cf99423e8d5540 (patch) | |
tree | dba8c1efb3bc7a0c482db0deffe73661e73a4571 /cocoa | |
parent | 7dc000e64356c58246d46253d072180bc2845ad7 (diff) | |
download | netsurf-817841eab3a59286908e3447b3cf99423e8d5540.tar.gz netsurf-817841eab3a59286908e3447b3cf99423e8d5540.tar.bz2 |
Fix up for nsurl changes. Untested.
svn path=/trunk/netsurf/; revision=12930
Diffstat (limited to 'cocoa')
-rw-r--r-- | cocoa/BookmarksController.m | 2 | ||||
-rw-r--r-- | cocoa/BrowserView.m | 2 | ||||
-rw-r--r-- | cocoa/BrowserViewController.m | 4 | ||||
-rw-r--r-- | cocoa/PreferencesWindowController.m | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m index fb28a6a35..9f59fd45e 100644 --- a/cocoa/BookmarksController.m +++ b/cocoa/BookmarksController.m @@ -142,7 +142,7 @@ static const char *cocoa_hotlist_path( void ) { struct browser_window *bw = [[(NetSurfApp *)NSApp frontTab] browser]; if (bw && bw->current_content) { - const char *url = content_get_url( bw->current_content ); + const char *url = nsurl_access(content_get_url( bw->current_content )); hotlist_add_page( url ); } } diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m index 30e874074..d1f5ae9f5 100644 --- a/cocoa/BrowserView.m +++ b/cocoa/BrowserView.m @@ -521,7 +521,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt ) browser_window_get_contextual_content( browser, point.x, point.y, &cont); if (cont.object != NULL) { - NSString *imageURL = [NSString stringWithUTF8String: content_get_url( cont.object )]; + NSString *imageURL = [NSString stringWithUTF8String: nsurl_access(content_get_url( cont.object ))]; [[popupMenu addItemWithTitle: NSLocalizedString( @"Open image in new tab", @"Context menu" ) action: @selector(cmOpenURLInTab:) diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m index a1b18605c..b188dccf0 100644 --- a/cocoa/BrowserViewController.m +++ b/cocoa/BrowserViewController.m @@ -145,10 +145,10 @@ /* try to load local files directly. */ char *scheme; - if (url_scheme(content_get_url(content), &scheme) != URL_FUNC_OK) + if (url_scheme(nsurl_access(content_get_url(content)), &scheme) != URL_FUNC_OK) return; if (strcmp(scheme, "file") == 0) - path = url_to_path(content_get_url(content)); + path = url_to_path(nsurl_access(content_get_url(content))); free(scheme); if (path == NULL) { diff --git a/cocoa/PreferencesWindowController.m b/cocoa/PreferencesWindowController.m index 2425589f9..adba8cf75 100644 --- a/cocoa/PreferencesWindowController.m +++ b/cocoa/PreferencesWindowController.m @@ -38,7 +38,7 @@ - (IBAction) useCurrentPageAsHomepage: (id) sender; { struct browser_window *bw = [[(NetSurfApp *)NSApp frontTab] browser]; - const char *url = content_get_url( bw->current_content ); + const char *url = nsurl_access(content_get_url( bw->current_content )); [self setHomepageURL: [NSString stringWithUTF8String: url]]; } |