diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-11 11:24:45 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-11 11:24:45 -0600 |
| commit | f0c24c976f319d0b087adc0c8bc694cf930aa30b (patch) | |
| tree | cc1d6a425b2d5c8c5625d010cb027953d6289751 /libdbusmenu-glib/server.c | |
| parent | 9e1c8319da6ac98bd36b73c4d46d7b655778ed9d (diff) | |
| parent | b3768eaec11202758801a3dd0f94a2ab315f4a0d (diff) | |
| download | libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.tar.gz libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.tar.bz2 libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.zip | |
Import upstream version 0.3.90
Diffstat (limited to 'libdbusmenu-glib/server.c')
| -rw-r--r-- | libdbusmenu-glib/server.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 68afb92..c5cf2fe 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -53,8 +53,6 @@ static void layout_update_signal (DbusmenuServer * server); #define DBUSMENU_VERSION_NUMBER 2 /* Privates, I'll show you mine... */ -typedef struct _DbusmenuServerPrivate DbusmenuServerPrivate; - struct _DbusmenuServerPrivate { DbusmenuMenuitem * root; @@ -63,8 +61,7 @@ struct _DbusmenuServerPrivate guint layout_idle; }; -#define DBUSMENU_SERVER_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_SERVER, DbusmenuServerPrivate)) +#define DBUSMENU_SERVER_GET_PRIVATE(o) (DBUSMENU_SERVER(o)->priv) /* Signals */ enum { @@ -214,6 +211,8 @@ dbusmenu_server_class_init (DbusmenuServerClass *class) static void dbusmenu_server_init (DbusmenuServer *self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_TYPE_SERVER, DbusmenuServerPrivate); + DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(self); priv->root = NULL; |