summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2009-06-15 04:38:34 (GMT)
committerMatthias Clasen <mclasen@redhat.com>2009-06-15 04:38:34 (GMT)
commitb533a944ffc83ad90cd8b6fba00f4e0bebcd0741 (patch)
treef096ead6f428ebc60916bc4b16bd8a96f571adb5
parentce4aa6253eea2b24c0e4a99f9a1d7f31b9cec979 (diff)
downloadglib-b533a944ffc83ad90cd8b6fba00f4e0bebcd0741.tar.gz
glib-b533a944ffc83ad90cd8b6fba00f4e0bebcd0741.tar.xz
Trivial formatting fixes
-rw-r--r--gio/gemblem.c63
1 files changed, 31 insertions, 32 deletions
diff --git a/gio/gemblem.c b/gio/gemblem.c
index 4cd70d3..0272bc7 100644
--- a/gio/gemblem.c
+++ b/gio/gemblem.c
@@ -1,5 +1,5 @@
/* GIO - GLib Input, Output and Streaming Library
- *
+ *
* Copyright (C) 2008 Clemens N. Buss <cebuzz@gmail.com>
*
* This library is free software; you can redistribute it and/or
@@ -16,7 +16,6 @@
* Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
- *
*/
#include <config.h>
@@ -42,9 +41,9 @@
* having an emblem, which is an icon with additional properties.
* It can than be added to a #GEmblemedIcon.
*
- * Currently, only metainformation about the emblem's origin is
+ * Currently, only metainformation about the emblem's origin is
* supported. More may be added in the future.
- **/
+ */
static void g_emblem_iface_init (GIconIface *iface);
@@ -72,13 +71,13 @@ G_DEFINE_TYPE_WITH_CODE (GEmblem, g_emblem, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_ICON, g_emblem_iface_init))
static void
-g_emblem_get_property (GObject *object,
- guint prop_id,
- GValue *value,
+g_emblem_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
GParamSpec *pspec)
{
GEmblem *emblem = G_EMBLEM (object);
-
+
switch (prop_id)
{
case PROP_ICON:
@@ -91,7 +90,7 @@ g_emblem_get_property (GObject *object,
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
- }
+ }
}
static void
@@ -132,19 +131,19 @@ static void
g_emblem_class_init (GEmblemClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
+
gobject_class->finalize = g_emblem_finalize;
gobject_class->set_property = g_emblem_set_property;
gobject_class->get_property = g_emblem_get_property;
- g_object_class_install_property (gobject_class,
+ g_object_class_install_property (gobject_class,
PROP_ORIGIN,
g_param_spec_enum ("origin",
P_("GEmblem's origin"),
P_("Tells which origin the emblem is derived from"),
G_TYPE_EMBLEM_ORIGIN,
G_EMBLEM_ORIGIN_UNKNOWN,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_ICON,
@@ -152,7 +151,7 @@ g_emblem_class_init (GEmblemClass *klass)
P_("The icon of the emblem"),
P_("The actual icon of the emblem"),
G_TYPE_OBJECT,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
@@ -164,13 +163,13 @@ g_emblem_init (GEmblem *emblem)
/**
* g_emblem_new:
* @icon: a GIcon containing the icon.
- *
+ *
* Creates a new emblem for @icon.
- *
+ *
* Returns: a new #GEmblem.
*
* Since: 2.18
- **/
+ */
GEmblem *
g_emblem_new (GIcon *icon)
{
@@ -193,11 +192,11 @@ g_emblem_new (GIcon *icon)
* @origin: a GEmblemOrigin enum defining the emblem's origin
*
* Creates a new emblem for @icon.
- *
+ *
* Returns: a new #GEmblem.
*
* Since: 2.18
- **/
+ */
GEmblem *
g_emblem_new_with_origin (GIcon *icon,
GEmblemOrigin origin)
@@ -218,14 +217,14 @@ g_emblem_new_with_origin (GIcon *icon,
/**
* g_emblem_get_icon:
* @emblem: a #GEmblem from which the icon should be extracted.
- *
+ *
* Gives back the icon from @emblem.
- *
+ *
* Returns: a #GIcon. The returned object belongs to the emblem
* and should not be modified or freed.
*
* Since: 2.18
- **/
+ */
GIcon *
g_emblem_get_icon (GEmblem *emblem)
{
@@ -237,14 +236,14 @@ g_emblem_get_icon (GEmblem *emblem)
/**
* g_emblem_get_origin:
- * @emblem: a #GEmblem
- *
+ * @emblem: a #GEmblem
+ *
* Gets the origin of the emblem.
- *
+ *
* Returns: the origin of the emblem
*
* Since: 2.18
- **/
+ */
GEmblemOrigin
g_emblem_get_origin (GEmblem *emblem)
{
@@ -260,7 +259,7 @@ g_emblem_hash (GIcon *icon)
guint hash;
hash = g_icon_hash (g_emblem_get_icon (emblem));
- hash ^= emblem->origin;
+ hash ^= emblem->origin;
return hash;
}
@@ -271,7 +270,7 @@ g_emblem_equal (GIcon *icon1,
{
GEmblem *emblem1 = G_EMBLEM (icon1);
GEmblem *emblem2 = G_EMBLEM (icon2);
-
+
return emblem1->origin == emblem2->origin &&
g_icon_equal (emblem1->icon, emblem2->icon);
}
@@ -301,7 +300,7 @@ g_emblem_to_tokens (GIcon *icon,
s = g_strdup_printf ("%d", emblem->origin);
g_ptr_array_add (tokens, s);
-
+
return TRUE;
}
@@ -336,17 +335,17 @@ g_emblem_from_tokens (gchar **tokens,
num_tokens);
return NULL;
}
-
+
icon = g_icon_new_for_string (tokens[0], error);
-
+
if (icon == NULL)
return NULL;
origin = atoi (tokens[1]);
-
+
emblem = g_emblem_new_with_origin (icon, origin);
g_object_unref (icon);
-
+
return G_ICON (emblem);
}