mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

linux: Also check for schema before init

Browse source
This commit is contained in:
Cheng Zhao 2014-10-21 20:06:54 +08:00
parent f6ff97cbeb
commit fe3489b383
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/atom_browser_main_parts_linux.cc
View file

@ -16,6 +16,16 @@ namespace {
const char* kInterfaceSchema = "org.gnome.desktop.interface"; const char* kInterfaceSchema = "org.gnome.desktop.interface";
const char* kScaleFactor = "scaling-factor"; const char* kScaleFactor = "scaling-factor";
bool SchemaExists(const LibGioLoader& libgio_loader, const char* schema_name) {
const gchar* const* schemas = libgio_loader.g_settings_list_schemas();
while (*schemas) {
if (strcmp(schema_name, static_cast<const char*>(*schemas)) == 0)
return true;
schemas++;
}
return false;
}
void GetDPIFromGSettings(guint* scale_factor) { void GetDPIFromGSettings(guint* scale_factor) {
LibGioLoader libgio_loader; LibGioLoader libgio_loader;
@ -26,8 +36,9 @@ void GetDPIFromGSettings(guint* scale_factor) {
return; return;
} }
GSettings* client = libgio_loader.g_settings_new(kInterfaceSchema); GSettings* client = nullptr;
if (!client) { if (!SchemaExists(libgio_loader, kInterfaceSchema) ||
!(client = libgio_loader.g_settings_new(kInterfaceSchema))) {
VLOG(1) << "Cannot create gsettings client."; VLOG(1) << "Cannot create gsettings client.";
return; return;
} }