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-gtk/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-gtk/client.c')
-rw-r--r-- | libdbusmenu-gtk/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 6970d59..487971f 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -37,13 +37,11 @@ License version 3 and version 2.1 along with this program. If not, see #include "genericmenuitem.h" /* Private */ -typedef struct _DbusmenuGtkClientPrivate DbusmenuGtkClientPrivate; struct _DbusmenuGtkClientPrivate { GtkAccelGroup * agroup; }; -#define DBUSMENU_GTKCLIENT_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientPrivate)) +#define DBUSMENU_GTKCLIENT_GET_PRIVATE(o) (DBUSMENU_GTKCLIENT(o)->priv) /* Prototypes */ static void dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass); @@ -85,6 +83,8 @@ dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass) static void dbusmenu_gtkclient_init (DbusmenuGtkClient *self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientPrivate); + DbusmenuGtkClientPrivate * priv = DBUSMENU_GTKCLIENT_GET_PRIVATE(self); priv->agroup = NULL; |