[gnome-settings-daemon] power: Sort private structure
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] power: Sort private structure
- Date: Thu, 17 Jan 2013 10:07:32 +0000 (UTC)
commit 2af9b9c515cc6c84bed730b05863112ea640ba75
Author: Bastien Nocera <hadess hadess net>
Date: Thu Jan 17 09:22:48 2013 +0100
power: Sort private structure
So we can see what we're doing
plugins/power/gsd-power-manager.c | 54 +++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 20 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 3f677b0..8e4e679 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -138,47 +138,57 @@ typedef enum {
struct GsdPowerManagerPrivate
{
+ /* D-Bus */
GDBusProxy *session;
guint name_id;
- gboolean lid_is_closed;
- GSettings *settings;
- GSettings *settings_session;
- GSettings *settings_screensaver;
- GSettings *settings_xrandr;
- UpClient *up_client;
GDBusNodeInfo *introspection_data;
GDBusConnection *connection;
GCancellable *bus_cancellable;
GDBusProxy *upower_proxy;
- GDBusProxy *upower_kdb_proxy;
- gint kbd_brightness_now;
- gint kbd_brightness_max;
- gint kbd_brightness_old;
- gint kbd_brightness_pre_dim;
- GnomeRRScreen *rr_screen;
+ GDBusProxy *session_presence_proxy;
+
+ /* Settings */
+ GSettings *settings;
+ GSettings *settings_session;
+ GSettings *settings_screensaver;
+ GSettings *settings_xrandr;
+
gboolean use_time_primary;
- gchar *previous_summary;
- GIcon *previous_icon;
- GPtrArray *devices_array;
guint action_percentage;
guint action_time;
guint critical_percentage;
guint critical_time;
guint low_percentage;
guint low_time;
+
+ /* Screensaver */
+ GDBusProxy *screensaver_proxy;
+ gboolean screensaver_active;
+
+ /* State */
+ gboolean lid_is_closed;
+ UpClient *up_client;
+ gchar *previous_summary;
+ GIcon *previous_icon;
+ GPtrArray *devices_array;
gint pre_dim_brightness; /* level, not percentage */
gint pre_dpms_brightness;
UpDevice *device_composite;
+ GnomeRRScreen *rr_screen;
NotifyNotification *notification_discharging;
NotifyNotification *notification_low;
+
+ /* Keyboard */
+ GDBusProxy *upower_kdb_proxy;
+ gint kbd_brightness_now;
+ gint kbd_brightness_max;
+ gint kbd_brightness_old;
+ gint kbd_brightness_pre_dim;
+
+ /* Sound */
ca_context *canberra_context;
ca_proplist *critical_alert_loop_props;
guint32 critical_alert_timeout_id;
- GDBusProxy *session_presence_proxy;
- GsdPowerIdleMode current_idle_mode;
- guint xscreensaver_watchdog_timer_id;
- GDBusProxy *screensaver_proxy;
- gboolean screensaver_active;
/* systemd stuff */
GDBusProxy *logind_proxy;
@@ -189,10 +199,14 @@ struct GsdPowerManagerPrivate
guint inhibit_lid_switch_timer_id;
gboolean is_virtual_machine;
+ /* Idles */
GnomeIdleMonitor *idle_monitor;
guint idle_dim_id;
guint idle_blank_id;
guint idle_sleep_id;
+ GsdPowerIdleMode current_idle_mode;
+
+ guint xscreensaver_watchdog_timer_id;
};
enum {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]