AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-18 17:30:10 +00:00
Code Issues Projects Releases Wiki Activity

Some documentation rewording

Browse Source
This commit is contained in:
Matthias Clasen 2014-06-22 16:46:11 -04:00
parent fe6cd7f2a5
commit a44f01c573
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkicontheme.c
View File

@ -70,10 +70,9 @@
* depending on what “icon theme” is selected * depending on what “icon theme” is selected
* by the user. The operation of icon themes on Linux and Unix * by the user. The operation of icon themes on Linux and Unix
* follows the [Icon Theme Specification](http://www.freedesktop.org/Standards/icon-theme-spec) * follows the [Icon Theme Specification](http://www.freedesktop.org/Standards/icon-theme-spec)
* There is a default icon theme, * There is a fallback icon theme, named `hicolor`, where applications
* named `hicolor` where applications should install * should install their icons, but additional icon themes can be installed
* their icons, but more additional application themes can be * as operating system vendors and users choose.
* installed as operating system vendors and users choose.
* *
* Named icons are similar to the deprecated [Stock Items][gtkstock], * Named icons are similar to the deprecated [Stock Items][gtkstock],
* and the distinction between the two may be a bit confusing. * and the distinction between the two may be a bit confusing.
@ -110,8 +109,7 @@
* can create new #GtkIconTheme objects, but it’s much more * can create new #GtkIconTheme objects, but it’s much more
* efficient to use the standard icon theme for the #GdkScreen * efficient to use the standard icon theme for the #GdkScreen
* so that the icon information is shared with other people * so that the icon information is shared with other people
* looking up icons. In the case where the default screen is * looking up icons.
* being used, looking up an icon can be as simple as:
* |[<!-- language="C" --> * |[<!-- language="C" -->
* GError *error = NULL; * GError *error = NULL;
* GtkIconTheme *icon_theme; * GtkIconTheme *icon_theme;
@ -432,9 +430,9 @@ gtk_icon_theme_new (void)
* gtk_icon_theme_get_for_screen(). * gtk_icon_theme_get_for_screen().
* *
* Returns: (transfer none): A unique #GtkIconTheme associated with * Returns: (transfer none): A unique #GtkIconTheme associated with
* the default screen. This icon theme is associated with * the default screen. This icon theme is associated with
* the screen and can be used as long as the screen * the screen and can be used as long as the screen
* is open. Do not ref or unref it. * is open. Do not ref or unref it.
* *
* Since: 2.4 * Since: 2.4
*/ */
@ -863,16 +861,16 @@ gtk_icon_theme_finalize (GObject *object)
* Sets the search path for the icon theme object. When looking * Sets the search path for the icon theme object. When looking
* for an icon theme, GTK+ will search for a subdirectory of * for an icon theme, GTK+ will search for a subdirectory of
* one or more of the directories in @path with the same name * one or more of the directories in @path with the same name
* as the icon theme. (Themes from multiple of the path elements * as the icon theme containing an index.theme file. (Themes from
* are combined to allow themes to be extended by adding icons * multiple of the path elements are combined to allow themes to be
* in the user’s home directory.) * extended by adding icons in the user’s home directory.)
* *
* In addition if an icon found isn’t found either in the current * In addition if an icon found isn’t found either in the current
* icon theme or the default icon theme, and an image file with * icon theme or the default icon theme, and an image file with
* the right name is found directly in one of the elements of * the right name is found directly in one of the elements of
* @path, then that image will be used for the icon name. * @path, then that image will be used for the icon name.
* (This is legacy feature, and new icons should be put * (This is legacy feature, and new icons should be put
* into the default icon theme, which is called hicolor, * into the fallback icon theme, which is called hicolor,
* rather than directly on the icon path.) * rather than directly on the icon path.)
* *
* Since: 2.4 * Since: 2.4
@ -1258,10 +1256,10 @@ load_themes (GtkIconTheme *icon_theme)
if (priv->current_theme) if (priv->current_theme)
insert_theme (icon_theme, priv->current_theme); insert_theme (icon_theme, priv->current_theme);
/* Always look in the gnome and hicolor icon themes. /* Always look in the Adwaita, gnome and hicolor icon themes.
* Looking in hicolor is mandated by the spec, looking * Looking in hicolor is mandated by the spec, looking in Adwaita
* in gnome is a pragmatic solution to prevent missing * and gnome is a pragmatic solution to prevent missing icons in
* icons in GTK+ applications when run under, e.g. KDE. * GTK+ applications when run under, e.g. KDE.
*/ */
insert_theme (icon_theme, "Adwaita"); insert_theme (icon_theme, "Adwaita");
insert_theme (icon_theme, "gnome"); insert_theme (icon_theme, "gnome");