1a3ac0d · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Proxy inactivity timeout values from gsettings into Unity.Screen Fixes: 1230345

1a3ac0dAlberto Aguirre12 years ago

debian/control+1−1

compare with xenial

unifiedsplit

@@ -168,7 +168,7 @@ Architecture: any

168Multi-Arch: same

169Pre-Depends: ${misc:Pre-Depends},

170Depends: accountsservice-ubuntu-schemas,

171− gsettings-ubuntu-schemas,

171+ gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),

172 libhardware2,

173 libunity-core-6.0-9,

174 pay-service,

plugins/Powerd/Powerd.cpp+16

@@ -25,6 +25,18 @@ void autoBrightnessChanged(GSettings *settings, const gchar *key, QDBusInterface

25 unityScreen->asyncCall("userAutobrightnessEnable", QVariant(value));

26}

28+void activityTimeoutChanged(GSettings *settings, const gchar *key, QDBusInterface *unityScreen)

29+{

30+ int value = g_settings_get_uint(settings, key);

31+ unityScreen->asyncCall("setInactivityTimeouts", QVariant(value), QVariant(-1));

32+}

33+

34+void dimTimeoutChanged(GSettings *settings, const gchar *key, QDBusInterface *unityScreen)

35+{

36+ int value = g_settings_get_uint(settings, key);

37+ unityScreen->asyncCall("setInactivityTimeouts", QVariant(-1), QVariant(value));

38+}

39+

28Powerd::Powerd(QObject* parent)

40Powerd::Powerd(QObject* parent)

29 : QObject(parent),

41 : QObject(parent),

30 unityScreen(NULL)

42 unityScreen(NULL)

@@ -43,7 +55,11 @@ Powerd::Powerd(QObject* parent)

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

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

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

57 g_signal_connect(systemSettings, "changed::auto-brightness", G_CALLBACK(autoBrightnessChanged), unityScreen);

58+ g_signal_connect(systemSettings, "changed::activity-timeout", G_CALLBACK(activityTimeoutChanged), unityScreen);

59+ g_signal_connect(systemSettings, "changed::dim-timeout", G_CALLBACK(dimTimeoutChanged), unityScreen);

46 autoBrightnessChanged(systemSettings, "auto-brightness", unityScreen);

60 autoBrightnessChanged(systemSettings, "auto-brightness", unityScreen);

61+ activityTimeoutChanged(systemSettings, "activity-timeout", unityScreen);

62+ dimTimeoutChanged(systemSettings, "dim-timeout", unityScreen);

47}

63}

49Powerd::~Powerd()

65Powerd::~Powerd()