summaryrefslogtreecommitdiff
path: root/gobject/gvaluetypes.c
diff options
context:
space:
mode:
Diffstat (limited to 'gobject/gvaluetypes.c')
-rw-r--r--gobject/gvaluetypes.c395
1 files changed, 157 insertions, 238 deletions
diff --git a/gobject/gvaluetypes.c b/gobject/gvaluetypes.c
index 1e8ae92cd..d148f03b9 100644
--- a/gobject/gvaluetypes.c
+++ b/gobject/gvaluetypes.c
@@ -1,5 +1,5 @@
/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997, 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
+ * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,27 +25,28 @@
#include "gvaluecollector.h"
#include <string.h>
+#include <stdlib.h> /* qsort() */
/* --- value functions --- */
static void
-value_long0_init (GValue *value)
+value_init_long0 (GValue *value)
{
value->data[0].v_long = 0;
}
static void
-value_long0_copy (const GValue *src_value,
+value_copy_long0 (const GValue *src_value,
GValue *dest_value)
{
dest_value->data[0].v_long = src_value->data[0].v_long;
}
static gchar*
-value_char_lcopy_value (const GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_lcopy_char (const GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
gint8 *int8_p = collect_values[0].v_pointer;
@@ -58,10 +59,10 @@ value_char_lcopy_value (const GValue *value,
}
static gchar*
-value_boolean_lcopy_value (const GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_lcopy_boolean (const GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
gboolean *bool_p = collect_values[0].v_pointer;
@@ -74,10 +75,10 @@ value_boolean_lcopy_value (const GValue *value,
}
static gchar*
-value_int_collect_value (GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_collect_int (GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
value->data[0].v_int = collect_values[0].v_int;
@@ -85,10 +86,10 @@ value_int_collect_value (GValue *value,
}
static gchar*
-value_int_lcopy_value (const GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_lcopy_int (const GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
gint *int_p = collect_values[0].v_pointer;
@@ -101,10 +102,10 @@ value_int_lcopy_value (const GValue *value,
}
static gchar*
-value_long_collect_value (GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_collect_long (GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
value->data[0].v_long = collect_values[0].v_long;
@@ -112,10 +113,10 @@ value_long_collect_value (GValue *value,
}
static gchar*
-value_long_lcopy_value (const GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_lcopy_long (const GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
glong *long_p = collect_values[0].v_pointer;
@@ -128,23 +129,23 @@ value_long_lcopy_value (const GValue *value,
}
static void
-value_float_init (GValue *value)
+value_init_float (GValue *value)
{
value->data[0].v_float = 0.0;
}
static void
-value_float_copy (const GValue *src_value,
+value_copy_float (const GValue *src_value,
GValue *dest_value)
{
dest_value->data[0].v_float = src_value->data[0].v_float;
}
static gchar*
-value_float_collect_value (GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_collect_float (GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
value->data[0].v_float = collect_values[0].v_double;
@@ -152,10 +153,10 @@ value_float_collect_value (GValue *value,
}
static gchar*
-value_float_lcopy_value (const GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_lcopy_float (const GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
gfloat *float_p = collect_values[0].v_pointer;
@@ -168,23 +169,23 @@ value_float_lcopy_value (const GValue *value,
}
static void
-value_double_init (GValue *value)
+value_init_double (GValue *value)
{
value->data[0].v_double = 0.0;
}
static void
-value_double_copy (const GValue *src_value,
+value_copy_double (const GValue *src_value,
GValue *dest_value)
{
dest_value->data[0].v_double = src_value->data[0].v_double;
}
static gchar*
-value_double_collect_value (GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_collect_double (GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
value->data[0].v_double = collect_values[0].v_double;
@@ -192,10 +193,10 @@ value_double_collect_value (GValue *value,
}
static gchar*
-value_double_lcopy_value (const GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_lcopy_double (const GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
gdouble *double_p = collect_values[0].v_pointer;
@@ -208,30 +209,30 @@ value_double_lcopy_value (const GValue *value,
}
static void
-value_string_init (GValue *value)
+value_init_string (GValue *value)
{
value->data[0].v_pointer = NULL;
}
static void
-value_string_free_value (GValue *value)
+value_free_string (GValue *value)
{
if (!(value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS))
g_free (value->data[0].v_pointer);
}
static void
-value_string_copy_value (const GValue *src_value,
- GValue *dest_value)
+value_copy_string (const GValue *src_value,
+ GValue *dest_value)
{
dest_value->data[0].v_pointer = g_strdup (src_value->data[0].v_pointer);
}
static gchar*
-value_string_collect_value (GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_collect_string (GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
if (!collect_values[0].v_pointer)
value->data[0].v_pointer = NULL;
@@ -247,10 +248,10 @@ value_string_collect_value (GValue *value,
}
static gchar*
-value_string_lcopy_value (const GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_lcopy_string (const GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
gchar **string_p = collect_values[0].v_pointer;
@@ -268,29 +269,29 @@ value_string_lcopy_value (const GValue *value,
}
static void
-value_pointer_init (GValue *value)
+value_init_pointer (GValue *value)
{
value->data[0].v_pointer = NULL;
}
static void
-value_pointer_copy (const GValue *src_value,
+value_copy_pointer (const GValue *src_value,
GValue *dest_value)
{
dest_value->data[0].v_pointer = src_value->data[0].v_pointer;
}
static gpointer
-value_pointer_peek_pointer (const GValue *value)
+value_peek_pointer0 (const GValue *value)
{
return value->data[0].v_pointer;
}
static gchar*
-value_pointer_collect_value (GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_collect_pointer (GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
value->data[0].v_pointer = collect_values[0].v_pointer;
@@ -298,10 +299,10 @@ value_pointer_collect_value (GValue *value,
}
static gchar*
-value_pointer_lcopy_value (const GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
+value_lcopy_pointer (const GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
{
gpointer *pointer_p = collect_values[0].v_pointer;
@@ -313,59 +314,6 @@ value_pointer_lcopy_value (const GValue *value,
return NULL;
}
-static void
-value_ccallback_init (GValue *value)
-{
- value->data[0].v_pointer = NULL;
- value->data[1].v_pointer = NULL;
-}
-
-static void
-value_ccallback_copy (const GValue *src_value,
- GValue *dest_value)
-{
- dest_value->data[0].v_pointer = src_value->data[0].v_pointer;
- dest_value->data[1].v_pointer = src_value->data[1].v_pointer;
-}
-
-static gchar*
-value_ccallback_collect_value (GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
-{
- gchar *error = NULL;
-
- if (!collect_values[0].v_pointer)
- error = g_strconcat ("invalid (NULL) pointer callback function for value type `",
- G_VALUE_TYPE_NAME (value),
- "'",
- NULL);
- value->data[0].v_pointer = collect_values[0].v_pointer;
- value->data[1].v_pointer = collect_values[1].v_pointer;
-
- return error;
-}
-
-static gchar*
-value_ccallback_lcopy_value (const GValue *value,
- guint n_collect_values,
- GTypeCValue *collect_values,
- guint collect_flags)
-{
- gpointer *callback_p = collect_values[0].v_pointer;
- gpointer *data_p = collect_values[1].v_pointer;
-
- if (!callback_p || !data_p)
- return g_strdup_printf ("%s location for `%s' passed as NULL",
- callback_p ? "data" : "callback",
- G_VALUE_TYPE_NAME (value));
- *callback_p = value->data[0].v_pointer;
- *data_p = value->data[1].v_pointer;
-
- return NULL;
-}
-
/* --- type initialization --- */
void
@@ -390,14 +338,14 @@ g_value_types_init (void) /* sync with gtype.c */
*/
{
static const GTypeValueTable value_table = {
- value_long0_init, /* value_init */
+ value_init_long0, /* value_init */
NULL, /* value_free */
- value_long0_copy, /* value_copy */
+ value_copy_long0, /* value_copy */
NULL, /* value_peek_pointer */
"i", /* collect_format */
- value_int_collect_value, /* collect_value */
+ value_collect_int, /* collect_value */
"p", /* lcopy_format */
- value_char_lcopy_value, /* lcopy_value */
+ value_lcopy_char, /* lcopy_value */
};
info.value_table = &value_table;
type = g_type_register_fundamental (G_TYPE_CHAR, "gchar", &info, &finfo, 0);
@@ -410,14 +358,14 @@ g_value_types_init (void) /* sync with gtype.c */
*/
{
static const GTypeValueTable value_table = {
- value_long0_init, /* value_init */
+ value_init_long0, /* value_init */
NULL, /* value_free */
- value_long0_copy, /* value_copy */
+ value_copy_long0, /* value_copy */
NULL, /* value_peek_pointer */
"i", /* collect_format */
- value_int_collect_value, /* collect_value */
+ value_collect_int, /* collect_value */
"p", /* lcopy_format */
- value_boolean_lcopy_value, /* lcopy_value */
+ value_lcopy_boolean, /* lcopy_value */
};
info.value_table = &value_table;
type = g_type_register_fundamental (G_TYPE_BOOLEAN, "gboolean", &info, &finfo, 0);
@@ -428,14 +376,14 @@ g_value_types_init (void) /* sync with gtype.c */
*/
{
static const GTypeValueTable value_table = {
- value_long0_init, /* value_init */
+ value_init_long0, /* value_init */
NULL, /* value_free */
- value_long0_copy, /* value_copy */
+ value_copy_long0, /* value_copy */
NULL, /* value_peek_pointer */
"i", /* collect_format */
- value_int_collect_value, /* collect_value */
+ value_collect_int, /* collect_value */
"p", /* lcopy_format */
- value_int_lcopy_value, /* lcopy_value */
+ value_lcopy_int, /* lcopy_value */
};
info.value_table = &value_table;
type = g_type_register_fundamental (G_TYPE_INT, "gint", &info, &finfo, 0);
@@ -448,14 +396,14 @@ g_value_types_init (void) /* sync with gtype.c */
*/
{
static const GTypeValueTable value_table = {
- value_long0_init, /* value_init */
+ value_init_long0, /* value_init */
NULL, /* value_free */
- value_long0_copy, /* value_copy */
+ value_copy_long0, /* value_copy */
NULL, /* value_peek_pointer */
"l", /* collect_format */
- value_long_collect_value, /* collect_value */
+ value_collect_long, /* collect_value */
"p", /* lcopy_format */
- value_long_lcopy_value, /* lcopy_value */
+ value_lcopy_long, /* lcopy_value */
};
info.value_table = &value_table;
type = g_type_register_fundamental (G_TYPE_LONG, "glong", &info, &finfo, 0);
@@ -468,14 +416,14 @@ g_value_types_init (void) /* sync with gtype.c */
*/
{
static const GTypeValueTable value_table = {
- value_float_init, /* value_init */
+ value_init_float, /* value_init */
NULL, /* value_free */
- value_float_copy, /* value_copy */
+ value_copy_float, /* value_copy */
NULL, /* value_peek_pointer */
"d", /* collect_format */
- value_float_collect_value, /* collect_value */
+ value_collect_float, /* collect_value */
"p", /* lcopy_format */
- value_float_lcopy_value, /* lcopy_value */
+ value_lcopy_float, /* lcopy_value */
};
info.value_table = &value_table;
type = g_type_register_fundamental (G_TYPE_FLOAT, "gfloat", &info, &finfo, 0);
@@ -486,14 +434,14 @@ g_value_types_init (void) /* sync with gtype.c */
*/
{
static const GTypeValueTable value_table = {
- value_double_init, /* value_init */
- NULL, /* value_free */
- value_double_copy, /* value_copy */
- NULL, /* value_peek_pointer */
- "d", /* collect_format */
- value_double_collect_value, /* collect_value */
- "p", /* lcopy_format */
- value_double_lcopy_value, /* lcopy_value */
+ value_init_double, /* value_init */
+ NULL, /* value_free */
+ value_copy_double, /* value_copy */
+ NULL, /* value_peek_pointer */
+ "d", /* collect_format */
+ value_collect_double, /* collect_value */
+ "p", /* lcopy_format */
+ value_lcopy_double, /* lcopy_value */
};
info.value_table = &value_table;
type = g_type_register_fundamental (G_TYPE_DOUBLE, "gdouble", &info, &finfo, 0);
@@ -504,14 +452,14 @@ g_value_types_init (void) /* sync with gtype.c */
*/
{
static const GTypeValueTable value_table = {
- value_string_init, /* value_init */
- value_string_free_value, /* value_free */
- value_string_copy_value, /* value_copy */
- value_pointer_peek_pointer, /* value_peek_pointer */
- "p", /* collect_format */
- value_string_collect_value, /* collect_value */
- "p", /* lcopy_format */
- value_string_lcopy_value, /* lcopy_value */
+ value_init_string, /* value_init */
+ value_free_string, /* value_free */
+ value_copy_string, /* value_copy */
+ value_peek_pointer0, /* value_peek_pointer */
+ "p", /* collect_format */
+ value_collect_string, /* collect_value */
+ "p", /* lcopy_format */
+ value_lcopy_string, /* lcopy_value */
};
info.value_table = &value_table;
type = g_type_register_fundamental (G_TYPE_STRING, "gstring", &info, &finfo, 0);
@@ -522,71 +470,53 @@ g_value_types_init (void) /* sync with gtype.c */
*/
{
static const GTypeValueTable value_table = {
- value_pointer_init, /* value_init */
- NULL, /* value_free */
- value_pointer_copy, /* value_copy */
- value_pointer_peek_pointer, /* value_peek_pointer */
- "p", /* collect_format */
- value_pointer_collect_value, /* collect_value */
- "p", /* lcopy_format */
- value_pointer_lcopy_value, /* lcopy_value */
+ value_init_pointer, /* value_init */
+ NULL, /* value_free */
+ value_copy_pointer, /* value_copy */
+ value_peek_pointer0, /* value_peek_pointer */
+ "p", /* collect_format */
+ value_collect_pointer, /* collect_value */
+ "p", /* lcopy_format */
+ value_lcopy_pointer, /* lcopy_value */
};
info.value_table = &value_table;
type = g_type_register_fundamental (G_TYPE_POINTER, "gpointer", &info, &finfo, 0);
g_assert (type == G_TYPE_POINTER);
}
-
- /* G_TYPE_CCALLBACK
- */
- {
- static const GTypeValueTable value_table = {
- value_ccallback_init, /* value_init */
- NULL, /* value_free */
- value_ccallback_copy, /* value_copy */
- NULL, /* value_peek_pointer */
- "pp", /* collect_format */
- value_ccallback_collect_value, /* collect_value */
- "pp", /* lcopy_format */
- value_ccallback_lcopy_value, /* lcopy_value */
- };
- info.value_table = &value_table;
- type = g_type_register_fundamental (G_TYPE_CCALLBACK, "GCCallback", &info, &finfo, 0);
- g_assert (type == G_TYPE_CCALLBACK);
- }
}
/* --- GValue functions --- */
void
g_value_set_char (GValue *value,
- gint8 v_char)
+ gchar v_char)
{
- g_return_if_fail (G_IS_VALUE_CHAR (value));
+ g_return_if_fail (G_VALUE_HOLDS_CHAR (value));
value->data[0].v_int = v_char;
}
-gint8
+gchar
g_value_get_char (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_CHAR (value), 0);
+ g_return_val_if_fail (G_VALUE_HOLDS_CHAR (value), 0);
return value->data[0].v_int;
}
void
g_value_set_uchar (GValue *value,
- guint8 v_uchar)
+ guchar v_uchar)
{
- g_return_if_fail (G_IS_VALUE_UCHAR (value));
+ g_return_if_fail (G_VALUE_HOLDS_UCHAR (value));
value->data[0].v_uint = v_uchar;
}
-guint8
+guchar
g_value_get_uchar (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_UCHAR (value), 0);
+ g_return_val_if_fail (G_VALUE_HOLDS_UCHAR (value), 0);
return value->data[0].v_uint;
}
@@ -595,15 +525,15 @@ void
g_value_set_boolean (GValue *value,
gboolean v_boolean)
{
- g_return_if_fail (G_IS_VALUE_BOOLEAN (value));
+ g_return_if_fail (G_VALUE_HOLDS_BOOLEAN (value));
- value->data[0].v_int = v_boolean;
+ value->data[0].v_int = v_boolean != FALSE;
}
gboolean
g_value_get_boolean (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_BOOLEAN (value), 0);
+ g_return_val_if_fail (G_VALUE_HOLDS_BOOLEAN (value), 0);
return value->data[0].v_int;
}
@@ -612,7 +542,7 @@ void
g_value_set_int (GValue *value,
gint v_int)
{
- g_return_if_fail (G_IS_VALUE_INT (value));
+ g_return_if_fail (G_VALUE_HOLDS_INT (value));
value->data[0].v_int = v_int;
}
@@ -620,7 +550,7 @@ g_value_set_int (GValue *value,
gint
g_value_get_int (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_INT (value), 0);
+ g_return_val_if_fail (G_VALUE_HOLDS_INT (value), 0);
return value->data[0].v_int;
}
@@ -629,7 +559,7 @@ void
g_value_set_uint (GValue *value,
guint v_uint)
{
- g_return_if_fail (G_IS_VALUE_UINT (value));
+ g_return_if_fail (G_VALUE_HOLDS_UINT (value));
value->data[0].v_uint = v_uint;
}
@@ -637,7 +567,7 @@ g_value_set_uint (GValue *value,
guint
g_value_get_uint (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_UINT (value), 0);
+ g_return_val_if_fail (G_VALUE_HOLDS_UINT (value), 0);
return value->data[0].v_uint;
}
@@ -646,7 +576,7 @@ void
g_value_set_long (GValue *value,
glong v_long)
{
- g_return_if_fail (G_IS_VALUE_LONG (value));
+ g_return_if_fail (G_VALUE_HOLDS_LONG (value));
value->data[0].v_long = v_long;
}
@@ -654,7 +584,7 @@ g_value_set_long (GValue *value,
glong
g_value_get_long (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_LONG (value), 0);
+ g_return_val_if_fail (G_VALUE_HOLDS_LONG (value), 0);
return value->data[0].v_long;
}
@@ -663,7 +593,7 @@ void
g_value_set_ulong (GValue *value,
gulong v_ulong)
{
- g_return_if_fail (G_IS_VALUE_ULONG (value));
+ g_return_if_fail (G_VALUE_HOLDS_ULONG (value));
value->data[0].v_ulong = v_ulong;
}
@@ -671,7 +601,7 @@ g_value_set_ulong (GValue *value,
gulong
g_value_get_ulong (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_ULONG (value), 0);
+ g_return_val_if_fail (G_VALUE_HOLDS_ULONG (value), 0);
return value->data[0].v_ulong;
}
@@ -680,7 +610,7 @@ void
g_value_set_float (GValue *value,
gfloat v_float)
{
- g_return_if_fail (G_IS_VALUE_FLOAT (value));
+ g_return_if_fail (G_VALUE_HOLDS_FLOAT (value));
value->data[0].v_float = v_float;
}
@@ -688,7 +618,7 @@ g_value_set_float (GValue *value,
gfloat
g_value_get_float (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_FLOAT (value), 0);
+ g_return_val_if_fail (G_VALUE_HOLDS_FLOAT (value), 0);
return value->data[0].v_float;
}
@@ -697,7 +627,7 @@ void
g_value_set_double (GValue *value,
gdouble v_double)
{
- g_return_if_fail (G_IS_VALUE_DOUBLE (value));
+ g_return_if_fail (G_VALUE_HOLDS_DOUBLE (value));
value->data[0].v_double = v_double;
}
@@ -705,7 +635,7 @@ g_value_set_double (GValue *value,
gdouble
g_value_get_double (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_DOUBLE (value), 0);
+ g_return_val_if_fail (G_VALUE_HOLDS_DOUBLE (value), 0);
return value->data[0].v_double;
}
@@ -714,7 +644,7 @@ void
g_value_set_string (GValue *value,
const gchar *v_string)
{
- g_return_if_fail (G_IS_VALUE_STRING (value));
+ g_return_if_fail (G_VALUE_HOLDS_STRING (value));
if (value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS)
value->data[1].v_uint = 0;
@@ -727,7 +657,7 @@ void
g_value_set_static_string (GValue *value,
const gchar *v_string)
{
- g_return_if_fail (G_IS_VALUE_STRING (value));
+ g_return_if_fail (G_VALUE_HOLDS_STRING (value));
if (!(value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS))
g_free (value->data[0].v_pointer);
@@ -735,10 +665,23 @@ g_value_set_static_string (GValue *value,
value->data[0].v_pointer = (gchar*) v_string;
}
+void
+g_value_set_string_take_ownership (GValue *value,
+ gchar *v_string)
+{
+ g_return_if_fail (G_VALUE_HOLDS_STRING (value));
+
+ if (value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS)
+ value->data[1].v_uint = 0;
+ else
+ g_free (value->data[0].v_pointer);
+ value->data[0].v_pointer = v_string;
+}
+
G_CONST_RETURN gchar*
g_value_get_string (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_STRING (value), NULL);
+ g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL);
return value->data[0].v_pointer;
}
@@ -746,7 +689,7 @@ g_value_get_string (const GValue *value)
gchar*
g_value_dup_string (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_STRING (value), NULL);
+ g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL);
return g_strdup (value->data[0].v_pointer);
}
@@ -755,7 +698,7 @@ void
g_value_set_pointer (GValue *value,
gpointer v_pointer)
{
- g_return_if_fail (G_IS_VALUE_POINTER (value));
+ g_return_if_fail (G_VALUE_HOLDS_POINTER (value));
value->data[0].v_pointer = v_pointer;
}
@@ -763,31 +706,7 @@ g_value_set_pointer (GValue *value,
gpointer
g_value_get_pointer (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_POINTER (value), NULL);
+ g_return_val_if_fail (G_VALUE_HOLDS_POINTER (value), NULL);
return value->data[0].v_pointer;
}
-
-void
-g_value_set_ccallback (GValue *value,
- gpointer callback_func,
- gpointer callback_data)
-{
- g_return_if_fail (G_IS_VALUE_CCALLBACK (value));
-
- value->data[0].v_pointer = callback_func;
- value->data[1].v_pointer = callback_data;
-}
-
-void
-g_value_get_ccallback (const GValue *value,
- gpointer *callback_func,
- gpointer *callback_data)
-{
- g_return_if_fail (G_IS_VALUE_CCALLBACK (value));
-
- if (callback_func)
- *callback_func = value->data[0].v_pointer;
- if (callback_data)
- *callback_data = value->data[1].v_pointer;
-}