diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-05-06 04:34:41 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-05-06 04:34:41 +0800 |
| commit | 1557095113a3c0f5baadcfb1e953d73762e5263e (patch) | |
| tree | 6af706fb1f4f673120981e033768a09169544c11 /libempathy/empathy-tp-contact-factory.c | |
| parent | 62828fac680bd53e0047d9ae2a281c864075c809 (diff) | |
| download | gsoc2013-empathy-1557095113a3c0f5baadcfb1e953d73762e5263e.tar gsoc2013-empathy-1557095113a3c0f5baadcfb1e953d73762e5263e.tar.gz gsoc2013-empathy-1557095113a3c0f5baadcfb1e953d73762e5263e.tar.bz2 gsoc2013-empathy-1557095113a3c0f5baadcfb1e953d73762e5263e.tar.lz gsoc2013-empathy-1557095113a3c0f5baadcfb1e953d73762e5263e.tar.xz gsoc2013-empathy-1557095113a3c0f5baadcfb1e953d73762e5263e.tar.zst gsoc2013-empathy-1557095113a3c0f5baadcfb1e953d73762e5263e.zip | |
Keep a priv pointer in the object struct instead of using G_TYPE_INSTANCE_GET_PRIVATE all the time.
svn path=/trunk/; revision=1082
Diffstat (limited to 'libempathy/empathy-tp-contact-factory.c')
| -rw-r--r-- | libempathy/empathy-tp-contact-factory.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c index e071ff5fb..7cf0b53cc 100644 --- a/libempathy/empathy-tp-contact-factory.c +++ b/libempathy/empathy-tp-contact-factory.c @@ -33,10 +33,8 @@ #define DEBUG_FLAG EMPATHY_DEBUG_TP | EMPATHY_DEBUG_CONTACT #include "empathy-debug.h" -#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - EMPATHY_TYPE_TP_CONTACT_FACTORY, EmpathyTpContactFactoryPriv)) - -struct _EmpathyTpContactFactoryPriv { +#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpContactFactory) +typedef struct { MissionControl *mc; McAccount *account; TpConnection *connection; @@ -45,10 +43,7 @@ struct _EmpathyTpContactFactoryPriv { GList *contacts; EmpathyContact *user; gpointer token; -}; - -static void empathy_tp_contact_factory_class_init (EmpathyTpContactFactoryClass *klass); -static void empathy_tp_contact_factory_init (EmpathyTpContactFactory *factory); +} EmpathyTpContactFactoryPriv; G_DEFINE_TYPE (EmpathyTpContactFactory, empathy_tp_contact_factory, G_TYPE_OBJECT); @@ -1276,8 +1271,10 @@ empathy_tp_contact_factory_class_init (EmpathyTpContactFactoryClass *klass) static void empathy_tp_contact_factory_init (EmpathyTpContactFactory *tp_factory) { - EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory); + EmpathyTpContactFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (tp_factory, + EMPATHY_TYPE_TP_CONTACT_FACTORY, EmpathyTpContactFactoryPriv); + tp_factory->priv = priv; priv->mc = empathy_mission_control_new (); priv->token = empathy_connect_to_account_status_changed (priv->mc, G_CALLBACK (tp_contact_factory_status_changed_cb), |