Bhumika (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-17496-sbh into
lp:openobject-addons/6.0.
Requested reviews:
Raphael Collet (OpenERP) (rco-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-17496-sbh/+merge/75698
Make Plugins compatible with Thunderbird 5.0 and Thunderbird 6.0 Beta.
OPW-issue-17496.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-17496-sbh/+merge/75698
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-17496-sbh.
=== modified file 'thunderbird/plugin/openerp_plugin.xpi'
Binary files thunderbird/plugin/openerp_plugin.xpi 2011-06-29 08:57:17 +0000 and thunderbird/plugin/openerp_plugin.xpi 2011-09-16 10:10:39 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome.manifest'
--- thunderbird/plugin/openerp_plugin/chrome.manifest 2011-01-14 00:11:01 +0000
+++ thunderbird/plugin/openerp_plugin/chrome.manifest 2011-09-16 10:10:39 +0000
@@ -1,3 +1,7 @@
+interfaces components/xml-rpc.xpt
+component {4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa} components/nsXmlRpcClient.js
+contract @mozilla.org/xml-rpc/client;1 {4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa}
+category profile-after-change @mozilla.org/xml-rpc/client;1
content openerp_plugin jar:chrome/openerp_plugin.jar!/content/
overlay chrome://messenger/content/messenger.xul chrome://openerp_plugin/content/overlay.xul
locale openerp_plugin en-US jar:chrome/openerp_plugin.jar!/locale/en-US/
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar 2011-06-29 08:57:17 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar 2011-09-16 10:10:39 +0000 differ
=== 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-06-16 14:58:01 +0000
+++ thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js 2011-09-16 10:10:39 +0000
@@ -563,7 +563,7 @@
//get the whole server path
function getServerUrl(){
- return getServer()+":"+getPort()+"/"+getServerService();
+ return getServer()+"/"+getServerService();
}
//get user id for the xmlrpc request
@@ -1384,7 +1384,6 @@
xmlRpcClient.asyncCall(listPartnerHandler,cmdPartnerList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
}
-
//function to create the xmlrpc supported variables for xmlrpc request
function dictcontact(a,b){
var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
=== modified file 'thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js'
--- thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js 2011-01-14 00:11:01 +0000
+++ thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js 2011-09-16 10:10:39 +0000
@@ -46,6 +46,7 @@
/*
* Constants
*/
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
const XMLRPCCLIENT_CONTRACTID = '@mozilla.org/xml-rpc/client;1';
const XMLRPCCLIENT_CID =
Components.ID('{4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa}');
@@ -103,6 +104,10 @@
_serverUrl: null,
_useAuth: false,
+ classDescription: "nsXmlRpcClient XPCOM component",
+ classID: Components.ID("{4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa}"),
+ contractID: "@mozilla.org/xml-rpc/client;1",
+
init: function(serverURL) {
this._serverUrl = serverURL;
this._encoding = "UTF-8";
@@ -712,6 +717,12 @@
}
};
+if (XPCOMUtils.generateNSGetFactory)
+ var NSGetFactory = XPCOMUtils.generateNSGetFactory([nsXmlRpcClient]);
+else
+ var NSGetModule = XPCOMUtils.generateNSGetModule([nsXmlRpcClient]);
+
+
/* The XMLWriter class constructor */
function XMLWriter(encoding) {
if (!encoding)
@@ -896,7 +907,6 @@
/*
* Functions
*/
-
/* module initialisation */
function NSGetModule(comMgr, fileSpec) { return nsXmlRpcClientModule; }
=== modified file 'thunderbird/plugin/openerp_plugin/install.rdf'
--- thunderbird/plugin/openerp_plugin/install.rdf 2011-01-14 00:11:01 +0000
+++ thunderbird/plugin/openerp_plugin/install.rdf 2011-09-16 10:10:39 +0000
@@ -15,7 +15,7 @@
<Description>
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
<em:minVersion>2.0</em:minVersion>
- <em:maxVersion>3.1.*</em:maxVersion>
+ <em:maxVersion>6.0.*</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
_______________________________________________
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
