summaryrefslogtreecommitdiff
path: root/UnityCore
diff options
authorMichal Hruby <michal.mhr@gmail.com>2012-11-13 15:11:24 +0100
committerMichal Hruby <michal.mhr@gmail.com>2012-11-13 15:11:24 +0100
commit01d77af4108751948d0b46817fd1b14d192f8496 (patch)
tree8b5efab047c792e10377de54ddc52c73e7a70310 /UnityCore
parentacb5650c8fa9cd7be7fc505e85947f14374c71e9 (diff)
Add a few more tests
(bzr r2866.7.3)
Diffstat (limited to 'UnityCore')
-rw-r--r--UnityCore/GLibDBusProxy.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/UnityCore/GLibDBusProxy.cpp b/UnityCore/GLibDBusProxy.cpp
index cacdbb969..bcd22bb18 100644
--- a/UnityCore/GLibDBusProxy.cpp
+++ b/UnityCore/GLibDBusProxy.cpp
@@ -325,10 +325,12 @@ void DBusProxy::Impl::Call(string const& method_name,
GDBusCallFlags flags,
int timeout_msec)
{
+ GCancellable* target_canc = cancellable != NULL ? cancellable : cancellable_;
+
if (!proxy_)
{
glib::Variant sinked_parameters(parameters);
- glib::Object<GCancellable>canc(cancellable, glib::AddRef());
+ glib::Object<GCancellable>canc(target_canc, glib::AddRef());
WaitForProxy(canc, timeout_msec, [this, method_name, sinked_parameters, callback, canc, flags, timeout_msec] (glib::Error const& err)
{
if (err)
@@ -354,7 +356,7 @@ void DBusProxy::Impl::Call(string const& method_name,
parameters,
flags,
timeout_msec,
- cancellable != NULL ? cancellable : cancellable_,
+ target_canc,
DBusProxy::Impl::OnCallCallback,
data);
}