diff options
author | Havoc Pennington <hp@redhat.com> | 2005-02-12 20:27:45 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2005-02-12 20:27:45 +0000 |
commit | 970be5fda36ea575973a9e7f25389e2ef173b940 (patch) | |
tree | 6bcc78511c8db57acaf1ca9b9c0e064ba122cb4f /glib | |
parent | 85fb9ff93c91bc500b91759d044e3dfd951c7868 (diff) |
2005-02-12 Havoc Pennington <hp@redhat.com>
* tools/dbus-tree-view.c (info_set_func_text): display more
details on args
* bus/driver.c (bus_driver_handle_list_services): list the bus
driver
* glib/dbus-gparser.c (parse_arg): generate an arg name if none is supplied
* glib/dbus-gidl.c (signal_info_get_n_args): new function
(method_info_get_n_args): new function
Diffstat (limited to 'glib')
-rw-r--r-- | glib/dbus-gidl.c | 12 | ||||
-rw-r--r-- | glib/dbus-gidl.h | 2 | ||||
-rw-r--r-- | glib/dbus-gparser.c | 13 |
3 files changed, 26 insertions, 1 deletions
diff --git a/glib/dbus-gidl.c b/glib/dbus-gidl.c index 8e0dc0da..ec87414d 100644 --- a/glib/dbus-gidl.c +++ b/glib/dbus-gidl.c @@ -459,6 +459,12 @@ method_info_get_args (MethodInfo *info) return info->args; } +int +method_info_get_n_args (MethodInfo *info) +{ + return g_slist_length (info->args); +} + static int args_sort_by_direction (const void *a, const void *b) @@ -532,6 +538,12 @@ signal_info_get_args (SignalInfo *info) return info->args; } +int +signal_info_get_n_args (SignalInfo *info) +{ + return g_slist_length (info->args); +} + void signal_info_add_arg (SignalInfo *info, ArgInfo *arg) diff --git a/glib/dbus-gidl.h b/glib/dbus-gidl.h index 88d5c6e7..a706c4d5 100644 --- a/glib/dbus-gidl.h +++ b/glib/dbus-gidl.h @@ -106,6 +106,7 @@ const char* method_info_get_name (MethodInfo *info); GSList* method_info_get_args (MethodInfo *info); void method_info_add_arg (MethodInfo *info, ArgInfo *arg); +int method_info_get_n_args (MethodInfo *info); SignalInfo* signal_info_new (const char *name); SignalInfo* signal_info_ref (SignalInfo *info); void signal_info_unref (SignalInfo *info); @@ -113,6 +114,7 @@ const char* signal_info_get_name (SignalInfo *info); GSList* signal_info_get_args (SignalInfo *info); void signal_info_add_arg (SignalInfo *info, ArgInfo *arg); +int signal_info_get_n_args (SignalInfo *info); PropertyInfo* property_info_new (const char *name, int type, PropertyAccessFlags access); diff --git a/glib/dbus-gparser.c b/glib/dbus-gparser.c index 963a5730..680d830a 100644 --- a/glib/dbus-gparser.c +++ b/glib/dbus-gparser.c @@ -620,6 +620,7 @@ parse_arg (Parser *parser, ArgDirection dir; int t; ArgInfo *arg; + char *generated_name; if (!(parser->method || parser->signal) || parser->node_stack == NULL || @@ -689,8 +690,16 @@ parse_arg (Parser *parser, t = type_from_string (type, element_name, error); if (t == DBUS_TYPE_INVALID) return FALSE; + + generated_name = NULL; + if (name == NULL) + generated_name = g_strdup_printf ("arg%d", + parser->method ? + method_info_get_n_args (parser->method) : + signal_info_get_n_args (parser->signal)); + - arg = arg_info_new (name, dir, t); + arg = arg_info_new (name ? name : generated_name, dir, t); if (parser->method) method_info_add_arg (parser->method, arg); else if (parser->signal) @@ -698,6 +707,8 @@ parse_arg (Parser *parser, else g_assert_not_reached (); + g_free (generated_name); + arg_info_unref (arg); parser->arg = arg; |