[telepathy-mission-control/master] McdDispatcher: revert hack used to preserve ABI

[Simon McVittie]

We don't care about MCD's ABI yet anyway, so preserve the old amount of
padding after adding the TpDBusPropertiesMixinClass.
---
 src/mcd-dispatcher.c |    2 +-
 src/mcd-dispatcher.h |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 94f3597..40607ab 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -2658,7 +2658,7 @@ mcd_dispatcher_class_init (McdDispatcherClass * klass)
 
     client_ready_quark = g_quark_from_static_string ("mcd_client_ready");
 
-    klass->dbus_properties_class.real.interfaces = prop_interfaces,
+    klass->dbus_properties_class.interfaces = prop_interfaces,
     tp_dbus_properties_mixin_class_init (object_class,
         G_STRUCT_OFFSET (McdDispatcherClass, dbus_properties_class));
 }
diff --git a/src/mcd-dispatcher.h b/src/mcd-dispatcher.h
index d39371a..3eb764c 100644
--- a/src/mcd-dispatcher.h
+++ b/src/mcd-dispatcher.h
@@ -74,10 +74,8 @@ struct _McdDispatcherClass
 				    GError *error);
 
     /* virtual methods */
-    union {
-        TpDBusPropertiesMixinClass real;
-        GCallback _pad;
-    } dbus_properties_class;
+    TpDBusPropertiesMixinClass dbus_properties_class;
+    void (*_mc_reserved0) (void);
     void (*_mc_reserved1) (void);
     void (*_mc_reserved2) (void);
     void (*_mc_reserved3) (void);
-- 
1.5.6.5