summaryrefslogtreecommitdiff
path: root/gtk/gtksettings.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-04-19 16:26:25 -0400
committerMatthias Clasen <mclasen@redhat.com>2020-04-19 16:26:25 -0400
commite91907d427b6eb4ee659bbd57376cff769aca1ee (patch)
tree0d307f7db00dd1d5931441b275af30ef1c0a9599 /gtk/gtksettings.c
parentdbf12d87a1b9d27d8fe98fa8db7d3110a26918db (diff)
downloadgtk+-e91907d427b6eb4ee659bbd57376cff769aca1ee.tar.gz
Docs: Various tweaks
Tweak the docs for library initialization, versioning and settings, and remove some outdated information.
Diffstat (limited to 'gtk/gtksettings.c')
-rw-r--r--gtk/gtksettings.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 6ce91b34b1..c6b9634213 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -74,14 +74,16 @@
* On the X window system, this sharing is realized by an
* [XSettings](http://www.freedesktop.org/wiki/Specifications/xsettings-spec)
* manager that is usually part of the desktop environment, along with
- * utilities that let the user change these settings. In the absence of
- * an Xsettings manager, GTK reads default values for settings from
- * `settings.ini` files in
- * `/etc/gtk-4.0`, `$XDG_CONFIG_DIRS/gtk-4.0`
- * and `$XDG_CONFIG_HOME/gtk-4.0`.
- * These files must be valid key files (see #GKeyFile), and have
- * a section called Settings. Themes can also provide default values
- * for settings by installing a `settings.ini` file
+ * utilities that let the user change these settings.
+ *
+ * On Wayland, the settings are obtained either via a settings portal,
+ * or by reading desktop settings from DConf.
+ *
+ * In the absence of these sharing mechanisms, GTK reads default values for
+ * settings from `settings.ini` files in `/etc/gtk-4.0`, `$XDG_CONFIG_DIRS/gtk-4.0`
+ * and `$XDG_CONFIG_HOME/gtk-4.0`. These files must be valid key files (see
+ * #GKeyFile), and have a section called Settings. Themes can also provide
+ * default values for settings by installing a `settings.ini` file
* next to their `gtk.css` file.
*
* Applications can override system-wide settings by setting the property
@@ -91,8 +93,7 @@
*
* There is one GtkSettings instance per display. It can be obtained with
* gtk_settings_get_for_display(), but in many cases, it is more convenient
- * to use gtk_widget_get_settings(). gtk_settings_get_default() returns the
- * GtkSettings instance for the default display.
+ * to use gtk_widget_get_settings().
*/