client.h   client.h 
skipping to change at line 87 skipping to change at line 87
#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, GVaria nt * data, guint timestamp, GError * error);
/*< Private >*/ /*< 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 (*reserved5) (void);
void (*reserved6) (void); void (*reserved6) (void);
}; };
skipping to change at line 125 skipping to change at line 125
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,
DbusmenuClientTypeH andler newfunc); DbusmenuClientTypeH andler newfunc);
void dbusmenu_client_send_event (DbusmenuClient * cl ient, void dbusmenu_client_send_event (DbusmenuClient * cl ient,
gint id, gint id,
const gchar * name, const gchar * name,
const GValue * valu e, GVariant * variant,
guint timestamp); guint timestamp);
void dbusmenu_client_send_about_to_show(DbusmenuClient * cl ient, void dbusmenu_client_send_about_to_show(DbusmenuClient * cl ient,
gint id, gint id,
void (*cb) (gpointe r user_data), void (*cb) (gpointe r user_data),
gpointer cb_data); gpointer cb_data);
/** /**
SECTION:client SECTION:client
@short_description: The catcher of all the server traffic @short_description: The catcher of all the server traffic
@stability: Unstable @stability: Unstable
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 menuitem.h   menuitem.h 
skipping to change at line 52 skipping to change at line 52
#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_SIGNAL_SHOW_TO_USER "show-to-user"
#define DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW "about-to-show"
#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 129 skipping to change at line 130
typedef void (*dbusmenu_menuitem_buildxml_slot_t) (DbusmenuMenuitem * mi, G PtrArray* stringarray); typedef void (*dbusmenu_menuitem_buildxml_slot_t) (DbusmenuMenuitem * mi, G PtrArray* stringarray);
/** /**
* 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.
* @about_to_show: Slot for #DbusmenuMenuitem::about-to-show.
* @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. * @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. * @reserved5: Reserved for future use.
* @reserved6: 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, GVariant * 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, GVa riant * 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);
gboolean (*about_to_show) (void);
/*< Private >*/ /*< 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 (*reserved5) (void);
void (*reserved6) (void); void (*reserved6) (void);
}; };
skipping to change at line 190 skipping to change at line 193
gboolean dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMen uitem * child); gboolean dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMen uitem * child);
gboolean dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMe nuitem * child); gboolean dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMe nuitem * child);
gboolean dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMen uitem * child); gboolean dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMen uitem * child);
gboolean dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, Dbusm enuMenuitem * child, guint position); gboolean dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, Dbusm enuMenuitem * child, guint position);
gboolean dbusmenu_menuitem_child_reorder (DbusmenuMenuitem * mi, DbusmenuMe nuitem * child, guint position); gboolean dbusmenu_menuitem_child_reorder (DbusmenuMenuitem * mi, DbusmenuMe nuitem * child, guint position);
DbusmenuMenuitem * dbusmenu_menuitem_child_find (DbusmenuMenuitem * mi, gin t id); DbusmenuMenuitem * dbusmenu_menuitem_child_find (DbusmenuMenuitem * mi, gin t id);
DbusmenuMenuitem * dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint i d); DbusmenuMenuitem * dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint i d);
gboolean dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, const gchar * value); gboolean dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, const gchar * value);
gboolean dbusmenu_menuitem_property_set_value (DbusmenuMenuitem * mi, const gchar * property, const GValue * value); gboolean dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, con st gchar * property, GVariant * value);
gboolean dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value); gboolean dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value);
gboolean dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const g char * property, const gint value); gboolean dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const g char * property, const gint value);
const gchar * dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property); const gchar * dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property);
const GValue * dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * property); GVariant * dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, c onst gchar * property);
gboolean dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property); gboolean dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property);
gint dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property); gint dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property);
gboolean dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gch ar * property); gboolean dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gch ar * property);
GList * dbusmenu_menuitem_properties_list (DbusmenuMenuitem * mi) G_GNUC_WA RN_UNUSED_RESULT; GList * dbusmenu_menuitem_properties_list (DbusmenuMenuitem * mi) G_GNUC_WA RN_UNUSED_RESULT;
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, GVariant * value, guint timestamp);
void dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, void (*cb ) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data); void dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, void (*cb ) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
void dbusmenu_menuitem_show_to_user (DbusmenuMenuitem * mi, guint timestamp ); 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
* *
 End of changes. 8 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/