aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-19 16:55:04 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-19 17:25:18 +0800
commit2a15005b42394c72c7c883aa9beff4f8f87b8e26 (patch)
treecf384d3dd9ac6ffeb5c4af9bd489a8b95f2ddac5 /src
parent335d9576a93088c11a44de1cdb9c3884a285d95e (diff)
downloadgsoc2013-empathy-2a15005b42394c72c7c883aa9beff4f8f87b8e26.tar
gsoc2013-empathy-2a15005b42394c72c7c883aa9beff4f8f87b8e26.tar.gz
gsoc2013-empathy-2a15005b42394c72c7c883aa9beff4f8f87b8e26.tar.bz2
gsoc2013-empathy-2a15005b42394c72c7c883aa9beff4f8f87b8e26.tar.lz
gsoc2013-empathy-2a15005b42394c72c7c883aa9beff4f8f87b8e26.tar.xz
gsoc2013-empathy-2a15005b42394c72c7c883aa9beff4f8f87b8e26.tar.zst
gsoc2013-empathy-2a15005b42394c72c7c883aa9beff4f8f87b8e26.zip
CallWindow: don't hide the toolbar when not in a call
https://bugzilla.gnome.org/show_bug.cgi?id=656566
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index df52534b1..bbaf96ac3 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1159,6 +1159,9 @@ empathy_call_window_set_state_connecting (EmpathyCallWindow *window)
empathy_call_window_status_message (window, _("Connecting…"));
priv->call_state = CONNECTING;
+ /* Show the toolbar */
+ clutter_state_set_state (priv->transitions, "fade-in");
+
if (priv->outgoing)
empathy_sound_manager_start_playing (priv->sound_mgr, GTK_WIDGET (window),
EMPATHY_SOUND_PHONE_OUTGOING, MS_BETWEEN_RING);
@@ -1275,7 +1278,11 @@ empathy_call_window_toolbar_timeout (gpointer data)
{
EmpathyCallWindow *self = data;
- clutter_state_set_state (self->priv->transitions, "fade-out");
+ /* We don't want to hide the toolbar if we're not in a call, as
+ * to show the call status all the time. */
+ if (self->priv->call_state != CONNECTING &&
+ self->priv->call_state != DISCONNECTED)
+ clutter_state_set_state (self->priv->transitions, "fade-out");
return TRUE;
}
@@ -2305,6 +2312,9 @@ empathy_call_window_disconnected (EmpathyCallWindow *self,
if (priv->call_state != REDIALING)
priv->call_state = DISCONNECTED;
+ /* Show the toolbar */
+ clutter_state_set_state (priv->transitions, "fade-in");
+
if (could_reset_pipeline)
{
g_mutex_lock (priv->lock);