Fix pad leak

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

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 5f006a9cf6ad4d8fdf0ad509da106418409c1d24..dbeda722ee22c6a85ebeda4e9f35f5d49b343a7c 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -26,6 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include <telepathy-farsight/channel.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy-gtk/empathy-video-widget.h>
@@ -66,6 +67,7 @@ struct _EmpathyCallWindowPriv
   GtkWidget *video_preview;
   GtkWidget *sidebar;
   GtkWidget *sidebar_button;
+  GtkWidget *statusbar;
 
   GstElement *video_input;
   GstElement *audio_input;
@@ -74,6 +76,7 @@ struct _EmpathyCallWindowPriv
   GstElement *video_tee;
 
   GladeXML *glade;
+  guint context_id;
 };
 
 #define GET_PRIV(o) \
@@ -89,11 +92,22 @@ static gboolean empathy_call_window_delete_cb (GtkWidget *widget,
 static void empathy_call_window_sidebar_toggled_cb (GtkToggleButton *toggle,
   EmpathyCallWindow *window);
 
+static void empathy_call_window_camera_toggled_cb (GtkToggleToolButton *toggle,
+  EmpathyCallWindow *window);
+
 static void empathy_call_window_sidebar_hidden_cb (EmpathySidebar *sidebar,
   EmpathyCallWindow *window);
 
 static void empathy_call_window_hangup (EmpathyCallWindow *window);
 
+static void empathy_call_window_status_message (EmpathyCallWindow *window,
+  gchar *message);
+
+static void
+empathy_call_window_session_created_cb (TfChannel *tfchannel,
+  FsConference  *conference, FsParticipant *participant,
+  gpointer user_data);
+
 static void
 empathy_call_window_setup_menubar (EmpathyCallWindow *self)
 {
@@ -130,6 +144,9 @@ empathy_call_window_setup_toolbar (EmpathyCallWindow *self)
 
   camera = glade_xml_get_widget (priv->glade, "camera");
   gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (camera), FALSE);
+
+  g_signal_connect (G_OBJECT (camera), "toggled",
+    G_CALLBACK (empathy_call_window_camera_toggled_cb), self);
 }
 
 static GtkWidget *
@@ -225,6 +242,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
   priv->glade = empathy_glade_get_file (filename, "call_window", NULL,
     "call_window_vbox", &top_vbox,
     "pane", &pane,
+    "statusbar", &priv->statusbar,
     NULL);
 
   gtk_widget_reparent (top_vbox, GTK_WIDGET (self));
@@ -235,6 +253,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
   priv->pipeline = gst_pipeline_new (NULL);
 
   hbox = gtk_hbox_new (FALSE, 3);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
   gtk_paned_pack1 (GTK_PANED(pane), hbox, TRUE, FALSE);
 
   bus = gst_pipeline_get_bus (GST_PIPELINE (priv->pipeline));
@@ -250,7 +269,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 3);
 
   priv->video_preview = empathy_video_widget_new_with_size (bus, 160, 120);
-  gtk_box_pack_start (GTK_BOX (vbox), priv->video_preview, FALSE, FALSE, 3);
+  gtk_box_pack_start (GTK_BOX (vbox), priv->video_preview, FALSE, FALSE, 0);
 
   priv->video_input = empathy_video_src_new ();
   gst_object_ref (priv->video_input);
@@ -284,7 +303,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
   gtk_paned_pack2 (GTK_PANED(pane), priv->sidebar, FALSE, FALSE);
 
   page = empathy_call_window_create_dtmf (self);
-  empathy_sidebar_add_page (EMPATHY_SIDEBAR (priv->sidebar), _("DTMF"),
+  empathy_sidebar_add_page (EMPATHY_SIDEBAR (priv->sidebar), _("Dialpad"),
     page);
 
   page = empathy_call_window_create_audio_input (self);
@@ -304,6 +323,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
 
   g_signal_connect (G_OBJECT (self), "delete-event",
     G_CALLBACK (empathy_call_window_delete_cb), self);
+
+  empathy_call_window_status_message (self, _("Connecting..."));
 }
 
 static void empathy_call_window_dispose (GObject *object);
