callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitespace fixes

Browse Source
This commit is contained in:
Matthias Clasen 2009-09-20 22:53:58 -04:00
parent 5ed8cf50b8
commit 508a44a0df
1 changed files with 230 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
gtk/gtkiconfactory.c
View File

@ -176,7 +176,7 @@ gtk_icon_factory_finalize (GObject *object)
* themes to override the icons for the application. * themes to override the icons for the application.
* *
* Return value: a new #GtkIconFactory * Return value: a new #GtkIconFactory
**/ */
GtkIconFactory* GtkIconFactory*
gtk_icon_factory_new (void) gtk_icon_factory_new (void)
{ {
@ -199,8 +199,7 @@ gtk_icon_factory_new (void)
* override your application's default icons. If an icon already * override your application's default icons. If an icon already
* existed in @factory for @stock_id, it is unreferenced and replaced * existed in @factory for @stock_id, it is unreferenced and replaced
* with the new @icon_set. * with the new @icon_set.
* */
**/
void void
gtk_icon_factory_add (GtkIconFactory *factory, gtk_icon_factory_add (GtkIconFactory *factory,
const gchar *stock_id, const gchar *stock_id,
@ -243,7 +242,7 @@ gtk_icon_factory_add (GtkIconFactory *factory,
* function directly, so that themes are taken into account. * function directly, so that themes are taken into account.
* *
* Return value: icon set of @stock_id. * Return value: icon set of @stock_id.
**/ */
GtkIconSet * GtkIconSet *
gtk_icon_factory_lookup (GtkIconFactory *factory, gtk_icon_factory_lookup (GtkIconFactory *factory,
const gchar *stock_id) const gchar *stock_id)
@ -267,8 +266,7 @@ static GSList *default_factories = NULL;
* There will normally be an icon factory added for each library or * There will normally be an icon factory added for each library or
* application that comes with icons. The default icon factories * application that comes with icons. The default icon factories
* can be overridden by themes. * can be overridden by themes.
* */
**/
void void
gtk_icon_factory_add_default (GtkIconFactory *factory) gtk_icon_factory_add_default (GtkIconFactory *factory)
{ {
@ -286,8 +284,7 @@ gtk_icon_factory_add_default (GtkIconFactory *factory)
* Removes an icon factory from the list of default icon * Removes an icon factory from the list of default icon
* factories. Not normally used; you might use it for a library that * factories. Not normally used; you might use it for a library that
* can be unloaded or shut down. * can be unloaded or shut down.
* */
**/
void void
gtk_icon_factory_remove_default (GtkIconFactory *factory) gtk_icon_factory_remove_default (GtkIconFactory *factory)
{ {
@ -319,9 +316,8 @@ _gtk_icon_factory_ensure_default_icons (void)
* using this function directly, so that themes are taken into * using this function directly, so that themes are taken into
* account. * account.
* *
*
* Return value: a #GtkIconSet, or %NULL * Return value: a #GtkIconSet, or %NULL
**/ */
GtkIconSet * GtkIconSet *
gtk_icon_factory_lookup_default (const gchar *stock_id) gtk_icon_factory_lookup_default (const gchar *stock_id)
{ {
@ -874,7 +870,6 @@ icon_size_lookup_intern (GtkSettings *settings,
{ {
gboolean initial = FALSE; gboolean initial = FALSE;
settings_sizes = get_settings_sizes (settings, &initial);
if (initial) if (initial)
icon_sizes_init_for_settings (settings); icon_sizes_init_for_settings (settings);
@ -920,7 +915,7 @@ icon_size_lookup_intern (GtkSettings *settings,
* Return value: %TRUE if @size was a valid size * Return value: %TRUE if @size was a valid size
* *
* Since: 2.2 * Since: 2.2
**/ */
gboolean gboolean
gtk_icon_size_lookup_for_settings (GtkSettings *settings, gtk_icon_size_lookup_for_settings (GtkSettings *settings,
GtkIconSize size, GtkIconSize size,
@ -951,7 +946,7 @@ gtk_icon_size_lookup_for_settings (GtkSettings *settings,
* the usual size. * the usual size.
* *
* Return value: %TRUE if @size was a valid size * Return value: %TRUE if @size was a valid size
**/ */
gboolean gboolean
gtk_icon_size_lookup (GtkIconSize size, gtk_icon_size_lookup (GtkIconSize size,
gint *widthp, gint *widthp,
@ -1018,8 +1013,7 @@ icon_size_register_intern (const gchar *name,
* etc. Returns the integer value for the size. * etc. Returns the integer value for the size.
* *
* Returns: integer value representing the size * Returns: integer value representing the size
* */
**/
GtkIconSize GtkIconSize
gtk_icon_size_register (const gchar *name, gtk_icon_size_register (const gchar *name,
gint width, gint width,
@ -1040,8 +1034,7 @@ gtk_icon_size_register (const gchar *name,
* Registers @alias as another name for @target. * Registers @alias as another name for @target.
* So calling gtk_icon_size_from_name() with @alias as argument * So calling gtk_icon_size_from_name() with @alias as argument
* will return @target. * will return @target.
* */
**/
void void
gtk_icon_size_register_alias (const gchar *alias, gtk_icon_size_register_alias (const gchar *alias,
GtkIconSize target) GtkIconSize target)
@ -1083,7 +1076,7 @@ gtk_icon_size_register_alias (const gchar *alias,
* @returns: the icon size with the given name. * @returns: the icon size with the given name.
* *
* Looks up the icon size associated with @name. * Looks up the icon size associated with @name.
**/ */
GtkIconSize GtkIconSize
gtk_icon_size_from_name (const gchar *name) gtk_icon_size_from_name (const gchar *name)
{ {
@ -1106,7 +1099,7 @@ gtk_icon_size_from_name (const gchar *name)
* *
* Gets the canonical name of the given icon size. The returned string * Gets the canonical name of the given icon size. The returned string
* is statically allocated and should not be freed. * is statically allocated and should not be freed.
**/ */
G_CONST_RETURN gchar* G_CONST_RETURN gchar*
gtk_icon_size_get_name (GtkIconSize size) gtk_icon_size_get_name (GtkIconSize size)
{ {
@ -1176,7 +1169,7 @@ static guint cache_serial = 0;
* a #GtkIconFactory. * a #GtkIconFactory.
* *
* Return value: a new #GtkIconSet * Return value: a new #GtkIconSet
**/ */
GtkIconSet* GtkIconSet*
gtk_icon_set_new (void) gtk_icon_set_new (void)
{ {
@ -1204,7 +1197,7 @@ gtk_icon_set_new (void)
* or make the icon look insensitive/prelighted. * or make the icon look insensitive/prelighted.
* *
* Return value: a new #GtkIconSet * Return value: a new #GtkIconSet
**/ */
GtkIconSet * GtkIconSet *
gtk_icon_set_new_from_pixbuf (GdkPixbuf *pixbuf) gtk_icon_set_new_from_pixbuf (GdkPixbuf *pixbuf)
{ {
@ -1231,7 +1224,7 @@ gtk_icon_set_new_from_pixbuf (GdkPixbuf *pixbuf)
* Increments the reference count on @icon_set. * Increments the reference count on @icon_set.
* *
* Return value: @icon_set. * Return value: @icon_set.
**/ */
GtkIconSet* GtkIconSet*
gtk_icon_set_ref (GtkIconSet *icon_set) gtk_icon_set_ref (GtkIconSet *icon_set)
{ {
@ -1249,7 +1242,7 @@ gtk_icon_set_ref (GtkIconSet *icon_set)
* *
* Decrements the reference count on @icon_set, and frees memory * Decrements the reference count on @icon_set, and frees memory
* if the reference count reaches 0. * if the reference count reaches 0.
**/ */
void void
gtk_icon_set_unref (GtkIconSet *icon_set) gtk_icon_set_unref (GtkIconSet *icon_set)
{ {
@ -1452,8 +1445,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source,
{ {
if (size == (GtkIconSize)-1) if (size == (GtkIconSize)-1)
{ {
/* Find an available size close to 48 /* Find an available size close to 48 */
*/
sizes = gtk_icon_theme_get_icon_sizes (icon_theme, icon_source->source.icon_name); sizes = gtk_icon_theme_get_icon_sizes (icon_theme, icon_source->source.icon_name);
dist = 1000; dist = 1000;
width = height = 48; width = height = 48;
@ -1646,7 +1638,7 @@ render_fallback_image (GtkStyle *style,
* image" icon will be returned instead. * image" icon will be returned instead.
* *
* Return value: a #GdkPixbuf to be displayed * Return value: a #GdkPixbuf to be displayed
**/ */
GdkPixbuf* GdkPixbuf*
gtk_icon_set_render_icon (GtkIconSet *icon_set, gtk_icon_set_render_icon (GtkIconSet *icon_set,
GtkStyle *style, GtkStyle *style,
@ -1746,10 +1738,9 @@ icon_source_compare (gconstpointer ap, gconstpointer bp)
* *
* gtk_icon_set_new_from_pixbuf() creates a new icon set with a * gtk_icon_set_new_from_pixbuf() creates a new icon set with a
* default icon source based on the given pixbuf. * default icon source based on the given pixbuf.
* */
**/
void void
gtk_icon_set_add_source (GtkIconSet *icon_set, gtk_icon_set_add_source (GtkIconSet *icon_set,
const GtkIconSource *source) const GtkIconSource *source)
{ {
g_return_if_fail (icon_set != NULL); g_return_if_fail (icon_set != NULL);
@ -1774,8 +1765,7 @@ gtk_icon_set_add_source (GtkIconSet *icon_set,
* *
* Obtains a list of icon sizes this icon set can render. The returned * Obtains a list of icon sizes this icon set can render. The returned
* array must be freed with g_free(). * array must be freed with g_free().
* */
**/
void void
gtk_icon_set_get_sizes (GtkIconSet *icon_set, gtk_icon_set_get_sizes (GtkIconSet *icon_set,
GtkIconSize **sizes, GtkIconSize **sizes,
@ -1879,7 +1869,7 @@ gtk_icon_set_get_sizes (GtkIconSet *icon_set,
* direction, widget state, or icon size. * direction, widget state, or icon size.
* *
* Return value: a new #GtkIconSource * Return value: a new #GtkIconSource
**/ */
GtkIconSource* GtkIconSource*
gtk_icon_source_new (void) gtk_icon_source_new (void)
{ {
@ -1905,7 +1895,7 @@ gtk_icon_source_new (void)
* Creates a copy of @source; mostly useful for language bindings. * Creates a copy of @source; mostly useful for language bindings.
* *
* Return value: a new #GtkIconSource * Return value: a new #GtkIconSource
**/ */
GtkIconSource* GtkIconSource*
gtk_icon_source_copy (const GtkIconSource *source) gtk_icon_source_copy (const GtkIconSource *source)
{ {
@ -1949,7 +1939,7 @@ gtk_icon_source_copy (const GtkIconSource *source)
* *
* Frees a dynamically-allocated icon source, along with its * Frees a dynamically-allocated icon source, along with its
* filename, size, and pixbuf fields if those are not %NULL. * filename, size, and pixbuf fields if those are not %NULL.
**/ */
void void
gtk_icon_source_free (GtkIconSource *source) gtk_icon_source_free (GtkIconSource *source)
{ {
@ -2014,7 +2004,7 @@ icon_source_clear (GtkIconSource *source)
* *
* Sets the name of an image file to use as a base image when creating * Sets the name of an image file to use as a base image when creating
* icon variants for #GtkIconSet. The filename must be absolute. * icon variants for #GtkIconSet. The filename must be absolute.
**/ */
void void
gtk_icon_source_set_filename (GtkIconSource *source, gtk_icon_source_set_filename (GtkIconSource *source,
const gchar *filename) const gchar *filename)
@ -2045,7 +2035,7 @@ gtk_icon_source_set_filename (GtkIconSource *source,
* *
* Sets the name of an icon to look up in the current icon theme * Sets the name of an icon to look up in the current icon theme
* to use as a base image when creating icon variants for #GtkIconSet. * to use as a base image when creating icon variants for #GtkIconSet.
**/ */
void void
gtk_icon_source_set_icon_name (GtkIconSource *source, gtk_icon_source_set_icon_name (GtkIconSource *source,
const gchar *icon_name) const gchar *icon_name)
@ -2072,7 +2062,7 @@ gtk_icon_source_set_icon_name (GtkIconSource *source,
* *
* Sets a pixbuf to use as a base image when creating icon variants * Sets a pixbuf to use as a base image when creating icon variants
* for #GtkIconSet. * for #GtkIconSet.
**/ */
void void
gtk_icon_source_set_pixbuf (GtkIconSource *source, gtk_icon_source_set_pixbuf (GtkIconSource *source,
GdkPixbuf *pixbuf) GdkPixbuf *pixbuf)
@ -2103,7 +2093,7 @@ gtk_icon_source_set_pixbuf (GtkIconSource *source,
* *
* Return value: image filename. This string must not be modified * Return value: image filename. This string must not be modified
* or freed. * or freed.
**/ */
G_CONST_RETURN gchar* G_CONST_RETURN gchar*
gtk_icon_source_get_filename (const GtkIconSource *source) gtk_icon_source_get_filename (const GtkIconSource *source)
{ {
@ -2124,7 +2114,7 @@ gtk_icon_source_get_filename (const GtkIconSource *source)
* persist beyond the lifetime of the icon source. * persist beyond the lifetime of the icon source.
* *
* Return value: icon name. This string must not be modified or freed. * Return value: icon name. This string must not be modified or freed.
**/ */
G_CONST_RETURN gchar* G_CONST_RETURN gchar*
gtk_icon_source_get_icon_name (const GtkIconSource *source) gtk_icon_source_get_icon_name (const GtkIconSource *source)
{ {
@ -2150,7 +2140,7 @@ gtk_icon_source_get_icon_name (const GtkIconSource *source)
* not incremented. * not incremented.
* *
* Return value: source pixbuf * Return value: source pixbuf
**/ */
GdkPixbuf* GdkPixbuf*
gtk_icon_source_get_pixbuf (const GtkIconSource *source) gtk_icon_source_get_pixbuf (const GtkIconSource *source)
{ {
@ -2178,8 +2168,7 @@ gtk_icon_source_get_pixbuf (const GtkIconSource *source)
* *
* #GtkIconSet prefers non-wildcarded sources (exact matches) over * #GtkIconSet prefers non-wildcarded sources (exact matches) over
* wildcarded sources, and will use an exact match when possible. * wildcarded sources, and will use an exact match when possible.
* */
**/
void void
gtk_icon_source_set_direction_wildcarded (GtkIconSource *source, gtk_icon_source_set_direction_wildcarded (GtkIconSource *source,
gboolean setting) gboolean setting)
@ -2207,7 +2196,7 @@ gtk_icon_source_set_direction_wildcarded (GtkIconSource *source,
* produce an appropriate icon for a given state, for example * produce an appropriate icon for a given state, for example
* lightening an image on prelight, but will not modify source images * lightening an image on prelight, but will not modify source images
* that match exactly. * that match exactly.
**/ */
void void
gtk_icon_source_set_state_wildcarded (GtkIconSource *source, gtk_icon_source_set_state_wildcarded (GtkIconSource *source,
gboolean setting) gboolean setting)
@ -2235,7 +2224,7 @@ gtk_icon_source_set_state_wildcarded (GtkIconSource *source,
* #GtkIconSet will normally scale wildcarded source images to produce * #GtkIconSet will normally scale wildcarded source images to produce
* an appropriate icon at a given size, but will not change the size * an appropriate icon at a given size, but will not change the size
* of source images that match exactly. * of source images that match exactly.
**/ */
void void
gtk_icon_source_set_size_wildcarded (GtkIconSource *source, gtk_icon_source_set_size_wildcarded (GtkIconSource *source,
gboolean setting) gboolean setting)
@ -2252,7 +2241,7 @@ gtk_icon_source_set_size_wildcarded (GtkIconSource *source,
* Gets the value set by gtk_icon_source_set_size_wildcarded(). * Gets the value set by gtk_icon_source_set_size_wildcarded().
* *
* Return value: %TRUE if this icon source is a base for any icon size variant * Return value: %TRUE if this icon source is a base for any icon size variant
**/ */
gboolean gboolean
gtk_icon_source_get_size_wildcarded (const GtkIconSource *source) gtk_icon_source_get_size_wildcarded (const GtkIconSource *source)
{ {
@ -2268,7 +2257,7 @@ gtk_icon_source_get_size_wildcarded (const GtkIconSource *source)
* Gets the value set by gtk_icon_source_set_state_wildcarded(). * Gets the value set by gtk_icon_source_set_state_wildcarded().
* *
* Return value: %TRUE if this icon source is a base for any widget state variant * Return value: %TRUE if this icon source is a base for any widget state variant
**/ */
gboolean gboolean
gtk_icon_source_get_state_wildcarded (const GtkIconSource *source) gtk_icon_source_get_state_wildcarded (const GtkIconSource *source)
{ {
@ -2284,7 +2273,7 @@ gtk_icon_source_get_state_wildcarded (const GtkIconSource *source)
* Gets the value set by gtk_icon_source_set_direction_wildcarded(). * Gets the value set by gtk_icon_source_set_direction_wildcarded().
* *
* Return value: %TRUE if this icon source is a base for any text direction variant * Return value: %TRUE if this icon source is a base for any text direction variant
**/ */
gboolean gboolean
gtk_icon_source_get_direction_wildcarded (const GtkIconSource *source) gtk_icon_source_get_direction_wildcarded (const GtkIconSource *source)
{ {
@ -2305,8 +2294,7 @@ gtk_icon_source_get_direction_wildcarded (const GtkIconSource *source)
* if the text direction is wildcarded. Therefore, you should usually * if the text direction is wildcarded. Therefore, you should usually
* call gtk_icon_source_set_direction_wildcarded() to un-wildcard it * call gtk_icon_source_set_direction_wildcarded() to un-wildcard it
* in addition to calling this function. * in addition to calling this function.
* */
**/
void void
gtk_icon_source_set_direction (GtkIconSource *source, gtk_icon_source_set_direction (GtkIconSource *source,
GtkTextDirection direction) GtkTextDirection direction)
@ -2328,8 +2316,7 @@ gtk_icon_source_set_direction (GtkIconSource *source,
* if the state is wildcarded. Therefore, you should usually * if the state is wildcarded. Therefore, you should usually
* call gtk_icon_source_set_state_wildcarded() to un-wildcard it * call gtk_icon_source_set_state_wildcarded() to un-wildcard it
* in addition to calling this function. * in addition to calling this function.
* */
**/
void void
gtk_icon_source_set_state (GtkIconSource *source, gtk_icon_source_set_state (GtkIconSource *source,
GtkStateType state) GtkStateType state)
@ -2351,8 +2338,7 @@ gtk_icon_source_set_state (GtkIconSource *source,
* if the size is wildcarded. Therefore, you should usually * if the size is wildcarded. Therefore, you should usually
* call gtk_icon_source_set_size_wildcarded() to un-wildcard it * call gtk_icon_source_set_size_wildcarded() to un-wildcard it
* in addition to calling this function. * in addition to calling this function.
* */
**/
void void
gtk_icon_source_set_size (GtkIconSource *source, gtk_icon_source_set_size (GtkIconSource *source,
GtkIconSize size) GtkIconSize size)
@ -2371,7 +2357,7 @@ gtk_icon_source_set_size (GtkIconSource *source,
* wildcarded. * wildcarded.
* *
* Return value: text direction this source matches * Return value: text direction this source matches
**/ */
GtkTextDirection GtkTextDirection
gtk_icon_source_get_direction (const GtkIconSource *source) gtk_icon_source_get_direction (const GtkIconSource *source)
{ {
@ -2389,7 +2375,7 @@ gtk_icon_source_get_direction (const GtkIconSource *source)
* wildcarded. * wildcarded.
* *
* Return value: widget state this source matches * Return value: widget state this source matches
**/ */
GtkStateType GtkStateType
gtk_icon_source_get_state (const GtkIconSource *source) gtk_icon_source_get_state (const GtkIconSource *source)
{ {
@ -2406,7 +2392,7 @@ gtk_icon_source_get_state (const GtkIconSource *source)
* is only useful/meaningful if the icon size is <emphasis>not</emphasis> wildcarded. * is only useful/meaningful if the icon size is <emphasis>not</emphasis> wildcarded.
* *
* Return value: icon size this source matches. * Return value: icon size this source matches.
**/ */
GtkIconSize GtkIconSize
gtk_icon_source_get_size (const GtkIconSource *source) gtk_icon_source_get_size (const GtkIconSource *source)
{ {
@ -2703,7 +2689,7 @@ _gtk_icon_set_invalidate_caches (void)
* The list itself should be freed. * The list itself should be freed.
* *
* Return value: List of ids in icon factories * Return value: List of ids in icon factories
**/ */
GList* GList*
_gtk_icon_factory_list_ids (void) _gtk_icon_factory_list_ids (void)
{ {