mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Undo ben's horkage.

This commit is contained in:
hyatt%netscape.com 2002-04-29 18:59:33 +00:00
Родитель af5aeeaded
Коммит 612aad1012
26 изменённых файлов: 106 добавлений и 180 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
camino/BrowserWindow.nib/classes.nib сгенерированный
Просмотреть файл

@ -34,6 +34,7 @@
stop = id; stop = id;
toggleSidebar = id; toggleSidebar = id;
viewOnlyThisImage = id; viewOnlyThisImage = id;
viewSource = id;
}; };
CLASS = BrowserWindowController; CLASS = BrowserWindowController;
LANGUAGE = ObjC; LANGUAGE = ObjC;
@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id; mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id; mAddBookmarkTitleField = id;
mCachedBMDS = id; mCachedBMDS = id;
mHistoryDataSource = id;
mImageLinkMenu = id; mImageLinkMenu = id;
mImageMenu = id; mImageMenu = id;
mInputMenu = id; mInputMenu = id;
@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
{
CLASS = CHHistoryDataSource;
LANGUAGE = ObjC;
SUPERCLASS = CHRDFOutlineViewDataSource;
},
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
CLASS = CHRDFOutlineViewDataSource;
LANGUAGE = ObjC;
OUTLETS = {mOutlineView = id; };
SUPERCLASS = NSObject;
},
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@ -109,8 +98,7 @@
urlbar = id; urlbar = id;
}; };
SUPERCLASS = NSView; SUPERCLASS = NSView;
}, }
{CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
); );
IBVersion = 1; IBVersion = 1;
} }

21
camino/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,31 +3,29 @@
<plist version="0.9"> <plist version="0.9">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>97 226 480 309 0 0 1280 1002 </string> <string>7 130 480 309 0 0 1152 746 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>124</key> <key>124</key>
<string>431 537 170 180 0 0 1152 746 </string> <string>431 537 170 180 0 0 1152 746 </string>
<key>160</key> <key>160</key>
<string>572 326 195 666 0 0 1280 1002 </string> <string>478 70 195 666 0 0 1152 746 </string>
<key>28</key> <key>28</key>
<string>572 439 195 457 0 0 1280 1002 </string> <string>478 279 195 457 0 0 1152 746 </string>
<key>297</key> <key>297</key>
<string>70 110 187 210 0 0 1152 746 </string> <string>70 110 198 210 0 0 1152 746 </string>
<key>314</key> <key>314</key>
<string>271 139 168 180 0 0 1152 746 </string> <string>271 139 198 180 0 0 1152 746 </string>
<key>336</key> <key>336</key>
<string>458 90 200 162 0 0 1152 746 </string> <string>458 90 200 162 0 0 1152 746 </string>
<key>343</key>
<string>499 330 200 252 0 0 1152 746 </string>
<key>365</key> <key>365</key>
<string>22 500 93 162 0 0 1152 746 </string> <string>22 500 93 162 0 0 1152 746 </string>
<key>463</key> <key>463</key>
<string>7 444 200 252 0 0 1152 746 </string> <string>7 444 200 252 0 0 1152 746 </string>
<key>475</key> <key>475</key>
<string>609 597 120 142 0 0 1280 1002 </string> <string>516 447 120 142 0 0 1152 746 </string>
<key>56</key> <key>56</key>
<string>498 634 343 68 0 0 1280 1002 </string> <string>404 484 343 68 0 0 1152 746 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>248.0</string> <string>248.0</string>
@ -47,9 +45,12 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer> <integer>160</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>5L21</string> <string>5Q125</string>
</dict> </dict>
</plist> </plist>

Двоичные данные
camino/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

5
camino/CHPreferenceManager.mm
Просмотреть файл

