client.h   client.h 
skipping to change at line 78 skipping to change at line 78
* String to attach to signal #DbusmenuClient::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: * DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT:
* *
* String to attach to signal #DbusmenuClient::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: * DBUSMENU_CLIENT_SIGNAL_ICON_THEME_DIRS_CHANGED:
* *
* String to attach to signal #DbusmenuClient::text-direction-changed * String to attach to signal #DbusmenuClient::icon-theme-dirs-changed
*/ */
#define DBUSMENU_CLIENT_SIGNAL_TEXT_DIRECTION_CHANGED "text-direction-ch anged" #define DBUSMENU_CLIENT_SIGNAL_ICON_THEME_DIRS_CHANGED "icon-theme-dirs- changed"
/** /**
* DBUSMENU_CLIENT_PROP_DBUS_NAME: * DBUSMENU_CLIENT_PROP_DBUS_NAME:
* *
* String to access property #DbusmenuClient: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: * DBUSMENU_CLIENT_PROP_DBUS_OBJECT:
* *
skipping to change at line 142 skipping to change at line 142
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. @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.
@icon_theme_dirs: Slot for #DbusmenuClient::icon-theme-dirs-changed.
@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.
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, GVaria nt * data, guint timestamp, GError * error); void (*event_result) (DbusmenuMenuitem * item, gchar * event, GVaria nt * data, guint timestamp, GError * error);
void (*icon_theme_dirs) (DbusmenuMenuitem * item, gpointer theme_dir s, 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);
}; };
/** /**
DbusmenuClient: DbusmenuClient:
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 {
skipping to change at line 201 skipping to change at line 201
@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 Return value: #TRUE if the type has been handled. #FALSE if this
function was somehow unable to handle it. 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:
@client: A pointer to the #DbusmenuClient
@type: The type that this handler was registered with
@user_data: The data you gave us
This handler is called when the type becomes unregistered by the
client. This is usally caused by the #DbusmenuClient being destroye
d
and should free memory or unref objects in @user_data.
*/
typedef void (*DbusmenuClientTypeDestroyHandler) (DbusmenuClient * client,
const gchar * type, gpointer user_data);
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);
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 estroyHandler destroy_func); GDestroyNotify dest roy_func);
DbusmenuTextDirection dbusmenu_client_get_text_direction (DbusmenuClient * client); DbusmenuTextDirection dbusmenu_client_get_text_direction (DbusmenuClient * client);
DbusmenuStatus dbusmenu_client_get_status (DbusmenuClient * cl ient); DbusmenuStatus dbusmenu_client_get_status (DbusmenuClient * cl ient);
const GStrv dbusmenu_client_get_icon_paths (DbusmenuClient * cl ient);
/** /**
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. 10 change blocks. 
20 lines changed or deleted 7 lines changed or added


 server.h   server.h 
skipping to change at line 170 skipping to change at line 170
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 * self, void dbusmenu_server_set_root (DbusmenuServer * self,
DbusmenuMenuit em * root); DbusmenuMenuit em * root);
DbusmenuTextDirection dbusmenu_server_get_text_direction (DbusmenuServer * server); DbusmenuTextDirection dbusmenu_server_get_text_direction (DbusmenuServer * server);
void dbusmenu_server_set_text_direction (DbusmenuServer * server, void dbusmenu_server_set_text_direction (DbusmenuServer * server,
DbusmenuTextDi rection dir); DbusmenuTextDi rection dir);
DbusmenuStatus dbusmenu_server_get_status (DbusmenuServer * server); DbusmenuStatus dbusmenu_server_get_status (DbusmenuServer * server);
void dbusmenu_server_set_status (DbusmenuServer * server, void dbusmenu_server_set_status (DbusmenuServer * server,
DbusmenuStatus status); DbusmenuStatus status);
const GStrv dbusmenu_server_get_icon_paths (DbusmenuServer
* server);
void dbusmenu_server_set_icon_paths (DbusmenuServer
* server,
GStrv
icon_paths);
/** /**
SECTION: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
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 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/