From 1557095113a3c0f5baadcfb1e953d73762e5263e Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 5 May 2008 20:34:41 +0000 Subject: Keep a priv pointer in the object struct instead of using G_TYPE_INSTANCE_GET_PRIVATE all the time. svn path=/trunk/; revision=1082 --- libempathy-gtk/empathy-conf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libempathy-gtk/empathy-conf.c') diff --git a/libempathy-gtk/empathy-conf.c b/libempathy-gtk/empathy-conf.c index 0ecb8e166..fae2c37db 100644 --- a/libempathy-gtk/empathy-conf.c +++ b/libempathy-gtk/empathy-conf.c @@ -26,6 +26,7 @@ #include +#include #include "empathy-conf.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER @@ -34,8 +35,7 @@ #define EMPATHY_CONF_ROOT "/apps/empathy" #define DESKTOP_INTERFACE_ROOT "/desktop/gnome/interface" -#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CONF, EmpathyConfPriv)) - +#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyConf) typedef struct { GConfClient *gconf_client; } EmpathyConfPriv; @@ -67,10 +67,10 @@ empathy_conf_class_init (EmpathyConfClass *class) static void empathy_conf_init (EmpathyConf *conf) { - EmpathyConfPriv *priv; - - priv = GET_PRIV (conf); + EmpathyConfPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (conf, + EMPATHY_TYPE_CONF, EmpathyConfPriv); + conf->priv = priv; priv->gconf_client = gconf_client_get_default (); gconf_client_add_dir (priv->gconf_client, -- cgit v1.2.3