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

search-provider: Populate the model in startup

Browse source 
If the translations are stripped off into gettext .mo files, as happens
on Ubuntu, we need to be operating in the right locale so that
g_desktop_app_info_get_description (et al.) read them out correctly.

Previously we were doing work in init(), which is after gtk_init() calls
setlocale().

Move the population of the model to startup(), and chain up first, so
that it happens after we're fully initialised (including the locale).

https://bugzilla.gnome.org/show_bug.cgi?id=791035
This commit is contained in:
Iain Lane 2017-12-06 19:01:12 +00:00
parent 3f3c4bed87
commit 6a2b5bbd8b
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
search-provider/control-center-search-provider.c
View file

@ -85,11 +85,7 @@ cc_search_provider_app_dispose (GObject *object)
static void static void
cc_search_provider_app_init (CcSearchProviderApp *self) cc_search_provider_app_init (CcSearchProviderApp *self)
{ {
self->model = cc_shell_model_new ();
cc_panel_loader_fill_model (self->model);
self->search_provider = cc_search_provider_new (); self->search_provider = cc_search_provider_new ();
g_application_set_inactivity_timeout (G_APPLICATION (self), g_application_set_inactivity_timeout (G_APPLICATION (self),
INACTIVITY_TIMEOUT); INACTIVITY_TIMEOUT);
@ -98,6 +94,19 @@ cc_search_provider_app_init (CcSearchProviderApp *self)
g_application_release (G_APPLICATION (self)); g_application_release (G_APPLICATION (self));
} }
static void
cc_search_provider_app_startup (GApplication *application)
{
CcSearchProviderApp *self;
self = CC_SEARCH_PROVIDER_APP (application);
G_APPLICATION_CLASS (cc_search_provider_app_parent_class)->startup (application);
self->model = cc_shell_model_new ();
cc_panel_loader_fill_model (self->model);
}
static void static void
cc_search_provider_app_class_init (CcSearchProviderAppClass *klass) cc_search_provider_app_class_init (CcSearchProviderAppClass *klass)
{ {
@ -108,6 +117,7 @@ cc_search_provider_app_class_init (CcSearchProviderAppClass *klass)
app_class->dbus_register = cc_search_provider_app_dbus_register; app_class->dbus_register = cc_search_provider_app_dbus_register;
app_class->dbus_unregister = cc_search_provider_app_dbus_unregister; app_class->dbus_unregister = cc_search_provider_app_dbus_unregister;
app_class->startup = cc_search_provider_app_startup;
} }
CcShellModel * CcShellModel *