diff --git a/frontends/gnustep/AppDelegate.m b/frontends/gnustep/AppDelegate.m index a7dcffb07..c8403d07a 100644 --- a/frontends/gnustep/AppDelegate.m +++ b/frontends/gnustep/AppDelegate.m @@ -17,6 +17,7 @@ #import "BookmarkFolder.h" #import "BookmarksWindowController.h" #import "PreferencesWindowController.h" +#import "Preferences.h" #define MAX_RECENT_HISTORY 10 @@ -118,8 +119,9 @@ static NSMenuItem *menuItemForItem(id item) { NSLog(@"Will create a new window %@", self); struct nsurl *url; nserror error; + NSString *startupUrl = [[Preferences defaultPreferences] startupUrl]; - error = nsurl_create("https://www.startpage.com", &url); + error = nsurl_create([startupUrl cString], &url); if (error == NSERROR_OK) { error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, NULL); diff --git a/frontends/gnustep/DownloadManager.m b/frontends/gnustep/DownloadManager.m index afe30bd10..1e68ded03 100644 --- a/frontends/gnustep/DownloadManager.m +++ b/frontends/gnustep/DownloadManager.m @@ -1,6 +1,7 @@ #import #import "DownloadManager.h" #import "desktop/download.h" +#import "Preferences.h" @implementation DownloadItem @@ -105,6 +106,9 @@ [outputStream close]; completed = YES; [[manager delegate] downloadManager: manager didUpdateItem: self]; + if ([[Preferences defaultPreferences] removeDownloadsOnComplete]) { + [manager removeDownloadsAtIndexes: [NSIndexSet indexSetWithIndex: index]]; + } } -(BOOL)isComplete { diff --git a/frontends/gnustep/Preferences.m b/frontends/gnustep/Preferences.m index 959c30144..80c14bf38 100644 --- a/frontends/gnustep/Preferences.m +++ b/frontends/gnustep/Preferences.m @@ -77,7 +77,7 @@ if ([defaults objectForKey: KEY_CONFIRM_OVERWRITE] != nil) { return [defaults boolForKey: KEY_CONFIRM_OVERWRITE]; } else { - return NO; + return YES; } } -(void)setConfirmBeforeOverwriting: (BOOL)value { diff --git a/frontends/gnustep/PreferencesWindowController.m b/frontends/gnustep/PreferencesWindowController.m index 71438876b..909095757 100644 --- a/frontends/gnustep/PreferencesWindowController.m +++ b/frontends/gnustep/PreferencesWindowController.m @@ -175,20 +175,10 @@ -(void)didPressStartupUseCurrentPage: (id)sender { NSLog(@"Did press startup use current page"); - @try { AppDelegate *delegate = [NSApp delegate]; NSString *url = [delegate currentUrl]; - NSLog(@"url: %@", url); [[Preferences defaultPreferences] setStartupUrl: url]; [startupPageField setStringValue: [[Preferences defaultPreferences] startupUrl]]; - } - @catch (NSException *ex) { - NSLog(@"ex: %@", ex); - } - @finally { - - } - }