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/menu.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/menu.c')
| -rw-r--r-- | libdbusmenu-gtk/menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 4fa546b..ace8e8a 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -44,7 +44,6 @@ enum { }; /* Private */ -typedef struct _DbusmenuGtkMenuPrivate DbusmenuGtkMenuPrivate; struct _DbusmenuGtkMenuPrivate { DbusmenuGtkClient * client; @@ -52,8 +51,7 @@ struct _DbusmenuGtkMenuPrivate { gchar * dbus_name; }; -#define DBUSMENU_GTKMENU_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuPrivate)) +#define DBUSMENU_GTKMENU_GET_PRIVATE(o) (DBUSMENU_GTKMENU(o)->priv) /* Prototypes */ static void dbusmenu_gtkmenu_class_init (DbusmenuGtkMenuClass *klass); @@ -110,6 +108,8 @@ menu_focus_cb(DbusmenuGtkMenu * menu, gpointer userdata) static void dbusmenu_gtkmenu_init (DbusmenuGtkMenu *self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuPrivate); + DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(self); priv->client = NULL; |