[-]
[+]
|
Changed |
_service:tar_git:gestured.spec
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/kimmoli/gesture-daemon.git</param>
<param name="branch">master</param>
- <param name="revision">cf0376718bed50532fdfc8a3938b58f9fc10541d</param>
+ <param name="revision">833e69df741d585451c67ec4fb38617a003f7de0</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:gestured-0.0.11.tar.bz2/src/gesture-actions.cpp
^
|
@@ -23,14 +23,11 @@
connect(_serviceWatcher, &QDBusServiceWatcher::serviceOwnerChanged, this, &Gestures::ownerChanged);
cameraDevice = new MGConfItem("/apps/jolla-camera/cameraDevice");
- cameraCaptureMode = new MGConfItem("/apps/jolla-camera/captureMode");
cameraNeedRestoreSettings = false;
cameraDeviceValue = cameraDevice->value().toString();
- cameraCaptureModeValue = cameraCaptureMode->value().toString();
QObject::connect(cameraDevice, SIGNAL(valueChanged()), this, SLOT(cameraValueChanged()));
- QObject::connect(cameraCaptureMode, SIGNAL(valueChanged()), this, SLOT(cameraValueChanged()));
}
Gestures::~Gestures()
@@ -118,9 +115,8 @@
void Gestures::showCameraViewfinder()
{
cameraDeviceValue = cameraDevice->value().toString();
- cameraCaptureModeValue = cameraCaptureMode->value().toString();
- if (cameraDeviceValue == "primary" || cameraCaptureModeValue == "video")
+ if (cameraDeviceValue != "secondary")
cameraNeedRestoreSettings = true;
QDBusConnection bus = QDBusConnection::sessionBus();
@@ -136,7 +132,6 @@
QThread::msleep(100);
cameraNeedRestoreSettings = false;
cameraDevice->set(cameraDeviceValue);
- cameraCaptureMode->set(cameraCaptureModeValue);
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:gestured-0.0.11.tar.bz2/src/gesture-actions.h
^
|
@@ -42,10 +42,8 @@
QDBusServiceWatcher *_serviceWatcher;
MGConfItem *cameraDevice;
- MGConfItem *cameraCaptureMode;
QString cameraDeviceValue;
- QString cameraCaptureModeValue;
};
#endif // GESTURE_ACTIONS_H
|