client.h   client.h 
skipping to change at line 36 skipping to change at line 36
<http://www.gnu.org/licenses/> <http://www.gnu.org/licenses/>
*/ */
#ifndef __DBUSMENU_CLIENT_H__ #ifndef __DBUSMENU_CLIENT_H__
#define __DBUSMENU_CLIENT_H__ #define __DBUSMENU_CLIENT_H__
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
#include "menuitem.h" #include "menuitem.h"
#include "types.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#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))
/**
* DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED:
*
* String to attach to signal #DbusmenuClient::layout-updated
*/
#define DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED "layout-updated" #define DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED "layout-updated"
/**
* DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED:
*
* String to attach to signal #DbusmenuClient::root-changed
*/
#define DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED "root-changed" #define DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED "root-changed"
/**
* DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM:
*
* String to attach to signal #DbusmenuClient::new-menuitem
*/
#define DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM "new-menuitem" #define DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM "new-menuitem"
/**
* DBUSMENU_CLIENT_SIGNAL_ITEM_ACTIVATE:
*
* String to attach to signal #DbusmenuClient::item-activate
*/
#define DBUSMENU_CLIENT_SIGNAL_ITEM_ACTIVATE "item-activate" #define DBUSMENU_CLIENT_SIGNAL_ITEM_ACTIVATE "item-activate"
/**
* DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT:
*
* String to attach to signal #DbusmenuClient::event-result
*/
#define DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT "event-result" #define DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT "event-result"
/**
* DBUSMENU_CLIENT_SIGNAL_TEXT_DIRECTION_CHANGED:
*
* String to attach to signal #DbusmenuClient::text-direction-changed
*/
#define DBUSMENU_CLIENT_SIGNAL_TEXT_DIRECTION_CHANGED "text-direction-ch
anged"
/**
* DBUSMENU_CLIENT_PROP_DBUS_NAME:
*
* String to access property #DbusmenuClient:dbus-name
*/
#define DBUSMENU_CLIENT_PROP_DBUS_NAME "dbus-name" #define DBUSMENU_CLIENT_PROP_DBUS_NAME "dbus-name"
/**
* DBUSMENU_CLIENT_PROP_DBUS_OBJECT:
*
* String to access property #DbusmenuClient:dbus-object
*/
#define DBUSMENU_CLIENT_PROP_DBUS_OBJECT "dbus-object" #define DBUSMENU_CLIENT_PROP_DBUS_OBJECT "dbus-object"
/**
* DBUSMENU_CLIENT_PROP_STATUS:
*
* String to access property #DbusmenuClient:status
*/
#define DBUSMENU_CLIENT_PROP_STATUS "status"
/**
* DBUSMENU_CLIENT_PROP_TEXT_DIRECTION:
*
* String to access property #DbusmenuClient:text-direction
*/
#define DBUSMENU_CLIENT_PROP_TEXT_DIRECTION "text-direction"
/**
* DBUSMENU_CLIENT_TYPES_DEFAULT:
*
* Used to set the 'type' property on a menu item to create
* a standard menu item.
*/
#define DBUSMENU_CLIENT_TYPES_DEFAULT "standard" #define DBUSMENU_CLIENT_TYPES_DEFAULT "standard"
/**
* DBUSMENU_CLIENT_TYPES_SEPARATOR:
*
* Used to set the 'type' property on a menu item to create
* a separator menu item.
*/
#define DBUSMENU_CLIENT_TYPES_SEPARATOR "separator" #define DBUSMENU_CLIENT_TYPES_SEPARATOR "separator"
/**
* DBUSMENU_CLIENT_TYPES_IMAGE:
*
* Used to set the 'type' property on a menu item to create
* an image menu item. Deprecated as standard menu items now
* support images as well.
*/
#define DBUSMENU_CLIENT_TYPES_IMAGE "standard" #define DBUSMENU_CLIENT_TYPES_IMAGE "standard"
typedef struct _DbusmenuClientPrivate DbusmenuClientPrivate; 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.
@root_changed: Slot for #DbusmenuClient::root-changed.
@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. @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.
skipping to change at line 100 skipping to change at line 174
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);
}; };
/** /**
DbusmenuClient: DbusmenuClient:
@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 >*/ /*< Private >*/
DbusmenuClientPrivate * priv; DbusmenuClientPrivate * priv;
skipping to change at line 122 skipping to change at line 195
/** /**
DbusmenuClientTypeHandler: DbusmenuClientTypeHandler:
@newitem: The #DbusmenuMenuitem that was created @newitem: The #DbusmenuMenuitem that was created
@parent: The parent of @newitem or #NULL if none @parent: The parent of @newitem or #NULL if none
@client: A pointer to the #DbusmenuClient @client: A pointer to the #DbusmenuClient
@user_data: The data you gave us @user_data: The data you gave us
The type handler is called when a dbusmenu item is created The type handler is called when a dbusmenu item is created
with a matching type as setup in #dbusmenu_client_add_type_handler with a matching type as setup in #dbusmenu_client_add_type_handler
Return value: #TRUE if the type has been handled. #FALSE if this
function was somehow unable to handle it.
*/ */
typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data); typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data);
/** /**
DbusmenuClientTypeDestroyHandler: DbusmenuClientTypeDestroyHandler:
@client: A pointer to the #DbusmenuClient @client: A pointer to the #DbusmenuClient
@type: The type that this handler was registered with @type: The type that this handler was registered with
@user_data: The data you gave us @user_data: The data you gave us
This handler is called when the type becomes unregistered by the This handler is called when the type becomes unregistered by the
skipping to change at line 148 skipping to change at line 224
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);
gboolean dbusmenu_client_add_type_handler_full (DbusmenuClient * client, gboolean dbusmenu_client_add_type_handler_full (DbusmenuClient * client,
const gchar * type, const gchar * type,
DbusmenuClientTypeH andler newfunc, DbusmenuClientTypeH andler newfunc,
gpointer user_data, gpointer user_data,
DbusmenuClientTypeD DbusmenuClientTypeD
estroyHandler destory_func); estroyHandler destroy_func);
void dbusmenu_client_send_event (DbusmenuClient * cl DbusmenuTextDirection dbusmenu_client_get_text_direction (DbusmenuClient *
ient, client);
gint id, DbusmenuStatus dbusmenu_client_get_status (DbusmenuClient * cl
const gchar * name, ient);
GVariant * variant,
guint timestamp);
void dbusmenu_client_send_about_to_show(DbusmenuClient * cl
ient,
gint id,
void (*cb) (gpointe
r user_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
@include: libdbusmenu-glib/client.h @include: libdbusmenu-glib/client.h
The client exists as a mirror to the server. For most folks The client exists as a mirror to the server. For most folks
all they will do with a client is set it up to connect to all they will do with a client is set it up to connect to
a server and then watch as the menu items on their side a server and then watch as the menu items on their side
 End of changes. 17 change blocks. 
15 lines changed or deleted 84 lines changed or added


 menu.h   menu.h 
skipping to change at line 48 skipping to change at line 48
#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; 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. * @reserved5: Reserved for future use.
@reserved6: Reserved for future use. * @reserved6: Reserved for future use.
*/ *
* All of the subclassable functions and signal slots for a
* #DbusmenuGtkMenu.
*/
typedef struct _DbusmenuGtkMenuClass DbusmenuGtkMenuClass; typedef struct _DbusmenuGtkMenuClass DbusmenuGtkMenuClass;
struct _DbusmenuGtkMenuClass { struct _DbusmenuGtkMenuClass {
GtkMenuClass parent_class; GtkMenuClass parent_class;
/*< 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);
}; };
/** /**
DbusmenuGtkMenu: * DbusmenuGtkMenu:
@parent: #GtkMenu *
*/ * A #GtkMenu that is built using an abstract tree built from
* a #DbusmenuGtkClient.
*/
typedef struct _DbusmenuGtkMenu DbusmenuGtkMenu; typedef struct _DbusmenuGtkMenu DbusmenuGtkMenu;
struct _DbusmenuGtkMenu { struct _DbusmenuGtkMenu {
GtkMenu parent; GtkMenu parent;
/*< Private >*/ /*< Private >*/
DbusmenuGtkMenuPrivate * priv; 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:menu
@short_description: A GTK Menu Object that syncronizes over DBus @short_description: A GTK Menu Object that syncronizes over DBus
@stability: Unstable @stability: Unstable
@include: libdbusmenu-gtk/menu.h @include: libdbusmenu-gtk/menu.h
In general, this is just a #GtkMenu, why else would you care? Oh, In general, this is just a #GtkMenu, why else would you care? Oh,
because this menu is created by someone else on a server that exists because this menu is created by someone else on a server that exists
on the other side of DBus. You need a #DbusmenuServer to be able on the other side of DBus. You need a #DbusmenuServer to be able
push the data into this menu. push the data into this menu.
The first thing you need to know is how to find that #DbusmenuServer The first thing you need to know is how to find that #DbusmenuServer
on DBus. This involves both the DBus name and the DBus object that on DBus. This involves both the DBus name and the DBus object that
the menu interface can be found on. Those two value should be set the menu interface can be found on. Those two value should be set
when creating the object using dbusmenu_gtkmenu_new(). They are the n when creating the object using dbusmenu_gtkmenu_new(). They are the n
stored on two properties #DbusmenuGtkMenu:dbus-name and #DbusmenuGtk Menu:dbus-object. stored on two properties #DbusmenuGtkMenu:dbus-name and #DbusmenuGtk Menu:dbus-object.
After creation the #DbusmenuGtkMenu it will continue to keep in After creation the #DbusmenuGtkMenu it will continue to keep in
synchronization with the #DbusmenuServer object across Dbus. If the synchronization with the #DbusmenuServer object across Dbus. If the
number of entries change, the menus change, if they change thier number of entries change, the menus change, if they change thier
properties change, they update in the items. All of this should properties change, they update in the items. All of this should
be handled transparently to the user of this object. be handled transparently to the user of this object.
TODO: Document properties.
*/ */
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 4 change blocks. 
15 lines changed or deleted 18 lines changed or added


