Merge lp:~sforshee/powerd/remove-gsettings into lp:powerd

[Seth Forshee]

Remove use of gsettings and the associated settings for the activity and dim timeouts.

Remove use of gsettings and the associated settings for the activity and dim timeouts.

[Sebastien Bacher (seb128)]

that schemas is used in ubuntu-system-settings, dropping it is going to make some of the settings code hits abort(). Is there a replacement schemas or api we can port our code to?

[Oliver Grawert (ogra)]

so after discussion on IRC it seems like removing the schema file will trigger a crash in system-settings but leaving it in place, even non-functional, will not cause this.
so lets drop the code but keep the shcema file until unity can provide it i would say ...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:96
http://jenkins.qa.ubuntu.com/job/powerd-ci/123/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/77/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/123/rebuild

review: Approve (continuous-integration)

[Seth Forshee (sforshee)]

In that case is there even any point in making the change? After all, the original trigger for this was that the setting couldn't be written to /root because it was read-only. If we remove the use of the setting but keep the schema that really doesn't fix anything, does it?

[lp:~sforshee/powerd/remove-gsettings]

97. By Seth Forshee on 2013-10-01

Add back gsettings schema

This will allow users of the schema some time to transition.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/powerd-ci/124/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/78
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/78/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/124/rebuild

review: Approve (continuous-integration)

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-09-25 17:44:55 +0000
+++ src/powerd.cpp	2013-10-01 14:18:00 +0000
@@ -72,9 +72,8 @@
 
 /* The real default for this is set in the gschema file, but set 60 here
  * as a sanity check */
-static int activity_timeout = 60;
-static int dim_timeout = 45;
-static GSettings *powerd_settings = NULL;
+static const int activity_timeout = 60;
+static const int dim_timeout = 45;
 
 static GMainLoop *main_loop = NULL;
 static guint name_id;
@@ -369,36 +368,6 @@
     }
 }
 
-static int
-get_activity_timeout_from_gsettings()
-{
-    int ret;
-    GVariant *val = NULL;
-
-    if (!powerd_settings)
-        powerd_settings = g_settings_new("com.canonical.powerd");
-
-    val = g_settings_get_value(powerd_settings, "activity-timeout");
-    ret = g_variant_get_uint32(val);
-    g_variant_unref(val);
-    return ret;
-}
-
-static int
-get_dim_timeout_from_gsettings()
-{
-    int ret;
-    GVariant *val = NULL;
-
-    if (!powerd_settings)
-        powerd_settings = g_settings_new("com.canonical.powerd");
-
-    val = g_settings_get_value(powerd_settings, "dim-timeout");
-    ret = (int)g_variant_get_uint32(val);
-    g_variant_unref(val);
-    return ret;
-}
-
 /* Must be first to run on main loop */
 static gboolean main_init(gpointer unused)
 {
@@ -467,11 +436,6 @@
         (GAsyncReadyCallback)ofono_proxy_connect_cb,
         NULL);
 
-    activity_timeout = get_activity_timeout_from_gsettings();
-    dim_timeout = get_dim_timeout_from_gsettings();
-    powerd_debug("Activity Timeout is %d seconds\n", activity_timeout);
-    powerd_debug("Auto-dim Timeout is %d seconds\n", dim_timeout);
-
     /* Init this first, data is used by other inits */
     device_config_init();