Attachment 129832 Details for Bug 99862 – daemon: move two functions up

[patch] daemon: move two functions up

daemon-move-two-functions-up.patch (text/plain), 2.68 KB, created by Christian Kellner on 2017-02-22 16:55:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Kellner

Created: 2017-02-22 16:55:02 UTC

Size: 2.68 KB

patch

obsolete

>From 48a952733434dc6a0411c5ed8989a1066d31e2a9 Mon Sep 17 00:00:00 2001
>From: Christian Kellner <christian@kellner.me>
>Date: Wed, 22 Feb 2017 17:45:28 +0100
>Subject: [PATCH] daemon: move two functions up
>
>No semantic change.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=99862
>---
> src/up-daemon.c | 56 +++++++++++++++++++++++++++-----------------------------
> 1 file changed, 27 insertions(+), 29 deletions(-)
>
>diff --git a/src/up-daemon.c b/src/up-daemon.c
>index 55cf5ba..fd38640 100644
>--- a/src/up-daemon.c
>+++ b/src/up-daemon.c
>@@ -75,8 +75,6 @@ static gboolean	up_daemon_get_on_battery_local	(UpDaemon	*daemon);
> static gboolean	up_daemon_get_warning_level_local(UpDaemon	*daemon);
> static gboolean	up_daemon_get_on_ac_local 	(UpDaemon	*daemon);
> 
>-static guint    calculate_timeout               (UpDevice *device);
>-
> G_DEFINE_TYPE (UpDaemon, up_daemon, UP_TYPE_EXPORTED_DAEMON_SKELETON)
> 
> #define UP_DAEMON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UP_TYPE_DAEMON, UpDaemonPrivate))
>@@ -727,6 +725,33 @@ typedef struct {
> 	GSourceFunc callback;
> } TimeoutData;
> 
>+static guint
>+calculate_timeout (UpDevice *device)
>+{
>+	UpDeviceLevel warning_level;
>+
>+	g_object_get (G_OBJECT (device), "warning-level", &warning_level, NULL);
>+	if (warning_level >= UP_DEVICE_LEVEL_DISCHARGING)
>+		return 30;
>+	return 120;
>+}
>+
>+static void
>+enable_poll_for_device (UpDevice *device, TimeoutData *data)
>+{
>+	guint timeout;
>+	char *name;
>+
>+	timeout = calculate_timeout (device);
>+	data->timeout = timeout;
>+
>+	data->id = g_timeout_add_seconds (timeout, fire_timeout_callback, device);
>+	name = g_strdup_printf ("[upower] UpDevice::poll for %s (%u secs)",
>+				up_device_get_object_path (device), timeout);
>+	g_source_set_name_by_id (data->id, name);
>+	g_free (name);
>+}
>+
> static void
> change_idle_timeout (UpDevice   *device,
> 		     GParamSpec *pspec,
>@@ -795,33 +820,6 @@ fire_timeout_callback (gpointer user_data)
> 	return G_SOURCE_CONTINUE;
> }
> 
>-static guint
>-calculate_timeout (UpDevice *device)
>-{
>-	UpDeviceLevel warning_level;
>-
>-	g_object_get (G_OBJECT (device), "warning-level", &warning_level, NULL);
>-	if (warning_level >= UP_DEVICE_LEVEL_DISCHARGING)
>-		return 30;
>-	return 120;
>-}
>-
>-static void
>-enable_poll_for_device (UpDevice *device, TimeoutData *data)
>-{
>-	guint timeout;
>-	char *name;
>-
>-	timeout = calculate_timeout (device);
>-	data->timeout = timeout;
>-
>-	data->id = g_timeout_add_seconds (timeout, fire_timeout_callback, device);
>-	name = g_strdup_printf ("[upower] UpDevice::poll for %s (%u secs)",
>-				up_device_get_object_path (device), timeout);
>-	g_source_set_name_by_id (data->id, name);
>-	g_free (name);
>-}
>-
> static void
> enable_warning_level_notifications (UpDaemon *daemon, UpDevice *device)
> {
>-- 
>2.9.3

Actions: View | Splinter Review

Attachments on bug 99862: 129831 | 129832 | 129833

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.