← Back to branch summary

~ci-train-bot/ubuntu-system-settings/ubuntu-system-settings-ubuntu-yakkety-landing-060

« back to all changes in this revision

Viewing changes to plugins/brightness/aethercast/device.cpp

  • Committer: Bileto Bot
  • Author(s): Simon Fels
  • Date: 2016-08-08 08:58:35 UTC
  • mfrom: (1670.5.3 uss-fixes-for-widi)
  • Revision ID: ci-train-bot@canonical.com-20160808085835-20vtwtpjea8hr1u2
Fixes for Aethercast support

 * add association state and tweak the same as configuration
 * use timeout of 130 seconds for dbus calls to have a bit more than
   the timeout aethercast has internally

Approved by: Ken VanDine

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/brightness/aethercast/device.cpp
43
43
    /* Give our calls a bit more time than the default 25 seconds to
44
44
     * complete whatever they are doing. In some situations (e.g. with
45
45
     * specific devices) the default doesn't seem to be enough to. */
46
 
    m_aethercastDevice->setTimeout(60 * 1000 /* 60 seconds */);
 
46
    m_aethercastDevice->setTimeout(130 * 1000 /* 130 seconds */);
47
47
 
48
48
    m_aethercastDeviceProperties.reset(new FreeDesktopProperties(AETHERCAST_SERVICE, path, bus));
49
49
 
135
135
            setState(Device::Disconnected);
136
136
        else if (value.toString() == "connected")
137
137
            setState(Device::Connected);
 
138
        else if (value.toString() == "association")
 
139
            setState(Device::Association);
138
140
        else if (value.toString() == "configuration")
139
141
            setState(Device::Configuration);
 
142
        else if (value.toString() == "failure")
 
143
            setState(Device::Failure);
140
144
    }
141
145
}