icera: fix abuse of GInterface

The GInterface structure for MMModemIcera isn't instance data, thus we
shouldn't be storing an instance pointer in it.  Instead, make implemtors
store the intstance data in their private structure, and have them
implement an accessor for the Icera-private data.  This makes everone
(especially GObject) happy.  It's a bit of additional indirection, but
we still get to use the MM_MODEM_ICERA_GET_PRIVATE() and we still
get to cast the passed-in GInterface MMModemIcera into the various
GSM MMModem subclasses, which is all we ever wanted anyway.

1 files changed, 6 insertions, 2 deletions

diff --git a/plugins/mm-modem-icera.h b/plugins/mm-modem-icera.h
index 71258d2a..aefa8414 100644
--- a/plugins/mm-modem-icera.h
+++ b/plugins/mm-modem-icera.h
@@ -37,12 +37,16 @@ typedef struct _MMModemIcera MMModemIcera;
 struct _MMModemIcera {
     GTypeInterface g_iface;
 
-    MMModemIceraPrivate *priv;
+    /* Returns the implementing object's pointer to an internal
+     * MMModemIceraPrivate pointer.
+     */
+    MMModemIceraPrivate * (*get_private) (MMModemIcera *icera);
 };
 
 GType mm_modem_icera_get_type (void);
 
-void mm_modem_icera_prepare (MMModemIcera *self);
+MMModemIceraPrivate *mm_modem_icera_init_private (void);
+void mm_modem_icera_dispose_private (MMModemIcera *self);
 
 void mm_modem_icera_cleanup (MMModemIcera *self);