client.h   client.h 
skipping to change at line 49 skipping to change at line 49
#define DBUSMENU_TYPE_CLIENT (dbusmenu_client_get_type ()) #define DBUSMENU_TYPE_CLIENT (dbusmenu_client_get_type ())
#define DBUSMENU_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_TYPE_CLIENT, DbusmenuClient)) #define DBUSMENU_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_TYPE_CLIENT, DbusmenuClient))
#define DBUSMENU_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_TYPE_CLIENT, DbusmenuClientClass)) #define DBUSMENU_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_TYPE_CLIENT, DbusmenuClientClass))
#define DBUSMENU_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_TYPE_CLIENT)) #define DBUSMENU_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_TYPE_CLIENT))
#define DBUSMENU_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_CLIENT)) #define DBUSMENU_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_CLIENT))
#define DBUSMENU_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_CLIENT, DbusmenuClientClass)) #define DBUSMENU_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_CLIENT, DbusmenuClientClass))
#define DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED "layout-updated" #define DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED "layout-updated"
#define DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED "root-changed" #define DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED "root-changed"
#define DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM "new-menuitem" #define DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM "new-menuitem"
#define DBUSMENU_CLIENT_SIGNAL_ITEM_ACTIVATE "item-activate"
#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"
/** /**
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.
@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.
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 (*event_result) (DbusmenuMenuitem * item, gchar * event, GValue
* data, guint timestamp, GError * error);
/* Reserved for future use */ /* Reserved for future use */
void (*reserved1) (void); void (*reserved1) (void);
void (*reserved2) (void); void (*reserved2) (void);
void (*reserved3) (void); /* void (*reserved3) (void); */
void (*reserved4) (void); /* void (*reserved4) (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;
 End of changes. 5 change blocks. 
4 lines changed or deleted 9 lines changed or added


 menuitem.h   menuitem.h 
skipping to change at line 51 skipping to change at line 51
#define DBUSMENU_IS_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass) , DBUSMENU_TYPE_MENUITEM)) #define DBUSMENU_IS_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass) , DBUSMENU_TYPE_MENUITEM))
#define DBUSMENU_MENUITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj) , DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemClass)) #define DBUSMENU_MENUITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj) , DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemClass))
#define DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED "property-changed" #define DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED "property-changed"
#define DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED "item-activated" #define DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED "item-activated"
#define DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED "child-added" #define DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED "child-added"
#define DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED "child-removed" #define DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED "child-removed"
#define DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED "child-moved" #define DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED "child-moved"
#define DBUSMENU_MENUITEM_SIGNAL_REALIZED "realized" #define DBUSMENU_MENUITEM_SIGNAL_REALIZED "realized"
#define DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID (g_signal_lookup(DBUSM ENU_MENUITEM_SIGNAL_REALIZED, DBUSMENU_TYPE_MENUITEM)) #define DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID (g_signal_lookup(DBUSM ENU_MENUITEM_SIGNAL_REALIZED, DBUSMENU_TYPE_MENUITEM))
#define DBUSMENU_MENUITEM_SIGNAL_SHOW_TO_USER "show-to-user"
#define DBUSMENU_MENUITEM_PROP_TYPE "type" #define DBUSMENU_MENUITEM_PROP_TYPE "type"
#define DBUSMENU_MENUITEM_PROP_VISIBLE "visible" #define DBUSMENU_MENUITEM_PROP_VISIBLE "visible"
#define DBUSMENU_MENUITEM_PROP_ENABLED "enabled" #define DBUSMENU_MENUITEM_PROP_ENABLED "enabled"
#define DBUSMENU_MENUITEM_PROP_LABEL "label" #define DBUSMENU_MENUITEM_PROP_LABEL "label"
#define DBUSMENU_MENUITEM_PROP_ICON_NAME "icon-name" #define DBUSMENU_MENUITEM_PROP_ICON_NAME "icon-name"
#define DBUSMENU_MENUITEM_PROP_ICON_DATA "icon-data" #define DBUSMENU_MENUITEM_PROP_ICON_DATA "icon-data"
#define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE "toggle-type" #define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE "toggle-type"
#define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE "toggle-state" #define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE "toggle-state"
#define DBUSMENU_MENUITEM_PROP_SHORTCUT "shortcut" #define DBUSMENU_MENUITEM_PROP_SHORTCUT "shortcut"
skipping to change at line 126 skipping to change at line 127
* DbusmenuMenuitemClass: * DbusmenuMenuitemClass:
* @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.
* @reserved1: Reserved for future use. * @show_to_user: Slot for #DbusmenuMenuitem::show-to-user.
* @reserved2: Reserved for future use.
* @reserved3: Reserved for future use.
* @reserved4: 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, dbusmenu_menuitem _about_to_show_cb cb, gpointer cb_data); void (*send_about_to_show) (DbusmenuMenuitem * mi, dbusmenu_menuitem _about_to_show_cb cb, gpointer cb_data);
void (*reserved1) (void); void (*show_to_user) (DbusmenuMenuitem * mi, guint timestamp, gpoint
er cb_data);
/* void (*reserved1) (void); */
/* void (*reserved2) (void); */ /* void (*reserved2) (void); */
/* void (*reserved3) (void); */ /* void (*reserved3) (void); */
/* void (*reserved4) (void); -- realized, realloc when bumping lib v ersion */ /* void (*reserved4) (void); -- realized, realloc when bumping lib v ersion */
}; };
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);
skipping to change at line 194 skipping to change at line 193
GHashTable * dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi); GHashTable * dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi);
void dbusmenu_menuitem_property_remove (DbusmenuMenuitem * mi, const gchar * property); void dbusmenu_menuitem_property_remove (DbusmenuMenuitem * mi, const gchar * property);
void dbusmenu_menuitem_set_root (DbusmenuMenuitem * mi, gboolean root); void dbusmenu_menuitem_set_root (DbusmenuMenuitem * mi, gboolean root);
gboolean dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi); gboolean dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi);
void dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (Dbusme nuMenuitem * mi, gpointer data), gpointer data); void dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (Dbusme nuMenuitem * mi, gpointer data), gpointer data);
void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * n ame, const GValue * value, guint timestamp); void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * n ame, const GValue * value, guint timestamp);
void dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, dbusmenu_ menuitem_about_to_show_cb cb, gpointer cb_data); void dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, dbusmenu_ menuitem_about_to_show_cb cb, gpointer cb_data);
void dbusmenu_menuitem_show_to_user (DbusmenuMenuitem * mi, guint timestamp
);
/** /**
* SECTION:menuitem * SECTION:menuitem
* @short_description: A lowlevel represenation of a menuitem * @short_description: A lowlevel represenation of a menuitem
* @stability: Unstable * @stability: Unstable
* @include: libdbusmenu-glib/menuitem.h * @include: libdbusmenu-glib/menuitem.h
* *
* A #DbusmenuMenuitem is the lowest level of represenation of a * A #DbusmenuMenuitem is the lowest level of represenation of a
* single item in a menu. It gets created on the server side * single item in a menu. It gets created on the server side
* and copied over to the client side where it gets rendered. As * and copied over to the client side where it gets rendered. As
* the server starts to change it, and grow it, and do all kinds * the server starts to change it, and grow it, and do all kinds
 End of changes. 4 change blocks. 
5 lines changed or deleted 8 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/