← Back to branch summary

~morphis/aethercast/sink-support

« back to all changes in this revision

Viewing changes to src/client/application.cpp

  • Committer: Simon Fels
  • Date: 2016-01-18 21:55:31 UTC
  • mfrom: (162.1.7 ac-wpa-dbus)
  • Revision ID: simon.fels@canonical.com-20160118215531-jfy1lx9ggtyz60au
Merge parent

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/application.cpp
435
435
    }
436
436
 
437
437
    // Use a high enough timeout to make sure we get the end of the scan
438
 
    // method call which has an internal timeout of 30 seconds
439
 
    g_dbus_proxy_set_default_timeout(G_DBUS_PROXY(inst->manager_), 60 * 1000);
 
438
    // method call which has an internal timeout of 240 seconds
 
439
    g_dbus_proxy_set_default_timeout(G_DBUS_PROXY(inst->manager_), 240 * 1000);
440
440
 
441
441
    aethercast_interface_object_manager_client_new(inst->bus_connection_,
442
442
                             G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,