summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/dbus-monitor.c2
-rw-r--r--tools/dbus-names-model.c15
-rw-r--r--tools/dbus-print-message.c69
-rw-r--r--tools/dbus-print-message.h2
-rw-r--r--tools/dbus-send.c10
-rw-r--r--tools/dbus-viewer.c37
-rw-r--r--tools/print-introspect.c8
7 files changed, 67 insertions, 76 deletions
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index fa9a9da6..9bd95ea3 100644
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
@@ -32,7 +32,7 @@ filter_func (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
- print_message (message);
+ print_message (message, FALSE);
if (dbus_message_is_signal (message,
DBUS_INTERFACE_LOCAL,
diff --git a/tools/dbus-names-model.c b/tools/dbus-names-model.c
index b1ea24eb..65faa1b4 100644
--- a/tools/dbus-names-model.c
+++ b/tools/dbus-names-model.c
@@ -43,7 +43,7 @@ struct NamesModel
GtkListStore parent;
DBusGConnection *connection;
DBusGProxy *driver_proxy;
- DBusGPendingCall *pending_list_names;
+ DBusGProxyCall *pending_list_names;
};
struct NamesModelClass
@@ -59,7 +59,8 @@ struct NamesModelClass
#define NAMES_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NAMES_MODEL, NamesModelClass))
static void
-have_names_notify (DBusGPendingCall *call,
+have_names_notify (DBusGProxy *proxy,
+ DBusGProxyCall *call,
void *data)
{
NamesModel *names_model;
@@ -69,7 +70,7 @@ have_names_notify (DBusGPendingCall *call,
names_model = NAMES_MODEL (data);
- g_assert (names_model->pending_list_names);
+ g_assert (names_model->pending_list_names == call);
g_assert (names_model->driver_proxy);
names = NULL;
@@ -195,8 +196,8 @@ names_model_reload (NamesModel *names_model)
if (names_model->pending_list_names)
{
- dbus_g_pending_call_cancel (names_model->pending_list_names);
- dbus_g_pending_call_unref (names_model->pending_list_names);
+ dbus_g_proxy_cancel_call (names_model->driver_proxy,
+ names_model->pending_list_names);
names_model->pending_list_names = NULL;
}
@@ -208,10 +209,8 @@ names_model_reload (NamesModel *names_model)
names_model->pending_list_names =
dbus_g_proxy_begin_call (names_model->driver_proxy,
"ListNames",
+ have_names_notify, names_model, NULL,
G_TYPE_INVALID);
-
- dbus_g_pending_call_set_notify (names_model->pending_list_names,
- have_names_notify, names_model, NULL);
}
static void
diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index bd47666c..e201fda3 100644
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -40,7 +40,7 @@ type_to_name (int message_type)
}
static void
-print_iter (DBusMessageIter *iter, int depth)
+print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
{
do
{
@@ -62,7 +62,11 @@ print_iter (DBusMessageIter *iter, int depth)
{
case DBUS_TYPE_STRING:
dbus_message_iter_get_basic (iter, &str);
- printf ("string \"%s\"\n", str);
+ if (!literal)
+ printf ("string \"");
+ printf ("%s", str);
+ if (!literal)
+ printf ("\"\n");
break;
case DBUS_TYPE_INT32:
@@ -97,7 +101,7 @@ print_iter (DBusMessageIter *iter, int depth)
dbus_message_iter_recurse (iter, &subiter);
printf ("variant:");
- print_iter (&subiter, depth);
+ print_iter (&subiter, literal, depth);
break;
}
case DBUS_TYPE_ARRAY:
@@ -110,7 +114,7 @@ print_iter (DBusMessageIter *iter, int depth)
printf("[");
while ((current_type = dbus_message_iter_get_arg_type (&subiter)) != DBUS_TYPE_INVALID)
{
- print_iter (&subiter, depth);
+ print_iter (&subiter, literal, depth);
dbus_message_iter_next (&subiter);
if (dbus_message_iter_get_arg_type (&subiter) != DBUS_TYPE_INVALID)
printf (",");
@@ -125,9 +129,9 @@ print_iter (DBusMessageIter *iter, int depth)
dbus_message_iter_recurse (iter, &subiter);
printf("{");
- print_iter (&subiter, depth);
+ print_iter (&subiter, literal, depth);
dbus_message_iter_next (&subiter);
- print_iter (&subiter, depth);
+ print_iter (&subiter, literal, depth);
printf("}");
break;
}
@@ -141,7 +145,7 @@ print_iter (DBusMessageIter *iter, int depth)
}
void
-print_message (DBusMessage *message)
+print_message (DBusMessage *message, dbus_bool_t literal)
{
DBusMessageIter iter;
const char *sender;
@@ -151,37 +155,40 @@ print_message (DBusMessage *message)
message_type = dbus_message_get_type (message);
sender = dbus_message_get_sender (message);
destination = dbus_message_get_destination (message);
-
- printf ("%s sender=%s -> dest=%s",
- type_to_name (message_type),
- sender ? sender : "(null sender)",
- destination ? destination : "(null destination)");
-
- switch (message_type)
+
+ if (!literal)
{
- case DBUS_MESSAGE_TYPE_METHOD_CALL:
- case DBUS_MESSAGE_TYPE_SIGNAL:
- printf (" interface=%s; member=%s\n",
- dbus_message_get_interface (message),
- dbus_message_get_member (message));
- break;
+ printf ("%s sender=%s -> dest=%s",
+ type_to_name (message_type),
+ sender ? sender : "(null sender)",
+ destination ? destination : "(null destination)");
+
+ switch (message_type)
+ {
+ case DBUS_MESSAGE_TYPE_METHOD_CALL:
+ case DBUS_MESSAGE_TYPE_SIGNAL:
+ printf (" interface=%s; member=%s\n",
+ dbus_message_get_interface (message),
+ dbus_message_get_member (message));
+ break;
- case DBUS_MESSAGE_TYPE_METHOD_RETURN:
- printf ("\n");
- break;
+ case DBUS_MESSAGE_TYPE_METHOD_RETURN:
+ printf ("\n");
+ break;
- case DBUS_MESSAGE_TYPE_ERROR:
- printf (" error_name=%s\n",
- dbus_message_get_error_name (message));
- break;
+ case DBUS_MESSAGE_TYPE_ERROR:
+ printf (" error_name=%s\n",
+ dbus_message_get_error_name (message));
+ break;
- default:
- printf ("\n");
- break;
+ default:
+ printf ("\n");
+ break;
+ }
}
dbus_message_iter_init (message, &iter);
- print_iter (&iter, 1);
+ print_iter (&iter, literal, 1);
}
diff --git a/tools/dbus-print-message.h b/tools/dbus-print-message.h
index c40e7667..a999450d 100644
--- a/tools/dbus-print-message.h
+++ b/tools/dbus-print-message.h
@@ -26,6 +26,6 @@
#include <string.h>
#include <dbus/dbus.h>
-void print_message (DBusMessage *message);
+void print_message (DBusMessage *message, dbus_bool_t literal);
#endif /* DBUS_PRINT_MESSAGE_H */
diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index 37b72067..477a8abd 100644
--- a/tools/dbus-send.c
+++ b/tools/dbus-send.c
@@ -32,7 +32,7 @@ static const char *appname;
static void
usage (int ecode)
{
- fprintf (stderr, "Usage: %s [--help] [--system | --session] [--dest=NAME] [--type=TYPE] [--print-reply] [--reply-timeout=MSEC] <destination object path> <message name> [contents ...]\n", appname);
+ fprintf (stderr, "Usage: %s [--help] [--system | --session] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--reply-timeout=MSEC] <destination object path> <message name> [contents ...]\n", appname);
exit (ecode);
}
@@ -183,6 +183,7 @@ main (int argc, char *argv[])
DBusError error;
DBusMessage *message;
int print_reply;
+ int print_reply_literal;
int reply_timeout;
DBusMessageIter iter;
int i;
@@ -199,6 +200,7 @@ main (int argc, char *argv[])
usage (1);
print_reply = FALSE;
+ print_reply_literal = FALSE;
reply_timeout = -1;
for (i = 1; i < argc && name == NULL; i++)
@@ -209,10 +211,12 @@ main (int argc, char *argv[])
type = DBUS_BUS_SYSTEM;
else if (strcmp (arg, "--session") == 0)
type = DBUS_BUS_SESSION;
- else if (strcmp (arg, "--print-reply") == 0)
+ else if (strncmp (arg, "--print-reply", 13) == 0)
{
print_reply = TRUE;
message_type = DBUS_MESSAGE_TYPE_METHOD_CALL;
+ if (*(arg + 13) != '\0')
+ print_reply_literal = TRUE;
}
else if (strstr (arg, "--reply-timeout=") == arg)
{
@@ -436,7 +440,7 @@ main (int argc, char *argv[])
if (reply)
{
- print_message (reply);
+ print_message (reply, print_reply_literal);
dbus_message_unref (reply);
}
}
diff --git a/tools/dbus-viewer.c b/tools/dbus-viewer.c
index 95d00c19..ae44075f 100644
--- a/tools/dbus-viewer.c
+++ b/tools/dbus-viewer.c
@@ -147,14 +147,12 @@ load_child_nodes (const char *service_name,
while (tmp != NULL)
{
DBusGProxy *proxy;
- DBusGPendingCall *call;
char *data;
NodeInfo *child;
NodeInfo *complete_child;
int save_len;
complete_child = NULL;
- call = NULL;
child = tmp->data;
@@ -183,17 +181,11 @@ load_child_nodes (const char *service_name,
goto done;
}
- call = dbus_g_proxy_begin_call (proxy, "Introspect",
- G_TYPE_INVALID);
-
- data = NULL;
- if (!dbus_g_proxy_end_call (proxy, call, error, G_TYPE_STRING, &data,
- G_TYPE_INVALID))
- {
- call = NULL;
+ if (!dbus_g_proxy_call (proxy, "Introspect", error,
+ G_TYPE_STRING, &data,
+ G_TYPE_INVALID,
+ G_TYPE_INVALID))
goto done;
- }
- call = NULL;
complete_child = description_load_from_string (data, -1, error);
g_free (data);
@@ -204,8 +196,6 @@ load_child_nodes (const char *service_name,
}
done:
- if (call)
- dbus_g_pending_call_unref (call);
g_object_unref (proxy);
if (complete_child == NULL)
@@ -271,7 +261,6 @@ static void*
load_from_service_thread_func (void *thread_data)
{
DBusGProxy *root_proxy;
- DBusGPendingCall *call;
const char *data;
NodeInfo *node;
GString *path;
@@ -280,7 +269,6 @@ load_from_service_thread_func (void *thread_data)
lfsd = thread_data;
node = NULL;
- call = NULL;
path = NULL;
#if 1
@@ -304,19 +292,15 @@ load_from_service_thread_func (void *thread_data)
}
#endif
- call = dbus_g_proxy_begin_call (root_proxy, "Introspect",
- G_TYPE_INVALID);
-
- data = NULL;
- if (!dbus_g_proxy_end_call (root_proxy, call, &lfsd->error, G_TYPE_STRING, &data,
- G_TYPE_INVALID))
+ if (!dbus_g_proxy_call (root_proxy, "Introspect", &lfsd->error,
+ G_TYPE_INVALID,
+ G_TYPE_STRING, &data,
+ G_TYPE_INVALID))
{
- call = NULL;
g_printerr ("Failed to Introspect() %s\n",
- dbus_g_proxy_get_bus_name (root_proxy));
+ dbus_g_proxy_get_bus_name (root_proxy));
goto out;
}
- call = NULL;
node = description_load_from_string (data, -1, &lfsd->error);
@@ -338,9 +322,6 @@ load_from_service_thread_func (void *thread_data)
}
out:
- if (call)
- dbus_g_pending_call_unref (call);
-
g_object_unref (root_proxy);
if (path)
diff --git a/tools/print-introspect.c b/tools/print-introspect.c
index e9fe3ce4..91052cf6 100644
--- a/tools/print-introspect.c
+++ b/tools/print-introspect.c
@@ -37,7 +37,6 @@ main (int argc, char *argv[])
{
DBusGConnection *connection;
DBusGProxy *proxy;
- DBusGPendingCall *call;
GError *error;
const char *service;
const char *path;
@@ -64,9 +63,10 @@ main (int argc, char *argv[])
proxy = dbus_g_proxy_new_for_name (connection,
service, path,
DBUS_INTERFACE_INTROSPECTABLE);
- call = dbus_g_proxy_begin_call (proxy, "Introspect", G_TYPE_INVALID);
- if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING,
- &introspect_data, G_TYPE_INVALID))
+ if (!dbus_g_proxy_call (proxy, "Introspect", &error,
+ G_TYPE_INVALID,
+ G_TYPE_STRING, &introspect_data,
+ G_TYPE_INVALID))
{
fprintf (stderr, "Failed to get introspection data: %s\n",
error->message);
generated by cgit (git 2.34.1) at 2024-05-20 20:51:59 +0000