luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

New functions. (g_file_icon_class_init): Hook them up. Install

Browse Source 
2008-08-07  Paul Pogonyshev  <pogonyshev@gmx.net>

	* gfileicon.c (g_file_icon_get_property)
	(g_file_icon_set_property): New functions.
	(g_file_icon_class_init): Hook them up.  Install `GFileIcon:file'
	property.
	(g_file_icon_new): Use the property (bug #546132).

svn path=/trunk/; revision=7318
This commit is contained in:
Paul Pogonyshev 2008-08-07 19:44:53 +00:00 committed by Paul Pogonyshev
parent c13b9d5d63
commit 3512e4f63d
2 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/ChangeLog
View File

@ -1,3 +1,11 @@
2008-08-07 Paul Pogonyshev <pogonyshev@gmx.net>
* gfileicon.c (g_file_icon_get_property)
(g_file_icon_set_property): New functions.
(g_file_icon_class_init): Hook them up. Install `GFileIcon:file'
property.
(g_file_icon_new): Use the property (bug #546132).
2008-08-06 Paul Pogonyshev <pogonyshev@gmx.net>
* gthemedicon.c (g_themed_icon_get_property): Also handle

66
gio/gfileicon.c
View File

@ -25,6 +25,7 @@
#include "gfileicon.h"
#include "gfile.h"
#include "gicon.h"
#include "glibintl.h"
#include "gloadableicon.h"
#include "ginputstream.h"
#include "gsimpleasyncresult.h"
@ -62,12 +63,56 @@ struct _GFileIconClass
GObjectClass parent_class;
};
enum
{
PROP_0,
PROP_FILE
};
G_DEFINE_TYPE_WITH_CODE (GFileIcon, g_file_icon, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_ICON,
g_file_icon_icon_iface_init)
G_IMPLEMENT_INTERFACE (G_TYPE_LOADABLE_ICON,
g_file_icon_loadable_icon_iface_init))
static void
g_file_icon_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GFileIcon *icon = G_FILE_ICON (object);
switch (prop_id)
{
case PROP_FILE:
g_value_set_object (value, icon->file);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
g_file_icon_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
GFileIcon *icon = G_FILE_ICON (object);
switch (prop_id)
{
case PROP_FILE:
icon->file = G_FILE (g_value_dup_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
g_file_icon_finalize (GObject *object)
{
@ -85,7 +130,21 @@ g_file_icon_class_init (GFileIconClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = g_file_icon_get_property;
gobject_class->set_property = g_file_icon_set_property;
gobject_class->finalize = g_file_icon_finalize;
/**
* GFileIcon:file:
*
* The file containing the icon.
*/
g_object_class_install_property (gobject_class, PROP_FILE,
g_param_spec_object ("file",
_("file"),
_("The file containing the icon"),
G_TYPE_FILE,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
}
static void
@ -104,14 +163,9 @@ g_file_icon_init (GFileIcon *file)
GIcon *
g_file_icon_new (GFile *file)
{
GFileIcon *icon;
g_return_val_if_fail (G_IS_FILE (file), NULL);
icon = g_object_new (G_TYPE_FILE_ICON, NULL);
icon->file = g_object_ref (file);
return G_ICON (icon);
return G_ICON (g_object_new (G_TYPE_FILE_ICON, "file", file, NULL));
}
/**