@ -9,6 +9,7 @@
#include "nsIPrefBranch.h" #include "nsIPrefBranch.h"
#include "nsIPrefService.h" #include "nsIPrefService.h"
#include "nsString.h" #include "nsString.h"
#include "nsEmbedAPI.h"
extern const char *prefContractID; extern const char *prefContractID;
@ -53,7 +54,9 @@ extern const char *prefContractID;
- (BOOL) initMozillaPrefs - (BOOL) initMozillaPrefs
{ {
nsresult rv; nsresult rv = NS_InitEmbedding(nsnull, nsnull);
if (NS_FAILED(rv))
return NO;
NSBundle *mainBundle = [NSBundle mainBundle]; NSBundle *mainBundle = [NSBundle mainBundle];
NSString *path = [mainBundle bundlePath]; NSString *path = [mainBundle bundlePath];

16
camino/English.lproj/BrowserWindow.nib/classes.nib сгенерированный
Просмотреть файл

@ -34,6 +34,7 @@
stop = id; stop = id;
toggleSidebar = id; toggleSidebar = id;
viewOnlyThisImage = id; viewOnlyThisImage = id;
viewSource = id;
}; };
CLASS = BrowserWindowController; CLASS = BrowserWindowController;
LANGUAGE = ObjC; LANGUAGE = ObjC;
@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id; mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id; mAddBookmarkTitleField = id;
mCachedBMDS = id; mCachedBMDS = id;
mHistoryDataSource = id;
mImageLinkMenu = id; mImageLinkMenu = id;
mImageMenu = id; mImageMenu = id;
mInputMenu = id; mInputMenu = id;
@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
{
CLASS = CHHistoryDataSource;
LANGUAGE = ObjC;
SUPERCLASS = CHRDFOutlineViewDataSource;
},
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
CLASS = CHRDFOutlineViewDataSource;
LANGUAGE = ObjC;
OUTLETS = {mOutlineView = id; };
SUPERCLASS = NSObject;
},
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@ -109,8 +98,7 @@
urlbar = id; urlbar = id;
}; };
SUPERCLASS = NSView; SUPERCLASS = NSView;
}, }
{CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
); );
IBVersion = 1; IBVersion = 1;
} }

21
camino/English.lproj/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,31 +3,29 @@
<plist version="0.9"> <plist version="0.9">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>97 226 480 309 0 0 1280 1002 </string> <string>7 130 480 309 0 0 1152 746 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>124</key> <key>124</key>
<string>431 537 170 180 0 0 1152 746 </string> <string>431 537 170 180 0 0 1152 746 </string>
<key>160</key> <key>160</key>
<string>572 326 195 666 0 0 1280 1002 </string> <string>478 70 195 666 0 0 1152 746 </string>
<key>28</key> <key>28</key>
<string>572 439 195 457 0 0 1280 1002 </string> <string>478 279 195 457 0 0 1152 746 </string>
<key>297</key> <key>297</key>
<string>70 110 187 210 0 0 1152 746 </string> <string>70 110 198 210 0 0 1152 746 </string>
<key>314</key> <key>314</key>
<string>271 139 168 180 0 0 1152 746 </string> <string>271 139 198 180 0 0 1152 746 </string>
<key>336</key> <key>336</key>
<string>458 90 200 162 0 0 1152 746 </string> <string>458 90 200 162 0 0 1152 746 </string>
<key>343</key>
<string>499 330 200 252 0 0 1152 746 </string>
<key>365</key> <key>365</key>
<string>22 500 93 162 0 0 1152 746 </string> <string>22 500 93 162 0 0 1152 746 </string>
<key>463</key> <key>463</key>
<string>7 444 200 252 0 0 1152 746 </string> <string>7 444 200 252 0 0 1152 746 </string>
<key>475</key> <key>475</key>
<string>609 597 120 142 0 0 1280 1002 </string> <string>516 447 120 142 0 0 1152 746 </string>
<key>56</key> <key>56</key>
<string>498 634 343 68 0 0 1280 1002 </string> <string>404 484 343 68 0 0 1152 746 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>248.0</string> <string>248.0</string>
@ -47,9 +45,12 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer> <integer>160</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>5L21</string> <string>5Q125</string>
</dict> </dict>
</plist> </plist>

Двоичные данные
camino/English.lproj/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

11
camino/nsCocoaBrowserService.mm
Просмотреть файл