 menuitem-proxy.h   menuitem-proxy.h 
skipping to change at line 70 skipping to change at line 70
DbusmenuMenuitemClass parent_class; DbusmenuMenuitemClass parent_class;
/*< 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);
}; };
/** /**
DbusmeneMenuitemProxy: DbusmenuMenuitemProxy:
@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 >*/ /*< Private >*/
DbusmenuMenuitemProxyPrivate * priv; 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);
/**
* SECTION:menuitem-proxy
* @short_description: A menuitem that proxies from another menuitem
* @stability: Unstable
* @include: libdbusmenu-glib/menuitem-proxy.h
*
* This small object allows for proxying all the properties from a remote
* menuitem to a new object that can be moved around appropriately within
* the new menu structure.
*/
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 12 lines changed or added


 menuitem.h   menuitem.h 
skipping to change at line 44 skipping to change at line 44
G_BEGIN_DECLS G_BEGIN_DECLS
#define DBUSMENU_TYPE_MENUITEM (dbusmenu_menuitem_get_type ()) #define DBUSMENU_TYPE_MENUITEM (dbusmenu_menuitem_get_type ())
#define DBUSMENU_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj ), DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitem)) #define DBUSMENU_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj ), DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitem))
#define DBUSMENU_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass) , DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemClass)) #define DBUSMENU_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass) , DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemClass))
#define DBUSMENU_IS_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj ), DBUSMENU_TYPE_MENUITEM)) #define DBUSMENU_IS_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj ), DBUSMENU_TYPE_MENUITEM))
#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))
/**
* DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED:
*
* String to attach to signal #DbusmenuServer::property-changed
*/
#define DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED "property-changed" #define DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED "property-changed"
/**
* DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED:
*
* String to attach to signal #DbusmenuServer::item-activated
*/
#define DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED "item-activated" #define DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED "item-activated"
/**
* DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED:
*
* String to attach to signal #DbusmenuServer::child-added
*/
#define DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED "child-added" #define DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED "child-added"
/**
* DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED:
*
* String to attach to signal #DbusmenuServer::child-removed
*/
#define DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED "child-removed" #define DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED "child-removed"
/**
* DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED:
*
* String to attach to signal #DbusmenuServer::child-moved
*/
#define DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED "child-moved" #define DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED "child-moved"
/**
* DBUSMENU_MENUITEM_SIGNAL_REALIZED:
*
* String to attach to signal #DbusmenuServer::realized
*/
#define DBUSMENU_MENUITEM_SIGNAL_REALIZED "realized" #define DBUSMENU_MENUITEM_SIGNAL_REALIZED "realized"
/**
* DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID:
*
* ID to attach to signal #DbusmenuServer::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))
/**
* DBUSMENU_MENUITEM_SIGNAL_SHOW_TO_USER:
*
* String to attach to signal #DbusmenuServer::show-to-user
*/
#define DBUSMENU_MENUITEM_SIGNAL_SHOW_TO_USER "show-to-user" #define DBUSMENU_MENUITEM_SIGNAL_SHOW_TO_USER "show-to-user"
/**
* DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW:
*
* String to attach to signal #DbusmenuServer::about-to-show
*/
#define DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW "about-to-show" #define DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW "about-to-show"
/**
* DBUSMENU_MENUITEM_SIGNAL_EVENT:
*
* String to attach to signal #DbusmenuServer::event
*/
#define DBUSMENU_MENUITEM_SIGNAL_EVENT "event"
/**
* DBUSMENU_MENUITEM_PROP_TYPE:
*
* #DbusmenuMenuitem property used to represent what type of menuitem
* this object represents. Type: #G_VARIANT_TYPE_STRING.
*/
#define DBUSMENU_MENUITEM_PROP_TYPE "type" #define DBUSMENU_MENUITEM_PROP_TYPE "type"
/**
* DBUSMENU_MENUITEM_PROP_VISIBLE:
*
* #DbusmenuMenuitem property used to represent whether the menuitem
* should be shown or not. Type: #G_VARIANT_TYPE_BOOLEAN.
*/
#define DBUSMENU_MENUITEM_PROP_VISIBLE "visible" #define DBUSMENU_MENUITEM_PROP_VISIBLE "visible"
/**
* DBUSMENU_MENUITEM_PROP_ENABLED:
*
* #DbusmenuMenuitem property used to represent whether the menuitem
* is clickable or not. Type: #G_VARIANT_TYPE_BOOLEAN.
*/
#define DBUSMENU_MENUITEM_PROP_ENABLED "enabled" #define DBUSMENU_MENUITEM_PROP_ENABLED "enabled"
/**
* DBUSMENU_MENUITEM_PROP_LABEL:
*
* #DbusmenuMenuitem property used for the text on the menu item.
* Type: #G_VARIANT_TYPE_STRING
*/
#define DBUSMENU_MENUITEM_PROP_LABEL "label" #define DBUSMENU_MENUITEM_PROP_LABEL "label"
/**
* DBUSMENU_MENUITEM_PROP_ICON_NAME:
*
* #DbusmenuMenuitem property that is the name of the icon under the
* Freedesktop.org icon naming spec. Type: #G_VARIANT_TYPE_STRING
*/
#define DBUSMENU_MENUITEM_PROP_ICON_NAME "icon-name" #define DBUSMENU_MENUITEM_PROP_ICON_NAME "icon-name"
/**
* DBUSMENU_MENUITEM_PROP_ICON_DATA:
*
* #DbusmenuMenuitem property that is the raw data of a custom icon
* used in the application. Type: #G_VARIANT_TYPE_VARIANT
*
* It is recommended that this is not set directly but instead the
* libdbusmenu-gtk library is used with the function dbusmenu_menuitem_prop
erty_set_image()
*/
#define DBUSMENU_MENUITEM_PROP_ICON_DATA "icon-data" #define DBUSMENU_MENUITEM_PROP_ICON_DATA "icon-data"
/**
* DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE:
*
* #DbusmenuMenuitem property that says what type of toggle entry should
* be shown in the menu. Should be either #DBUSMENU_MENUITEM_TOGGLE_CHECK
* or #DBUSMENU_MENUITEM_TOGGLE_RADIO. Type: #G_VARIANT_TYPE_STRING
*/
#define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE "toggle-type" #define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE "toggle-type"
/**
* DBUSMENU_MENUITEM_PROP_TOGGLE_STATE:
*
* #DbusmenuMenuitem property that says what state a toggle entry should
* be shown as the menu. Should be either #DBUSMENU_MENUITEM_TOGGLE_STATE_
UNCHECKED
* #DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED or #DBUSMENU_MENUITEM_TOGGLE_STA
TUE_UNKNOWN.
* Type: #G_VARIANT_TYPE_INT32
*/
#define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE "toggle-state" #define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE "toggle-state"
/**
* DBUSMENU_MENUITEM_PROP_SHORTCUT:
*
* #DbusmenuMenuitem property that is the entries that represent a shortcut
* to activate the menuitem. It is an array of arrays of strings.
* Type: #G_VARIANT_TYPE_ARRAY
*
* It is recommended that this is not set directly but instead the
* libdbusmenu-gtk library is used with the function dbusmenu_menuitem_prop
erty_set_shortcut()
*/
#define DBUSMENU_MENUITEM_PROP_SHORTCUT "shortcut" #define DBUSMENU_MENUITEM_PROP_SHORTCUT "shortcut"
/**
* DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY:
*
* #DbusmenuMenuitem property that tells how the children of this menuitem
* should be displayed. Most likely this will be unset or of the value
* #DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU. Type: #G_VARIANT_TYPE_STRING
*/
#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display" #define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display"
/**
* DBUSMENU_MENUITEM_TOGGLE_CHECK:
*
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE to be a standard
* check mark item.
*/
#define DBUSMENU_MENUITEM_TOGGLE_CHECK "checkmark" #define DBUSMENU_MENUITEM_TOGGLE_CHECK "checkmark"
/**
* DBUSMENU_MENUITEM_TOGGLE_RADIO:
*
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE to be a standard
* radio item.
*/
#define DBUSMENU_MENUITEM_TOGGLE_RADIO "radio" #define DBUSMENU_MENUITEM_TOGGLE_RADIO "radio"
/**
* DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED:
*
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_STATE so that the menu's
* toggle item is empty.
*/
#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED 0 #define DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED 0
/**
* DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED:
*
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_STATE so that the menu's
* toggle item is filled.
*/
#define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED 1 #define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED 1
/**
* DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN:
*
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_STATE so that the menu's
* toggle item is undecided.
*/
#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN -1 #define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN -1
/**
* DBUSMENU_MENUITEM_ICON_NAME_BLANK:
*
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_STATE so that the menu's
* toggle item is undecided.
*/
#define DBUSMENU_MENUITEM_ICON_NAME_BLANK "blank-icon" #define DBUSMENU_MENUITEM_ICON_NAME_BLANK "blank-icon"
/**
* DBUSMENU_MENUITEM_SHORTCUT_CONTROL:
*
* Used in #DBUSMENU_MENUITEM_PROP_SHORTCUT to represent the
* control key.
*/
#define DBUSMENU_MENUITEM_SHORTCUT_CONTROL "Control" #define DBUSMENU_MENUITEM_SHORTCUT_CONTROL "Control"
/**
* DBUSMENU_MENUITEM_SHORTCUT_ALT:
*
* Used in #DBUSMENU_MENUITEM_PROP_SHORTCUT to represent the
* alternate key.
*/
#define DBUSMENU_MENUITEM_SHORTCUT_ALT "Alt" #define DBUSMENU_MENUITEM_SHORTCUT_ALT "Alt"
/**
* DBUSMENU_MENUITEM_SHORTCUT_SHIFT:
*
* Used in #DBUSMENU_MENUITEM_PROP_SHORTCUT to represent the
* shift key.
*/
#define DBUSMENU_MENUITEM_SHORTCUT_SHIFT "Shift" #define DBUSMENU_MENUITEM_SHORTCUT_SHIFT "Shift"
/**
* DBUSMENU_MENUITEM_SHORTCUT_SUPER:
*
* Used in #DBUSMENU_MENUITEM_PROP_SHORTCUT to represent the
* super key.
*/
#define DBUSMENU_MENUITEM_SHORTCUT_SUPER "Super" #define DBUSMENU_MENUITEM_SHORTCUT_SUPER "Super"
/**
* DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU:
*
* Used in #DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY to have the
* subitems displayed as a submenu.
*/
#define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU "submenu" #define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU "submenu"
typedef struct _DbusmenuMenuitemPrivate DbusmenuMenuitemPrivate; typedef struct _DbusmenuMenuitemPrivate DbusmenuMenuitemPrivate;
/** /**
* DbusmenuMenuitem: * DbusmenuMenuitem:
* @parent: Parent object
* @priv: Private data
* *
* 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
skipping to change at line 115 skipping to change at line 305
* @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_buildvariant_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
* @properties: (allow-none): A list of properties that should be the only ones in the resulting variant structure
* *
* 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 a variant. 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 * Return value: (transfer full): A variant representing this item and it's children
*/ */
typedef GVariant * (*dbusmenu_menuitem_buildvariant_slot_t) (DbusmenuMenuit em * mi, gchar ** properties); typedef GVariant * (*dbusmenu_menuitem_buildvariant_slot_t) (DbusmenuMenuit em * mi, gchar ** properties);
/** /**
* DbusmenuMenuitemClass: * DbusmenuMenuitemClass:
* @parent_class: Functions and signals from our parent
* @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.
* @buildxml: Virtual function that appends the strings required to represe nt this menu item in the menu XML file. * @buildvariant: Virtual function that appends the strings required to rep resent this menu item in the menu variant.
* @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.
* * @event: Slot for #DbsumenuMenuitem::event.
* @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. *
* Functions and signals that every menuitem should know something
* about.
*/ */
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, 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_buildvariant_slot_t buildvariant; 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 * variant, 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);
void (*event) (const gchar * name, GVariant * value, guint timestamp
);
/*< 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);
}; };
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;
skipping to change at line 193 skipping to change at line 388
guint dbusmenu_menuitem_get_position_realized (DbusmenuMenuitem * mi, Dbusm enuMenuitem * parent); guint dbusmenu_menuitem_get_position_realized (DbusmenuMenuitem * mi, Dbusm enuMenuitem * parent);
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_set_parent (DbusmenuMenuitem * mi, DbusmenuMenui
tem * parent);
gboolean dbusmenu_menuitem_unparent (DbusmenuMenuitem *mi);
DbusmenuMenuitem * dbusmenu_menuitem_get_parent (DbusmenuMenuitem * mi);
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_variant (DbusmenuMenuitem * mi, con st gchar * property, GVariant * 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);
GVariant * dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, c onst 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, GVariant * value, guint timestamp); void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * n ame, GVariant * variant, 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. 43 change blocks. 
7 lines changed or deleted 212 lines changed or added


 parser.h   parser.h 
skipping to change at line 35 skipping to change at line 35
License version 3 and version 2.1 along with this program. If not, see License version 3 and version 2.1 along with this program. If not, see
<http://www.gnu.org/licenses/> <http://www.gnu.org/licenses/>
*/ */
#ifndef DBUSMENU_GTK_PARSER_H__ #ifndef DBUSMENU_GTK_PARSER_H__
#define DBUSMENU_GTK_PARSER_H__ #define DBUSMENU_GTK_PARSER_H__
#include <libdbusmenu-glib/menuitem.h> #include <libdbusmenu-glib/menuitem.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
G_BEGIN_DECLS
DbusmenuMenuitem * dbusmenu_gtk_parse_menu_structure (GtkWidget * widget); DbusmenuMenuitem * dbusmenu_gtk_parse_menu_structure (GtkWidget * widget);
/**
SECTION:parser
@short_description: A parser of in-memory GTK menu trees
@stability: Unstable
@include: libdbusmenu-gtk/parser.h
The parser will take a GTK menu tree and attach it to a Dbusmenu men
u
tree. Along with setting up all the signals for updates and destruc
tion.
The returned item would be the root item of the given tree.
*/
G_END_DECLS
#endif /* DBUSMENU_GTK_PARSER_H__ */ #endif /* DBUSMENU_GTK_PARSER_H__ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 16 lines changed or added


