Keep a priv pointer in the object struct instead of using G_TYPE_INSTANCE_GET_PRIVATE all the time.

git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@1082 4ee84921-47dd-4033-b63a-18d7a039a3e4

1 files changed, 7 insertions, 10 deletions

diff --git a/libempathy-gtk/empathy-theme.c b/libempathy-gtk/empathy-theme.c
index b3638476c..b1afa51ca 100644
--- a/libempathy-gtk/empathy-theme.c
+++ b/libempathy-gtk/empathy-theme.c
@@ -34,14 +34,11 @@
 /* Number of seconds between timestamps when using normal mode, 5 minutes. */
 #define TIMESTAMP_INTERVAL 300
 
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_THEME, EmpathyThemePriv))
-
-typedef struct _EmpathyThemePriv EmpathyThemePriv;
-
-struct _EmpathyThemePriv {
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTheme)
+typedef struct {
 	EmpathySmileyManager *smiley_manager;
 	gboolean show_avatars;
-};
+} EmpathyThemePriv;
 
 static void         theme_finalize            (GObject            *object);
 static void         theme_get_property        (GObject            *object,
@@ -89,12 +86,12 @@ empathy_theme_class_init (EmpathyThemeClass *class)
 }
 
 static void
-empathy_theme_init (EmpathyTheme *presence)
+empathy_theme_init (EmpathyTheme *theme)
 {
-	EmpathyThemePriv *priv;
-
-	priv = GET_PRIV (presence);
+	EmpathyThemePriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (theme,
+		EMPATHY_TYPE_THEME, EmpathyThemePriv);
 
+	theme->priv = priv;
 	priv->smiley_manager = empathy_smiley_manager_new ();
 }