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/empathy-chatroom.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'libempathy/empathy-chatroom.c') diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c index 7b4a3d672..17be191e5 100644 --- a/libempathy/empathy-chatroom.c +++ b/libempathy/empathy-chatroom.c @@ -28,17 +28,15 @@ #include "empathy-chatroom.h" #include "empathy-utils.h" -#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CHATROOM, EmpathyChatroomPriv)) - -struct _EmpathyChatroomPriv { +#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom) +typedef struct { McAccount *account; gchar *room; gchar *name; gboolean auto_connect; -}; +} EmpathyChatroomPriv; + -static void empathy_chatroom_class_init (EmpathyChatroomClass *klass); -static void empathy_chatroom_init (EmpathyChatroom *chatroom); static void chatroom_finalize (GObject *object); static void chatroom_get_property (GObject *object, guint param_id, @@ -107,6 +105,10 @@ empathy_chatroom_class_init (EmpathyChatroomClass *klass) static void empathy_chatroom_init (EmpathyChatroom *chatroom) { + EmpathyChatroomPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (chatroom, + EMPATHY_TYPE_CHATROOM, EmpathyChatroomPriv); + + chatroom->priv = priv; } static void -- cgit v1.2.3