Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/990598ccdcb9610799dd22aa76056527574d0b6b
...commit
http://git.netsurf-browser.org/netsurf.git/commit/990598ccdcb9610799dd22aa76056527574d0b6b
...tree
http://git.netsurf-browser.org/netsurf.git/tree/990598ccdcb9610799dd22aa76056527574d0b6b
The branch, master has been updated
via 990598ccdcb9610799dd22aa76056527574d0b6b (commit)
from 505ae08df2cf0e3de5271569586ae4592967d765 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=990598ccdcb9610799dd22aa76056527574d0b6b
commit 990598ccdcb9610799dd22aa76056527574d0b6b
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix cocoa include ordering to ensure error enum is available
diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m
index 9aec9e5..0bd51b2 100644
--- a/cocoa/BookmarksController.m
+++ b/cocoa/BookmarksController.m
@@ -16,6 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#import "utils/messages.h"
+#import "utils/utils.h"
+#import "desktop/browser.h"
+#import "desktop/hotlist.h"
+#import "desktop/tree.h"
+#import "content/hlcache.h"
+
#import "cocoa/BookmarksController.h"
#import "cocoa/Tree.h"
#import "cocoa/TreeView.h"
@@ -23,12 +30,6 @@
#import "cocoa/BrowserViewController.h"
#import "cocoa/gui.h"
-#import "desktop/browser.h"
-#import "desktop/hotlist.h"
-#import "desktop/tree.h"
-#import "utils/messages.h"
-#import "utils/utils.h"
-#import "content/hlcache.h"
@interface BookmarksController ()
- (void) noteAppWillTerminate: (NSNotification *) note;
diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m
index 686e37b..bfb8be0 100644
--- a/cocoa/BrowserWindowController.m
+++ b/cocoa/BrowserWindowController.m
@@ -16,6 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#import "desktop/browser.h"
+#import "utils/nsoption.h"
+#import "utils/messages.h"
+#import "utils/utils.h"
+#import "utils/nsurl.h"
+
#import "cocoa/BrowserWindowController.h"
#import "cocoa/BrowserViewController.h"
@@ -25,11 +31,6 @@
#import "cocoa/gui.h"
#import "cocoa/NetsurfApp.h"
-#import "desktop/browser.h"
-#import "utils/nsoption.h"
-#import "utils/messages.h"
-#import "utils/utils.h"
-#import "utils/nsurl.h"
@interface BrowserWindowController ()
diff --git a/cocoa/DownloadWindowController.m b/cocoa/DownloadWindowController.m
index 1241e50..0c9d869 100644
--- a/cocoa/DownloadWindowController.m
+++ b/cocoa/DownloadWindowController.m
@@ -16,14 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#import "cocoa/DownloadWindowController.h"
-#import "cocoa/gui.h"
-
#import "utils/log.h"
#import "utils/nsurl.h"
#import "desktop/download.h"
#import "desktop/gui_download.h"
+#import "cocoa/DownloadWindowController.h"
+#import "cocoa/gui.h"
+
@interface DownloadWindowController ()
@property (readwrite, retain, nonatomic) NSFileHandle *outputFile;
diff --git a/cocoa/PreferencesWindowController.m
b/cocoa/PreferencesWindowController.m
index f8a4849..f314736 100644
--- a/cocoa/PreferencesWindowController.m
+++ b/cocoa/PreferencesWindowController.m
@@ -16,17 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#import "utils/nsoption.h"
+#import "desktop/browser.h"
+#import "content/content.h"
+#import "content/hlcache.h"
#import "cocoa/PreferencesWindowController.h"
#import "cocoa/NetsurfApp.h"
#import "cocoa/gui.h"
#import "cocoa/BrowserViewController.h"
-#import "desktop/browser.h"
-#import "content/content.h"
-#import "utils/nsoption.h"
-#import "content/hlcache.h"
-
@implementation PreferencesWindowController
- init;
diff --git a/cocoa/gui.m b/cocoa/gui.m
index afd4905..a634f6a 100644
--- a/cocoa/gui.m
+++ b/cocoa/gui.m
@@ -18,15 +18,6 @@
#import <Cocoa/Cocoa.h>
-#import "cocoa/gui.h"
-#import "cocoa/plotter.h"
-#import "cocoa/BrowserView.h"
-#import "cocoa/BrowserViewController.h"
-#import "cocoa/BrowserWindowController.h"
-#import "cocoa/FormSelectMenu.h"
-#import "cocoa/fetch.h"
-#import "cocoa/schedule.h"
-
#import "utils/nsoption.h"
#import "utils/utils.h"
#import "utils/log.h"
@@ -40,6 +31,16 @@
#import "content/hlcache.h"
#import "content/content.h"
+#import "cocoa/gui.h"
+#import "cocoa/plotter.h"
+#import "cocoa/BrowserView.h"
+#import "cocoa/BrowserViewController.h"
+#import "cocoa/BrowserWindowController.h"
+#import "cocoa/FormSelectMenu.h"
+#import "cocoa/fetch.h"
+#import "cocoa/schedule.h"
+
+
NSString * const kCookiesFileOption = @"CookiesFile";
NSString * const kURLsFileOption = @"URLsFile";
NSString * const kHotlistFileOption = @"Hotlist";
-----------------------------------------------------------------------
Summary of changes:
cocoa/BookmarksController.m | 13 +++++++------
cocoa/BrowserWindowController.m | 11 ++++++-----
cocoa/DownloadWindowController.m | 6 +++---
cocoa/PreferencesWindowController.m | 9 ++++-----
cocoa/gui.m | 19 ++++++++++---------
5 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m
index 9aec9e5..0bd51b2 100644
--- a/cocoa/BookmarksController.m
+++ b/cocoa/BookmarksController.m
@@ -16,6 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#import "utils/messages.h"
+#import "utils/utils.h"
+#import "desktop/browser.h"
+#import "desktop/hotlist.h"
+#import "desktop/tree.h"
+#import "content/hlcache.h"
+
#import "cocoa/BookmarksController.h"
#import "cocoa/Tree.h"
#import "cocoa/TreeView.h"
@@ -23,12 +30,6 @@
#import "cocoa/BrowserViewController.h"
#import "cocoa/gui.h"
-#import "desktop/browser.h"
-#import "desktop/hotlist.h"
-#import "desktop/tree.h"
-#import "utils/messages.h"
-#import "utils/utils.h"
-#import "content/hlcache.h"
@interface BookmarksController ()
- (void) noteAppWillTerminate: (NSNotification *) note;
diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m
index 686e37b..bfb8be0 100644
--- a/cocoa/BrowserWindowController.m
+++ b/cocoa/BrowserWindowController.m
@@ -16,6 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#import "desktop/browser.h"
+#import "utils/nsoption.h"
+#import "utils/messages.h"
+#import "utils/utils.h"
+#import "utils/nsurl.h"
+
#import "cocoa/BrowserWindowController.h"
#import "cocoa/BrowserViewController.h"
@@ -25,11 +31,6 @@
#import "cocoa/gui.h"
#import "cocoa/NetsurfApp.h"
-#import "desktop/browser.h"
-#import "utils/nsoption.h"
-#import "utils/messages.h"
-#import "utils/utils.h"
-#import "utils/nsurl.h"
@interface BrowserWindowController ()
diff --git a/cocoa/DownloadWindowController.m b/cocoa/DownloadWindowController.m
index 1241e50..0c9d869 100644
--- a/cocoa/DownloadWindowController.m
+++ b/cocoa/DownloadWindowController.m
@@ -16,14 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#import "cocoa/DownloadWindowController.h"
-#import "cocoa/gui.h"
-
#import "utils/log.h"
#import "utils/nsurl.h"
#import "desktop/download.h"
#import "desktop/gui_download.h"
+#import "cocoa/DownloadWindowController.h"
+#import "cocoa/gui.h"
+
@interface DownloadWindowController ()
@property (readwrite, retain, nonatomic) NSFileHandle *outputFile;
diff --git a/cocoa/PreferencesWindowController.m
b/cocoa/PreferencesWindowController.m
index f8a4849..f314736 100644
--- a/cocoa/PreferencesWindowController.m
+++ b/cocoa/PreferencesWindowController.m
@@ -16,17 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#import "utils/nsoption.h"
+#import "desktop/browser.h"
+#import "content/content.h"
+#import "content/hlcache.h"
#import "cocoa/PreferencesWindowController.h"
#import "cocoa/NetsurfApp.h"
#import "cocoa/gui.h"
#import "cocoa/BrowserViewController.h"
-#import "desktop/browser.h"
-#import "content/content.h"
-#import "utils/nsoption.h"
-#import "content/hlcache.h"
-
@implementation PreferencesWindowController
- init;
diff --git a/cocoa/gui.m b/cocoa/gui.m
index afd4905..a634f6a 100644
--- a/cocoa/gui.m
+++ b/cocoa/gui.m
@@ -18,15 +18,6 @@
#import <Cocoa/Cocoa.h>
-#import "cocoa/gui.h"
-#import "cocoa/plotter.h"
-#import "cocoa/BrowserView.h"
-#import "cocoa/BrowserViewController.h"
-#import "cocoa/BrowserWindowController.h"
-#import "cocoa/FormSelectMenu.h"
-#import "cocoa/fetch.h"
-#import "cocoa/schedule.h"
-
#import "utils/nsoption.h"
#import "utils/utils.h"
#import "utils/log.h"
@@ -40,6 +31,16 @@
#import "content/hlcache.h"
#import "content/content.h"
+#import "cocoa/gui.h"
+#import "cocoa/plotter.h"
+#import "cocoa/BrowserView.h"
+#import "cocoa/BrowserViewController.h"
+#import "cocoa/BrowserWindowController.h"
+#import "cocoa/FormSelectMenu.h"
+#import "cocoa/fetch.h"
+#import "cocoa/schedule.h"
+
+
NSString * const kCookiesFileOption = @"CookiesFile";
NSString * const kURLsFileOption = @"URLsFile";
NSString * const kHotlistFileOption = @"Hotlist";
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
