summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac4
-rw-r--r--src/gdbus/Makefile.am5
-rw-r--r--src/gdbus/gdbusmessage.c26
-rw-r--r--src/gdbus/gdbusutils.c4
-rw-r--r--src/gdbus/gdbusvariant.c6
-rw-r--r--src/tests/exampleserver.c4
6 files changed, 29 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index 29949ae..996805e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,6 +111,10 @@ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.14.0 gio-2.0 >= 2.14.0])
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
+PKG_CHECK_MODULES(GEE, [gee-1.0 >= 0.1.3])
+AC_SUBST(GEE_CFLAGS)
+AC_SUBST(GEE_LIBS)
+
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
diff --git a/src/gdbus/Makefile.am b/src/gdbus/Makefile.am
index 329edd0..3e1aa6b 100644
--- a/src/gdbus/Makefile.am
+++ b/src/gdbus/Makefile.am
@@ -40,6 +40,7 @@ libgdbus_common_la_SOURCES = \
libgdbus_common_la_CFLAGS = \
-D_G_DBUS_COMPILATION \
+ $(GEE_CFLAGS) \
$(GLIB_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(NULL)
@@ -62,12 +63,14 @@ dbus2gobject_SOURCES = \
dbus2gobject_CFLAGS = \
-D_G_DBUS_COMPILATION \
+ $(GEE_CFLAGS) \
$(GLIB_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(EXPAT_CFLAGS) \
$(NULL)
dbus2gobject_LDADD = \
+ $(GEE_LIBS) \
$(GLIB_LIBS) \
$(DBUS_GLIB_LIBS) \
$(EXPAT_LIBS) \
@@ -143,11 +146,13 @@ libgdbus_1_la_SOURCES = \
libgdbus_1_la_CFLAGS = \
-D_G_DBUS_COMPILATION \
+ $(GEE_CFLAGS) \
$(GLIB_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(NULL)
libgdbus_1_la_LIBADD = \
+ $(GEE_LIBS) \
$(GLIB_LIBS) \
$(DBUS_GLIB_LIBS) \
libgdbus-common.la \
diff --git a/src/gdbus/gdbusmessage.c b/src/gdbus/gdbusmessage.c
index 11a4cc6..92cbf56 100644
--- a/src/gdbus/gdbusmessage.c
+++ b/src/gdbus/gdbusmessage.c
@@ -739,8 +739,8 @@ g_dbus_message_append_int16 (GDBusMessage *message,
GError **error)
{
GValue val = {0};
- g_value_init (&val, G_TYPE_INT);
- g_value_set_int (&val, value);
+ g_value_init (&val, G_TYPE_INT16);
+ g_value_set_int16 (&val, value);
return g_dbus_message_append_gvalue (message, &val, "n", error);
}
@@ -750,8 +750,8 @@ g_dbus_message_append_uint16 (GDBusMessage *message,
GError **error)
{
GValue val = {0};
- g_value_init (&val, G_TYPE_UINT);
- g_value_set_uint (&val, value);
+ g_value_init (&val, G_TYPE_UINT16);
+ g_value_set_uint16 (&val, value);
return g_dbus_message_append_gvalue (message, &val, "q", error);
}
@@ -1012,7 +1012,7 @@ g_dbus_message_extract_int16 (GDBusMessage *message,
if (!g_dbus_message_extract_gvalue (message, &val, error))
return FALSE;
if (out_value != NULL)
- *out_value = (gint16) g_value_get_int (&val);
+ *out_value = g_value_get_int16 (&val);
else
g_value_unset (&val);
return TRUE;
@@ -1028,7 +1028,7 @@ g_dbus_message_extract_uint16 (GDBusMessage *message,
if (!g_dbus_message_extract_gvalue (message, &val, error))
return FALSE;
if (out_value != NULL)
- *out_value = (guint16) g_value_get_uint (&val);
+ *out_value = (guint16) g_value_get_uint16 (&val);
else
g_value_unset (&val);
return TRUE;
@@ -1282,16 +1282,16 @@ g_dbus_get_value_from_iter (DBusMessageIter *iter,
g_value_set_uchar (out_value, uint8_val);
break;
- case DBUS_TYPE_INT16: /* wtf glib */
- g_value_init (out_value, G_TYPE_INT);
+ case DBUS_TYPE_INT16:
+ g_value_init (out_value, G_TYPE_INT16);
dbus_message_iter_get_basic (iter, &int16_val);
- g_value_set_int (out_value, int16_val);
+ g_value_set_int16 (out_value, int16_val);
break;
case DBUS_TYPE_UINT16:
- g_value_init (out_value, G_TYPE_UINT);
+ g_value_init (out_value, G_TYPE_UINT16);
dbus_message_iter_get_basic (iter, &uint16_val);
- g_value_set_uint (out_value, uint16_val);
+ g_value_set_uint16 (out_value, uint16_val);
break;
case DBUS_TYPE_INT32:
@@ -2063,12 +2063,12 @@ g_dbus_append_value_to_iter (DBusMessageIter *iter,
}
else if (strcmp (signature, DBUS_TYPE_INT16_AS_STRING) == 0)
{
- dbus_int16_t val = g_value_get_int (value);
+ dbus_int16_t val = g_value_get_int16 (value);
dbus_message_iter_append_basic (iter, DBUS_TYPE_INT16, &val);
}
else if (strcmp (signature, DBUS_TYPE_UINT16_AS_STRING) == 0)
{
- dbus_uint16_t val = g_value_get_uint (value);
+ dbus_uint16_t val = g_value_get_uint16 (value);
dbus_message_iter_append_basic (iter, DBUS_TYPE_UINT16, &val);
}
else if (strcmp (signature, DBUS_TYPE_INT32_AS_STRING) == 0)
diff --git a/src/gdbus/gdbusutils.c b/src/gdbus/gdbusutils.c
index e78eea0..0f5c54c 100644
--- a/src/gdbus/gdbusutils.c
+++ b/src/gdbus/gdbusutils.c
@@ -175,11 +175,11 @@ g_dbus_param_spec_signature (const gchar *name,
break;
case DBUS_TYPE_INT16:
- pspec = g_param_spec_int (name, nick, blurb, G_MININT16, G_MAXINT16, 0, flags);
+ pspec = g_param_spec_int16 (name, nick, blurb, G_MININT16, G_MAXINT16, 0, flags);
break;
case DBUS_TYPE_UINT16:
- pspec = g_param_spec_uint (name, nick, blurb, 0, G_MAXUINT16, 0, flags);
+ pspec = g_param_spec_uint16 (name, nick, blurb, 0, G_MAXUINT16, 0, flags);
break;
case DBUS_TYPE_INT32:
diff --git a/src/gdbus/gdbusvariant.c b/src/gdbus/gdbusvariant.c
index 2c01e42..7de668c 100644
--- a/src/gdbus/gdbusvariant.c
+++ b/src/gdbus/gdbusvariant.c
@@ -534,8 +534,8 @@ g_dbus_variant_set_uint16 (GDBusVariant *variant,
priv = G_DBUS_VARIANT_GET_PRIVATE (variant);
if (priv->signature != NULL)
g_value_unset (&priv->value);
- g_value_init (&priv->value, G_TYPE_UINT);
- g_value_set_uint (&priv->value, value);
+ g_value_init (&priv->value, G_TYPE_UINT16);
+ g_value_set_uint16 (&priv->value, value);
set_signature (variant, "q");
}
@@ -743,7 +743,7 @@ g_dbus_variant_get_uint16 (GDBusVariant *variant)
GDBusVariantPrivate *priv;
g_return_val_if_fail (G_DBUS_IS_VARIANT (variant) && g_dbus_variant_is_uint16 (variant), 0);
priv = G_DBUS_VARIANT_GET_PRIVATE (variant);
- return g_value_get_uint (&priv->value);
+ return g_value_get_uint16 (&priv->value);
}
gint32
diff --git a/src/tests/exampleserver.c b/src/tests/exampleserver.c
index e4b35e2..a107d0e 100644
--- a/src/tests/exampleserver.c
+++ b/src/tests/exampleserver.c
@@ -138,11 +138,11 @@ test_object_get_property (GObject *object,
break;
case PROP_TEST_FROB_N:
- g_value_set_int (value, 2);
+ g_value_set_int16 (value, 2);
break;
case PROP_TEST_FROB_Q:
- g_value_set_uint (value, 3);
+ g_value_set_uint16 (value, 3);
break;
case PROP_TEST_FROB_I:
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-21 05:12:04 +0000