[telepathy-gabble/master] Fix various coding style and types, also remove some dead code

[Sjoerd Simons]

---
 src/call-channel.c                  |    2 +-
 src/call-content-codecoffer.c       |   10 ----------
 src/call-content.c                  |   16 ++--------------
 src/call-stream-endpoint.c          |   16 +++++++---------
 src/call-stream-endpoint.h          |    1 -
 src/call-stream.c                   |    2 --
 src/caps-channel-manager.c          |    2 +-
 tests/twisted/jingle/jingletest2.py |    2 +-
 8 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/src/call-channel.c b/src/call-channel.c
index 186c73f..18920e9 100644
--- a/src/call-channel.c
+++ b/src/call-channel.c
@@ -690,7 +690,7 @@ call_iface_init (gpointer g_iface, gpointer iface_data)
 
 #define IMPLEMENT(x) gabble_svc_channel_type_call_implement_##x (\
     klass, gabble_call_channel_##x)
-    IMPLEMENT(accept);
+  IMPLEMENT(accept);
 #undef IMPLEMENT
 }
 
diff --git a/src/call-content-codecoffer.c b/src/call-content-codecoffer.c
index 3d0b238..fe233fe 100644
--- a/src/call-content-codecoffer.c
+++ b/src/call-content-codecoffer.c
@@ -50,16 +50,6 @@ enum
   PROP_REMOTE_CONTACT_CODEC_MAP,
 };
 
-#if 0
-/* signal enum */
-enum
-{
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-#endif
-
 /* private structure */
 struct _GabbleCallContentCodecofferPrivate
 {
diff --git a/src/call-content.c b/src/call-content.c
index 20fc9c3..96e9feb 100644
--- a/src/call-content.c
+++ b/src/call-content.c
@@ -75,18 +75,6 @@ enum
   PROP_CODEC_OFFER,
 };
 
-#if 0
-/* signal enum */
-enum
-{
-    STREAM_ADDED,
-    STREAM_REMOVED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-#endif
-
 /* private structure */
 struct _GabbleCallContentPrivate
 {
@@ -154,7 +142,7 @@ gabble_call_content_get_property (GObject    *object,
             {
               GabbleCallStream *s = GABBLE_CALL_STREAM (l->data);
               g_ptr_array_add (arr,
-                (gpointer) gabble_call_stream_get_object_path (s));
+                  (gpointer) gabble_call_stream_get_object_path (s));
             }
 
           g_value_set_boxed (value, arr);
@@ -308,7 +296,7 @@ gabble_call_content_class_init (
   };
 
   g_type_class_add_private (gabble_call_content_class,
-    sizeof (GabbleCallContentPrivate));
+      sizeof (GabbleCallContentPrivate));
 
   object_class->constructed = gabble_call_content_constructed;
 
diff --git a/src/call-stream-endpoint.c b/src/call-stream-endpoint.c
index 5d43d07..ae95bb7 100644
--- a/src/call-stream-endpoint.c
+++ b/src/call-stream-endpoint.c
@@ -45,9 +45,9 @@ G_DEFINE_TYPE_WITH_CODE(GabbleCallStreamEndpoint,
   gabble_call_stream_endpoint,
   G_TYPE_OBJECT,
   G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CALL_STREAM_ENDPOINT,
-        call_stream_endpoint_iface_init);
+      call_stream_endpoint_iface_init);
    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-    tp_dbus_properties_mixin_iface_init);
+      tp_dbus_properties_mixin_iface_init);
 );
 
 /* properties */
@@ -309,8 +309,6 @@ gabble_call_stream_endpoint_dispose (GObject *object)
 
   priv->content = NULL;
 
-  /* release any references held by the object here */
-
   if (G_OBJECT_CLASS (gabble_call_stream_endpoint_parent_class)->dispose)
     G_OBJECT_CLASS (gabble_call_stream_endpoint_parent_class)->dispose (
         object);
@@ -436,11 +434,11 @@ call_stream_endpoint_iface_init (gpointer iface, gpointer data)
   GabbleSvcCallStreamEndpointClass *klass =
     (GabbleSvcCallStreamEndpointClass *) iface;
 
-  #define IMPLEMENT(x) gabble_svc_call_stream_endpoint_implement_##x (\
-      klass, call_stream_endpoint_##x)
-      IMPLEMENT(set_stream_state);
-      IMPLEMENT(set_selected_candidate);
-  #undef IMPLEMENT
+#define IMPLEMENT(x) gabble_svc_call_stream_endpoint_implement_##x (\
+    klass, call_stream_endpoint_##x)
+  IMPLEMENT(set_stream_state);
+  IMPLEMENT(set_selected_candidate);
+#undef IMPLEMENT
 }
 
 GabbleCallStreamEndpoint *
diff --git a/src/call-stream-endpoint.h b/src/call-stream-endpoint.h
index 16d10a3..00b51fe 100644
--- a/src/call-stream-endpoint.h
+++ b/src/call-stream-endpoint.h
@@ -22,7 +22,6 @@
 #define __GABBLE_CALL_STREAM_ENDPOINT_H__
 
 #include <glib-object.h>
-#include <gio/gio.h>
 
 #include <telepathy-glib/dbus-properties-mixin.h>
 #include "jingle-content.h"
diff --git a/src/call-stream.c b/src/call-stream.c
index c42c74d..614de04 100644
--- a/src/call-stream.c
+++ b/src/call-stream.c
@@ -457,8 +457,6 @@ gabble_call_stream_dispose (GObject *object)
 
   priv->content = NULL;
 
-  /* release any references held by the object here */
-
   if (G_OBJECT_CLASS (gabble_call_stream_parent_class)->dispose)
     G_OBJECT_CLASS (gabble_call_stream_parent_class)->dispose (object);
 }
diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index c0f3241..962c4bb 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -71,7 +71,7 @@ gabble_caps_channel_manager_reset_capabilities (
     {
       method (caps_manager);
     }
-  /* ... else assume there is no need to rest the  caps */
+  /* ... else assume there is no need to reset the caps */
 }
 
 void
diff --git a/tests/twisted/jingle/jingletest2.py b/tests/twisted/jingle/jingletest2.py
index 51171f2..b0537fa 100644
--- a/tests/twisted/jingle/jingletest2.py
+++ b/tests/twisted/jingle/jingletest2.py
@@ -649,7 +649,7 @@ class JingleTest2:
                             for (name, id, rate) in codecs ]
         return dbus.Array(dbussed_codecs, signature='(usuua{ss})')
 
-    def dbusify_call_odecs_with_params(self, codecs):
+    def dbusify_call_codecs_with_params(self, codecs):
         dbussed_codecs = [ (id, name, rate, 0, params)
                             for (name, id, rate, params) in codecs ]
         return dbus.Array(dbussed_codecs, signature='(usuua{ss})')
-- 
1.5.6.5