diff options
author | Murray Cumming <murrayc@murrayc.com> | 2011-03-23 11:07:37 +0100 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2011-03-23 11:07:37 +0100 |
commit | 572f96865e23092a7d405760d1033e4b48c44fff (patch) | |
tree | a2c348f356d2aaca0e9ee3ca5d26d1de54d3fa5a /gio | |
parent | e806244b01d859834efa75732f1a2eadb9af18d0 (diff) | |
download | glibmm-572f96865e23092a7d405760d1033e4b48c44fff.tar.gz |
Gio::DBus::InterfaceVTable: Make the tuple clearer.
* gio/src/dbusinterfacevtable.[hg|ccg]: SlotInterfaceMethodCall: Change
the VariantBase type to a VariantContainerBase, because this is a tuple,
so people should get the children. This makes it more obvious.
DBusInterfaceVTable_MethodCall_giomm_callback(): Adapt.
Suggested by Michael Edwards.
Diffstat (limited to 'gio')
-rw-r--r-- | gio/src/dbusinterfacevtable.ccg | 4 | ||||
-rw-r--r-- | gio/src/dbusinterfacevtable.hg | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gio/src/dbusinterfacevtable.ccg b/gio/src/dbusinterfacevtable.ccg index bf478708..4db46a2d 100644 --- a/gio/src/dbusinterfacevtable.ccg +++ b/gio/src/dbusinterfacevtable.ccg @@ -44,9 +44,11 @@ static void DBusInterfaceVTable_MethodCall_giomm_callback( try { + // Note that we use VariantContainerBase instead of VariantBase for the + // GVariant, because it is documented as being a tuple (list of values). (*the_slot)(Glib::wrap(connection, true), (sender ? sender : ""), object_path, interface_name, method_name, - Glib::VariantBase(parameters, true), Glib::wrap(invocation, true)); + Glib::VariantContainerBase(parameters, true), Glib::wrap(invocation, true)); } catch(...) { diff --git a/gio/src/dbusinterfacevtable.hg b/gio/src/dbusinterfacevtable.hg index 5a49b018..a572af7c 100644 --- a/gio/src/dbusinterfacevtable.hg +++ b/gio/src/dbusinterfacevtable.hg @@ -69,7 +69,7 @@ public: const Glib::ustring&, const Glib::ustring&, const Glib::ustring&, - const Glib::VariantBase&, + const Glib::VariantContainerBase&, const Glib::RefPtr<MethodInvocation>& > SlotInterfaceMethodCall; |