diff options
| author | Alexander Larsson <alexl@redhat.com> | 2009-12-01 10:55:29 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2009-12-01 11:22:37 +0100 |
| commit | 19c12a0f68c84423479510344989ae962b0cdbd3 (patch) | |
| tree | d3e4edb3eb6a091d5e5c7d1012d79d7bf67db126 /monitor/proxy | |
| parent | dd3e17181854c91f7c9123360652ae2ec28ea03e (diff) | |
| download | gvfs-19c12a0f68c84423479510344989ae962b0cdbd3.tar.gz | |
Use new G_IMPLEMENT_INTERFACE_DYNAMIC from glib
Diffstat (limited to 'monitor/proxy')
| -rw-r--r-- | monitor/proxy/gproxydrive.c | 11 | ||||
| -rw-r--r-- | monitor/proxy/gproxymount.c | 10 | ||||
| -rw-r--r-- | monitor/proxy/gproxyshadowmount.c | 10 | ||||
| -rw-r--r-- | monitor/proxy/gproxyvolume.c | 11 |
4 files changed, 8 insertions, 34 deletions
diff --git a/monitor/proxy/gproxydrive.c b/monitor/proxy/gproxydrive.c index bfe6ce93..796581a5 100644 --- a/monitor/proxy/gproxydrive.c +++ b/monitor/proxy/gproxydrive.c @@ -64,16 +64,9 @@ struct _GProxyDrive { static void g_proxy_drive_drive_iface_init (GDriveIface *iface); -#define _G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init) { \ - const GInterfaceInfo g_implement_interface_info = { \ - (GInterfaceInitFunc) iface_init, NULL, NULL \ - }; \ - g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \ -} - G_DEFINE_DYNAMIC_TYPE_EXTENDED (GProxyDrive, g_proxy_drive, G_TYPE_OBJECT, 0, - _G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_DRIVE, - g_proxy_drive_drive_iface_init)) + G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_DRIVE, + g_proxy_drive_drive_iface_init)) static void g_proxy_drive_finalize (GObject *object) diff --git a/monitor/proxy/gproxymount.c b/monitor/proxy/gproxymount.c index 6e61ae78..39d31d21 100644 --- a/monitor/proxy/gproxymount.c +++ b/monitor/proxy/gproxymount.c @@ -58,15 +58,9 @@ struct _GProxyMount { static void g_proxy_mount_mount_iface_init (GMountIface *iface); -#define _G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init) { \ - const GInterfaceInfo g_implement_interface_info = { \ - (GInterfaceInitFunc) iface_init, NULL, NULL \ - }; \ - g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \ -} G_DEFINE_DYNAMIC_TYPE_EXTENDED (GProxyMount, g_proxy_mount, G_TYPE_OBJECT, 0, - _G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_MOUNT, - g_proxy_mount_mount_iface_init)) + G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_MOUNT, + g_proxy_mount_mount_iface_init)) static void g_proxy_mount_finalize (GObject *object) diff --git a/monitor/proxy/gproxyshadowmount.c b/monitor/proxy/gproxyshadowmount.c index d9d34de5..328d3d63 100644 --- a/monitor/proxy/gproxyshadowmount.c +++ b/monitor/proxy/gproxyshadowmount.c @@ -56,15 +56,9 @@ struct _GProxyShadowMount { static void g_proxy_shadow_mount_mount_iface_init (GMountIface *iface); -#define _G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init) { \ - const GInterfaceInfo g_implement_interface_info = { \ - (GInterfaceInitFunc) iface_init, NULL, NULL \ - }; \ - g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \ -} G_DEFINE_DYNAMIC_TYPE_EXTENDED (GProxyShadowMount, g_proxy_shadow_mount, G_TYPE_OBJECT, 0, - _G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_MOUNT, - g_proxy_shadow_mount_mount_iface_init)) + G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_MOUNT, + g_proxy_shadow_mount_mount_iface_init)) static void g_proxy_shadow_mount_finalize (GObject *object) diff --git a/monitor/proxy/gproxyvolume.c b/monitor/proxy/gproxyvolume.c index 0115901f..484939a4 100644 --- a/monitor/proxy/gproxyvolume.c +++ b/monitor/proxy/gproxyvolume.c @@ -69,16 +69,9 @@ struct _GProxyVolume { static void g_proxy_volume_volume_iface_init (GVolumeIface *iface); -#define _G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init) { \ - const GInterfaceInfo g_implement_interface_info = { \ - (GInterfaceInitFunc) iface_init, NULL, NULL \ - }; \ - g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \ -} - G_DEFINE_DYNAMIC_TYPE_EXTENDED (GProxyVolume, g_proxy_volume, G_TYPE_OBJECT, 0, - _G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_VOLUME, - g_proxy_volume_volume_iface_init)) + G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_VOLUME, + g_proxy_volume_volume_iface_init)) static void union_monitor_mount_added (GVolumeMonitor *union_monitor, |