Mercurial Mercurial > beem > otr / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libs/jingle-namespace.patch
author Da Risk <darisk972@gmail.com>
Fri, 25 Sep 2009 19:00:34 +0200
changeset 399 fe0cd5cc89b9
permissions -rw-r--r--
Add a patch for the jingle extension of smack. This patch change the experimental namespace used in the protocol with the draft version
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
399
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     1
 
diff -Nru source-org/org/jivesoftware/smackx/jingle/JingleManager.java source/org/jivesoftware/smackx/jingle/JingleManager.java
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     2
 
--- source-org/org/jivesoftware/smackx/jingle/JingleManager.java	2009-09-25 18:06:18.671020248 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     3
 
+++ source/org/jivesoftware/smackx/jingle/JingleManager.java	2009-09-25 18:28:51.645104395 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     4
 
@@ -255,7 +255,7 @@
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     5
 
      */
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     6
 
     public static void setJingleServiceEnabled() {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     7
 
         ProviderManager providerManager = ProviderManager.getInstance();
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     8
 
-        providerManager.addIQProvider("jingle", "urn:xmpp:tmp:jingle", new JingleProvider());
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     9
 
+        providerManager.addIQProvider("jingle", "urn:xmpp:jingle:1", new JingleProvider());
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    10
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    11
 
         // Enable the Jingle support on every established connection
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    12
 
         // The ServiceDiscoveryManager class should have been already
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    13
 
@@ -623,4 +623,4 @@
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    14
 
             }
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    15
 
         }
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    16
 
     }
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    17
 
-}
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    18
 
\ Pas de fin de ligne à la fin du fichier.
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    19
 
+}
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    20
 
diff -Nru source-org/org/jivesoftware/smackx/packet/JingleContentDescription.java source/org/jivesoftware/smackx/packet/JingleContentDescription.java
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    21
 
--- source-org/org/jivesoftware/smackx/packet/JingleContentDescription.java	2009-09-25 18:06:18.676020534 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    22
 
+++ source/org/jivesoftware/smackx/packet/JingleContentDescription.java	2009-09-25 18:29:00.788020599 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    23
 
@@ -172,7 +172,7 @@
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    24
 
      */
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    25
 
     public static class Audio extends JingleContentDescription {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    26
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    27
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    28
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    29
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    30
 
         public Audio() {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    31
 
             super();
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    32
 
diff -Nru source-org/org/jivesoftware/smackx/packet/JingleContentInfo.java source/org/jivesoftware/smackx/packet/JingleContentInfo.java
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    33
 
--- source-org/org/jivesoftware/smackx/packet/JingleContentInfo.java	2009-09-25 18:06:18.677020522 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    34
 
+++ source/org/jivesoftware/smackx/packet/JingleContentInfo.java	2009-09-25 18:29:10.384025608 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    35
 
@@ -96,7 +96,7 @@
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    36
 
      */
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    37
 
     public static class Audio extends JingleContentInfo {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    38
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    39
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    40
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    41
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    42
 
         public Audio(final ContentInfo mi) {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    43
 
             super(mi);
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    44
 
diff -Nru source-org/org/jivesoftware/smackx/packet/JingleDescription.java source/org/jivesoftware/smackx/packet/JingleDescription.java
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    45
 
--- source-org/org/jivesoftware/smackx/packet/JingleDescription.java	2009-09-25 18:06:18.677020522 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    46
 
+++ source/org/jivesoftware/smackx/packet/JingleDescription.java	2009-09-25 18:42:05.559023786 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    47
 
@@ -179,7 +179,7 @@
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    48
 
      */
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    49
 
     public static class Audio extends JingleDescription {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    50
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    51
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    52
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    53
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    54
 
         public Audio() {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    55
 
             super();
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    56
 
diff -Nru source-org/org/jivesoftware/smackx/packet/JingleError.java source/org/jivesoftware/smackx/packet/JingleError.java
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    57
 
--- source-org/org/jivesoftware/smackx/packet/JingleError.java	2009-09-25 18:06:18.677020522 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    58
 
+++ source/org/jivesoftware/smackx/packet/JingleError.java	2009-09-25 18:29:32.331099677 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    59
 
@@ -27,7 +27,7 @@
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    60
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    61
 
 public class JingleError implements PacketExtension {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    62
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    63
 
-    public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    64
 
+    public static String NAMESPACE = "urn:xmpp:jingle:errors:1";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    65
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    66
 
     public static final JingleError OUT_OF_ORDER = new JingleError("out-of-order");
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    67
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    68
 
diff -Nru source-org/org/jivesoftware/smackx/packet/Jingle.java source/org/jivesoftware/smackx/packet/Jingle.java
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    69
 
--- source-org/org/jivesoftware/smackx/packet/Jingle.java	2009-09-25 18:06:18.676020534 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    70
 
+++ source/org/jivesoftware/smackx/packet/Jingle.java	2009-09-25 18:29:39.937485756 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    71
 
@@ -44,7 +44,7 @@
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    72
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    73
 
     // static
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    74
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    75
 
-    public static final String NAMESPACE = "urn:xmpp:tmp:jingle";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    76
 
+    public static final String NAMESPACE = "urn:xmpp:jingle:1";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    77
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    78
 
     public static final String NODENAME = "jingle";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    79
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    80
 
diff -Nru source-org/org/jivesoftware/smackx/packet/JingleTransport.java source/org/jivesoftware/smackx/packet/JingleTransport.java
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    81
 
--- source-org/org/jivesoftware/smackx/packet/JingleTransport.java	2009-09-25 18:06:18.676020534 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    82
 
+++ source/org/jivesoftware/smackx/packet/JingleTransport.java	2009-09-25 18:44:09.198082560 +0200
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    83
 
@@ -270,7 +270,7 @@
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    84
 
      * RTP-ICE profile
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    85
 
      */
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    86
 
     public static class Ice extends JingleTransport {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    87
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:transports:ice-udp";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    88
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:transports:ice-udp:1";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    89
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    90
 
         public Ice() {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    91
 
             super();
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    92
 
@@ -352,7 +352,7 @@
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    93
 
      * Raw UDP profile.
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    94
 
      */
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    95
 
     public static class RawUdp extends JingleTransport {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    96
 
-        public static final String NAMESPACE = "http://www.xmpp.org/extensions/xep-0177.html#ns";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    97
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:transports:ice-udp:1";
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    98
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    99
 
         public RawUdp() {
fe0cd5cc89b9 Add a patch for the jingle extension of smack.
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
   100
 
             super();
BEEM-OTR