dbusmenu-gtk.h   dbusmenu-gtk.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_GTK_H__ #ifndef __DBUSMENU_GTK_H__
#define __DBUSMENU_GTK_H__ #define __DBUSMENU_GTK_H__
/* Start with the glib stuff */ /* Start with the glib stuff */
#include <libdbusmenu-glib/dbusmenu-glib.h> #include <libdbusmenu-glib/dbusmenu-glib.h>
/* Now get the GTK stuff */ /* Now get the GTK stuff */
#include <libdbusmenu-gtk/client.h> #include <libdbusmenu-gtk3/client.h>
#include <libdbusmenu-gtk/menu.h> #include <libdbusmenu-gtk3/menu.h>
#include <libdbusmenu-gtk/menuitem.h> #include <libdbusmenu-gtk3/menuitem.h>
#include <libdbusmenu-gtk/serializablemenuitem.h>
#endif /* __DBUSMENU_GLIB_H__ */ #endif /* __DBUSMENU_GLIB_H__ */
 End of changes. 1 change blocks. 
4 lines changed or deleted 3 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))
/* ***************************************** */
/* ********* GLib Object Signals ********* */
/* ***************************************** */
/** /**
* DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED: * DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED:
* *
* String to attach to signal #DbusmenuServer::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: * DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED:
* *
* String to attach to signal #DbusmenuServer::item-activated * String to attach to signal #DbusmenuServer::item-activated
skipping to change at line 105 skipping to change at line 108
* String to attach to signal #DbusmenuServer::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: * DBUSMENU_MENUITEM_SIGNAL_EVENT:
* *
* String to attach to signal #DbusmenuServer::event * String to attach to signal #DbusmenuServer::event
*/ */
#define DBUSMENU_MENUITEM_SIGNAL_EVENT "event" #define DBUSMENU_MENUITEM_SIGNAL_EVENT "event"
/* ***************************************** */
/* ********* Menuitem Properties ********* */
/* ***************************************** */
/** /**
* DBUSMENU_MENUITEM_PROP_TYPE: * DBUSMENU_MENUITEM_PROP_TYPE:
* *
* #DbusmenuMenuitem property used to represent what type of menuitem * #DbusmenuMenuitem property used to represent what type of menuitem
* this object represents. Type: #G_VARIANT_TYPE_STRING. * this object represents. Type: #G_VARIANT_TYPE_STRING.
*/ */
#define DBUSMENU_MENUITEM_PROP_TYPE "type" #define DBUSMENU_MENUITEM_PROP_TYPE "type"
/** /**
* DBUSMENU_MENUITEM_PROP_VISIBLE: * DBUSMENU_MENUITEM_PROP_VISIBLE:
* *
skipping to change at line 186 skipping to change at line 192
*/ */
#define DBUSMENU_MENUITEM_PROP_SHORTCUT "shortcut" #define DBUSMENU_MENUITEM_PROP_SHORTCUT "shortcut"
/** /**
* DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY: * DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY:
* *
* #DbusmenuMenuitem property that tells how the children of this menuitem * #DbusmenuMenuitem property that tells how the children of this menuitem
* should be displayed. Most likely this will be unset or of the value * should be displayed. Most likely this will be unset or of the value
* #DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU. Type: #G_VARIANT_TYPE_STRING * #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_PROP_DISPOSITION:
*
* #DbusmenuMenuitem property to tell what type of information that the
* menu item is displaying to the user. Type: #G_VARIANT_TYPE_STRING
*/
#define DBUSMENU_MENUITEM_PROP_DISPOSITION "disposition"
/* ***************************************** */
/* ********* Toggle Values ********* */
/* ***************************************** */
/** /**
* DBUSMENU_MENUITEM_TOGGLE_CHECK: * DBUSMENU_MENUITEM_TOGGLE_CHECK:
* *
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE to be a standard * Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE to be a standard
* check mark item. * check mark item.
*/ */
#define DBUSMENU_MENUITEM_TOGGLE_CHECK "checkmark" #define DBUSMENU_MENUITEM_TOGGLE_CHECK "checkmark"
/** /**
* DBUSMENU_MENUITEM_TOGGLE_RADIO: * DBUSMENU_MENUITEM_TOGGLE_RADIO:
* *
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE to be a standard * Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE to be a standard
* radio item. * radio item.
*/ */
#define DBUSMENU_MENUITEM_TOGGLE_RADIO "radio" #define DBUSMENU_MENUITEM_TOGGLE_RADIO "radio"
/* ***************************************** */
/* ********* Toggle States ********* */
/* ***************************************** */
/** /**
* DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED: * DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED:
* *
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_STATE so that the menu's * Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_STATE so that the menu's
* toggle item is empty. * toggle item is empty.
*/ */
#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED 0 #define DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED 0
/** /**
* DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED: * DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED:
* *
skipping to change at line 224 skipping to change at line 243
*/ */
#define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED 1 #define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED 1
/** /**
* DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN: * DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN:
* *
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_STATE so that the menu's * Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_STATE so that the menu's
* toggle item is undecided. * toggle item is undecided.
*/ */
#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN -1 #define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN -1
/* ***************************************** */
/* ********* Icon specials ********* */
/* ***************************************** */
/** /**
* DBUSMENU_MENUITEM_ICON_NAME_BLANK: * DBUSMENU_MENUITEM_ICON_NAME_BLANK:
* *
* Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_STATE so that the menu's * Used to set #DBUSMENU_MENUITEM_PROP_TOGGLE_STATE so that the menu's
* toggle item is undecided. * toggle item is undecided.
*/ */
#define DBUSMENU_MENUITEM_ICON_NAME_BLANK "blank-icon" #define DBUSMENU_MENUITEM_ICON_NAME_BLANK "blank-icon"
/* ***************************************** */
/* ********* Shortcut Modifiers ********* */
/* ***************************************** */
/** /**
* DBUSMENU_MENUITEM_SHORTCUT_CONTROL: * DBUSMENU_MENUITEM_SHORTCUT_CONTROL:
* *
* Used in #DBUSMENU_MENUITEM_PROP_SHORTCUT to represent the * Used in #DBUSMENU_MENUITEM_PROP_SHORTCUT to represent the
* control key. * control key.
*/ */
#define DBUSMENU_MENUITEM_SHORTCUT_CONTROL "Control" #define DBUSMENU_MENUITEM_SHORTCUT_CONTROL "Control"
/** /**
* DBUSMENU_MENUITEM_SHORTCUT_ALT: * DBUSMENU_MENUITEM_SHORTCUT_ALT:
* *
skipping to change at line 261 skipping to change at line 286
*/ */
#define DBUSMENU_MENUITEM_SHORTCUT_SHIFT "Shift" #define DBUSMENU_MENUITEM_SHORTCUT_SHIFT "Shift"
/** /**
* DBUSMENU_MENUITEM_SHORTCUT_SUPER: * DBUSMENU_MENUITEM_SHORTCUT_SUPER:
* *
* Used in #DBUSMENU_MENUITEM_PROP_SHORTCUT to represent the * Used in #DBUSMENU_MENUITEM_PROP_SHORTCUT to represent the
* super key. * super key.
*/ */
#define DBUSMENU_MENUITEM_SHORTCUT_SUPER "Super" #define DBUSMENU_MENUITEM_SHORTCUT_SUPER "Super"
/* ***************************************** */
/* ********* Child Display Types ********* */
/* ***************************************** */
/** /**
* DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU: * DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU:
* *
* Used in #DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY to have the * Used in #DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY to have the
* subitems displayed as a submenu. * subitems displayed as a submenu.
*/ */
#define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU "submenu" #define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU "submenu"
/* ***************************************** */
/* ********* Menuitem Dispositions ********* */
/* ***************************************** */
/**
* DBUSMENU_MENUITEM_DISPOSITION_NORMAL:
*
* Used in #DBUSMENU_MENUITEM_PROP_DISPOSITION to have a menu
* item displayed in the normal manner. Default value.
*/
#define DBUSMENU_MENUITEM_DISPOSITION_NORMAL "normal"
/**
* DBUSMENU_MENUITEM_DISPOSITION_INFORMATIVE:
*
* Used in #DBUSMENU_MENUITEM_PROP_DISPOSITION to have a menu
* item displayed in a way that conveys it's giving additional
* information to the user.
*/
#define DBUSMENU_MENUITEM_DISPOSITION_INFORMATIVE "informative"
/**
* DBUSMENU_MENUITEM_DISPOSITION_WARNING:
*
* Used in #DBUSMENU_MENUITEM_PROP_DISPOSITION to have a menu
* item displayed in a way that conveys it's giving a warning
* to the user.
*/
#define DBUSMENU_MENUITEM_DISPOSITION_WARNING "warning"
/**
* DBUSMENU_MENUITEM_DISPOSITION_ALERT:
*
* Used in #DBUSMENU_MENUITEM_PROP_DISPOSITION to have a menu
* item displayed in a way that conveys it's giving an alert
* to the user.
*/
#define DBUSMENU_MENUITEM_DISPOSITION_ALERT "alert"
/* ***************************************** */
/* ********* Dbusmenu Events ********* */
/* ***************************************** */
/** /**
* DBUSMENU_MENUITEM_EVENT_ACTIVATED: * DBUSMENU_MENUITEM_EVENT_ACTIVATED:
* *
* String for the event identifier when a menu item is clicked * String for the event identifier when a menu item is clicked
* on by the user. * on by the user.
*/ */
#define DBUSMENU_MENUITEM_EVENT_ACTIVATED "clicked" #define DBUSMENU_MENUITEM_EVENT_ACTIVATED "clicked"
/** /**
* DBUSMENU_MENUITEM_EVENT_OPENED: * DBUSMENU_MENUITEM_EVENT_OPENED:
 End of changes. 9 change blocks. 
0 lines changed or deleted 66 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/