diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-01 11:29:13 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-01 11:29:13 +0200 |
| commit | 983a91c50de70a528edafa6fc05dfa9ffcc13b98 (patch) | |
| tree | 8da346cb82d9cb9bdf8b6c3500f88839c3c215a9 /libdbusmenu-gtk/menuitem.h | |
| parent | 5259846f36df1eb4703c56cae6a08a4bd0b4ed15 (diff) | |
| parent | 6830905830ac78271515c586442a090cf7a0e3ff (diff) | |
| download | libdbusmenu-983a91c50de70a528edafa6fc05dfa9ffcc13b98.tar.gz libdbusmenu-983a91c50de70a528edafa6fc05dfa9ffcc13b98.tar.bz2 libdbusmenu-983a91c50de70a528edafa6fc05dfa9ffcc13b98.zip | |
Merge Ubuntu.
Preserve Maintainer and Vcs-* fields.
From Ubuntu:
* New upstream release.
* Adding support for menu shortcuts (LP: #591293)
* Fixing distcheck of documentation builds
* Autogen.sh fix for adding custom prefix (LP: #595565)
* Fixing children property name to match spec (LP: #597321)
* Merging in Debian branch
* debian/control: Switching branch on this branch to be the
dbusmenu-team.
* debian/rules: Updating shlibs to 0.3.3 for shortcut API additions
Diffstat (limited to 'libdbusmenu-gtk/menuitem.h')
| -rw-r--r-- | libdbusmenu-gtk/menuitem.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libdbusmenu-gtk/menuitem.h b/libdbusmenu-gtk/menuitem.h index ff458de..6960f76 100644 --- a/libdbusmenu-gtk/menuitem.h +++ b/libdbusmenu-gtk/menuitem.h @@ -32,8 +32,15 @@ License version 3 and version 2.1 along with this program. If not, see #include <glib.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <libdbusmenu-glib/menuitem.h> +#include <gdk/gdk.h> +#include <gtk/gtk.h> gboolean dbusmenu_menuitem_property_set_image (DbusmenuMenuitem * menuitem, const gchar * property, const GdkPixbuf * data); GdkPixbuf * dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar * property); +gboolean dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key, GdkModifierType modifier); +gboolean dbusmenu_menuitem_property_set_shortcut_string (DbusmenuMenuitem * menuitem, const gchar * shortcut); +gboolean dbusmenu_menuitem_property_set_shortcut_menuitem (DbusmenuMenuitem * menuitem, const GtkMenuItem * gmi); +void dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * key, GdkModifierType * modifiers); + #endif |