diff options
| author | Ted Gould <ted@gould.cx> | 2010-10-13 12:42:25 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-10-13 12:42:25 -0500 |
| commit | d01dcd794d4195c6e3eb20f6bb055fc647661dc2 (patch) | |
| tree | 81fc685280c823a7f4e2ad6e55523b35a034b0b9 /libdbusmenu-glib/client.c | |
| parent | 46a59a2613d8fc1cab048c3b8af579f7867f9b8a (diff) | |
| parent | de67e00eb07dbd06b6c53798653a690bb9b5fe85 (diff) | |
| download | libdbusmenu-d01dcd794d4195c6e3eb20f6bb055fc647661dc2.tar.gz libdbusmenu-d01dcd794d4195c6e3eb20f6bb055fc647661dc2.tar.bz2 libdbusmenu-d01dcd794d4195c6e3eb20f6bb055fc647661dc2.zip | |
* Upstream Merge
* Breaking ABI and getting reserved back
Diffstat (limited to 'libdbusmenu-glib/client.c')
| -rw-r--r-- | libdbusmenu-glib/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index ca16c9a..6a51764 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -62,7 +62,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -typedef struct _DbusmenuClientPrivate DbusmenuClientPrivate; struct _DbusmenuClientPrivate { DbusmenuMenuitem * root; @@ -113,8 +112,7 @@ struct _event_data_t { }; -#define DBUSMENU_CLIENT_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_CLIENT, DbusmenuClientPrivate)) +#define DBUSMENU_CLIENT_GET_PRIVATE(o) (DBUSMENU_CLIENT(o)->priv) /* GObject Stuff */ static void dbusmenu_client_class_init (DbusmenuClientClass *klass); @@ -254,6 +252,8 @@ dbusmenu_client_class_init (DbusmenuClientClass *klass) static void dbusmenu_client_init (DbusmenuClient *self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_TYPE_CLIENT, DbusmenuClientPrivate); + DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(self); priv->root = NULL; |