31cd76f · unity8 · git.iko.soy

plugins/Powerd/Powerd.cpp+7−7

compare with xenial

unifiedsplit

@@ -29,17 +29,17 @@ Powerd::Powerd(QObject* parent)

29 : QObject(parent),

30 powerd(NULL)

31{

32− powerd = new QDBusInterface("com.canonical.powerd",

32+ powerd = new QDBusInterface("com.canonical.Unity.Screen",

33− "/com/canonical/powerd",

33+ "/com/canonical/Unity/Screen",

34− "com.canonical.powerd",

34+ "com.canonical.Unity.Screen",

35 QDBusConnection::SM_BUSNAME(), this);

36

37− powerd->connection().connect("com.canonical.powerd",

37+ powerd->connection().connect("com.canonical.Unity.Screen",

38− "/com/canonical/powerd",

38+ "/com/canonical/Unity/Screen",

39− "com.canonical.powerd",

39+ "com.canonical.Unity.Screen",

40 "DisplayPowerStateChange",

41 this,

42− SIGNAL(displayPowerStateChange(int, unsigned int)));

42+ SIGNAL(displayPowerStateChange(int)));

43

44 systemSettings = g_settings_new("com.ubuntu.touch.system");

45 g_signal_connect(systemSettings, "changed::auto-brightness", G_CALLBACK(autoBrightnessChanged), powerd);

plugins/Powerd/Powerd.h+1−8

@@ -31,13 +31,6 @@ class Powerd: public QObject

31 Q_FLAGS(DisplayFlag DisplayFlags)

32

33public:

34− enum DisplayFlag {

35− UseProximity = 1, // Use proximity sensor to override screen state

36− DisableAutoBrightness = 2, // Force autobrightness to be disabled

37− Bright = 4, // Request the screen to stay bright

38− };

39− Q_DECLARE_FLAGS(DisplayFlags, DisplayFlag)

40−

41 enum Status {

34 enum Status {

42 Off,

35 Off,

43 On,

36 On,

@@ -47,7 +40,7 @@ public:

47 ~Powerd();

40 ~Powerd();

48

41

49Q_SIGNALS:

42Q_SIGNALS:

50− void displayPowerStateChange(int status, unsigned int flags);

43+ void displayPowerStateChange(int status);

51

44

52private:

45private:

53 QDBusInterface *powerd;

46 QDBusInterface *powerd;

qml/Shell.qml+1−1

@@ -432,7 +432,7 @@ FocusScope {

432 onDisplayPowerStateChange: {

433 // We ignore any display-off signals when the proximity sensor

434 // is active. This usually indicates something like a phone call.

435− if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {

435+ if (status == Powerd.Off) {

436 greeter.showNow();

437 }

438