applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

online-accounts: Don't segfault if get_all_providers_cb is called during init

Browse source 
Due to an API bug in GNOME Online Accounts, the asynchronous
goa_provider_get_all method doesn't accept a GCancellable argument. This makes
it difficult to cancel an ongoing call when the CcGoaPanel gets destroyed.

This was hacked around by taking a reference on the panel for the duration of
the call. Instead of cancelling a pending call on destruction, it would keep the
panel alive until the call was over.

The hack does not consider the case get_all_providers_cb is called while the
panel is still being initialized. E.g. this happen when create the panel passing
the paramenters "add <provider>" because the constuct properties are set just
after cc_goa_panel_init returns and because goa_provider_add_account will result
in a call to g_main_context_iterate (caused by gtk_dialog_run).

In order to work around this we can call goa_provider_get_all in _constructed()
after all construct properties have been set.

https://gitlab.gnome.org/GNOME/gnome-control-center/issues/401
This commit is contained in:
Andrea Azzarone 2019-03-05 18:21:39 +00:00 • committed by Robert Ancell
parent e4de2f5a09
commit c6776a7be6
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
panels/online-accounts/cc-online-accounts-panel.c
View file

@ -498,7 +498,6 @@ cc_goa_panel_init (CcGoaPanel *panel)
panel);
fill_accounts_listbox (panel);
goa_provider_get_all (get_all_providers_cb, g_object_ref_sink (panel));
gtk_widget_show (GTK_WIDGET (panel));
}
@ -520,6 +519,8 @@ cc_goa_panel_constructed (GObject *object)
gtk_window_set_transient_for (GTK_WINDOW (self->edit_account_dialog), parent);
goa_provider_get_all (get_all_providers_cb, g_object_ref_sink (self));
G_OBJECT_CLASS (cc_goa_panel_parent_class)->constructed (object);
}