dbus/tools/dbus-names-model.c
Colin Walters 2ca6e95764 2005-07-06 Colin Walters <walters@verbum.org>
* dbus/dbus-glib.h (DBusGPendingCall, DBusGPendingCallNotify)
	(DBUS_TYPE_G_PENDING_CALL, dbus_g_pending_call_get_g_type)
	(dbus_g_pending_call_ref, dbus_g_pending_call_unref): Delete.
	(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel):
	Delete in favor of dbus_g_proxy_begin_call and
	dbus_g_proxy_cancel_call.
	(DBusGProxyCall, DBusGProxyCallNotify): New.
	(dbus_g_proxy_begin_call): Change prototype to take callback, user
	data, and destroy function.  This replaces
	dbus_g_pending_call_set_notify.
	(dbus_g_proxy_cancel_call): Prototype.
	(DBusGAsyncData): Delete, shouldn't be needed anymore.

	* glib/dbus-gproxy.c (struct _DBusGProxy): Add call_id_counter and
	pending_calls map.
	(struct _DBusGProxyManager): Add bus_proxy member, which is an
	internal proxy for calls to the bus. Remove
	pending_nameowner_calls, now the internal proxy keeps track.
	(dbus_g_proxy_manager_unref): Unref bus proxy, remove reference to
	pending_nameowner_calls.
	(got_name_owner_cb): Update prototype, and use
	dbus_g_proxy_end_call.
	(got_name_owner_cb): Remove reference to pending_nameowner_calls.
	(dbus_g_proxy_manager_register): Delete directly libdbus code in
	favor of using internal proxy.
	(dbus_g_proxy_manager_unregister): Update to use
	dbus_g_proxy_cancel_call for any pending GetNameOwner call.
	(dbus_g_proxy_init): Initialize pending calls map.
	(dbus_g_proxy_constructor): New.
	(dbus_g_proxy_class_init): Add get/set property functions,
	constructor, and add NAME, PATH, and INTERFACE properties.
	(cancel_pending_call): New function.
	(dbus_g_proxy_dispose): Iterate over any outstanding calls and
	cancel them.
	(dbus_g_proxy_set_property, dbus_g_proxy_get_property): New.
	(GPendingNotifyClosure): New structure.
	(d_pending_call_notify, d_pending_call_free): Moved here from
	dbus-glib.c.
	(DBUS_G_VALUE_ARRAY_COLLECT_ALL): Moved around to satisfy function
	ordering.
	(manager_begin_bus_call): New internal function for talking to
	internal bus proxy.
	(dbus_g_proxy_new): Construct object using GObjet properties.
	(dbus_g_proxy_begin_call_internal): Update to take user data, etc.
	Create closure of same, and insert call into map of pending calls.
	(dbus_g_proxy_end_call_internal): Take call id instead of pending
	call.  Look up pending call in current set.  Remove it when we've
	completed.
	(dbus_g_pending_call_end, dbus_g_proxy_end_call_internal): Delete.
	(dbus_g_proxy_begin_call): Change API to take callback, user data,
	and destroy function directly.
	(dbus_g_proxy_end_call): Update to take DBusGProxyCall.
	(dbus_g_proxy_call): Invoke with NULL callback.
	(dbus_g_proxy_cancel_call): New function, replaces
	dbus_g_pending_call_cancel.

	* glib/dbus-gparser.c (validate_signature): Fix call to
	dbus_set_g_error.

	* glib/dbus-gobject.c (dbus_g_object_type_dbus_metadata_quark):
	New quark for attaching metadata to GType.
	(info_hash): Delete.
	(lookup_object_info): Look up using quark.
	(dbus_g_object_type_install_info): Check that a type is classed,
	not that it's an object.  Also just install type data using quark
	instead of using global hash.

	* glib/dbus-glib.c (dbus_g_pending_call_ref)
	(dbus_g_pending_call_unref, dbus_pending_call_get_g_type)
	(GPendingNotifyClosure): Delete.
	(d_pending_call_notify, d_pending_call_free): Move to dbus-gproxy.c.
	(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel): Delete.

	* glib/dbus-binding-tool-glib.c (generate_client_glue): Disable async
	client method generation until we can fix it...

	* tools/dbus-viewer.c (load_child_nodes): Use dbus_g_proxy_call.
	(load_from_service_thread_func): Ditto.

	* tools/dbus-names-model.c (struct NamesModel): Hold
	DBusGProxyCall.
	(have_names_notify): Update prototype, use
	dbus_g_proxy_cancel_call.
	(names_model_reload): Update for new dbus_g_proxy_begin_call API.

	* tools/dbus-monitor.c (filter_func): Update for print_message
	API change.

	* test/glib/test-dbus-glib.c: Add more tests for async
	invocations.  Update many begin_call/end_call pairs to just use
	dbus_g_proxy_call.

	* tools/dbus-send.c (main): Add --print-reply=literal mode.  This
	allows us to dump print-introspect.c.

	* tools/dbus-print-message.h (print_message): Add literal argument
	to print_message which is intended to allow printing arguments without
	metadata like "string=".

	* tools/dbus-print-message.c (print_iter): Add literal argument.
	(print_message): Allow printing string messages literally.
