Atul Patel(OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-785611-atp into 
lp:openobject-addons.

Requested reviews:
  tfr (Openerp) (tfr)
Related bugs:
  Bug #785611 in OpenERP Addons: "[PS] Thunderbird plugin - E-mail not pushed 
in OpenERP"
  https://bugs.launchpad.net/openobject-addons/+bug/785611

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-785611-atp/+merge/64657

Hello,

I had changed in source code and than run make command,

Fixed [PS] Thunderbird plugin - E-mail not pushed in OpenERP.lp:785611

so kindly review this.

Thanks

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-785611-atp/+merge/64657
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-785611-atp.
=== added file 'thunderbird/plugin/openerp_plugin.xpi'
Binary files thunderbird/plugin/openerp_plugin.xpi	1970-01-01 00:00:00 +0000 and thunderbird/plugin/openerp_plugin.xpi	2011-06-15 10:12:36 +0000 differ
=== removed file 'thunderbird/plugin/openerp_plugin.xpi'
Binary files thunderbird/plugin/openerp_plugin.xpi	2011-02-18 09:54:19 +0000 and thunderbird/plugin/openerp_plugin.xpi	1970-01-01 00:00:00 +0000 differ
=== added file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	1970-01-01 00:00:00 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	2011-06-15 10:12:36 +0000 differ
=== removed file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	2011-02-18 09:54:19 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	1970-01-01 00:00:00 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js'
--- thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js	2011-02-15 12:50:01 +0000
+++ thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js	2011-06-15 10:12:36 +0000
@@ -148,13 +148,14 @@
 	// type 2 = selected messages
 
 	var use_dir = "mboximport.exportMSG.use_dir";
-
+	var username = Components.classes["@mozilla.org/process/environment;1"].
+		getService(Components.interfaces.nsIEnvironment).get('USERNAME')	
 	var dir_path="";
 	if(navigator.userAgent.indexOf('Linux')!= -1){
 		dir_path ="/tmp"
 	}
 	else if(navigator.userAgent.indexOf('Win')!= -1){
-		dir_path ="C:\\"
+		dir_path ="C:\\Users\\"+ username +"\\"
 	}
 	else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
 		dir_path ="/tmp"

=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js'
--- thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js	2011-01-14 00:11:01 +0000
+++ thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js	2011-06-15 10:12:36 +0000
@@ -38,6 +38,8 @@
         return true
     }
     var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
+    var username = Components.classes["@mozilla.org/process/environment;1"].
+            getService(Components.interfaces.nsIEnvironment).get('USERNAME')
     var version_obj = prefService.getBranch("extensions.");
     version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
     version = version_obj.getCharPref("lastAppVersion");
@@ -152,7 +154,7 @@
                 obj.initWithPath("/tmp/");
             }
             else if(navigator.userAgent.indexOf('Win')!= -1){
-                obj.initWithPath("c:\\");
+                obj.initWithPath("C:\\Users\\"+ username +"\\");
             }
             else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
                 obj.initWithPath("/tmp/");
@@ -335,11 +337,13 @@
 //function to archive the mail content through xmlrpc request
 function parse_eml(){
     var fpath =""
+    var username = Components.classes["@mozilla.org/process/environment;1"].
+        getService(Components.interfaces.nsIEnvironment).get('USERNAME')
     if(navigator.userAgent.indexOf('Linux')!= -1){
         fpath ="/tmp/"
     }
     else if(navigator.userAgent.indexOf('Win')!= -1){
-        fpath ="C:\\"
+        fpath ="C:\\Users\\"+ username +"\\"
     }
     else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
         fpath ="/tmp/"

=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js'
--- thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js	2011-02-18 09:54:19 +0000
+++ thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js	2011-06-15 10:12:36 +0000
@@ -1434,34 +1434,6 @@
 }
 
 //function to archive the mail content through xmlrpc request
-
-function parse_eml(){
-    var fpath =""
-    if(navigator.userAgent.indexOf('Linux')!= -1){
-        fpath ="/tmp/"
-    }
-    else if(navigator.userAgent.indexOf('Win')!= -1){
-        fpath ="C:\\"
-    }
-    else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-        fpath ="/tmp/"
-    } 
-
-    name = fpath + getFileName() +".eml"
-    var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-    file.initWithPath( name );
-    if ( file.exists() == false ) {
-        return null;
-    } else {
-        var is = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance( Components.interfaces.nsIFileInputStream );
-        is.init( file,0x01, 00004, null);
-        var sis = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance( Components.interfaces.nsIScriptableInputStream );
-        sis.init( is );
-        var output = sis.read( sis.available() );
-        return output
-    }
-    
-}
 function upload_archivemail()
 {
     list_documents = document.getElementById('listSearchBox')

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to