fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-04-30 22:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2005-08-01 Colin Walters <walters@verbum.org>

Browse source 
Patch from Joe Markus Clarke:

	* glib/dbus-gvalue.c (dbus_g_value_types_init):
	* glib/dbus-gvalue-utils.c (dbus_g_type_specialized_builtins_init)
	* glib/dbus-gobject.c (write_interface):

	Don't use C99 style initializers (bug #3933).
This commit is contained in:
Colin Walters 2005-08-01 16:07:19 +00:00
parent bd2a59b1d8
commit 932272884c
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2005-08-01 Colin Walters <walters@verbum.org>
Patch from Joe Markus Clarke:
* glib/dbus-gvalue.c (dbus_g_value_types_init):
* glib/dbus-gvalue-utils.c (dbus_g_type_specialized_builtins_init)
* glib/dbus-gobject.c (write_interface):
Don't use C99 style initializers (bug #3933).
2005-07-31 Havoc Pennington <hp@redhat.com>
* tools/dbus-viewer.c (load_child_nodes): fix invocation of

2
glib/dbus-gobject.c
View file

@ -373,8 +373,8 @@ write_interface (gpointer key, gpointer val, gpointer user_data)
for (; methods; methods = methods->next)
{
DBusGMethodInfo *method;
method = methods->data;
const char *args;
method = methods->data;
g_string_append_printf (xml, " <method name=\"%s\">\n",
method_name_from_object_info (object_info, method));

7
glib/dbus-gvalue-utils.c
View file

@ -855,7 +855,6 @@ dbus_g_type_specialized_builtins_init (void)
NULL
};
dbus_g_type_register_collection ("GArray", &array_vtable, 0);
static const DBusGTypeSpecializedCollectionVtable ptrarray_vtable = {
{
@ -869,7 +868,6 @@ dbus_g_type_specialized_builtins_init (void)
NULL,
};
dbus_g_type_register_collection ("GPtrArray", &ptrarray_vtable, 0);
static const DBusGTypeSpecializedCollectionVtable slist_vtable = {
{
@ -883,8 +881,6 @@ dbus_g_type_specialized_builtins_init (void)
slist_end_append,
};
dbus_g_type_register_collection ("GSList", &slist_vtable, 0);
static const DBusGTypeSpecializedMapVtable hashtable_vtable = {
{
hashtable_constructor,
@ -898,6 +894,9 @@ dbus_g_type_specialized_builtins_init (void)
hashtable_append
};
dbus_g_type_register_collection ("GSList", &slist_vtable, 0);
dbus_g_type_register_collection ("GArray", &array_vtable, 0);
dbus_g_type_register_collection ("GPtrArray", &ptrarray_vtable, 0);
dbus_g_type_register_map ("GHashTable", &hashtable_vtable, 0);
}

8
glib/dbus-gvalue.c
View file

@ -189,6 +189,10 @@ dbus_g_value_types_init (void)
{
static gboolean types_initialized;
static const DBusGTypeMarshalVtable basic_vtable = {
marshal_basic,
demarshal_basic
};
if (types_initialized)
return;
@ -196,10 +200,6 @@ dbus_g_value_types_init (void)
dbus_g_type_specialized_init ();
dbus_g_type_specialized_builtins_init ();
static const DBusGTypeMarshalVtable basic_vtable = {
marshal_basic,
demarshal_basic
};
/* Register basic types */
{