diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2010-11-17 15:35:34 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2010-11-17 15:35:34 -0500 |
| commit | ca1881e6cf5180215a3222f95b387c48f265184c (patch) | |
| tree | 2075e0d9976ea51c39964137ef5dfca5c2e6e3d0 /libdbusmenu-glib/server.c | |
| parent | b353628b2659d06ad6e356cfbf017aa96cb4697e (diff) | |
| parent | 395db9878504b28778b246ea658be5287e758e1f (diff) | |
| download | libdbusmenu-ca1881e6cf5180215a3222f95b387c48f265184c.tar.gz libdbusmenu-ca1881e6cf5180215a3222f95b387c48f265184c.tar.bz2 libdbusmenu-ca1881e6cf5180215a3222f95b387c48f265184c.zip | |
* New upstream release.
* Breaking ABI and getting reserved back
* Adding build support for GTK2/3 builds
* Only force a flush of top level items, allow others to be
based on the count.
* debian/control, debian/libdbusmenu-glib2.install,
debian/libdbusmenu-gtk2.install: Switching package names to
match .so bump.
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; |