client.h   client.h 
skipping to change at line 59 skipping to change at line 59
#define DBUSMENU_CLIENT_SIGNAL_ITEM_ACTIVATE "item-activate" #define DBUSMENU_CLIENT_SIGNAL_ITEM_ACTIVATE "item-activate"
#define DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT "event-result" #define DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT "event-result"
#define DBUSMENU_CLIENT_PROP_DBUS_NAME "dbus-name" #define DBUSMENU_CLIENT_PROP_DBUS_NAME "dbus-name"
#define DBUSMENU_CLIENT_PROP_DBUS_OBJECT "dbus-object" #define DBUSMENU_CLIENT_PROP_DBUS_OBJECT "dbus-object"
#define DBUSMENU_CLIENT_TYPES_DEFAULT "standard" #define DBUSMENU_CLIENT_TYPES_DEFAULT "standard"
#define DBUSMENU_CLIENT_TYPES_SEPARATOR "separator" #define DBUSMENU_CLIENT_TYPES_SEPARATOR "separator"
#define DBUSMENU_CLIENT_TYPES_IMAGE "standard" #define DBUSMENU_CLIENT_TYPES_IMAGE "standard"
typedef struct _DbusmenuClientPrivate DbusmenuClientPrivate;
/** /**
DbusmenuClientClass: DbusmenuClientClass:
@parent_class: #GObjectClass @parent_class: #GObjectClass
@layout_updated: Slot for #DbusmenuClient::layout-updated. @layout_updated: Slot for #DbusmenuClient::layout-updated.
@new_menuitem: Slot for #DbusmenuClient::new-menuitem. @new_menuitem: Slot for #DbusmenuClient::new-menuitem.
@item_activate: Slot for #DbusmenuClient::item-activate. @item_activate: Slot for #DbusmenuClient::item-activate.
@event_result: Slot for #DbusmenuClient::event-error. @event_result: Slot for #DbusmenuClient::event-error.
@reserved1: Reserved for future use. @reserved1: Reserved for future use.
@reserved2: 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 A simple class that takes all of the information from a
#DbusmenuServer over DBus and makes the same set of #DbusmenuServer over DBus and makes the same set of
#DbusmenuMenuitem objects appear on the other side. #DbusmenuMenuitem objects appear on the other side.
*/ */
typedef struct _DbusmenuClientClass DbusmenuClientClass; typedef struct _DbusmenuClientClass DbusmenuClientClass;
struct _DbusmenuClientClass { struct _DbusmenuClientClass {
GObjectClass parent_class; GObjectClass parent_class;
void (*layout_updated)(void); void (*layout_updated)(void);
void (*root_changed) (DbusmenuMenuitem * newroot); void (*root_changed) (DbusmenuMenuitem * newroot);
void (*new_menuitem) (DbusmenuMenuitem * newitem); void (*new_menuitem) (DbusmenuMenuitem * newitem);
void (*item_activate) (DbusmenuMenuitem * item, guint timestamp); void (*item_activate) (DbusmenuMenuitem * item, guint timestamp);
void (*event_result) (DbusmenuMenuitem * item, gchar * event, GValue * data, guint timestamp, GError * error); void (*event_result) (DbusmenuMenuitem * item, gchar * event, GValue * data, guint timestamp, GError * error);
/* Reserved for future use */ /*< Private >*/
void (*reserved1) (void); void (*reserved1) (void);
void (*reserved2) (void); void (*reserved2) (void);
/* void (*reserved3) (void); */ void (*reserved3) (void);
/* void (*reserved4) (void); */ void (*reserved4) (void);
void (*reserved5) (void);
void (*reserved6) (void);
}; };
/** /**
DbusmenuClient: DbusmenuClient:
@parent: #GObject. @parent: #GObject.
The client for a #DbusmenuServer creating a shared The client for a #DbusmenuServer creating a shared
object set of #DbusmenuMenuitem objects. object set of #DbusmenuMenuitem objects.
*/ */
typedef struct _DbusmenuClient DbusmenuClient; typedef struct _DbusmenuClient DbusmenuClient;
struct _DbusmenuClient { struct _DbusmenuClient {
GObject parent; GObject parent;
/*< Private >*/
DbusmenuClientPrivate * priv;
}; };
typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
GType dbusmenu_client_get_type (void); GType dbusmenu_client_get_type (void);
DbusmenuClient * dbusmenu_client_new (const gchar * name, DbusmenuClient * dbusmenu_client_new (const gchar * name,
const gchar * objec t); const gchar * objec t);
DbusmenuMenuitem * dbusmenu_client_get_root (DbusmenuClient * cl ient); DbusmenuMenuitem * dbusmenu_client_get_root (DbusmenuClient * cl ient);
gboolean dbusmenu_client_add_type_handler (DbusmenuClient * cl ient, gboolean dbusmenu_client_add_type_handler (DbusmenuClient * cl ient,
const gchar * type, const gchar * type,
 End of changes. 5 change blocks. 
3 lines changed or deleted 14 lines changed or added


 menu.h   menu.h 
skipping to change at line 45 skipping to change at line 45
G_BEGIN_DECLS G_BEGIN_DECLS
#define DBUSMENU_GTKMENU_TYPE (dbusmenu_gtkmenu_get_type ()) #define DBUSMENU_GTKMENU_TYPE (dbusmenu_gtkmenu_get_type ())
#define DBUSMENU_GTKMENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj) , DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenu)) #define DBUSMENU_GTKMENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj) , DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenu))
#define DBUSMENU_GTKMENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuClass)) #define DBUSMENU_GTKMENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuClass))
#define DBUSMENU_IS_GTKMENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj) , DBUSMENU_GTKMENU_TYPE)) #define DBUSMENU_IS_GTKMENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj) , DBUSMENU_GTKMENU_TYPE))
#define DBUSMENU_IS_GTKMENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_GTKMENU_TYPE)) #define DBUSMENU_IS_GTKMENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_GTKMENU_TYPE))
#define DBUSMENU_GTKMENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuClass)) #define DBUSMENU_GTKMENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuClass))
typedef struct _DbusmenuGtkMenuPrivate DbusmenuGtkMenuPrivate;
/** /**
DbusmenuGtkMenuClass: DbusmenuGtkMenuClass:
@parent_class: #GtkMenuClass @parent_class: #GtkMenuClass
@reserved1: Reserved for future use. @reserved1: Reserved for future use.
@reserved2: Reserved for future use. @reserved2: Reserved for future use.
@reserved3: Reserved for future use. @reserved3: Reserved for future use.
@reserved4: Reserved for future use. @reserved4: Reserved for future use.
@reserved5: Reserved for future use.
@reserved6: Reserved for future use.
*/ */
typedef struct _DbusmenuGtkMenuClass DbusmenuGtkMenuClass; typedef struct _DbusmenuGtkMenuClass DbusmenuGtkMenuClass;
struct _DbusmenuGtkMenuClass { struct _DbusmenuGtkMenuClass {
GtkMenuClass parent_class; GtkMenuClass parent_class;
/* Reserved */ /*< Private >*/
void (*reserved1) (void); void (*reserved1) (void);
void (*reserved2) (void); void (*reserved2) (void);
void (*reserved3) (void); void (*reserved3) (void);
void (*reserved4) (void); void (*reserved4) (void);
void (*reserved5) (void);
void (*reserved6) (void);
}; };
/** /**
DbusmenuGtkMenu: DbusmenuGtkMenu:
@parent: #GtkMenu @parent: #GtkMenu
*/ */
typedef struct _DbusmenuGtkMenu DbusmenuGtkMenu; typedef struct _DbusmenuGtkMenu DbusmenuGtkMenu;
struct _DbusmenuGtkMenu { struct _DbusmenuGtkMenu {
GtkMenu parent; GtkMenu parent;
/*< Private >*/
DbusmenuGtkMenuPrivate * priv;
}; };
GType dbusmenu_gtkmenu_get_type (void); GType dbusmenu_gtkmenu_get_type (void);
DbusmenuGtkMenu * dbusmenu_gtkmenu_new (gchar * dbus_name, gchar * dbus_obj ect); DbusmenuGtkMenu * dbusmenu_gtkmenu_new (gchar * dbus_name, gchar * dbus_obj ect);
DbusmenuGtkClient * dbusmenu_gtkmenu_get_client (DbusmenuGtkMenu * menu); DbusmenuGtkClient * dbusmenu_gtkmenu_get_client (DbusmenuGtkMenu * menu);
/** /**
SECTION:gtkmenu SECTION:gtkmenu
@short_description: A GTK Menu Object that syncronizes over DBus @short_description: A GTK Menu Object that syncronizes over DBus
@stability: Unstable @stability: Unstable
 End of changes. 5 change blocks. 
1 lines changed or deleted 10 lines changed or added


 menuitem-proxy.h   menuitem-proxy.h 
skipping to change at line 45 skipping to change at line 45
G_BEGIN_DECLS G_BEGIN_DECLS
#define DBUSMENU_TYPE_MENUITEM_PROXY (dbusmenu_menuitem_proxy_ge t_type ()) #define DBUSMENU_TYPE_MENUITEM_PROXY (dbusmenu_menuitem_proxy_ge t_type ())
#define DBUSMENU_MENUITEM_PROXY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_TYPE_MENUITEM_PROXY, DbusmenuMenuitemProxy)) #define DBUSMENU_MENUITEM_PROXY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_TYPE_MENUITEM_PROXY, DbusmenuMenuitemProxy))
#define DBUSMENU_MENUITEM_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (( klass), DBUSMENU_TYPE_MENUITEM_PROXY, DbusmenuMenuitemProxyClass)) #define DBUSMENU_MENUITEM_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (( klass), DBUSMENU_TYPE_MENUITEM_PROXY, DbusmenuMenuitemProxyClass))
#define DBUSMENU_IS_MENUITEM_PROXY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_TYPE_MENUITEM_PROXY)) #define DBUSMENU_IS_MENUITEM_PROXY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_TYPE_MENUITEM_PROXY))
#define DBUSMENU_IS_MENUITEM_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE (( klass), DBUSMENU_TYPE_MENUITEM_PROXY)) #define DBUSMENU_IS_MENUITEM_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE (( klass), DBUSMENU_TYPE_MENUITEM_PROXY))
#define DBUSMENU_MENUITEM_PROXY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_MENUITEM_PROXY, DbusmenuMenuitemProxyClass)) #define DBUSMENU_MENUITEM_PROXY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_MENUITEM_PROXY, DbusmenuMenuitemProxyClass))
typedef struct _DbusmenuMenuitemProxy DbusmenuMenuitemProxy; typedef struct _DbusmenuMenuitemProxy DbusmenuMenuitemProxy;
typedef struct _DbusmenuMenuitemProxyClass DbusmenuMenuitemProxyClass; typedef struct _DbusmenuMenuitemProxyClass DbusmenuMenuitemProxyClass;
typedef struct _DbusmenuMenuitemProxyPrivate DbusmenuMenuitemProxyPrivate;
/** /**
DbusmenuMenuitemProxyClass: DbusmenuMenuitemProxyClass:
@parent_class: The Class of #DbusmeneMenuitem @parent_class: The Class of #DbusmeneMenuitem
@reserved1: Reserved for future use.
@reserved2: Reserved for future use.
@reserved3: Reserved for future use.
@reserved4: Reserved for future use.
Functions and signal slots for #DbusmenuMenuitemProxy. Functions and signal slots for #DbusmenuMenuitemProxy.
*/ */
struct _DbusmenuMenuitemProxyClass { struct _DbusmenuMenuitemProxyClass {
DbusmenuMenuitemClass parent_class; DbusmenuMenuitemClass parent_class;
/*< Private >*/
void (*reserved1) (void);
void (*reserved2) (void);
void (*reserved3) (void);
void (*reserved4) (void);
}; };
/** /**
DbusmeneMenuitemProxy: DbusmeneMenuitemProxy:
@parent: The instance of #DbusmenuMenuitem @parent: The instance of #DbusmenuMenuitem
Public instance data for a #DbusmenuMenuitemProxy. Public instance data for a #DbusmenuMenuitemProxy.
*/ */
struct _DbusmenuMenuitemProxy { struct _DbusmenuMenuitemProxy {
DbusmenuMenuitem parent; DbusmenuMenuitem parent;
/*< Private >*/
DbusmenuMenuitemProxyPrivate * priv;
}; };
GType dbusmenu_menuitem_proxy_get_type (void); GType dbusmenu_menuitem_proxy_get_type (void);
DbusmenuMenuitemProxy * dbusmenu_menuitem_proxy_new (DbusmenuMenuitem * mi) ; DbusmenuMenuitemProxy * dbusmenu_menuitem_proxy_new (DbusmenuMenuitem * mi) ;
DbusmenuMenuitem * dbusmenu_menuitem_proxy_get_wrapped (DbusmenuMenuitemPro xy * pmi); DbusmenuMenuitem * dbusmenu_menuitem_proxy_get_wrapped (DbusmenuMenuitemPro xy * pmi);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 4 change blocks. 
2 lines changed or deleted 16 lines changed or added


 menuitem.h   menuitem.h 
skipping to change at line 80 skipping to change at line 80
#define DBUSMENU_MENUITEM_ICON_NAME_BLANK "blank-icon" #define DBUSMENU_MENUITEM_ICON_NAME_BLANK "blank-icon"
#define DBUSMENU_MENUITEM_SHORTCUT_CONTROL "Control" #define DBUSMENU_MENUITEM_SHORTCUT_CONTROL "Control"
#define DBUSMENU_MENUITEM_SHORTCUT_ALT "Alt" #define DBUSMENU_MENUITEM_SHORTCUT_ALT "Alt"
#define DBUSMENU_MENUITEM_SHORTCUT_SHIFT "Shift" #define DBUSMENU_MENUITEM_SHORTCUT_SHIFT "Shift"
#define DBUSMENU_MENUITEM_SHORTCUT_SUPER "Super" #define DBUSMENU_MENUITEM_SHORTCUT_SUPER "Super"
#define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU "submenu" #define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU "submenu"
typedef struct _DbusmenuMenuitemPrivate DbusmenuMenuitemPrivate;
/** /**
* DbusmenuMenuitem: * DbusmenuMenuitem:
* *
* This is the #GObject based object that represents a menu * This is the #GObject based object that represents a menu
* item. It gets created the same on both the client and * item. It gets created the same on both the client and
* the server side and libdbusmenu-glib does the work of making * the server side and libdbusmenu-glib does the work of making
* this object model appear on both sides of DBus. Simple * this object model appear on both sides of DBus. Simple
* really, though through updates and people coming on and off * really, though through updates and people coming on and off
* the bus it can lead to lots of fun complex scenarios. * the bus it can lead to lots of fun complex scenarios.
*/ */
typedef struct _DbusmenuMenuitem DbusmenuMenuitem; typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
struct _DbusmenuMenuitem struct _DbusmenuMenuitem
{ {
GObject parent; GObject parent;
/*< Private >*/
DbusmenuMenuitemPrivate * priv;
}; };
/** /**
* dbusmenu_menuitem_about_to_show_cb: * dbusmenu_menuitem_about_to_show_cb:
* @mi: Menu item that should be shown * @mi: Menu item that should be shown
* @user_data: (closure): Extra user data sent with the function * @user_data: (closure): Extra user data sent with the function
* *
* Callback prototype for a callback that is called when the * Callback prototype for a callback that is called when the
* menu should be shown. * menu should be shown.
*/ */
skipping to change at line 128 skipping to change at line 133
* @property_changed: Slot for #DbusmenuMenuitem::property-changed. * @property_changed: Slot for #DbusmenuMenuitem::property-changed.
* @item_activated: Slot for #DbusmenuMenuitem::item-activated. * @item_activated: Slot for #DbusmenuMenuitem::item-activated.
* @child_added: Slot for #DbusmenuMenuitem::child-added. * @child_added: Slot for #DbusmenuMenuitem::child-added.
* @child_removed: Slot for #DbusmenuMenuitem::child-removed. * @child_removed: Slot for #DbusmenuMenuitem::child-removed.
* @child_moved: Slot for #DbusmenuMenuitem::child-moved. * @child_moved: Slot for #DbusmenuMenuitem::child-moved.
* @realized: Slot for #DbusmenuMenuitem::realized. * @realized: Slot for #DbusmenuMenuitem::realized.
* @buildxml: Virtual function that appends the strings required to represe nt this menu item in the menu XML file. * @buildxml: Virtual function that appends the strings required to represe nt this menu item in the menu XML file.
* @handle_event: This function is to override how events are handled by su bclasses. Look at #dbusmenu_menuitem_handle_event for lots of good informa tion. * @handle_event: This function is to override how events are handled by su bclasses. Look at #dbusmenu_menuitem_handle_event for lots of good informa tion.
* @send_about_to_show: Virtual function that notifies server that the clie nt is about to show a menu. * @send_about_to_show: Virtual function that notifies server that the clie nt is about to show a menu.
* @show_to_user: Slot for #DbusmenuMenuitem::show-to-user. * @show_to_user: Slot for #DbusmenuMenuitem::show-to-user.
*
* @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.
*/ */
typedef struct _DbusmenuMenuitemClass DbusmenuMenuitemClass; typedef struct _DbusmenuMenuitemClass DbusmenuMenuitemClass;
struct _DbusmenuMenuitemClass struct _DbusmenuMenuitemClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
/* Signals */ /* Signals */
void (*property_changed) (gchar * property, GValue * value); void (*property_changed) (gchar * property, GValue * value);
void (*item_activated) (guint timestamp); void (*item_activated) (guint timestamp);
void (*child_added) (DbusmenuMenuitem * child, guint position); void (*child_added) (DbusmenuMenuitem * child, guint position);
void (*child_removed) (DbusmenuMenuitem * child); void (*child_removed) (DbusmenuMenuitem * child);
void (*child_moved) (DbusmenuMenuitem * child, guint newpos, guint o ldpos); void (*child_moved) (DbusmenuMenuitem * child, guint newpos, guint o ldpos);
void (*realized) (void); void (*realized) (void);
/* Virtual functions */ /* Virtual functions */
dbusmenu_menuitem_buildxml_slot_t buildxml; dbusmenu_menuitem_buildxml_slot_t buildxml;
void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, con st GValue * value, guint timestamp); void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, con st GValue * value, guint timestamp);
void (*send_about_to_show) (DbusmenuMenuitem * mi, void (*cb) (Dbusm enuMenuitem * mi, gpointer user_data), gpointer cb_data); void (*send_about_to_show) (DbusmenuMenuitem * mi, void (*cb) (Dbusm enuMenuitem * mi, gpointer user_data), gpointer cb_data);
void (*show_to_user) (DbusmenuMenuitem * mi, guint timestamp, gpoint er cb_data); void (*show_to_user) (DbusmenuMenuitem * mi, guint timestamp, gpoint er cb_data);
/* void (*reserved1) (void); */
/* void (*reserved2) (void); */ /*< Private >*/
/* void (*reserved3) (void); */ void (*reserved1) (void);
/* void (*reserved4) (void); -- realized, realloc when bumping lib v void (*reserved2) (void);
ersion */ void (*reserved3) (void);
void (*reserved4) (void);
void (*reserved5) (void);
void (*reserved6) (void);
}; };
GType dbusmenu_menuitem_get_type (void); GType dbusmenu_menuitem_get_type (void);
DbusmenuMenuitem * dbusmenu_menuitem_new (void) G_GNUC_WARN_UNUSED_RESULT; DbusmenuMenuitem * dbusmenu_menuitem_new (void) G_GNUC_WARN_UNUSED_RESULT;
DbusmenuMenuitem * dbusmenu_menuitem_new_with_id (gint id) G_GNUC_WARN_UNUS ED_RESULT; DbusmenuMenuitem * dbusmenu_menuitem_new_with_id (gint id) G_GNUC_WARN_UNUS ED_RESULT;
gint dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi); gint dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi);
GList * dbusmenu_menuitem_get_children (DbusmenuMenuitem * mi); GList * dbusmenu_menuitem_get_children (DbusmenuMenuitem * mi);
GList * dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi) G_GNUC_WARN _UNUSED_RESULT; GList * dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi) G_GNUC_WARN _UNUSED_RESULT;
 End of changes. 4 change blocks. 
