From 46370df830357239d0b2f5da6db2721f5ee66bdb Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Wed, 13 Apr 2011 16:35:19 -0400 Subject: [PATCH] Catch up with s/Stub/Skeleton/ rename in GLib's gdbus-codegen branch Signed-off-by: David Zeuthen --- src/udisksbasejob.c | 2 +- src/udisksbasejob.h | 4 ++-- src/udisksdaemon.c | 24 ++++++++++++------------ src/udisksfstabprovider.c | 8 ++++---- src/udisksiscsiprovider.c | 12 ++++++------ src/udiskslinuxblock.c | 32 ++++++++++++++++---------------- src/udiskslinuxfilesystem.c | 10 +++++----- src/udiskslinuxlun.c | 24 ++++++++++++------------ src/udiskslinuxprovider.c | 4 ++-- 9 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/udisksbasejob.c b/src/udisksbasejob.c index a0aedee..bd16090 100644 --- a/src/udisksbasejob.c +++ b/src/udisksbasejob.c @@ -48,7 +48,7 @@ enum PROP_CANCELLABLE, }; -G_DEFINE_ABSTRACT_TYPE_WITH_CODE (UDisksBaseJob, udisks_base_job, UDISKS_TYPE_JOB_STUB, +G_DEFINE_ABSTRACT_TYPE_WITH_CODE (UDisksBaseJob, udisks_base_job, UDISKS_TYPE_JOB_SKELETON, G_IMPLEMENT_INTERFACE (UDISKS_TYPE_JOB, job_iface_init)); static void diff --git a/src/udisksbasejob.h b/src/udisksbasejob.h index 3e1a261..7c73cd9 100644 --- a/src/udisksbasejob.h +++ b/src/udisksbasejob.h @@ -44,7 +44,7 @@ typedef struct _UDisksBaseJobPrivate UDisksBaseJobPrivate; struct _UDisksBaseJob { /*< private >*/ - UDisksJobStub parent_instance; + UDisksJobSkeleton parent_instance; UDisksBaseJobPrivate *priv; }; @@ -56,7 +56,7 @@ struct _UDisksBaseJob */ struct _UDisksBaseJobClass { - UDisksJobStubClass parent_class; + UDisksJobSkeletonClass parent_class; /*< private >*/ gpointer padding[8]; }; diff --git a/src/udisksdaemon.c b/src/udisksdaemon.c index 41ee789..e894042 100644 --- a/src/udisksdaemon.c +++ b/src/udisksdaemon.c @@ -432,15 +432,15 @@ on_job_completed (UDisksJob *job, gpointer user_data) { UDisksDaemon *daemon = UDISKS_DAEMON (user_data); - GDBusObjectStub *object; + GDBusObjectSkeleton *object; - object = G_DBUS_OBJECT_STUB (g_dbus_interface_get_object (G_DBUS_INTERFACE (job))); + object = G_DBUS_OBJECT_SKELETON (g_dbus_interface_get_object (G_DBUS_INTERFACE (job))); g_assert (object != NULL); /* Unexport job */ g_dbus_object_manager_server_unexport (daemon->object_manager, g_dbus_object_get_object_path (G_DBUS_OBJECT (object))); - g_dbus_object_stub_remove_interface (object, G_DBUS_INTERFACE_STUB (job)); + g_dbus_object_skeleton_remove_interface (object, G_DBUS_INTERFACE_SKELETON (job)); g_object_unref (object); /* returns the reference we took when connecting to the @@ -479,7 +479,7 @@ udisks_daemon_launch_simple_job (UDisksDaemon *daemon, GCancellable *cancellable) { UDisksSimpleJob *job; - GDBusObjectStub *object; + GDBusObjectSkeleton *object; gchar *object_path; g_return_val_if_fail (UDISKS_IS_DAEMON (daemon), NULL); @@ -488,8 +488,8 @@ udisks_daemon_launch_simple_job (UDisksDaemon *daemon, /* TODO: protect job_id by a mutex */ object_path = g_strdup_printf ("/org/freedesktop/UDisks2/jobs/%d", job_id++); - object = g_dbus_object_stub_new (object_path); - g_dbus_object_stub_add_interface (object, G_DBUS_INTERFACE_STUB (job)); + object = g_dbus_object_skeleton_new (object_path); + g_dbus_object_skeleton_add_interface (object, G_DBUS_INTERFACE_SKELETON (job)); g_free (object_path); g_dbus_object_manager_server_export (daemon->object_manager, object); @@ -534,7 +534,7 @@ udisks_daemon_launch_threaded_job (UDisksDaemon *daemon, GCancellable *cancellable) { UDisksThreadedJob *job; - GDBusObjectStub *object; + GDBusObjectSkeleton *object; gchar *object_path; g_return_val_if_fail (UDISKS_IS_DAEMON (daemon), NULL); @@ -547,8 +547,8 @@ udisks_daemon_launch_threaded_job (UDisksDaemon *daemon, /* TODO: protect job_id by a mutex */ object_path = g_strdup_printf ("/org/freedesktop/UDisks2/jobs/%d", job_id++); - object = g_dbus_object_stub_new (object_path); - g_dbus_object_stub_add_interface (object, G_DBUS_INTERFACE_STUB (job)); + object = g_dbus_object_skeleton_new (object_path); + g_dbus_object_skeleton_add_interface (object, G_DBUS_INTERFACE_SKELETON (job)); g_free (object_path); g_dbus_object_manager_server_export (daemon->object_manager, object); @@ -592,7 +592,7 @@ udisks_daemon_launch_spawned_job (UDisksDaemon *daemon, va_list var_args; gchar *command_line; UDisksSpawnedJob *job; - GDBusObjectStub *object; + GDBusObjectSkeleton *object; gchar *object_path; g_return_val_if_fail (UDISKS_IS_DAEMON (daemon), NULL); @@ -607,8 +607,8 @@ udisks_daemon_launch_spawned_job (UDisksDaemon *daemon, /* TODO: protect job_id by a mutex */ object_path = g_strdup_printf ("/org/freedesktop/UDisks2/jobs/%d", job_id++); - object = g_dbus_object_stub_new (object_path); - g_dbus_object_stub_add_interface (object, G_DBUS_INTERFACE_STUB (job)); + object = g_dbus_object_skeleton_new (object_path); + g_dbus_object_skeleton_add_interface (object, G_DBUS_INTERFACE_SKELETON (job)); g_free (object_path); g_dbus_object_manager_server_export (daemon->object_manager, object); diff --git a/src/udisksfstabprovider.c b/src/udisksfstabprovider.c index f6f7727..a639cdc 100644 --- a/src/udisksfstabprovider.c +++ b/src/udisksfstabprovider.c @@ -60,7 +60,7 @@ typedef struct gint passno; gchar *object_path; - GDBusObjectStub *object; + GDBusObjectSkeleton *object; UDisksConfigurationItem *item; } FstabEntry; @@ -469,7 +469,7 @@ export_entry (UDisksFstabProvider *provider, } } - entry->item = udisks_configuration_item_stub_new (); + entry->item = udisks_configuration_item_skeleton_new (); udisks_configuration_item_set_type (entry->item, "fsmount"); @@ -498,8 +498,8 @@ export_entry (UDisksFstabProvider *provider, /* set the transient fields */ update_entry (provider, entry); - entry->object = g_dbus_object_stub_new (entry->object_path); - g_dbus_object_stub_add_interface (entry->object, G_DBUS_INTERFACE_STUB (entry->item)); + entry->object = g_dbus_object_skeleton_new (entry->object_path); + g_dbus_object_skeleton_add_interface (entry->object, G_DBUS_INTERFACE_SKELETON (entry->item)); g_dbus_object_manager_server_export (udisks_daemon_get_object_manager (udisks_provider_get_daemon (UDISKS_PROVIDER (provider))), entry->object); diff --git a/src/udisksiscsiprovider.c b/src/udisksiscsiprovider.c index e0a609d..9c2f32a 100644 --- a/src/udisksiscsiprovider.c +++ b/src/udisksiscsiprovider.c @@ -241,7 +241,7 @@ typedef struct gchar *dir_name; gchar *object_path; - GDBusObjectStub *object; + GDBusObjectSkeleton *object; UDisksIScsiTarget *iface; GList *portals; @@ -799,9 +799,9 @@ load_and_process_iscsi (UDisksIScsiProvider *provider) { IScsiTarget *target = l->data; target->object_path = util_compute_object_path ("/org/freedesktop/UDisks2/iSCSI/", target->target_name); - target->iface = udisks_iscsi_target_stub_new (); - g_dbus_interface_stub_set_flags (G_DBUS_INTERFACE_STUB (target->iface), - G_DBUS_INTERFACE_STUB_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD); + target->iface = udisks_iscsi_target_skeleton_new (); + g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (target->iface), + G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD); g_signal_connect (target->iface, "handle-login", G_CALLBACK (on_iscsi_target_handle_login), @@ -827,8 +827,8 @@ load_and_process_iscsi (UDisksIScsiProvider *provider) for (l = added; l != NULL; l = l->next) { IScsiTarget *target = l->data; - target->object = g_dbus_object_stub_new (target->object_path); - g_dbus_object_stub_add_interface (target->object, G_DBUS_INTERFACE_STUB (target->iface)); + target->object = g_dbus_object_skeleton_new (target->object_path); + g_dbus_object_skeleton_add_interface (target->object, G_DBUS_INTERFACE_SKELETON (target->iface)); g_dbus_object_manager_server_export_uniquely (udisks_daemon_get_object_manager (udisks_provider_get_daemon (UDISKS_PROVIDER (provider))), target->object); } diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c index 5713207..814ef0c 100644 --- a/src/udiskslinuxblock.c +++ b/src/udiskslinuxblock.c @@ -57,7 +57,7 @@ typedef struct _UDisksLinuxBlockClass UDisksLinuxBlockClass; */ struct _UDisksLinuxBlock { - GDBusObjectStub parent_instance; + GDBusObjectSkeleton parent_instance; UDisksDaemon *daemon; UDisksMountMonitor *mount_monitor; @@ -72,7 +72,7 @@ struct _UDisksLinuxBlock struct _UDisksLinuxBlockClass { - GDBusObjectStubClass parent_class; + GDBusObjectSkeletonClass parent_class; }; enum @@ -82,7 +82,7 @@ enum PROP_DEVICE }; -G_DEFINE_TYPE (UDisksLinuxBlock, udisks_linux_block, G_TYPE_DBUS_OBJECT_STUB); +G_DEFINE_TYPE (UDisksLinuxBlock, udisks_linux_block, G_TYPE_DBUS_OBJECT_SKELETON); static void on_mount_monitor_mount_added (UDisksMountMonitor *monitor, UDisksMount *mount, @@ -192,7 +192,7 @@ udisks_linux_block_constructed (GObject *object) /* compute the object path */ str = g_string_new ("/org/freedesktop/UDisks2/block_devices/"); udisks_safe_append_to_object_path (str, g_udev_device_get_name (block->device)); - g_dbus_object_stub_set_object_path (G_DBUS_OBJECT_STUB (block), str->str); + g_dbus_object_skeleton_set_object_path (G_DBUS_OBJECT_SKELETON (block), str->str); g_string_free (str, TRUE); if (G_OBJECT_CLASS (udisks_linux_block_parent_class)->constructed != NULL) @@ -311,7 +311,7 @@ update_iface (UDisksLinuxBlock *block, HasInterfaceFunc has_func, ConnectInterfaceFunc connect_func, UpdateInterfaceFunc update_func, - GType stub_type, + GType skeleton_type, gpointer _interface_pointer) { gboolean has; @@ -321,8 +321,8 @@ update_iface (UDisksLinuxBlock *block, g_return_if_fail (block != NULL); g_return_if_fail (has_func != NULL); g_return_if_fail (update_func != NULL); - g_return_if_fail (g_type_is_a (stub_type, G_TYPE_OBJECT)); - g_return_if_fail (g_type_is_a (stub_type, G_TYPE_DBUS_INTERFACE)); + g_return_if_fail (g_type_is_a (skeleton_type, G_TYPE_OBJECT)); + g_return_if_fail (g_type_is_a (skeleton_type, G_TYPE_DBUS_INTERFACE)); g_return_if_fail (interface_pointer != NULL); g_return_if_fail (*interface_pointer == NULL || G_IS_DBUS_INTERFACE (*interface_pointer)); @@ -332,7 +332,7 @@ update_iface (UDisksLinuxBlock *block, { if (has) { - *interface_pointer = g_object_new (stub_type, NULL); + *interface_pointer = g_object_new (skeleton_type, NULL); if (connect_func != NULL) connect_func (block); add = TRUE; @@ -342,7 +342,7 @@ update_iface (UDisksLinuxBlock *block, { if (!has) { - g_dbus_object_stub_remove_interface (G_DBUS_OBJECT_STUB (block), G_DBUS_INTERFACE_STUB (*interface_pointer)); + g_dbus_object_skeleton_remove_interface (G_DBUS_OBJECT_SKELETON (block), G_DBUS_INTERFACE_SKELETON (*interface_pointer)); g_object_unref (*interface_pointer); *interface_pointer = NULL; } @@ -352,7 +352,7 @@ update_iface (UDisksLinuxBlock *block, { update_func (block, uevent_action, G_DBUS_INTERFACE (*interface_pointer)); if (add) - g_dbus_object_stub_add_interface (G_DBUS_OBJECT_STUB (block), G_DBUS_INTERFACE_STUB (*interface_pointer)); + g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (block), G_DBUS_INTERFACE_SKELETON (*interface_pointer)); } } @@ -400,7 +400,7 @@ find_lun (GDBusObjectManagerServer *object_manager, objects = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (object_manager)); for (l = objects; l != NULL; l = l->next) { - GDBusObjectStub *object = G_DBUS_OBJECT_STUB (l->data); + GDBusObjectSkeleton *object = G_DBUS_OBJECT_SKELETON (l->data); UDisksLinuxLun *lun; GList *lun_devices; GList *j; @@ -448,7 +448,7 @@ find_block_device_by_sysfs_path (GDBusObjectManagerServer *object_manager, objects = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (object_manager)); for (l = objects; l != NULL; l = l->next) { - GDBusObjectStub *object = G_DBUS_OBJECT_STUB (l->data); + GDBusObjectSkeleton *object = G_DBUS_OBJECT_SKELETON (l->data); UDisksLinuxBlock *block; if (!UDISKS_IS_LINUX_BLOCK (object)) @@ -976,8 +976,8 @@ static void swapspace_connect (UDisksLinuxBlock *block) { /* indicate that we want to handle the method invocations in a thread */ - g_dbus_interface_stub_set_flags (G_DBUS_INTERFACE_STUB (block->iface_swapspace), - G_DBUS_INTERFACE_STUB_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD); + g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (block->iface_swapspace), + G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD); g_signal_connect (block->iface_swapspace, "handle-start", G_CALLBACK (swapspace_handle_start), @@ -1032,11 +1032,11 @@ udisks_linux_block_uevent (UDisksLinuxBlock *block, } update_iface (block, action, block_device_check, block_device_connect, block_device_update, - UDISKS_TYPE_BLOCK_DEVICE_STUB, &block->iface_block_device); + UDISKS_TYPE_BLOCK_DEVICE_SKELETON, &block->iface_block_device); update_iface (block, action, filesystem_check, NULL, filesystem_update, UDISKS_TYPE_LINUX_FILESYSTEM, &block->iface_filesystem); update_iface (block, action, swapspace_check, swapspace_connect, swapspace_update, - UDISKS_TYPE_SWAPSPACE_STUB, &block->iface_swapspace); + UDISKS_TYPE_SWAPSPACE_SKELETON, &block->iface_swapspace); } /* ---------------------------------------------------------------------------------------------------- */ diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c index e9072a3..55a7452 100644 --- a/src/udiskslinuxfilesystem.c +++ b/src/udiskslinuxfilesystem.c @@ -54,17 +54,17 @@ typedef struct _UDisksLinuxFilesystemClass UDisksLinuxFilesystemClass; */ struct _UDisksLinuxFilesystem { - UDisksFilesystemStub parent_instance; + UDisksFilesystemSkeleton parent_instance; }; struct _UDisksLinuxFilesystemClass { - UDisksFilesystemStubClass parent_class; + UDisksFilesystemSkeletonClass parent_class; }; static void filesystem_iface_init (UDisksFilesystemIface *iface); -G_DEFINE_TYPE_WITH_CODE (UDisksLinuxFilesystem, udisks_linux_filesystem, UDISKS_TYPE_FILESYSTEM_STUB, +G_DEFINE_TYPE_WITH_CODE (UDisksLinuxFilesystem, udisks_linux_filesystem, UDISKS_TYPE_FILESYSTEM_SKELETON, G_IMPLEMENT_INTERFACE (UDISKS_TYPE_FILESYSTEM, filesystem_iface_init)); /* ---------------------------------------------------------------------------------------------------- */ @@ -72,8 +72,8 @@ G_DEFINE_TYPE_WITH_CODE (UDisksLinuxFilesystem, udisks_linux_filesystem, UDISKS_ static void udisks_linux_filesystem_init (UDisksLinuxFilesystem *filesystem) { - g_dbus_interface_stub_set_flags (G_DBUS_INTERFACE_STUB (filesystem), - G_DBUS_INTERFACE_STUB_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD); + g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (filesystem), + G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD); } static void diff --git a/src/udiskslinuxlun.c b/src/udiskslinuxlun.c index 6e23837..45f0b1f 100644 --- a/src/udiskslinuxlun.c +++ b/src/udiskslinuxlun.c @@ -48,7 +48,7 @@ typedef struct _UDisksLinuxLunClass UDisksLinuxLunClass; */ struct _UDisksLinuxLun { - GDBusObjectStub parent_instance; + GDBusObjectSkeleton parent_instance; UDisksDaemon *daemon; @@ -61,7 +61,7 @@ struct _UDisksLinuxLun struct _UDisksLinuxLunClass { - GDBusObjectStubClass parent_class; + GDBusObjectSkeletonClass parent_class; }; enum @@ -71,7 +71,7 @@ enum PROP_DEVICE }; -G_DEFINE_TYPE (UDisksLinuxLun, udisks_linux_lun, G_TYPE_DBUS_OBJECT_STUB); +G_DEFINE_TYPE (UDisksLinuxLun, udisks_linux_lun, G_TYPE_DBUS_OBJECT_SKELETON); static void udisks_linux_lun_finalize (GObject *object) @@ -249,7 +249,7 @@ udisks_linux_lun_constructed (GObject *object) g_free (vendor); g_free (model); g_free (serial); - g_dbus_object_stub_set_object_path (G_DBUS_OBJECT_STUB (lun), str->str); + g_dbus_object_skeleton_set_object_path (G_DBUS_OBJECT_SKELETON (lun), str->str); g_string_free (str, TRUE); if (G_OBJECT_CLASS (udisks_linux_lun_parent_class)->constructed != NULL) @@ -377,7 +377,7 @@ update_iface (UDisksLinuxLun *lun, const gchar *uevent_action, HasInterfaceFunc has_func, UpdateInterfaceFunc update_func, - GType stub_type, + GType skeleton_type, gpointer _interface_pointer) { gboolean has; @@ -387,8 +387,8 @@ update_iface (UDisksLinuxLun *lun, g_return_if_fail (lun != NULL); g_return_if_fail (has_func != NULL); g_return_if_fail (update_func != NULL); - g_return_if_fail (g_type_is_a (stub_type, G_TYPE_OBJECT)); - g_return_if_fail (g_type_is_a (stub_type, G_TYPE_DBUS_INTERFACE)); + g_return_if_fail (g_type_is_a (skeleton_type, G_TYPE_OBJECT)); + g_return_if_fail (g_type_is_a (skeleton_type, G_TYPE_DBUS_INTERFACE)); g_return_if_fail (interface_pointer != NULL); g_return_if_fail (*interface_pointer == NULL || G_IS_DBUS_INTERFACE (*interface_pointer)); @@ -398,7 +398,7 @@ update_iface (UDisksLinuxLun *lun, { if (has) { - *interface_pointer = g_object_new (stub_type, NULL); + *interface_pointer = g_object_new (skeleton_type, NULL); add = TRUE; } } @@ -406,7 +406,7 @@ update_iface (UDisksLinuxLun *lun, { if (!has) { - g_dbus_object_stub_remove_interface (G_DBUS_OBJECT_STUB (lun), G_DBUS_INTERFACE_STUB (*interface_pointer)); + g_dbus_object_skeleton_remove_interface (G_DBUS_OBJECT_SKELETON (lun), G_DBUS_INTERFACE_SKELETON (*interface_pointer)); g_object_unref (*interface_pointer); *interface_pointer = NULL; } @@ -416,7 +416,7 @@ update_iface (UDisksLinuxLun *lun, { update_func (lun, uevent_action, G_DBUS_INTERFACE (*interface_pointer)); if (add) - g_dbus_object_stub_add_interface (G_DBUS_OBJECT_STUB (lun), G_DBUS_INTERFACE_STUB (*interface_pointer)); + g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (lun), G_DBUS_INTERFACE_SKELETON (*interface_pointer)); } } @@ -436,7 +436,7 @@ find_iscsi_target (GDBusObjectManagerServer *object_manager, objects = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (object_manager)); for (l = objects; l != NULL; l = l->next) { - GDBusObjectStub *object = G_DBUS_OBJECT_STUB (l->data); + GDBusObjectSkeleton *object = G_DBUS_OBJECT_SKELETON (l->data); UDisksIScsiTarget *target; target = UDISKS_PEEK_ISCSI_TARGET (object); @@ -1018,7 +1018,7 @@ udisks_linux_lun_uevent (UDisksLinuxLun *lun, } update_iface (lun, action, lun_check, lun_update, - UDISKS_TYPE_LUN_STUB, &lun->iface_lun); + UDISKS_TYPE_LUN_SKELETON, &lun->iface_lun); } /* ---------------------------------------------------------------------------------------------------- */ diff --git a/src/udiskslinuxprovider.c b/src/udiskslinuxprovider.c index 75c1d46..7b9630c 100644 --- a/src/udiskslinuxprovider.c +++ b/src/udiskslinuxprovider.c @@ -261,7 +261,7 @@ handle_block_uevent_for_lun (UDisksLinuxProvider *provider, { g_object_set_data_full (G_OBJECT (lun), "x-vpd", g_strdup (vpd), g_free); g_dbus_object_manager_server_export_uniquely (udisks_daemon_get_object_manager (daemon), - G_DBUS_OBJECT_STUB (lun)); + G_DBUS_OBJECT_SKELETON (lun)); g_hash_table_insert (provider->vpd_to_lun, g_strdup (vpd), lun); g_hash_table_insert (provider->sysfs_path_to_lun, g_strdup (sysfs_path), lun); } @@ -305,7 +305,7 @@ handle_block_uevent_for_block (UDisksLinuxProvider *provider, { block = udisks_linux_block_new (daemon, device); g_dbus_object_manager_server_export_uniquely (udisks_daemon_get_object_manager (daemon), - G_DBUS_OBJECT_STUB (block)); + G_DBUS_OBJECT_SKELETON (block)); g_hash_table_insert (provider->sysfs_to_block, g_strdup (sysfs_path), block); } } -- 2.7.4