diff options
| author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
|---|---|---|
| committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
| commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
| tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /gio/src/dbussubtreevtable.ccg | |
| parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
| parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
| download | glibmm-0d5f63b18f5766760cf39e82ee11482984e0a938.tar.gz | |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'gio/src/dbussubtreevtable.ccg')
| -rw-r--r-- | gio/src/dbussubtreevtable.ccg | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gio/src/dbussubtreevtable.ccg b/gio/src/dbussubtreevtable.ccg index a2481012..da8dd753 100644 --- a/gio/src/dbussubtreevtable.ccg +++ b/gio/src/dbussubtreevtable.ccg @@ -44,7 +44,7 @@ static char** DBusSubtreeVTable_Enumerate_giomm_callback( try { - std::vector<Glib::ustring> result = + auto result = (*the_slot)(Glib::wrap(connection, true), sender, object_path); // This will be freed by the caller. @@ -77,7 +77,7 @@ static GDBusInterfaceInfo** DBusSubtreeVTable_Introspect_giomm_callback( try { - std::vector< Glib::RefPtr<Gio::DBus::InterfaceInfo> > result = + auto result = (*the_slot)(Glib::wrap(connection, true), sender, object_path, node); // This will be freed by the caller, along with unreferencing its members. @@ -105,21 +105,21 @@ static const GDBusInterfaceVTable* DBusSubtreeVTable_Dispatch_giomm_callback( const char* interface_name, const char* node, void** out_user_data, void* user_data) { - Gio::DBus::SubtreeVTable* vtable = + Gio::DBus::SubtreeVTable* vtable_subtree = static_cast<Gio::DBus::SubtreeVTable*>(user_data); Gio::DBus::SubtreeVTable::SlotSubtreeDispatch* the_slot = - vtable->get_slot_dispatch(); + vtable_subtree->get_slot_dispatch(); try { - const Gio::DBus::InterfaceVTable* vtable = + const Gio::DBus::InterfaceVTable* vtable_iface = (*the_slot)(Glib::wrap(connection, true), sender, object_path, interface_name, (node ? node : "")); - *out_user_data = const_cast<Gio::DBus::InterfaceVTable*>(vtable); + *out_user_data = const_cast<Gio::DBus::InterfaceVTable*>(vtable_iface); - return vtable->gobj(); + return vtable_iface->gobj(); } catch(...) { |