projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Fix for non-GCC
[platform/upstream/glib.git]
/
gio
/
gsettings-tool.c
diff --git
a/gio/gsettings-tool.c
b/gio/gsettings-tool.c
index
a232602
..
e823cf4
100644
(file)
--- a/
gio/gsettings-tool.c
+++ b/
gio/gsettings-tool.c
@@
-27,16
+27,16
@@
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
-static gboolean
-contained (const gchar * const *items,
- const gchar *item)
-{
- while (*items)
- if (strcmp (*items++, item) == 0)
- return TRUE;
+#ifdef G_OS_WIN32
+#include "glib/glib-private.h"
+#endif
- return FALSE;
-}
+static GSettingsSchemaSource *global_schema_source;
+static GSettings *global_settings;
+static GSettingsSchema *global_schema;
+static GSettingsSchemaKey *global_schema_key;
+const gchar *global_key;
+const gchar *global_value;
static gboolean
is_relocatable_schema (GSettingsSchema *schema)
static gboolean
is_relocatable_schema (GSettingsSchema *schema)
@@
-116,27
+116,8
@@
check_path (const gchar *path)
return TRUE;
}
return TRUE;
}
-static gboolean
-check_key (GSettings *settings,
- const gchar *key)
-{
- gboolean good;
- gchar **keys;
-
- keys = g_settings_list_keys (settings);
- good = contained ((const gchar **) keys, key);
- g_strfreev (keys);
-
- if (good)
- return TRUE;
-
- g_printerr (_("No such key '%s'\n"), key);
-
- return FALSE;
-}
-
static void
static void
-output_list (
const gchar * const
*list)
+output_list (
gchar *
*list)
{
gint i;
{
gint i;
@@
-145,43
+126,50
@@
output_list (const gchar * const *list)
}
static void
}
static void
-gsettings_list_schemas (GSettings *settings,
- const gchar *key,
- const gchar *value)
+gsettings_print_version (void)
{
{
- output_list (g_settings_list_schemas ());
+ g_print ("%d.%d.%d\n", glib_major_version, glib_minor_version,
+ glib_micro_version);
}
static void
}
static void
-gsettings_list_relocatable_schemas (GSettings *settings,
- const gchar *key,
- const gchar *value)
+gsettings_list_schemas (void)
{
{
- output_list (g_settings_list_relocatable_schemas ());
+ gchar **schemas;
+
+ g_settings_schema_source_list_schemas (global_schema_source, TRUE, &schemas, NULL);
+ output_list (schemas);
+ g_strfreev (schemas);
}
static void
}
static void
-gsettings_list_keys (GSettings *settings,
- const gchar *key,
- const gchar *value)
+gsettings_list_relocatable_schemas (void)
+{
+ gchar **schemas;
+
+ g_settings_schema_source_list_schemas (global_schema_source, TRUE, NULL, &schemas);
+ output_list (schemas);
+ g_strfreev (schemas);
+}
+
+static void
+gsettings_list_keys (void)
{
gchar **keys;
{
gchar **keys;
- keys = g_settings_list_keys (settings);
- output_list (
(const gchar **)
keys);
+ keys = g_settings_list_keys (
global_
settings);
+ output_list (keys);
g_strfreev (keys);
}
static void
g_strfreev (keys);
}
static void
-gsettings_list_children (GSettings *settings,
- const gchar *key,
- const gchar *value)
+gsettings_list_children (void)
{
gchar **children;
gint max = 0;
gint i;
{
gchar **children;
gint max = 0;
gint i;
- children = g_settings_list_children (settings);
+ children = g_settings_list_children (
global_
settings);
for (i = 0; children[i]; i++)
if (strlen (children[i]) > max)
max = strlen (children[i]);
for (i = 0; children[i]; i++)
if (strlen (children[i]) > max)
max = strlen (children[i]);
@@
-192,7
+180,7
@@
gsettings_list_children (GSettings *settings,
GSettingsSchema *schema;
gchar *path;
GSettingsSchema *schema;
gchar *path;
- child = g_settings_get_child (settings, children[i]);
+ child = g_settings_get_child (
global_
settings, children[i]);
g_object_get (child,
"settings-schema", &schema,
"path", &path,
g_object_get (child,
"settings-schema", &schema,
"path", &path,
@@
-218,7
+206,7
@@
enumerate (GSettings *settings)
gchar *schema;
gint i;
gchar *schema;
gint i;
- g_object_get (settings, "schema", &schema, NULL);
+ g_object_get (settings, "schema
-id
", &schema, NULL);
keys = g_settings_list_keys (settings);
for (i = 0; keys[i]; i++)
keys = g_settings_list_keys (settings);
for (i = 0; keys[i]; i++)
@@
-238,58
+226,59
@@
enumerate (GSettings *settings)
}
static void
}
static void
-gsettings_list_recursively (GSettings *settings,
- const gchar *key,
- const gchar *value)
+list_recursively (GSettings *settings)
{
{
- if (settings)
- {
- gchar **children;
- gint i;
-
- enumerate (settings);
- children = g_settings_list_children (settings);
- for (i = 0; children[i]; i++)
- {
- GSettings *child;
- GSettingsSchema *schema;
+ gchar **children;
+ gint i;
- child = g_settings_get_child (settings, children[i]);
- g_object_get (child, "settings-schema", &schema, NULL);
+ enumerate (settings);
+ children = g_settings_list_children (settings);
+ for (i = 0; children[i]; i++)
+ {
+ GSettings *child;
- enumerate (child);
+ child = g_settings_get_child (settings, children[i]);
+ list_recursively (child);
+ g_object_unref (child);
+ }
- g_object_unref (child);
- g_settings_schema_unref (schema);
- }
+ g_strfreev (children);
+}
- g_strfreev (children);
+static void
+gsettings_list_recursively (void)
+{
+ if (global_settings)
+ {
+ list_recursively (global_settings);
}
else
{
}
else
{
-
const gchar * const
*schemas;
+
gchar *
*schemas;
gint i;
gint i;
-
schemas = g_settings_list_schemas (
);
+
g_settings_schema_source_list_schemas (global_schema_source, TRUE, &schemas, NULL
);
for (i = 0; schemas[i]; i++)
{
for (i = 0; schemas[i]; i++)
{
+ GSettings *settings;
+
settings = g_settings_new (schemas[i]);
settings = g_settings_new (schemas[i]);
-
enumerate
(settings);
+
list_recursively
(settings);
g_object_unref (settings);
}
g_object_unref (settings);
}
+
+ g_strfreev (schemas);
}
}
static void
}
}
static void
-gsettings_range (GSettings *settings,
- const gchar *key,
- const gchar *value)
+gsettings_range (void)
{
GVariant *range, *detail;
const gchar *type;
{
GVariant *range, *detail;
const gchar *type;
- range = g_settings_
get_range (settings,
key);
+ range = g_settings_
schema_key_get_range (global_schema_
key);
g_variant_get (range, "(&sv)", &type, &detail);
if (strcmp (type, "type") == 0)
g_variant_get (range, "(&sv)", &type, &detail);
if (strcmp (type, "type") == 0)
@@
-335,14
+324,12
@@
gsettings_range (GSettings *settings,
}
static void
}
static void
-gsettings_get (GSettings *settings,
- const gchar *key,
- const gchar *value_)
+gsettings_get (void)
{
GVariant *value;
gchar *printed;
{
GVariant *value;
gchar *printed;
- value = g_settings_get_value (
settings,
key);
+ value = g_settings_get_value (
global_settings, global_
key);
printed = g_variant_print (value, TRUE);
g_print ("%s\n", printed);
g_variant_unref (value);
printed = g_variant_print (value, TRUE);
g_print ("%s\n", printed);
g_variant_unref (value);
@@
-350,16
+337,14
@@
gsettings_get (GSettings *settings,
}
static void
}
static void
-gsettings_reset (GSettings *settings,
- const gchar *key,
- const gchar *value)
+gsettings_reset (void)
{
{
- g_settings_reset (
settings,
key);
+ g_settings_reset (
global_settings, global_
key);
g_settings_sync ();
}
static void
g_settings_sync ();
}
static void
-reset_all_keys (GSettings
*settings)
+reset_all_keys (GSettings *settings)
{
gchar **keys;
gint i;
{
gchar **keys;
gint i;
@@
-374,21
+359,19
@@
reset_all_keys (GSettings *settings)
}
static void
}
static void
-gsettings_reset_recursively (GSettings *settings,
- const gchar *key,
- const gchar *value)
+gsettings_reset_recursively (void)
{
gchar **children;
gint i;
{
gchar **children;
gint i;
- g_settings_delay (settings);
+ g_settings_delay (
global_
settings);
- reset_all_keys (settings);
- children = g_settings_list_children (settings);
+ reset_all_keys (
global_
settings);
+ children = g_settings_list_children (
global_
settings);
for (i = 0; children[i]; i++)
{
GSettings *child;
for (i = 0; children[i]; i++)
{
GSettings *child;
- child = g_settings_get_child (settings, children[i]);
+ child = g_settings_get_child (
global_
settings, children[i]);
reset_all_keys (child);
reset_all_keys (child);
@@
-397,68
+380,58
@@
gsettings_reset_recursively (GSettings *settings,
g_strfreev (children);
g_strfreev (children);
- g_settings_apply (settings);
+ g_settings_apply (
global_
settings);
g_settings_sync ();
}
static void
g_settings_sync ();
}
static void
-gsettings_writable (GSettings *settings,
- const gchar *key,
- const gchar *value)
+gsettings_writable (void)
{
g_print ("%s\n",
{
g_print ("%s\n",
- g_settings_is_writable (
settings,
key) ?
+ g_settings_is_writable (
global_settings, global_
key) ?
"true" : "false");
}
static void
"true" : "false");
}
static void
-value_changed (GSettings *settings,
- const gchar *key,
- gpointer user_data)
+value_changed (void)
{
GVariant *value;
gchar *printed;
{
GVariant *value;
gchar *printed;
- value = g_settings_get_value (
settings,
key);
+ value = g_settings_get_value (
global_settings, global_
key);
printed = g_variant_print (value, TRUE);
printed = g_variant_print (value, TRUE);
- g_print ("%s: %s\n", key, printed);
+ g_print ("%s: %s\n",
global_
key, printed);
g_variant_unref (value);
g_free (printed);
}
static void
g_variant_unref (value);
g_free (printed);
}
static void
-gsettings_monitor (GSettings *settings,
- const gchar *key,
- const gchar *value)
+gsettings_monitor (void)
{
{
- if (key)
+ if (
global_
key)
{
gchar *name;
{
gchar *name;
- name = g_strdup_printf ("changed::%s", key);
- g_signal_connect (settings, name, G_CALLBACK (value_changed), NULL);
+ name = g_strdup_printf ("changed::%s",
global_
key);
+ g_signal_connect (
global_
settings, name, G_CALLBACK (value_changed), NULL);
}
else
}
else
- g_signal_connect (settings, "changed", G_CALLBACK (value_changed), NULL);
+ g_signal_connect (
global_
settings, "changed", G_CALLBACK (value_changed), NULL);
g_main_loop_run (g_main_loop_new (NULL, FALSE));
}
static void
g_main_loop_run (g_main_loop_new (NULL, FALSE));
}
static void
-gsettings_set (GSettings *settings,
- const gchar *key,
- const gchar *value)
+gsettings_set (void)
{
const GVariantType *type;
GError *error = NULL;
{
const GVariantType *type;
GError *error = NULL;
- GVariant *existing;
GVariant *new;
gchar *freeme = NULL;
GVariant *new;
gchar *freeme = NULL;
- existing = g_settings_get_value (settings, key);
- type = g_variant_get_type (existing);
+ type = g_settings_schema_key_get_value_type (global_schema_key);
- new = g_variant_parse (type, value, NULL, NULL, &error);
+ new = g_variant_parse (type,
global_
value, NULL, NULL, &error);
/* If that didn't work and the type is string then we should assume
* that the user is just trying to set a string directly and forgot
/* If that didn't work and the type is string then we should assume
* that the user is just trying to set a string directly and forgot
@@
-483,29
+456,30
@@
gsettings_set (GSettings *settings,
*/
if (new == NULL &&
g_variant_type_equal (type, G_VARIANT_TYPE_STRING) &&
*/
if (new == NULL &&
g_variant_type_equal (type, G_VARIANT_TYPE_STRING) &&
-
value[0] != '\'' &&
value[0] != '"')
+
global_value[0] != '\'' && global_
value[0] != '"')
{
g_clear_error (&error);
{
g_clear_error (&error);
- new = g_variant_new_string (value);
+ new = g_variant_new_string (
global_
value);
}
}
- /* we're done with 'type' now, so we can free 'existing' */
- g_variant_unref (existing);
-
if (new == NULL)
{
g_printerr ("%s\n", error->message);
exit (1);
}
if (new == NULL)
{
g_printerr ("%s\n", error->message);
exit (1);
}
- if (!g_settings_
range_check (settings,
key, new))
+ if (!g_settings_
schema_key_range_check (global_schema_
key, new))
{
g_printerr (_("The provided value is outside of the valid range\n"));
g_variant_unref (new);
exit (1);
}
{
g_printerr (_("The provided value is outside of the valid range\n"));
g_variant_unref (new);
exit (1);
}
- g_settings_set_value (settings, key, new);
+ if (!g_settings_set_value (global_settings, global_key, new))
+ {
+ g_printerr (_("The key is not writable\n"));
+ exit (1);
+ }
g_settings_sync ();
g_settings_sync ();
@@
-531,6
+505,12
@@
gsettings_help (gboolean requested,
synopsis = "[COMMAND]";
}
synopsis = "[COMMAND]";
}
+ else if (strcmp (command, "--version") == 0)
+ {
+ description = _("Print version information and exit");
+ synopsis = "";
+ }
+
else if (strcmp (command, "list-schemas") == 0)
{
description = _("List the installed (non-relocatable) schemas");
else if (strcmp (command, "list-schemas") == 0)
{
description = _("List the installed (non-relocatable) schemas");
@@
-616,6
+596,7
@@
gsettings_help (gboolean requested,
{
g_string_append (string,
_("Usage:\n"
{
g_string_append (string,
_("Usage:\n"
+ " gsettings --version\n"
" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n"
"\n"
"Commands:\n"
" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n"
"\n"
"Commands:\n"
@@
-683,14
+664,9
@@
gsettings_help (gboolean requested,
int
main (int argc, char **argv)
{
int
main (int argc, char **argv)
{
- void (* function) (GSettings *, const gchar *, const gchar *);
- GSettingsSchemaSource *schema_source;
- GSettingsSchema *schema;
- GSettings *settings;
- const gchar *key;
+ void (* function) (void);
#ifdef G_OS_WIN32
#ifdef G_OS_WIN32
- extern gchar *_glib_get_locale_dir (void);
gchar *tmp;
#endif
gchar *tmp;
#endif
@@
-712,19
+688,19
@@
main (int argc, char **argv)
if (argc < 2)
return gsettings_help (FALSE, NULL);
if (argc < 2)
return gsettings_help (FALSE, NULL);
- schema_source = g_settings_schema_source_ref (g_settings_schema_source_get_default ());
+
global_
schema_source = g_settings_schema_source_ref (g_settings_schema_source_get_default ());
if (argc > 3 && g_str_equal (argv[1], "--schemadir"))
{
if (argc > 3 && g_str_equal (argv[1], "--schemadir"))
{
- GSettingsSchemaSource *parent = schema_source;
+ GSettingsSchemaSource *parent =
global_
schema_source;
GError *error = NULL;
GError *error = NULL;
- schema_source = g_settings_schema_source_new_from_directory (argv[2], parent, FALSE, &error);
+
global_
schema_source = g_settings_schema_source_new_from_directory (argv[2], parent, FALSE, &error);
g_settings_schema_source_unref (parent);
g_settings_schema_source_unref (parent);
- if (schema_source == NULL)
+ if (
global_
schema_source == NULL)
{
{
- g_printerr (
"Could not load schemas from %s: %s\n"
, argv[2], error->message);
+ g_printerr (
_("Could not load schemas from %s: %s\n")
, argv[2], error->message);
g_clear_error (&error);
return 1;
g_clear_error (&error);
return 1;
@@
-738,6
+714,9
@@
main (int argc, char **argv)
if (strcmp (argv[1], "help") == 0)
return gsettings_help (TRUE, argv[2]);
if (strcmp (argv[1], "help") == 0)
return gsettings_help (TRUE, argv[2]);
+ else if (argc == 2 && strcmp (argv[1], "--version") == 0)
+ function = gsettings_print_version;
+
else if (argc == 2 && strcmp (argv[1], "list-schemas") == 0)
function = gsettings_list_schemas;
else if (argc == 2 && strcmp (argv[1], "list-schemas") == 0)
function = gsettings_list_schemas;
@@
-777,8
+756,6
@@
main (int argc, char **argv)
else
return gsettings_help (FALSE, argv[1]);
else
return gsettings_help (FALSE, argv[1]);
- g_type_init ();
-
if (argc > 2)
{
gchar **parts;
if (argc > 2)
{
gchar **parts;
@@
-791,48
+768,47
@@
main (int argc, char **argv)
parts = g_strsplit (argv[2], ":", 2);
parts = g_strsplit (argv[2], ":", 2);
-
schema = g_settings_schema_source_lookup (
schema_source, parts[0], TRUE);
+
global_schema = g_settings_schema_source_lookup (global_
schema_source, parts[0], TRUE);
if (parts[1])
{
if (parts[1])
{
- if (!check_relocatable_schema (schema, parts[0]) || !check_path (parts[1]))
+ if (!check_relocatable_schema (
global_
schema, parts[0]) || !check_path (parts[1]))
return 1;
return 1;
-
settings = g_settings_new_full (
schema, NULL, parts[1]);
+
global_settings = g_settings_new_full (global_
schema, NULL, parts[1]);
}
else
{
}
else
{
- if (!check_schema (schema, parts[0]))
+ if (!check_schema (
global_
schema, parts[0]))
return 1;
return 1;
-
settings = g_settings_new_full (
schema, NULL, NULL);
+
global_settings = g_settings_new_full (global_
schema, NULL, NULL);
}
g_strfreev (parts);
}
}
g_strfreev (parts);
}
- else
- {
- settings = NULL;
- schema = NULL;
- }
if (argc > 3)
{
if (argc > 3)
{
- if (!check_key (settings, argv[3]))
- return 1;
+ if (!g_settings_schema_has_key (global_schema, argv[3]))
+ {
+ g_printerr (_("No such key '%s'\n"), argv[3]);
+ return 1;
+ }
- key = argv[3];
+ global_key = argv[3];
+ global_schema_key = g_settings_schema_get_key (global_schema, global_key);
}
}
- else
- key = NULL;
- (* function) (settings, key, argc > 4 ? argv[4] : NULL);
+ if (argc > 4)
+ global_value = argv[4];
+
+ (* function) ();
- if (settings != NULL)
- g_object_unref (settings);
- if (schema != NULL)
- g_settings_schema_unref (schema);
- g_settings_schema_source_unref (schema_source);
+ g_clear_pointer (&global_schema_source, g_settings_schema_source_unref);
+ g_clear_pointer (&global_schema_key, g_settings_schema_key_unref);
+ g_clear_pointer (&global_schema, g_settings_schema_unref);
+ g_clear_object (&global_settings);
return 0;
}
return 0;
}