[Telepathy-commits] [telepathy-gabble/master] code cleanup

[Senko Rasic]

---
 src/jingle-media-rtp.c       |   55 +++++++++++++++++++++++-------------------
 src/jingle-transport-iface.c |   10 +++++++
 src/jingle-transport-iface.h |    2 +
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index d35243c..6486ccc 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -253,6 +253,9 @@ parse_description (GabbleJingleContent *content,
     }
   else
     {
+      /* If we get here, namespace in use is not one of
+       * namespaces we signed up with, so obviously a bug
+       * somewhere. */
       g_assert_not_reached ();
     }
 
@@ -364,31 +367,33 @@ produce_description (GabbleJingleContent *obj, LmMessageNode *content_node)
 
   desc_node = lm_message_node_add_child (content_node, "description", NULL);
 
-  switch (dialect) {
-    case JINGLE_DIALECT_GTALK3:
-    case JINGLE_DIALECT_GTALK4:
-      g_assert (priv->media_type == JINGLE_MEDIA_TYPE_AUDIO);
-      xmlns = NS_GOOGLE_SESSION_PHONE;
-      break;
-    case JINGLE_DIALECT_V015:
-      if (priv->media_type == JINGLE_MEDIA_TYPE_AUDIO)
-          xmlns = NS_JINGLE_DESCRIPTION_AUDIO;
-      else if (priv->media_type == JINGLE_MEDIA_TYPE_VIDEO)
-          xmlns = NS_JINGLE_DESCRIPTION_VIDEO;
-      else
-          g_assert_not_reached ();
-      break;
-    case JINGLE_DIALECT_V026:
-      xmlns = "urn:xmpp:tmp:jingle:apps:rtp";
-      if (priv->media_type == JINGLE_MEDIA_TYPE_AUDIO)
-          lm_message_node_set_attribute (desc_node, "media", "audio");
-      else if (priv->media_type == JINGLE_MEDIA_TYPE_VIDEO)
-          lm_message_node_set_attribute (desc_node, "media", "video");
-      else
-          g_assert_not_reached ();
-      break;
-    default:
-      g_assert_not_reached ();
+  switch (dialect)
+    {
+      case JINGLE_DIALECT_GTALK3:
+      case JINGLE_DIALECT_GTALK4:
+        g_assert (priv->media_type == JINGLE_MEDIA_TYPE_AUDIO);
+        xmlns = NS_GOOGLE_SESSION_PHONE;
+        break;
+      case JINGLE_DIALECT_V015:
+        if (priv->media_type == JINGLE_MEDIA_TYPE_AUDIO)
+            xmlns = NS_JINGLE_DESCRIPTION_AUDIO;
+        else if (priv->media_type == JINGLE_MEDIA_TYPE_VIDEO)
+            xmlns = NS_JINGLE_DESCRIPTION_VIDEO;
+        else
+          {
+            DEBUG ("unknown media type %u", priv->media_type);
+            xmlns = "";
+          }
+        break;
+      default:
+        xmlns = "urn:xmpp:tmp:jingle:apps:rtp";
+        if (priv->media_type == JINGLE_MEDIA_TYPE_AUDIO)
+            lm_message_node_set_attribute (desc_node, "media", "audio");
+        else if (priv->media_type == JINGLE_MEDIA_TYPE_VIDEO)
+            lm_message_node_set_attribute (desc_node, "media", "video");
+        else
+            g_assert_not_reached ();
+        break;
     }
 
   lm_message_node_set_attribute (desc_node, "xmlns", xmlns);
diff --git a/src/jingle-transport-iface.c b/src/jingle-transport-iface.c
index 1e2611a..816db11 100644
--- a/src/jingle-transport-iface.c
+++ b/src/jingle-transport-iface.c
@@ -70,6 +70,16 @@ gabble_jingle_transport_iface_retransmit_candidates (GabbleJingleTransportIface
   virtual_method (self);
 }
 
+GList *
+gabble_jingle_transport_iface_get_remote_candidates (
+    GabbleJingleTransportIface *self)
+{
+  GList * (*virtual_method)(GabbleJingleTransportIface *) =
+    GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->get_remote_candidates;
+
+  g_assert (virtual_method != NULL);
+  return virtual_method (self);
+}
 
 static void
 gabble_jingle_transport_iface_base_init (gpointer klass)
diff --git a/src/jingle-transport-iface.h b/src/jingle-transport-iface.h
index e2675d0..35248f6 100644
--- a/src/jingle-transport-iface.h
+++ b/src/jingle-transport-iface.h
@@ -48,6 +48,7 @@ struct _GabbleJingleTransportIfaceClass {
   void (*add_candidates) (GabbleJingleTransportIface *,
     GList *);
   void (*retransmit_candidates) (GabbleJingleTransportIface *);
+  GList * (*get_remote_candidates) (GabbleJingleTransportIface *);
 };
 
 GType gabble_jingle_transport_iface_get_type (void);
@@ -68,6 +69,7 @@ void gabble_jingle_transport_iface_parse_candidates (GabbleJingleTransportIface
 void gabble_jingle_transport_iface_produce (GabbleJingleTransportIface *, LmMessageNode *);
 void gabble_jingle_transport_iface_add_candidates (GabbleJingleTransportIface *, GList *);
 void gabble_jingle_transport_iface_retransmit_candidates (GabbleJingleTransportIface *);
+GList *gabble_jingle_transport_iface_get_remote_candidates (GabbleJingleTransportIface *);
 
 G_END_DECLS
 
-- 
1.5.6.5