[Telepathy-commits] [telepathy-gabble/master] added jingle headers to Makefile.am sources and documented obsolete jingle namespaces

[Senko Rasic]

---
 src/Makefile.am  |    6 ++++++
 src/namespaces.h |    7 ++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 20356a8..54e1349 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,11 +54,17 @@ libgabble_convenience_la_SOURCES = \
     im-channel.c \
     im-factory.h \
     im-factory.c \
+    jingle-content.h \
     jingle-content.c \
+    jingle-factory.h \
     jingle-factory.c \
+    jingle-media-rtp.h \
     jingle-media-rtp.c \
+    jingle-session.h \
     jingle-session.c \
+    jingle-transport-google.h \
     jingle-transport-google.c \
+    jingle-transport-iface.h \
     jingle-transport-iface.c \
     media-channel.h \
     media-channel.c \
diff --git a/src/namespaces.h b/src/namespaces.h
index f122bf3..96d300f 100644
--- a/src/namespaces.h
+++ b/src/namespaces.h
@@ -35,9 +35,6 @@
 #define NS_GOOGLE_FEAT_VOICE    "http://www.google.com/xmpp/protocol/voice/v1"
 #define NS_GOOGLE_JINGLE_INFO   "google:jingleinfo"
 #define NS_GOOGLE_ROSTER        "google:roster"
-#define NS_GOOGLE_SESSION       "http://www.google.com/session"
-#define NS_GOOGLE_SESSION_PHONE "http://www.google.com/session/phone"
-#define NS_GOOGLE_TRANSPORT_P2P "http://www.google.com/transport/p2p"
 #define NS_IBB                  "http://jabber.org/protocol/ibb"
 /* XEP-0166 draft v0.15 */
 #define NS_JINGLE015            "http://jabber.org/protocol/jingle"
@@ -49,10 +46,10 @@
 #define NS_GOOGLE_SESSION_PHONE "http://www.google.com/session/phone"
 /* XEP-0167 (Jingle RTP) */
 #define NS_JINGLE_RTP           "urn:xmpp:jingle:apps:rtp:0"
-/* RTP audio capability in Jingle v0.15 */
+/* RTP audio capability in Jingle v0.15 (obsoleted by NS_JINGLE_RTP) */
 #define NS_JINGLE_DESCRIPTION_AUDIO \
   "http://jabber.org/protocol/jingle/description/audio"
-/* RTP video capability in Jingle v0.15 */
+/* RTP video capability in Jingle v0.15 (obsoleted by NS_JINGLE_RTP) */
 #define NS_JINGLE_DESCRIPTION_VIDEO \
   "http://jabber.org/protocol/jingle/description/video"
 #define NS_JINGLE_ERRORS            "http://jabber.org/protocol/jingle#errors"
-- 
1.5.6.5