diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2012-09-13 15:58:55 +0200 |
---|---|---|
committer | Patrick Ohly <patrick.ohly@intel.com> | 2012-10-25 16:43:45 +0200 |
commit | 88169d216451ae125ac6a337fa8356b29fad2b4b (patch) | |
tree | da4b6dba1c41e4bb51ca8c24eabbb4f75ed36278 /src/gdbusxx/gdbus-cxx-bridge.h | |
parent | cec68658987d99da8db3fdde4ad61b2fb44a310b (diff) |
GDBus GIO: finish code refactoring of DBusResult
Two done() calls still used g_dbus_connection_send_message()
directly instead of the common sendMsg() in the base class.
Diffstat (limited to 'src/gdbusxx/gdbus-cxx-bridge.h')
-rw-r--r-- | src/gdbusxx/gdbus-cxx-bridge.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gdbusxx/gdbus-cxx-bridge.h b/src/gdbusxx/gdbus-cxx-bridge.h index 07a4ad3f..35900f01 100644 --- a/src/gdbusxx/gdbus-cxx-bridge.h +++ b/src/gdbusxx/gdbus-cxx-bridge.h @@ -2232,11 +2232,7 @@ class DBusResult0 : if (!reply) { throw std::runtime_error("no GDBusMessage"); } - GError *error = NULL; - if (!g_dbus_connection_send_message(m_conn.get(), reply.get(), - G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, &error)) { - throwFailure("", "g_dbus_connection_send_message()", error); - } + sendMsg(reply); } static std::string getSignature() { return ""; } @@ -2348,11 +2344,7 @@ class DBusResult4 : throw std::runtime_error("no GDBusMessage"); } AppendRetvals(reply) << a1 << a2 << a3 << a4; - GError *error = NULL; - if (!g_dbus_connection_send_message(m_conn.get(), reply.get(), - G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, &error)) { - throwFailure("", "g_dbus_connection_send_message()", error); - } + sendMsg(reply); } static std::string getSignature() { return dbus_traits<A1>::getSignature() + |