[ekiga] Call Window: Fixed call info frame always being shown.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Call Window: Fixed call info frame always being shown.
- Date: Sat, 27 Oct 2012 11:28:43 +0000 (UTC)
commit 85271e5cf9a0012cdd0e46328293e24ff079e3db
Author: Damien Sandras <dsandras beip be>
Date: Sat Oct 27 13:27:45 2012 +0200
Call Window: Fixed call info frame always being shown.
It should only be shown when we have an active call. Not when
webcam preview is being used.
lib/engine/gui/gtk-frontend/call-window.cpp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index af8cd14..4a4ae81 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -1398,6 +1398,9 @@ ekiga_call_window_update_calling_state (EkigaCallWindow *cw,
gtk_widget_hide (cw->priv->spinner);
gtk_spinner_stop (GTK_SPINNER (cw->priv->spinner));
+ /* Show/hide call frame */
+ gtk_widget_hide (cw->priv->call_frame);
+
/* Destroy the transfer call popup */
if (cw->priv->transfer_call_popup)
gtk_dialog_response (GTK_DIALOG (cw->priv->transfer_call_popup),
@@ -2353,12 +2356,9 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
cw->priv->call_frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (cw->priv->call_frame), GTK_SHADOW_NONE);
hbox = gtk_hbox_new (false, 0);
- gtk_widget_show (cw->priv->call_frame);
- gtk_widget_show (hbox);
cw->priv->avatar_image = gtk_image_new_from_icon_name ("camera-web", GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_box_pack_start (GTK_BOX (hbox), cw->priv->avatar_image, false, false, 12);
- gtk_widget_show (cw->priv->avatar_image);
cw->priv->spinner = gtk_spinner_new ();
gtk_widget_set_size_request (GTK_WIDGET (cw->priv->spinner), 24, 24);
@@ -2376,7 +2376,8 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
gtk_box_pack_start (GTK_BOX (hbox), alignment, false, false, 2);
gtk_container_add (GTK_CONTAINER (cw->priv->call_frame), hbox);
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (cw->priv->call_frame), true, true, 2);
- gtk_widget_show_all (alignment);
+ gtk_widget_show_all (cw->priv->call_frame);
+ gtk_widget_hide (cw->priv->spinner);
/* Pick-up */
item = gtk_tool_item_new ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]