[gnome-disk-utility/udisks2-port] Update to latest GDBus codegen
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility/udisks2-port] Update to latest GDBus codegen
- Date: Wed, 16 Mar 2011 19:45:49 +0000 (UTC)
commit 48fe5482083c0898a9103296c889d587da4d8c83
Author: David Zeuthen <davidz redhat com>
Date: Wed Mar 16 15:45:21 2011 -0400
Update to latest GDBus codegen
Signed-off-by: David Zeuthen <davidz redhat com>
src/palimpsest/gdudevicetreemodel.c | 156 ++++++++++++++--------------
src/palimpsest/gdudevicetreemodel.h | 2 +-
src/palimpsest/gduvolumegrid.c | 192 +++++++++++++++++-----------------
src/palimpsest/gduvolumegrid.h | 10 +-
src/palimpsest/gduwindow.c | 186 +++++++++++++++++-----------------
5 files changed, 273 insertions(+), 273 deletions(-)
---
diff --git a/src/palimpsest/gdudevicetreemodel.c b/src/palimpsest/gdudevicetreemodel.c
index 33e4e59..bd5ca1b 100644
--- a/src/palimpsest/gdudevicetreemodel.c
+++ b/src/palimpsest/gdudevicetreemodel.c
@@ -158,25 +158,25 @@ gdu_device_tree_model_set_property (GObject *object,
typedef struct
{
- GDBusObjectProxy *object;
+ GDBusObject *object;
GtkTreeIter iter;
gboolean found;
} FindIterData;
static gboolean
-find_iter_for_object_proxy_cb (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer user_data)
+find_iter_for_object_cb (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer user_data)
{
FindIterData *data = user_data;
- GDBusObjectProxy *iter_object;
+ GDBusObject *iter_object;
iter_object = NULL;
gtk_tree_model_get (model,
iter,
- GDU_DEVICE_TREE_MODEL_COLUMN_OBJECT_PROXY, &iter_object,
+ GDU_DEVICE_TREE_MODEL_COLUMN_OBJECT, &iter_object,
-1);
if (iter_object == NULL)
goto out;
@@ -195,9 +195,9 @@ find_iter_for_object_proxy_cb (GtkTreeModel *model,
}
static gboolean
-find_iter_for_object_proxy (GduDeviceTreeModel *model,
- GDBusObjectProxy *object,
- GtkTreeIter *out_iter)
+find_iter_for_object (GduDeviceTreeModel *model,
+ GDBusObject *object,
+ GtkTreeIter *out_iter)
{
FindIterData data;
@@ -205,7 +205,7 @@ find_iter_for_object_proxy (GduDeviceTreeModel *model,
data.object = object;
data.found = FALSE;
gtk_tree_model_foreach (GTK_TREE_MODEL (model),
- find_iter_for_object_proxy_cb,
+ find_iter_for_object_cb,
&data);
if (data.found)
{
@@ -265,11 +265,11 @@ diff_sorted_lists (GList *list1,
/* ---------------------------------------------------------------------------------------------------- */
static gint
-_g_dbus_object_proxy_compare (GDBusObjectProxy *a,
- GDBusObjectProxy *b)
+_g_dbus_object_compare (GDBusObject *a,
+ GDBusObject *b)
{
- return g_strcmp0 (g_dbus_object_proxy_get_object_path (a),
- g_dbus_object_proxy_get_object_path (b));
+ return g_strcmp0 (g_dbus_object_get_object_path (a),
+ g_dbus_object_get_object_path (b));
}
/* ---------------------------------------------------------------------------------------------------- */
@@ -286,7 +286,7 @@ gdu_device_tree_model_constructed (GObject *object)
types[2] = G_TYPE_STRING;
types[3] = G_TYPE_ICON;
types[4] = G_TYPE_STRING;
- types[5] = G_TYPE_DBUS_OBJECT_PROXY;
+ types[5] = G_TYPE_DBUS_OBJECT;
G_STATIC_ASSERT (6 == GDU_DEVICE_TREE_MODEL_N_COLUMNS);
gtk_tree_store_set_column_types (GTK_TREE_STORE (model),
GDU_DEVICE_TREE_MODEL_N_COLUMNS,
@@ -422,7 +422,7 @@ nuke_lun_header (GduDeviceTreeModel *model)
static void
add_lun (GduDeviceTreeModel *model,
- GDBusObjectProxy *object_proxy,
+ GDBusObject *object,
GtkTreeIter *parent)
{
UDisksLun *lun;
@@ -434,7 +434,7 @@ add_lun (GduDeviceTreeModel *model,
gchar *sort_key;
GtkTreeIter iter;
- lun = UDISKS_PEEK_LUN (object_proxy);
+ lun = UDISKS_PEEK_LUN (object);
udisks_util_get_lun_info (lun, &name, &description, &drive_icon, &media_icon);
s = g_strdup_printf ("%s\n"
"<small><span foreground=\"#555555\">%s</span></small>",
@@ -445,11 +445,11 @@ add_lun (GduDeviceTreeModel *model,
// " drive_icon=%s\n"
// " media_icon=%s\n"
// "\n",
- // g_dbus_object_proxy_get_object_path (object_proxy),
+ // g_dbus_object_get_object_path (object),
// g_icon_to_string (drive_icon),
// g_icon_to_string (media_icon));
- sort_key = g_strdup (g_dbus_object_proxy_get_object_path (object_proxy)); /* for now */
+ sort_key = g_strdup (g_dbus_object_get_object_path (object)); /* for now */
gtk_tree_store_insert_with_values (GTK_TREE_STORE (model),
&iter,
parent,
@@ -457,7 +457,7 @@ add_lun (GduDeviceTreeModel *model,
GDU_DEVICE_TREE_MODEL_COLUMN_ICON, drive_icon,
GDU_DEVICE_TREE_MODEL_COLUMN_NAME, s,
GDU_DEVICE_TREE_MODEL_COLUMN_SORT_KEY, sort_key,
- GDU_DEVICE_TREE_MODEL_COLUMN_OBJECT_PROXY, object_proxy,
+ GDU_DEVICE_TREE_MODEL_COLUMN_OBJECT, object,
-1);
g_object_unref (media_icon);
g_object_unref (drive_icon);
@@ -469,16 +469,16 @@ add_lun (GduDeviceTreeModel *model,
static void
remove_lun (GduDeviceTreeModel *model,
- GDBusObjectProxy *object_proxy)
+ GDBusObject *object)
{
GtkTreeIter iter;
- if (!find_iter_for_object_proxy (model,
- object_proxy,
- &iter))
+ if (!find_iter_for_object (model,
+ object,
+ &iter))
{
- g_warning ("Error finding iter for object proxy at %s",
- g_dbus_object_proxy_get_object_path (object_proxy));
+ g_warning ("Error finding iter for object at %s",
+ g_dbus_object_get_object_path (object));
goto out;
}
@@ -492,49 +492,49 @@ static void
update_luns (GduDeviceTreeModel *model)
{
GDBusProxyManager *proxy_manager;
- GList *object_proxies;
+ GList *objects;
GList *luns;
GList *added_luns;
GList *removed_luns;
GList *l;
proxy_manager = udisks_client_get_proxy_manager (model->client);
- object_proxies = g_dbus_proxy_manager_get_all (proxy_manager);
+ objects = g_dbus_proxy_manager_get_objects (proxy_manager);
luns = NULL;
- for (l = object_proxies; l != NULL; l = l->next)
+ for (l = objects; l != NULL; l = l->next)
{
- GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data);
+ GDBusObject *object = G_DBUS_OBJECT (l->data);
UDisksLun *lun;
- lun = UDISKS_PEEK_LUN (object_proxy);
+ lun = UDISKS_PEEK_LUN (object);
if (lun == NULL)
continue;
- luns = g_list_prepend (luns, g_object_ref (object_proxy));
+ luns = g_list_prepend (luns, g_object_ref (object));
}
- luns = g_list_sort (luns, (GCompareFunc) _g_dbus_object_proxy_compare);
- model->current_luns = g_list_sort (model->current_luns, (GCompareFunc) _g_dbus_object_proxy_compare);
+ luns = g_list_sort (luns, (GCompareFunc) _g_dbus_object_compare);
+ model->current_luns = g_list_sort (model->current_luns, (GCompareFunc) _g_dbus_object_compare);
diff_sorted_lists (model->current_luns,
luns,
- (GCompareFunc) _g_dbus_object_proxy_compare,
+ (GCompareFunc) _g_dbus_object_compare,
&added_luns,
&removed_luns);
for (l = removed_luns; l != NULL; l = l->next)
{
- GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data);
- g_assert (g_list_find (model->current_luns, object_proxy) != NULL);
- model->current_luns = g_list_remove (model->current_luns, object_proxy);
- remove_lun (model, object_proxy);
- g_object_unref (object_proxy);
+ GDBusObject *object = G_DBUS_OBJECT (l->data);
+ g_assert (g_list_find (model->current_luns, object) != NULL);
+ model->current_luns = g_list_remove (model->current_luns, object);
+ remove_lun (model, object);
+ g_object_unref (object);
}
for (l = added_luns; l != NULL; l = l->next)
{
- GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data);
- model->current_luns = g_list_prepend (model->current_luns, g_object_ref (object_proxy));
- add_lun (model, object_proxy, get_lun_header_iter (model));
+ GDBusObject *object = G_DBUS_OBJECT (l->data);
+ model->current_luns = g_list_prepend (model->current_luns, g_object_ref (object));
+ add_lun (model, object, get_lun_header_iter (model));
}
if (g_list_length (model->current_luns) == 0)
@@ -545,8 +545,8 @@ update_luns (GduDeviceTreeModel *model)
g_list_foreach (luns, (GFunc) g_object_unref, NULL);
g_list_free (luns);
- g_list_foreach (object_proxies, (GFunc) g_object_unref, NULL);
- g_list_free (object_proxies);
+ g_list_foreach (objects, (GFunc) g_object_unref, NULL);
+ g_list_free (objects);
}
/* ---------------------------------------------------------------------------------------------------- */
@@ -589,7 +589,7 @@ nuke_block_header (GduDeviceTreeModel *model)
static void
add_block (GduDeviceTreeModel *model,
- GDBusObjectProxy *object_proxy,
+ GDBusObject *object,
GtkTreeIter *parent)
{
UDisksBlockDevice *block;
@@ -602,7 +602,7 @@ add_block (GduDeviceTreeModel *model,
guint64 size;
gchar *size_str;
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
size = udisks_block_device_get_size (block);
size_str = udisks_util_get_size_for_display (size, FALSE, FALSE);
@@ -642,7 +642,7 @@ add_block (GduDeviceTreeModel *model,
preferred_device);
}
- sort_key = g_strdup (g_dbus_object_proxy_get_object_path (object_proxy)); /* for now */
+ sort_key = g_strdup (g_dbus_object_get_object_path (object)); /* for now */
gtk_tree_store_insert_with_values (GTK_TREE_STORE (model),
&iter,
parent,
@@ -650,7 +650,7 @@ add_block (GduDeviceTreeModel *model,
GDU_DEVICE_TREE_MODEL_COLUMN_ICON, icon,
GDU_DEVICE_TREE_MODEL_COLUMN_NAME, s,
GDU_DEVICE_TREE_MODEL_COLUMN_SORT_KEY, sort_key,
- GDU_DEVICE_TREE_MODEL_COLUMN_OBJECT_PROXY, object_proxy,
+ GDU_DEVICE_TREE_MODEL_COLUMN_OBJECT, object,
-1);
g_object_unref (icon);
g_free (sort_key);
@@ -660,16 +660,16 @@ add_block (GduDeviceTreeModel *model,
static void
remove_block (GduDeviceTreeModel *model,
- GDBusObjectProxy *object_proxy)
+ GDBusObject *object)
{
GtkTreeIter iter;
- if (!find_iter_for_object_proxy (model,
- object_proxy,
- &iter))
+ if (!find_iter_for_object (model,
+ object,
+ &iter))
{
- g_warning ("Error finding iter for object proxy at %s",
- g_dbus_object_proxy_get_object_path (object_proxy));
+ g_warning ("Error finding iter for object at %s",
+ g_dbus_object_get_object_path (object));
goto out;
}
@@ -680,7 +680,7 @@ remove_block (GduDeviceTreeModel *model,
}
static gboolean
-should_include_block (GDBusObjectProxy *object_proxy)
+should_include_block (GDBusObject *object)
{
UDisksBlockDevice *block;
gboolean ret;
@@ -691,7 +691,7 @@ should_include_block (GDBusObjectProxy *object_proxy)
ret = FALSE;
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
/* RAM devices are useless */
device = udisks_block_device_get_device (block);
@@ -727,52 +727,52 @@ static void
update_blocks (GduDeviceTreeModel *model)
{
GDBusProxyManager *proxy_manager;
- GList *object_proxies;
+ GList *objects;
GList *blocks;
GList *added_blocks;
GList *removed_blocks;
GList *l;
proxy_manager = udisks_client_get_proxy_manager (model->client);
- object_proxies = g_dbus_proxy_manager_get_all (proxy_manager);
+ objects = g_dbus_proxy_manager_get_objects (proxy_manager);
blocks = NULL;
- for (l = object_proxies; l != NULL; l = l->next)
+ for (l = objects; l != NULL; l = l->next)
{
- GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data);
+ GDBusObject *object = G_DBUS_OBJECT (l->data);
UDisksBlockDevice *block;
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
if (block == NULL)
continue;
- if (should_include_block (object_proxy))
- blocks = g_list_prepend (blocks, g_object_ref (object_proxy));
+ if (should_include_block (object))
+ blocks = g_list_prepend (blocks, g_object_ref (object));
}
- blocks = g_list_sort (blocks, (GCompareFunc) _g_dbus_object_proxy_compare);
- model->current_blocks = g_list_sort (model->current_blocks, (GCompareFunc) _g_dbus_object_proxy_compare);
+ blocks = g_list_sort (blocks, (GCompareFunc) _g_dbus_object_compare);
+ model->current_blocks = g_list_sort (model->current_blocks, (GCompareFunc) _g_dbus_object_compare);
diff_sorted_lists (model->current_blocks,
blocks,
- (GCompareFunc) _g_dbus_object_proxy_compare,
+ (GCompareFunc) _g_dbus_object_compare,
&added_blocks,
&removed_blocks);
for (l = removed_blocks; l != NULL; l = l->next)
{
- GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data);
+ GDBusObject *object = G_DBUS_OBJECT (l->data);
- g_assert (g_list_find (model->current_blocks, object_proxy) != NULL);
+ g_assert (g_list_find (model->current_blocks, object) != NULL);
- model->current_blocks = g_list_remove (model->current_blocks, object_proxy);
- remove_block (model, object_proxy);
- g_object_unref (object_proxy);
+ model->current_blocks = g_list_remove (model->current_blocks, object);
+ remove_block (model, object);
+ g_object_unref (object);
}
for (l = added_blocks; l != NULL; l = l->next)
{
- GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data);
- model->current_blocks = g_list_prepend (model->current_blocks, g_object_ref (object_proxy));
- add_block (model, object_proxy, get_block_header_iter (model));
+ GDBusObject *object = G_DBUS_OBJECT (l->data);
+ model->current_blocks = g_list_prepend (model->current_blocks, g_object_ref (object));
+ add_block (model, object, get_block_header_iter (model));
}
if (g_list_length (model->current_blocks) == 0)
@@ -783,8 +783,8 @@ update_blocks (GduDeviceTreeModel *model)
g_list_foreach (blocks, (GFunc) g_object_unref, NULL);
g_list_free (blocks);
- g_list_foreach (object_proxies, (GFunc) g_object_unref, NULL);
- g_list_free (object_proxies);
+ g_list_foreach (objects, (GFunc) g_object_unref, NULL);
+ g_list_free (objects);
}
/* ---------------------------------------------------------------------------------------------------- */
diff --git a/src/palimpsest/gdudevicetreemodel.h b/src/palimpsest/gdudevicetreemodel.h
index ae2a160..8dfd479 100644
--- a/src/palimpsest/gdudevicetreemodel.h
+++ b/src/palimpsest/gdudevicetreemodel.h
@@ -39,7 +39,7 @@ enum
GDU_DEVICE_TREE_MODEL_COLUMN_HEADING_TEXT,
GDU_DEVICE_TREE_MODEL_COLUMN_ICON,
GDU_DEVICE_TREE_MODEL_COLUMN_NAME,
- GDU_DEVICE_TREE_MODEL_COLUMN_OBJECT_PROXY,
+ GDU_DEVICE_TREE_MODEL_COLUMN_OBJECT,
GDU_DEVICE_TREE_MODEL_N_COLUMNS
};
diff --git a/src/palimpsest/gduvolumegrid.c b/src/palimpsest/gduvolumegrid.c
index 40036ae..910ff86 100644
--- a/src/palimpsest/gduvolumegrid.c
+++ b/src/palimpsest/gduvolumegrid.c
@@ -52,7 +52,7 @@ struct GridElement
/* these values are set in recompute_grid() */
gint fixed_width;
gdouble size_ratio;
- GDBusObjectProxy *object_proxy;
+ GDBusObject *object;
guint64 offset;
guint64 size;
@@ -84,8 +84,8 @@ grid_element_free (GridElement *element)
{
if (element->icon != NULL)
g_object_unref (element->icon);
- if (element->object_proxy != NULL)
- g_object_unref (element->object_proxy);
+ if (element->object != NULL)
+ g_object_unref (element->object);
g_free (element->markup);
g_list_foreach (element->embedded_elements, (GFunc) grid_element_free, NULL);
g_list_free (element->embedded_elements);
@@ -101,7 +101,7 @@ struct _GduVolumeGrid
GtkWidget parent;
UDisksClient *client;
- GDBusObjectProxy *block_device;
+ GDBusObject *block_device;
gboolean container_visible;
gchar *container_markup;
@@ -590,7 +590,7 @@ gdu_volume_grid_class_init (GduVolumeGridClass *klass)
g_param_spec_object ("block-device",
"Block Device",
"The top-level block device to show a grid for",
- G_TYPE_DBUS_OBJECT_PROXY,
+ G_TYPE_DBUS_OBJECT,
G_PARAM_READABLE |
G_PARAM_WRITABLE |
G_PARAM_STATIC_STRINGS));
@@ -622,7 +622,7 @@ gdu_volume_grid_new (UDisksClient *client)
NULL));
}
-GDBusObjectProxy *
+GDBusObject *
gdu_volume_grid_get_block_device (GduVolumeGrid *grid)
{
g_return_val_if_fail (GDU_IS_VOLUME_GRID (grid), NULL);
@@ -631,7 +631,7 @@ gdu_volume_grid_get_block_device (GduVolumeGrid *grid)
void
gdu_volume_grid_set_block_device (GduVolumeGrid *grid,
- GDBusObjectProxy *block_device)
+ GDBusObject *block_device)
{
g_return_if_fail (GDU_IS_VOLUME_GRID (grid));
@@ -1387,9 +1387,9 @@ find_element_for_position (GduVolumeGrid *grid,
}
static GridElement *
-do_find_element_for_offset_and_object_proxy (GList *elements,
- guint64 offset,
- GDBusObjectProxy *object_proxy)
+do_find_element_for_offset_and_object (GList *elements,
+ guint64 offset,
+ GDBusObject *object)
{
GList *l;
GridElement *ret;
@@ -1400,13 +1400,13 @@ do_find_element_for_offset_and_object_proxy (GList *elements,
{
GridElement *e = l->data;
- if (e->offset == offset && e->object_proxy == object_proxy)
+ if (e->offset == offset && e->object == object)
{
ret = e;
goto out;
}
- ret = do_find_element_for_offset_and_object_proxy (e->embedded_elements, offset, object_proxy);
+ ret = do_find_element_for_offset_and_object (e->embedded_elements, offset, object);
if (ret != NULL)
goto out;
}
@@ -1416,16 +1416,16 @@ do_find_element_for_offset_and_object_proxy (GList *elements,
}
static GridElement *
-find_element_for_offset_and_object_proxy (GduVolumeGrid *grid,
- guint64 offset,
- GDBusObjectProxy *object_proxy)
+find_element_for_offset_and_object (GduVolumeGrid *grid,
+ guint64 offset,
+ GDBusObject *object)
{
- return do_find_element_for_offset_and_object_proxy (grid->elements, offset, object_proxy);
+ return do_find_element_for_offset_and_object (grid->elements, offset, object);
}
static gint
-partition_sort_by_offset_func (GDBusObjectProxy *a,
- GDBusObjectProxy *b)
+partition_sort_by_offset_func (GDBusObject *a,
+ GDBusObject *b)
{
guint64 oa;
guint64 ob;
@@ -1442,39 +1442,39 @@ partition_sort_by_offset_func (GDBusObjectProxy *a,
static void grid_element_set_details (GduVolumeGrid *grid,
GridElement *element);
-static GDBusObjectProxy *
+static GDBusObject *
lookup_cleartext_device_for_crypto_device (GduVolumeGrid *grid,
const gchar *object_path)
{
GDBusProxyManager *proxy_manager;
- GDBusObjectProxy *ret;
- GList *object_proxies;
+ GDBusObject *ret;
+ GList *objects;
GList *l;
ret = NULL;
proxy_manager = udisks_client_get_proxy_manager (grid->client);
- object_proxies = g_dbus_proxy_manager_get_all (proxy_manager);
- for (l = object_proxies; l != NULL; l = l->next)
+ objects = g_dbus_proxy_manager_get_objects (proxy_manager);
+ for (l = objects; l != NULL; l = l->next)
{
- GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data);
+ GDBusObject *object = G_DBUS_OBJECT (l->data);
UDisksBlockDevice *block;
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
if (block == NULL)
continue;
if (g_strcmp0 (udisks_block_device_get_crypto_backing_device (block),
object_path) == 0)
{
- ret = g_object_ref (object_proxy);
+ ret = g_object_ref (object);
goto out;
}
}
out:
- g_list_foreach (object_proxies, (GFunc) g_object_unref, NULL);
- g_list_free (object_proxies);
+ g_list_foreach (objects, (GFunc) g_object_unref, NULL);
+ g_list_free (objects);
return ret;
}
@@ -1487,21 +1487,21 @@ maybe_add_crypto (GduVolumeGrid *grid,
cleartext_element = NULL;
- if (element->object_proxy == NULL)
+ if (element->object == NULL)
goto out;
- block = UDISKS_PEEK_BLOCK_DEVICE (element->object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (element->object);
if (block == NULL)
goto out;
if (g_strcmp0 (udisks_block_device_get_id_usage (block), "crypto") == 0)
{
- GDBusObjectProxy *cleartext_object_proxy;
+ GDBusObject *cleartext_object;
GridElement *embedded_cleartext_element;
- cleartext_object_proxy = lookup_cleartext_device_for_crypto_device (grid,
- g_dbus_object_proxy_get_object_path (element->object_proxy));
- if (cleartext_object_proxy == NULL)
+ cleartext_object = lookup_cleartext_device_for_crypto_device (grid,
+ g_dbus_object_get_object_path (element->object));
+ if (cleartext_object == NULL)
{
element->show_padlock_closed = TRUE;
}
@@ -1512,9 +1512,9 @@ maybe_add_crypto (GduVolumeGrid *grid,
cleartext_element->type = GDU_VOLUME_GRID_ELEMENT_TYPE_DEVICE;
cleartext_element->parent = element;
cleartext_element->size_ratio = 1.0;
- cleartext_element->object_proxy = g_object_ref (cleartext_object_proxy);
+ cleartext_element->object = g_object_ref (cleartext_object);
cleartext_element->offset = 0;
- cleartext_element->size = udisks_block_device_get_size (UDISKS_PEEK_BLOCK_DEVICE (cleartext_object_proxy));
+ cleartext_element->size = udisks_block_device_get_size (UDISKS_PEEK_BLOCK_DEVICE (cleartext_object));
grid_element_set_details (grid, cleartext_element);
/* recurse to handle multiple layers of encryption... */
@@ -1522,7 +1522,7 @@ maybe_add_crypto (GduVolumeGrid *grid,
if (embedded_cleartext_element != NULL)
cleartext_element->embedded_elements = g_list_prepend (NULL, embedded_cleartext_element);
- g_object_unref (cleartext_object_proxy);
+ g_object_unref (cleartext_object);
}
}
@@ -1531,15 +1531,15 @@ maybe_add_crypto (GduVolumeGrid *grid,
}
static GList *
-recompute_grid_add_partitions (GduVolumeGrid *grid,
- guint64 total_size,
- GridElement *parent,
- guint64 free_space_slack,
- guint64 top_offset,
- guint64 top_size,
- GList *partitions,
- GDBusObjectProxy *extended_partition,
- GList *logical_partitions)
+recompute_grid_add_partitions (GduVolumeGrid *grid,
+ guint64 total_size,
+ GridElement *parent,
+ guint64 free_space_slack,
+ guint64 top_offset,
+ guint64 top_size,
+ GList *partitions,
+ GDBusObject *extended_partition,
+ GList *logical_partitions)
{
guint64 prev_end;
GridElement *element;
@@ -1555,11 +1555,11 @@ recompute_grid_add_partitions (GduVolumeGrid *grid,
prev_element = NULL;
for (l = partitions; l != NULL; l = l->next)
{
- GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data);
+ GDBusObject *object = G_DBUS_OBJECT (l->data);
UDisksBlockDevice *block;
guint64 begin, end, size;
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
begin = udisks_block_device_get_part_entry_offset (block);
size = udisks_block_device_get_part_entry_size (block);
end = begin + size;
@@ -1584,7 +1584,7 @@ recompute_grid_add_partitions (GduVolumeGrid *grid,
element->type = GDU_VOLUME_GRID_ELEMENT_TYPE_DEVICE;
element->parent = parent;
element->size_ratio = ((gdouble) udisks_block_device_get_part_entry_size (block)) / top_size;
- element->object_proxy = g_object_ref (object_proxy);
+ element->object = g_object_ref (object);
element->offset = begin;
element->size = size;
element->prev = prev_element;
@@ -1595,7 +1595,7 @@ recompute_grid_add_partitions (GduVolumeGrid *grid,
prev_end = end;
grid_element_set_details (grid, element);
- if (object_proxy == extended_partition)
+ if (object == extended_partition)
{
element->embedded_elements = recompute_grid_add_partitions (grid,
total_size,
@@ -1639,33 +1639,33 @@ recompute_grid (GduVolumeGrid *grid)
{
GList *partitions;
GList *logical_partitions;
- GDBusObjectProxy *extended_partition;
- GList *object_proxies;
+ GDBusObject *extended_partition;
+ GList *objects;
GDBusProxyManager *proxy_manager;
GList *l;
- const gchar *top_object_proxy_path;
+ const gchar *top_object_path;
UDisksBlockDevice *top_block;
guint64 top_size;
guint64 free_space_slack;
GridElement *element;
guint64 cur_selected_offset;
guint64 cur_focused_offset;
- GDBusObjectProxy *cur_selected_object_proxy;
- GDBusObjectProxy *cur_focused_object_proxy;
+ GDBusObject *cur_selected_object;
+ GDBusObject *cur_focused_object;
cur_selected_offset = G_MAXUINT64;
- cur_selected_object_proxy = NULL;
+ cur_selected_object = NULL;
if (grid->selected != NULL)
{
cur_selected_offset = grid->selected->offset;
- cur_selected_object_proxy = grid->selected->object_proxy;
+ cur_selected_object = grid->selected->object;
}
cur_focused_offset = G_MAXUINT64;
- cur_focused_object_proxy = NULL;
+ cur_focused_object = NULL;
if (grid->focused != NULL)
{
cur_focused_offset = grid->focused->offset;
- cur_focused_object_proxy = grid->focused->object_proxy;
+ cur_focused_object = grid->focused->object;
}
/* delete all old elements */
@@ -1675,7 +1675,7 @@ recompute_grid (GduVolumeGrid *grid)
//g_debug ("TODO: recompute grid for %s, container_visible=%d",
// grid->block_device != NULL ?
- // g_dbus_object_proxy_get_object_path (grid->block_device) : "<nothing selected>",
+ // g_dbus_object_get_object_path (grid->block_device) : "<nothing selected>",
// grid->container_visible);
if (grid->container_visible)
@@ -1707,7 +1707,7 @@ recompute_grid (GduVolumeGrid *grid)
goto out;
}
- top_object_proxy_path = g_dbus_object_proxy_get_object_path (grid->block_device);
+ top_object_path = g_dbus_object_get_object_path (grid->block_device);
top_block = UDISKS_PEEK_BLOCK_DEVICE (grid->block_device);
top_size = udisks_block_device_get_size (top_block);
@@ -1720,17 +1720,17 @@ recompute_grid (GduVolumeGrid *grid)
logical_partitions = NULL;
extended_partition = NULL;
proxy_manager = udisks_client_get_proxy_manager (grid->client);
- object_proxies = g_dbus_proxy_manager_get_all (proxy_manager);
- for (l = object_proxies; l != NULL; l = l->next)
+ objects = g_dbus_proxy_manager_get_objects (proxy_manager);
+ for (l = objects; l != NULL; l = l->next)
{
- GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data);
+ GDBusObject *object = G_DBUS_OBJECT (l->data);
UDisksBlockDevice *block;
gboolean is_logical;
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
if (block != NULL &&
g_strcmp0 (udisks_block_device_get_part_entry_table (block),
- top_object_proxy_path) == 0)
+ top_object_path) == 0)
{
is_logical = FALSE;
if (g_strcmp0 (udisks_block_device_get_part_entry_scheme (block), "mbr") == 0)
@@ -1746,15 +1746,15 @@ recompute_grid (GduVolumeGrid *grid)
if (type == 0x05 || type == 0x0f || type == 0x85)
{
g_warn_if_fail (extended_partition == NULL);
- extended_partition = object_proxy;
+ extended_partition = object;
}
}
}
if (is_logical)
- logical_partitions = g_list_prepend (logical_partitions, object_proxy);
+ logical_partitions = g_list_prepend (logical_partitions, object);
else
- partitions = g_list_prepend (partitions, object_proxy);
+ partitions = g_list_prepend (partitions, object);
}
}
@@ -1783,7 +1783,7 @@ recompute_grid (GduVolumeGrid *grid)
element->size_ratio = 1.0;
element->offset = 0;
element->size = top_size;
- element->object_proxy = g_object_ref (grid->block_device);
+ element->object = g_object_ref (grid->block_device);
if (grid->elements != NULL)
{
((GridElement *) grid->elements->data)->next = element;
@@ -1816,14 +1816,14 @@ recompute_grid (GduVolumeGrid *grid)
g_list_free (logical_partitions);
g_list_free (partitions);
- g_list_foreach (object_proxies, (GFunc) g_object_unref, NULL);
- g_list_free (object_proxies);
+ g_list_foreach (objects, (GFunc) g_object_unref, NULL);
+ g_list_free (objects);
out:
/* reselect focused and selected elements */
- grid->selected = find_element_for_offset_and_object_proxy (grid, cur_selected_offset, cur_selected_object_proxy);
- grid->focused = find_element_for_offset_and_object_proxy (grid, cur_focused_offset, cur_focused_object_proxy);
+ grid->selected = find_element_for_offset_and_object (grid, cur_selected_offset, cur_selected_object);
+ grid->focused = find_element_for_offset_and_object (grid, cur_focused_offset, cur_focused_object);
/* ensure something is always focused/selected */
if (grid->selected == NULL)
@@ -1844,11 +1844,11 @@ gdu_volume_grid_get_selected_type (GduVolumeGrid *grid)
return grid->selected->type;
}
-GDBusObjectProxy *
+GDBusObject *
gdu_volume_grid_get_selected_device (GduVolumeGrid *grid)
{
g_return_val_if_fail (GDU_IS_VOLUME_GRID (grid), NULL);
- return grid->selected->object_proxy;
+ return grid->selected->object;
}
guint64
@@ -1904,7 +1904,7 @@ grid_element_set_details (GduVolumeGrid *grid,
gchar *type_for_display;
size_str = udisks_util_get_size_for_display (element->size, FALSE, FALSE);
- block = UDISKS_PEEK_BLOCK_DEVICE (element->object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (element->object);
usage = udisks_block_device_get_id_usage (block);
type = udisks_block_device_get_id_type (block);
@@ -1957,21 +1957,21 @@ grid_element_set_details (GduVolumeGrid *grid,
/* ---------------------------------------------------------------------------------------------------- */
static gboolean
-is_disk_or_partition_in_grid (GduVolumeGrid *grid,
- GDBusObjectProxy *object_proxy)
+is_disk_or_partition_in_grid (GduVolumeGrid *grid,
+ GDBusObject *object)
{
UDisksBlockDevice *block;
gboolean ret;
ret = FALSE;
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
if (block == NULL)
goto out;
- if (object_proxy == grid->block_device ||
+ if (object == grid->block_device ||
g_strcmp0 (udisks_block_device_get_part_entry_table (block),
- g_dbus_object_proxy_get_object_path (grid->block_device)) == 0)
+ g_dbus_object_get_object_path (grid->block_device)) == 0)
ret = TRUE;
out:
@@ -1979,39 +1979,39 @@ is_disk_or_partition_in_grid (GduVolumeGrid *grid,
}
gboolean
-gdu_volume_grid_includes_object_proxy (GduVolumeGrid *grid,
- GDBusObjectProxy *object_proxy)
+gdu_volume_grid_includes_object (GduVolumeGrid *grid,
+ GDBusObject *object)
{
UDisksBlockDevice *block;
const gchar *crypto_backing_device;
- GDBusObjectProxy *crypto_object_proxy;
+ GDBusObject *crypto_object;
gboolean ret;
g_return_val_if_fail (GDU_IS_VOLUME_GRID (grid), FALSE);
- g_return_val_if_fail (G_IS_DBUS_OBJECT_PROXY (object_proxy), FALSE);
+ g_return_val_if_fail (G_IS_DBUS_OBJECT (object), FALSE);
ret = FALSE;
- crypto_object_proxy = NULL;
+ crypto_object = NULL;
if (grid->block_device == NULL)
goto out;
- if (is_disk_or_partition_in_grid (grid, object_proxy))
+ if (is_disk_or_partition_in_grid (grid, object))
{
ret = TRUE;
goto out;
}
/* handle when it's a crypt devices for our grid or a partition in it */
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
if (block != NULL)
{
crypto_backing_device = udisks_block_device_get_crypto_backing_device (block);
- crypto_object_proxy = g_dbus_proxy_manager_lookup (udisks_client_get_proxy_manager (grid->client),
- crypto_backing_device);
- if (crypto_object_proxy != NULL)
+ crypto_object = g_dbus_proxy_manager_get_object (udisks_client_get_proxy_manager (grid->client),
+ crypto_backing_device);
+ if (crypto_object != NULL)
{
- if (is_disk_or_partition_in_grid (grid, crypto_object_proxy))
+ if (is_disk_or_partition_in_grid (grid, crypto_object))
{
ret = TRUE;
goto out;
@@ -2020,8 +2020,8 @@ gdu_volume_grid_includes_object_proxy (GduVolumeGrid *grid,
}
out:
- if (crypto_object_proxy != NULL)
- g_object_unref (crypto_object_proxy);
+ if (crypto_object != NULL)
+ g_object_unref (crypto_object);
return ret;
}
@@ -2031,7 +2031,7 @@ static void
maybe_update (GduVolumeGrid *grid,
GDBusObjectProxy *object_proxy)
{
- if (gdu_volume_grid_includes_object_proxy (grid, object_proxy))
+ if (gdu_volume_grid_includes_object (grid, G_DBUS_OBJECT (object_proxy)))
recompute_grid (grid);
}
diff --git a/src/palimpsest/gduvolumegrid.h b/src/palimpsest/gduvolumegrid.h
index 9d698db..206809c 100644
--- a/src/palimpsest/gduvolumegrid.h
+++ b/src/palimpsest/gduvolumegrid.h
@@ -35,8 +35,8 @@ G_BEGIN_DECLS
GType gdu_volume_grid_get_type (void) G_GNUC_CONST;
GtkWidget* gdu_volume_grid_new (UDisksClient *client);
void gdu_volume_grid_set_block_device (GduVolumeGrid *grid,
- GDBusObjectProxy *block_device);
-GDBusObjectProxy *gdu_volume_grid_get_block_device (GduVolumeGrid *grid);
+ GDBusObject *block_device);
+GDBusObject *gdu_volume_grid_get_block_device (GduVolumeGrid *grid);
void gdu_volume_grid_set_container_visible (GduVolumeGrid *grid,
gboolean visible);
void gdu_volume_grid_set_container_markup (GduVolumeGrid *grid,
@@ -44,11 +44,11 @@ void gdu_volume_grid_set_container_markup (GduVolumeGrid
void gdu_volume_grid_set_container_icon (GduVolumeGrid *grid,
GIcon *icon);
-gboolean gdu_volume_grid_includes_object_proxy (GduVolumeGrid *grid,
- GDBusObjectProxy *object_proxy);
+gboolean gdu_volume_grid_includes_object (GduVolumeGrid *grid,
+ GDBusObject *object);
GduVolumeGridElementType gdu_volume_grid_get_selected_type (GduVolumeGrid *grid);
-GDBusObjectProxy *gdu_volume_grid_get_selected_device (GduVolumeGrid *grid);
+GDBusObject *gdu_volume_grid_get_selected_device (GduVolumeGrid *grid);
guint64 gdu_volume_grid_get_selected_offset (GduVolumeGrid *grid);
guint64 gdu_volume_grid_get_selected_size (GduVolumeGrid *grid);
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index 08ab27f..0fcfaa8 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -50,7 +50,7 @@ struct _GduWindow
GduDeviceTreeModel *model;
DetailsPage current_page;
- GDBusObjectProxy *current_object_proxy;
+ GDBusObject *current_object;
GtkWidget *volume_grid;
GtkWidget *write_cache_switch;
@@ -134,8 +134,8 @@ gdu_window_finalize (GObject *object)
G_CALLBACK (on_interface_proxy_properties_changed),
window);
- if (window->current_object_proxy != NULL)
- g_object_unref (window->current_object_proxy);
+ if (window->current_object != NULL)
+ g_object_unref (window->current_object);
g_object_unref (window->builder);
g_object_unref (window->model);
@@ -177,20 +177,20 @@ on_row_inserted (GtkTreeModel *tree_model,
gtk_tree_view_expand_all (GTK_TREE_VIEW (gdu_window_get_widget (window, "device-tree-treeview")));
}
-static void select_details_page (GduWindow *window,
- GDBusObjectProxy *object_proxy,
- DetailsPage page);
+static void select_details_page (GduWindow *window,
+ GDBusObject *object,
+ DetailsPage page);
static void
-set_selected_object_proxy (GduWindow *window,
- GDBusObjectProxy *object_proxy)
+set_selected_object (GduWindow *window,
+ GDBusObject *object)
{
- if (object_proxy != NULL)
+ if (object != NULL)
{
- if (UDISKS_PEEK_LUN (object_proxy) != NULL ||
- UDISKS_PEEK_BLOCK_DEVICE (object_proxy) != NULL)
+ if (UDISKS_PEEK_LUN (object) != NULL ||
+ UDISKS_PEEK_BLOCK_DEVICE (object) != NULL)
{
- select_details_page (window, object_proxy, DETAILS_PAGE_DEVICE);
+ select_details_page (window, object, DETAILS_PAGE_DEVICE);
}
else
{
@@ -213,18 +213,18 @@ on_tree_selection_changed (GtkTreeSelection *tree_selection,
if (gtk_tree_selection_get_selected (tree_selection, &model, &iter))
{
- GDBusObjectProxy *object_proxy;
+ GDBusObject *object;
gtk_tree_model_get (model,
&iter,
- GDU_DEVICE_TREE_MODEL_COLUMN_OBJECT_PROXY,
- &object_proxy,
+ GDU_DEVICE_TREE_MODEL_COLUMN_OBJECT,
+ &object,
-1);
- set_selected_object_proxy (window, object_proxy);
- g_object_unref (object_proxy);
+ set_selected_object (window, object);
+ g_object_unref (object);
}
else
{
- set_selected_object_proxy (window, NULL);
+ set_selected_object (window, NULL);
}
}
@@ -507,12 +507,12 @@ gdu_window_get_widget (GduWindow *window,
}
static void
-teardown_details_page (GduWindow *window,
- GDBusObjectProxy *object_proxy,
- gint page)
+teardown_details_page (GduWindow *window,
+ GDBusObject *object,
+ gint page)
{
//g_debug ("teardown for %s, page %d",
- // object_proxy != NULL ? g_dbus_object_proxy_get_object_path (object_proxy) : "<none>",
+ // object != NULL ? g_dbus_object_get_object_path (object) : "<none>",
// page);
switch (page)
{
@@ -609,22 +609,22 @@ get_top_level_block_devices_for_lun (GduWindow *window,
GDBusProxyManager *proxy_manager;
proxy_manager = udisks_client_get_proxy_manager (window->client);
- object_proxies = g_dbus_proxy_manager_get_all (proxy_manager);
+ object_proxies = g_dbus_proxy_manager_get_objects (proxy_manager);
ret = NULL;
for (l = object_proxies; l != NULL; l = l->next)
{
- GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data);
+ GDBusObject *object = G_DBUS_OBJECT (l->data);
UDisksBlockDevice *block;
- block = UDISKS_GET_BLOCK_DEVICE (object_proxy);
+ block = UDISKS_GET_BLOCK_DEVICE (object);
if (block == NULL)
continue;
if (g_strcmp0 (udisks_block_device_get_lun (block), lun_object_path) == 0 &&
!udisks_block_device_get_part_entry (block))
{
- ret = g_list_append (ret, g_object_ref (object_proxy));
+ ret = g_list_append (ret, g_object_ref (object));
}
g_object_unref (block);
}
@@ -634,8 +634,8 @@ get_top_level_block_devices_for_lun (GduWindow *window,
}
static gint
-block_device_compare_on_preferred (GDBusObjectProxy *a,
- GDBusObjectProxy *b)
+block_device_compare_on_preferred (GDBusObject *a,
+ GDBusObject *b)
{
return g_strcmp0 (udisks_block_device_get_preferred_device (UDISKS_PEEK_BLOCK_DEVICE (a)),
udisks_block_device_get_preferred_device (UDISKS_PEEK_BLOCK_DEVICE (b)));
@@ -644,8 +644,8 @@ block_device_compare_on_preferred (GDBusObjectProxy *a,
/* ---------------------------------------------------------------------------------------------------- */
static void
-setup_device_page (GduWindow *window,
- GDBusObjectProxy *object_proxy)
+setup_device_page (GduWindow *window,
+ GDBusObject *object)
{
UDisksLun *lun;
UDisksBlockDevice *block;
@@ -660,8 +660,8 @@ setup_device_page (GduWindow *window,
}
g_list_free (children);
- lun = UDISKS_PEEK_LUN (object_proxy);
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ lun = UDISKS_PEEK_LUN (object);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
if (lun != NULL)
{
@@ -672,7 +672,7 @@ setup_device_page (GduWindow *window,
GIcon *lun_media_icon;
/* TODO: for multipath, ensure e.g. mpathk is before sda, sdb */
- block_devices = get_top_level_block_devices_for_lun (window, g_dbus_object_proxy_get_object_path (object_proxy));
+ block_devices = get_top_level_block_devices_for_lun (window, g_dbus_object_get_object_path (object));
block_devices = g_list_sort (block_devices, (GCompareFunc) block_device_compare_on_preferred);
udisks_util_get_lun_info (lun,
@@ -700,7 +700,7 @@ setup_device_page (GduWindow *window,
else if (block != NULL)
{
gdu_volume_grid_set_container_visible (GDU_VOLUME_GRID (window->volume_grid), FALSE);
- gdu_volume_grid_set_block_device (GDU_VOLUME_GRID (window->volume_grid), object_proxy);
+ gdu_volume_grid_set_block_device (GDU_VOLUME_GRID (window->volume_grid), object);
}
else
{
@@ -719,12 +719,12 @@ update_device_page (GduWindow *window)
/* ---------------------------------------------------------------------------------------------------- */
static void
-setup_details_page (GduWindow *window,
- GDBusObjectProxy *object_proxy,
- gint page)
+setup_details_page (GduWindow *window,
+ GDBusObject *object,
+ gint page)
{
//g_debug ("setup for %s, page %d",
- // object_proxy != NULL ? g_dbus_object_proxy_get_object_path (object_proxy) : "<none>",
+ // object != NULL ? g_dbus_object_get_object_path (object) : "<none>",
// page);
switch (page)
@@ -733,17 +733,17 @@ setup_details_page (GduWindow *window,
break;
case DETAILS_PAGE_DEVICE:
- setup_device_page (window, object_proxy);
+ setup_device_page (window, object);
break;
}
}
static void
-update_details_page (GduWindow *window,
- gint page)
+update_details_page (GduWindow *window,
+ gint page)
{
//g_debug ("update for %s, page %d",
- // object_proxy != NULL ? g_dbus_object_proxy_get_object_path (object_proxy) : "<none>",
+ // object != NULL ? g_dbus_object_get_object_path (object) : "<none>",
// page);
switch (page)
@@ -758,35 +758,35 @@ update_details_page (GduWindow *window,
}
static void
-select_details_page (GduWindow *window,
- GDBusObjectProxy *object_proxy,
- DetailsPage page)
+select_details_page (GduWindow *window,
+ GDBusObject *object,
+ DetailsPage page)
{
GtkNotebook *notebook;
notebook = GTK_NOTEBOOK (gdu_window_get_widget (window, "palimpsest-notebook"));
teardown_details_page (window,
- window->current_object_proxy,
+ window->current_object,
window->current_page);
window->current_page = page;
- if (window->current_object_proxy != NULL)
- g_object_unref (window->current_object_proxy);
- window->current_object_proxy = object_proxy != NULL ? g_object_ref (object_proxy) : NULL;
+ if (window->current_object != NULL)
+ g_object_unref (window->current_object);
+ window->current_object = object != NULL ? g_object_ref (object) : NULL;
gtk_notebook_set_current_page (notebook, page);
setup_details_page (window,
- window->current_object_proxy,
+ window->current_object,
window->current_page);
update_details_page (window, window->current_page);
}
static void
-update_all (GduWindow *window,
- GDBusObjectProxy *object_proxy)
+update_all (GduWindow *window,
+ GDBusObject *object)
{
switch (window->current_page)
{
@@ -796,7 +796,7 @@ update_all (GduWindow *window,
case DETAILS_PAGE_DEVICE:
/* this is a little too inclusive.. */
- if (gdu_volume_grid_includes_object_proxy (GDU_VOLUME_GRID (window->volume_grid), object_proxy))
+ if (gdu_volume_grid_includes_object (GDU_VOLUME_GRID (window->volume_grid), object))
{
update_details_page (window, window->current_page);
}
@@ -810,7 +810,7 @@ on_object_proxy_added (GDBusProxyManager *manager,
gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
- update_all (window, object_proxy);
+ update_all (window, G_DBUS_OBJECT (object_proxy));
}
static void
@@ -819,7 +819,7 @@ on_object_proxy_removed (GDBusProxyManager *manager,
gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
- update_all (window, object_proxy);
+ update_all (window, G_DBUS_OBJECT (object_proxy));
}
static void
@@ -829,7 +829,7 @@ on_interface_proxy_added (GDBusProxyManager *manager,
gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
- update_all (window, object_proxy);
+ update_all (window, G_DBUS_OBJECT (object_proxy));
}
static void
@@ -839,7 +839,7 @@ on_interface_proxy_removed (GDBusProxyManager *manager,
gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
- update_all (window, object_proxy);
+ update_all (window, G_DBUS_OBJECT (object_proxy));
}
static void
@@ -851,13 +851,13 @@ on_interface_proxy_properties_changed (GDBusProxyManager *manager,
gpointer user_data)
{
GduWindow *window = GDU_WINDOW (user_data);
- update_all (window, object_proxy);
+ update_all (window, G_DBUS_OBJECT (object_proxy));
}
static void
-update_devtab_for_lun (GduWindow *window,
- GDBusObjectProxy *object_proxy,
- UDisksLun *lun)
+update_devtab_for_lun (GduWindow *window,
+ GDBusObject *object,
+ UDisksLun *lun)
{
gchar *s;
GList *block_devices;
@@ -869,10 +869,10 @@ update_devtab_for_lun (GduWindow *window,
gchar *media_compat_for_display;
//g_debug ("In update_devtab_for_lun() - selected=%s",
- // object_proxy != NULL ? g_dbus_object_proxy_get_object_path (object_proxy) : "<nothing>");
+ // object != NULL ? g_dbus_object_get_object_path (object) : "<nothing>");
/* TODO: for multipath, ensure e.g. mpathk is before sda, sdb */
- block_devices = get_top_level_block_devices_for_lun (window, g_dbus_object_proxy_get_object_path (object_proxy));
+ block_devices = get_top_level_block_devices_for_lun (window, g_dbus_object_get_object_path (object));
block_devices = g_list_sort (block_devices, (GCompareFunc) block_device_compare_on_preferred);
lun_vendor = udisks_lun_get_vendor (lun);
@@ -883,10 +883,10 @@ update_devtab_for_lun (GduWindow *window,
str = g_string_new (NULL);
for (l = block_devices; l != NULL; l = l->next)
{
- GDBusObjectProxy *block_object_proxy = G_DBUS_OBJECT_PROXY (l->data);
+ GDBusObject *block_object = G_DBUS_OBJECT (l->data);
if (str->len > 0)
g_string_append_c (str, ' ');
- g_string_append (str, udisks_block_device_get_preferred_device (UDISKS_PEEK_BLOCK_DEVICE (block_object_proxy)));
+ g_string_append (str, udisks_block_device_get_preferred_device (UDISKS_PEEK_BLOCK_DEVICE (block_object)));
}
s = g_string_free (str, FALSE);
set_markup (window,
@@ -939,7 +939,7 @@ update_devtab_for_lun (GduWindow *window,
static void
update_devtab_for_block (GduWindow *window,
- GDBusObjectProxy *object_proxy,
+ GDBusObject *object,
UDisksBlockDevice *block,
guint64 size)
{
@@ -952,7 +952,7 @@ update_devtab_for_block (GduWindow *window,
//g_debug ("In update_devtab_for_block() - size=%" G_GUINT64_FORMAT " selected=%s",
// size,
- // object_proxy != NULL ? g_dbus_object_proxy_get_object_path (object_proxy) : "<nothing>");
+ // object != NULL ? g_dbus_object_get_object_path (object) : "<nothing>");
set_markup (window,
"devtab-device-label",
@@ -1029,22 +1029,22 @@ update_devtab_for_block (GduWindow *window,
static void
update_devtab_for_no_media (GduWindow *window,
- GDBusObjectProxy *object_proxy,
+ GDBusObject *object,
UDisksBlockDevice *block)
{
//g_debug ("In update_devtab_for_no_media() - selected=%s",
- // object_proxy != NULL ? g_dbus_object_proxy_get_object_path (object_proxy) : "<nothing>");
+ // object != NULL ? g_dbus_object_get_object_path (object) : "<nothing>");
}
static void
update_devtab_for_free_space (GduWindow *window,
- GDBusObjectProxy *object_proxy,
+ GDBusObject *object,
UDisksBlockDevice *block,
guint64 size)
{
//g_debug ("In update_devtab_for_free_space() - size=%" G_GUINT64_FORMAT " selected=%s",
// size,
- // object_proxy != NULL ? g_dbus_object_proxy_get_object_path (object_proxy) : "<nothing>");
+ // object != NULL ? g_dbus_object_get_object_path (object) : "<nothing>");
set_markup (window,
"devtab-device-label",
@@ -1064,7 +1064,7 @@ update_devtab_for_free_space (GduWindow *window,
static void
update_devtab (GduWindow *window)
{
- GDBusObjectProxy *object_proxy;
+ GDBusObject *object;
GList *children;
GList *l;
GduVolumeGridElementType type;
@@ -1081,27 +1081,27 @@ update_devtab (GduWindow *window)
}
g_list_free (children);
- object_proxy = window->current_object_proxy;
- lun = UDISKS_PEEK_LUN (window->current_object_proxy);
- block = UDISKS_PEEK_BLOCK_DEVICE (window->current_object_proxy);
+ object = window->current_object;
+ lun = UDISKS_PEEK_LUN (window->current_object);
+ block = UDISKS_PEEK_BLOCK_DEVICE (window->current_object);
type = gdu_volume_grid_get_selected_type (GDU_VOLUME_GRID (window->volume_grid));
size = gdu_volume_grid_get_selected_size (GDU_VOLUME_GRID (window->volume_grid));
if (type == GDU_VOLUME_GRID_ELEMENT_TYPE_CONTAINER)
{
if (lun != NULL)
- update_devtab_for_lun (window, object_proxy, lun);
+ update_devtab_for_lun (window, object, lun);
else if (block != NULL)
- update_devtab_for_block (window, object_proxy, block, size);
+ update_devtab_for_block (window, object, block, size);
}
else
{
- object_proxy = gdu_volume_grid_get_selected_device (GDU_VOLUME_GRID (window->volume_grid));
- if (object_proxy == NULL)
- object_proxy = gdu_volume_grid_get_block_device (GDU_VOLUME_GRID (window->volume_grid));
- if (object_proxy != NULL)
+ object = gdu_volume_grid_get_selected_device (GDU_VOLUME_GRID (window->volume_grid));
+ if (object == NULL)
+ object = gdu_volume_grid_get_block_device (GDU_VOLUME_GRID (window->volume_grid));
+ if (object != NULL)
{
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
switch (type)
{
case GDU_VOLUME_GRID_ELEMENT_TYPE_CONTAINER:
@@ -1109,15 +1109,15 @@ update_devtab (GduWindow *window)
break;
case GDU_VOLUME_GRID_ELEMENT_TYPE_DEVICE:
- update_devtab_for_block (window, object_proxy, block, size);
+ update_devtab_for_block (window, object, block, size);
break;
case GDU_VOLUME_GRID_ELEMENT_TYPE_NO_MEDIA:
- update_devtab_for_no_media (window, object_proxy, block);
+ update_devtab_for_no_media (window, object, block);
break;
case GDU_VOLUME_GRID_ELEMENT_TYPE_FREE_SPACE:
- update_devtab_for_free_space (window, object_proxy, block, size);
+ update_devtab_for_free_space (window, object, block, size);
break;
}
}
@@ -1214,16 +1214,16 @@ on_change_filesystem_label (GduWindow *window)
gint response;
GtkWidget *dialog;
GtkWidget *entry;
- GDBusObjectProxy *object_proxy;
+ GDBusObject *object;
UDisksBlockDevice *block;
const gchar *label;
ChangeFilesystemLabelData data;
const gchar *label_to_set;
const gchar *options[] = {NULL};
- object_proxy = gdu_volume_grid_get_selected_device (GDU_VOLUME_GRID (window->volume_grid));
- g_assert (object_proxy != NULL);
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ object = gdu_volume_grid_get_selected_device (GDU_VOLUME_GRID (window->volume_grid));
+ g_assert (object != NULL);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
g_assert (block != NULL);
dialog = gdu_window_get_widget (window, "change-filesystem-label-dialog");
@@ -1303,7 +1303,7 @@ on_change_partition_type (GduWindow *window)
gint response;
GtkWidget *dialog;
GtkWidget *combo_box;
- GDBusObjectProxy *object_proxy;
+ GDBusObject *object;
UDisksBlockDevice *block;
const gchar *scheme;
const gchar *cur_type;
@@ -1313,9 +1313,9 @@ on_change_partition_type (GduWindow *window)
ChangePartitionTypeData data;
const gchar *type_to_set;
- object_proxy = gdu_volume_grid_get_selected_device (GDU_VOLUME_GRID (window->volume_grid));
- g_assert (object_proxy != NULL);
- block = UDISKS_PEEK_BLOCK_DEVICE (object_proxy);
+ object = gdu_volume_grid_get_selected_device (GDU_VOLUME_GRID (window->volume_grid));
+ g_assert (object != NULL);
+ block = UDISKS_PEEK_BLOCK_DEVICE (object);
g_assert (block != NULL);
dialog = gdu_window_get_widget (window, "change-partition-type-dialog");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
