Revert "merge git work"

[empathy.git] / libempathy-gtk / empathy-call-window.c

diff --git a/libempathy-gtk/empathy-call-window.c b/libempathy-gtk/empathy-call-window.c
index baa169755b94e579a773a25dfec022df21a6fe2d..a1c7bd79906927d84644982ea8f54f95b99a6599 100644 (file)
--- a/libempathy-gtk/empathy-call-window.c
+++ b/libempathy-gtk/empathy-call-window.c
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include <libempathy/empathy-debug.h>
 
@@ -103,6 +104,20 @@ call_window_capabilities_notify_cb (EmpathyContact    *contact,
                                         capabilities & EMPATHY_CAPABILITIES_VIDEO);
 }
 
+static void
+call_window_name_notify_cb (EmpathyContact    *contact,
+                           GParamSpec        *param,
+                           EmpathyCallWindow *window)
+{
+       const gchar *name;
+       gchar       *title;
+
+       name = empathy_contact_get_name (contact);
+       title = g_strdup_printf (_("Call from %s"), name);
+       gtk_window_set_title (GTK_WINDOW (window->window), title);
+       g_free (title);
+}
+
 static void
 call_window_status_notify_cb (EmpathyTpCall     *call,
                              GParamSpec        *param,
@@ -124,7 +139,11 @@ call_window_status_notify_cb (EmpathyTpCall     *call,
                        g_signal_connect (contact, "notify::capabilities",
                                          G_CALLBACK (call_window_capabilities_notify_cb),
                                          window);
+                       g_signal_connect (contact, "notify::name",
+                                         G_CALLBACK (call_window_name_notify_cb),
+                                         window);
                        call_window_capabilities_notify_cb (contact, NULL, window);
+                       call_window_name_notify_cb (contact, NULL, window);
                }
        }
 
@@ -142,7 +161,7 @@ call_window_destroy_cb (GtkWidget         *widget,
        g_slice_free (EmpathyCallWindow, window);
 }
 
-void
+GtkWidget *
 empathy_call_window_show (EmpathyTpCall *call)
 {
        EmpathyCallWindow *window;
@@ -194,5 +213,7 @@ empathy_call_window_show (EmpathyTpCall *call)
                          window);
 
        gtk_widget_show (window->window);
+
+       return window->window;
 }