~ubuntu-branches/ubuntu/saucy/clementine/saucy

« back to all changes in this revision

Viewing changes to src/devices/devicekitlister.cpp

  • Committer: Package Import Robot
  • Author(s): Thomas PIERSON
  • Date: 2012-01-01 20:43:39 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20120101204339-lsb6nndwhfy05sde
Tags: 1.0.1+dfsg-1
New upstream release. (Closes: #653926, #651611, #657391)

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
#include "config.h"
19
19
#include "devicekitlister.h"
20
20
#include "filesystemdevice.h"
 
21
#include "core/logging.h"
21
22
#include "core/utilities.h"
22
23
#include "dbus/udisks.h"
23
24
#include "dbus/udisksdevice.h"
35
36
}
36
37
 
37
38
DeviceKitLister::~DeviceKitLister() {
38
 
  qDebug() << __PRETTY_FUNCTION__;
 
39
  qLog(Debug) << __PRETTY_FUNCTION__;
39
40
}
40
41
 
41
42
QString DeviceKitLister::DeviceData::unique_id() const {
52
53
  reply.waitForFinished();
53
54
 
54
55
  if (!reply.isValid()) {
55
 
    qWarning() << "Error enumerating DeviceKit-disks devices:" << reply.error().name() << reply.error().message();
 
56
    qLog(Warning) << "Error enumerating DeviceKit-disks devices:" << reply.error().name() << reply.error().message();
56
57
    interface_.reset();
57
58
    return;
58
59
  }
149
150
      OrgFreedesktopUDisksInterface::staticInterfaceName(),
150
151
      path.path(), QDBusConnection::systemBus());
151
152
  if (!device.isValid()) {
152
 
    qWarning() << "Error connecting to the device interface on" << path.path();
 
153
    qLog(Warning) << "Error connecting to the device interface on" << path.path();
153
154
    return ret;
154
155
  }
155
156
 
251
252
      OrgFreedesktopUDisksInterface::staticInterfaceName(),
252
253
      path, QDBusConnection::systemBus());
253
254
  if (!device.isValid()) {
254
 
    qWarning() << "Error connecting to the device interface on" << path;
 
255
    qLog(Warning) << "Error connecting to the device interface on" << path;
255
256
    return;
256
257
  }
257
258
 
261
262
      OrgFreedesktopUDisksInterface::staticInterfaceName(),
262
263
      drive_path, QDBusConnection::systemBus());
263
264
  if (!drive.isValid()) {
264
 
    qWarning() << "Error connecting to the drive interface on" << drive_path;
 
265
    qLog(Warning) << "Error connecting to the drive interface on" << drive_path;
265
266
    return;
266
267
  }
267
268