diff options
Diffstat (limited to 'libempathy-gtk/empathy-conf.c')
| -rw-r--r-- | libempathy-gtk/empathy-conf.c | 10 |
1 files changed, 5 insertions, 5 deletions
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 <gconf/gconf-client.h> +#include <libempathy/empathy-utils.h> #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, |