projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdbus-tool: simplify some logic
[platform/upstream/glib.git]
/
gio
/
gbytesicon.c
diff --git
a/gio/gbytesicon.c
b/gio/gbytesicon.c
index
2f4b557
..
413e8bd
100644
(file)
--- a/
gio/gbytesicon.c
+++ b/
gio/gbytesicon.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* 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/>.
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
@@
-34,7
+32,7
@@
/**
* SECTION:gbytesicon
/**
* SECTION:gbytesicon
- * @short_description: An icon stored in memory as a
#
GBytes
+ * @short_description: An icon stored in memory as a GBytes
* @include: gio/gio.h
* @see_also: #GIcon, #GLoadableIcon, #GBytes
*
* @include: gio/gio.h
* @see_also: #GIcon, #GLoadableIcon, #GBytes
*
@@
-110,7
+108,7
@@
g_bytes_icon_finalize (GObject *object)
icon = G_BYTES_ICON (object);
icon = G_BYTES_ICON (object);
- g_
object
_unref (icon->bytes);
+ g_
bytes
_unref (icon->bytes);
G_OBJECT_CLASS (g_bytes_icon_parent_class)->finalize (object);
}
G_OBJECT_CLASS (g_bytes_icon_parent_class)->finalize (object);
}
@@
-189,7
+187,7
@@
g_bytes_icon_hash (GIcon *icon)
static gboolean
g_bytes_icon_equal (GIcon *icon1,
static gboolean
g_bytes_icon_equal (GIcon *icon1,
- GIcon *icon2)
+
GIcon *icon2)
{
GBytesIcon *bytes1 = G_BYTES_ICON (icon1);
GBytesIcon *bytes2 = G_BYTES_ICON (icon2);
{
GBytesIcon *bytes1 = G_BYTES_ICON (icon1);
GBytesIcon *bytes2 = G_BYTES_ICON (icon2);
@@
-197,11
+195,21
@@
g_bytes_icon_equal (GIcon *icon1,
return g_bytes_equal (bytes1->bytes, bytes2->bytes);
}
return g_bytes_equal (bytes1->bytes, bytes2->bytes);
}
+static GVariant *
+g_bytes_icon_serialize (GIcon *icon)
+{
+ GBytesIcon *bytes_icon = G_BYTES_ICON (icon);
+
+ return g_variant_new ("(sv)", "bytes",
+ g_variant_new_from_bytes (G_VARIANT_TYPE_BYTESTRING, bytes_icon->bytes, TRUE));
+}
+
static void
g_bytes_icon_icon_iface_init (GIconIface *iface)
{
iface->hash = g_bytes_icon_hash;
iface->equal = g_bytes_icon_equal;
static void
g_bytes_icon_icon_iface_init (GIconIface *iface)
{
iface->hash = g_bytes_icon_hash;
iface->equal = g_bytes_icon_equal;
+ iface->serialize = g_bytes_icon_serialize;
}
static GInputStream *
}
static GInputStream *
@@
-213,6
+221,9
@@
g_bytes_icon_load (GLoadableIcon *icon,
{
GBytesIcon *bytes_icon = G_BYTES_ICON (icon);
{
GBytesIcon *bytes_icon = G_BYTES_ICON (icon);
+ if (type)
+ *type = NULL;
+
return g_memory_input_stream_new_from_bytes (bytes_icon->bytes);
}
return g_memory_input_stream_new_from_bytes (bytes_icon->bytes);
}
@@
-228,6
+239,7
@@
g_bytes_icon_load_async (GLoadableIcon *icon,
task = g_task_new (icon, cancellable, callback, user_data);
g_task_return_pointer (task, g_memory_input_stream_new_from_bytes (bytes_icon->bytes), g_object_unref);
task = g_task_new (icon, cancellable, callback, user_data);
g_task_return_pointer (task, g_memory_input_stream_new_from_bytes (bytes_icon->bytes), g_object_unref);
+ g_object_unref (task);
}
static GInputStream *
}
static GInputStream *