Index: client/content/make-call.xul
===================================================================
RCS file: /cvsroot/mozilla/zap/client/content/Attic/make-call.xul,v
retrieving revision 1.1.2.17
diff -u -r1.1.2.17 make-call.xul
--- client/content/make-call.xul	29 May 2006 09:52:23 -0000	1.1.2.17
+++ client/content/make-call.xul	14 Aug 2006 10:08:04 -0000
@@ -51,6 +51,7 @@
   <script type="application/x-javascript">
   <![CDATA[
     var wRemoteAddress;
+    var wRequestURI;
 
     function initPage() {
       // try to parse the url_field into a sip address:
@@ -65,6 +66,28 @@
         // so let's just fall through:
         return;
       }
+      var uri = wRemoteAddress.uri.QueryInterface(Components.interfaces.zapISipSIPURI);
+      var method = uri.getURIParameter("method");
+      if (!method) {
+        method = "INVITE";
+        }
+      // XXX We process only INVITE for now, but in the future, MESSAGE can be processed...
+      if (method != "INVITE") {
+        return;
+        }
+      uri.removeURIParameter("method");
+      if (uri.hasHeader("Subject")) {
+        document.getElementById("urn:mozilla:zap:subject").value = uri.getHeader("Subject");
+        }
+      uri.getHeaderNames({}).forEach(function(name) {
+        uri.removeHeader(name);
+        });
+      wRequestURI = uri.clone(true);
+      uri.port = "";
+      uri.removeURIParameter("maddr");
+      uri.removeURIParameter("ttl");
+      uri.removeURIParameter("transport");
+      uri.removeURIParameter("lr");
       
       dump("initialized make-call.xul:"+wRemoteAddress.serialize()+"\n");
 
@@ -105,7 +128,7 @@
       var oc = parent.OutboundCall.instantiate();
       oc.createFromDocument(document);
       // start the ball rolling:
-      oc.makeCall(wRemoteAddress, parent.wCurrentIdentity, codecs, offerIn200);
+      oc.makeCall(wRequestURI, wRemoteAddress, parent.wCurrentIdentity, codecs, offerIn200);
       parent.loadPage("chrome://zap/content/call.xul?resource="+escape(oc.resource.Value));
     }
   ]]>
Index: client/content/zap.js
===================================================================
RCS file: /cvsroot/mozilla/zap/client/content/Attic/zap.js,v
retrieving revision 1.1.2.85
diff -u -r1.1.2.85 zap.js
--- client/content/zap.js	13 Aug 2006 08:37:47 -0000	1.1.2.85
+++ client/content/zap.js	14 Aug 2006 10:08:05 -0000
@@ -2683,7 +2683,8 @@
 OutboundCall.addCondition("RoutingInfoResolved");
 
 OutboundCall.fun(
-  function makeCall(toAddress, identity, codecs, offerIn200) {
+  function makeCall(requestURI, toAddress, identity, codecs, offerIn200) {
+    this.requestURI = requestURI;
     this.toAddress = toAddress;
     this.identity = identity;
     this.codecs = codecs;
@@ -2789,7 +2790,8 @@
     this.callHandler = OutboundCallHandler.instantiate();
     this.callHandler.call = this;
 
-    var rc = wSipStack.createInviteRequestClient(this.toAddress,
+    var rc = wSipStack.createInviteRequestClient(this.requestURI,
+                                                 this.toAddress,
                                                  this.identity.getFromAddress(),
                                                  this.routingInfo.contact,
                                                  this.routingInfo.routeset,
Index: sip/SipUAStack.js
===================================================================
RCS file: /cvsroot/mozilla/zap/sip/Attic/SipUAStack.js,v
retrieving revision 1.1.2.34
diff -u -r1.1.2.34 SipUAStack.js
--- sip/SipUAStack.js	10 Jul 2006 07:18:16 -0000	1.1.2.34
+++ sip/SipUAStack.js	14 Aug 2006 10:08:05 -0000
@@ -224,12 +224,12 @@
   });
 
 
-//  zapISipInviteRC createInviteRequestClient(in zapISipAddress ToAddress, in zapISipAddress FromAddress, in zapISipAddress ContactAddress, [array, size_is(count)] in zapISipAddress routeset, in unsigned long count, in unsigned long rcFlags);
+//  zapISipInviteRC createInviteRequestClient(in zapISipURI RequestURI, in zapISipAddress ToAddress, in zapISipAddress FromAddress, in zapISipAddress ContactAddress, [array, size_is(count)] in zapISipAddress routeset, in unsigned long count, in unsigned long rcFlags);
 SipUAStack.fun(
-  function createInviteRequestClient(ToAddress, FromAddress, contactAddress,
+  function createInviteRequestClient(RequestURI, ToAddress, FromAddress, contactAddress,
                                      routeset, count, rcFlags) {
     var rc = SipInviteRC.instantiate();
-    var request = this.formulateGenericRequest("INVITE", ToAddress.uri,
+    var request = this.formulateGenericRequest("INVITE", RequestURI,
                                                ToAddress, FromAddress,
                                                routeset, count);
     // add mandatory Contact header (rfc3261 8.1.1.8):
Index: sip/idl/zapISipUAStack.idl
===================================================================
RCS file: /cvsroot/mozilla/zap/sip/idl/Attic/zapISipUAStack.idl,v
retrieving revision 1.1.2.21
diff -u -r1.1.2.21 zapISipUAStack.idl
--- sip/idl/zapISipUAStack.idl	19 Feb 2006 11:32:17 -0000	1.1.2.21
+++ sip/idl/zapISipUAStack.idl	14 Aug 2006 10:08:05 -0000
@@ -304,7 +304,8 @@
    * createNonInviteRequestClient(), and, in addition, a Contact header
    * set to the given Contact address will be added.
    */
-  zapISipInviteRC createInviteRequestClient(in zapISipAddress ToAddress,
+  zapISipInviteRC createInviteRequestClient(in zapISipURI RequestURI,
+                                            in zapISipAddress ToAddress,
                                             in zapISipAddress FromAddress,
                                             in zapISipAddress contactAddress,
                                             [array, size_is(count)]