 serializablemenuitem.h   serializablemenuitem.h 
skipping to change at line 47 skipping to change at line 47
G_BEGIN_DECLS G_BEGIN_DECLS
#define DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM (dbusmenu_gtk_s erializable_menu_item_get_type ()) #define DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM (dbusmenu_gtk_s erializable_menu_item_get_type ())
#define DBUSMENU_GTK_SERIALIZABLE_MENU_ITEM(obj) (G_TYPE_CHECK_I NSTANCE_CAST ((obj), DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM, DbusmenuGtkS erializableMenuItem)) #define DBUSMENU_GTK_SERIALIZABLE_MENU_ITEM(obj) (G_TYPE_CHECK_I NSTANCE_CAST ((obj), DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM, DbusmenuGtkS erializableMenuItem))
#define DBUSMENU_GTK_SERIALIZABLE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_C LASS_CAST ((klass), DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM, DbusmenuGtkSe rializableMenuItemClass)) #define DBUSMENU_GTK_SERIALIZABLE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_C LASS_CAST ((klass), DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM, DbusmenuGtkSe rializableMenuItemClass))
#define DBUSMENU_IS_GTK_SERIALIZABLE_MENU_ITEM(obj) (G_TYPE_CHECK_I NSTANCE_TYPE ((obj), DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM)) #define DBUSMENU_IS_GTK_SERIALIZABLE_MENU_ITEM(obj) (G_TYPE_CHECK_I NSTANCE_TYPE ((obj), DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM))
#define DBUSMENU_IS_GTK_SERIALIZABLE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_C LASS_TYPE ((klass), DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM)) #define DBUSMENU_IS_GTK_SERIALIZABLE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_C LASS_TYPE ((klass), DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM))
#define DBUSMENU_GTK_SERIALIZABLE_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANC E_GET_CLASS ((obj), DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM, DbusmenuGtkSe rializableMenuItemClass)) #define DBUSMENU_GTK_SERIALIZABLE_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANC E_GET_CLASS ((obj), DBUSMENU_TYPE_GTK_SERIALIZABLE_MENU_ITEM, DbusmenuGtkSe rializableMenuItemClass))
/**
* DBUSMENU_GTK_SERIALIZABLE_MENU_ITEM_PROP_MENUITEM:
*
* String to access property #DbusmenuGtkSerializableMenuItem:dbusmenu-menu
item
*/
#define DBUSMENU_GTK_SERIALIZABLE_MENU_ITEM_PROP_MENUITEM "dbusmenu-menui tem" #define DBUSMENU_GTK_SERIALIZABLE_MENU_ITEM_PROP_MENUITEM "dbusmenu-menui tem"
typedef struct _DbusmenuGtkSerializableMenuItem DbusmenuGtkSerializa bleMenuItem; typedef struct _DbusmenuGtkSerializableMenuItem DbusmenuGtkSerializa bleMenuItem;
typedef struct _DbusmenuGtkSerializableMenuItemClass DbusmenuGtkSerializa bleMenuItemClass; typedef struct _DbusmenuGtkSerializableMenuItemClass DbusmenuGtkSerializa bleMenuItemClass;
typedef struct _DbusmenuGtkSerializableMenuItemPrivate DbusmenuGtkSerializa bleMenuItemPrivate; typedef struct _DbusmenuGtkSerializableMenuItemPrivate DbusmenuGtkSerializa bleMenuItemPrivate;
/** /**
DbusmenuGtkSerializableMenuItemClass: DbusmenuGtkSerializableMenuItemClass:
@parent_class: Inherit from GtkMenuItem @parent_class: Inherit from GtkMenuItem
@get_type_string: Static function to get a string describing this ty pe @get_type_string: Static function to get a string describing this ty pe
@get_default_properties: Return a hashtable of defaults for the menu item type @get_default_properties: Return a hashtable of defaults for the menu item type
@build_dbusmenu_menuitem: Build a menuitem that can be sent over dbu s @build_dbusmenu_menuitem: Build a menuitem that can be sent over dbu s
@_dbusmenu_gtk_serializable_menu_item_reserved1: Reserved for future use. @_dbusmenu_gtk_serializable_menu_item_reserved1: Reserved for future use.
@_dbusmenu_gtk_serializable_menu_item_reserved2: Reserved for future use. @_dbusmenu_gtk_serializable_menu_item_reserved2: Reserved for future use.
@_dbusmenu_gtk_serializable_menu_item_reserved3: Reserved for future use. @_dbusmenu_gtk_serializable_menu_item_reserved3: Reserved for future use.
@_dbusmenu_gtk_serializable_menu_item_reserved4: Reserved for future use. @_dbusmenu_gtk_serializable_menu_item_reserved4: Reserved for future use.
@_dbusmenu_gtk_serializable_menu_item_reserved5: Reserved for future use. @_dbusmenu_gtk_serializable_menu_item_reserved5: Reserved for future use.
@_dbusmenu_gtk_serializable_menu_item_reserved6: Reserved for future use. @_dbusmenu_gtk_serializable_menu_item_reserved6: Reserved for future use.
Signals and functions for #DbusmenuGtkSerializableMenuItem.
*/ */
struct _DbusmenuGtkSerializableMenuItemClass { struct _DbusmenuGtkSerializableMenuItemClass {
GtkMenuItemClass parent_class; GtkMenuItemClass parent_class;
/* Subclassable functions */ /* Subclassable functions */
const gchar * (*get_type_string) (void); const gchar * (*get_type_string) (void);
GHashTable * (*get_default_properties) (void); GHashTable * (*get_default_properties) (void);
DbusmenuMenuitem * (*build_dbusmenu_menuitem) (DbusmenuGtkSeria lizableMenuItem * smi); DbusmenuMenuitem * (*build_dbusmenu_menuitem) (DbusmenuGtkSeria lizableMenuItem * smi);
skipping to change at line 111 skipping to change at line 118
DbusmenuGtkSerializableMenuItemPrivate * priv; DbusmenuGtkSerializableMenuItemPrivate * priv;
}; };
GType dbusmenu_gtk_serializable_menu_item_get_type (void); GType dbusmenu_gtk_serializable_menu_item_get_type (void);
DbusmenuMenuitem * dbusmenu_gtk_serializable_menu_item_build_menuitem (Dbu smenuGtkSerializableMenuItem * smi); DbusmenuMenuitem * dbusmenu_gtk_serializable_menu_item_build_menuitem (Dbu smenuGtkSerializableMenuItem * smi);
void dbusmenu_gtk_serializable_menu_item_register_to_client (DbusmenuClient * client, GType item_type); void dbusmenu_gtk_serializable_menu_item_register_to_client (DbusmenuClient * client, GType item_type);
void dbusmenu_gtk_serializable_menu_item_set_menuitem (Dbusm enuGtkSerializableMenuItem * smi, DbusmenuMenuitem * mi); void dbusmenu_gtk_serializable_menu_item_set_menuitem (Dbusm enuGtkSerializableMenuItem * smi, DbusmenuMenuitem * mi);
/**
SECTION:serializablemenuitem
@short_description: A way to build #GtkMenuItems that can be sent ov
er Dbusmenu
@stability: Unstable
@include: libdbusmenu-gtk/serializablemenuitem.h
Menuitems can subclass from this instead of #GtkMenuItem and
by providing the appropriate functions Dbusmenu will be able
to parse them and send them over the bus.
*/
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
0 lines changed or deleted 20 lines changed or added


