/* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * 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.
- *
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include <stdlib.h>
#include <string.h>
-#include "gioalias.h"
/**
* SECTION:gemblem
* 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);
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:
g_value_set_object (value, emblem->icon);
+ break;
case PROP_ORIGIN:
g_value_set_enum (value, emblem->origin);
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
- }
+ }
}
static void
switch (prop_id)
{
case PROP_ICON:
- emblem->icon = g_value_get_object (value);
+ emblem->icon = g_value_dup_object (value);
break;
case PROP_ORIGIN:
{
GEmblem *emblem = G_EMBLEM (object);
- g_object_unref (emblem->icon);
+ if (emblem->icon)
+ g_object_unref (emblem->icon);
(*G_OBJECT_CLASS (g_emblem_parent_class)->finalize) (object);
}
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,
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));
}
/**
* 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)
{
* @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)
/**
* 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.
+ *
+ * Returns: (transfer none): 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)
{
/**
* g_emblem_get_origin:
- * @emblem: a #GEmblem
- *
+ * @emblem: a #GEmblem
+ *
* Gets the origin of the emblem.
- *
- * Returns: the origin of the emblem
+ *
+ * Returns: (transfer none): the origin of the emblem
*
* Since: 2.18
- **/
+ */
GEmblemOrigin
g_emblem_get_origin (GEmblem *emblem)
{
guint hash;
hash = g_icon_hash (g_emblem_get_icon (emblem));
- hash ^= emblem->origin;
+ hash ^= emblem->origin;
return hash;
}
{
GEmblem *emblem1 = G_EMBLEM (icon1);
GEmblem *emblem2 = G_EMBLEM (icon2);
-
+
return emblem1->origin == emblem2->origin &&
g_icon_equal (emblem1->icon, emblem2->icon);
}
s = g_strdup_printf ("%d", emblem->origin);
g_ptr_array_add (tokens, s);
-
+
return TRUE;
}
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);
}
+static GVariant *
+g_emblem_serialize (GIcon *icon)
+{
+ GEmblem *emblem = G_EMBLEM (icon);
+ GVariant *icon_data;
+ GEnumValue *origin;
+ GVariant *result;
+
+ icon_data = g_icon_serialize (emblem->icon);
+ if (!icon_data)
+ return NULL;
+
+ origin = g_enum_get_value (g_type_class_peek (G_TYPE_EMBLEM_ORIGIN), emblem->origin);
+ result = g_variant_new_parsed ("('emblem', <(%v, {'origin': <%s>})>)",
+ icon_data, origin ? origin->value_nick : "unknown");
+ g_variant_unref (icon_data);
+
+ return result;
+}
+
static void
g_emblem_iface_init (GIconIface *iface)
{
iface->equal = g_emblem_equal;
iface->to_tokens = g_emblem_to_tokens;
iface->from_tokens = g_emblem_from_tokens;
+ iface->serialize = g_emblem_serialize;
}
-
-#define __G_EMBLEM_C__
-#include "gioaliasdef.c"