Menu
▾
▴
[Edu2-commits] SF.net SVN: edu2: [446] edu2
|
From: <bl...@us...> - 2008-03-01 15:41:49
|
Revision: 446
http://edu2.svn.sourceforge.net/edu2/?rev=446&view=rev
Author: blackhc
Date: 2008-03-01 07:41:47 -0800 (Sat, 01 Mar 2008)
Log Message:
-----------
Add edu2-launcher.bat which offers a few choices to run edu2 for presentation purposes.
Add unescaped javascript code where its necessary as reference in case anyone wants to see how it works.
Reset XULRunner back to the previous version until Res and I find time to debug it properly.
Add gecko_navigateex which should allow us to use an offline cache transparently.
Modified Paths:
--------------
edu2/OffscreenGecko.dll
edu2/OffscreenGecko.pdb
edu2/edu1/quake.rc
edu2/edu2/csprogs.dat
edu2/edu2/csprogs.lno
edu2/edu2/menu.dat
edu2/edu2/menu.lno
edu2/edu2/quake.rc
edu2/id1/qcsrc/cgame/progs.src
edu2/id1/qcsrc/common/geckoterminal.qc
edu2/id1/qcsrc/game/dpextensions.qc
edu2/id1/qcsrc/menu/edu2/dialog_login.c
edu2/id1/qcsrc/menu/edu2/dialog_logout.c
edu2/id1/qcsrc/menu/edu2/gamelist.c
edu2/id1/qcsrc/menu/item/gecko.c
edu2/id1/qcsrc/menu/progs.src
edu2/xulrunner-win32/AccessibleMarshal.dll
edu2/xulrunner-win32/IA2Marshal.dll
edu2/xulrunner-win32/README.txt
edu2/xulrunner-win32/chrome/classic.jar
edu2/xulrunner-win32/chrome/comm.jar
edu2/xulrunner-win32/chrome/en-US.jar
edu2/xulrunner-win32/chrome/pippki.jar
edu2/xulrunner-win32/chrome/toolkit.jar
edu2/xulrunner-win32/components/FeedProcessor.js
edu2/xulrunner-win32/components/accessibility.xpt
edu2/xulrunner-win32/components/autocomplete.xpt
edu2/xulrunner-win32/components/caps.xpt
edu2/xulrunner-win32/components/content_base.xpt
edu2/xulrunner-win32/components/contentprefs.xpt
edu2/xulrunner-win32/components/docshell_base.xpt
edu2/xulrunner-win32/components/dom_base.xpt
edu2/xulrunner-win32/components/dom_events.xpt
edu2/xulrunner-win32/components/dom_offline.xpt
edu2/xulrunner-win32/components/dom_storage.xpt
edu2/xulrunner-win32/components/dom_svg.xpt
edu2/xulrunner-win32/components/dom_xul.xpt
edu2/xulrunner-win32/components/downloads.xpt
edu2/xulrunner-win32/components/editor.xpt
edu2/xulrunner-win32/components/extensions.xpt
edu2/xulrunner-win32/components/exthandler.xpt
edu2/xulrunner-win32/components/imglib2.xpt
edu2/xulrunner-win32/components/inspector.xpt
edu2/xulrunner-win32/components/loginmgr.xpt
edu2/xulrunner-win32/components/necko.xpt
edu2/xulrunner-win32/components/necko_cache.xpt
edu2/xulrunner-win32/components/necko_dns.xpt
edu2/xulrunner-win32/components/nsBlocklistService.js
edu2/xulrunner-win32/components/nsContentDispatchChooser.js
edu2/xulrunner-win32/components/nsContentPrefService.js
edu2/xulrunner-win32/components/nsDownloadManagerUI.js
edu2/xulrunner-win32/components/nsExtensionManager.js
edu2/xulrunner-win32/components/nsHandlerService.js
edu2/xulrunner-win32/components/nsHelperAppDlg.js
edu2/xulrunner-win32/components/nsLivemarkService.js
edu2/xulrunner-win32/components/nsLoginInfo.js
edu2/xulrunner-win32/components/nsLoginManager.js
edu2/xulrunner-win32/components/nsLoginManagerPrompter.js
edu2/xulrunner-win32/components/nsTaggingService.js
edu2/xulrunner-win32/components/nsURLFormatter.js
edu2/xulrunner-win32/components/nsUpdateService.js
edu2/xulrunner-win32/components/pipnss.xpt
edu2/xulrunner-win32/components/places.xpt
edu2/xulrunner-win32/components/prefetch.xpt
edu2/xulrunner-win32/components/storage-Legacy.js
edu2/xulrunner-win32/components/storage.xpt
edu2/xulrunner-win32/components/txEXSLTRegExFunctions.js
edu2/xulrunner-win32/components/update.xpt
edu2/xulrunner-win32/components/widget.xpt
edu2/xulrunner-win32/components/windowds.xpt
edu2/xulrunner-win32/components/xpcom_io.xpt
edu2/xulrunner-win32/components/xpcom_system.xpt
edu2/xulrunner-win32/components/xpconnect.xpt
edu2/xulrunner-win32/components/xpinstall.xpt
edu2/xulrunner-win32/components/xultmpl.xpt
edu2/xulrunner-win32/crashreporter.exe
edu2/xulrunner-win32/crashreporter.ini
edu2/xulrunner-win32/dependentlibs.list
edu2/xulrunner-win32/dictionaries/en-US.aff
edu2/xulrunner-win32/dictionaries/en-US.dic
edu2/xulrunner-win32/freebl3.chk
edu2/xulrunner-win32/freebl3.dll
edu2/xulrunner-win32/greprefs/all.js
edu2/xulrunner-win32/javaxpcom.jar
edu2/xulrunner-win32/javaxpcomglue.dll
edu2/xulrunner-win32/js3250.dll
edu2/xulrunner-win32/modules/Microformats.js
edu2/xulrunner-win32/mozctl.dll
edu2/xulrunner-win32/mozctlx.dll
edu2/xulrunner-win32/nspr4.dll
edu2/xulrunner-win32/nss3.dll
edu2/xulrunner-win32/nssckbi.dll
edu2/xulrunner-win32/nssdbm3.dll
edu2/xulrunner-win32/platform.ini
edu2/xulrunner-win32/plc4.dll
edu2/xulrunner-win32/plds4.dll
edu2/xulrunner-win32/plugins/npnul32.dll
edu2/xulrunner-win32/res/arrow.gif
edu2/xulrunner-win32/res/arrowd.gif
edu2/xulrunner-win32/res/dtd/mathml.dtd
edu2/xulrunner-win32/res/entityTables/mathml20.properties
edu2/xulrunner-win32/res/fonts/mathfont.properties
edu2/xulrunner-win32/res/fonts/mathfontSTIXNonUnicode.properties
edu2/xulrunner-win32/res/forms.css
edu2/xulrunner-win32/res/html.css
edu2/xulrunner-win32/res/language.properties
edu2/xulrunner-win32/res/mathml.css
edu2/xulrunner-win32/res/table-add-column-after-active.gif
edu2/xulrunner-win32/res/table-add-column-before-active.gif
edu2/xulrunner-win32/res/table-add-row-after-active.gif
edu2/xulrunner-win32/res/table-add-row-before-active.gif
edu2/xulrunner-win32/smime3.dll
edu2/xulrunner-win32/softokn3.chk
edu2/xulrunner-win32/softokn3.dll
edu2/xulrunner-win32/sqlite3.dll
edu2/xulrunner-win32/ssl3.dll
edu2/xulrunner-win32/updater.exe
edu2/xulrunner-win32/xpcom.dll
edu2/xulrunner-win32/xpidl.exe
edu2/xulrunner-win32/xpt_dump.exe
edu2/xulrunner-win32/xpt_link.exe
edu2/xulrunner-win32/xul.dll
edu2/xulrunner-win32/xulrunner-stub.exe
edu2/xulrunner-win32/xulrunner.exe
Added Paths:
-----------
edu2/_edu2_start.bat
edu2/_start-edu1-server.bat
edu2/_start-edu1.bat
edu2/_start-edu2-server.bat
edu2/_start-edu2.bat
edu2/edu2-launcher.bat
edu2/id1/qcsrc/common/gecko_navigateex.qc
edu2/id1/web/facebookscripts.txt
Removed Paths:
-------------
edu2/edu2_start.bat
edu2/start-edu1-server.bat
edu2/start-edu1.bat
edu2/start-edu2-server.bat
edu2/start-edu2.bat
Modified: edu2/OffscreenGecko.dll
===================================================================
(Binary files differ)
Modified: edu2/OffscreenGecko.pdb
===================================================================
(Binary files differ)
Copied: edu2/_edu2_start.bat (from rev 444, edu2/edu2_start.bat)
===================================================================
--- edu2/_edu2_start.bat (rev 0)
+++ edu2/_edu2_start.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -0,0 +1,16 @@
+:eduloop
+@del edu2\da
+ta\edu1launch.txt
+@call _start-edu2 %*
+
+@if exist edu2\data\edu1launch.txt goto :launchedu1
+
+@goto :eof
+:launchedu1
+@copy edu2\data\edu1launch.txt edu1\autoexec.cfg /Y
+@del edu2\data\edu1launch.txt
+@call _start-edu1
+@del edu1\autoexec.cfg
+@goto :eduloop
+
+
Copied: edu2/_start-edu1-server.bat (from rev 442, edu2/start-edu1-server.bat)
===================================================================
--- edu2/_start-edu1-server.bat (rev 0)
+++ edu2/_start-edu1-server.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -0,0 +1,2 @@
+@title Edu1 Dedicated Server - simply close or type 'quit' into the console to exit
+@edu1-dedicated.exe -game edu1 -port 26666 +set sv_public 1 +map level1
\ No newline at end of file
Copied: edu2/_start-edu1.bat (from rev 444, edu2/start-edu1.bat)
===================================================================
--- edu2/_start-edu1.bat (rev 0)
+++ edu2/_start-edu1.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -0,0 +1 @@
+@edu1 -game edu1 %*
Copied: edu2/_start-edu2-server.bat (from rev 443, edu2/start-edu2-server.bat)
===================================================================
--- edu2/_start-edu2-server.bat (rev 0)
+++ edu2/_start-edu2-server.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -0,0 +1,2 @@
+@title Edu2 Dedicated Server - simply close or type 'quit' into the console to exit
+@edu2p-dedicated.exe -game edu2 -port 26000 +set sv_public 1 +map $edu2map
\ No newline at end of file
Copied: edu2/_start-edu2.bat (from rev 444, edu2/start-edu2.bat)
===================================================================
--- edu2/_start-edu2.bat (rev 0)
+++ edu2/_start-edu2.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -0,0 +1 @@
+@edu2p -game edu2 %*
Modified: edu2/edu1/quake.rc
===================================================================
--- edu2/edu1/quake.rc 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/edu1/quake.rc 2008-03-01 15:41:47 UTC (rev 446)
@@ -1,4 +1,5 @@
maxplayers 10
+set edu1map "level1"
exec default.cfg
exec config.cfg
exec autoexec.cfg
Modified: edu2/edu2/csprogs.dat
===================================================================
(Binary files differ)
Modified: edu2/edu2/csprogs.lno
===================================================================
(Binary files differ)
Modified: edu2/edu2/menu.dat
===================================================================
(Binary files differ)
Modified: edu2/edu2/menu.lno
===================================================================
(Binary files differ)
Modified: edu2/edu2/quake.rc
===================================================================
--- edu2/edu2/quake.rc 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/edu2/quake.rc 2008-03-01 15:41:47 UTC (rev 446)
@@ -1,5 +1,5 @@
-//set edu2map map_16_02
-set edu2map test
+set edu2map map_16_02
+//set edu2map test
// set maxplayers here
maxplayers 64
Added: edu2/edu2-launcher.bat
===================================================================
--- edu2/edu2-launcher.bat (rev 0)
+++ edu2/edu2-launcher.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -0,0 +1,48 @@
+@title Edu2 Launcher
+@echo Options:
+@echo.
+@echo L: start locally (no dedicated server)
+@echo M: start dedicated servers and connect to it on login in the client
+@echo D: start dedicated servers only and wait for remote users
+@echo R: use a remote server for logins (and edu1)
+@echo.
+@choice /C LMDR /M "Your choice:"
+@if ERRORLEVEL 4 goto :remoteservers
+@if ERRORLEVEL 3 goto :dedicatedservers
+@if ERRORLEVEL 2 goto :localservers
+@if ERRORLEVEL 1 goto :localclients
+
+@echo Bad choice.
+@goto :eof
+
+:localclients
+@call _edu2_start +set edu1params "map $edu1map"
+@goto :eof
+
+:localservers
+@call :dedicatedservers
+
+@_edu2_start +set edu1params "connect 127.0.0.1:26666" +set edu2logincommands "connect 127.0.0.1"
+@goto :eof
+
+:dedicatedservers
+@start _start-edu1-server.bat
+@start _start-edu2-server.bat
+
+@ipconfig
+@echo .
+@echo Broadcast one of the IPs above to others who want to connect to your servers
+@goto :eof
+
+:remoteservers
+@echo.
+@set SERVERIP=127.0.0.1
+@set /P SERVERIP="Enter the ip address of the servers (edu2 and edu1 should run on the same server) (default: 127.0.0.1): "
+@echo.
+@echo Connecting to servers at IP:
+@set SERVERIP
+@echo.
+
+@_edu2_start +set edu1params "connect %SERVERIP%:26666" +set edu2logincommands "connect %SERVERIP%"
+@goto :eof
+
Deleted: edu2/edu2_start.bat
===================================================================
--- edu2/edu2_start.bat 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/edu2_start.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -1,15 +0,0 @@
-:eduloop
-@del edu2\data\edu1launch.txt
-@call start-edu2 %*
-
-@if exist edu2\data\edu1launch.txt goto :launchedu1
-
-@goto :eof
-:launchedu1
-@copy edu2\data\edu1launch.txt edu1\autoexec.cfg /Y
-@del edu2\data\edu1launch.txt
-@call start-edu1
-@del edu1\autoexec.cfg
-@goto :eduloop
-
-
Modified: edu2/id1/qcsrc/cgame/progs.src
===================================================================
--- edu2/id1/qcsrc/cgame/progs.src 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/id1/qcsrc/cgame/progs.src 2008-03-01 15:41:47 UTC (rev 446)
@@ -14,6 +14,7 @@
viewmodel.qh
../common/playermodel.qh
+../common/gecko_navigateex.qc
dpextensions.qc
system.qc
Added: edu2/id1/qcsrc/common/gecko_navigateex.qc
===================================================================
--- edu2/id1/qcsrc/common/gecko_navigateex.qc (rev 0)
+++ edu2/id1/qcsrc/common/gecko_navigateex.qc 2008-03-01 15:41:47 UTC (rev 446)
@@ -0,0 +1,18 @@
+// Andreas Kirsch
+
+// gecko navigation wrapper for offline mode
+// use the gecko_offline_basepath to specify a directory (full absolute path) that contains an offline cache
+// e.g. C:\webcache
+// if you want to open www.google.com C:\webcache\www.google.com will be opened instead
+void( string instanceName, string URL ) gecko_navigateex = {
+ registercvar( "gecko_offline_basepath", "", 0 );
+ string lOfflinePath;
+ lOfflinePath = cvar_string( "gecko_offline_basepath" );
+ string lURI;
+ lURI = URL;
+ if( lOfflinePath != "" ) {
+ lOfflinePath = strreplace( "/", "\\", lOfflinePath );
+ lURI = strreplace( strcat( "file:///", lOfflinePath ), "http:/", lURI ); // only one / because the other one is used as dir separator
+ }
+ gecko_navigate( instanceName, lURI );
+}
Modified: edu2/id1/qcsrc/common/geckoterminal.qc
===================================================================
--- edu2/id1/qcsrc/common/geckoterminal.qc 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/id1/qcsrc/common/geckoterminal.qc 2008-03-01 15:41:47 UTC (rev 446)
@@ -57,7 +57,7 @@
// TODO: copy String_* from the scmenu.. BlackHC
strunzone( self.targetURL );
self.targetURL = strzone( readstring() );
-// gecko_navigate( self.geckoInstanceName, strcat( "javascript:setHome(\"http://", self.targetURL, "\");" ) );
+// gecko_navigateex( self.geckoInstanceName, strcat( "javascript:setHome(\"http://", self.targetURL, "\");" ) );
}
void() gecko_terminal_removeEvent = {
@@ -122,7 +122,7 @@
registercvar( "gecko_terminal_width", "1024", CVAR_SAVE );
registercvar( "gecko_terminal_height", "512", CVAR_SAVE );
gecko_resize( self.geckoInstanceName, cvar( "gecko_terminal_width" ), cvar( "gecko_terminal_height" ) );
- gecko_navigate( self.geckoInstanceName, strcat( "http://www.icculus.org/~black/stuff/terminalbrowser.html?", self.targetURL ) );
+ gecko_navigateex( self.geckoInstanceName, strcat( "http://www.icculus.org/~black/stuff/terminalbrowser.html?", self.targetURL ) );
self.classname = "gecko_terminal";
self.RemoveEvent = gecko_terminal_removeEvent;
Modified: edu2/id1/qcsrc/game/dpextensions.qc
===================================================================
--- edu2/id1/qcsrc/game/dpextensions.qc 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/id1/qcsrc/game/dpextensions.qc 2008-03-01 15:41:47 UTC (rev 446)
@@ -269,10 +269,10 @@
// use this for mouse events if needed?
float GECKO_BUTTON_DOUBLECLICK = 3;
//builtin definitions:
-float(string name) gecko_create( string name ) = #487;
-void(string name) gecko_destroy( string name ) = #488;
-void(string name) gecko_navigate( string name, string URI ) = #489;
-float(string name) gecko_keyevent( string name, float key, float eventtype ) = #490;
+float gecko_create( string name ) = #487;
+void gecko_destroy( string name ) = #488;
+void gecko_navigate( string name, string URI ) = #489;
+float gecko_keyevent( string name, float key, float eventtype ) = #490;
void gecko_mousemove( string name, float x, float y ) = #491;
void gecko_resize( string name, float w, float h ) = #492;
vector gecko_get_texture_extent( string name ) = #493;
Modified: edu2/id1/qcsrc/menu/edu2/dialog_login.c
===================================================================
--- edu2/id1/qcsrc/menu/edu2/dialog_login.c 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/id1/qcsrc/menu/edu2/dialog_login.c 2008-03-01 15:41:47 UTC (rev 446)
@@ -35,6 +35,18 @@
profile_browser.goHome( profile_browser );
}
+/* JavaScript code:
+document.loginform.email.value="";
+document.loginform.pass.value="";
+document.loginform.persistent.checked=true;
+if( document.loginform.persistent.checked.dialog != null )
+ document.loginform.persistent.checked.dialog.hide();
+login_form_change();
+
+this.disabled=true; document.loginform.submit();
+document.loginform.submit();
+*/
+
void LoginDialog_onOkClick(entity button, entity me)
{
// TODO: delay the whole thing? Black
Modified: edu2/id1/qcsrc/menu/edu2/dialog_logout.c
===================================================================
--- edu2/id1/qcsrc/menu/edu2/dialog_logout.c 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/id1/qcsrc/menu/edu2/dialog_logout.c 2008-03-01 15:41:47 UTC (rev 446)
@@ -13,6 +13,17 @@
#endif
#ifdef IMPLEMENTATION
+
+/* JavaScript code:
+for( var i = 0 ; i < document.links.length ; i++ ) {
+ var str = String( document.links[i].href );
+ if( str.search( "www.facebook.com/logout.php" ) != -1 ) {
+ location.assign( str + "&confirm=1" );
+
+ }
+}
+*/
+
void LogoutDialog_onYesClick(entity button, entity me)
{
loginout_browser.executeScript( loginout_browser,
Modified: edu2/id1/qcsrc/menu/edu2/gamelist.c
===================================================================
--- edu2/id1/qcsrc/menu/edu2/gamelist.c 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/id1/qcsrc/menu/edu2/gamelist.c 2008-03-01 15:41:47 UTC (rev 446)
@@ -57,7 +57,7 @@
};
void( entity button ) Edu1_Start = {
- registercvar( "edu1params", "map level1", 0 );
+ registercvar( "edu1params", "map $edu1map", 0 );
str_save( strcat( cvar_string( "edu1params" ), "\n" ), "edu1launch.txt" );
localcmd( "quit\n" );
};
Modified: edu2/id1/qcsrc/menu/item/gecko.c
===================================================================
--- edu2/id1/qcsrc/menu/item/gecko.c 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/id1/qcsrc/menu/item/gecko.c 2008-03-01 15:41:47 UTC (rev 446)
@@ -39,7 +39,7 @@
}
// TODO: FIXME possible leak!
me.homeURI = strzone( lFullURI );
- gecko_navigate( me.texturePath, lFullURI);
+ gecko_navigateex( me.texturePath, lFullURI);
//gecko_navigate( me.texturePath, "about:blank" );
//gecko_navigate( me.texturePath, "javascript:Darkplaces.query( 123 );" );
}
@@ -55,15 +55,15 @@
strunzone( me.homeURI );
}
me.homeURI = strzone( lFullURI );
- gecko_navigate( me.texturePath, lFullURI);
+ gecko_navigateex( me.texturePath, lFullURI);
}
void goHomeGecko( entity me ) {
- gecko_navigate( me.texturePath, me.homeURI );
+ gecko_navigateex( me.texturePath, me.homeURI );
}
void executeScriptGecko( entity me, string pCode ) {
- gecko_navigate( me.texturePath, strcat( "javascript:", pCode ) );
+ gecko_navigateex( me.texturePath, strcat( "javascript:", pCode ) );
}
void drawGecko(entity me)
Modified: edu2/id1/qcsrc/menu/progs.src
===================================================================
--- edu2/id1/qcsrc/menu/progs.src 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/id1/qcsrc/menu/progs.src 2008-03-01 15:41:47 UTC (rev 446)
@@ -15,6 +15,8 @@
../common/player_anim.qh
../common/playermodel.qh
+../common/gecko_navigateex.qc
+
gamecommand.qh
menu.qh
draw.qh
Added: edu2/id1/web/facebookscripts.txt
===================================================================
--- edu2/id1/web/facebookscripts.txt (rev 0)
+++ edu2/id1/web/facebookscripts.txt 2008-03-01 15:41:47 UTC (rev 446)
@@ -0,0 +1,21 @@
+for( var i = 0 ; i < document.links.length ; i++ ) {
+ var str = String( document.links[i].href );
+ if( str.search( "www.facebook.com/logout.php" ) != -1 ) {
+ location.assign( str + "&confirm=1" );
+
+ }
+}
+
+
+document.loginform.email.value="edu...@gm...";
+document.loginform.pass.value="...";
+document.loginform.persistent.value = 1;
+document.loginform.persistent.checked=true;
+if( document.loginform.persistent.checked.dialog != null )
+ document.loginform.persistent.checked.dialog.hide();
+login_form_change();
+
+this.disabled=true; document.loginform.submit();
+document.loginform.submit();
+
+
Deleted: edu2/start-edu1-server.bat
===================================================================
--- edu2/start-edu1-server.bat 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/start-edu1-server.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -1 +0,0 @@
-@edu1-dedicated.exe -game edu1 -port 26666 +set sv_public 1 +map level1
\ No newline at end of file
Deleted: edu2/start-edu1.bat
===================================================================
--- edu2/start-edu1.bat 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/start-edu1.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -1 +0,0 @@
-@edu1 -game edu1 %*
Deleted: edu2/start-edu2-server.bat
===================================================================
--- edu2/start-edu2-server.bat 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/start-edu2-server.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -1 +0,0 @@
-@edu2p-dedicated.exe -game edu2 -port 26000 +set sv_public 1 +map $edu2map
\ No newline at end of file
Deleted: edu2/start-edu2.bat
===================================================================
--- edu2/start-edu2.bat 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/start-edu2.bat 2008-03-01 15:41:47 UTC (rev 446)
@@ -1 +0,0 @@
-@edu2p -game edu2 %*
Modified: edu2/xulrunner-win32/AccessibleMarshal.dll
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/IA2Marshal.dll
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/README.txt
===================================================================
--- edu2/xulrunner-win32/README.txt 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/xulrunner-win32/README.txt 2008-03-01 15:41:47 UTC (rev 446)
@@ -1,20 +1,306 @@
-For information on how to build Mozilla from the source code, see:
+==============================================================
- http://developer.mozilla.org/en/docs/Build_Documentation
+= = = = = = = = = = Mozilla Read Me = = = = = = = = = = =
-To have your bug fix / feature added to Mozilla, you should create a patch and
-submit it to Bugzilla (http://bugzilla.mozilla.org). Instructions are at:
+==============================================================
- http://developer.mozilla.org/en/docs/Creating_a_patch
- http://developer.mozilla.org/en/docs/Getting_your_patch_in_the_tree
+Mozilla is subject to the terms detailed in the license
+agreement accompanying it.
-If you have a question about developing Mozilla, and can't find the solution
-on http://developer.mozilla.org, you can try asking your question in a
-mozilla.* Usenet group, or on IRC at irc.mozilla.org. [The Mozilla news groups
-are accessible on Google Groups, or news.mozilla.org with a NNTP reader.]
+This Read Me file contains information about system
+requirements and installation instructions for the Windows,
+Mac OS, and Linux builds of Mozilla.
-You can download nightly development builds from the the Mozilla FTP server.
-Keep in mind that nightly builds, which are used by Mozilla developers for
-testing, may be buggy. Firefox nightlies, for example, can be found at:
+For more info on Mozilla, see www.mozilla.org. To submit bugs
+or other feedback, see the Navigator QA menu and check out
+Bugzilla at http://bugzilla.mozilla.org for links to known
+bugs, bug-writing guidelines, and more. You can also get help
+with Bugzilla by pointing your IRC client to #mozillazine
+at irc.mozilla.org.
- ftp://ftp.mozilla.org/pub/firefox/nightly/latest-trunk/
+
+==============================================================
+
+ Getting Mozilla
+
+==============================================================
+
+You can download nightly builds of Mozilla from the
+Mozilla.org FTP site at
+
+ ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/
+
+For the very latest builds, see
+
+ ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/latest-trunk
+
+Keep in mind that nightly builds, which are used by
+Mozilla.org developers for testing, may be buggy. If you are
+looking for a more polished version of Mozilla, Mozilla.org
+releases Milestone builds of Mozilla every six weeks or so
+that you can download from
+
+ http://www.mozilla.org/releases
+
+Be sure to read the Mozilla release notes for information
+on known problems and installation issues with Mozilla.
+The release notes can be found at the preceding URL along
+with the milestone releases themselves.
+
+Note: Please use Talkback builds whenever possible. These
+builds allow transmission of crash data back to Mozilla
+developers, improved crash analysis, and posting of crash
+information to our crash-data newsgroup.
+
+
+==============================================================
+
+ System Requirements
+
+==============================================================
+
+*All Platforms
+
+ To view and use the new streamlined "Modern" theme,
+ your display monitor should be set to display
+ thousands of colors. For users who cannot set their
+ displays to use more than 256 colors, Mozilla.org
+ recommends using the "Classic" theme for Mozilla.
+
+ To select the Modern theme after you have installed
+ Mozilla, from the Navigator browser, open the View
+ menu, and then open then open the Apply Theme submenu
+ and choose Modern.
+
+*Mac OS
+
+ -Mac OS X or later
+ -PowerPC processor (266 MHz or faster recommended)
+ -64 MB RAM
+ -36 MB of free hard disk space
+
+*Windows
+
+ -Windows 95, 98, Me, NT4, 2000 or XP
+ -Intel Pentium class processor (233 MHz or faster
+ recommended)
+ -64 MB RAM
+ -26 MB free hard disk space
+
+*Linux
+
+ -The following library versions (or compatible) are
+ required: glibc 2.1, XFree86 3.3.x, GTK 1.2.x, Glib
+ 1.2.x, Libstdc++ 2.9.0. Red Hat Linux 6.0,
+ Debian 2.1, and SuSE 6.2 (or later) installations
+ should work.
+ -Red Hat 6.x users who want to install the Mozilla
+ RPM must have at least version 4.0.2 of rpm
+ installed.
+ -Intel Pentium class processor (233 MHz or faster
+ recommended)
+ -64MB RAM
+ -26MB free hard disk space
+
+
+==============================================================
+
+ Installation Instructions
+
+==============================================================
+
+For Mac OS and Windows users, it is strongly recommended that
+you exit all programs before running the setup program. Also,
+you should temporarily disable virus-detection software.
+
+For Linux users, note that the installation instructions use
+the bash shell. If you're not using bash, adjust the commands
+accordingly.
+
+For all platforms, install into a clean (new) directory.
+Installing on top of previously released builds may cause
+problems.
+
+Note: These instructions do not tell you how to build Mozilla.
+For info on building the Mozilla source, see
+
+ http://www.mozilla.org/source.html
+
+
+Windows Installation Instructions
+---------------------------------
+
+Note: For Windows NT/2000/XP systems, you need Administrator
+privileges to install Mozilla. If you see an "Error 5" message
+during installation, make sure you're running the installation
+with Administrator privileges.
+
+
+ To install Mozilla by downloading the Mozilla installer,
+ follow these steps:
+
+ 1. Click the the mozilla-win32-installer.exe link on
+ the site you're downloading Mozilla from to download
+ the installer file to your machine.
+
+ 2. Navigate to where you downloaded the file and
+ double-click the Mozilla program icon on your machine
+ to begin the Setup program.
+
+ 3. Follow the on-screen instructions in the setup
+ program. The program starts automatically the first
+ time.
+
+
+ To install Mozilla by downloading the .zip file and
+ installing manually, follow these steps:
+
+ 1. Click the mozilla-win32-talkback.zip link or the
+ mozilla-win32.zip link on the site you're down-
+ loading Mozilla from to download the .zip file to
+ your machine.
+
+ 2. Navigate to where you downloaded the file and
+ double-click the compressed file.
+
+ Note: This step assumes you already have a recent
+ version of WinZip installed, and that you know how to
+ use it. If not, you can get WinZip and information
+ about the program at www.winzip.com.
+
+ 3. Extract the .zip file to a directory such as
+ C:\Program Files\mozilla.org\Mozilla.
+
+ 4. To start Mozilla, navigate to the directory you
+ extracted Mozilla to and double-click the Mozilla.exe
+ icon.
+
+
+Mac OS X Installation Instructions
+----------------------------------
+
+ To install Mozilla by downloading the Mozilla disk image,
+ follow these steps:
+
+ 1. Click the mozilla-mac-MachO.dmg.gz link to download
+ it to your machine. By default, the download file is
+ downloaded to your desktop.
+
+ 2. Once you have downloaded the .dmg.gz file, drag it
+ onto Stuffit Expander to decompress it. If the disk
+ image doesn't mount automatically, double-click on the
+ .dmg file to mount it. If that fails, and the file
+ does not look like a disk image file, do a "Show Info"
+ on the file, and, in the "Open with application"
+ category, choose Disk Copy. In Mac OS 10.2, you can
+ use "Open with" from the context menu.
+
+ 3. Once the disk image mounts, open it, and drag the
+ Mozilla icon onto your hard disk.
+
+ 4. We recommend that you copy it to the Applications
+ folder.
+
+ 5. Now Eject the disk image.
+
+ 6. If you like, you can drag Mozilla to your dock to
+ have it easily accessible at all times. You might also
+ wish to select Mozilla as your default browser in the
+ Internet system preferences pane (under the Web tab).
+
+
+Linux Installation Instructions
+-------------------------------
+
+Note: If you install in the default directory (which is
+usually /usr/local/mozilla), or any other directory where
+only the root user normally has write-access, you must
+start Mozilla first as root before other users can start
+the program. Doing so generates a set of files required
+for later use by other users.
+
+
+ To install Mozilla by downloading the Mozilla installer,
+ follow these steps:
+
+ 1. Create a directory named mozilla (mkdir mozilla)
+ and change to that directory (cd mozilla).
+
+ 2. Click the link on the site you're downloading
+ Mozilla from to download the installer file
+ (called mozilla-1686-pc-linux-gnu-installer.tar.gz)
+ to your machine.
+
+ 3. Change to the mozilla directory (cd mozilla) and
+ decompress the archive with the following command:
+
+ tar zxvf moz*.tar.gz
+
+ The installer is now located in a subdirectory of
+ Mozilla named mozilla-installer.
+
+ 4. Change to the mozilla-installer directory
+ (cd mozilla-installer) and run the installer with the
+ ./mozilla-installer command.
+
+ 5. Follow the instructions in the install wizard for
+ installing Mozilla.
+
+ Note: If you have a slower machine, be aware that the
+ installation may take some time. In this case, the
+ installation progress may appear to hang indefinitely,
+ even though the installation is still in process.
+
+ 6. To start Mozilla, change to the directory where you
+ installed it and run the ./mozilla command.
+
+
+ To install Mozilla by downloading the tar.gz file:
+
+ 1. Create a directory named "mozilla" (mkdir mozilla)
+ and change to that directory (cd mozilla).
+
+ 2. Click the link on the site you're downloading
+ Mozilla from to download the non-installer
+ (mozilla*.tar.gz) file into the mozilla directory.
+
+ 3. Change to the mozilla directory (cd mozilla) and
+ decompress the file with the following command:
+
+ tar zxvf moz*.tar.gz
+
+ This creates a "mozilla" directory under your mozilla
+ directory.
+
+ 4. Change to the mozilla directory (cd mozilla).
+
+ 5. Run Mozilla with the following run script:
+
+ ./mozilla
+
+
+ To hook up Mozilla complete with icon to the GNOME Panel,
+ follow these steps:
+
+ 1. Click the GNOME Main Menu button, open the Panel menu,
+ and then open the Add to Panel submenu and choose Launcher.
+
+ 2. Right-click the icon for Mozilla on the Panel and
+ enter the following command:
+ directory_name./mozilla
+
+ where directory_name is the name of the directory
+ you downloaded mozilla to. For example, the default
+ directory that Mozilla suggests is /usr/local/mozilla.
+
+ 3. Type in a name for the icon, and type in a comment
+ if you wish.
+
+ 4. Click the icon button and type in the following as
+ the icon's location:
+
+ directory_name/icons/mozicon50.xpm
+
+ where directory name is the directory where you
+ installed Mozilla. For example, the default directory
+ is /usr/local/mozilla/icons/mozicon50.xpm.
Modified: edu2/xulrunner-win32/chrome/classic.jar
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/chrome/comm.jar
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/chrome/en-US.jar
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/chrome/pippki.jar
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/chrome/toolkit.jar
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/FeedProcessor.js
===================================================================
--- edu2/xulrunner-win32/components/FeedProcessor.js 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/xulrunner-win32/components/FeedProcessor.js 2008-03-01 15:41:47 UTC (rev 446)
@@ -22,7 +22,6 @@
* Ben Goodger <be...@go...>
* Myk Melez <my...@mo...>
* Michael Ventnor <m.v...@gm...>
- * Will Guaraldi <wil...@pc...>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -221,9 +220,7 @@
"http://my.netscape.com/rdf/simple/0.9/":"rss1",
"http://wellformedweb.org/CommentAPI/":"wfw",
"http://purl.org/rss/1.0/modules/wiki/":"wiki",
- "http://www.w3.org/XML/1998/namespace":"xml",
- "http://search.yahoo.com/mrss/":"media",
- "http://search.yahoo.com/mrss":"media"
+ "http://www.w3.org/XML/1998/namespace":"xml"
}
// We allow a very small set of namespaces in XHTML content,
@@ -267,8 +264,6 @@
this.authors = Cc[ARRAY_CONTRACTID].createInstance(Ci.nsIMutableArray);
this.contributors = Cc[ARRAY_CONTRACTID].createInstance(Ci.nsIMutableArray);
this.baseURI = null;
- this.enclosureCount = 0;
- this.type = Ci.nsIFeed.TYPE_FEED;
}
Feed.prototype = {
@@ -308,8 +303,6 @@
if (bagHasKey(this.fields, "links"))
this._atomLinksToURI();
- this._calcEnclosureCountAndFeedType();
-
// Resolve relative image links
if (this.image && bagHasKey(this.image, "url"))
this._resolveImageLink();
@@ -318,67 +311,6 @@
this.searchLists.title]);
},
- _calcEnclosureCountAndFeedType: function Feed_calcEnclosureCountAndFeedType() {
- var entries_with_enclosures = 0;
- var audio_count = 0;
- var image_count = 0;
- var video_count = 0;
- var other_count = 0;
-
- for (var i = 0; i < this.items.length; ++i) {
- var entry = this.items.queryElementAt(i, Ci.nsIFeedEntry);
- entry.QueryInterface(Ci.nsIFeedContainer);
-
- if (entry.enclosures && entry.enclosures.length > 0) {
- ++entries_with_enclosures;
-
- for (var e = 0; e < entry.enclosures.length; ++e) {
- var enc = entry.enclosures.queryElementAt(e, Ci.nsIWritablePropertyBag2);
- if (enc.hasKey("type")) {
- var enctype = enc.get("type");
-
- if (/^audio/.test(enctype)) {
- ++audio_count;
- } else if (/^image/.test(enctype)) {
- ++image_count;
- } else if (/^video/.test(enctype)) {
- ++video_count;
- } else {
- ++other_count;
- }
- } else {
- ++other_count;
- }
- }
- }
- }
-
- var feedtype = Ci.nsIFeed.TYPE_FEED;
-
- // For a feed to be marked as TYPE_VIDEO, TYPE_AUDIO and TYPE_IMAGE,
- // we enforce two things:
- //
- // 1. all entries must have at least one enclosure
- // 2. all enclosures must be video for TYPE_VIDEO, audio for TYPE_AUDIO or image
- // for TYPE_IMAGE
- //
- // Otherwise it's a TYPE_FEED.
- if (entries_with_enclosures == this.items.length && other_count == 0) {
- if (audio_count > 0 && !video_count && !image_count) {
- feedtype = Ci.nsIFeed.TYPE_AUDIO;
-
- } else if (image_count > 0 && !audio_count && !video_count) {
- feedtype = Ci.nsIFeed.TYPE_IMAGE;
-
- } else if (video_count > 0 && !audio_count && !image_count) {
- feedtype = Ci.nsIFeed.TYPE_VIDEO;
- }
- }
-
- this.type = feedtype;
- this.enclosureCount = other_count + video_count + audio_count + image_count;
- },
-
_atomLinksToURI: function Feed_linkToURI() {
var links = this.fields.getPropertyAsInterface("links", Ci.nsIArray);
var alternates = findAtomLinks("alternate", links);
@@ -464,7 +396,7 @@
"atom03:summary", "atom:summary"],
content: ["content:encoded","atom03:content","atom:content"],
rights: ["atom03:rights","atom:rights"],
- published: ["pubDate", "atom03:issued", "dcterms:issued", "atom:published"],
+ published: ["atom03:issued", "dcterms:issued", "atom:published"],
updated: ["pubDate", "atom03:modified", "dc:date", "dcterms:modified",
"atom:updated"]
},
@@ -475,10 +407,7 @@
// Assign Atom link if needed
if (bagHasKey(this.fields, "links"))
this._atomLinksToURI();
-
- // Populate enclosures array
- this._populateEnclosures();
-
+
// The link might be a guid w/ permalink=true
if (!this.link && bagHasKey(this.fields, "guid")) {
var guid = this.fields.getProperty("guid");
@@ -501,133 +430,6 @@
this.searchLists.title]);
},
- _populateEnclosures: function Entry_populateEnclosures() {
- if (bagHasKey(this.fields, "links"))
- this._atomLinksToEnclosures();
-
- // Add RSS2 enclosure to enclosures
- if (bagHasKey(this.fields, "enclosure"))
- this._enclosureToEnclosures();
-
- // Add media:content to enclosures
- if (bagHasKey(this.fields, "mediacontent"))
- this._mediacontentToEnclosures();
-
- // Add media:content in media:group to enclosures
- if (bagHasKey(this.fields, "mediagroup"))
- this._mediagroupToEnclosures();
- },
-
- __enclosure_map: null,
-
- _addToEnclosures: function Entry_addToEnclosures(new_enc) {
- if (!bagHasKey(new_enc, "url"))
- return;
-
- if (this.__enclosure_map == null)
- this.__enclosure_map = {};
-
- var previous_enc = this.__enclosure_map[new_enc.getPropertyAsAString("url")];
-
- if (previous_enc != undefined) {
- previous_enc.QueryInterface(Ci.nsIWritablePropertyBag2);
-
- if (!bagHasKey(previous_enc, "type") && bagHasKey(new_enc, "type"))
- previous_enc.setPropertyAsAString("type", new_enc.getPropertyAsAString("type"));
-
- if (!bagHasKey(previous_enc, "length") && bagHasKey(new_enc, "length"))
- previous_enc.setPropertyAsAString("length", new_enc.getPropertyAsAString("length"));
-
- return;
- }
-
- if (this.enclosures == null) {
- this.enclosures = Cc[ARRAY_CONTRACTID].createInstance(Ci.nsIMutableArray);
- this.enclosures.QueryInterface(Ci.nsIMutableArray);
- }
-
- this.enclosures.appendElement(new_enc, false);
- this.__enclosure_map[new_enc.getPropertyAsAString("url")] = new_enc;
- },
-
- _atomLinksToEnclosures: function Entry_linkToEnclosure() {
- var links = this.fields.getPropertyAsInterface("links", Ci.nsIArray);
- var enc_links = findAtomLinks("enclosure", links);
- if (enc_links.length == 0)
- return;
-
- for (var i = 0; i < enc_links.length; ++i) {
- var link = enc_links[i];
-
- // an enclosure must have an href
- if (!(link.getProperty("href")))
- return;
-
- var enc = Cc[BAG_CONTRACTID].createInstance(Ci.nsIWritablePropertyBag2);
-
- // copy Atom bits over to equivalent enclosure bits
- enc.setPropertyAsAString("url", link.getPropertyAsAString("href"));
- if (bagHasKey(link, "type"))
- enc.setPropertyAsAString("type", link.getPropertyAsAString("type"));
- if (bagHasKey(link, "length"))
- enc.setPropertyAsAString("length", link.getPropertyAsAString("length"));
-
- this._addToEnclosures(enc);
- }
- },
-
- _enclosureToEnclosures: function Entry_enclosureToEnclosures() {
- var enc = this.fields.getPropertyAsInterface("enclosure", Ci.nsIPropertyBag2);
-
- if (!(enc.getProperty("url")))
- return;
-
- this._addToEnclosures(enc);
- },
-
- _mediacontentToEnclosures: function Entry_mediacontentToEnclosures() {
- var mc = this.fields.getPropertyAsInterface("mediacontent", Ci.nsIPropertyBag2);
-
- if (!(mc.getProperty("url")))
- return;
-
- var enc = Cc[BAG_CONTRACTID].createInstance(Ci.nsIWritablePropertyBag2);
-
- enc.setPropertyAsAString("url", mc.getPropertyAsAString("url"));
- if (bagHasKey(mc, "fileSize"))
- enc.setPropertyAsAString("length", mc.getPropertyAsAString("fileSize"));
- if (bagHasKey(mc, "type"))
- enc.setPropertyAsAString("type", mc.getPropertyAsAString("type"));
-
- this._addToEnclosures(enc);
- },
-
- _mediagroupToEnclosures: function Entry_mediagroupToEnclosures() {
- var group = this.fields.getPropertyAsInterface("mediagroup", Ci.nsIPropertyBag2);
-
- var content = group.getPropertyAsInterface("mediacontent", Ci.nsIArray);
- for (var i = 0; i < content.length; ++i) {
- var contentElement = content.queryElementAt(i, Ci.nsIWritablePropertyBag2);
- // media:content don't require url, but if it's not there, we should
- // skip it.
- if (!bagHasKey(contentElement, "url"))
- continue;
-
- var enc = Cc[BAG_CONTRACTID].createInstance(Ci.nsIWritablePropertyBag2);
-
- // copy media:content bits over to equivalent enclosure bits
- enc.setPropertyAsAString("url", contentElement.getPropertyAsAString("url"));
- if (bagHasKey(contentElement, "type")) {
- enc.setPropertyAsAString("type", contentElement.getPropertyAsAString("type"));
- }
- if (bagHasKey(contentElement, "fileSize")) {
- enc.setPropertyAsAString("length", contentElement.getPropertyAsAString("fileSize"));
- }
-
- this._addToEnclosures(enc);
- }
- },
-
// XPCOM stuff
classDescription: ENTRY_CLASSNAME,
classID: ENTRY_CLASSID,
@@ -1261,9 +1063,7 @@
"dc:contributor": new ElementInfo("contributors", Cc[PERSON_CONTRACTID],
rssAuthor, true),
"category": new ElementInfo("categories", null, rssCatTerm, true),
- "enclosure": new ElementInfo("enclosure", null, null, false),
- "media:content": new ElementInfo("mediacontent", null, null, false),
- "media:group": new ElementInfo("mediagroup", null, null, false),
+ "enclosure": new ElementInfo("enclosure", null, null, true),
"guid": new ElementInfo("guid", null, rssGuid, false)
},
@@ -1275,10 +1075,6 @@
"hour": new ElementInfo("hours", null, rssArrayElement, true)
},
- "IN_MEDIAGROUP": {
- "media:content": new ElementInfo("mediacontent", null, null, true)
- },
-
/********* RSS1 **********/
"IN_RDF": {
// If we hit a rss1:channel, we can verify that we have RSS1
Modified: edu2/xulrunner-win32/components/accessibility.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/autocomplete.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/caps.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/content_base.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/contentprefs.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/docshell_base.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/dom_base.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/dom_events.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/dom_offline.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/dom_storage.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/dom_svg.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/dom_xul.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/downloads.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/editor.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/extensions.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/exthandler.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/imglib2.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/inspector.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/loginmgr.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/necko.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/necko_cache.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/necko_dns.xpt
===================================================================
(Binary files differ)
Modified: edu2/xulrunner-win32/components/nsBlocklistService.js
===================================================================
--- edu2/xulrunner-win32/components/nsBlocklistService.js 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/xulrunner-win32/components/nsBlocklistService.js 2008-03-01 15:41:47 UTC (rev 446)
@@ -76,16 +76,6 @@
checkCert(oldChannel);
},
- // Suppress any certificate errors
- notifyCertProblem: function(socketInfo, status, targetSite) {
- return true;
- },
-
- // Suppress any ssl errors
- notifySSLError: function(socketInfo, error, targetSite) {
- return true;
- },
-
// nsIInterfaceRequestor
getInterface: function(iid) {
return this.QueryInterface(iid);
@@ -94,8 +84,6 @@
// nsISupports
QueryInterface: function(iid) {
if (!iid.equals(Components.interfaces.nsIChannelEventSink) &&
- !iid.equals(Components.interfaces.nsIBadCertListener2) &&
- !iid.equals(Components.interfaces.nsISSLErrorListener) &&
!iid.equals(Components.interfaces.nsIInterfaceRequestor) &&
!iid.equals(Components.interfaces.nsISupports))
throw Components.results.NS_ERROR_NO_INTERFACE;
Modified: edu2/xulrunner-win32/components/nsContentDispatchChooser.js
===================================================================
--- edu2/xulrunner-win32/components/nsContentDispatchChooser.js 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/xulrunner-win32/components/nsContentDispatchChooser.js 2008-03-01 15:41:47 UTC (rev 446)
@@ -86,7 +86,6 @@
bundle.GetStringFromName("protocol.choices.label"),
bundle.formatStringFromName("protocol.checkbox.label",
[aURI.scheme], 1),
- bundle.GetStringFromName("protocol.checkbox.accesskey"),
bundle.formatStringFromName("protocol.checkbox.extra",
[xai.name], 1)];
Modified: edu2/xulrunner-win32/components/nsContentPrefService.js
===================================================================
--- edu2/xulrunner-win32/components/nsContentPrefService.js 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/xulrunner-win32/components/nsContentPrefService.js 2008-03-01 15:41:47 UTC (rev 446)
@@ -270,11 +270,7 @@
return this._grouper;
},
- get DBConnection ContentPrefService_get_DBConnection() {
- return this._dbConnection;
- },
-
//**************************************************************************//
// Data Retrieval & Modification
@@ -695,26 +691,32 @@
if (!dbFile.exists())
dbConnection = this._dbCreate(dbService, dbFile);
else {
- dbConnection = dbService.openDatabase(dbFile);
+ try {
+ dbConnection = dbService.openDatabase(dbFile);
- // If the connection isn't ready after we open the database, that means
- // the database has been corrupted, so we back it up and then recreate it.
- if (!dbConnection.connectionReady)
- dbConnection = this._dbBackUpAndRecreate(dbService, dbFile, dbConnection);
+ // Get the version of the database in the file.
+ var version = dbConnection.schemaVersion;
- // Get the version of the schema in the file.
- var version = dbConnection.schemaVersion;
-
- // Try to migrate the schema in the database to the current schema used by
- // the service. If migration fails, back up the database and recreate it.
- if (version != this._dbVersion) {
- try {
+ if (version != this._dbVersion)
this._dbMigrate(dbConnection, version, this._dbVersion);
+ }
+ catch (ex) {
+ // If the database file is corrupted, I'm not sure whether we should
+ // just delete the corrupted file or back it up. For now I'm just
+ // deleting it, but here's some code that backs it up (but doesn't limit
+ // the number of backups, which is probably necessary, thus I'm not
+ // using this code):
+ //var backup = this._dbFile.clone();
+ //backup.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, PERMS_FILE);
+ //backup.remove(false);
+ //this._dbFile.moveTo(null, backup.leafName);
+ if (ex.result == Cr.NS_ERROR_FILE_CORRUPTED) {
+ // Remove the corrupted file, then recreate it.
+ dbFile.remove(false);
+ dbConnection = this._dbCreate(dbService, dbFile);
}
- catch(ex) {
- Cu.reportError("error migrating DB: " + ex + "; backing up and recreating");
- dbConnection = this._dbBackUpAndRecreate(dbService, dbFile, dbConnection);
- }
+ else
+ throw ex;
}
}
@@ -723,33 +725,13 @@
_dbCreate: function ContentPrefService__dbCreate(aDBService, aDBFile) {
var dbConnection = aDBService.openDatabase(aDBFile);
-
- try {
- this._dbCreateSchema(dbConnection);
- dbConnection.schemaVersion = this._dbVersion;
- }
- catch(ex) {
- // If we failed to create the database (perhaps because the disk ran out
- // of space), then remove the database file so we don't leave it in some
- // half-created state from which we won't know how to recover.
- dbConnection.close();
- aDBFile.remove(false);
- throw ex;
- }
-
+ for (let name in this._dbSchema.tables)
+ dbConnection.createTable(name, this._dbSchema.tables[name]);
+ this._dbCreateIndices(dbConnection);
+ dbConnection.schemaVersion = this._dbVersion;
return dbConnection;
},
- _dbCreateSchema: function ContentPrefService__dbCreateSchema(aDBConnection) {
- this._dbCreateTables(aDBConnection);
- this._dbCreateIndices(aDBConnection);
- },
-
- _dbCreateTables: function ContentPrefService__dbCreateTables(aDBConnection) {
- for (let name in this._dbSchema.tables)
- aDBConnection.createTable(name, this._dbSchema.tables[name]);
- },
-
_dbCreateIndices: function ContentPrefService__dbCreateIndices(aDBConnection) {
for (let name in this._dbSchema.indices) {
let index = this._dbSchema.indices[name];
@@ -759,23 +741,6 @@
}
},
- _dbBackUpAndRecreate: function ContentPrefService__dbBackUpAndRecreate(aDBService,
- aDBFile,
- aDBConnection) {
- aDBConnection.backupDB("content-prefs.sqlite.corrupt");
-
- // Close the database, ignoring the "already closed" exception, if any.
- // It'll be open if we're here because of a migration failure but closed
- // if we're here because of database corruption.
- try { aDBConnection.close() } catch(ex) {}
-
- aDBFile.remove(false);
-
- let dbConnection = this._dbCreate(aDBService, aDBFile);
-
- return dbConnection;
- },
-
_dbMigrate: function ContentPrefService__dbMigrate(aDBConnection, aOldVersion, aNewVersion) {
if (this["_dbMigrate" + aOldVersion + "To" + aNewVersion]) {
aDBConnection.beginTransaction();
@@ -790,19 +755,34 @@
}
}
else
- throw("no migrator function from version " + aOldVersion +
- " to version " + aNewVersion);
+ throw("can't migrate database from v" + aOldVersion +
+ " to v" + aNewVersion + ": no migrator function");
},
- /**
- * If the schema version is 0, that means it was never set, which means
- * the database was somehow created without the schema being applied, perhaps
- * because the system ran out of disk space (although we check for this
- * in _createDB) or because some other code created the database file without
- * applying the schema. In any case, recover by simply reapplying the schema.
- */
_dbMigrate0To3: function ContentPrefService___dbMigrate0To3(aDBConnection) {
- this._dbCreateSchema(aDBConnection);
+ aDBConnection.createTable("groups", this._dbSchema.tables.groups);
+ aDBConnection.executeSimpleSQL(
+ "INSERT INTO groups (id, name) SELECT id, name FROM sites"
+ );
+
+ aDBConnection.createTable("settings", this._dbSchema.tables.settings);
+ aDBConnection.executeSimpleSQL(
+ "INSERT INTO settings (id, name) SELECT id, name FROM keys"
+ );
+
+ aDBConnection.executeSimpleSQL("ALTER TABLE prefs RENAME TO prefsOld");
+ aDBConnection.createTable("prefs", this._dbSchema.tables.prefs);
+ aDBConnection.executeSimpleSQL(
+ "INSERT INTO prefs (id, groupID, settingID, value) " +
+ "SELECT id, site_id, key_id, value FROM prefsOld"
+ );
+
+ // Drop obsolete tables.
+ aDBConnection.executeSimpleSQL("DROP TABLE prefsOld");
+ aDBConnection.executeSimpleSQL("DROP TABLE keys");
+ aDBConnection.executeSimpleSQL("DROP TABLE sites");
+
+ this._dbCreateIndices(aDBConnection);
},
_dbMigrate1To3: function ContentPrefService___dbMigrate1To3(aDBConnection) {
Modified: edu2/xulrunner-win32/components/nsDownloadManagerUI.js
===================================================================
--- edu2/xulrunner-win32/components/nsDownloadManagerUI.js 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/xulrunner-win32/components/nsDownloadManagerUI.js 2008-03-01 15:41:47 UTC (rev 446)
@@ -1,5 +1,5 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
@@ -66,9 +66,6 @@
return;
}
- // We try to get a window to use as the parent here. If we don't have one,
- // the download manager will close immediately after opening if the pref
- // browser.download.manager.closeWhenDone is set to true.
var window = null;
try {
if (aWindowContext)
@@ -92,7 +89,7 @@
getService(Ci.nsIWindowWatcher);
ww.openWindow(window,
DOWNLOAD_MANAGER_URL,
- "Download:Manager",
+ null,
"chrome,dialog=no,resizable",
params);
},
@@ -108,11 +105,7 @@
var prefs = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefBranch);
- // This preference may not be set, so defaulting to two.
- let flashCount = 2;
- try {
- flashCount = prefs.getIntPref(PREF_FLASH_COUNT);
- } catch (e) { }
+ var flashCount = prefs.getIntPref(PREF_FLASH_COUNT);
var win = this.recentWindow.QueryInterface(Ci.nsIDOMChromeWindow);
win.getAttentionWithCycleCount(flashCount);
Modified: edu2/xulrunner-win32/components/nsExtensionManager.js
===================================================================
--- edu2/xulrunner-win32/components/nsExtensionManager.js 2008-03-01 14:16:56 UTC (rev 445)
+++ edu2/xulrunner-win32/components/nsExtensionManager.js 2008-03-01 15:41:47 UTC (rev 446)
@@ -17,11 +17,11 @@
const PREF_EM_CHECK_COMPATIBILITY = "extensions.checkCompatibility";
const PREF_EM_CHECK_UPDATE_SECURITY = "extensions.checkUpdateSecurity";
const PREF_EM_LAST_APP_VERSION = "extensions.lastAppVersion";
-const PREF_EM_ENABLED_ITEMS = "extensions.enabledItems";
const PREF_UPDATE_COUNT = "extensions.update.count";
const PREF_UPDATE_DEFAULT_URL = "extensions.update.url";
const PREF_EM_IGNOREMTIMECHANGES = "extensions.ignoreMTimeChanges";
const PREF_EM_DISABLEDOBSOLETE = "extensions.disabledObsolete";
+const PREF_EM_LAST_SELECTED_SKIN = "extensions.lastSelectedSkin";
const PREF_EM_EXTENSION_FORMAT = "extensions.%UUID%.";
const PREF_EM_ITEM_UPDATE_ENABLED = "extensions.%UUID%.update.enabled";
const PREF_EM_UPDATE_ENABLED = "extensions.update.enabled";
@@ -75,9 +75,6 @@
const KEY_APP_PROFILE = "app-profile";
const KEY_APP_GLOBAL = "app-global";
-const KEY_APP_SYSTEM_LOCAL = "app-system-local";
-const KEY_APP_SYSTEM_SHARE = "app-system-share";
-const KEY_APP_SYSTEM_USER = "app-system-user";
const CATEGORY_INSTALL_LOCATIONS = "extension-install-locations";
const CATEGORY_UPDATE_PARAMS = "extension-update-params";
@@ -180,16 +177,6 @@
checkCert(oldChannel);
},
- // Suppress any certificate errors
- notifyCertProblem: function(socketInfo, status, targetSite) {
- return true;
- },
-
- // Suppress any ssl errors
- notifySSLError: function(socketInfo, error, targetSite) {
- return true;
- },
-
// nsIInterfaceRequestor
getInterface: function(iid) {
return this.QueryInterface(iid);
@@ -198,15 +185,13 @@
// nsISupports
QueryInterface: function(iid) {
if (!iid.equals(Components.interfaces.nsIChannelEventSink) &&
- !iid.equals(Components.interfaces.nsIBadCertListener2) &&
- !iid.equals(Components.interfaces.nsISSLErrorListener) &&
!iid.equals(Components.interfaces.nsIInterfaceRequestor) &&
!iid.equals(Components.interfaces.nsISupports))
throw Components.results.NS_ERROR_NO_INTERFACE;
return this;
}
};
-//@line 184 "e:\builds\tinderbox\XR-Trunk\WINNT_5.2_Depend\mozilla\toolkit\mozapps\extensions\src\nsExtensionManager.js.in"
+//@line 181 "e:\builds\tinderbox\XR-Trunk\WINNT_5.2_Depend\mozilla\toolkit\mozapps\extensions\src\nsExtensionManager.js.in"...
[truncated message content] |