5 lines changed or deleted 20 lines changed or added


 server.h   server.h 
skipping to change at line 56 skipping to change at line 56
#define DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE "item-property-updated" #define DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE "item-property-updated"
#define DBUSMENU_SERVER_SIGNAL_ID_UPDATE "item-updated" #define DBUSMENU_SERVER_SIGNAL_ID_UPDATE "item-updated"
#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED "layout-updated" #define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED "layout-updated"
#define DBUSMENU_SERVER_SIGNAL_ITEM_ACTIVATION "item-activation-requested" #define DBUSMENU_SERVER_SIGNAL_ITEM_ACTIVATION "item-activation-requested"
#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE DBUSMENU_SERVER_SIGNAL_LAYOU T_UPDATED #define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE DBUSMENU_SERVER_SIGNAL_LAYOU T_UPDATED
#define DBUSMENU_SERVER_PROP_DBUS_OBJECT "dbus-object" #define DBUSMENU_SERVER_PROP_DBUS_OBJECT "dbus-object"
#define DBUSMENU_SERVER_PROP_ROOT_NODE "root-node" #define DBUSMENU_SERVER_PROP_ROOT_NODE "root-node"
#define DBUSMENU_SERVER_PROP_VERSION "version" #define DBUSMENU_SERVER_PROP_VERSION "version"
typedef struct _DbusmenuServerPrivate DbusmenuServerPrivate;
/** /**
DbusmenuServerClass: DbusmenuServerClass:
@parent_class: #GObjectClass @parent_class: #GObjectClass
@id_prop_update: Slot for #DbusmenuServer::id-prop-update. @id_prop_update: Slot for #DbusmenuServer::id-prop-update.
@id_update: Slot for #DbusmenuServer::id-update. @id_update: Slot for #DbusmenuServer::id-update.
@layout_updated: Slot for #DbusmenuServer::layout-update. @layout_updated: Slot for #DbusmenuServer::layout-update.
@item_activation_requested: Slot for #DbusmenuServer::item-activatio n-requested. @item_activation_requested: Slot for #DbusmenuServer::item-activatio n-requested.
@dbusmenu_server_reserved1: Reserved for future use.
@dbusmenu_server_reserved2: Reserved for future use. @reserved1: Reserved for future use.
@dbusmenu_server_reserved3: 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.
The class implementing the virtual functions for #DbusmenuServer. The class implementing the virtual functions for #DbusmenuServer.
*/ */
typedef struct _DbusmenuServerClass DbusmenuServerClass; typedef struct _DbusmenuServerClass DbusmenuServerClass;
struct _DbusmenuServerClass { struct _DbusmenuServerClass {
GObjectClass parent_class; GObjectClass parent_class;
/* Signals */ /* Signals */
void (*id_prop_update)(gint id, gchar * property, gchar * value); void (*id_prop_update)(gint id, gchar * property, gchar * value);
void (*id_update)(gint id); void (*id_update)(gint id);
void (*layout_updated)(gint revision); void (*layout_updated)(gint revision);
void (*item_activation)(gint id, guint timestamp); void (*item_activation)(gint id, guint timestamp);
/* Reserved */ /*< Private >*/
void (*dbusmenu_server_reserved1)(void); void (*reserved1) (void);
void (*dbusmenu_server_reserved2)(void); void (*reserved2) (void);
void (*dbusmenu_server_reserved3)(void); void (*reserved3) (void);
void (*reserved4) (void);
void (*reserved5) (void);
void (*reserved6) (void);
}; };
/** /**
DbusmenuServer: DbusmenuServer:
@parent: #GObject @parent: #GObject
A server which represents a sharing of a set of A server which represents a sharing of a set of
#DbusmenuMenuitems across DBus to a #DbusmenuClient. #DbusmenuMenuitems across DBus to a #DbusmenuClient.
*/ */
typedef struct _DbusmenuServer DbusmenuServer; typedef struct _DbusmenuServer DbusmenuServer;
struct _DbusmenuServer { struct _DbusmenuServer {
GObject parent; GObject parent;
/*< Private >*/
DbusmenuServerPrivate * priv;
}; };
GType dbusmenu_server_get_type (void); GType dbusmenu_server_get_type (void);
DbusmenuServer * dbusmenu_server_new (const gchar * object); DbusmenuServer * dbusmenu_server_new (const gchar * object);
void dbusmenu_server_set_root (DbusmenuServer * server, Db usmenuMenuitem * root); void dbusmenu_server_set_root (DbusmenuServer * server, Db usmenuMenuitem * root);
/** /**
SECIONT:server SECIONT:server
@short_description: The server signals changed and @short_description: The server signals changed and
updates on a tree of #DbusmenuMenuitem objecs. updates on a tree of #DbusmenuMenuitem objecs.
 End of changes. 4 change blocks. 
7 lines changed or deleted 19 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/