Skip to content
Permalink
Browse files

Merge bit/master

  • Loading branch information...
darkpixel committed Jan 5, 2012
2 parents e910f4d + f760be9 commit 07f10c44c87d2958d0db7a55d06f8a3a0c58f611
Showing with 1,833 additions and 8,504 deletions.
  1. +1 −2 build.sh
  2. +0 −8 chrome.manifest
  3. BIN components/firegpg_ipc.dll
  4. BIN components/firegpg_ipc.xpt
  5. BIN components/libfiregpg_ipc.32.so
  6. BIN components/libfiregpg_ipc.64.so
  7. BIN components/libfiregpg_ipc.dylib
  8. +1 −1 config_build.sh
  9. +13 −23 content/Core/cgpgaccess.js
  10. +1 −1 install.rdf
  11. +0 −11 ipc/README
  12. +0 −20 ipc/build_linux32.sh
  13. +0 −20 ipc/build_linux64.sh
  14. +0 −31 ipc/build_osx.sh
  15. +0 −21 ipc/build_win32.sh
  16. +0 −10 ipc/chrome.manifest
  17. BIN ipc/firegpg-ipc/.hg/00changelog.i
  18. +0 −1 ipc/firegpg-ipc/.hg/branch
  19. +0 −2 ipc/firegpg-ipc/.hg/branchheads.cache
  20. BIN ipc/firegpg-ipc/.hg/dirstate
  21. +0 −2 ipc/firegpg-ipc/.hg/hgrc
  22. +0 −4 ipc/firegpg-ipc/.hg/requires
  23. BIN ipc/firegpg-ipc/.hg/store/00changelog.i
  24. BIN ipc/firegpg-ipc/.hg/store/00manifest.i
  25. BIN ipc/firegpg-ipc/.hg/store/data/_makefile.in.i
  26. BIN ipc/firegpg-ipc/.hg/store/data/build/_makefile.in.i
  27. BIN ipc/firegpg-ipc/.hg/store/data/build/ns_i_p_c_module.cpp.i
  28. BIN ipc/firegpg-ipc/.hg/store/data/makemake.i
  29. BIN ipc/firegpg-ipc/.hg/store/data/modules/_makefile.in.i
  30. BIN ipc/firegpg-ipc/.hg/store/data/modules/subprocess.jsm.i
  31. BIN ipc/firegpg-ipc/.hg/store/data/public/_makefile.in.i
  32. BIN ipc/firegpg-ipc/.hg/store/data/public/ns_i_i_p_c_buffer.idl.i
  33. BIN ipc/firegpg-ipc/.hg/store/data/public/ns_i_pipe_listener.idl.i
  34. BIN ipc/firegpg-ipc/.hg/store/data/public/ns_i_pipe_transport.idl.i
  35. BIN ipc/firegpg-ipc/.hg/store/data/readme.txt.i
  36. BIN ipc/firegpg-ipc/.hg/store/data/src/_i_p_c_process.cpp.i
  37. BIN ipc/firegpg-ipc/.hg/store/data/src/_i_p_c_process.h.i
  38. BIN ipc/firegpg-ipc/.hg/store/data/src/_makefile.in.i
  39. BIN ipc/firegpg-ipc/.hg/store/data/src/ipc.h.i
  40. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_i_p_c_buffer.cpp.i
  41. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_i_p_c_buffer.h.i
  42. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_pipe_transport.cpp.i
  43. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_pipe_transport.h.i
  44. BIN ipc/firegpg-ipc/.hg/store/data/tests/_ipc_cat.cpp.i
  45. BIN ipc/firegpg-ipc/.hg/store/data/tests/_makefile.in.i
  46. BIN ipc/firegpg-ipc/.hg/store/data/tests/unit/test__ipcbuffer.js.i
  47. BIN ipc/firegpg-ipc/.hg/store/data/tests/unit/test__pipetrans.js.i
  48. BIN ipc/firegpg-ipc/.hg/store/data/tests/unit/test__subprocess.js.i
  49. BIN ipc/firegpg-ipc/.hg/store/data/~2ehgtags.i
  50. +0 −25 ipc/firegpg-ipc/.hg/store/fncache
  51. BIN ipc/firegpg-ipc/.hg/store/undo
  52. +0 −3 ipc/firegpg-ipc/.hg/tags.cache
  53. +0 −1 ipc/firegpg-ipc/.hg/undo.branch
  54. +0 −3 ipc/firegpg-ipc/.hg/undo.desc
  55. 0 ipc/firegpg-ipc/.hg/undo.dirstate
  56. +0 −1 ipc/firegpg-ipc/.hgtags
  57. +0 −53 ipc/firegpg-ipc/Makefile.in
  58. +0 −115 ipc/firegpg-ipc/build/Makefile.in
  59. +0 −69 ipc/firegpg-ipc/build/nsIPCModule.cpp
  60. +0 −193 ipc/firegpg-ipc/makemake
  61. +0 −52 ipc/firegpg-ipc/modules/Makefile.in
  62. +0 −422 ipc/firegpg-ipc/modules/subprocess.jsm
  63. +0 −53 ipc/firegpg-ipc/public/Makefile.in
  64. +0 −122 ipc/firegpg-ipc/public/nsIIPCBuffer.idl
  65. +0 −114 ipc/firegpg-ipc/public/nsIPipeListener.idl
  66. +0 −294 ipc/firegpg-ipc/public/nsIPipeTransport.idl
  67. +0 −16 ipc/firegpg-ipc/readme.txt
  68. +0 −684 ipc/firegpg-ipc/src/IPCProcess.cpp
  69. +0 −195 ipc/firegpg-ipc/src/IPCProcess.h
  70. +0 −89 ipc/firegpg-ipc/src/Makefile.in
  71. +0 −46 ipc/firegpg-ipc/src/ipc.h
  72. +0 −1,074 ipc/firegpg-ipc/src/nsIPCBuffer.cpp
  73. +0 −113 ipc/firegpg-ipc/src/nsIPCBuffer.h
  74. +0 −2,824 ipc/firegpg-ipc/src/nsPipeTransport.cpp
  75. +0 −414 ipc/firegpg-ipc/src/nsPipeTransport.h
  76. +0 −156 ipc/firegpg-ipc/tests/IpcCat.cpp
  77. +0 −62 ipc/firegpg-ipc/tests/Makefile.in
  78. +0 −245 ipc/firegpg-ipc/tests/unit/test_ipcbuffer.js
  79. +0 −342 ipc/firegpg-ipc/tests/unit/test_pipetrans.js
  80. +0 −251 ipc/firegpg-ipc/tests/unit/test_subprocess.js
  81. +0 −33 ipc/get.sh
  82. +1,364 −283 modules/subprocess.jsm
  83. +229 −0 modules/subprocess_worker_unix.js
  84. +224 −0 modules/subprocess_worker_win.js
