aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-07 18:20:11 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:08 +0800
commit0d4971e462c733f212443c44d53690e9a6d41bc6 (patch)
tree1411cced08e99a8d1b8160c6d027a8d2b4f5f410
parent6e258dd8646083c5c17f71318901aad4f529d9ee (diff)
downloadgsoc2013-empathy-0d4971e462c733f212443c44d53690e9a6d41bc6.tar
gsoc2013-empathy-0d4971e462c733f212443c44d53690e9a6d41bc6.tar.gz
gsoc2013-empathy-0d4971e462c733f212443c44d53690e9a6d41bc6.tar.bz2
gsoc2013-empathy-0d4971e462c733f212443c44d53690e9a6d41bc6.tar.lz
gsoc2013-empathy-0d4971e462c733f212443c44d53690e9a6d41bc6.tar.xz
gsoc2013-empathy-0d4971e462c733f212443c44d53690e9a6d41bc6.tar.zst
gsoc2013-empathy-0d4971e462c733f212443c44d53690e9a6d41bc6.zip
Change the page before showing the sidebar
To avoid showing it without the dialpad, which would cause the dialpad menu callback to be called to hide it before the page was changed, causing the sidebar to be hidden again!
-rw-r--r--src/empathy-call-window.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index d9bab64ea..ba7d2d43a 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -3125,12 +3125,12 @@ empathy_call_window_dialpad_cb (GtkToggleAction *menu,
active = gtk_toggle_action_get_active (menu);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->sidebar_button),
- active);
-
if (active)
empathy_sidebar_set_page (EMPATHY_SIDEBAR (priv->sidebar),
priv->dtmf_panel);
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->sidebar_button),
+ active);
}
static void