From b8607414ea0e41c44a09d31ebcd0437a3c867a24 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sat, 29 Dec 2007 15:49:47 +0000 Subject: merge git work svn path=/trunk/; revision=518 --- libempathy-gtk/empathy-call-window.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'libempathy-gtk/empathy-call-window.c') diff --git a/libempathy-gtk/empathy-call-window.c b/libempathy-gtk/empathy-call-window.c index a1c7bd799..baa169755 100644 --- a/libempathy-gtk/empathy-call-window.c +++ b/libempathy-gtk/empathy-call-window.c @@ -24,7 +24,6 @@ #include "config.h" #include -#include #include @@ -104,20 +103,6 @@ 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, @@ -139,11 +124,7 @@ 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); } } @@ -161,7 +142,7 @@ call_window_destroy_cb (GtkWidget *widget, g_slice_free (EmpathyCallWindow, window); } -GtkWidget * +void empathy_call_window_show (EmpathyTpCall *call) { EmpathyCallWindow *window; @@ -213,7 +194,5 @@ empathy_call_window_show (EmpathyTpCall *call) window); gtk_widget_show (window->window); - - return window->window; } -- cgit v1.2.3