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-cell-renderer-text.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'libempathy-gtk/empathy-cell-renderer-text.c') diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c index d48de32b8..c31a013aa 100644 --- a/libempathy-gtk/empathy-cell-renderer-text.c +++ b/libempathy-gtk/empathy-cell-renderer-text.c @@ -24,11 +24,11 @@ #include +#include #include "empathy-cell-renderer-text.h" -#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CELL_RENDERER_TEXT, EmpathyCellRendererTextPriv)) - -struct _EmpathyCellRendererTextPriv { +#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText) +typedef struct { gchar *name; gchar *status; gboolean is_group; @@ -37,10 +37,8 @@ struct _EmpathyCellRendererTextPriv { gboolean is_selected; gboolean show_status; -}; +} EmpathyCellRendererTextPriv; -static void empathy_cell_renderer_text_class_init (EmpathyCellRendererTextClass *klass); -static void empathy_cell_renderer_text_init (EmpathyCellRendererText *cell); static void cell_renderer_text_finalize (GObject *object); static void cell_renderer_text_get_property (GObject *object, guint param_id, @@ -131,10 +129,10 @@ empathy_cell_renderer_text_class_init (EmpathyCellRendererTextClass *klass) static void empathy_cell_renderer_text_init (EmpathyCellRendererText *cell) { - EmpathyCellRendererTextPriv *priv; - - priv = GET_PRIV (cell); + EmpathyCellRendererTextPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (cell, + EMPATHY_TYPE_CELL_RENDERER_TEXT, EmpathyCellRendererTextPriv); + cell->priv = priv; g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -- cgit v1.2.3