summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-10-11 11:27:04 +0200
committerBastien Nocera <hadess@hadess.net>2013-10-14 10:42:56 +0200
commitccda7a4a17b529b078086f28c37f6bc9b53457eb (patch)
tree0379c22f925c85f81887a39e4a82c0f821cbcba3 /src
parent5423adab8902eb22ebebcb60c8b4223ef5d7f3eb (diff)
downloadupower-ccda7a4a17b529b078086f28c37f6bc9b53457eb.tar.gz
daemon: Remove unused config file loading
We already have UpConfig to handle that.
Diffstat (limited to 'src')
-rw-r--r--src/up-daemon.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/up-daemon.c b/src/up-daemon.c
index aac303f..243fd8a 100644
--- a/src/up-daemon.c
+++ b/src/up-daemon.c
@@ -622,36 +622,11 @@ up_daemon_properties_changed_cb (GObject *object, GParamSpec *pspec, UpDaemon *d
static void
up_daemon_init (UpDaemon *daemon)
{
- gboolean ret;
- GError *error = NULL;
- GKeyFile *file;
- const gchar *filename_self_test;
- gchar *filename;
-
daemon->priv = UP_DAEMON_GET_PRIVATE (daemon);
daemon->priv->polkit = up_polkit_new ();
daemon->priv->config = up_config_new ();
daemon->priv->power_devices = up_device_list_new ();
- /* load some values from the config file */
- file = g_key_file_new ();
- filename_self_test = g_getenv ("UPOWER_CONF_FILE_NAME");
- if (filename_self_test != NULL) {
- g_debug ("using %s as the self test conf file", filename_self_test);
- filename = g_strdup (filename_self_test);
- } else {
- filename = g_build_filename (PACKAGE_SYSCONF_DIR,"UPower", "UPower.conf", NULL);
- }
- ret = g_key_file_load_from_file (file, filename, G_KEY_FILE_NONE, &error);
- if (ret) {
- /* FIXME: Do something? */
- } else {
- g_warning ("failed to load config file %s: %s", filename, error->message);
- g_error_free (error);
- }
- g_key_file_free (file);
- g_free (filename);
-
daemon->priv->backend = up_backend_new ();
g_signal_connect (daemon->priv->backend, "device-added",
G_CALLBACK (up_daemon_device_added_cb), daemon);