@ -80,19 +80,14 @@ nsCocoaBrowserService::InitEmbedding()
} }
NS_ADDREF(sSingleton); NS_ADDREF(sSingleton);
nsresult rv = NS_InitEmbedding(nsnull, nsnull);
if (NS_FAILED(rv)) {
return rv;
}
// Register as the prompt service // Register as the prompt service
#define NS_PROMPTSERVICE_CID \ #define NS_PROMPTSERVICE_CID \
{0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}} {0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}}
static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID); static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID);
rv = nsComponentManager::RegisterFactory(kPromptServiceCID, nsresult rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
"Prompt Service", "Prompt Service",
"@mozilla.org/embedcomp/prompt-service;1", "@mozilla.org/embedcomp/prompt-service;1",
sSingleton, sSingleton,
PR_TRUE); // replace existing PR_TRUE); // replace existing
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {

16
camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib сгенерированный
Просмотреть файл

@ -34,6 +34,7 @@
stop = id; stop = id;
toggleSidebar = id; toggleSidebar = id;
viewOnlyThisImage = id; viewOnlyThisImage = id;
viewSource = id;
}; };
CLASS = BrowserWindowController; CLASS = BrowserWindowController;
LANGUAGE = ObjC; LANGUAGE = ObjC;
@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id; mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id; mAddBookmarkTitleField = id;
mCachedBMDS = id; mCachedBMDS = id;
mHistoryDataSource = id;
mImageLinkMenu = id; mImageLinkMenu = id;
mImageMenu = id; mImageMenu = id;
mInputMenu = id; mInputMenu = id;
@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
{
CLASS = CHHistoryDataSource;
LANGUAGE = ObjC;
SUPERCLASS = CHRDFOutlineViewDataSource;
},
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
CLASS = CHRDFOutlineViewDataSource;
LANGUAGE = ObjC;
OUTLETS = {mOutlineView = id; };
SUPERCLASS = NSObject;
},
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@ -109,8 +98,7 @@
urlbar = id; urlbar = id;
}; };
SUPERCLASS = NSView; SUPERCLASS = NSView;
}, }
{CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
); );
IBVersion = 1; IBVersion = 1;
} }

21
camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,31 +3,29 @@
<plist version="0.9"> <plist version="0.9">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>97 226 480 309 0 0 1280 1002 </string> <string>7 130 480 309 0 0 1152 746 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>124</key> <key>124</key>
<string>431 537 170 180 0 0 1152 746 </string> <string>431 537 170 180 0 0 1152 746 </string>
<key>160</key> <key>160</key>
<string>572 326 195 666 0 0 1280 1002 </string> <string>478 70 195 666 0 0 1152 746 </string>
<key>28</key> <key>28</key>
<string>572 439 195 457 0 0 1280 1002 </string> <string>478 279 195 457 0 0 1152 746 </string>
<key>297</key> <key>297</key>
<string>70 110 187 210 0 0 1152 746 </string> <string>70 110 198 210 0 0 1152 746 </string>
<key>314</key> <key>314</key>
<string>271 139 168 180 0 0 1152 746 </string> <string>271 139 198 180 0 0 1152 746 </string>
<key>336</key> <key>336</key>
<string>458 90 200 162 0 0 1152 746 </string> <string>458 90 200 162 0 0 1152 746 </string>
<key>343</key>
<string>499 330 200 252 0 0 1152 746 </string>
<key>365</key> <key>365</key>
<string>22 500 93 162 0 0 1152 746 </string> <string>22 500 93 162 0 0 1152 746 </string>
<key>463</key> <key>463</key>
<string>7 444 200 252 0 0 1152 746 </string> <string>7 444 200 252 0 0 1152 746 </string>
<key>475</key> <key>475</key>
<string>609 597 120 142 0 0 1280 1002 </string> <string>516 447 120 142 0 0 1152 746 </string>
<key>56</key> <key>56</key>
<string>498 634 343 68 0 0 1280 1002 </string> <string>404 484 343 68 0 0 1152 746 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>248.0</string> <string>248.0</string>
@ -47,9 +45,12 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer> <integer>160</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>5L21</string> <string>5Q125</string>
</dict> </dict>
</plist> </plist>

