[ekiga] Fix call window closing when hitting Esc.

[Damien Sandras <dsandras src gnome org>]

commit 48b2ebc89133a7aa96b7959b88a3c9b8151949f7
Author: Damien Sandras <dsandras beip be>
Date:   Sat Feb 11 14:26:36 2012 +0100

    Fix call window closing when hitting Esc.
    
    When being in a call: hangup the current call.
    When preview is active: disable it.

 src/gui/call_window.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/gui/call_window.cpp b/src/gui/call_window.cpp
index 1b80524..4914563 100644
--- a/src/gui/call_window.cpp
+++ b/src/gui/call_window.cpp
@@ -1314,8 +1314,11 @@ ekiga_call_window_delete_event_cb (GtkWidget *widget,
   cw = EKIGA_CALL_WINDOW (widget);
   g_return_val_if_fail (EKIGA_IS_CALL_WINDOW (cw), FALSE);
 
+  /* Hangup or disable preview */
   if (cw->priv->current_call)
     cw->priv->current_call->hangup ();
+  else
+    gm_conf_set_bool (VIDEO_DEVICES_KEY "enable_preview", false);
 
   return true;
 }
@@ -2480,7 +2483,7 @@ ekiga_call_window_init (EkigaCallWindow *cw)
   cw->priv->accel = gtk_accel_group_new ();
   gtk_window_add_accel_group (GTK_WINDOW (cw), cw->priv->accel);
   gtk_accel_group_connect (cw->priv->accel, GDK_Escape, (GdkModifierType) 0, GTK_ACCEL_LOCKED,
-                           g_cclosure_new (G_CALLBACK (hangup_call_cb), (gpointer) cw, NULL));
+                           g_cclosure_new_swap (G_CALLBACK (ekiga_call_window_delete_event_cb), (gpointer) cw, NULL));
   g_object_unref (cw->priv->accel);
 
   cw->priv->changing_back_to_local_after_a_call = false;