fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-10 02:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-01-05 Robert McQueen <robot101@debian.org>

Browse source 
* glib/dbus-binding-tool-glib.c: Patch from Ricardo Kekki
	<ricardo.kekki@movial.fi> to make dbus-binding-tool heed C symbol name
	annotations when generating glib client bindings.
This commit is contained in:
Robert McQueen 2006-01-05 20:03:38 +00:00
parent f3358b8da7
commit 36e234a11a
2 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-01-05 Robert McQueen <robot101@debian.org>
* glib/dbus-binding-tool-glib.c: Patch from Ricardo Kekki
<ricardo.kekki@movial.fi> to make dbus-binding-tool heed C symbol name
annotations when generating glib client bindings.
2005-12-19 John (J5) Palmieri <johnp@redhat.com>
* dbus/dbus-shared.h: Call it shared constants instead of shared macros

42
glib/dbus-binding-tool-glib.c
View file

@ -1311,8 +1311,24 @@ static gboolean
write_async_method_client (GIOChannel *channel, InterfaceInfo *interface, MethodInfo *method, GError **error)
{
char *method_name, *iface_prefix;
char *interface_c_name;
iface_prefix = iface_to_c_prefix (interface_info_get_name (interface));
method_name = compute_client_method_name (iface_prefix, method);
interface_c_name = interface_info_get_annotation (interface, DBUS_GLIB_ANNOTATION_C_SYMBOL);
if (interface_c_name == NULL)
{
interface_c_name = iface_prefix;
}
method_name = g_strdup (method_info_get_annotation (method, DBUS_GLIB_ANNOTATION_C_SYMBOL));
if (method_name == NULL)
{
char *method_name_uscored;
method_name_uscored = _dbus_gutils_wincaps_to_uscore (method_info_get_name (method));
method_name = g_strdup_printf ("%s_%s", interface_c_name, method_name_uscored);
g_free (method_name_uscored);
}
g_free(iface_prefix);
/* Write the typedef for the client callback */
if (!write_printf_to_iochannel ("typedef void (*%s_reply) (DBusGProxy *proxy, ", channel, error, method_name))
@ -1424,6 +1440,7 @@ generate_client_glue (BaseInfo *base, DBusBindingToolCData *data, GError **error
GSList *methods;
GSList *tmp;
char *iface_prefix;
char *interface_c_name;
channel = data->channel;
@ -1432,6 +1449,12 @@ generate_client_glue (BaseInfo *base, DBusBindingToolCData *data, GError **error
methods = interface_info_get_methods (interface);
iface_prefix = iface_to_c_prefix (interface_info_get_name (interface));
interface_c_name = interface_info_get_annotation (interface, DBUS_GLIB_ANNOTATION_C_SYMBOL);
if (interface_c_name == NULL)
{
interface_c_name = iface_prefix;
}
if (!write_printf_to_iochannel ("#ifndef DBUS_GLIB_CLIENT_WRAPPERS_%s\n"
"#define DBUS_GLIB_CLIENT_WRAPPERS_%s\n\n",
@ -1445,10 +1468,20 @@ generate_client_glue (BaseInfo *base, DBusBindingToolCData *data, GError **error
for (tmp = methods; tmp != NULL; tmp = g_slist_next (tmp))
{
MethodInfo *method;
char *method_name;
char *method_c_name;
gboolean is_noreply;
method = (MethodInfo *) tmp->data;
method_c_name = g_strdup (method_info_get_annotation (method, DBUS_GLIB_ANNOTATION_C_SYMBOL));
if (method_c_name == NULL)
{
char *method_name_uscored;
method_name_uscored = _dbus_gutils_wincaps_to_uscore (method_info_get_name (method));
method_c_name = g_strdup_printf ("%s_%s",
interface_c_name,
method_name_uscored);
g_free (method_name_uscored);
}
is_noreply = method_info_get_annotation (method, DBUS_GLIB_ANNOTATION_NOREPLY) != NULL;
@ -1460,13 +1493,12 @@ generate_client_glue (BaseInfo *base, DBusBindingToolCData *data, GError **error
continue;
}
method_name = compute_client_method_name (iface_prefix, method);
WRITE_OR_LOSE ("static\n#ifdef G_HAVE_INLINE\ninline\n#endif\ngboolean\n");
if (!write_printf_to_iochannel ("%s (DBusGProxy *proxy", channel, error,
method_name))
method_c_name))
goto io_lose;
g_free (method_name);
g_free (method_c_name);
if (!write_formal_parameters (interface, method, channel, error))
goto io_lose;