luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-08 03:45:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

g_settings_list_keys() -> _list_items()

Browse Source 
This function returns children as well.
This commit is contained in:
Ryan Lortie 2010-06-30 10:02:45 -04:00
parent 3628b0b499
commit 137ae2413c
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gio/gio-sections.txt
View File

@ -2151,7 +2151,7 @@ g_settings_get_child
<SUBSECTION Introspection> <SUBSECTION Introspection>
g_settings_list_schemas g_settings_list_schemas
g_settings_list_keys g_settings_list_items
<SUBSECTION Convenience> <SUBSECTION Convenience>
g_settings_get g_settings_get

2
gio/gio.symbols
View File

@ -1478,7 +1478,7 @@ g_settings_set_boolean
g_settings_get_enum g_settings_get_enum
g_settings_set_enum g_settings_set_enum
g_settings_sync g_settings_sync
g_settings_list_keys g_settings_list_items
g_settings_get_mapped g_settings_get_mapped
#endif #endif
#endif #endif

4
gio/gsettings-tool.c
View File

@ -162,7 +162,7 @@ key_exists (GSettings *settings,
ret = FALSE; ret = FALSE;
keys = g_settings_list_keys (settings); keys = g_settings_list_items (settings);
for (i = 0; keys[i]; i++) for (i = 0; keys[i]; i++)
if (!g_str_has_suffix (keys[i], "/") && if (!g_str_has_suffix (keys[i], "/") &&
g_strcmp0 (keys[i], name) == 0) g_strcmp0 (keys[i], name) == 0)
@ -182,7 +182,7 @@ list_keys (GSettings *settings,
const gchar **keys; const gchar **keys;
gint i; gint i;
keys = g_settings_list_keys (settings); keys = g_settings_list_items (settings);
for (i = 0; keys[i]; i++) for (i = 0; keys[i]; i++)
{ {
if (!g_str_has_suffix (keys[i], "/") && if (!g_str_has_suffix (keys[i], "/") &&

12
gio/gsettings.c
View File

@ -1844,7 +1844,7 @@ g_settings_get_has_unapplied (GSettings *settings)
G_DELAYED_SETTINGS_BACKEND (settings->priv->backend)); G_DELAYED_SETTINGS_BACKEND (settings->priv->backend));
} }
/* Extra API (sync, get_child, is_writable, list_keys) {{{1 */ /* Extra API (sync, get_child, is_writable, list_items) {{{1 */
/** /**
* g_settings_sync: * g_settings_sync:
* @context: the context to sync, or %NULL * @context: the context to sync, or %NULL
@ -1938,11 +1938,15 @@ g_settings_get_child (GSettings *settings,
} }
/** /**
* g_settings_list_keys: * g_settings_list_items:
* @settings: a #GSettings object * @settings: a #GSettings object
* Returns: a list of the keys on @settings * Returns: a list of the keys on @settings
* *
* Introspects the list of keys on @settings. * Introspects the list of keys and children on @settings.
*
* The list that is returned is a mix of the keys and children. The
* names of the children are suffixed with '/'. The names of the keys
* are not.
* *
* You should probably not be calling this function from "normal" code * You should probably not be calling this function from "normal" code
* (since you should already know what keys are in your schema). This * (since you should already know what keys are in your schema). This
@ -1952,7 +1956,7 @@ g_settings_get_child (GSettings *settings,
* it. * it.
*/ */
const gchar ** const gchar **
g_settings_list_keys (GSettings *settings) g_settings_list_items (GSettings *settings)
{ {
const GQuark *keys; const GQuark *keys;
const gchar **strv; const gchar **strv;

2
gio/gsettings.h
View File

@ -79,7 +79,7 @@ GSettings * g_settings_new_with_backend (const g
GSettings * g_settings_new_with_backend_and_path (const gchar *schema, GSettings * g_settings_new_with_backend_and_path (const gchar *schema,
GSettingsBackend *backend, GSettingsBackend *backend,
const gchar *path); const gchar *path);
const gchar ** g_settings_list_keys (GSettings *settings); const gchar ** g_settings_list_items (GSettings *settings);
gboolean g_settings_set_value (GSettings *settings, gboolean g_settings_set_value (GSettings *settings,
const gchar *key, const gchar *key,