brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more sections to the Clutter configuration file

Browse Source 
On top of the existing "Settings" group in the settings.ini file we
should have two more groups:

  Environment   - contains all the configuration possible through
                  environment variables
  Debug         - contains all the possible debug variables
This commit is contained in:
Emmanuele Bassi
2011-10-11 15:28:47 +01:00
parent f5eee5aec7
commit 372b39fd63
3 changed files with 165 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
clutter/clutter-settings.c
View File

@ -690,37 +690,21 @@ _clutter_settings_set_backend (ClutterSettings *settings,
#define SETTINGS_GROUP "Settings"
void
_clutter_settings_read_from_file (ClutterSettings *settings,
const gchar *file)
_clutter_settings_read_from_key_file (ClutterSettings *settings,
GKeyFile *keyfile)
{
GObjectClass *settings_class;
GObject *settings_obj;
GParamSpec **pspecs;
GKeyFile *keyfile;
GError *error;
guint n_pspecs, i;
error = NULL;
keyfile = g_key_file_new ();
g_key_file_load_from_file (keyfile, file, G_KEY_FILE_NONE, &error);
if (error != NULL)
{
g_critical ("Unable to read configuration from '%s': %s",
file,
error->message);
g_error_free (error);
goto out;
}
if (!g_key_file_has_group (keyfile, SETTINGS_GROUP))
goto out;
return;
settings_obj = G_OBJECT (settings);
settings_class = G_OBJECT_GET_CLASS (settings);
pspecs = g_object_class_list_properties (settings_class, &n_pspecs);
CLUTTER_NOTE (BACKEND, "Reading settings from '%s'", file);
for (i = 0; i < n_pspecs; i++)
{
GParamSpec *pspec = pspecs[i];
@ -790,9 +774,8 @@ _clutter_settings_read_from_file (ClutterSettings *settings,
key_error->domain != G_KEY_FILE_ERROR &&
key_error->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND)
{
g_critical ("Unable to read the value for setting '%s' in '%s': %s",
g_critical ("Unable to read the value for setting '%s': %s",
p_name,
file,
key_error->message);
}
@ -805,7 +788,4 @@ _clutter_settings_read_from_file (ClutterSettings *settings,
}
g_free (pspecs);
out:
g_key_file_free (keyfile);
}