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-gtk/empathy-theme.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-gtk/empathy-theme.c')
-rw-r--r-- | libempathy-gtk/empathy-theme.c | 17 |
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 (); } |