Двоичные данные
camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

11
camino/src/embedding/CHBrowserService.mm
Просмотреть файл

@ -80,19 +80,14 @@ nsCocoaBrowserService::InitEmbedding()
} }
NS_ADDREF(sSingleton); NS_ADDREF(sSingleton);
nsresult rv = NS_InitEmbedding(nsnull, nsnull);
if (NS_FAILED(rv)) {
return rv;
}
// Register as the prompt service // Register as the prompt service
#define NS_PROMPTSERVICE_CID \ #define NS_PROMPTSERVICE_CID \
{0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}} {0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}}
static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID); static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID);
rv = nsComponentManager::RegisterFactory(kPromptServiceCID, nsresult rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
"Prompt Service", "Prompt Service",
"@mozilla.org/embedcomp/prompt-service;1", "@mozilla.org/embedcomp/prompt-service;1",
sSingleton, sSingleton,
PR_TRUE); // replace existing PR_TRUE); // replace existing
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {

5
camino/src/preferences/PreferenceManager.mm
Просмотреть файл

@ -9,6 +9,7 @@
#include "nsIPrefBranch.h" #include "nsIPrefBranch.h"
#include "nsIPrefService.h" #include "nsIPrefService.h"
#include "nsString.h" #include "nsString.h"
#include "nsEmbedAPI.h"
extern const char *prefContractID; extern const char *prefContractID;
@ -53,7 +54,9 @@ extern const char *prefContractID;
- (BOOL) initMozillaPrefs - (BOOL) initMozillaPrefs
{ {
nsresult rv; nsresult rv = NS_InitEmbedding(nsnull, nsnull);
if (NS_FAILED(rv))
return NO;
NSBundle *mainBundle = [NSBundle mainBundle]; NSBundle *mainBundle = [NSBundle mainBundle];
NSString *path = [mainBundle bundlePath]; NSString *path = [mainBundle bundlePath];

16
chimera/BrowserWindow.nib/classes.nib сгенерированный
Просмотреть файл

@ -34,6 +34,7 @@
stop = id; stop = id;
toggleSidebar = id; toggleSidebar = id;
viewOnlyThisImage = id; viewOnlyThisImage = id;
viewSource = id;
}; };
CLASS = BrowserWindowController; CLASS = BrowserWindowController;
LANGUAGE = ObjC; LANGUAGE = ObjC;
@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id; mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id; mAddBookmarkTitleField = id;
mCachedBMDS = id; mCachedBMDS = id;
mHistoryDataSource = id;
mImageLinkMenu = id; mImageLinkMenu = id;
mImageMenu = id; mImageMenu = id;
mInputMenu = id; mInputMenu = id;
@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
{
CLASS = CHHistoryDataSource;
LANGUAGE = ObjC;
SUPERCLASS = CHRDFOutlineViewDataSource;
},
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
CLASS = CHRDFOutlineViewDataSource;
LANGUAGE = ObjC;
OUTLETS = {mOutlineView = id; };
SUPERCLASS = NSObject;
},
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@ -109,8 +98,7 @@
urlbar = id; urlbar = id;
}; };
SUPERCLASS = NSView; SUPERCLASS = NSView;
}, }
{CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
); );
IBVersion = 1; IBVersion = 1;
} }