@@ -15,7 +15,6 @@
# skin/ |
#
# defaults/ |
# components/ |} these must be listed in $ROOT_DIRS in order to be packaged
# ... |
#
# It uses a temporary directory ./build when building; don't use that!
@@ -75,7 +74,7 @@ zip -0 -r $JAR_FILE `cat files` -x '*.svn*'
# The following statement should be used instead if you don't wish to use the JAR file
#cp --verbose --parents `cat files` $TMP_DIR/chrome

# prepare components and defaults
# prepare defaults
echo "Copying various files to $TMP_DIR folder..."
for DIR in $ROOT_DIRS; do
mkdir $TMP_DIR/$DIR
@@ -41,11 +41,3 @@ style chrome://global/content/customizeToolbar.xul chrome://fire

resource firegpg modules/

interfaces components/firegpg_ipc.xpt
binary-component components/libfiregpg_ipc.dylib ABI=Darwin_x86-gcc3
binary-component components/libfiregpg_ipc.dylib ABI=Darwin_x86_64-gcc3
binary-component components/libfiregpg_ipc.64.so ABI=Linux_x86_64-gcc3
binary-component components/libfiregpg_ipc.32.so ABI=Linux_x86-gcc3
binary-component components/firegpg_ipc.dll ABI=WINNT_x86-msvc
contract @getfiregpg.org/ipc/ipc-buffer;1 {babce0c1-7ab1-11d4-8f02-a06008948af5}
contract @getfiregpg.org/ipc/pipe-transport;1 {babce001-7ab1-11d4-8f02-a06008948af5}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -4,6 +4,6 @@ APP_NAME=firegpg
CHROME_PROVIDERS="content locale skin"
CLEAN_UP=1
ROOT_FILES="AUTHORS COPYING README"
ROOT_DIRS="defaults components modules"
ROOT_DIRS="defaults modules"
BEFORE_BUILD=
AFTER_BUILD=
@@ -358,29 +358,29 @@ FireGPG.GPGAccess = {
Parameters:
parameters - The parameters for gnupg.
sdtIn - The data to send to gnupg on the sdIn
charset - _Optional_. The charset to read the sdtIn (UTF-8 by default)
stdIn - The data to send to gnupg on the sdIn
charset - _Optional_. The charset to read the stdIn (UTF-8 by default)
Return:
The sdOut (.out) and the sdErr (.err) of the execution
*/
runGnupg: function(parameters, sdtIn, charset) {
runGnupg: function(parameters, stdIn, charset) {

if (charset == undefined)
charset = "utf-8";

if (sdtIn == undefined)
sdtIn = "";
if (stdIn == undefined)
stdIn = "";


sdtIn = FireGPG.Misc.EnigConvertFromUnicode(sdtIn, charset);
stdIn = FireGPG.Misc.EnigConvertFromUnicode(stdIn, charset);

var outStrObj = new Object();
var outLenObj = new Object();
var errStrObj = new Object();
var errLenObj = new Object();

FireGPG.debug(this.getGPGCommand() + " " + parameters + "[" + sdtIn + "]",'FireGPGGPGAccessCallerUnixXpcom');
FireGPG.debug(this.getGPGCommand() + " " + parameters + "[" + stdIn + "]",'FireGPGGPGAccessCallerUnixXpcom');

var parametersS = parameters.split(/ /gi);

@@ -416,22 +416,12 @@ FireGPG.GPGAccess = {
var p = subprocess.call({
command: this.getGPGCommand(),
arguments: gpgArgs,
onFinished: subprocess.Terminate(function() {
retour.out = FireGPG.Misc.EnigConvertToUnicode(retour.out,
charset);
retour.err = FireGPG.Misc.EnigConvertToUnicode(retour.err,
charset);
}),
stderr: subprocess.ReadablePipe(function(data) {
retour.err += data;
}),
stdout: subprocess.ReadablePipe(function(data) {
retour.out += data;
}),
stdin: subprocess.WritablePipe(function() {
this.write(sdtIn);
this.close();
})
charset: charset,
done: function(result) {
retour.err = result.stderr;
retour.out = result.stdout;
},
stdin: stdIn
});
p.wait();
return retour;
@@ -6,7 +6,7 @@

em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
em:minVersion="6.0"
em:maxVersion="6.*" />
em:maxVersion="10.*" />
<RDF:Description RDF:about="urn:mozilla:install-manifest"
em:id="firegpg@firegpg.team"
em:version="0.8.5"

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Binary file not shown.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Binary file not shown.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Oops, something went wrong.
Binary file not shown.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 07f10c4

Please sign in to comment.
You can’t perform that action at this time.