[gvfs] Use new G_IMPLEMENT_INTERFACE_DYNAMIC from glib

[Alexander Larsson <alexl src gnome org>]

commit 19c12a0f68c84423479510344989ae962b0cdbd3
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Dec 1 10:55:29 2009 +0100

    Use new G_IMPLEMENT_INTERFACE_DYNAMIC from glib

 gconf/gapplookupgconf.c           |   11 ++---------
 monitor/proxy/gproxydrive.c       |   11 ++---------
 monitor/proxy/gproxymount.c       |   10 ++--------
 monitor/proxy/gproxyshadowmount.c |   10 ++--------
 monitor/proxy/gproxyvolume.c      |   11 ++---------
 5 files changed, 10 insertions(+), 43 deletions(-)
---
diff --git a/gconf/gapplookupgconf.c b/gconf/gapplookupgconf.c
index 5d477ba..2690265 100644
--- a/gconf/gapplookupgconf.c
+++ b/gconf/gapplookupgconf.c
@@ -41,16 +41,9 @@ struct _GAppLookupGConf {
 static void lookup_iface_init (GDesktopAppInfoLookupIface *iface);
 static void g_app_lookup_gconf_finalize (GObject *object);
 
-#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 (GAppLookupGConf, g_app_lookup_gconf, G_TYPE_OBJECT, 0,
-                                _G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_DESKTOP_APP_INFO_LOOKUP,
-                                                                lookup_iface_init))
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_DESKTOP_APP_INFO_LOOKUP,
+							       lookup_iface_init))
 
 static void
 g_app_lookup_gconf_finalize (GObject *object)
diff --git a/monitor/proxy/gproxydrive.c b/monitor/proxy/gproxydrive.c
index bfe6ce9..796581a 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 6e61ae7..39d31d2 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 d9d34de..328d3d6 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 0115901..484939a 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,