21
chimera/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,31 +3,29 @@
<plist version="0.9"> <plist version="0.9">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>97 226 480 309 0 0 1280 1002 </string> <string>7 130 480 309 0 0 1152 746 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>124</key> <key>124</key>
<string>431 537 170 180 0 0 1152 746 </string> <string>431 537 170 180 0 0 1152 746 </string>
<key>160</key> <key>160</key>
<string>572 326 195 666 0 0 1280 1002 </string> <string>478 70 195 666 0 0 1152 746 </string>
<key>28</key> <key>28</key>
<string>572 439 195 457 0 0 1280 1002 </string> <string>478 279 195 457 0 0 1152 746 </string>
<key>297</key> <key>297</key>
<string>70 110 187 210 0 0 1152 746 </string> <string>70 110 198 210 0 0 1152 746 </string>
<key>314</key> <key>314</key>
<string>271 139 168 180 0 0 1152 746 </string> <string>271 139 198 180 0 0 1152 746 </string>
<key>336</key> <key>336</key>
<string>458 90 200 162 0 0 1152 746 </string> <string>458 90 200 162 0 0 1152 746 </string>
<key>343</key>
<string>499 330 200 252 0 0 1152 746 </string>
<key>365</key> <key>365</key>
<string>22 500 93 162 0 0 1152 746 </string> <string>22 500 93 162 0 0 1152 746 </string>
<key>463</key> <key>463</key>
<string>7 444 200 252 0 0 1152 746 </string> <string>7 444 200 252 0 0 1152 746 </string>
<key>475</key> <key>475</key>
<string>609 597 120 142 0 0 1280 1002 </string> <string>516 447 120 142 0 0 1152 746 </string>
<key>56</key> <key>56</key>
<string>498 634 343 68 0 0 1280 1002 </string> <string>404 484 343 68 0 0 1152 746 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>248.0</string> <string>248.0</string>
@ -47,9 +45,12 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer> <integer>160</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>5L21</string> <string>5Q125</string>
</dict> </dict>
</plist> </plist>

Двоичные данные
chimera/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

5
chimera/CHPreferenceManager.mm
Просмотреть файл

@ -9,6 +9,7 @@
#include "nsIPrefBranch.h" #include "nsIPrefBranch.h"
#include "nsIPrefService.h" #include "nsIPrefService.h"
#include "nsString.h" #include "nsString.h"
#include "nsEmbedAPI.h"
extern const char *prefContractID; extern const char *prefContractID;
@ -53,7 +54,9 @@ extern const char *prefContractID;
- (BOOL) initMozillaPrefs - (BOOL) initMozillaPrefs
{ {
nsresult rv; nsresult rv = NS_InitEmbedding(nsnull, nsnull);
if (NS_FAILED(rv))
return NO;
NSBundle *mainBundle = [NSBundle mainBundle]; NSBundle *mainBundle = [NSBundle mainBundle];
NSString *path = [mainBundle bundlePath]; NSString *path = [mainBundle bundlePath];

16
chimera/English.lproj/BrowserWindow.nib/classes.nib сгенерированный
Просмотреть файл

@ -34,6 +34,7 @@
stop = id; stop = id;
toggleSidebar = id; toggleSidebar = id;
viewOnlyThisImage = id; viewOnlyThisImage = id;
viewSource = id;
}; };
CLASS = BrowserWindowController; CLASS = BrowserWindowController;
LANGUAGE = ObjC; LANGUAGE = ObjC;
@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id; mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id; mAddBookmarkTitleField = id;
mCachedBMDS = id; mCachedBMDS = id;
mHistoryDataSource = id;
mImageLinkMenu = id; mImageLinkMenu = id;
mImageMenu = id; mImageMenu = id;
mInputMenu = id; mInputMenu = id;
@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
{
CLASS = CHHistoryDataSource;
LANGUAGE = ObjC;
SUPERCLASS = CHRDFOutlineViewDataSource;
},
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
CLASS = CHRDFOutlineViewDataSource;
LANGUAGE = ObjC;
OUTLETS = {mOutlineView = id; };
SUPERCLASS = NSObject;
},
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@ -109,8 +98,7 @@
urlbar = id; urlbar = id;
}; };
SUPERCLASS = NSView; SUPERCLASS = NSView;
}, }
{CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
); );
IBVersion = 1; IBVersion = 1;
} }

