summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2012-08-21 13:29:46 -0400
committerRay Strode <rstrode@redhat.com>2012-08-21 14:38:03 -0400
commit933c883f5297c7a36cb438822822c462412a8ec2 (patch)
tree5f9d942f902f8a8bb155a2cbc22e489a4b4a9bb9
parentc2d9f437ac38874ee98048ed63a39d8092e060b8 (diff)
downloadgnome-control-center-933c883f5297c7a36cb438822822c462412a8ec2.tar.gz
online-accounts: set up finalize handler at class init time
It was being set up at class finalization time, which is too late. Fixes crash when switching from panel to shell and back (and then try to interact with the switches). https://bugzilla.gnome.org/show_bug.cgi?id=682379 (cherry picked from commit 3bf8bcf3f8a357f0c33f1f790852c42eec954483) Conflicts: panels/online-accounts/cc-online-accounts-panel.c
-rw-r--r--panels/online-accounts/cc-online-accounts-panel.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c
index a06db9a8e..4d9c89db3 100644
--- a/panels/online-accounts/cc-online-accounts-panel.c
+++ b/panels/online-accounts/cc-online-accounts-panel.c
@@ -220,15 +220,13 @@ goa_panel_init (GoaPanel *panel)
static void
goa_panel_class_init (GoaPanelClass *klass)
{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ object_class->finalize = goa_panel_finalize;
}
static void
goa_panel_class_finalize (GoaPanelClass *klass)
{
- GObjectClass *gobject_class;
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = goa_panel_finalize;
}
/* ---------------------------------------------------------------------------------------------------- */