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.h | |
| 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.h')
| -rw-r--r-- | libdbusmenu-glib/client.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h index 5d4b5c3..32813d9 100644 --- a/libdbusmenu-glib/client.h +++ b/libdbusmenu-glib/client.h @@ -56,6 +56,8 @@ G_BEGIN_DECLS #define DBUSMENU_CLIENT_TYPES_SEPARATOR "separator" #define DBUSMENU_CLIENT_TYPES_IMAGE "standard" +typedef struct _DbusmenuClientPrivate DbusmenuClientPrivate; + /** DbusmenuClientClass: @parent_class: #GObjectClass @@ -65,6 +67,10 @@ G_BEGIN_DECLS @event_result: Slot for #DbusmenuClient::event-error. @reserved1: Reserved for future use. @reserved2: Reserved for future use. + @reserved3: Reserved for future use. + @reserved4: Reserved for future use. + @reserved5: Reserved for future use. + @reserved6: Reserved for future use. A simple class that takes all of the information from a #DbusmenuServer over DBus and makes the same set of @@ -80,11 +86,13 @@ struct _DbusmenuClientClass { void (*item_activate) (DbusmenuMenuitem * item, guint timestamp); void (*event_result) (DbusmenuMenuitem * item, gchar * event, GValue * data, guint timestamp, GError * error); - /* Reserved for future use */ + /*< Private >*/ void (*reserved1) (void); void (*reserved2) (void); - /* void (*reserved3) (void); */ - /* void (*reserved4) (void); */ + void (*reserved3) (void); + void (*reserved4) (void); + void (*reserved5) (void); + void (*reserved6) (void); }; /** @@ -97,6 +105,9 @@ struct _DbusmenuClientClass { typedef struct _DbusmenuClient DbusmenuClient; struct _DbusmenuClient { GObject parent; + + /*< Private >*/ + DbusmenuClientPrivate * priv; }; typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); |