21
chimera/English.lproj/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,31 +3,29 @@
<plist version="0.9"> <plist version="0.9">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>97 226 480 309 0 0 1280 1002 </string> <string>7 130 480 309 0 0 1152 746 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>124</key> <key>124</key>
<string>431 537 170 180 0 0 1152 746 </string> <string>431 537 170 180 0 0 1152 746 </string>
<key>160</key> <key>160</key>
<string>572 326 195 666 0 0 1280 1002 </string> <string>478 70 195 666 0 0 1152 746 </string>
<key>28</key> <key>28</key>
<string>572 439 195 457 0 0 1280 1002 </string> <string>478 279 195 457 0 0 1152 746 </string>
<key>297</key> <key>297</key>
<string>70 110 187 210 0 0 1152 746 </string> <string>70 110 198 210 0 0 1152 746 </string>
<key>314</key> <key>314</key>
<string>271 139 168 180 0 0 1152 746 </string> <string>271 139 198 180 0 0 1152 746 </string>
<key>336</key> <key>336</key>
<string>458 90 200 162 0 0 1152 746 </string> <string>458 90 200 162 0 0 1152 746 </string>
<key>343</key>
<string>499 330 200 252 0 0 1152 746 </string>
<key>365</key> <key>365</key>
<string>22 500 93 162 0 0 1152 746 </string> <string>22 500 93 162 0 0 1152 746 </string>
<key>463</key> <key>463</key>
<string>7 444 200 252 0 0 1152 746 </string> <string>7 444 200 252 0 0 1152 746 </string>
<key>475</key> <key>475</key>
<string>609 597 120 142 0 0 1280 1002 </string> <string>516 447 120 142 0 0 1152 746 </string>
<key>56</key> <key>56</key>
<string>498 634 343 68 0 0 1280 1002 </string> <string>404 484 343 68 0 0 1152 746 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>248.0</string> <string>248.0</string>
@ -47,9 +45,12 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer> <integer>160</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>5L21</string> <string>5Q125</string>
</dict> </dict>
</plist> </plist>

Двоичные данные
chimera/English.lproj/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

11
chimera/nsCocoaBrowserService.mm
Просмотреть файл

@ -80,19 +80,14 @@ nsCocoaBrowserService::InitEmbedding()
} }
NS_ADDREF(sSingleton); NS_ADDREF(sSingleton);
nsresult rv = NS_InitEmbedding(nsnull, nsnull);
if (NS_FAILED(rv)) {
return rv;
}
// Register as the prompt service // Register as the prompt service
#define NS_PROMPTSERVICE_CID \ #define NS_PROMPTSERVICE_CID \
{0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}} {0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}}
static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID); static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID);
rv = nsComponentManager::RegisterFactory(kPromptServiceCID, nsresult rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
"Prompt Service", "Prompt Service",
"@mozilla.org/embedcomp/prompt-service;1", "@mozilla.org/embedcomp/prompt-service;1",
sSingleton, sSingleton,
PR_TRUE); // replace existing PR_TRUE); // replace existing
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {

16
chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib сгенерированный
Просмотреть файл

@ -34,6 +34,7 @@
stop = id; stop = id;
toggleSidebar = id; toggleSidebar = id;
viewOnlyThisImage = id; viewOnlyThisImage = id;
viewSource = id;
}; };
CLASS = BrowserWindowController; CLASS = BrowserWindowController;
LANGUAGE = ObjC; LANGUAGE = ObjC;
@ -43,7 +44,6 @@
mAddBookmarkSheetWindow = id; mAddBookmarkSheetWindow = id;
mAddBookmarkTitleField = id; mAddBookmarkTitleField = id;
mCachedBMDS = id; mCachedBMDS = id;
mHistoryDataSource = id;
mImageLinkMenu = id; mImageLinkMenu = id;
mImageMenu = id; mImageMenu = id;
mInputMenu = id; mInputMenu = id;
@ -75,18 +75,7 @@
{CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
{
CLASS = CHHistoryDataSource;
LANGUAGE = ObjC;
SUPERCLASS = CHRDFOutlineViewDataSource;
},
{CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
CLASS = CHRDFOutlineViewDataSource;
LANGUAGE = ObjC;
OUTLETS = {mOutlineView = id; };
SUPERCLASS = NSObject;
},
{CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
@ -109,8 +98,7 @@
urlbar = id; urlbar = id;
}; };
SUPERCLASS = NSView; SUPERCLASS = NSView;
}, }
{CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
); );
IBVersion = 1; IBVersion = 1;
} }

