[gnome-disk-utility/udisks2-port] Update to latest gdbus-codegen changes
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility/udisks2-port] Update to latest gdbus-codegen changes
- Date: Thu, 17 Mar 2011 18:33:56 +0000 (UTC)
commit 53fea35a106df8c9d37eca17f185f69dca4f6247
Author: David Zeuthen <davidz redhat com>
Date: Thu Mar 17 14:33:27 2011 -0400
Update to latest gdbus-codegen changes
Signed-off-by: David Zeuthen <davidz redhat com>
src/palimpsest/gdudevicetreemodel.c | 152 ++++++++++++++++----------------
src/palimpsest/gduvolumegrid.c | 170 +++++++++++++++++-----------------
src/palimpsest/gduwindow.c | 156 ++++++++++++++++----------------
3 files changed, 238 insertions(+), 240 deletions(-)
---
diff --git a/src/palimpsest/gdudevicetreemodel.c b/src/palimpsest/gdudevicetreemodel.c
index bd5ca1b..8d18119 100644
--- a/src/palimpsest/gdudevicetreemodel.c
+++ b/src/palimpsest/gdudevicetreemodel.c
@@ -56,51 +56,51 @@ G_DEFINE_TYPE (GduDeviceTreeModel, gdu_device_tree_model, GTK_TYPE_TREE_STORE);
static void coldplug (GduDeviceTreeModel *model);
-static void on_object_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data);
-
-static void on_object_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data);
-
-static void on_interface_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data);
-
-static void on_interface_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data);
-
-static void on_interface_proxy_properties_changed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- GVariant *changed_properties,
- const gchar *const *invalidated_properties,
- gpointer user_data);
+static void on_object_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data);
+
+static void on_object_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data);
+
+static void on_interface_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data);
+
+static void on_interface_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data);
+
+static void on_interface_proxy_properties_changed (GDBusObjectManagerClient *manager,
+ GDBusObjectProxy *object_proxy,
+ GDBusProxy *interface_proxy,
+ GVariant *changed_properties,
+ const gchar *const *invalidated_properties,
+ gpointer user_data);
static void
gdu_device_tree_model_finalize (GObject *object)
{
GduDeviceTreeModel *model = GDU_DEVICE_TREE_MODEL (object);
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
- proxy_manager = udisks_client_get_proxy_manager (model->client);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_object_proxy_added),
+ object_manager = udisks_client_get_object_manager (model->client);
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_object_added),
model);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_object_proxy_removed),
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_object_removed),
model);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_interface_proxy_added),
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_interface_added),
model);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_interface_proxy_removed),
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_interface_removed),
model);
- g_signal_handlers_disconnect_by_func (proxy_manager,
+ g_signal_handlers_disconnect_by_func (object_manager,
G_CALLBACK (on_interface_proxy_properties_changed),
model);
@@ -279,7 +279,7 @@ gdu_device_tree_model_constructed (GObject *object)
{
GduDeviceTreeModel *model = GDU_DEVICE_TREE_MODEL (object);
GType types[GDU_DEVICE_TREE_MODEL_N_COLUMNS];
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
types[0] = G_TYPE_STRING;
types[1] = G_TYPE_BOOLEAN;
@@ -294,24 +294,24 @@ gdu_device_tree_model_constructed (GObject *object)
g_assert (gtk_tree_model_get_flags (GTK_TREE_MODEL (model)) & GTK_TREE_MODEL_ITERS_PERSIST);
- proxy_manager = udisks_client_get_proxy_manager (model->client);
- g_signal_connect (proxy_manager,
- "object-proxy-added",
- G_CALLBACK (on_object_proxy_added),
+ object_manager = udisks_client_get_object_manager (model->client);
+ g_signal_connect (object_manager,
+ "object-added",
+ G_CALLBACK (on_object_added),
model);
- g_signal_connect (proxy_manager,
- "object-proxy-removed",
- G_CALLBACK (on_object_proxy_removed),
+ g_signal_connect (object_manager,
+ "object-removed",
+ G_CALLBACK (on_object_removed),
model);
- g_signal_connect (proxy_manager,
- "interface-proxy-added",
- G_CALLBACK (on_interface_proxy_added),
+ g_signal_connect (object_manager,
+ "interface-added",
+ G_CALLBACK (on_interface_added),
model);
- g_signal_connect (proxy_manager,
- "interface-proxy-removed",
- G_CALLBACK (on_interface_proxy_removed),
+ g_signal_connect (object_manager,
+ "interface-removed",
+ G_CALLBACK (on_interface_removed),
model);
- g_signal_connect (proxy_manager,
+ g_signal_connect (object_manager,
"interface-proxy-properties-changed",
G_CALLBACK (on_interface_proxy_properties_changed),
model);
@@ -491,15 +491,15 @@ remove_lun (GduDeviceTreeModel *model,
static void
update_luns (GduDeviceTreeModel *model)
{
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
GList *objects;
GList *luns;
GList *added_luns;
GList *removed_luns;
GList *l;
- proxy_manager = udisks_client_get_proxy_manager (model->client);
- objects = g_dbus_proxy_manager_get_objects (proxy_manager);
+ object_manager = udisks_client_get_object_manager (model->client);
+ objects = g_dbus_object_manager_get_objects (object_manager);
luns = NULL;
for (l = objects; l != NULL; l = l->next)
@@ -726,15 +726,15 @@ should_include_block (GDBusObject *object)
static void
update_blocks (GduDeviceTreeModel *model)
{
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
GList *objects;
GList *blocks;
GList *added_blocks;
GList *removed_blocks;
GList *l;
- proxy_manager = udisks_client_get_proxy_manager (model->client);
- objects = g_dbus_proxy_manager_get_objects (proxy_manager);
+ object_manager = udisks_client_get_object_manager (model->client);
+ objects = g_dbus_object_manager_get_objects (object_manager);
blocks = NULL;
for (l = objects; l != NULL; l = l->next)
@@ -804,50 +804,50 @@ coldplug (GduDeviceTreeModel *model)
}
static void
-on_object_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data)
+on_object_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data)
{
GduDeviceTreeModel *model = GDU_DEVICE_TREE_MODEL (user_data);
update_all (model);
}
static void
-on_object_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data)
+on_object_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data)
{
GduDeviceTreeModel *model = GDU_DEVICE_TREE_MODEL (user_data);
update_all (model);
}
static void
-on_interface_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data)
+on_interface_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data)
{
GduDeviceTreeModel *model = GDU_DEVICE_TREE_MODEL (user_data);
update_all (model);
}
static void
-on_interface_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data)
+on_interface_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data)
{
GduDeviceTreeModel *model = GDU_DEVICE_TREE_MODEL (user_data);
update_all (model);
}
static void
-on_interface_proxy_properties_changed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- GVariant *changed_properties,
- const gchar *const *invalidated_properties,
- gpointer user_data)
+on_interface_proxy_properties_changed (GDBusObjectManagerClient *manager,
+ GDBusObjectProxy *object_proxy,
+ GDBusProxy *interface_proxy,
+ GVariant *changed_properties,
+ const gchar *const *invalidated_properties,
+ gpointer user_data)
{
GduDeviceTreeModel *model = GDU_DEVICE_TREE_MODEL (user_data);
update_all (model);
diff --git a/src/palimpsest/gduvolumegrid.c b/src/palimpsest/gduvolumegrid.c
index 910ff86..fb62899 100644
--- a/src/palimpsest/gduvolumegrid.c
+++ b/src/palimpsest/gduvolumegrid.c
@@ -138,30 +138,30 @@ enum
static guint signals[LAST_SIGNAL] = {0};
-static void on_object_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data);
-
-static void on_object_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data);
-
-static void on_interface_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data);
-
-static void on_interface_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data);
-
-static void on_interface_proxy_properties_changed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- GVariant *changed_properties,
- const gchar *const *invalidated_properties,
- gpointer user_data);
+static void on_object_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data);
+
+static void on_object_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data);
+
+static void on_interface_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data);
+
+static void on_interface_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data);
+
+static void on_interface_proxy_properties_changed (GDBusObjectManagerClient *manager,
+ GDBusObjectProxy *object_proxy,
+ GDBusProxy *interface_proxy,
+ GVariant *changed_properties,
+ const gchar *const *invalidated_properties,
+ gpointer user_data);
G_DEFINE_TYPE (GduVolumeGrid, gdu_volume_grid, GTK_TYPE_WIDGET)
@@ -186,26 +186,26 @@ static void
gdu_volume_grid_finalize (GObject *object)
{
GduVolumeGrid *grid = GDU_VOLUME_GRID (object);
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
if (grid->container_icon != NULL)
g_object_unref (grid->container_icon);
g_free (grid->container_markup);
- proxy_manager = udisks_client_get_proxy_manager (grid->client);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_object_proxy_added),
+ object_manager = udisks_client_get_object_manager (grid->client);
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_object_added),
grid);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_object_proxy_removed),
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_object_removed),
grid);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_interface_proxy_added),
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_interface_added),
grid);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_interface_proxy_removed),
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_interface_removed),
grid);
- g_signal_handlers_disconnect_by_func (proxy_manager,
+ g_signal_handlers_disconnect_by_func (object_manager,
G_CALLBACK (on_interface_proxy_properties_changed),
grid);
@@ -277,26 +277,26 @@ static void
gdu_volume_grid_constructed (GObject *object)
{
GduVolumeGrid *grid = GDU_VOLUME_GRID (object);
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
- proxy_manager = udisks_client_get_proxy_manager (grid->client);
- g_signal_connect (proxy_manager,
- "object-proxy-added",
- G_CALLBACK (on_object_proxy_added),
+ object_manager = udisks_client_get_object_manager (grid->client);
+ g_signal_connect (object_manager,
+ "object-added",
+ G_CALLBACK (on_object_added),
grid);
- g_signal_connect (proxy_manager,
- "object-proxy-removed",
- G_CALLBACK (on_object_proxy_removed),
+ g_signal_connect (object_manager,
+ "object-removed",
+ G_CALLBACK (on_object_removed),
grid);
- g_signal_connect (proxy_manager,
- "interface-proxy-added",
- G_CALLBACK (on_interface_proxy_added),
+ g_signal_connect (object_manager,
+ "interface-added",
+ G_CALLBACK (on_interface_added),
grid);
- g_signal_connect (proxy_manager,
- "interface-proxy-removed",
- G_CALLBACK (on_interface_proxy_removed),
+ g_signal_connect (object_manager,
+ "interface-removed",
+ G_CALLBACK (on_interface_removed),
grid);
- g_signal_connect (proxy_manager,
+ g_signal_connect (object_manager,
"interface-proxy-properties-changed",
G_CALLBACK (on_interface_proxy_properties_changed),
grid);
@@ -1446,15 +1446,15 @@ static GDBusObject *
lookup_cleartext_device_for_crypto_device (GduVolumeGrid *grid,
const gchar *object_path)
{
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
GDBusObject *ret;
GList *objects;
GList *l;
ret = NULL;
- proxy_manager = udisks_client_get_proxy_manager (grid->client);
- objects = g_dbus_proxy_manager_get_objects (proxy_manager);
+ object_manager = udisks_client_get_object_manager (grid->client);
+ objects = g_dbus_object_manager_get_objects (object_manager);
for (l = objects; l != NULL; l = l->next)
{
GDBusObject *object = G_DBUS_OBJECT (l->data);
@@ -1641,7 +1641,7 @@ recompute_grid (GduVolumeGrid *grid)
GList *logical_partitions;
GDBusObject *extended_partition;
GList *objects;
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
GList *l;
const gchar *top_object_path;
UDisksBlockDevice *top_block;
@@ -1719,8 +1719,8 @@ recompute_grid (GduVolumeGrid *grid)
partitions = NULL;
logical_partitions = NULL;
extended_partition = NULL;
- proxy_manager = udisks_client_get_proxy_manager (grid->client);
- objects = g_dbus_proxy_manager_get_objects (proxy_manager);
+ object_manager = udisks_client_get_object_manager (grid->client);
+ objects = g_dbus_object_manager_get_objects (object_manager);
for (l = objects; l != NULL; l = l->next)
{
GDBusObject *object = G_DBUS_OBJECT (l->data);
@@ -2007,8 +2007,8 @@ gdu_volume_grid_includes_object (GduVolumeGrid *grid,
if (block != NULL)
{
crypto_backing_device = udisks_block_device_get_crypto_backing_device (block);
- crypto_object = g_dbus_proxy_manager_get_object (udisks_client_get_proxy_manager (grid->client),
- crypto_backing_device);
+ crypto_object = g_dbus_object_manager_get_object (udisks_client_get_object_manager (grid->client),
+ crypto_backing_device);
if (crypto_object != NULL)
{
if (is_disk_or_partition_in_grid (grid, crypto_object))
@@ -2029,60 +2029,60 @@ gdu_volume_grid_includes_object (GduVolumeGrid *grid,
static void
maybe_update (GduVolumeGrid *grid,
- GDBusObjectProxy *object_proxy)
+ GDBusObject *object)
{
- if (gdu_volume_grid_includes_object (grid, G_DBUS_OBJECT (object_proxy)))
+ if (gdu_volume_grid_includes_object (grid, object))
recompute_grid (grid);
}
static void
-on_object_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data)
+on_object_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data)
{
GduVolumeGrid *grid = GDU_VOLUME_GRID (user_data);
- maybe_update (grid, object_proxy);
+ maybe_update (grid, object);
}
static void
-on_object_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data)
+on_object_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data)
{
GduVolumeGrid *grid = GDU_VOLUME_GRID (user_data);
- maybe_update (grid, object_proxy);
+ maybe_update (grid, object);
}
static void
-on_interface_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data)
+on_interface_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data)
{
GduVolumeGrid *grid = GDU_VOLUME_GRID (user_data);
- maybe_update (grid, object_proxy);
+ maybe_update (grid, object);
}
static void
-on_interface_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data)
+on_interface_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data)
{
GduVolumeGrid *grid = GDU_VOLUME_GRID (user_data);
- maybe_update (grid, object_proxy);
+ maybe_update (grid, object);
}
static void
-on_interface_proxy_properties_changed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- GVariant *changed_properties,
- const gchar *const *invalidated_properties,
- gpointer user_data)
+on_interface_proxy_properties_changed (GDBusObjectManagerClient *manager,
+ GDBusObjectProxy *object_proxy,
+ GDBusProxy *interface_proxy,
+ GVariant *changed_properties,
+ const gchar *const *invalidated_properties,
+ gpointer user_data)
{
GduVolumeGrid *grid = GDU_VOLUME_GRID (user_data);
- maybe_update (grid, object_proxy);
+ maybe_update (grid, G_DBUS_OBJECT (object_proxy));
}
/* ---------------------------------------------------------------------------------------------------- */
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index 0fcfaa8..2849ad3 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -84,53 +84,51 @@ gdu_window_init (GduWindow *window)
NULL);
}
-static void on_object_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data);
-
-static void on_object_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data);
-
-static void on_interface_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data);
-
-static void on_interface_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data);
-
-static void on_interface_proxy_properties_changed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- GVariant *changed_properties,
- const gchar *const *invalidated_properties,
- gpointer user_data);
+static void on_object_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data);
+
+static void on_object_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data);
+
+static void on_interface_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data);
+
+static void on_interface_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data);
+
+static void on_interface_proxy_properties_changed (GDBusObjectManagerClient *manager,
+ GDBusObjectProxy *object_proxy,
+ GDBusProxy *interface_proxy,
+ GVariant *changed_properties,
+ const gchar *const *invalidated_properties,
+ gpointer user_data);
static void
gdu_window_finalize (GObject *object)
{
GduWindow *window = GDU_WINDOW (object);
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
- g_hash_table_unref (window->label_connections);
-
- proxy_manager = udisks_client_get_proxy_manager (window->client);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_object_proxy_added),
+ object_manager = udisks_client_get_object_manager (window->client);
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_object_added),
window);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_object_proxy_removed),
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_object_removed),
window);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_interface_proxy_added),
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_interface_added),
window);
- g_signal_handlers_disconnect_by_func (proxy_manager,
- G_CALLBACK (on_interface_proxy_removed),
+ g_signal_handlers_disconnect_by_func (object_manager,
+ G_CALLBACK (on_interface_removed),
window);
- g_signal_handlers_disconnect_by_func (proxy_manager,
+ g_signal_handlers_disconnect_by_func (object_manager,
G_CALLBACK (on_interface_proxy_properties_changed),
window);
@@ -244,7 +242,7 @@ gdu_window_constructed (GObject *object)
GtkWidget *w;
GtkWidget *label;
GtkStyleContext *context;
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
/* chain up */
if (G_OBJECT_CLASS (gdu_window_parent_class)->constructed != NULL)
@@ -338,24 +336,24 @@ gdu_window_constructed (GObject *object)
window);
gtk_tree_view_expand_all (tree_view);
- proxy_manager = udisks_client_get_proxy_manager (window->client);
- g_signal_connect (proxy_manager,
- "object-proxy-added",
- G_CALLBACK (on_object_proxy_added),
+ object_manager = udisks_client_get_object_manager (window->client);
+ g_signal_connect (object_manager,
+ "object-added",
+ G_CALLBACK (on_object_added),
window);
- g_signal_connect (proxy_manager,
- "object-proxy-removed",
- G_CALLBACK (on_object_proxy_removed),
+ g_signal_connect (object_manager,
+ "object-removed",
+ G_CALLBACK (on_object_removed),
window);
- g_signal_connect (proxy_manager,
- "interface-proxy-added",
- G_CALLBACK (on_interface_proxy_added),
+ g_signal_connect (object_manager,
+ "interface-added",
+ G_CALLBACK (on_interface_added),
window);
- g_signal_connect (proxy_manager,
- "interface-proxy-removed",
- G_CALLBACK (on_interface_proxy_removed),
+ g_signal_connect (object_manager,
+ "interface-removed",
+ G_CALLBACK (on_interface_removed),
window);
- g_signal_connect (proxy_manager,
+ g_signal_connect (object_manager,
"interface-proxy-properties-changed",
G_CALLBACK (on_interface_proxy_properties_changed),
window);
@@ -606,10 +604,10 @@ get_top_level_block_devices_for_lun (GduWindow *window,
GList *ret;
GList *l;
GList *object_proxies;
- GDBusProxyManager *proxy_manager;
+ GDBusObjectManager *object_manager;
- proxy_manager = udisks_client_get_proxy_manager (window->client);
- object_proxies = g_dbus_proxy_manager_get_objects (proxy_manager);
+ object_manager = udisks_client_get_object_manager (window->client);
+ object_proxies = g_dbus_object_manager_get_objects (object_manager);
ret = NULL;
for (l = object_proxies; l != NULL; l = l->next)
@@ -805,50 +803,50 @@ update_all (GduWindow *window,
}
static void
-on_object_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data)
+on_object_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
- update_all (window, G_DBUS_OBJECT (object_proxy));
+ update_all (window, object);
}
static void
-on_object_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- gpointer user_data)
+on_object_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
- update_all (window, G_DBUS_OBJECT (object_proxy));
+ update_all (window, object);
}
static void
-on_interface_proxy_added (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data)
+on_interface_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
- update_all (window, G_DBUS_OBJECT (object_proxy));
+ update_all (window, object);
}
static void
-on_interface_proxy_removed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- gpointer user_data)
+on_interface_removed (GDBusObjectManager *manager,
+ GDBusObject *object,
+ GDBusInterface *interface,
+ gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
- update_all (window, G_DBUS_OBJECT (object_proxy));
+ update_all (window, object);
}
static void
-on_interface_proxy_properties_changed (GDBusProxyManager *manager,
- GDBusObjectProxy *object_proxy,
- GDBusProxy *interface_proxy,
- GVariant *changed_properties,
- const gchar *const *invalidated_properties,
- gpointer user_data)
+on_interface_proxy_properties_changed (GDBusObjectManagerClient *manager,
+ GDBusObjectProxy *object_proxy,
+ GDBusProxy *interface_proxy,
+ GVariant *changed_properties,
+ const gchar *const *invalidated_properties,
+ gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
update_all (window, G_DBUS_OBJECT (object_proxy));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
