aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 03:07:34 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:09 +0800
commit70f3ecbecff1194994e950e0e34eaf45bab8a1b2 (patch)
tree8f4b4a8d81fcfbcef127d83692c57f0aada8888c /src
parent523e8030211e4a0c84e3c5bec0c705818ca3c669 (diff)
downloadgsoc2013-empathy-70f3ecbecff1194994e950e0e34eaf45bab8a1b2.tar
gsoc2013-empathy-70f3ecbecff1194994e950e0e34eaf45bab8a1b2.tar.gz
gsoc2013-empathy-70f3ecbecff1194994e950e0e34eaf45bab8a1b2.tar.bz2
gsoc2013-empathy-70f3ecbecff1194994e950e0e34eaf45bab8a1b2.tar.lz
gsoc2013-empathy-70f3ecbecff1194994e950e0e34eaf45bab8a1b2.tar.xz
gsoc2013-empathy-70f3ecbecff1194994e950e0e34eaf45bab8a1b2.tar.zst
gsoc2013-empathy-70f3ecbecff1194994e950e0e34eaf45bab8a1b2.zip
CallWindow: properly track the dialpad status again
This stopped working properly as the latest EvSidebar didn't have notify::current-page anymore.
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 9fa5ef391..9d4fe5201 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -241,7 +241,7 @@ static void empathy_call_window_sidebar_shown_cb (EvSidebar *sidebar,
EmpathyCallWindow *window);
static void empathy_call_window_sidebar_changed_cb (EvSidebar *sidebar,
- GParamSpec *pspec,
+ const gchar *page,
EmpathyCallWindow *window);
static void empathy_call_window_hangup_cb (gpointer object,
@@ -1140,7 +1140,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
"hide", G_CALLBACK (empathy_call_window_sidebar_hidden_cb), self);
g_signal_connect (G_OBJECT (priv->sidebar),
"show", G_CALLBACK (empathy_call_window_sidebar_shown_cb), self);
- g_signal_connect (G_OBJECT (priv->sidebar), "notify::current-page",
+ g_signal_connect (G_OBJECT (priv->sidebar), "changed",
G_CALLBACK (empathy_call_window_sidebar_changed_cb), self);
gtk_paned_pack2 (GTK_PANED (priv->pane), priv->sidebar, FALSE, FALSE);
@@ -3050,15 +3050,11 @@ empathy_call_window_sidebar_shown_cb (EvSidebar *sidebar,
static void
empathy_call_window_sidebar_changed_cb (EvSidebar *sidebar,
- GParamSpec *pspec,
+ const gchar *page,
EmpathyCallWindow *window)
{
- gchar *page;
-
- page = ev_sidebar_get_current_page (sidebar);
empathy_call_window_update_dialpad_menu (window,
!tp_strdiff (page, "dialpad"));
- g_free (page);
}
static void