 server.h   server.h 
skipping to change at line 36 skipping to change at line 36
<http://www.gnu.org/licenses/> <http://www.gnu.org/licenses/>
*/ */
#ifndef __DBUSMENU_SERVER_H__ #ifndef __DBUSMENU_SERVER_H__
#define __DBUSMENU_SERVER_H__ #define __DBUSMENU_SERVER_H__
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
#include "menuitem.h" #include "menuitem.h"
#include "types.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define DBUSMENU_TYPE_SERVER (dbusmenu_server_get_type ()) #define DBUSMENU_TYPE_SERVER (dbusmenu_server_get_type ())
#define DBUSMENU_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_TYPE_SERVER, DbusmenuServer)) #define DBUSMENU_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_TYPE_SERVER, DbusmenuServer))
#define DBUSMENU_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_TYPE_SERVER, DbusmenuServerClass)) #define DBUSMENU_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_TYPE_SERVER, DbusmenuServerClass))
#define DBUSMENU_IS_SERVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_TYPE_SERVER)) #define DBUSMENU_IS_SERVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_TYPE_SERVER))
#define DBUSMENU_IS_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_SERVER)) #define DBUSMENU_IS_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_SERVER))
#define DBUSMENU_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_SERVER, DbusmenuServerClass)) #define DBUSMENU_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_SERVER, DbusmenuServerClass))
/**
* DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE:
*
* String to attach to signal #DbusmenuServer::item-property-updated
*/
#define DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE "item-property-updated" #define DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE "item-property-updated"
/**
* DBUSMENU_SERVER_SIGNAL_ID_UPDATE:
*
* String to attach to signal #DbusmenuServer::item-updated
*/
#define DBUSMENU_SERVER_SIGNAL_ID_UPDATE "item-updated" #define DBUSMENU_SERVER_SIGNAL_ID_UPDATE "item-updated"
/**
* DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED:
*
* String to attach to signal #DbusmenuServer::layout-updated
*/
#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED "layout-updated" #define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED "layout-updated"
/**
* DBUSMENU_SERVER_SIGNAL_ITEM_ACTIVATION:
*
* String to attach to signal #DbusmenuServer::item-activation-requested
*/
#define DBUSMENU_SERVER_SIGNAL_ITEM_ACTIVATION "item-activation-requested" #define DBUSMENU_SERVER_SIGNAL_ITEM_ACTIVATION "item-activation-requested"
/**
* DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE:
*
* String to attach to signal #DbusmenuServer::layout-updated
*/
#define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE DBUSMENU_SERVER_SIGNAL_LAYOU T_UPDATED #define DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE DBUSMENU_SERVER_SIGNAL_LAYOU T_UPDATED
/**
* DBUSMENU_SERVER_PROP_DBUS_OBJECT:
*
* String to access property #DbusmenuServer:dbus-object
*/
#define DBUSMENU_SERVER_PROP_DBUS_OBJECT "dbus-object" #define DBUSMENU_SERVER_PROP_DBUS_OBJECT "dbus-object"
/**
* DBUSMENU_SERVER_PROP_ROOT_NODE:
*
* String to access property #DbusmenuServer:root-node
*/
#define DBUSMENU_SERVER_PROP_ROOT_NODE "root-node" #define DBUSMENU_SERVER_PROP_ROOT_NODE "root-node"
/**
* DBUSMENU_SERVER_PROP_VERSION:
*
* String to access property #DbusmenuServer:version
*/
#define DBUSMENU_SERVER_PROP_VERSION "version" #define DBUSMENU_SERVER_PROP_VERSION "version"
/**
* DBUSMENU_SERVER_PROP_TEXT_DIRECTION:
*
* String to access property #DbusmenuServer:text-direction
*/
#define DBUSMENU_SERVER_PROP_TEXT_DIRECTION "text-direction"
/**
* DBUSMENU_SERVER_PROP_STATUS:
*
* String to access property #DbusmenuServer:status
*/
#define DBUSMENU_SERVER_PROP_STATUS "status"
typedef struct _DbusmenuServerPrivate DbusmenuServerPrivate; 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 @item_activation: Slot for #DbusmenuServer::item-activation-requeste
n-requested. d.
@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.
The class implementing the virtual functions for #DbusmenuServer. The class implementing the virtual functions for #DbusmenuServer.
*/ */
typedef struct _DbusmenuServerClass DbusmenuServerClass; typedef struct _DbusmenuServerClass DbusmenuServerClass;
skipping to change at line 96 skipping to change at line 148
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);
}; };
/** /**
DbusmenuServer: DbusmenuServer:
@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 >*/ /*< Private >*/
DbusmenuServerPrivate * priv; 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 *
void dbusmenu_server_set_root (DbusmenuServer * server, Db object);
usmenuMenuitem * root); void dbusmenu_server_set_root (DbusmenuServer
* self,
DbusmenuMenuit
em * root);
DbusmenuTextDirection dbusmenu_server_get_text_direction (DbusmenuServer
* server);
void dbusmenu_server_set_text_direction (DbusmenuServer
* server,
DbusmenuTextDi
rection dir);
DbusmenuStatus dbusmenu_server_get_status (DbusmenuServer
* server);
void dbusmenu_server_set_status (DbusmenuServer
* server,
DbusmenuStatus
status);
/** /**
SECIONT:server SECTION: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.
@stability: Unstable @stability: Unstable
@include: libdbusmenu-glib/server.h @include: libdbusmenu-glib/server.h
A #DbusmenuServer is the object that represents the local A #DbusmenuServer is the object that represents the local
tree of #DbusmenuMenuitem objects on DBus. It watches the tree of #DbusmenuMenuitem objects on DBus. It watches the
various signals that those objects emit and correctly various signals that those objects emit and correctly
represents them across DBus to a #DbusmenuClient so that represents them across DBus to a #DbusmenuClient so that
the same tree can be maintained in another process. the same tree can be maintained in another process.
 End of changes. 14 change blocks. 
9 lines changed or deleted 75 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/