Merge branch 'debug-window'

[empathy.git] / src / empathy-call-window.c

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 7bca4a564fbcd0eea9a4e78984ad008215dda6dd..f7ba242326fadb68f4dd71202d124a59a6882308 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -863,6 +863,8 @@ set_window_title (EmpathyCallWindow *self)
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
   gchar *tmp;
 
+  /* translators: Call is a noun and %s is the contact name. This string is used
+   * in the window title */
   tmp = g_strdup_printf (_("Call with %s"),
       empathy_contact_get_name (priv->contact));
   gtk_window_set_title (GTK_WINDOW (self), tmp);
@@ -932,6 +934,7 @@ empathy_call_window_setup_avatars (EmpathyCallWindow *self,
   else
     {
       g_warning ("call handler doesn't have a contact");
+      /* translators: Call is a noun. This string is used in the window title */
       gtk_window_set_title (GTK_WINDOW (self), _("Call"));
 
       /* Since we can't access the remote contact, we can't get a connection
@@ -1133,7 +1136,10 @@ empathy_call_window_finalize (GObject *object)
     }
 
   if (priv->bus_message_source_id != 0)
-    g_source_remove (priv->bus_message_source_id);
+    {
+      g_source_remove (priv->bus_message_source_id);
+      priv->bus_message_source_id = 0;
+    }
 
   /* free any data held directly by the object here */
   g_mutex_free (priv->lock);
@@ -1190,7 +1196,11 @@ empathy_call_window_reset_pipeline (EmpathyCallWindow *self)
     return TRUE;
 
   if (priv->bus_message_source_id != 0)
-    g_source_remove (priv->bus_message_source_id);
+    {
+      g_source_remove (priv->bus_message_source_id);
+      priv->bus_message_source_id = 0;
+    }
+
   state_change_return = gst_element_set_state (priv->pipeline, GST_STATE_NULL);
 
   if (state_change_return == GST_STATE_CHANGE_SUCCESS ||
@@ -1703,7 +1713,10 @@ empathy_call_window_delete_cb (GtkWidget *widget, GdkEvent*event,
   if (priv->pipeline != NULL)
     {
       if (priv->bus_message_source_id != 0)
-        g_source_remove (priv->bus_message_source_id);
+        {
+          g_source_remove (priv->bus_message_source_id);
+          priv->bus_message_source_id = 0;
+        }
 
       gst_element_set_state (priv->pipeline, GST_STATE_NULL);
     }