diff options
| author | José Alburquerque <jaalburqu@svn.gnome.org> | 2012-02-23 17:31:46 -0500 |
|---|---|---|
| committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2012-02-23 17:31:46 -0500 |
| commit | 6cb1cc0515efd8932ce0a0e61b5fc954cf2ec3d4 (patch) | |
| tree | 46cbd66f459fc6db95f6134aa1201877f3655221 | |
| parent | 3afbcea2fdf15cddad0d00cd8f532284527b268d (diff) | |
| download | glibmm-6cb1cc0515efd8932ce0a0e61b5fc954cf2ec3d4.tar.gz | |
Gio::DBus::Connection: Add the MenuModel export/unexport methods.
* gio/src/dbusconnection.{ccg,hg}: Add the two new methods, wrapping
the two functions in the GMenuModel exporter API:
http://developer.gnome.org/gio/2.31/gio-GMenuModel-exporter.html
* tools/m4/convert_gio.m4: Add necessary conversions.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gio/src/dbusconnection.ccg | 1 | ||||
| -rw-r--r-- | gio/src/dbusconnection.hg | 4 | ||||
| -rw-r--r-- | tools/m4/convert_gio.m4 | 1 |
4 files changed, 15 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2012-02-23 José Alburquerque <jaalburquerque@gmail.com> + + Gio::DBus::Connection: Add the MenuModel export/unexport methods. + + * gio/src/dbusconnection.{ccg,hg}: Add the two new methods, wrapping + the two functions in the GMenuModel exporter API: + http://developer.gnome.org/gio/2.31/gio-GMenuModel-exporter.html + * tools/m4/convert_gio.m4: Add necessary conversions. + 2012-02-22 José Alburquerque <jaalburquerque@gmail.com> giomm: MenuModel, MenuAttributeIter: Correct typos. diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg index 9de4e5bd..0f0eca03 100644 --- a/gio/src/dbusconnection.ccg +++ b/gio/src/dbusconnection.ccg @@ -24,6 +24,7 @@ #include <giomm/dbusintrospection.h> #include <giomm/dbusmethodinvocation.h> #include <giomm/dbuserror.h> +#include <giomm/menumodel.h> #include <giomm/unixfdlist.h> #include "slot_async.h" diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg index 35222517..0789e756 100644 --- a/gio/src/dbusconnection.hg +++ b/gio/src/dbusconnection.hg @@ -37,6 +37,7 @@ namespace Gio { class ActionGroup; +class MenuModel; class UnixFDList; @@ -1044,6 +1045,9 @@ public: _WRAP_METHOD(guint export_action_group(const Glib::ustring& object_path, const Glib::RefPtr<ActionGroup>& action_group), g_dbus_connection_export_action_group, errthrow) _WRAP_METHOD(void unexport_action_group(guint export_id), g_dbus_connection_unexport_action_group) + _WRAP_METHOD(guint export_menu_model(const Glib::ustring& object_path, const Glib::RefPtr<MenuModel>& menu), g_dbus_connection_export_menu_model, errthrow) + _WRAP_METHOD(void unexport_menu_model(guint export_id), g_dbus_connection_unexport_menu_model) + //_WRAP_PROPERTY("address", std::string) // write-only construct-only //_WRAP_PROPERTY("authentication-observer", Glib::RefPtr<AuthObserver>) // write-only construct-only _WRAP_PROPERTY("capabilities", CapabilityFlags) diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index 61fcdb38..ec787ae0 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -174,6 +174,7 @@ _CONVERSION(`GMenuLinkIter*',`Glib::RefPtr<MenuLinkIter>',`Glib::wrap($3)') # MenuModel _CONVERSION(`GMenuModel*',`Glib::RefPtr<MenuModel>',`Glib::wrap($3)') +_CONVERSION(`const Glib::RefPtr<MenuModel>&',`GMenuModel*',__CONVERT_CONST_REFPTR_TO_P) # Mount _CONVERSION(`GMount*',`Glib::RefPtr<Mount>',`Glib::wrap($3)') |