| menuitem.h | menuitem.h | |||
|---|---|---|---|---|
| skipping to change at line 113 | skipping to change at line 113 | |||
| * 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. | |||
| */ | */ | |||
| typedef void (*dbusmenu_menuitem_about_to_show_cb) (DbusmenuMenuitem * mi, gpointer user_data); | typedef void (*dbusmenu_menuitem_about_to_show_cb) (DbusmenuMenuitem * mi, gpointer user_data); | |||
| /** | /** | |||
| * dbusmenu_menuitem_buildxml_slot_t: | * dbusmenu_menuitem_buildvariant_slot_t: | |||
| * @mi: (in): Menu item that should be built from | * @mi: (in): Menu item that should be built from | |||
| * @stringarray: (inout) (transfer none) (array) (element-type utf8): An ar ray of strings that can be combined into an XML file. | ||||
| * | * | |||
| * This is the function that is called to represent this menu item | * This is the function that is called to represent this menu item | |||
| * as an XML fragment. Should call it's own children. | * as a variant. Should call it's own children. | |||
| * | ||||
| * Return value: (transfer full) A variant representing this item and it's | ||||
| children | ||||
| */ | */ | |||
| typedef void (*dbusmenu_menuitem_buildxml_slot_t) (DbusmenuMenuitem * mi, G PtrArray* stringarray); | typedef GVariant * (*dbusmenu_menuitem_buildvariant_slot_t) (DbusmenuMenuit em * mi, gchar ** properties); | |||
| /** | /** | |||
| * 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. | * @about_to_show: Slot for #DbusmenuMenuitem::about-to-show. | |||
| skipping to change at line 157 | skipping to change at line 158 | |||
| /* Signals */ | /* Signals */ | |||
| void (*property_changed) (gchar * property, GVariant * 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_buildvariant_slot_t buildvariant; | |||
| void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, GVa riant * 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); | 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); | |||
| End of changes. 5 change blocks. | ||||
| 5 lines changed or deleted | 7 lines changed or added | |||