From 970be5fda36ea575973a9e7f25389e2ef173b940 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 12 Feb 2005 20:27:45 +0000 Subject: 2005-02-12 Havoc Pennington * 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 --- tools/dbus-tree-view.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/dbus-tree-view.c b/tools/dbus-tree-view.c index d2898fb3..f9342ee9 100644 --- a/tools/dbus-tree-view.c +++ b/tools/dbus-tree-view.c @@ -25,6 +25,49 @@ #include "dbus-tree-view.h" #include +/* FIXME this function should just be in the library */ +static const char * +type_to_string (int type) +{ + switch (type) + { + case DBUS_TYPE_INVALID: + return "invalid"; + case DBUS_TYPE_BOOLEAN: + return "boolean"; + case DBUS_TYPE_BYTE: + return "byte"; + case DBUS_TYPE_INT16: + return "int16"; + case DBUS_TYPE_UINT16: + return "uint16"; + case DBUS_TYPE_INT32: + return "int32"; + case DBUS_TYPE_UINT32: + return "uint32"; + case DBUS_TYPE_DOUBLE: + return "double"; + case DBUS_TYPE_STRING: + return "string"; + case DBUS_TYPE_OBJECT_PATH: + return "object_path"; + case DBUS_TYPE_SIGNATURE: + return "signature"; + case DBUS_TYPE_STRUCT: + return "struct"; + case DBUS_TYPE_ARRAY: + return "array"; + case DBUS_TYPE_VARIANT: + return "variant"; + case DBUS_STRUCT_BEGIN_CHAR: + return "begin_struct"; + case DBUS_STRUCT_END_CHAR: + return "end_struct"; + default: + return "unknown"; + } +} + enum { MODEL_COLUMN_INFO, @@ -292,7 +335,11 @@ info_set_func_text (GtkTreeViewColumn *tree_column, g_string_append (str, "property"); break; case INFO_TYPE_ARG: - g_string_append (str, "arg"); + g_string_append_printf (str, "arg %s", + arg_info_get_direction ((ArgInfo*)info) == ARG_IN ? + "in" : "out"); + g_string_append_printf (str, " %s", + type_to_string (arg_info_get_type ((ArgInfo*)info))); break; } -- cgit