2005-07-06 21:27:53 +00:00

388 lines
10 KiB
C

/* -*- mode: C; c-file-style: "gnu" -*- */
/* dbus-names-model.c GtkTreeModel for names on the bus
*
* Copyright (C) 2005 Red Hat, Inc.
*
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#include "dbus-names-model.h"
#include <glib/gi18n.h>
#include <string.h>
#include <dbus/dbus-protocol.h>
enum
{
MODEL_COLUMN_NAME,
MODEL_COLUMN_LAST
};
typedef struct NamesModel NamesModel;
typedef struct NamesModelClass NamesModelClass;
GType names_model_get_type (void);
struct NamesModel
{
GtkListStore parent;
DBusGConnection *connection;
DBusGProxy *driver_proxy;
DBusGProxyCall *pending_list_names;
};
struct NamesModelClass
{
GtkListStoreClass parent;
};
#define TYPE_NAMES_MODEL (names_model_get_type ())
#define NAMES_MODEL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TYPE_NAMES_MODEL, NamesModel))
#define NAMES_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NAMES_MODEL, NamesModelClass))
#define IS_NAMES_MODEL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TYPE_NAMES_MODEL))
#define IS_NAMES_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NAMES_MODEL))
#define NAMES_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NAMES_MODEL, NamesModelClass))
static void
have_names_notify (DBusGProxy *proxy,
DBusGProxyCall *call,
void *data)
{
NamesModel *names_model;
GError *error;
char **names;
int i;
names_model = NAMES_MODEL (data);
g_assert (names_model->pending_list_names == call);
g_assert (names_model->driver_proxy);
names = NULL;
error = NULL;
if (!dbus_g_proxy_end_call (names_model->driver_proxy,
names_model->pending_list_names,
&error,
G_TYPE_STRV, &names, G_TYPE_INVALID))
{
g_assert (names == NULL);
g_assert (error != NULL);
g_printerr (_("Failed to load names on the bus: %s\n"), error->message);
g_error_free (error);
return;
}
i = 0;
while (names[i])
{
GtkTreeIter iter;
#if 0
g_printerr ("%d of %d: %s\n",
i, n_elements, names[i]);
#endif
gtk_list_store_append (GTK_LIST_STORE (names_model),
&iter);
gtk_list_store_set (GTK_LIST_STORE (names_model),
&iter,
MODEL_COLUMN_NAME, names[i],
-1);
++i;
}
g_strfreev (names);
}
static gboolean
names_model_find_name (NamesModel *names_model,
const char *name,
GtkTreeIter *iter_p)
{
GtkTreeIter iter;
if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (names_model),
&iter))
return FALSE;
do
{
char *s;
gtk_tree_model_get (GTK_TREE_MODEL (names_model),
&iter,
MODEL_COLUMN_NAME, &s,
-1);
if (s && strcmp (s, name) == 0)
{
*iter_p = iter;
g_free (s);
return TRUE;
}
g_free (s);
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (names_model),
&iter));
return FALSE;
}
static void
name_owner_changed (DBusGProxy *driver_proxy,
const char *name,
const char *old_owner,
const char *new_owner,
void *data)
{
NamesModel *names_model = NAMES_MODEL (data);
#if 0
g_printerr ("Name '%s' changed owner '%s' -> '%s'\n",
name, old_owner, new_owner);
#endif
if (*new_owner == '\0')
{
/* this name has vanished */
GtkTreeIter iter;
if (names_model_find_name (names_model, name, &iter))
gtk_list_store_remove (GTK_LIST_STORE (names_model),
&iter);
}
else if (*old_owner == '\0')
{
/* this name has been added */
GtkTreeIter iter;
if (!names_model_find_name (names_model, name, &iter))
{
gtk_list_store_append (GTK_LIST_STORE (names_model),
&iter);
gtk_list_store_set (GTK_LIST_STORE (names_model),
&iter,
MODEL_COLUMN_NAME, name,
-1);
}
}
}
static void
names_model_reload (NamesModel *names_model)
{
GtkListStore *list_store;
list_store = GTK_LIST_STORE (names_model);
if (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;
}
gtk_list_store_clear (list_store);
if (names_model->connection == NULL)
return;
names_model->pending_list_names =
dbus_g_proxy_begin_call (names_model->driver_proxy,
"ListNames",
have_names_notify, names_model, NULL,
G_TYPE_INVALID);
}
static void
names_model_set_connection (NamesModel *names_model,
DBusGConnection *connection)
{
g_return_if_fail (IS_NAMES_MODEL (names_model));
if (connection == names_model->connection)
return;
if (names_model->connection)
{
dbus_g_proxy_disconnect_signal (names_model->driver_proxy,
"NameOwnerChanged",
G_CALLBACK (name_owner_changed),
names_model);
g_object_unref (names_model->driver_proxy);
names_model->driver_proxy = NULL;
dbus_g_connection_unref (names_model->connection);
names_model->connection = NULL;
}
if (connection)
{
names_model->connection = connection;
dbus_g_connection_ref (names_model->connection);
names_model->driver_proxy =
dbus_g_proxy_new_for_name (names_model->connection,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
g_assert (names_model->driver_proxy);
dbus_g_proxy_add_signal (names_model->driver_proxy,
"NameOwnerChanged",
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_INVALID);
dbus_g_proxy_connect_signal (names_model->driver_proxy,
"NameOwnerChanged",
G_CALLBACK (name_owner_changed),
names_model,
NULL);
}
names_model_reload (names_model);
}
G_DEFINE_TYPE(NamesModel, names_model, GTK_TYPE_LIST_STORE)
/* Properties */
enum
{
PROP_0,
PROP_CONNECTION
};
static void
names_model_dispose (GObject *object)
{
NamesModel *names_model = NAMES_MODEL (object);
names_model_set_connection (names_model, NULL);
g_assert (names_model->connection == NULL);
g_assert (names_model->driver_proxy == NULL);
g_assert (names_model->pending_list_names == NULL);
(G_OBJECT_CLASS (names_model_parent_class)->dispose) (object);
}
static void
names_model_finalize (GObject *object)
{
NamesModel *names_model = NAMES_MODEL (object);
g_assert (names_model->connection == NULL);
g_assert (names_model->driver_proxy == NULL);
g_assert (names_model->pending_list_names == NULL);
(G_OBJECT_CLASS (names_model_parent_class)->finalize) (object);
}
static void
names_model_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
NamesModel *names_model;
names_model = NAMES_MODEL (object);
switch (prop_id)
{
case PROP_CONNECTION:
names_model_set_connection (names_model, g_value_get_boxed (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
names_model_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
NamesModel *names_model;
names_model = NAMES_MODEL (object);
switch (prop_id)
{
case PROP_CONNECTION:
g_value_set_boxed (value, names_model->connection);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
names_model_init (NamesModel *names_model)
{
GtkListStore *list_store;
GType types[MODEL_COLUMN_LAST];
list_store = GTK_LIST_STORE (names_model);
types[0] = G_TYPE_STRING; /* name */
gtk_list_store_set_column_types (list_store, MODEL_COLUMN_LAST, types);
}
static void
names_model_class_init (NamesModelClass *names_model_class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (names_model_class);
gobject_class->finalize = names_model_finalize;
gobject_class->dispose = names_model_dispose;
gobject_class->set_property = names_model_set_property;
gobject_class->get_property = names_model_get_property;
g_object_class_install_property (gobject_class,
PROP_CONNECTION,
g_param_spec_boxed ("connection",
_("Bus connection"),
_("Connection to the message bus"),
DBUS_TYPE_G_CONNECTION,
G_PARAM_READWRITE));
}
GtkTreeModel*
names_model_new (DBusGConnection *connection)
{
NamesModel *names_model;
names_model = g_object_new (TYPE_NAMES_MODEL,
"connection", connection,
NULL);
return GTK_TREE_MODEL (names_model);
}