aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-12-28 00:00:04 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-12-28 00:00:04 +0800
commit41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7 (patch)
treea0e9506d44e441333586d2cf976200bbe685b6af
parent4de10b5ccf45229e8557b808ae601073d23251c4 (diff)
parentac8964d55c1c8fa4b349a0b3c995d605b3ed33c9 (diff)
downloadgsoc2013-empathy-41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7.tar
gsoc2013-empathy-41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7.tar.gz
gsoc2013-empathy-41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7.tar.bz2
gsoc2013-empathy-41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7.tar.lz
gsoc2013-empathy-41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7.tar.xz
gsoc2013-empathy-41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7.tar.zst
gsoc2013-empathy-41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7.zip
Merge branch 'gnome-3-10'
-rw-r--r--libempathy-gtk/empathy-roster-view.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c
index ba567e7cb..0dab3ba66 100644
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -196,9 +196,9 @@ add_roster_contact (EmpathyRosterView *self,
}
static void
-group_expanded_cb (EmpathyRosterGroup *group,
+group_expanded_cb (GtkWidget *expander,
GParamSpec *spec,
- EmpathyRosterView *self)
+ EmpathyRosterGroup *group)
{
GList *widgets, *l;
@@ -241,8 +241,8 @@ ensure_roster_group (EmpathyRosterView *self,
gtk_expander_set_expanded (EMPATHY_ROSTER_GROUP (roster_group)->expander,
empathy_contact_group_get_expanded (group));
- g_signal_connect (roster_group, "notify::expanded",
- G_CALLBACK (group_expanded_cb), self);
+ g_signal_connect (EMPATHY_ROSTER_GROUP (roster_group)->expander,
+ "notify::expanded", G_CALLBACK (group_expanded_cb), roster_group);
gtk_widget_show (roster_group);
gtk_container_add (GTK_CONTAINER (self), roster_group);