21
chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,31 +3,29 @@
<plist version="0.9"> <plist version="0.9">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>97 226 480 309 0 0 1280 1002 </string> <string>7 130 480 309 0 0 1152 746 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>124</key> <key>124</key>
<string>431 537 170 180 0 0 1152 746 </string> <string>431 537 170 180 0 0 1152 746 </string>
<key>160</key> <key>160</key>
<string>572 326 195 666 0 0 1280 1002 </string> <string>478 70 195 666 0 0 1152 746 </string>
<key>28</key> <key>28</key>
<string>572 439 195 457 0 0 1280 1002 </string> <string>478 279 195 457 0 0 1152 746 </string>
<key>297</key> <key>297</key>
<string>70 110 187 210 0 0 1152 746 </string> <string>70 110 198 210 0 0 1152 746 </string>
<key>314</key> <key>314</key>
<string>271 139 168 180 0 0 1152 746 </string> <string>271 139 198 180 0 0 1152 746 </string>
<key>336</key> <key>336</key>
<string>458 90 200 162 0 0 1152 746 </string> <string>458 90 200 162 0 0 1152 746 </string>
<key>343</key>
<string>499 330 200 252 0 0 1152 746 </string>
<key>365</key> <key>365</key>
<string>22 500 93 162 0 0 1152 746 </string> <string>22 500 93 162 0 0 1152 746 </string>
<key>463</key> <key>463</key>
<string>7 444 200 252 0 0 1152 746 </string> <string>7 444 200 252 0 0 1152 746 </string>
<key>475</key> <key>475</key>
<string>609 597 120 142 0 0 1280 1002 </string> <string>516 447 120 142 0 0 1152 746 </string>
<key>56</key> <key>56</key>
<string>498 634 343 68 0 0 1280 1002 </string> <string>404 484 343 68 0 0 1152 746 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>248.0</string> <string>248.0</string>
@ -47,9 +45,12 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer> <integer>160</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>5L21</string> <string>5Q125</string>
</dict> </dict>
</plist> </plist>

Двоичные данные
chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

11
chimera/src/embedding/CHBrowserService.mm
Просмотреть файл

@ -80,19 +80,14 @@ nsCocoaBrowserService::InitEmbedding()
} }
NS_ADDREF(sSingleton); NS_ADDREF(sSingleton);
nsresult rv = NS_InitEmbedding(nsnull, nsnull);
if (NS_FAILED(rv)) {
return rv;
}
// Register as the prompt service // Register as the prompt service
#define NS_PROMPTSERVICE_CID \ #define NS_PROMPTSERVICE_CID \
{0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}} {0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}}
static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID); static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID);
rv = nsComponentManager::RegisterFactory(kPromptServiceCID, nsresult rv = nsComponentManager::RegisterFactory(kPromptServiceCID,
"Prompt Service", "Prompt Service",
"@mozilla.org/embedcomp/prompt-service;1", "@mozilla.org/embedcomp/prompt-service;1",
sSingleton, sSingleton,
PR_TRUE); // replace existing PR_TRUE); // replace existing
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {

5
chimera/src/preferences/PreferenceManager.mm
Просмотреть файл

@ -9,6 +9,7 @@
#include "nsIPrefBranch.h" #include "nsIPrefBranch.h"
#include "nsIPrefService.h" #include "nsIPrefService.h"
#include "nsString.h" #include "nsString.h"
#include "nsEmbedAPI.h"
extern const char *prefContractID; extern const char *prefContractID;
@ -53,7 +54,9 @@ extern const char *prefContractID;
- (BOOL) initMozillaPrefs - (BOOL) initMozillaPrefs
{ {
nsresult rv; nsresult rv = NS_InitEmbedding(nsnull, nsnull);
if (NS_FAILED(rv))
return NO;
NSBundle *mainBundle = [NSBundle mainBundle]; NSBundle *mainBundle = [NSBundle mainBundle];
NSString *path = [mainBundle bundlePath]; NSString *path = [mainBundle bundlePath];