[telepathy-gabble/master] Remove vestigial references to timer_id

[Will Thompson]

Daf broke the build, and I reviewed it. Sorry. :(

Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
---
 src/jingle-content.c |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/src/jingle-content.c b/src/jingle-content.c
index f1be177..62790a1 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -111,7 +111,6 @@ gabble_jingle_content_init (GabbleJingleContent *obj)
   priv->created_by_us = TRUE;
   priv->media_ready = FALSE;
   priv->have_local_candidates = FALSE;
-  priv->timer_id = 0;
   priv->gtalk4_event_id = 0;
   priv->dispose_has_run = FALSE;
 
@@ -131,15 +130,6 @@ gabble_jingle_content_dispose (GObject *object)
   DEBUG ("%p", object);
   priv->dispose_has_run = TRUE;
 
-  /* If we're in the middle of content-add/-accept when the session is
-   * terminated, we'll get disposed without being explicitly removed from
-   * the session. So, remove the timer here. */
-  if (priv->timer_id != 0)
-    {
-      g_source_remove (priv->timer_id);
-      priv->timer_id = 0;
-    }
-
   if (priv->gtalk4_event_id != 0)
     {
       g_source_remove (priv->gtalk4_event_id);
@@ -619,10 +609,6 @@ gabble_jingle_content_parse_accept (GabbleJingleContent *c,
   if (*error != NULL)
       return;
 
-  if (priv->timer_id != 0)
-      g_source_remove (priv->timer_id);
-  priv->timer_id = 0;
-
   priv->state = JINGLE_CONTENT_STATE_ACKNOWLEDGED;
   g_object_notify ((GObject *) c, "state");
 }
@@ -995,12 +981,6 @@ gabble_jingle_content_remove (GabbleJingleContent *c, gboolean signal_peer)
 
   DEBUG ("called for %p (%s)", c, priv->name);
 
-  if (priv->timer_id != 0)
-    {
-      g_source_remove (priv->timer_id);
-      priv->timer_id = 0;
-    }
-
   /* If we were already signalled and removal is not a side-effect of
    * something else (sesssion termination, or removal by peer),
    * we have to signal removal to the peer. */
-- 
1.5.6.5