projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use g_simple_async_result_{new_,}take_error
[platform/upstream/glib.git]
/
gio
/
gfileicon.c
diff --git
a/gio/gfileicon.c
b/gio/gfileicon.c
index
730d3ba
..
74d75b8
100644
(file)
--- a/
gio/gfileicon.c
+++ b/
gio/gfileicon.c
@@
-31,7
+31,6
@@
#include "gsimpleasyncresult.h"
#include "gioerror.h"
#include "gsimpleasyncresult.h"
#include "gioerror.h"
-#include "gioalias.h"
/**
* SECTION:gfileicon
/**
* SECTION:gfileicon
@@
-142,8
+141,8
@@
g_file_icon_class_init (GFileIconClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_FILE,
g_param_spec_object ("file",
*/
g_object_class_install_property (gobject_class, PROP_FILE,
g_param_spec_object ("file",
- _("file"),
- _("The file containing the icon"),
+
P
_("file"),
+
P
_("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));
}
G_TYPE_FILE,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
}
@@
-159,7
+158,7
@@
g_file_icon_init (GFileIcon *file)
*
* Creates a new icon for a file.
*
*
* Creates a new icon for a file.
*
- * Returns: a #GIcon for the given @file, or %NULL on error.
+ * Returns:
(transfer full):
a #GIcon for the given @file, or %NULL on error.
**/
GIcon *
g_file_icon_new (GFile *file)
**/
GIcon *
g_file_icon_new (GFile *file)
@@
-175,7
+174,7
@@
g_file_icon_new (GFile *file)
*
* Gets the #GFile associated with the given @icon.
*
*
* Gets the #GFile associated with the given @icon.
*
- * Returns: a #GFile, or %NULL.
+ * Returns:
(transfer none):
a #GFile, or %NULL.
**/
GFile *
g_file_icon_get_file (GFileIcon *icon)
**/
GFile *
g_file_icon_get_file (GFileIcon *icon)
@@
-310,11
+309,10
@@
load_async_callback (GObject *source_object,
if (stream == NULL)
{
if (stream == NULL)
{
- simple = g_simple_async_result_new_
from
_error (G_OBJECT (data->icon),
+ simple = g_simple_async_result_new_
take
_error (G_OBJECT (data->icon),
data->callback,
data->user_data,
error);
data->callback,
data->user_data,
error);
- g_error_free (error);
}
else
{
}
else
{
@@
-383,6
+381,3
@@
g_file_icon_loadable_icon_iface_init (GLoadableIconIface *iface)
iface->load_async = g_file_icon_load_async;
iface->load_finish = g_file_icon_load_finish;
}
iface->load_async = g_file_icon_load_async;
iface->load_finish = g_file_icon_load_finish;
}
-
-#define __G_FILE_ICON_C__
-#include "gioaliasdef.c"