diff --git a/camino/BrowserWindow.nib/classes.nib b/camino/BrowserWindow.nib/classes.nib
index ff1d11f6433..669269f11fb 100644
--- a/camino/BrowserWindow.nib/classes.nib
+++ b/camino/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
stop = id;
toggleSidebar = id;
viewOnlyThisImage = id;
+ viewSource = id;
};
CLASS = BrowserWindowController;
LANGUAGE = ObjC;
@@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id;
mCachedBMDS = id;
- mHistoryDataSource = id;
mImageLinkMenu = id;
mImageMenu = id;
mInputMenu = id;
@@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
- {
- CLASS = CHHistoryDataSource;
- LANGUAGE = ObjC;
- SUPERCLASS = CHRDFOutlineViewDataSource;
- },
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
- {
- CLASS = CHRDFOutlineViewDataSource;
- LANGUAGE = ObjC;
- OUTLETS = {mOutlineView = id; };
- SUPERCLASS = NSObject;
- },
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@@ -109,8 +98,7 @@
urlbar = id;
};
SUPERCLASS = NSView;
- },
- {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
+ }
);
IBVersion = 1;
}
\ No newline at end of file
diff --git a/camino/BrowserWindow.nib/info.nib b/camino/BrowserWindow.nib/info.nib
index 4715c3421a5..8738aab0fe7 100644
--- a/camino/BrowserWindow.nib/info.nib
+++ b/camino/BrowserWindow.nib/info.nib
@@ -3,31 +3,29 @@
IBDocumentLocation
- 97 226 480 309 0 0 1280 1002
+ 7 130 480 309 0 0 1152 746
IBEditorPositions
124
431 537 170 180 0 0 1152 746
160
- 572 326 195 666 0 0 1280 1002
+ 478 70 195 666 0 0 1152 746
28
- 572 439 195 457 0 0 1280 1002
+ 478 279 195 457 0 0 1152 746
297
- 70 110 187 210 0 0 1152 746
+ 70 110 198 210 0 0 1152 746
314
- 271 139 168 180 0 0 1152 746
+ 271 139 198 180 0 0 1152 746
336
458 90 200 162 0 0 1152 746
- 343
- 499 330 200 252 0 0 1152 746
365
22 500 93 162 0 0 1152 746
463
7 444 200 252 0 0 1152 746
475
- 609 597 120 142 0 0 1280 1002
+ 516 447 120 142 0 0 1152 746
56
- 498 634 343 68 0 0 1280 1002
+ 404 484 343 68 0 0 1152 746
IBFramework Version
248.0
@@ -47,9 +45,12 @@
IBOpenObjects
+ 475
+ 56
+ 297
160
IBSystem Version
- 5L21
+ 5Q125
diff --git a/camino/BrowserWindow.nib/objects.nib b/camino/BrowserWindow.nib/objects.nib
index 2a3a4ec2375..abf53d203f7 100644
Binary files a/camino/BrowserWindow.nib/objects.nib and b/camino/BrowserWindow.nib/objects.nib differ
diff --git a/camino/CHPreferenceManager.mm b/camino/CHPreferenceManager.mm
index 1a9e331b485..52987d3045e 100644
--- a/camino/CHPreferenceManager.mm
+++ b/camino/CHPreferenceManager.mm
@@ -9,6 +9,7 @@
#include "nsIPrefBranch.h"
#include "nsIPrefService.h"
#include "nsString.h"
+#include "nsEmbedAPI.h"
extern const char *prefContractID;
@@ -53,7 +54,9 @@ extern const char *prefContractID;
- (BOOL) initMozillaPrefs
{
- nsresult rv;
+ nsresult rv = NS_InitEmbedding(nsnull, nsnull);
+ if (NS_FAILED(rv))
+ return NO;
NSBundle *mainBundle = [NSBundle mainBundle];
NSString *path = [mainBundle bundlePath];
diff --git a/camino/English.lproj/BrowserWindow.nib/classes.nib b/camino/English.lproj/BrowserWindow.nib/classes.nib
index ff1d11f6433..669269f11fb 100644
--- a/camino/English.lproj/BrowserWindow.nib/classes.nib
+++ b/camino/English.lproj/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
stop = id;
toggleSidebar = id;
viewOnlyThisImage = id;
+ viewSource = id;
};
CLASS = BrowserWindowController;
LANGUAGE = ObjC;
@@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id;
mCachedBMDS = id;
- mHistoryDataSource = id;
mImageLinkMenu = id;
mImageMenu = id;
mInputMenu = id;
@@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
- {
- CLASS = CHHistoryDataSource;
- LANGUAGE = ObjC;
- SUPERCLASS = CHRDFOutlineViewDataSource;
- },
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
- {
- CLASS = CHRDFOutlineViewDataSource;
- LANGUAGE = ObjC;
- OUTLETS = {mOutlineView = id; };
- SUPERCLASS = NSObject;
- },
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@@ -109,8 +98,7 @@
urlbar = id;
};
SUPERCLASS = NSView;
- },
- {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
+ }
);
IBVersion = 1;
}
\ No newline at end of file
diff --git a/camino/English.lproj/BrowserWindow.nib/info.nib b/camino/English.lproj/BrowserWindow.nib/info.nib
index 4715c3421a5..8738aab0fe7 100644
--- a/camino/English.lproj/BrowserWindow.nib/info.nib
+++ b/camino/English.lproj/BrowserWindow.nib/info.nib
@@ -3,31 +3,29 @@
IBDocumentLocation
- 97 226 480 309 0 0 1280 1002
+ 7 130 480 309 0 0 1152 746
IBEditorPositions
124
431 537 170 180 0 0 1152 746
160
- 572 326 195 666 0 0 1280 1002
+ 478 70 195 666 0 0 1152 746
28
- 572 439 195 457 0 0 1280 1002
+ 478 279 195 457 0 0 1152 746
297
- 70 110 187 210 0 0 1152 746
+ 70 110 198 210 0 0 1152 746
314
- 271 139 168 180 0 0 1152 746
+ 271 139 198 180 0 0 1152 746
336
458 90 200 162 0 0 1152 746
- 343
- 499 330 200 252 0 0 1152 746
365
22 500 93 162 0 0 1152 746
463
7 444 200 252 0 0 1152 746
475
- 609 597 120 142 0 0 1280 1002
+ 516 447 120 142 0 0 1152 746
56
- 498 634 343 68 0 0 1280 1002
+ 404 484 343 68 0 0 1152 746
IBFramework Version
248.0
@@ -47,9 +45,12 @@
IBOpenObjects
+ 475
+ 56
+ 297
160
IBSystem Version
- 5L21
+ 5Q125
diff --git a/camino/English.lproj/BrowserWindow.nib/objects.nib b/camino/English.lproj/BrowserWindow.nib/objects.nib
index 2a3a4ec2375..abf53d203f7 100644
Binary files a/camino/English.lproj/BrowserWindow.nib/objects.nib and b/camino/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/camino/nsCocoaBrowserService.mm b/camino/nsCocoaBrowserService.mm
index fabd64a9b78..8fed5f25956 100644
--- a/camino/nsCocoaBrowserService.mm
+++ b/camino/nsCocoaBrowserService.mm
@@ -80,19 +80,14 @@ nsCocoaBrowserService::InitEmbedding()
}
NS_ADDREF(sSingleton);
- nsresult rv = NS_InitEmbedding(nsnull, nsnull);
- if (NS_FAILED(rv)) {
- return rv;
- }
-
// Register as the prompt service
#define NS_PROMPTSERVICE_CID \
{0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}}
static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID);
- rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
- "Prompt Service",
- "@mozilla.org/embedcomp/prompt-service;1",
+ nsresult rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
+ "Prompt Service",
+ "@mozilla.org/embedcomp/prompt-service;1",
sSingleton,
PR_TRUE); // replace existing
if (NS_FAILED(rv)) {
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
index ff1d11f6433..669269f11fb 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
stop = id;
toggleSidebar = id;
viewOnlyThisImage = id;
+ viewSource = id;
};
CLASS = BrowserWindowController;
LANGUAGE = ObjC;
@@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id;
mCachedBMDS = id;
- mHistoryDataSource = id;
mImageLinkMenu = id;
mImageMenu = id;
mInputMenu = id;
@@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
- {
- CLASS = CHHistoryDataSource;
- LANGUAGE = ObjC;
- SUPERCLASS = CHRDFOutlineViewDataSource;
- },
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
- {
- CLASS = CHRDFOutlineViewDataSource;
- LANGUAGE = ObjC;
- OUTLETS = {mOutlineView = id; };
- SUPERCLASS = NSObject;
- },
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@@ -109,8 +98,7 @@
urlbar = id;
};
SUPERCLASS = NSView;
- },
- {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
+ }
);
IBVersion = 1;
}
\ No newline at end of file
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index 4715c3421a5..8738aab0fe7 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -3,31 +3,29 @@
IBDocumentLocation
- 97 226 480 309 0 0 1280 1002
+ 7 130 480 309 0 0 1152 746
IBEditorPositions
124
431 537 170 180 0 0 1152 746
160
- 572 326 195 666 0 0 1280 1002
+ 478 70 195 666 0 0 1152 746
28
- 572 439 195 457 0 0 1280 1002
+ 478 279 195 457 0 0 1152 746
297
- 70 110 187 210 0 0 1152 746
+ 70 110 198 210 0 0 1152 746
314
- 271 139 168 180 0 0 1152 746
+ 271 139 198 180 0 0 1152 746
336
458 90 200 162 0 0 1152 746
- 343
- 499 330 200 252 0 0 1152 746
365
22 500 93 162 0 0 1152 746
463
7 444 200 252 0 0 1152 746
475
- 609 597 120 142 0 0 1280 1002
+ 516 447 120 142 0 0 1152 746
56
- 498 634 343 68 0 0 1280 1002
+ 404 484 343 68 0 0 1152 746
IBFramework Version
248.0
@@ -47,9 +45,12 @@
IBOpenObjects
+ 475
+ 56
+ 297
160
IBSystem Version
- 5L21
+ 5Q125
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index 2a3a4ec2375..abf53d203f7 100644
Binary files a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/camino/src/embedding/CHBrowserService.mm b/camino/src/embedding/CHBrowserService.mm
index fabd64a9b78..8fed5f25956 100644
--- a/camino/src/embedding/CHBrowserService.mm
+++ b/camino/src/embedding/CHBrowserService.mm
@@ -80,19 +80,14 @@ nsCocoaBrowserService::InitEmbedding()
}
NS_ADDREF(sSingleton);
- nsresult rv = NS_InitEmbedding(nsnull, nsnull);
- if (NS_FAILED(rv)) {
- return rv;
- }
-
// Register as the prompt service
#define NS_PROMPTSERVICE_CID \
{0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}}
static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID);
- rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
- "Prompt Service",
- "@mozilla.org/embedcomp/prompt-service;1",
+ nsresult rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
+ "Prompt Service",
+ "@mozilla.org/embedcomp/prompt-service;1",
sSingleton,
PR_TRUE); // replace existing
if (NS_FAILED(rv)) {
diff --git a/camino/src/preferences/PreferenceManager.mm b/camino/src/preferences/PreferenceManager.mm
index 1a9e331b485..52987d3045e 100644
--- a/camino/src/preferences/PreferenceManager.mm
+++ b/camino/src/preferences/PreferenceManager.mm
@@ -9,6 +9,7 @@
#include "nsIPrefBranch.h"
#include "nsIPrefService.h"
#include "nsString.h"
+#include "nsEmbedAPI.h"
extern const char *prefContractID;
@@ -53,7 +54,9 @@ extern const char *prefContractID;
- (BOOL) initMozillaPrefs
{
- nsresult rv;
+ nsresult rv = NS_InitEmbedding(nsnull, nsnull);
+ if (NS_FAILED(rv))
+ return NO;
NSBundle *mainBundle = [NSBundle mainBundle];
NSString *path = [mainBundle bundlePath];
diff --git a/chimera/BrowserWindow.nib/classes.nib b/chimera/BrowserWindow.nib/classes.nib
index ff1d11f6433..669269f11fb 100644
--- a/chimera/BrowserWindow.nib/classes.nib
+++ b/chimera/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
stop = id;
toggleSidebar = id;
viewOnlyThisImage = id;
+ viewSource = id;
};
CLASS = BrowserWindowController;
LANGUAGE = ObjC;
@@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id;
mCachedBMDS = id;
- mHistoryDataSource = id;
mImageLinkMenu = id;
mImageMenu = id;
mInputMenu = id;
@@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
- {
- CLASS = CHHistoryDataSource;
- LANGUAGE = ObjC;
- SUPERCLASS = CHRDFOutlineViewDataSource;
- },
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
- {
- CLASS = CHRDFOutlineViewDataSource;
- LANGUAGE = ObjC;
- OUTLETS = {mOutlineView = id; };
- SUPERCLASS = NSObject;
- },
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@@ -109,8 +98,7 @@
urlbar = id;
};
SUPERCLASS = NSView;
- },
- {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
+ }
);
IBVersion = 1;
}
\ No newline at end of file
diff --git a/chimera/BrowserWindow.nib/info.nib b/chimera/BrowserWindow.nib/info.nib
index 4715c3421a5..8738aab0fe7 100644
--- a/chimera/BrowserWindow.nib/info.nib
+++ b/chimera/BrowserWindow.nib/info.nib
@@ -3,31 +3,29 @@
IBDocumentLocation
- 97 226 480 309 0 0 1280 1002
+ 7 130 480 309 0 0 1152 746
IBEditorPositions
124
431 537 170 180 0 0 1152 746
160
- 572 326 195 666 0 0 1280 1002
+ 478 70 195 666 0 0 1152 746
28
- 572 439 195 457 0 0 1280 1002
+ 478 279 195 457 0 0 1152 746
297
- 70 110 187 210 0 0 1152 746
+ 70 110 198 210 0 0 1152 746
314
- 271 139 168 180 0 0 1152 746
+ 271 139 198 180 0 0 1152 746
336
458 90 200 162 0 0 1152 746
- 343
- 499 330 200 252 0 0 1152 746
365
22 500 93 162 0 0 1152 746
463
7 444 200 252 0 0 1152 746
475
- 609 597 120 142 0 0 1280 1002
+ 516 447 120 142 0 0 1152 746
56
- 498 634 343 68 0 0 1280 1002
+ 404 484 343 68 0 0 1152 746
IBFramework Version
248.0
@@ -47,9 +45,12 @@
IBOpenObjects
+ 475
+ 56
+ 297
160
IBSystem Version
- 5L21
+ 5Q125
diff --git a/chimera/BrowserWindow.nib/objects.nib b/chimera/BrowserWindow.nib/objects.nib
index 2a3a4ec2375..abf53d203f7 100644
Binary files a/chimera/BrowserWindow.nib/objects.nib and b/chimera/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/CHPreferenceManager.mm b/chimera/CHPreferenceManager.mm
index 1a9e331b485..52987d3045e 100644
--- a/chimera/CHPreferenceManager.mm
+++ b/chimera/CHPreferenceManager.mm
@@ -9,6 +9,7 @@
#include "nsIPrefBranch.h"
#include "nsIPrefService.h"
#include "nsString.h"
+#include "nsEmbedAPI.h"
extern const char *prefContractID;
@@ -53,7 +54,9 @@ extern const char *prefContractID;
- (BOOL) initMozillaPrefs
{
- nsresult rv;
+ nsresult rv = NS_InitEmbedding(nsnull, nsnull);
+ if (NS_FAILED(rv))
+ return NO;
NSBundle *mainBundle = [NSBundle mainBundle];
NSString *path = [mainBundle bundlePath];
diff --git a/chimera/English.lproj/BrowserWindow.nib/classes.nib b/chimera/English.lproj/BrowserWindow.nib/classes.nib
index ff1d11f6433..669269f11fb 100644
--- a/chimera/English.lproj/BrowserWindow.nib/classes.nib
+++ b/chimera/English.lproj/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
stop = id;
toggleSidebar = id;
viewOnlyThisImage = id;
+ viewSource = id;
};
CLASS = BrowserWindowController;
LANGUAGE = ObjC;
@@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id;
mCachedBMDS = id;
- mHistoryDataSource = id;
mImageLinkMenu = id;
mImageMenu = id;
mInputMenu = id;
@@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
- {
- CLASS = CHHistoryDataSource;
- LANGUAGE = ObjC;
- SUPERCLASS = CHRDFOutlineViewDataSource;
- },
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
- {
- CLASS = CHRDFOutlineViewDataSource;
- LANGUAGE = ObjC;
- OUTLETS = {mOutlineView = id; };
- SUPERCLASS = NSObject;
- },
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@@ -109,8 +98,7 @@
urlbar = id;
};
SUPERCLASS = NSView;
- },
- {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
+ }
);
IBVersion = 1;
}
\ No newline at end of file
diff --git a/chimera/English.lproj/BrowserWindow.nib/info.nib b/chimera/English.lproj/BrowserWindow.nib/info.nib
index 4715c3421a5..8738aab0fe7 100644
--- a/chimera/English.lproj/BrowserWindow.nib/info.nib
+++ b/chimera/English.lproj/BrowserWindow.nib/info.nib
@@ -3,31 +3,29 @@
IBDocumentLocation
- 97 226 480 309 0 0 1280 1002
+ 7 130 480 309 0 0 1152 746
IBEditorPositions
124
431 537 170 180 0 0 1152 746
160
- 572 326 195 666 0 0 1280 1002
+ 478 70 195 666 0 0 1152 746
28
- 572 439 195 457 0 0 1280 1002
+ 478 279 195 457 0 0 1152 746
297
- 70 110 187 210 0 0 1152 746
+ 70 110 198 210 0 0 1152 746
314
- 271 139 168 180 0 0 1152 746
+ 271 139 198 180 0 0 1152 746
336
458 90 200 162 0 0 1152 746
- 343
- 499 330 200 252 0 0 1152 746
365
22 500 93 162 0 0 1152 746
463
7 444 200 252 0 0 1152 746
475
- 609 597 120 142 0 0 1280 1002
+ 516 447 120 142 0 0 1152 746
56
- 498 634 343 68 0 0 1280 1002
+ 404 484 343 68 0 0 1152 746
IBFramework Version
248.0
@@ -47,9 +45,12 @@
IBOpenObjects
+ 475
+ 56
+ 297
160
IBSystem Version
- 5L21
+ 5Q125
diff --git a/chimera/English.lproj/BrowserWindow.nib/objects.nib b/chimera/English.lproj/BrowserWindow.nib/objects.nib
index 2a3a4ec2375..abf53d203f7 100644
Binary files a/chimera/English.lproj/BrowserWindow.nib/objects.nib and b/chimera/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/nsCocoaBrowserService.mm b/chimera/nsCocoaBrowserService.mm
index fabd64a9b78..8fed5f25956 100644
--- a/chimera/nsCocoaBrowserService.mm
+++ b/chimera/nsCocoaBrowserService.mm
@@ -80,19 +80,14 @@ nsCocoaBrowserService::InitEmbedding()
}
NS_ADDREF(sSingleton);
- nsresult rv = NS_InitEmbedding(nsnull, nsnull);
- if (NS_FAILED(rv)) {
- return rv;
- }
-
// Register as the prompt service
#define NS_PROMPTSERVICE_CID \
{0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}}
static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID);
- rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
- "Prompt Service",
- "@mozilla.org/embedcomp/prompt-service;1",
+ nsresult rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
+ "Prompt Service",
+ "@mozilla.org/embedcomp/prompt-service;1",
sSingleton,
PR_TRUE); // replace existing
if (NS_FAILED(rv)) {
diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
index ff1d11f6433..669269f11fb 100644
--- a/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
+++ b/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
stop = id;
toggleSidebar = id;
viewOnlyThisImage = id;
+ viewSource = id;
};
CLASS = BrowserWindowController;
LANGUAGE = ObjC;
@@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id;
mCachedBMDS = id;
- mHistoryDataSource = id;
mImageLinkMenu = id;
mImageMenu = id;
mInputMenu = id;
@@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
- {
- CLASS = CHHistoryDataSource;
- LANGUAGE = ObjC;
- SUPERCLASS = CHRDFOutlineViewDataSource;
- },
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
- {
- CLASS = CHRDFOutlineViewDataSource;
- LANGUAGE = ObjC;
- OUTLETS = {mOutlineView = id; };
- SUPERCLASS = NSObject;
- },
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@@ -109,8 +98,7 @@
urlbar = id;
};
SUPERCLASS = NSView;
- },
- {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
+ }
);
IBVersion = 1;
}
\ No newline at end of file
diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index 4715c3421a5..8738aab0fe7 100644
--- a/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -3,31 +3,29 @@
IBDocumentLocation
- 97 226 480 309 0 0 1280 1002
+ 7 130 480 309 0 0 1152 746
IBEditorPositions
124
431 537 170 180 0 0 1152 746
160
- 572 326 195 666 0 0 1280 1002
+ 478 70 195 666 0 0 1152 746
28
- 572 439 195 457 0 0 1280 1002
+ 478 279 195 457 0 0 1152 746
297
- 70 110 187 210 0 0 1152 746
+ 70 110 198 210 0 0 1152 746
314
- 271 139 168 180 0 0 1152 746
+ 271 139 198 180 0 0 1152 746
336
458 90 200 162 0 0 1152 746
- 343
- 499 330 200 252 0 0 1152 746
365
22 500 93 162 0 0 1152 746
463
7 444 200 252 0 0 1152 746
475
- 609 597 120 142 0 0 1280 1002
+ 516 447 120 142 0 0 1152 746
56
- 498 634 343 68 0 0 1280 1002
+ 404 484 343 68 0 0 1152 746
IBFramework Version
248.0
@@ -47,9 +45,12 @@
IBOpenObjects
+ 475
+ 56
+ 297
160
IBSystem Version
- 5L21
+ 5Q125
diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index 2a3a4ec2375..abf53d203f7 100644
Binary files a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/src/embedding/CHBrowserService.mm b/chimera/src/embedding/CHBrowserService.mm
index fabd64a9b78..8fed5f25956 100644
--- a/chimera/src/embedding/CHBrowserService.mm
+++ b/chimera/src/embedding/CHBrowserService.mm
@@ -80,19 +80,14 @@ nsCocoaBrowserService::InitEmbedding()
}
NS_ADDREF(sSingleton);
- nsresult rv = NS_InitEmbedding(nsnull, nsnull);
- if (NS_FAILED(rv)) {
- return rv;
- }
-
// Register as the prompt service
#define NS_PROMPTSERVICE_CID \
{0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}}
static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID);
- rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
- "Prompt Service",
- "@mozilla.org/embedcomp/prompt-service;1",
+ nsresult rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
+ "Prompt Service",
+ "@mozilla.org/embedcomp/prompt-service;1",
sSingleton,
PR_TRUE); // replace existing
if (NS_FAILED(rv)) {
diff --git a/chimera/src/preferences/PreferenceManager.mm b/chimera/src/preferences/PreferenceManager.mm
index 1a9e331b485..52987d3045e 100644
--- a/chimera/src/preferences/PreferenceManager.mm
+++ b/chimera/src/preferences/PreferenceManager.mm
@@ -9,6 +9,7 @@
#include "nsIPrefBranch.h"
#include "nsIPrefService.h"
#include "nsString.h"
+#include "nsEmbedAPI.h"
extern const char *prefContractID;
@@ -53,7 +54,9 @@ extern const char *prefContractID;
- (BOOL) initMozillaPrefs
{
- nsresult rv;
+ nsresult rv = NS_InitEmbedding(nsnull, nsnull);
+ if (NS_FAILED(rv))
+ return NO;
NSBundle *mainBundle = [NSBundle mainBundle];
NSString *path = [mainBundle bundlePath];