@@ -436,8 +457,23 @@ empathy_call_window_conference_added_cb (EmpathyCallHandler *handler,
   gst_bin_add (GST_BIN (priv->pipeline), conference);
 
   gst_element_set_state (conference, GST_STATE_PLAYING);
+}
+
+static void
+empathy_call_window_channel_closed_cb (TfChannel *channel, gpointer user_data)
+{
+  EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
 
-  printf ("ADDING CONFERENCE\n");
+  empathy_call_window_status_message (self, _("Disconnected"));
+}
+
+static void
+empathy_call_window_session_created_cb (TfChannel *tfchannel,
+  FsConference  *conference, FsParticipant *participant,
+  gpointer user_data)
+{
+  g_signal_connect (G_OBJECT (tfchannel), "closed",
+    G_CALLBACK (empathy_call_window_channel_closed_cb), user_data);
 }
 
 static void
@@ -449,8 +485,11 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler,
 
   GstPad *pad;
   GstElement *element;
+  gchar *str;
 
-  printf ("ADDING SRC PAD %d\n", media_type);
+  str = g_strdup_printf (_("Connected -- %d:%02dm"), 0, 0);
+  empathy_call_window_status_message (self, str);
+  g_free (str);
 
   switch (media_type)
     {
@@ -473,6 +512,8 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler,
   gst_element_set_state (element, GST_STATE_PLAYING);
 
   gst_pad_link (src, pad);
+
+  gst_object_unref (pad);
 }
 
 static void
@@ -483,8 +524,6 @@ empathy_call_window_sink_added_cb (EmpathyCallHandler *handler,
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
   GstPad *pad;
 
-  printf ("ADDING SINK PAD %d\n", media_type);
-
   switch (media_type)
     {
       case TP_MEDIA_STREAM_TYPE_AUDIO:
@@ -513,6 +552,8 @@ empathy_call_window_realized_cb (GtkWidget *widget, EmpathyCallWindow *window)
 
   g_signal_connect (priv->handler, "conference-added",
     G_CALLBACK (empathy_call_window_conference_added_cb), window);
+  g_signal_connect (priv->handler, "session-created",
+    G_CALLBACK (empathy_call_window_session_created_cb), window);
   g_signal_connect (priv->handler, "src-pad-added",
     G_CALLBACK (empathy_call_window_src_added_cb), window);
   g_signal_connect (priv->handler, "sink-pad-added",
@@ -567,6 +608,23 @@ empathy_call_window_sidebar_toggled_cb (GtkToggleButton *toggle,
   gtk_button_set_image (GTK_BUTTON (priv->sidebar_button), arrow);
 }
 
+static void
+empathy_call_window_camera_toggled_cb (GtkToggleToolButton *toggle,
+  EmpathyCallWindow *window)
+{
+  EmpathyCallWindowPriv *priv = GET_PRIV (window);
+  gboolean active;
+  EmpathyTpCall *call;
+
+  active = (gtk_toggle_tool_button_get_active (toggle));
+
+  g_object_get (priv->handler, "tp-call", &call, NULL);
+
+  empathy_tp_call_request_video_stream_direction (call, active);
+
+  g_object_unref (call);
+}
+
 static void
 empathy_call_window_sidebar_hidden_cb (EmpathySidebar *sidebar,
   EmpathyCallWindow *window)
@@ -585,3 +643,23 @@ empathy_call_window_hangup (EmpathyCallWindow *window)
   gst_element_set_state (priv->pipeline, GST_STATE_NULL);
   gtk_widget_destroy (GTK_WIDGET (window));
 }
+
+static void
+empathy_call_window_status_message (EmpathyCallWindow *window,
+  gchar *message)
+{
+  EmpathyCallWindowPriv *priv = GET_PRIV (window);
+
+  if (priv->context_id == 0)
+    {
+      priv->context_id = gtk_statusbar_get_context_id (
+        GTK_STATUSBAR (priv->statusbar), "voip call status messages");
+    }
+  else
+    {
+      gtk_statusbar_pop (GTK_STATUSBAR (priv->statusbar), priv->context_id);
+    }
+
+  gtk_statusbar_push (GTK_STATUSBAR (priv->statusbar), priv->context_id,
+    message);
+}