diff --git a/common/xfpm-brightness-polkit.c b/common/xfpm-brightness-polkit.c
index 0d087b00cffdcabebc7c2246b3970578800e0f4b..9494f6a9098c219f5771a1b6e7d0fd16d4687aac 100644
--- a/common/xfpm-brightness-polkit.c
+++ b/common/xfpm-brightness-polkit.c
@@ -26,17 +26,22 @@
#include "xfpm-brightness-polkit.h"
#include "xfpm-debug.h"
-static gboolean xfpm_brightness_polkit_setup (XfpmBrightness *brightness,
- gint32 *min_level,
- gint32 *max_level);
-static gboolean xfpm_brightness_polkit_get_level (XfpmBrightness *brightness,
- gint32 *current);
-static gboolean xfpm_brightness_polkit_set_level (XfpmBrightness *brightness,
- gint32 level);
-static gboolean xfpm_brightness_polkit_get_switch (XfpmBrightness *brightness,
- gint *_switch);
-static gboolean xfpm_brightness_polkit_set_switch (XfpmBrightness *brightness,
- gint _switch);
+static gboolean
+xfpm_brightness_polkit_setup (XfpmBrightness *brightness,
+ gint32 *min_level,
+ gint32 *max_level);
+static gboolean
+xfpm_brightness_polkit_get_level (XfpmBrightness *brightness,
+ gint32 *current);
+static gboolean
+xfpm_brightness_polkit_set_level (XfpmBrightness *brightness,
+ gint32 level);
+static gboolean
+xfpm_brightness_polkit_get_switch (XfpmBrightness *brightness,
+ gint *_switch);
+static gboolean
+xfpm_brightness_polkit_set_switch (XfpmBrightness *brightness,
+ gint _switch);
struct _XfpmBrightnessPolkit
{
@@ -112,7 +117,7 @@ xfpm_brightness_polkit_setup (XfpmBrightness *brightness,
*max_level = helper_get_value ("get-max-brightness");
XFPM_DEBUG ("get-max-brightness returned %i", *max_level);
- if (*max_level >=0)
+ if (*max_level >= 0)
{
#ifdef BACKEND_TYPE_FREEBSD
const gchar *controller = "sysctl";
diff --git a/common/xfpm-brightness-x11.c b/common/xfpm-brightness-x11.c
index 27ba2f41875eae5e838b39ea5c8d1964e416f18c..8d90cda17414189e8b1ee4a4162b39652362be97 100644
--- a/common/xfpm-brightness-x11.c
+++ b/common/xfpm-brightness-x11.c
@@ -31,17 +31,22 @@
#include <X11/extensions/Xrandr.h>
#include <gdk/gdkx.h>
-static gboolean xfpm_brightness_x11_setup (XfpmBrightness *brightness,
- gint32 *min_level,
- gint32 *max_level);
-static gboolean xfpm_brightness_x11_get_level (XfpmBrightness *brightness,
- gint32 *level);
-static gboolean xfpm_brightness_x11_set_level (XfpmBrightness *brightness,
- gint32 level);
-static gboolean xfpm_brightness_x11_get_switch (XfpmBrightness *brightness,
- gint *_switch);
-static gboolean xfpm_brightness_x11_set_switch (XfpmBrightness *brightness,
- gint _switch);
+static gboolean
+xfpm_brightness_x11_setup (XfpmBrightness *brightness,
+ gint32 *min_level,
+ gint32 *max_level);
+static gboolean
+xfpm_brightness_x11_get_level (XfpmBrightness *brightness,
+ gint32 *level);
+static gboolean
+xfpm_brightness_x11_set_level (XfpmBrightness *brightness,
+ gint32 level);
+static gboolean
+xfpm_brightness_x11_get_switch (XfpmBrightness *brightness,
+ gint *_switch);
+static gboolean
+xfpm_brightness_x11_set_switch (XfpmBrightness *brightness,
+ gint _switch);
struct _XfpmBrightnessX11
{
@@ -123,8 +128,8 @@ xfpm_brightness_x11_setup (XfpmBrightness *_brightness,
gboolean success = FALSE;
gdk_x11_display_error_trap_push (gdisplay);
- if (!XRRQueryExtension (gdk_x11_get_default_xdisplay (), &event_base, &error_base) ||
- !XRRQueryVersion (gdk_x11_get_default_xdisplay (), &major, &minor))
+ if (!XRRQueryExtension (gdk_x11_get_default_xdisplay (), &event_base, &error_base)
+ || !XRRQueryVersion (gdk_x11_get_default_xdisplay (), &major, &minor))
{
gdk_x11_display_error_trap_pop_ignored (gdisplay);
g_warning ("No XRANDR extension found");
@@ -136,7 +141,8 @@ xfpm_brightness_x11_setup (XfpmBrightness *_brightness,
brightness->backlight = XInternAtom (display, RR_PROPERTY_BACKLIGHT, True);
if (brightness->backlight == None) /* fall back to deprecated name */
#endif
- brightness->backlight = XInternAtom (display, "BACKLIGHT", True);
+ brightness->backlight = XInternAtom (display, "BACKLIGHT", True);
+
if (brightness->backlight == None)
{
XFPM_DEBUG ("No outputs have backlight property");
@@ -197,8 +203,9 @@ xfpm_brightness_x11_get_level (XfpmBrightness *_brightness,
if (XRRGetOutputProperty (gdk_x11_get_default_xdisplay (), brightness->output, brightness->backlight,
0, 4, False, False, None,
&actual_type, &actual_format,
- &nitems, &bytes_after, ((unsigned char **) &prop)) != Success
- || gdk_x11_display_error_trap_pop (display) != 0)
+ &nitems, &bytes_after, ((unsigned char **) &prop))
+ != Success
+ || gdk_x11_display_error_trap_pop (display) != 0)
{
g_warning ("Failed to XRRGetOutputProperty");
return FALSE;
diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
index 2bbe45409db85867cf93cc3fee9fc5baf4f755d8..60f0ee8e35a10dce9b185524f5e5e9cb735db49e 100644
--- a/common/xfpm-brightness.c
+++ b/common/xfpm-brightness.c
@@ -37,8 +37,8 @@
#include <math.h>
-#define get_instance_private(instance) ((XfpmBrightnessPrivate *) \
- xfpm_brightness_get_instance_private (XFPM_BRIGHTNESS (instance)))
+#define get_instance_private(instance) \
+ ((XfpmBrightnessPrivate *) xfpm_brightness_get_instance_private (XFPM_BRIGHTNESS (instance)))
typedef struct _XfpmBrightnessPrivate
{
diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
index 737826462b8ca9a15011c0889d04e85e9975c541..2c04d2f8461a3c3f5bd9e25ef7adba47b9f41eb2 100644
--- a/common/xfpm-brightness.h
+++ b/common/xfpm-brightness.h
@@ -33,38 +33,49 @@ struct _XfpmBrightnessClass
{
GObjectClass parent_class;
- gboolean (*setup) (XfpmBrightness *brightness,
- gint32 *min_level,
- gint32 *max_level);
- gboolean (*get_level) (XfpmBrightness *brightness,
- gint32 *level);
- gboolean (*set_level) (XfpmBrightness *brightness,
- gint32 level);
- gboolean (*get_switch) (XfpmBrightness *brightness,
- gint *_switch);
- gboolean (*set_switch) (XfpmBrightness *brightness,
- gint _switch);
+ gboolean (*setup) (XfpmBrightness *brightness,
+ gint32 *min_level,
+ gint32 *max_level);
+ gboolean (*get_level) (XfpmBrightness *brightness,
+ gint32 *level);
+ gboolean (*set_level) (XfpmBrightness *brightness,
+ gint32 level);
+ gboolean (*get_switch) (XfpmBrightness *brightness,
+ gint *_switch);
+ gboolean (*set_switch) (XfpmBrightness *brightness,
+ gint _switch);
};
-XfpmBrightness *xfpm_brightness_new (void);
-gint32 xfpm_brightness_get_min_level (XfpmBrightness *brightness);
-void xfpm_brightness_set_min_level (XfpmBrightness *brightness,
- gint32 level);
-gint32 xfpm_brightness_get_max_level (XfpmBrightness *brightness);
-void xfpm_brightness_set_step_count (XfpmBrightness *brightness,
- guint32 count,
- gboolean exponential);
-gboolean xfpm_brightness_decrease (XfpmBrightness *brightness);
-gboolean xfpm_brightness_increase (XfpmBrightness *brightness);
+XfpmBrightness *
+xfpm_brightness_new (void);
+gint32
+xfpm_brightness_get_min_level (XfpmBrightness *brightness);
+void
+xfpm_brightness_set_min_level (XfpmBrightness *brightness,
+ gint32 level);
+gint32
+xfpm_brightness_get_max_level (XfpmBrightness *brightness);
+void
+xfpm_brightness_set_step_count (XfpmBrightness *brightness,
+ guint32 count,
+ gboolean exponential);
+gboolean
+xfpm_brightness_decrease (XfpmBrightness *brightness);
+gboolean
+xfpm_brightness_increase (XfpmBrightness *brightness);
-gboolean xfpm_brightness_get_level (XfpmBrightness *brightness,
- gint32 *level);
-gboolean xfpm_brightness_set_level (XfpmBrightness *brightness,
- gint32 level);
-gboolean xfpm_brightness_get_switch (XfpmBrightness *brightness,
- gint *_switch);
-gboolean xfpm_brightness_set_switch (XfpmBrightness *brightness,
- gint _switch);
+gboolean
+xfpm_brightness_get_level (XfpmBrightness *brightness,
+ gint32 *level);
+gboolean
+xfpm_brightness_set_level (XfpmBrightness *brightness,
+ gint32 level);
+gboolean
+xfpm_brightness_get_switch (XfpmBrightness *brightness,
+ gint *_switch);
+gboolean
+xfpm_brightness_set_switch (XfpmBrightness *brightness,
+ gint _switch);
G_END_DECLS
diff --git a/common/xfpm-common.c b/common/xfpm-common.c
index 3c076ab40389bac911de88cd41ef0c11d986620d..109c966386a7e80ec9c1ade637fe96b5d5d83b80 100644
--- a/common/xfpm-common.c
+++ b/common/xfpm-common.c
@@ -27,8 +27,8 @@
#include <libxfce4util/libxfce4util.h>
-const gchar
-*xfpm_bool_to_string (gboolean value)
+const gchar *
+xfpm_bool_to_string (gboolean value)
{
if (value)
return "TRUE";
@@ -47,8 +47,9 @@ xfpm_string_to_bool (const gchar *string)
return FALSE;
}
-GtkBuilder
-*xfpm_builder_new_from_string (const gchar *ui, GError **error)
+GtkBuilder *
+xfpm_builder_new_from_string (const gchar *ui,
+ GError **error)
{
GtkBuilder *builder;
@@ -69,9 +70,9 @@ xfpm_preferences (void)
}
void
-xfpm_preferences_device_id (const gchar* object_path)
+xfpm_preferences_device_id (const gchar *object_path)
{
- gchar *string = g_strdup_printf("xfce4-power-manager-settings -d %s", object_path);
+ gchar *string = g_strdup_printf ("xfce4-power-manager-settings -d %s", object_path);
if (string)
g_spawn_command_line_async (string, NULL);
@@ -88,43 +89,40 @@ xfpm_quit (void)
void
xfpm_about (gpointer data)
{
- gchar *package = (gchar *)data;
+ gchar *package = (gchar *) data;
- const gchar* authors[] =
- {
+ const gchar *authors[] = {
"Ali Abdallah <aliov@xfce.org>",
"Nick Schermer <nick@xfce.org>",
"Eric Koegel <eric.koegel@gmail.com>",
"Harald Judt <h.judt@gmx.at>",
"Simon Steinbeiß <simon@xfce.org>",
- NULL,
+ NULL,
};
- static const gchar *documenters[] =
- {
+ static const gchar *documenters[] = {
"Ali Abdallah <aliov@xfce.org>",
NULL,
};
- static const gchar *artists[] =
- {
+ static const gchar *artists[] = {
"Simon Steinbeiß <simon@xfce.org>",
- NULL,
+ NULL,
};
gtk_show_about_dialog (NULL,
- "copyright", "Copyright \302\251 2008-2023 The Xfce development team",
- "destroy-with-parent", TRUE,
- "authors", authors,
- "artists", artists,
- "documenters", documenters,
- "license", XFCE_LICENSE_GPL,
- "program-name", package,
- "translator-credits", _("translator-credits"),
- "version", PACKAGE_VERSION,
- "website", "https://docs.xfce.org/xfce/xfce4-power-manager/start",
- "logo-icon-name", "org.xfce.powermanager",
- NULL);
+ "copyright", "Copyright \302\251 2008-2023 The Xfce development team",
+ "destroy-with-parent", TRUE,
+ "authors", authors,
+ "artists", artists,
+ "documenters", documenters,
+ "license", XFCE_LICENSE_GPL,
+ "program-name", package,
+ "translator-credits", _("translator-credits"),
+ "version", PACKAGE_VERSION,
+ "website", "https://docs.xfce.org/xfce/xfce4-power-manager/start",
+ "logo-icon-name", "org.xfce.powermanager",
+ NULL);
}
gboolean
@@ -137,7 +135,7 @@ xfpm_is_multihead_connected (void)
nmonitor = gdk_display_get_n_monitors (dpy);
- if ( nmonitor > 1 )
+ if (nmonitor > 1)
{
XFPM_DEBUG ("Multiple monitors connected");
return TRUE;
@@ -151,7 +149,9 @@ xfpm_is_multihead_connected (void)
}
GdkPixbuf *
-xfpm_icon_load (const gchar *icon_name, gint size, gint scale_factor)
+xfpm_icon_load (const gchar *icon_name,
+ gint size,
+ gint scale_factor)
{
GdkPixbuf *pix = NULL;
GError *error = NULL;
@@ -163,7 +163,7 @@ xfpm_icon_load (const gchar *icon_name, gint size, gint scale_factor)
GTK_ICON_LOOKUP_FORCE_SIZE,
&error);
- if ( error )
+ if (error)
{
g_warning ("Unable to load icon : %s : %s", icon_name, error->message);
g_error_free (error);
diff --git a/common/xfpm-common.h b/common/xfpm-common.h
index b147fccc8fdef441f061cc38f958d1cc3ad07f68..6e163b1ed08fe92399f92bae9a8f4dcbcba2b348 100644
--- a/common/xfpm-common.h
+++ b/common/xfpm-common.h
@@ -25,18 +25,27 @@
G_BEGIN_DECLS
-GdkPixbuf *xfpm_icon_load (const gchar *icon_name,
- gint size,
- gint scale_factor);
-const gchar *xfpm_bool_to_string (gboolean value) G_GNUC_PURE;
-gboolean xfpm_string_to_bool (const gchar *string) G_GNUC_PURE;
-GtkBuilder *xfpm_builder_new_from_string (const gchar *file,
- GError **error);
-void xfpm_preferences (void);
-void xfpm_preferences_device_id (const gchar *object_path);
-void xfpm_quit (void);
-void xfpm_about (gpointer data);
-gboolean xfpm_is_multihead_connected (void);
+GdkPixbuf *
+xfpm_icon_load (const gchar *icon_name,
+ gint size,
+ gint scale_factor);
+const gchar *
+xfpm_bool_to_string (gboolean value) G_GNUC_PURE;
+gboolean
+xfpm_string_to_bool (const gchar *string) G_GNUC_PURE;
+GtkBuilder *
+xfpm_builder_new_from_string (const gchar *file,
+ GError **error);
+void
+xfpm_preferences (void);
+void
+xfpm_preferences_device_id (const gchar *object_path);
+void
+xfpm_quit (void);
+void
+xfpm_about (gpointer data);
+gboolean
+xfpm_is_multihead_connected (void);
G_END_DECLS
diff --git a/common/xfpm-config.h b/common/xfpm-config.h
index b454c36a934c6a3386fc0b6090e11a7c5acba070..9be30e46b94be5f9a4a6e1dad82143430f04c441 100644
--- a/common/xfpm-config.h
+++ b/common/xfpm-config.h
@@ -27,58 +27,58 @@
G_BEGIN_DECLS
-#define XFPM_CHANNEL "xfce4-power-manager"
-#define XFPM_PROPERTIES_PREFIX "/xfce4-power-manager/"
+#define XFPM_CHANNEL "xfce4-power-manager"
+#define XFPM_PROPERTIES_PREFIX "/xfce4-power-manager/"
-#define ON_AC_INACTIVITY_TIMEOUT "inactivity-on-ac"
-#define ON_BATTERY_INACTIVITY_TIMEOUT "inactivity-on-battery"
-#define INACTIVITY_SLEEP_MODE_ON_AC "inactivity-sleep-mode-on-ac"
-#define INACTIVITY_SLEEP_MODE_ON_BATTERY "inactivity-sleep-mode-on-battery"
+#define ON_AC_INACTIVITY_TIMEOUT "inactivity-on-ac"
+#define ON_BATTERY_INACTIVITY_TIMEOUT "inactivity-on-battery"
+#define INACTIVITY_SLEEP_MODE_ON_AC "inactivity-sleep-mode-on-ac"
+#define INACTIVITY_SLEEP_MODE_ON_BATTERY "inactivity-sleep-mode-on-battery"
-#define CRITICAL_POWER_LEVEL "critical-power-level"
-#define CRITICAL_BATT_ACTION_CFG "critical-power-action"
+#define CRITICAL_POWER_LEVEL "critical-power-level"
+#define CRITICAL_BATT_ACTION_CFG "critical-power-action"
-#define DPMS_ENABLED_CFG "dpms-enabled"
-#define ON_AC_DPMS_SLEEP "dpms-on-ac-sleep"
-#define ON_AC_DPMS_OFF "dpms-on-ac-off"
-#define ON_BATT_DPMS_SLEEP "dpms-on-battery-sleep"
-#define ON_BATT_DPMS_OFF "dpms-on-battery-off"
-#define DPMS_SLEEP_MODE "dpms-sleep-mode"
+#define DPMS_ENABLED_CFG "dpms-enabled"
+#define ON_AC_DPMS_SLEEP "dpms-on-ac-sleep"
+#define ON_AC_DPMS_OFF "dpms-on-ac-off"
+#define ON_BATT_DPMS_SLEEP "dpms-on-battery-sleep"
+#define ON_BATT_DPMS_OFF "dpms-on-battery-off"
+#define DPMS_SLEEP_MODE "dpms-sleep-mode"
-#define PROFILE_ON_AC "profile-on-ac"
-#define PROFILE_ON_BATTERY "profile-on-battery"
+#define PROFILE_ON_AC "profile-on-ac"
+#define PROFILE_ON_BATTERY "profile-on-battery"
-#define LOCK_SCREEN_ON_SLEEP "lock-screen-suspend-hibernate"
-#define GENERAL_NOTIFICATION_CFG "general-notification"
-#define PRESENTATION_MODE "presentation-mode"
-#define HEARTBEAT_COMMAND "heartbeat-command"
-#define SHOW_TRAY_ICON_CFG "show-tray-icon"
+#define LOCK_SCREEN_ON_SLEEP "lock-screen-suspend-hibernate"
+#define GENERAL_NOTIFICATION_CFG "general-notification"
+#define PRESENTATION_MODE "presentation-mode"
+#define HEARTBEAT_COMMAND "heartbeat-command"
+#define SHOW_TRAY_ICON_CFG "show-tray-icon"
-#define POWER_SWITCH_CFG "power-button-action"
-#define HIBERNATE_SWITCH_CFG "hibernate-button-action"
-#define SLEEP_SWITCH_CFG "sleep-button-action"
-#define BATTERY_SWITCH_CFG "battery-button-action"
-#define LID_SWITCH_ON_AC_CFG "lid-action-on-ac"
-#define LID_SWITCH_ON_BATTERY_CFG "lid-action-on-battery"
+#define POWER_SWITCH_CFG "power-button-action"
+#define HIBERNATE_SWITCH_CFG "hibernate-button-action"
+#define SLEEP_SWITCH_CFG "sleep-button-action"
+#define BATTERY_SWITCH_CFG "battery-button-action"
+#define LID_SWITCH_ON_AC_CFG "lid-action-on-ac"
+#define LID_SWITCH_ON_BATTERY_CFG "lid-action-on-battery"
-#define LOGIND_HANDLE_POWER_KEY "logind-handle-power-key"
-#define LOGIND_HANDLE_SUSPEND_KEY "logind-handle-suspend-key"
-#define LOGIND_HANDLE_HIBERNATE_KEY "logind-handle-hibernate-key"
-#define LOGIND_HANDLE_LID_SWITCH "logind-handle-lid-switch"
+#define LOGIND_HANDLE_POWER_KEY "logind-handle-power-key"
+#define LOGIND_HANDLE_SUSPEND_KEY "logind-handle-suspend-key"
+#define LOGIND_HANDLE_HIBERNATE_KEY "logind-handle-hibernate-key"
+#define LOGIND_HANDLE_LID_SWITCH "logind-handle-lid-switch"
-#define BRIGHTNESS_ON_AC "brightness-on-ac"
-#define BRIGHTNESS_ON_BATTERY "brightness-on-battery"
-#define BRIGHTNESS_LEVEL_ON_AC "brightness-level-on-ac"
-#define BRIGHTNESS_LEVEL_ON_BATTERY "brightness-level-on-battery"
-#define BRIGHTNESS_SLIDER_MIN_LEVEL "brightness-slider-min-level"
-#define BRIGHTNESS_STEP_COUNT "brightness-step-count"
-#define BRIGHTNESS_EXPONENTIAL "brightness-exponential"
-#define BRIGHTNESS_SWITCH "brightness-switch"
-#define BRIGHTNESS_SWITCH_SAVE "brightness-switch-restore-on-exit"
-#define HANDLE_BRIGHTNESS_KEYS "handle-brightness-keys"
-#define SHOW_BRIGHTNESS_POPUP "show-brightness-popup"
-#define SHOW_PANEL_LABEL "show-panel-label"
-#define SHOW_PRESENTATION_INDICATOR "show-presentation-indicator"
+#define BRIGHTNESS_ON_AC "brightness-on-ac"
+#define BRIGHTNESS_ON_BATTERY "brightness-on-battery"
+#define BRIGHTNESS_LEVEL_ON_AC "brightness-level-on-ac"
+#define BRIGHTNESS_LEVEL_ON_BATTERY "brightness-level-on-battery"
+#define BRIGHTNESS_SLIDER_MIN_LEVEL "brightness-slider-min-level"
+#define BRIGHTNESS_STEP_COUNT "brightness-step-count"
+#define BRIGHTNESS_EXPONENTIAL "brightness-exponential"
+#define BRIGHTNESS_SWITCH "brightness-switch"
+#define BRIGHTNESS_SWITCH_SAVE "brightness-switch-restore-on-exit"
+#define HANDLE_BRIGHTNESS_KEYS "handle-brightness-keys"
+#define SHOW_BRIGHTNESS_POPUP "show-brightness-popup"
+#define SHOW_PANEL_LABEL "show-panel-label"
+#define SHOW_PRESENTATION_INDICATOR "show-presentation-indicator"
G_END_DECLS
diff --git a/common/xfpm-debug.c b/common/xfpm-debug.c
index bfe6cad4412c2b8ebe77599f0fbebe32fd4f3268..dda0ebea2f31ba9bf035a95fb137d0008ae5b4d3 100644
--- a/common/xfpm-debug.c
+++ b/common/xfpm-debug.c
@@ -31,11 +31,15 @@ static gboolean enable_debug = FALSE;
#if defined(G_HAVE_ISO_VARARGS)
void
-xfpm_debug (const char *func, const char *file, int line, const char *format, ...)
+xfpm_debug (const char *func,
+ const char *file,
+ int line,
+ const char *format,
+ ...)
{
va_list args;
- if ( !enable_debug )
+ if (!enable_debug)
return;
va_start (args, format);
@@ -48,16 +52,20 @@ xfpm_debug (const char *func, const char *file, int line, const char *format, ..
}
void
-xfpm_warn (const char *func, const char *file, int line, const char *format, ...)
+xfpm_warn (const char *func,
+ const char *file,
+ int line,
+ const char *format,
+ ...)
{
va_list args;
- if ( !enable_debug )
+ if (!enable_debug)
return;
va_start (args, format);
- fprintf(stdout, "TRACE[%s:%d] %s(): ", file, line, func);
+ fprintf (stdout, "TRACE[%s:%d] %s(): ", file, line, func);
fprintf (stdout, "***WARNING***: ");
vfprintf (stdout, format, args);
fprintf (stdout, "\n");
@@ -65,8 +73,13 @@ xfpm_warn (const char *func, const char *file, int line, const char *format, ...
}
void
-xfpm_debug_enum (const gchar *func, const gchar *file, gint line,
- gint v_enum, GType type, const gchar *format, ...)
+xfpm_debug_enum (const gchar *func,
+ const gchar *file,
+ gint line,
+ gint v_enum,
+ GType type,
+ const gchar *format,
+ ...)
{
va_list args;
gchar *buffer;
@@ -74,7 +87,7 @@ xfpm_debug_enum (const gchar *func, const gchar *file, gint line,
gchar *content = NULL;
GValue __value__ = G_VALUE_INIT;
- if ( !enable_debug )
+ if (!enable_debug)
return;
g_value_init (&__value__, type);
@@ -86,9 +99,9 @@ xfpm_debug_enum (const gchar *func, const gchar *file, gint line,
g_vasprintf (&buffer, format, args);
va_end (args);
- fprintf(stdout, "TRACE[%s:%d] %s(): ", file, line, func);
- fprintf(stdout, "%s: %s", buffer, content);
- fprintf(stdout, "\n");
+ fprintf (stdout, "TRACE[%s:%d] %s(): ", file, line, func);
+ fprintf (stdout, "%s: %s", buffer, content);
+ fprintf (stdout, "\n");
g_value_unset (&__value__);
g_free (content);
@@ -100,5 +113,5 @@ xfpm_debug_enum (const gchar *func, const gchar *file, gint line,
void
xfpm_debug_init (gboolean debug)
{
- enable_debug = debug;
+ enable_debug = debug;
}
diff --git a/common/xfpm-debug.h b/common/xfpm-debug.h
index c880a097c2215235a7baab42ce547d5288429208..9d9a242fbced28508dc73dfce770585983dbbaa5 100644
--- a/common/xfpm-debug.h
+++ b/common/xfpm-debug.h
@@ -28,33 +28,36 @@ G_BEGIN_DECLS
#if defined(G_HAVE_ISO_VARARGS)
-#define XFPM_DEBUG(...)\
+#define XFPM_DEBUG(...) \
xfpm_debug (__func__, __FILE__, __LINE__, __VA_ARGS__)
-#define XFPM_WARNING(...)\
+#define XFPM_WARNING(...) \
xfpm_warn (__func__, __FILE__, __LINE__, __VA_ARGS__)
-#define XFPM_DEBUG_ENUM(_value, _type, ...)\
+#define XFPM_DEBUG_ENUM(_value, _type, ...) \
xfpm_debug_enum (__func__, __FILE__, __LINE__, _value, _type, __VA_ARGS__)
-void xfpm_debug_enum (const gchar *func,
- const gchar *file,
- gint line,
- gint v_enum,
- GType type,
- const gchar *format,
- ...) __attribute__((format (printf,6,7)));
-void xfpm_debug (const char *func,
- const char *file,
- int line,
- const char *format,
- ...) __attribute__((format (printf,4,5)));
-void xfpm_warn (const char *func,
- const char *file,
- int line,
- const char *format,
- ...) __attribute__((format (printf,4,5)));
+void
+xfpm_debug_enum (const gchar *func,
+ const gchar *file,
+ gint line,
+ gint v_enum,
+ GType type,
+ const gchar *format,
+ ...) __attribute__ ((format (printf, 6, 7)));
+void
+xfpm_debug (const char *func,
+ const char *file,
+ int line,
+ const char *format,
+ ...) __attribute__ ((format (printf, 4, 5)));
+void
+xfpm_warn (const char *func,
+ const char *file,
+ int line,
+ const char *format,
+ ...) __attribute__ ((format (printf, 4, 5)));
#else
@@ -64,7 +67,8 @@ void xfpm_warn (const char *func,
#endif
-void xfpm_debug_init (gboolean debug);
+void
+xfpm_debug_init (gboolean debug);
G_END_DECLS
diff --git a/common/xfpm-enum.h b/common/xfpm-enum.h
index 6d4b6f5d169d78df211697c6e53b565df83b2aac..41defe2ac516fce5a2afeb7d2feadd01aac92069 100644
--- a/common/xfpm-enum.h
+++ b/common/xfpm-enum.h
@@ -1,4 +1,4 @@
- /*
+/*
* * Copyright (C) 2008-2011 Ali <aliov@xfce.org>
*
* Licensed under the GNU General Public License Version 2
@@ -35,24 +35,24 @@ typedef enum
typedef enum
{
- LID_KEY = (1 << 0),
- BRIGHTNESS_KEY_UP = (1 << 1),
- BRIGHTNESS_KEY_DOWN = (1 << 2),
- SLEEP_KEY = (1 << 3),
- HIBERNATE_KEY = (1 << 4),
- POWER_KEY = (1 << 5),
- KBD_BRIGHTNESS_KEY_UP = (1 << 6),
- KBD_BRIGHTNESS_KEY_DOWN = (1 << 7),
- KBD_BRIGHTNESS_CYCLE = (1 << 8),
- BATTERY_KEY = (1 << 9)
+ LID_KEY = (1 << 0),
+ BRIGHTNESS_KEY_UP = (1 << 1),
+ BRIGHTNESS_KEY_DOWN = (1 << 2),
+ SLEEP_KEY = (1 << 3),
+ HIBERNATE_KEY = (1 << 4),
+ POWER_KEY = (1 << 5),
+ KBD_BRIGHTNESS_KEY_UP = (1 << 6),
+ KBD_BRIGHTNESS_KEY_DOWN = (1 << 7),
+ KBD_BRIGHTNESS_CYCLE = (1 << 8),
+ BATTERY_KEY = (1 << 9)
} XfpmKeys;
typedef enum
{
- CPU_UNKNOWN = (1 << 0),
- CPU_POWERSAVE = (1 << 1),
- CPU_ONDEMAND = (1 << 2),
- CPU_PERFORMANCE = (1 << 3)
+ CPU_UNKNOWN = (1 << 0),
+ CPU_POWERSAVE = (1 << 1),
+ CPU_ONDEMAND = (1 << 2),
+ CPU_PERFORMANCE = (1 << 3)
} XfpmCpuGovernor;
G_END_DECLS
diff --git a/common/xfpm-icons.h b/common/xfpm-icons.h
index 0e6ef6d8cb4ed5541b1a51369d717509ecdbf6d7..f1f67339cababb3888e8e95f9e63700d1e15e6ff 100644
--- a/common/xfpm-icons.h
+++ b/common/xfpm-icons.h
@@ -23,21 +23,21 @@
G_BEGIN_DECLS
-#define XFPM_AC_ADAPTER_ICON "ac-adapter"
-#define XFPM_BATTERY_LEVEL_ICON "battery-level"
-#define XFPM_COMPUTER_ICON "computer"
-#define XFPM_DISPLAY_BRIGHTNESS_ICON "display-brightness-symbolic"
-#define XFPM_MOUSE_ICON "input-mouse"
-#define XFPM_KBD_ICON "input-keyboard"
-#define XFPM_MEDIA_PLAYER_ICON "multimedia-player"
-#define XFPM_PDA_ICON "pda"
-#define XFPM_PHONE_ICON "phone"
-#define XFPM_TABLET_ICON "tablet"
-#define XFPM_UPS_ICON "uninterruptible-power-supply"
-#define XFPM_MONITOR_ICON "video-display"
-#define PANEL_DEFAULT_ICON "battery-full-charged"
-#define PANEL_DEFAULT_ICON_SYMBOLIC "battery-full-charged-symbolic"
-#define PRESENTATION_MODE_ICON "x-office-presentation-symbolic"
+#define XFPM_AC_ADAPTER_ICON "ac-adapter"
+#define XFPM_BATTERY_LEVEL_ICON "battery-level"
+#define XFPM_COMPUTER_ICON "computer"
+#define XFPM_DISPLAY_BRIGHTNESS_ICON "display-brightness-symbolic"
+#define XFPM_MOUSE_ICON "input-mouse"
+#define XFPM_KBD_ICON "input-keyboard"
+#define XFPM_MEDIA_PLAYER_ICON "multimedia-player"
+#define XFPM_PDA_ICON "pda"
+#define XFPM_PHONE_ICON "phone"
+#define XFPM_TABLET_ICON "tablet"
+#define XFPM_UPS_ICON "uninterruptible-power-supply"
+#define XFPM_MONITOR_ICON "video-display"
+#define PANEL_DEFAULT_ICON "battery-full-charged"
+#define PANEL_DEFAULT_ICON_SYMBOLIC "battery-full-charged-symbolic"
+#define PRESENTATION_MODE_ICON "x-office-presentation-symbolic"
G_END_DECLS
diff --git a/common/xfpm-power-common.c b/common/xfpm-power-common.c
index 756e74a7454d26ccb0be80f316f285e7a7573cc8..be4a35aa928049af5e8990585c9b577e307ea20e 100644
--- a/common/xfpm-power-common.c
+++ b/common/xfpm-power-common.c
@@ -127,12 +127,12 @@ xfpm_battery_get_icon_index (guint percent)
gchar *
xfpm_battery_get_time_string (guint seconds)
{
- char* timestring = NULL;
- gint hours;
- gint minutes;
+ char *timestring = NULL;
+ gint hours;
+ gint minutes;
/* Add 0.5 to do rounding */
- minutes = (int) ( ( seconds / 60.0 ) + 0.5 );
+ minutes = (int) ((seconds / 60.0) + 0.5);
if (minutes == 0)
{
@@ -142,9 +142,7 @@ xfpm_battery_get_time_string (guint seconds)
if (minutes < 60)
{
- timestring = g_strdup_printf (ngettext ("%i minute",
- "%i minutes",
- minutes), minutes);
+ timestring = g_strdup_printf (ngettext ("%i minute", "%i minutes", minutes), minutes);
return timestring;
}
@@ -152,21 +150,19 @@ xfpm_battery_get_time_string (guint seconds)
minutes = minutes % 60;
if (minutes == 0)
- timestring = g_strdup_printf (ngettext (
- "%i hour",
- "%i hours",
- hours), hours);
+ timestring = g_strdup_printf (ngettext ("%i hour", "%i hours", hours), hours);
else
- /* TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
- * Swap order with "%2$s %2$i %1$s %1$i if needed */
- timestring = g_strdup_printf (_("%i %s %i %s"),
- hours, ngettext ("hour", "hours", hours),
- minutes, ngettext ("minute", "minutes", minutes));
+ /* TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ * Swap order with "%2$s %2$i %1$s %1$i if needed */
+ timestring = g_strdup_printf (_("%i %s %i %s"),
+ hours, ngettext ("hour", "hours", hours),
+ minutes, ngettext ("minute", "minutes", minutes));
return timestring;
}
static gboolean
-is_display_device (UpClient *upower, UpDevice *device)
+is_display_device (UpClient *upower,
+ UpDevice *device)
{
UpDevice *display_device = NULL;
gboolean ret = FALSE;
@@ -180,15 +176,18 @@ is_display_device (UpClient *upower, UpDevice *device)
return ret;
}
-gchar*
-get_device_panel_icon_name (UpClient *upower, UpDevice *device)
+gchar *
+get_device_panel_icon_name (UpClient *upower,
+ UpDevice *device)
{
return get_device_icon_name (upower, device, TRUE);
}
-gchar*
-get_device_icon_name (UpClient *upower, UpDevice *device, gboolean is_panel)
+gchar *
+get_device_icon_name (UpClient *upower,
+ UpDevice *device,
+ gboolean is_panel)
{
gchar *icon_name = NULL;
gchar *icon_suffix;
@@ -224,51 +223,52 @@ get_device_icon_name (UpClient *upower, UpDevice *device, gboolean is_panel)
* http://cgit.freedesktop.org/upower/tree/libupower-glib/up-types.h
* because UPower doesn't return device-specific icon-names
*/
- if ( type == UP_DEVICE_KIND_BATTERY && is_panel )
+ if (type == UP_DEVICE_KIND_BATTERY && is_panel)
{
- if ( state == UP_DEVICE_STATE_CHARGING || state == UP_DEVICE_STATE_PENDING_CHARGE)
+ if (state == UP_DEVICE_STATE_CHARGING || state == UP_DEVICE_STATE_PENDING_CHARGE)
icon_name = g_strdup_printf ("%s-%s-%s", XFPM_BATTERY_LEVEL_ICON, xfpm_battery_get_icon_index (percentage), "charging-symbolic");
- else if ( state == UP_DEVICE_STATE_DISCHARGING || state == UP_DEVICE_STATE_PENDING_DISCHARGE)
+ else if (state == UP_DEVICE_STATE_DISCHARGING || state == UP_DEVICE_STATE_PENDING_DISCHARGE)
icon_name = g_strdup_printf ("%s-%s-%s", XFPM_BATTERY_LEVEL_ICON, xfpm_battery_get_icon_index (percentage), "symbolic");
- else if ( state == UP_DEVICE_STATE_FULLY_CHARGED)
+ else if (state == UP_DEVICE_STATE_FULLY_CHARGED)
icon_name = g_strdup_printf ("%s-%s", XFPM_BATTERY_LEVEL_ICON, "100-charged-symbolic");
else
icon_name = g_strdup ("battery-missing-symbolic");
}
- else if ( type == UP_DEVICE_KIND_UPS )
+ else if (type == UP_DEVICE_KIND_UPS)
icon_name = g_strdup (XFPM_UPS_ICON);
- else if ( type == UP_DEVICE_KIND_MOUSE )
+ else if (type == UP_DEVICE_KIND_MOUSE)
icon_name = g_strdup (XFPM_MOUSE_ICON);
- else if ( type == UP_DEVICE_KIND_KEYBOARD )
+ else if (type == UP_DEVICE_KIND_KEYBOARD)
icon_name = g_strdup (XFPM_KBD_ICON);
- else if ( type == UP_DEVICE_KIND_PHONE )
+ else if (type == UP_DEVICE_KIND_PHONE)
icon_name = g_strdup (XFPM_PHONE_ICON);
- else if ( type == UP_DEVICE_KIND_PDA )
+ else if (type == UP_DEVICE_KIND_PDA)
icon_name = g_strdup (XFPM_PDA_ICON);
- else if ( type == UP_DEVICE_KIND_MEDIA_PLAYER )
+ else if (type == UP_DEVICE_KIND_MEDIA_PLAYER)
icon_name = g_strdup (XFPM_MEDIA_PLAYER_ICON);
- else if ( type == UP_DEVICE_KIND_LINE_POWER )
+ else if (type == UP_DEVICE_KIND_LINE_POWER)
icon_name = g_strdup_printf ("%s%s", XFPM_AC_ADAPTER_ICON, is_panel ? "-symbolic" : "");
- else if ( type == UP_DEVICE_KIND_MONITOR )
+ else if (type == UP_DEVICE_KIND_MONITOR)
icon_name = g_strdup (XFPM_MONITOR_ICON);
- else if ( type == UP_DEVICE_KIND_TABLET )
+ else if (type == UP_DEVICE_KIND_TABLET)
icon_name = g_strdup (XFPM_TABLET_ICON);
- else if ( type == UP_DEVICE_KIND_COMPUTER )
+ else if (type == UP_DEVICE_KIND_COMPUTER)
icon_name = g_strdup (XFPM_COMPUTER_ICON);
/* As UPower does not tell us whether a system is a desktop or a laptop we
decide this based on whether there is a battery and/or a a lid */
- else if (!up_client_get_lid_is_present (upower) &&
- !up_client_get_on_battery (upower) &&
- g_strcmp0 (upower_icon, "battery-missing-symbolic") == 0)
+ else if (!up_client_get_lid_is_present (upower)
+ && !up_client_get_on_battery (upower)
+ && g_strcmp0 (upower_icon, "battery-missing-symbolic") == 0)
icon_name = g_strdup_printf ("%s%s", XFPM_AC_ADAPTER_ICON, is_panel ? "-symbolic" : "");
- else if ( g_strcmp0 (upower_icon, "") != 0 )
+ else if (g_strcmp0 (upower_icon, "") != 0)
icon_name = g_strndup (upower_icon, icon_base_length);
return icon_name;
}
-gchar*
-get_device_description (UpClient *upower, UpDevice *device)
+gchar *
+get_device_description (UpClient *upower,
+ UpDevice *device)
{
gchar *tip = NULL;
gchar *est_time_str = NULL;
@@ -289,7 +289,7 @@ get_device_description (UpClient *upower, UpDevice *device)
"time-to-empty", &time_to_empty,
"time-to-full", &time_to_full,
"online", &online,
- NULL);
+ NULL);
if (is_display_device (upower, device))
{
@@ -312,7 +312,7 @@ get_device_description (UpClient *upower, UpDevice *device)
/* If we get a vendor or model we can use it, otherwise translate the
* device type into something readable (works for things like ac_power)
*/
- if (g_strcmp0(vendor, "") == 0 && g_strcmp0(model, "") == 0)
+ if (g_strcmp0 (vendor, "") == 0 && g_strcmp0 (model, "") == 0)
vendor = g_strdup_printf ("%s", xfpm_power_translate_device_type (type));
/* If the device is unknown to the kernel (maybe no-name stuff or
@@ -321,17 +321,17 @@ get_device_description (UpClient *upower, UpDevice *device)
* useful nor human-readable, so translate and use the device
* type instead of the hex IDs (see bug #11217).
*/
- else if (strlen(vendor) == 31 && strlen(model) == 31)
+ else if (strlen (vendor) == 31 && strlen (model) == 31)
{
g_free (vendor);
g_free (model);
vendor = g_strdup_printf ("%s", xfpm_power_translate_device_type (type));
- model = g_strdup("");
+ model = g_strdup ("");
}
- if ( state == UP_DEVICE_STATE_FULLY_CHARGED )
+ if (state == UP_DEVICE_STATE_FULLY_CHARGED)
{
- if ( time_to_empty > 0 )
+ if (time_to_empty > 0)
{
est_time_str = xfpm_battery_get_time_string (time_to_empty);
tip = g_strdup_printf (_("<b>%s %s</b>\nFully charged - %s remaining"),
@@ -345,9 +345,9 @@ get_device_description (UpClient *upower, UpDevice *device)
vendor, model);
}
}
- else if ( state == UP_DEVICE_STATE_CHARGING )
+ else if (state == UP_DEVICE_STATE_CHARGING)
{
- if ( time_to_full != 0 )
+ if (time_to_full != 0)
{
est_time_str = xfpm_battery_get_time_string (time_to_full);
tip = g_strdup_printf (_("<b>%s %s</b>\n%0.0f%% - %s until full"),
@@ -363,9 +363,9 @@ get_device_description (UpClient *upower, UpDevice *device)
percentage);
}
}
- else if ( state == UP_DEVICE_STATE_DISCHARGING )
+ else if (state == UP_DEVICE_STATE_DISCHARGING)
{
- if ( time_to_empty != 0 )
+ if (time_to_empty != 0)
{
est_time_str = xfpm_battery_get_time_string (time_to_empty);
tip = g_strdup_printf (_("<b>%s %s</b>\n%0.0f%% - %s remaining"),
@@ -381,24 +381,24 @@ get_device_description (UpClient *upower, UpDevice *device)
percentage);
}
}
- else if ( state == UP_DEVICE_STATE_PENDING_CHARGE )
+ else if (state == UP_DEVICE_STATE_PENDING_CHARGE)
{
tip = g_strdup_printf (_("<b>%s %s</b>\nWaiting to charge (%0.0f%%)"),
vendor, model,
percentage);
}
- else if ( state == UP_DEVICE_STATE_PENDING_DISCHARGE )
+ else if (state == UP_DEVICE_STATE_PENDING_DISCHARGE)
{
tip = g_strdup_printf (_("<b>%s %s</b>\nWaiting to discharge (%0.0f%%)"),
vendor, model,
percentage);
}
- else if ( state == UP_DEVICE_STATE_EMPTY )
+ else if (state == UP_DEVICE_STATE_EMPTY)
{
tip = g_strdup_printf (_("<b>%s %s</b>\nis empty"),
vendor, model);
}
- else if ( state == UP_DEVICE_STATE_UNKNOWN && percentage != 0.0 )
+ else if (state == UP_DEVICE_STATE_UNKNOWN && percentage != 0.0)
{
tip = g_strdup_printf (_("<b>%s %s</b>\nCurrent charge: %0.0f%%"),
vendor, model,
@@ -411,7 +411,7 @@ get_device_description (UpClient *upower, UpDevice *device)
/* On the 2nd line we want to know if the power cord is plugged
* in or not */
tip = g_strdup_printf (_("<b>%s %s</b>\n%s"),
- vendor, model, online ? _("Plugged in") : _("Not plugged in"));
+ vendor, model, online ? _("Plugged in") : _("Not plugged in"));
}
else if (is_display_device (upower, device))
{
@@ -422,13 +422,12 @@ get_device_description (UpClient *upower, UpDevice *device)
else
{
/* unknown device state, just display the percentage */
- tip = g_strdup_printf (_("<b>%s %s</b>\nUnknown state"),
- vendor, model);
+ tip = g_strdup_printf (_("<b>%s %s</b>\nUnknown state"), vendor, model);
}
}
- g_free(model);
- g_free(vendor);
+ g_free (model);
+ g_free (vendor);
return tip;
}
diff --git a/common/xfpm-power-common.h b/common/xfpm-power-common.h
index 58c97018d36c5599bef222a45dd36c0a099cdfa0..c3a3e8d99c986fcf023e372e68ffb89224ce4e74 100644
--- a/common/xfpm-power-common.h
+++ b/common/xfpm-power-common.h
@@ -23,37 +23,43 @@
#include <upower.h>
-#define UPOWER_NAME "org.freedesktop.UPower"
-#define UPOWER_PATH "/org/freedesktop/UPower"
+#define UPOWER_NAME "org.freedesktop.UPower"
+#define UPOWER_PATH "/org/freedesktop/UPower"
-#define UPOWER_IFACE "org.freedesktop.UPower"
-#define UPOWER_IFACE_DEVICE "org.freedesktop.UPower.Device"
-#define UPOWER_PATH_DEVICE "/org/freedesktop/UPower/devices/"
+#define UPOWER_IFACE "org.freedesktop.UPower"
+#define UPOWER_IFACE_DEVICE "org.freedesktop.UPower.Device"
+#define UPOWER_PATH_DEVICE "/org/freedesktop/UPower/devices/"
-#define UPOWER_PATH_WAKEUPS "/org/freedesktop/UPower/Wakeups"
-#define UPOWER_IFACE_WAKEUPS "org.freedesktop.UPower.Wakeups"
+#define UPOWER_PATH_WAKEUPS "/org/freedesktop/UPower/Wakeups"
+#define UPOWER_IFACE_WAKEUPS "org.freedesktop.UPower.Wakeups"
-#define POLKIT_AUTH_SUSPEND_UPOWER "org.freedesktop.upower.suspend"
-#define POLKIT_AUTH_HIBERNATE_UPOWER "org.freedesktop.upower.hibernate"
+#define POLKIT_AUTH_SUSPEND_UPOWER "org.freedesktop.upower.suspend"
+#define POLKIT_AUTH_HIBERNATE_UPOWER "org.freedesktop.upower.hibernate"
-#define POLKIT_AUTH_SUSPEND_LOGIND "org.freedesktop.login1.suspend"
-#define POLKIT_AUTH_HIBERNATE_LOGIND "org.freedesktop.login1.hibernate"
+#define POLKIT_AUTH_SUSPEND_LOGIND "org.freedesktop.login1.suspend"
+#define POLKIT_AUTH_HIBERNATE_LOGIND "org.freedesktop.login1.hibernate"
-#define POLKIT_AUTH_SUSPEND_XFPM "org.xfce.power.xfce4-pm-helper"
-#define POLKIT_AUTH_HIBERNATE_XFPM "org.xfce.power.xfce4-pm-helper"
+#define POLKIT_AUTH_SUSPEND_XFPM "org.xfce.power.xfce4-pm-helper"
+#define POLKIT_AUTH_HIBERNATE_XFPM "org.xfce.power.xfce4-pm-helper"
-#define POLKIT_AUTH_SUSPEND_CONSOLEKIT2 "org.freedesktop.consolekit.system.suspend"
+#define POLKIT_AUTH_SUSPEND_CONSOLEKIT2 "org.freedesktop.consolekit.system.suspend"
#define POLKIT_AUTH_HIBERNATE_CONSOLEKIT2 "org.freedesktop.consolekit.system.hibernate"
-const gchar *xfpm_power_translate_device_type (guint type);
-const gchar *xfpm_power_translate_technology (guint value);
-gchar *xfpm_battery_get_time_string (guint seconds);
-gchar *get_device_panel_icon_name (UpClient *upower,
- UpDevice *device);
-gchar *get_device_icon_name (UpClient *upower,
- UpDevice *device,
- gboolean is_panel);
-gchar *get_device_description (UpClient *upower,
- UpDevice *device);
+const gchar *
+xfpm_power_translate_device_type (guint type);
+const gchar *
+xfpm_power_translate_technology (guint value);
+gchar *
+xfpm_battery_get_time_string (guint seconds);
+gchar *
+get_device_panel_icon_name (UpClient *upower,
+ UpDevice *device);
+gchar *
+get_device_icon_name (UpClient *upower,
+ UpDevice *device,
+ gboolean is_panel);
+gchar *
+get_device_description (UpClient *upower,
+ UpDevice *device);
#endif /* XFPM_UPOWER_COMMON */
diff --git a/common/xfpm-ppd-common.c b/common/xfpm-ppd-common.c
index 19c912d9d6f66f1e00d387dc4ca191bb0b968b6b..909e30be2e79a3ebcf2d65bd3e851e2260029045 100644
--- a/common/xfpm-ppd-common.c
+++ b/common/xfpm-ppd-common.c
@@ -46,7 +46,7 @@ xfpm_ppd_g_dbus_proxy_new (void)
GSList *
xfpm_ppd_get_profiles (GDBusProxy *proxy)
{
- GVariant *var = NULL;
+ GVariant *var = NULL;
GSList *names = NULL;
g_return_val_if_fail (proxy != NULL, NULL);
diff --git a/common/xfpm-ppd-common.h b/common/xfpm-ppd-common.h
index 75bc35d27b35ef4e22999bbc32526da33e6eac40..cf58ee4f8f0d6922d28a4be1932f141eb07463f4 100644
--- a/common/xfpm-ppd-common.h
+++ b/common/xfpm-ppd-common.h
@@ -25,8 +25,10 @@
G_BEGIN_DECLS
-GDBusProxy *xfpm_ppd_g_dbus_proxy_new (void);
-GSList *xfpm_ppd_get_profiles (GDBusProxy *proxy);
+GDBusProxy *
+xfpm_ppd_g_dbus_proxy_new (void);
+GSList *
+xfpm_ppd_get_profiles (GDBusProxy *proxy);
G_END_DECLS
diff --git a/libdbus/xfpm-dbus-monitor.c b/libdbus/xfpm-dbus-monitor.c
index 8adf61b82683c810619299dcb8e83d451b30d081..898191ce91160932af79f868c07a1f80d868401b 100644
--- a/libdbus/xfpm-dbus-monitor.c
+++ b/libdbus/xfpm-dbus-monitor.c
@@ -27,27 +27,28 @@
#include <libxfce4util/libxfce4util.h>
-static void xfpm_dbus_monitor_finalize (GObject *object);
+static void
+xfpm_dbus_monitor_finalize (GObject *object);
#define XFPM_DBUS_MONITOR_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), XFPM_TYPE_DBUS_MONITOR, XfpmDBusMonitorPrivate))
+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), XFPM_TYPE_DBUS_MONITOR, XfpmDBusMonitorPrivate))
struct XfpmDBusMonitorPrivate
{
GDBusConnection *system_bus;
GDBusConnection *session_bus;
- guint system_signal;
- guint session_signal;
+ guint system_signal;
+ guint session_signal;
- GPtrArray *names_array;
- GPtrArray *services_array;
+ GPtrArray *names_array;
+ GPtrArray *services_array;
};
typedef struct
{
- gchar *name;
- GBusType bus_type;
+ gchar *name;
+ GBusType bus_type;
} XfpmWatchData;
enum
@@ -58,7 +59,7 @@ enum
LAST_SIGNAL
};
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE_WITH_PRIVATE (XfpmDBusMonitor, xfpm_dbus_monitor, G_TYPE_OBJECT)
@@ -72,12 +73,14 @@ xfpm_dbus_monitor_free_watch_data (gpointer data)
}
static XfpmWatchData *
-xfpm_dbus_monitor_get_watch_data (GPtrArray *array, const gchar *name, GBusType bus_type)
+xfpm_dbus_monitor_get_watch_data (GPtrArray *array,
+ const gchar *name,
+ GBusType bus_type)
{
XfpmWatchData *data;
guint i;
- for ( i = 0; i < array->len; i++)
+ for (i = 0; i < array->len; i++)
{
data = g_ptr_array_index (array, i);
if (g_strcmp0 (data->name, name) == 0 && data->bus_type == bus_type)
@@ -87,123 +90,126 @@ xfpm_dbus_monitor_get_watch_data (GPtrArray *array, const gchar *name, GBusType
}
static void
-xfpm_dbus_monitor_unique_connection_name_lost (XfpmDBusMonitor *monitor, GBusType bus_type, const gchar *name)
+xfpm_dbus_monitor_unique_connection_name_lost (XfpmDBusMonitor *monitor,
+ GBusType bus_type,
+ const gchar *name)
{
XfpmWatchData *watch;
guint i = 0;
- for ( i = 0; i < monitor->priv->names_array->len; i++ )
+ for (i = 0; i < monitor->priv->names_array->len; i++)
{
watch = g_ptr_array_index (monitor->priv->names_array, i);
if (g_strcmp0 (watch->name, name) == 0 && bus_type == watch->bus_type)
{
- g_signal_emit (G_OBJECT(monitor), signals [UNIQUE_NAME_LOST], 0,
- watch->name, bus_type == G_BUS_TYPE_SESSION);
+ g_signal_emit (G_OBJECT (monitor), signals[UNIQUE_NAME_LOST], 0,
+ watch->name, bus_type == G_BUS_TYPE_SESSION);
g_ptr_array_remove (monitor->priv->names_array, watch);
}
}
}
static void
-xfpm_dbus_monitor_service_connection_changed (XfpmDBusMonitor *monitor, GBusType bus_type,
- const gchar *name, gboolean connected)
+xfpm_dbus_monitor_service_connection_changed (XfpmDBusMonitor *monitor,
+ GBusType bus_type,
+ const gchar *name,
+ gboolean connected)
{
XfpmWatchData *watch;
guint i;
- for ( i = 0; i < monitor->priv->services_array->len; i++)
+ for (i = 0; i < monitor->priv->services_array->len; i++)
{
watch = g_ptr_array_index (monitor->priv->services_array, i);
if (g_strcmp0 (watch->name, name) == 0 && watch->bus_type == bus_type)
{
- g_signal_emit (G_OBJECT (monitor), signals [SERVICE_CONNECTION_CHANGED], 0,
+ g_signal_emit (G_OBJECT (monitor), signals[SERVICE_CONNECTION_CHANGED], 0,
name, connected, bus_type == G_BUS_TYPE_SESSION);
}
}
}
static void
-xfpm_dbus_monitor_name_owner_changed (XfpmDBusMonitor *monitor, const gchar *name,
- const gchar *prev, const gchar *new, GBusType bus_type)
+xfpm_dbus_monitor_name_owner_changed (XfpmDBusMonitor *monitor,
+ const gchar *name,
+ const gchar *prev,
+ const gchar *new,
+ GBusType bus_type)
{
- if ( strlen (prev) != 0 )
+ if (strlen (prev) != 0)
{
xfpm_dbus_monitor_unique_connection_name_lost (monitor, bus_type, prev);
/* Connection has name */
- if ( strlen (name) != 0 )
+ if (strlen (name) != 0)
xfpm_dbus_monitor_service_connection_changed (monitor, bus_type, name, FALSE);
}
- else if ( strlen (name) != 0 && strlen (new) != 0)
+ else if (strlen (name) != 0 && strlen (new) != 0)
{
xfpm_dbus_monitor_service_connection_changed (monitor, bus_type, name, TRUE);
}
}
static void
-xfpm_dbus_monitor_session_name_owner_changed_cb (GDBusConnection *connection, const gchar *sender,
- const gchar *object_path, const gchar *interface_name,
- const gchar *signal_name, GVariant *parameters,
+xfpm_dbus_monitor_session_name_owner_changed_cb (GDBusConnection *connection,
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *signal_name,
+ GVariant *parameters,
gpointer monitor)
{
- const gchar *name, *prev, *new;
+ const gchar *name, *prev, *new;
- g_variant_get (parameters,
- "(&s&s&s)",
- &name,
- &prev,
- &new);
+ g_variant_get (parameters, "(&s&s&s)", &name, &prev, &new);
- xfpm_dbus_monitor_name_owner_changed (monitor, name, prev, new, G_BUS_TYPE_SESSION);
+ xfpm_dbus_monitor_name_owner_changed (monitor, name, prev, new, G_BUS_TYPE_SESSION);
}
static void
-xfpm_dbus_monitor_system_name_owner_changed_cb (GDBusConnection *connection, const gchar *sender,
- const gchar *object_path, const gchar *interface_name,
- const gchar *signal_name, GVariant *parameters,
- gpointer monitor)
+xfpm_dbus_monitor_system_name_owner_changed_cb (GDBusConnection *connection,
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *signal_name,
+ GVariant *parameters,
+ gpointer monitor)
{
- const gchar *name, *prev, *new;
+ const gchar *name, *prev, *new;
- g_variant_get (parameters,
- "(&s&s&s)",
- &name,
- &prev,
- &new);
+ g_variant_get (parameters, "(&s&s&s)", &name, &prev, &new);
- xfpm_dbus_monitor_name_owner_changed (monitor, name, prev, new, G_BUS_TYPE_SYSTEM);
+ xfpm_dbus_monitor_name_owner_changed (monitor, name, prev, new, G_BUS_TYPE_SYSTEM);
}
static void
xfpm_dbus_monitor_session (XfpmDBusMonitor *monitor)
{
- monitor->priv->session_signal =
- g_dbus_connection_signal_subscribe (monitor->priv->session_bus,
- "org.freedesktop.DBus",
- "org.freedesktop.DBus",
- "NameOwnerChanged",
- "/org/freedesktop/DBus",
- NULL,
- G_DBUS_SIGNAL_FLAGS_NONE,
- xfpm_dbus_monitor_session_name_owner_changed_cb,
- monitor, NULL);
+ monitor->priv->session_signal = g_dbus_connection_signal_subscribe (monitor->priv->session_bus,
+ "org.freedesktop.DBus",
+ "org.freedesktop.DBus",
+ "NameOwnerChanged",
+ "/org/freedesktop/DBus",
+ NULL,
+ G_DBUS_SIGNAL_FLAGS_NONE,
+ xfpm_dbus_monitor_session_name_owner_changed_cb,
+ monitor, NULL);
}
static void
xfpm_dbus_monitor_system (XfpmDBusMonitor *monitor)
{
- monitor->priv->system_signal =
- g_dbus_connection_signal_subscribe (monitor->priv->system_bus,
- "org.freedesktop.DBus",
- "org.freedesktop.DBus",
- "NameOwnerChanged",
- "/org/freedesktop/DBus",
- NULL,
- G_DBUS_SIGNAL_FLAGS_NONE,
- xfpm_dbus_monitor_system_name_owner_changed_cb,
- monitor, NULL);
+ monitor->priv->system_signal = g_dbus_connection_signal_subscribe (monitor->priv->system_bus,
+ "org.freedesktop.DBus",
+ "org.freedesktop.DBus",
+ "NameOwnerChanged",
+ "/org/freedesktop/DBus",
+ NULL,
+ G_DBUS_SIGNAL_FLAGS_NONE,
+ xfpm_dbus_monitor_system_name_owner_changed_cb,
+ monitor, NULL);
}
static void
@@ -211,34 +217,29 @@ xfpm_dbus_monitor_class_init (XfpmDBusMonitorClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- signals [UNIQUE_NAME_LOST] =
- g_signal_new ("unique-name-lost",
- XFPM_TYPE_DBUS_MONITOR,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfpmDBusMonitorClass, unique_name_lost),
- NULL, NULL,
- _xfpm_dbus_marshal_VOID__STRING_BOOLEAN,
- G_TYPE_NONE, 2,
- G_TYPE_STRING, G_TYPE_BOOLEAN);
-
- signals [SERVICE_CONNECTION_CHANGED] =
- g_signal_new ("service-connection-changed",
- XFPM_TYPE_DBUS_MONITOR,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfpmDBusMonitorClass, service_connection_changed),
- NULL, NULL,
- _xfpm_dbus_marshal_VOID__STRING_BOOLEAN_BOOLEAN,
- G_TYPE_NONE, 3, G_TYPE_STRING,
- G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
-
- signals [SYSTEM_BUS_CONNECTION_CHANGED] =
- g_signal_new ("system-bus-connection-changed",
- XFPM_TYPE_DBUS_MONITOR,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfpmDBusMonitorClass, system_bus_connection_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+ signals[UNIQUE_NAME_LOST] = g_signal_new ("unique-name-lost",
+ XFPM_TYPE_DBUS_MONITOR,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmDBusMonitorClass, unique_name_lost),
+ NULL, NULL,
+ _xfpm_dbus_marshal_VOID__STRING_BOOLEAN,
+ G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+
+ signals[SERVICE_CONNECTION_CHANGED] = g_signal_new ("service-connection-changed",
+ XFPM_TYPE_DBUS_MONITOR,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmDBusMonitorClass, service_connection_changed),
+ NULL, NULL,
+ _xfpm_dbus_marshal_VOID__STRING_BOOLEAN_BOOLEAN,
+ G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
+
+ signals[SYSTEM_BUS_CONNECTION_CHANGED] = g_signal_new ("system-bus-connection-changed",
+ XFPM_TYPE_DBUS_MONITOR,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmDBusMonitorClass, system_bus_connection_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
object_class->finalize = xfpm_dbus_monitor_finalize;
}
@@ -252,10 +253,10 @@ xfpm_dbus_monitor_init (XfpmDBusMonitor *monitor)
monitor->priv->services_array = g_ptr_array_new_with_free_func (xfpm_dbus_monitor_free_watch_data);
monitor->priv->session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
- monitor->priv->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+ monitor->priv->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
xfpm_dbus_monitor_session (monitor);
- xfpm_dbus_monitor_system (monitor);
+ xfpm_dbus_monitor_system (monitor);
}
static void
@@ -283,7 +284,7 @@ xfpm_dbus_monitor_new (void)
{
static gpointer xfpm_dbus_monitor_object = NULL;
- if ( G_LIKELY (xfpm_dbus_monitor_object != NULL) )
+ if (G_LIKELY (xfpm_dbus_monitor_object != NULL))
{
g_object_ref (xfpm_dbus_monitor_object);
}
@@ -296,7 +297,10 @@ xfpm_dbus_monitor_new (void)
return XFPM_DBUS_MONITOR (xfpm_dbus_monitor_object);
}
-gboolean xfpm_dbus_monitor_add_unique_name (XfpmDBusMonitor *monitor, GBusType bus_type, const gchar *unique_name)
+gboolean
+xfpm_dbus_monitor_add_unique_name (XfpmDBusMonitor *monitor,
+ GBusType bus_type,
+ const gchar *unique_name)
{
XfpmWatchData *watch;
@@ -304,10 +308,10 @@ gboolean xfpm_dbus_monitor_add_unique_name (XfpmDBusMonitor *monitor, GBusType b
g_return_val_if_fail (unique_name != NULL, FALSE);
/* We have it already */
- if ( xfpm_dbus_monitor_get_watch_data (monitor->priv->names_array, unique_name, bus_type) )
+ if (xfpm_dbus_monitor_get_watch_data (monitor->priv->names_array, unique_name, bus_type))
return FALSE;
- watch = g_new0 (XfpmWatchData , 1);
+ watch = g_new0 (XfpmWatchData, 1);
watch->name = g_strdup (unique_name);
watch->bus_type = bus_type;
@@ -315,7 +319,10 @@ gboolean xfpm_dbus_monitor_add_unique_name (XfpmDBusMonitor *monitor, GBusType b
return TRUE;
}
-void xfpm_dbus_monitor_remove_unique_name (XfpmDBusMonitor *monitor, GBusType bus_type, const gchar *unique_name)
+void
+xfpm_dbus_monitor_remove_unique_name (XfpmDBusMonitor *monitor,
+ GBusType bus_type,
+ const gchar *unique_name)
{
XfpmWatchData *watch;
@@ -323,22 +330,25 @@ void xfpm_dbus_monitor_remove_unique_name (XfpmDBusMonitor *monitor, GBusType bu
watch = xfpm_dbus_monitor_get_watch_data (monitor->priv->names_array, unique_name, bus_type);
- if ( watch )
+ if (watch)
{
g_ptr_array_remove (monitor->priv->names_array, watch);
}
}
-gboolean xfpm_dbus_monitor_add_service (XfpmDBusMonitor *monitor, GBusType bus_type, const gchar *service_name)
+gboolean
+xfpm_dbus_monitor_add_service (XfpmDBusMonitor *monitor,
+ GBusType bus_type,
+ const gchar *service_name)
{
XfpmWatchData *watch;
g_return_val_if_fail (XFPM_IS_DBUS_MONITOR (monitor), FALSE);
- if ( xfpm_dbus_monitor_get_watch_data (monitor->priv->services_array, service_name, bus_type ) )
+ if (xfpm_dbus_monitor_get_watch_data (monitor->priv->services_array, service_name, bus_type))
return FALSE;
- watch = g_new0 (XfpmWatchData , 1);
+ watch = g_new0 (XfpmWatchData, 1);
watch->name = g_strdup (service_name);
watch->bus_type = bus_type;
@@ -347,7 +357,10 @@ gboolean xfpm_dbus_monitor_add_service (XfpmDBusMonitor *monitor, GBusType bus_t
return TRUE;
}
-void xfpm_dbus_monitor_remove_service (XfpmDBusMonitor *monitor, GBusType bus_type, const gchar *service_name)
+void
+xfpm_dbus_monitor_remove_service (XfpmDBusMonitor *monitor,
+ GBusType bus_type,
+ const gchar *service_name)
{
XfpmWatchData *watch;
@@ -355,7 +368,7 @@ void xfpm_dbus_monitor_remove_service (XfpmDBusMonitor *monitor, GBusType bus_ty
watch = xfpm_dbus_monitor_get_watch_data (monitor->priv->services_array, service_name, bus_type);
- if ( watch )
+ if (watch)
{
g_ptr_array_remove (monitor->priv->services_array, watch);
}
diff --git a/libdbus/xfpm-dbus-monitor.h b/libdbus/xfpm-dbus-monitor.h
index fbb4a6d90d620b1337aca1f76c40184c9826fa42..9800056855fab4e28b5b3ce52380b36becaac889 100644
--- a/libdbus/xfpm-dbus-monitor.h
+++ b/libdbus/xfpm-dbus-monitor.h
@@ -26,58 +26,65 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_DBUS_MONITOR (xfpm_dbus_monitor_get_type () )
-#define XFPM_DBUS_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_DBUS_MONITOR, XfpmDBusMonitor))
-#define XFPM_IS_DBUS_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_DBUS_MONITOR))
+#define XFPM_TYPE_DBUS_MONITOR (xfpm_dbus_monitor_get_type ())
+#define XFPM_DBUS_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_DBUS_MONITOR, XfpmDBusMonitor))
+#define XFPM_IS_DBUS_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_DBUS_MONITOR))
typedef struct XfpmDBusMonitorPrivate XfpmDBusMonitorPrivate;
typedef struct
{
- GObject parent;
+ GObject parent;
XfpmDBusMonitorPrivate *priv;
} XfpmDBusMonitor;
typedef struct
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
/*
* Unique name connection lost.
*/
- void (*unique_name_lost) (XfpmDBusMonitor *monitor,
- gchar *unique_name,
- gboolean on_session);
+ void (*unique_name_lost) (XfpmDBusMonitor *monitor,
+ gchar *unique_name,
+ gboolean on_session);
/*
* A Service connection changed.
*/
- void (*service_connection_changed) (XfpmDBusMonitor *monitor,
- gchar *service_name,
- gboolean connected,
- gboolean on_session);
+ void (*service_connection_changed) (XfpmDBusMonitor *monitor,
+ gchar *service_name,
+ gboolean connected,
+ gboolean on_session);
/*
* DBus: system bus disconnected
*/
- void (*system_bus_connection_changed) (XfpmDBusMonitor *monitor,
- gboolean connected);
+ void (*system_bus_connection_changed) (XfpmDBusMonitor *monitor,
+ gboolean connected);
} XfpmDBusMonitorClass;
-GType xfpm_dbus_monitor_get_type (void) G_GNUC_CONST;
-XfpmDBusMonitor *xfpm_dbus_monitor_new (void);
-void xfpm_dbus_monitor_watch_system_bus (XfpmDBusMonitor *monitor);
-gboolean xfpm_dbus_monitor_add_unique_name (XfpmDBusMonitor *monitor,
- GBusType bus_type,
- const gchar *unique_name);
-void xfpm_dbus_monitor_remove_unique_name (XfpmDBusMonitor *monitor,
- GBusType bus_type,
- const gchar *unique_name);
-gboolean xfpm_dbus_monitor_add_service (XfpmDBusMonitor *monitor,
- GBusType bus_type,
- const gchar *service_name);
-void xfpm_dbus_monitor_remove_service (XfpmDBusMonitor *monitor,
- GBusType bus_type,
- const gchar *service_name);
+GType
+xfpm_dbus_monitor_get_type (void) G_GNUC_CONST;
+XfpmDBusMonitor *
+xfpm_dbus_monitor_new (void);
+void
+xfpm_dbus_monitor_watch_system_bus (XfpmDBusMonitor *monitor);
+gboolean
+xfpm_dbus_monitor_add_unique_name (XfpmDBusMonitor *monitor,
+ GBusType bus_type,
+ const gchar *unique_name);
+void
+xfpm_dbus_monitor_remove_unique_name (XfpmDBusMonitor *monitor,
+ GBusType bus_type,
+ const gchar *unique_name);
+gboolean
+xfpm_dbus_monitor_add_service (XfpmDBusMonitor *monitor,
+ GBusType bus_type,
+ const gchar *service_name);
+void
+xfpm_dbus_monitor_remove_service (XfpmDBusMonitor *monitor,
+ GBusType bus_type,
+ const gchar *service_name);
G_END_DECLS
#endif /* __XFPM_DBUS_MONITOR_H */
diff --git a/libdbus/xfpm-dbus.c b/libdbus/xfpm-dbus.c
index 082332f10e98759a72c789120610ff2d4f969cf4..5f465de987fe2dcd9e3f612cb3d1acd66ef5565d 100644
--- a/libdbus/xfpm-dbus.c
+++ b/libdbus/xfpm-dbus.c
@@ -25,7 +25,8 @@
#include "xfpm-dbus.h"
gboolean
-xfpm_dbus_name_has_owner (GDBusConnection *connection, const gchar *name)
+xfpm_dbus_name_has_owner (GDBusConnection *connection,
+ const gchar *name)
{
GError *error = NULL;
const gchar *owner = NULL;
@@ -47,16 +48,18 @@ xfpm_dbus_name_has_owner (GDBusConnection *connection, const gchar *name)
}
else
{
- if (! g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_NAME_HAS_NO_OWNER))
- g_warning("Failed to get name owner: %s\n", error->message);
+ if (!g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_NAME_HAS_NO_OWNER))
+ g_warning ("Failed to get name owner: %s\n", error->message);
- g_error_free(error);
+ g_error_free (error);
}
return owner != NULL;
}
-gboolean xfpm_dbus_register_name(GDBusConnection *connection, const gchar *name)
+gboolean
+xfpm_dbus_register_name (GDBusConnection *connection,
+ const gchar *name)
{
GError *error = NULL;
guint32 ret = 0;
@@ -80,14 +83,16 @@ gboolean xfpm_dbus_register_name(GDBusConnection *connection, const gchar *name)
}
else
{
- g_warning("Error: %s",error->message);
- g_error_free(error);
+ g_warning ("Error: %s", error->message);
+ g_error_free (error);
}
return ret == 1; /* DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER */
}
-gboolean xfpm_dbus_release_name(GDBusConnection *connection, const gchar *name)
+gboolean
+xfpm_dbus_release_name (GDBusConnection *connection,
+ const gchar *name)
{
GError *error = NULL;
GVariant *var = g_dbus_connection_call_sync (connection,
@@ -107,8 +112,8 @@ gboolean xfpm_dbus_release_name(GDBusConnection *connection, const gchar *name)
}
else
{
- g_warning("Error: %s",error->message);
- g_error_free(error);
+ g_warning ("Error: %s", error->message);
+ g_error_free (error);
}
return var != NULL;
diff --git a/libdbus/xfpm-dbus.h b/libdbus/xfpm-dbus.h
index 374ab0950c1ce2a5536d5cabe4d54c56bf1562df..238a54abae2fa0f2f70018f516c0c605cf97587d 100644
--- a/libdbus/xfpm-dbus.h
+++ b/libdbus/xfpm-dbus.h
@@ -23,10 +23,13 @@
#include <gio/gio.h>
-gboolean xfpm_dbus_name_has_owner (GDBusConnection *bus,
- const gchar *name);
-gboolean xfpm_dbus_register_name (GDBusConnection *bus,
- const gchar *name);
-gboolean xfpm_dbus_release_name (GDBusConnection *bus,
- const gchar *name);
+gboolean
+xfpm_dbus_name_has_owner (GDBusConnection *bus,
+ const gchar *name);
+gboolean
+xfpm_dbus_register_name (GDBusConnection *bus,
+ const gchar *name);
+gboolean
+xfpm_dbus_release_name (GDBusConnection *bus,
+ const gchar *name);
#endif /* __XFPM_DBUS_H */
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 1729498ddf7d41afa717b42b45ade76bf9a24466..ed905c11ec0608fde1d07b43a2690d2f853ebc22 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -50,61 +50,61 @@ struct PowerManagerButtonPrivate
{
#ifdef XFCE_PLUGIN
XfcePanelPlugin *plugin;
- GDBusProxy *inhibit_proxy;
+ GDBusProxy *inhibit_proxy;
#else
- XfpmInhibit *inhibit;
+ XfpmInhibit *inhibit;
#endif
- XfconfChannel *channel;
+ XfconfChannel *channel;
- UpClient *upower;
+ UpClient *upower;
/* A list of BatteryDevices */
- GList *devices;
+ GList *devices;
/* The left-click popup menu, if one is being displayed */
- GtkWidget *menu;
+ GtkWidget *menu;
/* The actual panel icon image */
- GtkWidget *panel_icon_image;
- GtkWidget *panel_presentation_mode;
- GtkWidget *panel_label;
- GtkWidget *hbox;
+ GtkWidget *panel_icon_image;
+ GtkWidget *panel_presentation_mode;
+ GtkWidget *panel_label;
+ GtkWidget *hbox;
/* Keep track of icon name to redisplay during size changes */
- gchar *panel_icon_name;
- gchar *panel_fallback_icon_name;
+ gchar *panel_icon_name;
+ gchar *panel_fallback_icon_name;
/* Keep track of the last icon size for use during updates */
- gint panel_icon_width;
+ gint panel_icon_width;
/* Keep track of the tooltip */
- gchar *tooltip;
+ gchar *tooltip;
/* Upower 0.99 has a display device that can be used for the
* panel image and tooltip description */
- UpDevice *display_device;
+ UpDevice *display_device;
- XfpmBrightness *brightness;
+ XfpmBrightness *brightness;
/* display brightness slider widget */
- GtkWidget *range;
+ GtkWidget *range;
/* filter range value changed events for snappier UI feedback */
- guint set_level_timeout;
+ guint set_level_timeout;
- gint show_panel_label;
- gboolean presentation_mode;
- gboolean show_presentation_indicator;
+ gint show_panel_label;
+ gboolean presentation_mode;
+ gboolean show_presentation_indicator;
};
typedef struct
{
- cairo_surface_t *surface; /* Icon */
- GtkWidget *img; /* Icon image in the menu */
- gchar *details; /* Description of the device + state */
- gchar *object_path; /* UpDevice object path */
- UpDevice *device; /* Pointer to the UpDevice */
- gulong changed_signal_id; /* device changed callback id */
- gulong expose_signal_id; /* expose-event callback id */
- GtkWidget *menu_item; /* The device's item on the menu (if shown) */
+ cairo_surface_t *surface; /* Icon */
+ GtkWidget *img; /* Icon image in the menu */
+ gchar *details; /* Description of the device + state */
+ gchar *object_path; /* UpDevice object path */
+ UpDevice *device; /* Pointer to the UpDevice */
+ gulong changed_signal_id; /* device changed callback id */
+ gulong expose_signal_id; /* expose-event callback id */
+ GtkWidget *menu_item; /* The device's item on the menu (if shown) */
} BatteryDevice;
typedef enum
@@ -115,7 +115,8 @@ typedef enum
PROP_SHOW_PRESENTATION_INDICATOR,
} POWER_MANAGER_BUTTON_PROPERTIES;
-enum {
+enum
+{
SIG_ICON_NAME_CHANGED = 0,
SIG_TOOLTIP_CHANGED,
SIG_N_SIGNALS,
@@ -125,39 +126,50 @@ static guint __signals[SIG_N_SIGNALS] = { 0 };
G_DEFINE_TYPE_WITH_PRIVATE (PowerManagerButton, power_manager_button, GTK_TYPE_TOGGLE_BUTTON)
-static void power_manager_button_finalize (GObject *object);
-static GList* find_device_in_list (PowerManagerButton *button,
- const gchar *object_path);
-static gboolean power_manager_button_device_icon_draw (GtkWidget *img,
- cairo_t *cr,
- gpointer userdata);
-static void power_manager_button_set_icon (PowerManagerButton *button);
-static void power_manager_button_set_label (PowerManagerButton *button,
- gdouble percentage,
- guint64 time_to_empty_or_full);
+static void
+power_manager_button_finalize (GObject *object);
+static GList *
+find_device_in_list (PowerManagerButton *button,
+ const gchar *object_path);
+static gboolean
+power_manager_button_device_icon_draw (GtkWidget *img,
+ cairo_t *cr,
+ gpointer userdata);
+static void
+power_manager_button_set_icon (PowerManagerButton *button);
+static void
+power_manager_button_set_label (PowerManagerButton *button,
+ gdouble percentage,
+ guint64 time_to_empty_or_full);
#ifdef XFCE_PLUGIN
-static void power_manager_button_toggle_presentation_mode (GtkMenuItem *mi,
- GtkSwitch *sw);
-static void power_manager_button_update_presentation_indicator (PowerManagerButton *button);
+static void
+power_manager_button_toggle_presentation_mode (GtkMenuItem *mi,
+ GtkSwitch *sw);
+static void
+power_manager_button_update_presentation_indicator (PowerManagerButton *button);
#endif
-static void power_manager_button_update_label (PowerManagerButton *button,
- UpDevice *device);
-static gboolean power_manager_button_press_event (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean power_manager_button_menu_add_device (PowerManagerButton *button,
- BatteryDevice *battery_device,
- gboolean append);
-static void battery_device_remove_surface (BatteryDevice *battery_device);
+static void
+power_manager_button_update_label (PowerManagerButton *button,
+ UpDevice *device);
+static gboolean
+power_manager_button_press_event (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean
+power_manager_button_menu_add_device (PowerManagerButton *button,
+ BatteryDevice *battery_device,
+ gboolean append);
+static void
+battery_device_remove_surface (BatteryDevice *battery_device);
-static BatteryDevice*
+static BatteryDevice *
get_display_device (PowerManagerButton *button)
{
GList *item = NULL;
gdouble highest_percentage = 0;
BatteryDevice *display_device = NULL;
- g_return_val_if_fail (POWER_MANAGER_IS_BUTTON(button), NULL);
+ g_return_val_if_fail (POWER_MANAGER_IS_BUTTON (button), NULL);
if (button->priv->display_device)
{
@@ -176,7 +188,7 @@ get_display_device (PowerManagerButton *button)
guint type = 0;
gdouble percentage;
- if (!battery_device->device || !UP_IS_DEVICE(battery_device->device))
+ if (!battery_device->device || !UP_IS_DEVICE (battery_device->device))
{
continue;
}
@@ -199,12 +211,13 @@ get_display_device (PowerManagerButton *button)
return display_device;
}
-static GList*
-find_device_in_list (PowerManagerButton *button, const gchar *object_path)
+static GList *
+find_device_in_list (PowerManagerButton *button,
+ const gchar *object_path)
{
GList *item = NULL;
- g_return_val_if_fail ( POWER_MANAGER_IS_BUTTON(button), NULL );
+ g_return_val_if_fail (POWER_MANAGER_IS_BUTTON (button), NULL);
for (item = g_list_first (button->priv->devices); item != NULL; item = g_list_next (item))
{
@@ -227,7 +240,7 @@ power_manager_button_set_icon (PowerManagerButton *button)
{
g_return_if_fail (GTK_IS_WIDGET (button->priv->panel_presentation_mode));
- if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), button->priv->panel_icon_name))
+ if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), button->priv->panel_icon_name))
gtk_image_set_from_icon_name (GTK_IMAGE (button->priv->panel_icon_image), button->priv->panel_icon_name, GTK_ICON_SIZE_BUTTON);
else
gtk_image_set_from_icon_name (GTK_IMAGE (button->priv->panel_icon_image), button->priv->panel_fallback_icon_name, GTK_ICON_SIZE_BUTTON);
@@ -259,9 +272,9 @@ power_manager_button_set_tooltip (PowerManagerButton *button)
if (display_device)
{
/* if we have something, display it */
- if( display_device->details )
+ if (display_device->details)
{
- button->priv->tooltip = g_strdup(display_device->details);
+ button->priv->tooltip = g_strdup (display_device->details);
gtk_widget_set_tooltip_markup (GTK_WIDGET (button), display_device->details);
/* Tooltip changed! */
g_signal_emit (button, __signals[SIG_TOOLTIP_CHANGED], 0);
@@ -289,16 +302,17 @@ power_manager_button_get_tooltip (PowerManagerButton *button)
}
static void
-power_manager_button_set_label (PowerManagerButton *button, gdouble percentage,
+power_manager_button_set_label (PowerManagerButton *button,
+ gdouble percentage,
guint64 time_to_empty_or_full)
{
gchar *label_string = NULL;
- gint hours;
- gint minutes;
+ gint hours;
+ gint minutes;
gchar *remaining_time = NULL;
/* Create the short timestring in the format hh:mm */
- minutes = (int) ( ( time_to_empty_or_full / 60.0 ) + 0.5 );
+ minutes = (int) ((time_to_empty_or_full / 60.0) + 0.5);
if (minutes < 60)
{
if (minutes < 10)
@@ -331,7 +345,9 @@ power_manager_button_set_label (PowerManagerButton *button, gdouble percentage,
}
static gboolean
-power_manager_button_device_icon_draw (GtkWidget *img, cairo_t *cr, gpointer userdata)
+power_manager_button_device_icon_draw (GtkWidget *img,
+ cairo_t *cr,
+ gpointer userdata)
{
UpDevice *device = NULL;
guint type = 0, state = 0;
@@ -348,7 +364,7 @@ power_manager_button_device_icon_draw (GtkWidget *img, cairo_t *cr, gpointer use
if (UP_IS_DEVICE (userdata))
{
- device = UP_DEVICE(userdata);
+ device = UP_DEVICE (userdata);
g_object_get (device,
"kind", &type,
@@ -388,17 +404,17 @@ power_manager_button_device_icon_draw (GtkWidget *img, cairo_t *cr, gpointer use
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
if ((height * (percentage / 100)) > min_height)
- min_height = (height - 3) * (percentage / 100);
+ min_height = (height - 3) * (percentage / 100);
cairo_rectangle (cr, width - 3, allocation.y + height - min_height - 1, 4, min_height);
if (percentage > 5 && percentage < 20)
- cairo_set_source_rgb (cr, 0.93, 0.83, 0.0);
+ cairo_set_source_rgb (cr, 0.93, 0.83, 0.0);
else if (percentage > 20 && percentage < 100)
- cairo_set_source_rgb (cr, 0.2, 0.4, 0.64);
+ cairo_set_source_rgb (cr, 0.2, 0.4, 0.64);
else if (percentage == 100)
- cairo_set_source_rgb (cr, 0.45, 0.82, 0.08);
+ cairo_set_source_rgb (cr, 0.45, 0.82, 0.08);
else
- cairo_set_source_rgb (cr, 0.94, 0.16, 0.16);
+ cairo_set_source_rgb (cr, 0.94, 0.16, 0.16);
cairo_fill (cr);
cairo_rectangle (cr, width - 2.5, allocation.y + 2.5, 3, height - 4);
@@ -410,7 +426,7 @@ power_manager_button_device_icon_draw (GtkWidget *img, cairo_t *cr, gpointer use
/* Draw a bubble with a question mark for devices with unknown state */
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_set_line_width (cr, 1.0);
- cairo_arc(cr, width - 4.5, allocation.y + 6.5, 6, 0, 2*3.14159);
+ cairo_arc (cr, width - 4.5, allocation.y + 6.5, 6, 0, 2 * 3.14159);
cairo_set_source_rgb (cr, 0.2, 0.54, 0.9);
cairo_fill_preserve (cr);
cairo_set_source_rgb (cr, 0.1, 0.37, 0.6);
@@ -432,17 +448,18 @@ power_manager_button_device_icon_draw (GtkWidget *img, cairo_t *cr, gpointer use
static void
-power_manager_button_update_device_icon_and_details (PowerManagerButton *button, UpDevice *device)
+power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
+ UpDevice *device)
{
- GList *item;
- BatteryDevice *battery_device;
- BatteryDevice *display_device;
- const gchar *object_path = up_device_get_object_path(device);
- gchar *details = NULL;
- gchar *icon_name = NULL;
- gchar *menu_icon_name = NULL;
- gint scale_factor;
- GdkPixbuf *pix;
+ GList *item;
+ BatteryDevice *battery_device;
+ BatteryDevice *display_device;
+ const gchar *object_path = up_device_get_object_path (device);
+ gchar *details = NULL;
+ gchar *icon_name = NULL;
+ gchar *menu_icon_name = NULL;
+ gint scale_factor;
+ GdkPixbuf *pix;
cairo_surface_t *surface = NULL;
if (!POWER_MANAGER_IS_BUTTON (button))
@@ -463,7 +480,7 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
}
/* If UPower doesn't give us an icon, just use the default */
- if (g_strcmp0(menu_icon_name, "") == 0)
+ if (g_strcmp0 (menu_icon_name, "") == 0)
{
/* ignore empty icon names */
g_free (menu_icon_name);
@@ -479,7 +496,7 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
32,
scale_factor,
GTK_ICON_LOOKUP_USE_BUILTIN
- | GTK_ICON_LOOKUP_FORCE_SIZE,
+ | GTK_ICON_LOOKUP_FORCE_SIZE,
NULL);
if (G_LIKELY (pix != NULL))
{
@@ -495,7 +512,7 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
battery_device->details = details;
/* If we had an image before, remove it and the callback */
- battery_device_remove_surface(battery_device);
+ battery_device_remove_surface (battery_device);
battery_device->surface = surface;
@@ -532,9 +549,9 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
battery_device->img = gtk_image_new_from_surface (battery_device->surface);
g_object_ref (battery_device->img);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(battery_device->menu_item), battery_device->img);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (battery_device->menu_item), battery_device->img);
+ G_GNUC_END_IGNORE_DEPRECATIONS
battery_device->expose_signal_id = g_signal_connect_after (G_OBJECT (battery_device->img),
"draw",
G_CALLBACK (power_manager_button_device_icon_draw),
@@ -543,20 +560,23 @@ G_GNUC_END_IGNORE_DEPRECATIONS
}
static void
-device_changed_cb (UpDevice *device, GParamSpec *pspec, PowerManagerButton *button)
+device_changed_cb (UpDevice *device,
+ GParamSpec *pspec,
+ PowerManagerButton *button)
{
- power_manager_button_update_device_icon_and_details (button, device);
+ power_manager_button_update_device_icon_and_details (button, device);
}
static void
-power_manager_button_add_device (UpDevice *device, PowerManagerButton *button)
+power_manager_button_add_device (UpDevice *device,
+ PowerManagerButton *button)
{
BatteryDevice *battery_device;
guint type = 0;
- const gchar *object_path = up_device_get_object_path(device);
+ const gchar *object_path = up_device_get_object_path (device);
gulong signal_id;
- g_return_if_fail (POWER_MANAGER_IS_BUTTON (button ));
+ g_return_if_fail (POWER_MANAGER_IS_BUTTON (button));
/* don't add the same device twice */
if (find_device_in_list (button, object_path))
@@ -574,7 +594,7 @@ power_manager_button_add_device (UpDevice *device, PowerManagerButton *button)
/* populate the struct */
battery_device->object_path = g_strdup (object_path);
battery_device->changed_signal_id = signal_id;
- battery_device->device = g_object_ref(device);
+ battery_device->device = g_object_ref (device);
/* add it to the list */
button->priv->devices = g_list_append (button->priv->devices, battery_device);
@@ -604,8 +624,8 @@ battery_device_remove_surface (BatteryDevice *battery_device)
{
if (battery_device->expose_signal_id != 0)
{
- g_signal_handler_disconnect (battery_device->img, battery_device->expose_signal_id);
- battery_device->expose_signal_id = 0;
+ g_signal_handler_disconnect (battery_device->img, battery_device->expose_signal_id);
+ battery_device->expose_signal_id = 0;
}
g_object_unref (battery_device->img);
battery_device->img = NULL;
@@ -616,7 +636,8 @@ battery_device_remove_surface (BatteryDevice *battery_device)
}
static void
-remove_battery_device (PowerManagerButton *button, BatteryDevice *battery_device)
+remove_battery_device (PowerManagerButton *button,
+ BatteryDevice *battery_device)
{
g_return_if_fail (POWER_MANAGER_IS_BUTTON (button));
g_return_if_fail (battery_device != NULL);
@@ -630,7 +651,7 @@ remove_battery_device (PowerManagerButton *button, BatteryDevice *battery_device
battery_device_remove_surface (battery_device);
- if (battery_device->device != NULL && UP_IS_DEVICE(battery_device->device))
+ if (battery_device->device != NULL && UP_IS_DEVICE (battery_device->device))
{
/* disconnect the signal handler if we were using it */
if (battery_device->changed_signal_id != 0)
@@ -645,7 +666,8 @@ remove_battery_device (PowerManagerButton *button, BatteryDevice *battery_device
}
static void
-power_manager_button_remove_device (PowerManagerButton *button, const gchar *object_path)
+power_manager_button_remove_device (PowerManagerButton *button,
+ const gchar *object_path)
{
GList *item;
BatteryDevice *battery_device;
@@ -665,13 +687,17 @@ power_manager_button_remove_device (PowerManagerButton *button, const gchar *obj
}
static void
-device_added_cb (UpClient *upower, UpDevice *device, PowerManagerButton *button)
+device_added_cb (UpClient *upower,
+ UpDevice *device,
+ PowerManagerButton *button)
{
power_manager_button_add_device (device, button);
}
static void
-device_removed_cb (UpClient *upower, const gchar *object_path, PowerManagerButton *button)
+device_removed_cb (UpClient *upower,
+ const gchar *object_path,
+ PowerManagerButton *button)
{
power_manager_button_remove_device (button, object_path);
}
@@ -725,7 +751,8 @@ power_manager_button_remove_all_devices (PowerManagerButton *button)
}
static gboolean
-power_manager_button_scroll_event (GtkWidget *widget, GdkEventScroll *ev)
+power_manager_button_scroll_event (GtkWidget *widget,
+ GdkEventScroll *ev)
{
PowerManagerButton *button = POWER_MANAGER_BUTTON (widget);
@@ -734,8 +761,8 @@ power_manager_button_scroll_event (GtkWidget *widget, GdkEventScroll *ev)
if (ev->direction == GDK_SCROLL_UP || ev->direction == GDK_SCROLL_DOWN)
{
- gboolean (*scroll_brightness) (XfpmBrightness *) =
- ev->direction == GDK_SCROLL_UP ? xfpm_brightness_increase : xfpm_brightness_decrease;
+ gboolean (*scroll_brightness) (XfpmBrightness *) = ev->direction == GDK_SCROLL_UP ? xfpm_brightness_increase
+ : xfpm_brightness_decrease;
if (scroll_brightness (button->priv->brightness) && button->priv->range != NULL)
{
gint32 level;
@@ -768,12 +795,12 @@ power_manager_button_set_property (GObject *object,
case PROP_PRESENTATION_MODE:
button->priv->presentation_mode = g_value_get_boolean (value);
if (GTK_IS_WIDGET (button->priv->panel_presentation_mode))
- power_manager_button_update_presentation_indicator (button);
+ power_manager_button_update_presentation_indicator (button);
break;
case PROP_SHOW_PRESENTATION_INDICATOR:
button->priv->show_presentation_indicator = g_value_get_boolean (value);
if (GTK_IS_WIDGET (button->priv->panel_presentation_mode))
- power_manager_button_update_presentation_indicator (button);
+ power_manager_button_update_presentation_indicator (button);
break;
#else
case PROP_SHOW_PANEL_LABEL:
@@ -788,16 +815,16 @@ power_manager_button_set_property (GObject *object,
}
static void
-power_manager_button_get_property(GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+power_manager_button_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
#ifdef XFCE_PLUGIN
PowerManagerButton *button = POWER_MANAGER_BUTTON (object);
#endif
- switch(property_id)
+ switch (property_id)
{
#ifdef XFCE_PLUGIN
case PROP_SHOW_PANEL_LABEL:
@@ -853,8 +880,7 @@ power_manager_button_class_init (PowerManagerButtonClass *klass)
__signals[SIG_TOOLTIP_CHANGED] = g_signal_new ("tooltip-changed",
POWER_MANAGER_TYPE_BUTTON,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(PowerManagerButtonClass,
- tooltip_changed),
+ G_STRUCT_OFFSET (PowerManagerButtonClass, tooltip_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@@ -862,17 +888,16 @@ power_manager_button_class_init (PowerManagerButtonClass *klass)
__signals[SIG_ICON_NAME_CHANGED] = g_signal_new ("icon-name-changed",
POWER_MANAGER_TYPE_BUTTON,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(PowerManagerButtonClass,
- icon_name_changed),
+ G_STRUCT_OFFSET (PowerManagerButtonClass, icon_name_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
-#define XFPM_PARAM_FLAGS (G_PARAM_READWRITE \
- | G_PARAM_CONSTRUCT \
- | G_PARAM_STATIC_NAME \
- | G_PARAM_STATIC_NICK \
- | G_PARAM_STATIC_BLURB)
+#define XFPM_PARAM_FLAGS (G_PARAM_READWRITE \
+ | G_PARAM_CONSTRUCT \
+ | G_PARAM_STATIC_NAME \
+ | G_PARAM_STATIC_NICK \
+ | G_PARAM_STATIC_BLURB)
g_object_class_install_property (object_class, PROP_SHOW_PANEL_LABEL,
g_param_spec_int (SHOW_PANEL_LABEL,
@@ -929,8 +954,8 @@ power_manager_button_init (PowerManagerButton *button)
button->priv->brightness = xfpm_brightness_new ();
button->priv->set_level_timeout = 0;
- button->priv->upower = up_client_new ();
- if ( !xfconf_init (&error) )
+ button->priv->upower = up_client_new ();
+ if (!xfconf_init (&error))
{
if (error)
{
@@ -1008,7 +1033,7 @@ power_manager_button_finalize (GObject *object)
g_object_unref (button->priv->brightness);
if (button->priv->set_level_timeout)
{
- g_source_remove(button->priv->set_level_timeout);
+ g_source_remove (button->priv->set_level_timeout);
button->priv->set_level_timeout = 0;
}
@@ -1040,7 +1065,7 @@ GtkWidget *
power_manager_button_new (XfcePanelPlugin *plugin)
#endif
#ifdef XFPM_SYSTRAY
-power_manager_button_new (void)
+ power_manager_button_new (void)
#endif
{
PowerManagerButton *button = NULL;
@@ -1060,7 +1085,8 @@ power_manager_button_new (void)
}
static gboolean
-power_manager_button_press_event (GtkWidget *widget, GdkEventButton *event)
+power_manager_button_press_event (GtkWidget *widget,
+ GdkEventButton *event)
{
PowerManagerButton *button = POWER_MANAGER_BUTTON (widget);
@@ -1085,7 +1111,9 @@ power_manager_button_press_event (GtkWidget *widget, GdkEventButton *event)
#ifdef XFCE_PLUGIN
static void
-power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerManagerButton *button)
+power_manager_button_size_changed_cb (XfcePanelPlugin *plugin,
+ gint size,
+ PowerManagerButton *button)
{
g_return_if_fail (POWER_MANAGER_IS_BUTTON (button));
g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin));
@@ -1104,20 +1132,23 @@ power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerM
}
static void
-power_manager_button_style_update_cb (XfcePanelPlugin *plugin, PowerManagerButton *button)
+power_manager_button_style_update_cb (XfcePanelPlugin *plugin,
+ PowerManagerButton *button)
{
gtk_widget_reset_style (GTK_WIDGET (plugin));
power_manager_button_size_changed_cb (plugin, xfce_panel_plugin_get_size (plugin), button);
}
static void
-power_manager_button_free_data_cb (XfcePanelPlugin *plugin, PowerManagerButton *button)
+power_manager_button_free_data_cb (XfcePanelPlugin *plugin,
+ PowerManagerButton *button)
{
gtk_widget_destroy (GTK_WIDGET (button));
}
static void
-about_cb (GtkMenuItem *menuitem, gpointer user_data)
+about_cb (GtkMenuItem *menuitem,
+ gpointer user_data)
{
xfpm_about ("org.xfce.powermanager");
}
@@ -1172,10 +1203,10 @@ power_manager_button_show (PowerManagerButton *button)
G_CALLBACK (power_manager_button_free_data_cb), button);
#endif
- gtk_widget_show_all (GTK_WIDGET(button));
+ gtk_widget_show_all (GTK_WIDGET (button));
- gtk_widget_set_visible (button->priv->panel_presentation_mode, button->priv->presentation_mode &&
- button->priv->show_presentation_indicator);
+ gtk_widget_set_visible (button->priv->panel_presentation_mode,
+ button->priv->presentation_mode && button->priv->show_presentation_indicator);
power_manager_button_update_label (button, button->priv->display_device);
power_manager_button_set_tooltip (button);
@@ -1189,13 +1220,14 @@ power_manager_button_update_presentation_indicator (PowerManagerButton *button)
{
gtk_image_set_pixel_size (GTK_IMAGE (button->priv->panel_presentation_mode), button->priv->panel_icon_width);
- gtk_widget_set_visible (button->priv->panel_presentation_mode, button->priv->presentation_mode &&
- button->priv->show_presentation_indicator);
+ gtk_widget_set_visible (button->priv->panel_presentation_mode,
+ button->priv->presentation_mode && button->priv->show_presentation_indicator);
}
#endif
static void
-power_manager_button_update_label (PowerManagerButton *button, UpDevice *device)
+power_manager_button_update_label (PowerManagerButton *button,
+ UpDevice *device)
{
guint state;
gdouble percentage;
@@ -1203,7 +1235,7 @@ power_manager_button_update_label (PowerManagerButton *button, UpDevice *device)
guint64 time_to_full;
if (!POWER_MANAGER_IS_BUTTON (button) || !UP_IS_DEVICE (device))
- return;
+ return;
#ifdef XFCE_PLUGIN
if (button->priv->show_panel_label == PANEL_LABEL_NONE)
@@ -1240,7 +1272,8 @@ power_manager_button_update_label (PowerManagerButton *button, UpDevice *device)
}
static void
-menu_destroyed_cb(GtkMenuShell *menu, gpointer user_data)
+menu_destroyed_cb (GtkMenuShell *menu,
+ gpointer user_data)
{
PowerManagerButton *button = POWER_MANAGER_BUTTON (user_data);
@@ -1248,7 +1281,7 @@ menu_destroyed_cb(GtkMenuShell *menu, gpointer user_data)
button->priv->range = NULL;
/* untoggle panel icon */
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), FALSE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
gtk_menu_detach (GTK_MENU (button->priv->menu));
@@ -1256,7 +1289,8 @@ menu_destroyed_cb(GtkMenuShell *menu, gpointer user_data)
}
static void
-menu_item_destroyed_cb(GtkWidget *object, gpointer user_data)
+menu_item_destroyed_cb (GtkWidget *object,
+ gpointer user_data)
{
PowerManagerButton *button = POWER_MANAGER_BUTTON (user_data);
GList *item;
@@ -1274,7 +1308,8 @@ menu_item_destroyed_cb(GtkWidget *object, gpointer user_data)
}
static void
-menu_item_activate_cb(GtkWidget *object, gpointer user_data)
+menu_item_activate_cb (GtkWidget *object,
+ gpointer user_data)
{
PowerManagerButton *button = POWER_MANAGER_BUTTON (user_data);
GList *item;
@@ -1293,7 +1328,9 @@ menu_item_activate_cb(GtkWidget *object, gpointer user_data)
}
static gboolean
-power_manager_button_menu_add_device (PowerManagerButton *button, BatteryDevice *battery_device, gboolean append)
+power_manager_button_menu_add_device (PowerManagerButton *button,
+ BatteryDevice *battery_device,
+ gboolean append)
{
GtkWidget *mi, *label;
guint type = 0;
@@ -1316,41 +1353,42 @@ power_manager_button_menu_add_device (PowerManagerButton *button, BatteryDevice
return FALSE;
}
}
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- mi = gtk_image_menu_item_new_with_label(battery_device->details);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ mi = gtk_image_menu_item_new_with_label (battery_device->details);
+ G_GNUC_END_IGNORE_DEPRECATIONS
/* Make the menu item be bold and multi-line */
label = gtk_bin_get_child (GTK_BIN (mi));
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
/* add the image */
battery_device->img = gtk_image_new_from_surface (battery_device->surface);
g_object_ref (battery_device->img);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), battery_device->img);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), battery_device->img);
+ G_GNUC_END_IGNORE_DEPRECATIONS
/* keep track of the menu item in the battery_device so we can update it */
battery_device->menu_item = mi;
- g_signal_connect(G_OBJECT (mi), "destroy", G_CALLBACK (menu_item_destroyed_cb), button);
+ g_signal_connect (G_OBJECT (mi), "destroy", G_CALLBACK (menu_item_destroyed_cb), button);
battery_device->expose_signal_id = g_signal_connect_after (G_OBJECT (battery_device->img),
"draw",
G_CALLBACK (power_manager_button_device_icon_draw),
battery_device->device);
/* Active calls xfpm settings with the device's id to display details */
- g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menu_item_activate_cb), button);
+ g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (menu_item_activate_cb), button);
/* Add it to the menu */
gtk_widget_show (mi);
if (append)
- gtk_menu_shell_append (GTK_MENU_SHELL(button->priv->menu), mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (button->priv->menu), mi);
else
- gtk_menu_shell_prepend (GTK_MENU_SHELL(button->priv->menu), mi);
+ gtk_menu_shell_prepend (GTK_MENU_SHELL (button->priv->menu), mi);
return TRUE;
}
static void
-add_inhibitor_to_menu (PowerManagerButton *button, const gchar *text)
+add_inhibitor_to_menu (PowerManagerButton *button,
+ const gchar *text)
{
GtkWidget *mi, *img;
@@ -1360,24 +1398,25 @@ add_inhibitor_to_menu (PowerManagerButton *button, const gchar *text)
*/
gchar *label = g_strdup_printf (_("%s is currently inhibiting power management"), text);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- mi = gtk_image_menu_item_new_with_label(label);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ mi = gtk_image_menu_item_new_with_label (label);
+ G_GNUC_END_IGNORE_DEPRECATIONS
/* add the image */
img = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_MENU);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
+ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_set_can_focus (mi, FALSE);
gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL(button->priv->menu), mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (button->priv->menu), mi);
g_free (label);
}
#ifdef XFCE_PLUGIN
static void
-display_inhibitors (PowerManagerButton *button, GtkWidget *menu)
+display_inhibitors (PowerManagerButton *button,
+ GtkWidget *menu)
{
GtkWidget *separator_mi;
gboolean needs_seperator = FALSE;
@@ -1388,7 +1427,7 @@ display_inhibitors (PowerManagerButton *button, GtkWidget *menu)
if (button->priv->inhibit_proxy)
{
GVariant *reply;
- GError *error = NULL;
+ GError *error = NULL;
reply = g_dbus_proxy_call_sync (button->priv->inhibit_proxy,
"GetInhibitors",
@@ -1401,7 +1440,7 @@ display_inhibitors (PowerManagerButton *button, GtkWidget *menu)
if (reply != NULL)
{
GVariantIter *iter;
- gchar *value;
+ gchar *value;
g_variant_get (reply, "(as)", &iter);
@@ -1417,8 +1456,9 @@ display_inhibitors (PowerManagerButton *button, GtkWidget *menu)
}
g_variant_iter_free (iter);
g_variant_unref (reply);
-
- } else {
+ }
+ else
+ {
g_warning ("failed calling GetInhibitors: %s", error->message);
g_clear_error (&error);
}
@@ -1434,7 +1474,8 @@ display_inhibitors (PowerManagerButton *button, GtkWidget *menu)
}
#else
static void
-display_inhibitors (PowerManagerButton *button, GtkWidget *menu)
+display_inhibitors (PowerManagerButton *button,
+ GtkWidget *menu)
{
guint i;
GtkWidget *separator_mi;
@@ -1446,7 +1487,7 @@ display_inhibitors (PowerManagerButton *button, GtkWidget *menu)
inhibitors = xfpm_inhibit_get_inhibit_list (button->priv->inhibit);
if (inhibitors != NULL && inhibitors[0] != NULL)
{
- for (i=0; inhibitors[i] != NULL; i++)
+ for (i = 0; inhibitors[i] != NULL; i++)
{
add_inhibitor_to_menu (button, inhibitors[i]);
}
@@ -1477,7 +1518,7 @@ brightness_set_level_with_timeout (PowerManagerButton *button)
if (button->priv->set_level_timeout)
{
- g_source_remove(button->priv->set_level_timeout);
+ g_source_remove (button->priv->set_level_timeout);
button->priv->set_level_timeout = 0;
}
@@ -1485,20 +1526,22 @@ brightness_set_level_with_timeout (PowerManagerButton *button)
}
static void
-range_value_changed_cb (PowerManagerButton *button, GtkWidget *widget)
+range_value_changed_cb (PowerManagerButton *button,
+ GtkWidget *widget)
{
if (button->priv->set_level_timeout)
return;
- button->priv->set_level_timeout =
- g_timeout_add (SET_LEVEL_TIMEOUT,
- (GSourceFunc) brightness_set_level_with_timeout, button);
+ button->priv->set_level_timeout = g_timeout_add (SET_LEVEL_TIMEOUT,
+ (GSourceFunc) brightness_set_level_with_timeout,
+ button);
}
static void
-range_show_cb (GtkWidget *widget, PowerManagerButton *button)
+range_show_cb (GtkWidget *widget,
+ PowerManagerButton *button)
{
- GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default());
+ GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default ());
GdkDevice *pointer = gdk_seat_get_pointer (seat);
/* Release these grabs as they will cause a lockup if pkexec is called
@@ -1513,7 +1556,8 @@ range_show_cb (GtkWidget *widget, PowerManagerButton *button)
#ifdef XFCE_PLUGIN
static void
-power_manager_button_toggle_presentation_mode (GtkMenuItem *mi, GtkSwitch *sw)
+power_manager_button_toggle_presentation_mode (GtkMenuItem *mi,
+ GtkSwitch *sw)
{
g_return_if_fail (GTK_IS_SWITCH (sw));
@@ -1536,15 +1580,16 @@ power_manager_button_show_menu (PowerManagerButton *button)
g_return_if_fail (POWER_MANAGER_IS_BUTTON (button));
if (gtk_widget_has_screen (GTK_WIDGET (button)))
- gscreen = gtk_widget_get_screen(GTK_WIDGET(button));
+ gscreen = gtk_widget_get_screen (GTK_WIDGET (button));
else
- gscreen = gdk_display_get_default_screen(gdk_display_get_default());
+ gscreen = gdk_display_get_default_screen (gdk_display_get_default ());
menu = gtk_menu_new ();
- gtk_menu_set_screen(GTK_MENU(menu), gscreen);
+ gtk_menu_set_screen (GTK_MENU (menu), gscreen);
+
/* keep track of the menu while it's being displayed */
button->priv->menu = menu;
- g_signal_connect(GTK_MENU_SHELL(menu), "deactivate", G_CALLBACK(menu_destroyed_cb), button);
+ g_signal_connect (GTK_MENU_SHELL (menu), "deactivate", G_CALLBACK (menu_destroyed_cb), button);
gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (button), NULL);
for (item = g_list_first (button->priv->devices); item != NULL; item = g_list_next (item))
@@ -1591,12 +1636,12 @@ power_manager_button_show_menu (PowerManagerButton *button)
/* load and display the brightness icon and force it to 32px size */
img = gtk_image_new_from_icon_name (XFPM_DISPLAY_BRIGHTNESS_ICON, GTK_ICON_SIZE_DND);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), img);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
+ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_image_set_pixel_size (GTK_IMAGE (img), 32);
gtk_widget_show_all (mi);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
}
/* Presentation mode checkbox */
@@ -1629,16 +1674,18 @@ G_GNUC_END_IGNORE_DEPRECATIONS
/* Power manager settings */
mi = gtk_menu_item_new_with_mnemonic (_("_Settings..."));
gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), mi);
- g_signal_connect (G_OBJECT(mi), "activate", G_CALLBACK(xfpm_preferences), NULL);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (xfpm_preferences), NULL);
gtk_menu_popup_at_widget (GTK_MENU (menu),
GTK_WIDGET (button),
#ifdef XFCE_PLUGIN
xfce_panel_plugin_get_orientation (button->priv->plugin) == GTK_ORIENTATION_VERTICAL
- ? GDK_GRAVITY_WEST : GDK_GRAVITY_NORTH,
+ ? GDK_GRAVITY_WEST
+ : GDK_GRAVITY_NORTH,
xfce_panel_plugin_get_orientation (button->priv->plugin) == GTK_ORIENTATION_VERTICAL
- ? GDK_GRAVITY_EAST : GDK_GRAVITY_SOUTH,
+ ? GDK_GRAVITY_EAST
+ : GDK_GRAVITY_SOUTH,
#else
GDK_GRAVITY_NORTH,
GDK_GRAVITY_SOUTH,
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.h b/panel-plugins/power-manager-plugin/power-manager-button.h
index e4daa5e15f4897c70661a6e9ea156e3fb4584025..119ecfa574524674673a15b496bffefcaebdbebd 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.h
+++ b/panel-plugins/power-manager-plugin/power-manager-button.h
@@ -30,15 +30,15 @@
G_BEGIN_DECLS
-#define POWER_MANAGER_TYPE_BUTTON (power_manager_button_get_type () )
-#define POWER_MANAGER_BUTTON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), POWER_MANAGER_TYPE_BUTTON, PowerManagerButton))
-#define POWER_MANAGER_IS_BUTTON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), POWER_MANAGER_TYPE_BUTTON))
+#define POWER_MANAGER_TYPE_BUTTON (power_manager_button_get_type ())
+#define POWER_MANAGER_BUTTON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), POWER_MANAGER_TYPE_BUTTON, PowerManagerButton))
+#define POWER_MANAGER_IS_BUTTON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), POWER_MANAGER_TYPE_BUTTON))
typedef struct PowerManagerButtonPrivate PowerManagerButtonPrivate;
typedef struct
{
- GtkToggleButton parent;
+ GtkToggleButton parent;
PowerManagerButtonPrivate *priv;
} PowerManagerButton;
@@ -48,21 +48,28 @@ typedef struct
GtkToggleButtonClass parent_class;
/*< Signals >*/
- void (*tooltip_changed) (PowerManagerButton *button);
- void (*icon_name_changed)(PowerManagerButton *button);
+ void (*tooltip_changed) (PowerManagerButton *button);
+ void (*icon_name_changed) (PowerManagerButton *button);
} PowerManagerButtonClass;
-GType power_manager_button_get_type (void) G_GNUC_CONST;
+GType
+power_manager_button_get_type (void) G_GNUC_CONST;
#ifdef XFCE_PLUGIN
-GtkWidget *power_manager_button_new (XfcePanelPlugin *plugin);
+GtkWidget *
+power_manager_button_new (XfcePanelPlugin *plugin);
#endif
#ifdef XFPM_SYSTRAY
-GtkWidget *power_manager_button_new (void);
+GtkWidget *
+power_manager_button_new (void);
#endif
-void power_manager_button_show (PowerManagerButton *button);
-void power_manager_button_show_menu (PowerManagerButton *button);
-const gchar *power_manager_button_get_icon_name (PowerManagerButton *button);
-const gchar *power_manager_button_get_tooltip (PowerManagerButton *button);
+void
+power_manager_button_show (PowerManagerButton *button);
+void
+power_manager_button_show_menu (PowerManagerButton *button);
+const gchar *
+power_manager_button_get_icon_name (PowerManagerButton *button);
+const gchar *
+power_manager_button_get_tooltip (PowerManagerButton *button);
G_END_DECLS
diff --git a/panel-plugins/power-manager-plugin/scalemenuitem.c b/panel-plugins/power-manager-plugin/scalemenuitem.c
index 4b3b3d5cc39dc49bf418c9a3b9c314f8aa8bdc92..13bd1025ac3bc63378b87c653b845a72e412b8fb 100644
--- a/panel-plugins/power-manager-plugin/scalemenuitem.c
+++ b/panel-plugins/power-manager-plugin/scalemenuitem.c
@@ -34,34 +34,41 @@
-static gboolean scale_menu_item_button_press_event (GtkWidget *menuitem,
- GdkEventButton *event);
-static gboolean scale_menu_item_button_release_event (GtkWidget *menuitem,
- GdkEventButton *event);
-static gboolean scale_menu_item_motion_notify_event (GtkWidget *menuitem,
- GdkEventMotion *event);
-static gboolean scale_menu_item_grab_broken (GtkWidget *menuitem,
- GdkEventGrabBroken *event);
-static void scale_menu_item_parent_set (GtkWidget *item,
- GtkWidget *previous_parent);
-static void update_packing (ScaleMenuItem * self);
-
-
-
-
-struct _ScaleMenuItemPrivate {
- GtkWidget *scale;
- GtkWidget *description_label;
- GtkWidget *percentage_label;
- GtkWidget *vbox;
- GtkWidget *hbox;
- gboolean grabbed;
- gboolean ignore_value_changed;
+static gboolean
+scale_menu_item_button_press_event (GtkWidget *menuitem,
+ GdkEventButton *event);
+static gboolean
+scale_menu_item_button_release_event (GtkWidget *menuitem,
+ GdkEventButton *event);
+static gboolean
+scale_menu_item_motion_notify_event (GtkWidget *menuitem,
+ GdkEventMotion *event);
+static gboolean
+scale_menu_item_grab_broken (GtkWidget *menuitem,
+ GdkEventGrabBroken *event);
+static void
+scale_menu_item_parent_set (GtkWidget *item,
+ GtkWidget *previous_parent);
+static void
+update_packing (ScaleMenuItem *self);
+
+
+
+struct _ScaleMenuItemPrivate
+{
+ GtkWidget *scale;
+ GtkWidget *description_label;
+ GtkWidget *percentage_label;
+ GtkWidget *vbox;
+ GtkWidget *hbox;
+ gboolean grabbed;
+ gboolean ignore_value_changed;
};
-enum {
+enum
+{
SLIDER_GRABBED,
SLIDER_RELEASED,
VALUE_CHANGED,
@@ -70,7 +77,6 @@ enum {
-
static guint signals[LAST_SIGNAL] = { 0 };
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
@@ -81,7 +87,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
static void
scale_menu_item_scale_value_changed (GtkRange *range,
- gpointer user_data)
+ gpointer user_data)
{
ScaleMenuItem *self = user_data;
ScaleMenuItemPrivate *priv = scale_menu_item_get_instance_private (self);
@@ -96,14 +102,14 @@ scale_menu_item_scale_value_changed (GtkRange *range,
static void
scale_menu_item_class_init (ScaleMenuItemClass *item_class)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (item_class);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (item_class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (item_class);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (item_class);
- widget_class->button_press_event = scale_menu_item_button_press_event;
+ widget_class->button_press_event = scale_menu_item_button_press_event;
widget_class->button_release_event = scale_menu_item_button_release_event;
- widget_class->motion_notify_event = scale_menu_item_motion_notify_event;
- widget_class->grab_broken_event = scale_menu_item_grab_broken;
- widget_class->parent_set = scale_menu_item_parent_set;
+ widget_class->motion_notify_event = scale_menu_item_motion_notify_event;
+ widget_class->grab_broken_event = scale_menu_item_grab_broken;
+ widget_class->parent_set = scale_menu_item_parent_set;
/**
@@ -155,9 +161,9 @@ scale_menu_item_class_init (ScaleMenuItemClass *item_class)
static void
remove_children (GtkContainer *container)
{
- GList * children = gtk_container_get_children (container);
- GList * l;
- for (l=children; l!=NULL; l=l->next)
+ GList *children = gtk_container_get_children (container);
+ GList *l;
+ for (l = children; l != NULL; l = l->next)
gtk_container_remove (container, l->data);
g_list_free (children);
}
@@ -169,9 +175,9 @@ update_packing (ScaleMenuItem *self)
GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- if(priv->hbox)
+ if (priv->hbox)
remove_children (GTK_CONTAINER (priv->hbox));
- if(priv->vbox)
+ if (priv->vbox)
{
remove_children (GTK_CONTAINER (priv->vbox));
gtk_container_remove (GTK_CONTAINER (self), priv->vbox);
@@ -183,35 +189,35 @@ update_packing (ScaleMenuItem *self)
/* add the new layout */
if (priv->description_label && priv->percentage_label)
{
- /* [IC] Description
- * [ON] <----slider----> [percentage]%
- */
- gtk_box_pack_start (GTK_BOX (vbox), priv->description_label, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), priv->hbox, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), priv->scale, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), priv->percentage_label, FALSE, FALSE, 0);
+ /* [IC] Description
+ * [ON] <----slider----> [percentage]%
+ */
+ gtk_box_pack_start (GTK_BOX (vbox), priv->description_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), priv->hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->scale, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->percentage_label, FALSE, FALSE, 0);
}
else if (priv->description_label)
{
- /* [IC] Description
- * [ON] <----slider---->
- */
- gtk_box_pack_start (GTK_BOX (vbox), priv->description_label, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), priv->hbox, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), priv->scale, TRUE, TRUE, 0);
+ /* [IC] Description
+ * [ON] <----slider---->
+ */
+ gtk_box_pack_start (GTK_BOX (vbox), priv->description_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), priv->hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->scale, TRUE, TRUE, 0);
}
else if (priv->percentage_label)
{
- /* [ICON] <----slider----> [percentage]% */
- gtk_box_pack_start (GTK_BOX (vbox), priv->hbox, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), priv->scale, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), priv->percentage_label, FALSE, FALSE, 0);
+ /* [ICON] <----slider----> [percentage]% */
+ gtk_box_pack_start (GTK_BOX (vbox), priv->hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->scale, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->percentage_label, FALSE, FALSE, 0);
}
else
{
- /* [ICON] <----slider----> */
- gtk_box_pack_start (GTK_BOX (vbox), priv->hbox, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), priv->scale, TRUE, TRUE, 0);
+ /* [ICON] <----slider----> */
+ gtk_box_pack_start (GTK_BOX (vbox), priv->hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->scale, TRUE, TRUE, 0);
}
gtk_widget_show_all (priv->vbox);
@@ -226,7 +232,7 @@ scale_menu_item_init (ScaleMenuItem *self)
}
static gboolean
-scale_menu_item_button_press_event (GtkWidget *menuitem,
+scale_menu_item_button_press_event (GtkWidget *menuitem,
GdkEventButton *event)
{
ScaleMenuItemPrivate *priv = scale_menu_item_get_instance_private (SCALE_MENU_ITEM (menuitem));
@@ -237,14 +243,13 @@ scale_menu_item_button_press_event (GtkWidget *menuitem,
gtk_widget_translate_coordinates (menuitem, priv->scale, event->x, event->y, &x, &y);
if (x > 0 && x < alloc.width && y > 0 && y < alloc.height)
- gtk_widget_event (priv->scale,
- ((GdkEvent *)(void*)(event)));
+ gtk_widget_event (priv->scale, (GdkEvent *) event);
if (!priv->grabbed)
- {
- priv->grabbed = TRUE;
- g_signal_emit (menuitem, signals[SLIDER_GRABBED], 0);
- }
+ {
+ priv->grabbed = TRUE;
+ g_signal_emit (menuitem, signals[SLIDER_GRABBED], 0);
+ }
return TRUE;
}
@@ -255,19 +260,19 @@ scale_menu_item_button_release_event (GtkWidget *menuitem,
{
ScaleMenuItemPrivate *priv = scale_menu_item_get_instance_private (SCALE_MENU_ITEM (menuitem));
- gtk_widget_event (priv->scale, (GdkEvent*)event);
+ gtk_widget_event (priv->scale, (GdkEvent *) event);
if (priv->grabbed)
- {
- priv->grabbed = FALSE;
- g_signal_emit (menuitem, signals[SLIDER_RELEASED], 0);
- }
+ {
+ priv->grabbed = FALSE;
+ g_signal_emit (menuitem, signals[SLIDER_RELEASED], 0);
+ }
return TRUE;
}
static gboolean
-scale_menu_item_motion_notify_event (GtkWidget *menuitem,
+scale_menu_item_motion_notify_event (GtkWidget *menuitem,
GdkEventMotion *event)
{
ScaleMenuItemPrivate *priv = scale_menu_item_get_instance_private (SCALE_MENU_ITEM (menuitem));
@@ -287,9 +292,8 @@ scale_menu_item_motion_notify_event (GtkWidget *menuitem,
event->y = y;
}
- if (priv->grabbed ||
- (x > 0 && x < alloc.width && y > 0 && y < alloc.height))
- gtk_widget_event (scale, (GdkEvent*)event);
+ if (priv->grabbed || (x > 0 && x < alloc.width && y > 0 && y < alloc.height))
+ gtk_widget_event (scale, (GdkEvent *) event);
return TRUE;
}
@@ -306,16 +310,16 @@ scale_menu_item_grab_broken (GtkWidget *menuitem,
}
static void
-menu_hidden (GtkWidget *menu,
+menu_hidden (GtkWidget *menu,
ScaleMenuItem *scale)
{
ScaleMenuItemPrivate *priv = scale_menu_item_get_instance_private (scale);
if (priv->grabbed)
- {
- priv->grabbed = FALSE;
- g_signal_emit (scale, signals[SLIDER_RELEASED], 0);
- }
+ {
+ priv->grabbed = FALSE;
+ g_signal_emit (scale, signals[SLIDER_RELEASED], 0);
+ }
}
static void
@@ -326,24 +330,24 @@ scale_menu_item_parent_set (GtkWidget *item,
GtkWidget *parent;
if (previous_parent)
- {
- g_signal_handlers_disconnect_by_func (previous_parent, menu_hidden, item);
- }
+ {
+ g_signal_handlers_disconnect_by_func (previous_parent, menu_hidden, item);
+ }
parent = gtk_widget_get_parent (item);
if (parent)
- {
- g_signal_connect (parent, "hide", G_CALLBACK (menu_hidden), item);
- }
+ {
+ g_signal_connect (parent, "hide", G_CALLBACK (menu_hidden), item);
+ }
}
-GtkWidget*
-scale_menu_item_new_with_range (gdouble min,
- gdouble max,
- gdouble step)
+GtkWidget *
+scale_menu_item_new_with_range (gdouble min,
+ gdouble max,
+ gdouble step)
{
ScaleMenuItem *scale_item;
ScaleMenuItemPrivate *priv;
@@ -359,14 +363,17 @@ scale_menu_item_new_with_range (gdouble min,
g_signal_connect (priv->scale, "value-changed", G_CALLBACK (scale_menu_item_scale_value_changed), scale_item);
g_object_ref (priv->scale);
gtk_widget_set_size_request (priv->scale, 100, -1);
- gtk_range_set_inverted (GTK_RANGE(priv->scale), FALSE);
- gtk_scale_set_draw_value (GTK_SCALE(priv->scale), FALSE);
+ gtk_range_set_inverted (GTK_RANGE (priv->scale), FALSE);
+ gtk_scale_set_draw_value (GTK_SCALE (priv->scale), FALSE);
update_packing (scale_item);
- gtk_widget_add_events (GTK_WIDGET(scale_item), GDK_SCROLL_MASK|GDK_POINTER_MOTION_MASK|GDK_BUTTON_MOTION_MASK);
+ gtk_widget_add_events (GTK_WIDGET (scale_item),
+ GDK_SCROLL_MASK
+ | GDK_POINTER_MOTION_MASK
+ | GDK_BUTTON_MOTION_MASK);
- return GTK_WIDGET(scale_item);
+ return GTK_WIDGET (scale_item);
}
/**
@@ -377,7 +384,7 @@ scale_menu_item_new_with_range (gdouble min,
*
* Return Value: (transfer none)
**/
-GtkWidget*
+GtkWidget *
scale_menu_item_get_scale (ScaleMenuItem *menuitem)
{
ScaleMenuItemPrivate *priv;
@@ -397,7 +404,7 @@ scale_menu_item_get_scale (ScaleMenuItem *menuitem)
*
* Return Value: The label text.
**/
-const gchar*
+const gchar *
scale_menu_item_get_description_label (ScaleMenuItem *menuitem)
{
ScaleMenuItemPrivate *priv;
@@ -417,7 +424,7 @@ scale_menu_item_get_description_label (ScaleMenuItem *menuitem)
*
* Return Value: The label text.
**/
-const gchar*
+const gchar *
scale_menu_item_get_percentage_label (ScaleMenuItem *menuitem)
{
ScaleMenuItemPrivate *priv;
@@ -439,7 +446,7 @@ scale_menu_item_get_percentage_label (ScaleMenuItem *menuitem)
**/
void
scale_menu_item_set_description_label (ScaleMenuItem *menuitem,
- const gchar *label)
+ const gchar *label)
{
ScaleMenuItemPrivate *priv;
@@ -448,28 +455,28 @@ scale_menu_item_set_description_label (ScaleMenuItem *menuitem,
priv = scale_menu_item_get_instance_private (menuitem);
if (label == NULL && priv->description_label)
- {
- /* remove label */
- g_object_unref (priv->description_label);
- priv->description_label = NULL;
- return;
- }
+ {
+ /* remove label */
+ g_object_unref (priv->description_label);
+ priv->description_label = NULL;
+ return;
+ }
if (priv->description_label && label)
- {
- gtk_label_set_markup (GTK_LABEL (priv->description_label), label);
- }
- else if(label)
- {
- /* create label */
- priv->description_label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (priv->description_label), label);
-
- /* align left */
- gtk_widget_set_halign (GTK_WIDGET (priv->description_label), GTK_ALIGN_START);
- }
-
- update_packing (menuitem);
+ {
+ gtk_label_set_markup (GTK_LABEL (priv->description_label), label);
+ }
+ else if (label)
+ {
+ /* create label */
+ priv->description_label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (priv->description_label), label);
+
+ /* align left */
+ gtk_widget_set_halign (GTK_WIDGET (priv->description_label), GTK_ALIGN_START);
+ }
+
+ update_packing (menuitem);
}
@@ -483,7 +490,7 @@ scale_menu_item_set_description_label (ScaleMenuItem *menuitem,
**/
void
scale_menu_item_set_percentage_label (ScaleMenuItem *menuitem,
- const gchar *label)
+ const gchar *label)
{
ScaleMenuItemPrivate *priv;
@@ -492,26 +499,26 @@ scale_menu_item_set_percentage_label (ScaleMenuItem *menuitem,
priv = scale_menu_item_get_instance_private (menuitem);
if (label == NULL && priv->percentage_label)
- {
- /* remove label */
- g_object_unref (priv->percentage_label);
- priv->percentage_label = NULL;
- return;
- }
+ {
+ /* remove label */
+ g_object_unref (priv->percentage_label);
+ priv->percentage_label = NULL;
+ return;
+ }
if (priv->percentage_label && label)
- {
- gtk_label_set_text (GTK_LABEL (priv->percentage_label), label);
- }
- else if(label)
- {
- /* create label */
- priv->percentage_label = gtk_label_new (label);
- /* align left */
- gtk_widget_set_halign (GTK_WIDGET (priv->percentage_label), GTK_ALIGN_START);
- }
-
- update_packing (menuitem);
+ {
+ gtk_label_set_text (GTK_LABEL (priv->percentage_label), label);
+ }
+ else if (label)
+ {
+ /* create label */
+ priv->percentage_label = gtk_label_new (label);
+ /* align left */
+ gtk_widget_set_halign (GTK_WIDGET (priv->percentage_label), GTK_ALIGN_START);
+ }
+
+ update_packing (menuitem);
}
@@ -523,7 +530,7 @@ scale_menu_item_set_percentage_label (ScaleMenuItem *menuitem,
*/
void
scale_menu_item_set_value (ScaleMenuItem *item,
- gdouble value)
+ gdouble value)
{
ScaleMenuItemPrivate *priv = scale_menu_item_get_instance_private (item);
diff --git a/panel-plugins/power-manager-plugin/scalemenuitem.h b/panel-plugins/power-manager-plugin/scalemenuitem.h
index 481b6ba3d063045cab4722270f335582dfe9aaad..57e1e77767fbddfea938842930c7579a21e78516 100644
--- a/panel-plugins/power-manager-plugin/scalemenuitem.h
+++ b/panel-plugins/power-manager-plugin/scalemenuitem.h
@@ -32,16 +32,16 @@
G_BEGIN_DECLS
-#define TYPE_SCALE_MENU_ITEM (scale_menu_item_get_type ())
-#define SCALE_MENU_ITEM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SCALE_MENU_ITEM, ScaleMenuItem))
-#define SCALE_MENU_ITEM_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TYPE_SCALE_MENU_ITEM, ScaleMenuItemClass))
-#define IS_SCALE_MENU_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SCALE_MENU_ITEM))
-#define IS_SCALE_MENU_ITEM_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TYPE_SCALE_MENU_ITEM))
+#define TYPE_SCALE_MENU_ITEM (scale_menu_item_get_type ())
+#define SCALE_MENU_ITEM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SCALE_MENU_ITEM, ScaleMenuItem))
+#define SCALE_MENU_ITEM_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TYPE_SCALE_MENU_ITEM, ScaleMenuItemClass))
+#define IS_SCALE_MENU_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SCALE_MENU_ITEM))
+#define IS_SCALE_MENU_ITEM_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TYPE_SCALE_MENU_ITEM))
#define SCALE_MENU_ITEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_SCALE_MENU_ITEM, ScaleMenuItemClass))
-typedef struct _ScaleMenuItem ScaleMenuItem;
-typedef struct _ScaleMenuItemClass ScaleMenuItemClass;
+typedef struct _ScaleMenuItem ScaleMenuItem;
+typedef struct _ScaleMenuItemClass ScaleMenuItemClass;
typedef struct _ScaleMenuItemPrivate ScaleMenuItemPrivate;
struct _ScaleMenuItem
@@ -57,20 +57,27 @@ struct _ScaleMenuItemClass
};
-GType scale_menu_item_get_type (void) G_GNUC_CONST;
-GtkWidget *scale_menu_item_new_with_range (gdouble min,
- gdouble max,
- gdouble step);
-GtkWidget *scale_menu_item_get_scale (ScaleMenuItem *menuitem);
-const gchar *scale_menu_item_get_description_label (ScaleMenuItem *menuitem);
-const gchar *scale_menu_item_get_percentage_label (ScaleMenuItem *menuitem);
-void scale_menu_item_set_description_label (ScaleMenuItem *menuitem,
- const gchar *label);
-void scale_menu_item_set_percentage_label (ScaleMenuItem *menuitem,
- const gchar *label);
-void scale_menu_item_set_value (ScaleMenuItem *item,
- gdouble value);
-
+GType
+scale_menu_item_get_type (void) G_GNUC_CONST;
+GtkWidget *
+scale_menu_item_new_with_range (gdouble min,
+ gdouble max,
+ gdouble step);
+GtkWidget *
+scale_menu_item_get_scale (ScaleMenuItem *menuitem);
+const gchar *
+scale_menu_item_get_description_label (ScaleMenuItem *menuitem);
+const gchar *
+scale_menu_item_get_percentage_label (ScaleMenuItem *menuitem);
+void
+scale_menu_item_set_description_label (ScaleMenuItem *menuitem,
+ const gchar *label);
+void
+scale_menu_item_set_percentage_label (ScaleMenuItem *menuitem,
+ const gchar *label);
+void
+scale_menu_item_set_value (ScaleMenuItem *item,
+ gdouble value);
G_END_DECLS
diff --git a/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c b/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
index 2436cde55d8bb028abcfe5ba08dbb72819913091..4c211b65c32798b1ff87c6f60cd57699bb1de636 100644
--- a/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
+++ b/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
@@ -42,26 +42,27 @@ typedef struct
XfcePanelPlugin *plugin;
/* panel widgets */
- GtkWidget *ebox;
- GtkWidget *power_manager_button;
-}
-PowerManagerPlugin;
+ GtkWidget *ebox;
+ GtkWidget *power_manager_button;
+} PowerManagerPlugin;
-enum {
+enum
+{
COLUMN_INT,
COLUMN_STRING,
N_COLUMNS
};
/* prototypes */
-static void power_manager_plugin_construct (XfcePanelPlugin *plugin);
+static void
+power_manager_plugin_construct (XfcePanelPlugin *plugin);
/* register the plugin */
XFCE_PANEL_PLUGIN_REGISTER (power_manager_plugin_construct);
static void
-power_manager_plugin_configure_response (GtkWidget *dialog,
- gint response,
- PowerManagerPlugin *power_manager_plugin)
+power_manager_plugin_configure_response (GtkWidget *dialog,
+ gint response,
+ PowerManagerPlugin *power_manager_plugin)
{
if (response == GTK_RESPONSE_HELP)
{
@@ -95,13 +96,12 @@ power_manager_plugin_panel_label_changed (XfconfChannel *channel,
current_setting = g_value_get_int (value);
for (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
- gtk_list_store_iter_is_valid (list_store, &iter);
- gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter))
+ gtk_list_store_iter_is_valid (list_store, &iter);
+ gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter))
{
gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, 0, &show_panel_label, -1);
if (show_panel_label == current_setting)
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo),
- &iter);
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
}
}
@@ -125,13 +125,13 @@ power_manager_plugin_combo_changed (GtkComboBox *combo,
}
static void
-power_manager_plugin_configure (XfcePanelPlugin *plugin,
- PowerManagerPlugin *power_manager_plugin)
+power_manager_plugin_configure (XfcePanelPlugin *plugin,
+ PowerManagerPlugin *power_manager_plugin)
{
GtkWidget *dialog;
GtkWidget *grid, *combo, *label, *gtkswitch;
gint show_panel_label;
- XfconfChannel *channel;
+ XfconfChannel *channel;
GtkListStore *list_store;
GtkTreeIter iter, active_iter;
GtkCellRenderer *cell;
@@ -188,7 +188,7 @@ power_manager_plugin_configure (XfcePanelPlugin *plugin,
}
combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (list_store));
cell = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE );
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell, "text", COLUMN_STRING, NULL);
gtk_combo_box_set_id_column (GTK_COMBO_BOX (combo), COLUMN_STRING);
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &active_iter);
@@ -217,7 +217,7 @@ power_manager_plugin_configure (XfcePanelPlugin *plugin,
g_object_set_data (G_OBJECT (plugin), "dialog", dialog);
g_signal_connect (G_OBJECT (dialog), "response",
- G_CALLBACK(power_manager_plugin_configure_response), power_manager_plugin);
+ G_CALLBACK (power_manager_plugin_configure_response), power_manager_plugin);
gtk_widget_show_all (grid);
}
@@ -237,7 +237,7 @@ power_manager_plugin_new (XfcePanelPlugin *plugin)
/* create some panel ebox */
power_manager_plugin->ebox = gtk_event_box_new ();
gtk_widget_show (power_manager_plugin->ebox);
- gtk_event_box_set_visible_window (GTK_EVENT_BOX(power_manager_plugin->ebox), FALSE);
+ gtk_event_box_set_visible_window (GTK_EVENT_BOX (power_manager_plugin->ebox), FALSE);
power_manager_plugin->power_manager_button = power_manager_button_new (plugin);
gtk_container_add (GTK_CONTAINER (power_manager_plugin->ebox), power_manager_plugin->power_manager_button);
diff --git a/settings/xfpm-settings-app.c b/settings/xfpm-settings-app.c
index 6b69f512ee3e43ecc5f0cf824af96bd0370a5455..5ee6f3e4facb1ae55ba440eaae2678b944cd0e2b 100644
--- a/settings/xfpm-settings-app.c
+++ b/settings/xfpm-settings-app.c
@@ -40,32 +40,38 @@
struct _XfpmSettingsAppPrivate
{
- gboolean debug;
+ gboolean debug;
#ifdef ENABLE_X11
- Window socket_id;
+ Window socket_id;
#endif
- gchar *device_id;
+ gchar *device_id;
};
-static void xfpm_settings_app_launch (GApplication *app);
+static void
+xfpm_settings_app_launch (GApplication *app);
-static void activate_socket (GSimpleAction *action,
- GVariant *parameter,
- gpointer data);
-static void activate_device (GSimpleAction *action,
- GVariant *parameter,
- gpointer data);
-static void activate_debug (GSimpleAction *action,
- GVariant *parameter,
- gpointer data);
-static void activate_window (GSimpleAction *action,
- GVariant *parameter,
- gpointer data);
-static void activate_quit (GSimpleAction *action,
- GVariant *parameter,
- gpointer data);
+static void
+activate_socket (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer data);
+static void
+activate_device (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer data);
+static void
+activate_debug (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer data);
+static void
+activate_window (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer data);
+static void
+activate_quit (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer data);
-G_DEFINE_TYPE_WITH_PRIVATE(XfpmSettingsApp, xfpm_settings_app, GTK_TYPE_APPLICATION);
+G_DEFINE_TYPE_WITH_PRIVATE (XfpmSettingsApp, xfpm_settings_app, GTK_TYPE_APPLICATION);
@@ -73,12 +79,12 @@ static void
xfpm_settings_app_init (XfpmSettingsApp *app)
{
const GOptionEntry option_entries[] = {
- { "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, NULL, N_("Settings manager socket"), N_("SOCKET ID") },
- { "device-id", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, NULL, N_("Display a specific device by UpDevice object path"), N_("UpDevice object path") },
- { "debug", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, NULL, N_("Enable debugging"), NULL },
- { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, NULL, N_("Display version information"), NULL },
- { "quit", 'q', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, NULL, N_("Cause xfce4-power-manager-settings to quit"), NULL },
- { NULL, },
+ { "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, NULL, N_ ("Settings manager socket"), N_ ("SOCKET ID") },
+ { "device-id", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, NULL, N_ ("Display a specific device by UpDevice object path"), N_ ("UpDevice object path") },
+ { "debug", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, NULL, N_ ("Enable debugging"), NULL },
+ { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, NULL, N_ ("Display version information"), NULL },
+ { "quit", 'q', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, NULL, N_ ("Cause xfce4-power-manager-settings to quit"), NULL },
+ { NULL },
};
g_application_add_main_option_entries (G_APPLICATION (app), option_entries);
@@ -88,11 +94,11 @@ static void
xfpm_settings_app_startup (GApplication *app)
{
const GActionEntry action_entries[] = {
- { "socket-id", activate_socket, "i" },
- { "device-id", activate_device, "s" },
- { "debug", activate_debug, NULL },
- { "activate", activate_window, NULL },
- { "quit", activate_quit, NULL },
+ { "socket-id", activate_socket, "i" },
+ { "device-id", activate_device, "s" },
+ { "debug", activate_debug, NULL },
+ { "activate", activate_window, NULL },
+ { "quit", activate_quit, NULL },
};
g_action_map_add_action_entries (G_ACTION_MAP (app),
@@ -101,7 +107,7 @@ xfpm_settings_app_startup (GApplication *app)
app);
/* let the parent class do it's startup as well */
- G_APPLICATION_CLASS(xfpm_settings_app_parent_class)->startup(app);
+ G_APPLICATION_CLASS (xfpm_settings_app_parent_class)->startup (app);
}
static void
@@ -115,14 +121,14 @@ xfpm_settings_app_launch (GApplication *app)
XfpmSettingsAppPrivate *priv = xfpm_settings_app_get_instance_private (XFPM_SETTINGS_APP (app));
XfpmPowerManager *manager;
- XfconfChannel *channel;
- GError *error = NULL;
- GtkWidget *dialog;
- GHashTable *hash;
- GVariant *config;
- GVariantIter *iter;
- gchar *key, *value;
- GList *windows;
+ XfconfChannel *channel;
+ GError *error = NULL;
+ GtkWidget *dialog;
+ GHashTable *hash;
+ GVariant *config;
+ GVariantIter *iter;
+ gchar *key, *value;
+ GList *windows;
gboolean has_battery;
gboolean auth_suspend;
@@ -136,7 +142,7 @@ xfpm_settings_app_launch (GApplication *app)
gboolean has_power_button;
gboolean has_battery_button;
gboolean has_lid;
- gint start_xfpm_if_not_running;
+ gint start_xfpm_if_not_running;
windows = gtk_application_get_windows (GTK_APPLICATION (app));
@@ -164,17 +170,15 @@ xfpm_settings_app_launch (GApplication *app)
if (error != NULL)
{
- g_critical("xfpm_power_manager_proxy_new_sync failed: %s", error->message);
- xfce_dialog_show_warning (NULL,
- _("Xfce Power Manager"),
- "%s",
- _("Failed to connect to power manager"));
+ g_critical ("xfpm_power_manager_proxy_new_sync failed: %s", error->message);
+ xfce_dialog_show_warning (NULL, _("Xfce Power Manager"),
+ "%s", _("Failed to connect to power manager"));
g_clear_error (&error);
return;
}
- while ( !xfpm_power_manager_call_get_config_sync (manager, &config, NULL, NULL) )
+ while (!xfpm_power_manager_call_get_config_sync (manager, &config, NULL, NULL))
{
GtkWidget *startw;
@@ -192,15 +196,17 @@ xfpm_settings_app_launch (GApplication *app)
app_info = g_app_info_create_from_commandline ("xfce4-power-manager", "Xfce4 Power Manager",
G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION, NULL);
- if (!g_app_info_launch (app_info, NULL, NULL, &error)) {
- if (error != NULL) {
- g_warning ("xfce4-power-manager could not be launched. %s", error->message);
- g_error_free (error);
- error = NULL;
- }
+ if (!g_app_info_launch (app_info, NULL, NULL, &error))
+ {
+ if (error != NULL)
+ {
+ g_warning ("xfce4-power-manager could not be launched: %s", error->message);
+ g_error_free (error);
+ error = NULL;
+ }
}
/* wait 2 seconds for xfpm to startup */
- g_usleep ( 2 * 1000000 );
+ g_usleep (2 * 1000000);
}
else
{
@@ -209,18 +215,16 @@ xfpm_settings_app_launch (GApplication *app)
}
}
- if ( !xfconf_init(&error) )
+ if (!xfconf_init (&error))
{
- g_critical("xfconf init failed: %s using default settings", error->message);
- xfce_dialog_show_warning (NULL,
- _("Xfce Power Manager"),
- "%s",
- _("Failed to load power manager configuration, using defaults"));
+ g_critical ("xfconf init failed: %s using default settings", error->message);
+ xfce_dialog_show_warning (NULL, _("Xfce Power Manager"),
+ "%s", _("Failed to load power manager configuration, using defaults"));
g_clear_error (&error);
}
- channel = xfconf_channel_new(XFPM_CHANNEL);
+ channel = xfconf_channel_new (XFPM_CHANNEL);
xfpm_debug_init (priv->debug);
@@ -248,7 +252,7 @@ xfpm_settings_app_launch (GApplication *app)
can_shutdown = xfpm_string_to_bool (g_hash_table_lookup (hash, "can-shutdown"));
#ifdef ENABLE_X11
- XFPM_DEBUG ("socket_id %i", (int)priv->socket_id);
+ XFPM_DEBUG ("socket_id %i", (int) priv->socket_id);
#endif
XFPM_DEBUG ("device id %s", priv->device_id);
@@ -268,9 +272,9 @@ xfpm_settings_app_launch (GApplication *app)
}
static void
-activate_socket (GSimpleAction *action,
- GVariant *parameter,
- gpointer data)
+activate_socket (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer data)
{
XfpmSettingsApp *app = XFPM_SETTINGS_APP (data);
#ifdef ENABLE_X11
@@ -282,22 +286,22 @@ activate_socket (GSimpleAction *action,
}
static void
-activate_device (GSimpleAction *action,
- GVariant *parameter,
- gpointer data)
+activate_device (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer data)
{
XfpmSettingsApp *app = XFPM_SETTINGS_APP (data);
XfpmSettingsAppPrivate *priv = xfpm_settings_app_get_instance_private (app);
- priv->device_id = g_strdup(g_variant_get_string (parameter, NULL));
+ priv->device_id = g_strdup (g_variant_get_string (parameter, NULL));
xfpm_settings_app_launch (G_APPLICATION (app));
}
static void
-activate_debug (GSimpleAction *action,
- GVariant *parameter,
- gpointer data)
+activate_debug (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer data)
{
XfpmSettingsApp *app = XFPM_SETTINGS_APP (data);
XfpmSettingsAppPrivate *priv = xfpm_settings_app_get_instance_private (app);
@@ -308,9 +312,9 @@ activate_debug (GSimpleAction *action,
}
static void
-activate_window (GSimpleAction *action,
- GVariant *parameter,
- gpointer data)
+activate_window (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer data)
{
XfpmSettingsApp *app = XFPM_SETTINGS_APP (data);
@@ -318,9 +322,9 @@ activate_window (GSimpleAction *action,
}
static void
-activate_quit (GSimpleAction *action,
- GVariant *parameter,
- gpointer data)
+activate_quit (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer data)
{
GtkApplication *app = GTK_APPLICATION (data);
GList *windows;
@@ -341,12 +345,12 @@ xfpm_settings_app_local_options (GApplication *g_application,
/* --version */
if (g_variant_dict_contains (options, "version"))
{
- g_print(_("This is %s version %s, running on Xfce %s.\n"), PACKAGE,
- VERSION, xfce_version_string());
- g_print(_("Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d."),
- GTK_MAJOR_VERSION,GTK_MINOR_VERSION, GTK_MICRO_VERSION,
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- g_print("\n");
+ g_print (_("This is %s version %s, running on Xfce %s.\n"),
+ PACKAGE, VERSION, xfce_version_string ());
+ g_print (_("Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d."),
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ g_print ("\n");
return 0;
}
@@ -357,7 +361,7 @@ xfpm_settings_app_local_options (GApplication *g_application,
/* --debug */
if (g_variant_dict_contains (options, "debug"))
{
- g_action_group_activate_action(G_ACTION_GROUP(g_application), "debug", NULL);
+ g_action_group_activate_action (G_ACTION_GROUP (g_application), "debug", NULL);
return 0;
}
@@ -368,7 +372,7 @@ xfpm_settings_app_local_options (GApplication *g_application,
var = g_variant_dict_lookup_value (options, "socket-id", G_VARIANT_TYPE_INT32);
- g_action_group_activate_action(G_ACTION_GROUP(g_application), "socket-id", var);
+ g_action_group_activate_action (G_ACTION_GROUP (g_application), "socket-id", var);
return 0;
}
@@ -379,19 +383,19 @@ xfpm_settings_app_local_options (GApplication *g_application,
var = g_variant_dict_lookup_value (options, "device-id", G_VARIANT_TYPE_STRING);
- g_action_group_activate_action(G_ACTION_GROUP(g_application), "device-id", var);
+ g_action_group_activate_action (G_ACTION_GROUP (g_application), "device-id", var);
return 0;
}
/* --quit */
if (g_variant_dict_contains (options, "quit") || g_variant_dict_contains (options, "q"))
{
- g_action_group_activate_action(G_ACTION_GROUP(g_application), "quit", NULL);
+ g_action_group_activate_action (G_ACTION_GROUP (g_application), "quit", NULL);
return 0;
}
/* default action */
- g_action_group_activate_action(G_ACTION_GROUP(g_application), "activate", NULL);
+ g_action_group_activate_action (G_ACTION_GROUP (g_application), "activate", NULL);
return 0;
}
@@ -402,8 +406,8 @@ xfpm_settings_app_class_init (XfpmSettingsAppClass *class)
GApplicationClass *gapplication_class = G_APPLICATION_CLASS (class);
gapplication_class->handle_local_options = xfpm_settings_app_local_options;
- gapplication_class->startup = xfpm_settings_app_startup;
- gapplication_class->activate = xfpm_settings_app_activate;
+ gapplication_class->startup = xfpm_settings_app_startup;
+ gapplication_class->activate = xfpm_settings_app_activate;
}
XfpmSettingsApp *
diff --git a/settings/xfpm-settings-app.h b/settings/xfpm-settings-app.h
index 0f878121717de2d0d53417bc1a320d1c4f935987..a8155a58245630764b42f964e98024dd0badb94b 100644
--- a/settings/xfpm-settings-app.h
+++ b/settings/xfpm-settings-app.h
@@ -29,30 +29,32 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_SETTINGS_APP (xfpm_settings_app_get_type())
-#define XFPM_SETTINGS_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFPM_TYPE_SETTINGS_APP, XfpmSettingsApp))
-#define XFPM_SETTINGS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), XFPM_TYPE_SETTINGS_APP, XfpmSettingsAppClass))
-#define XFPM_IS_SETTINGS_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), XFPM_TYPE_SETTINGS_APP))
-#define XFPM_SETTINGS_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), XFPM_TYPE_SETTINGS_APP, XfpmSettingsAppClass))
+#define XFPM_TYPE_SETTINGS_APP (xfpm_settings_app_get_type ())
+#define XFPM_SETTINGS_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFPM_TYPE_SETTINGS_APP, XfpmSettingsApp))
+#define XFPM_SETTINGS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFPM_TYPE_SETTINGS_APP, XfpmSettingsAppClass))
+#define XFPM_IS_SETTINGS_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFPM_TYPE_SETTINGS_APP))
+#define XFPM_SETTINGS_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFPM_TYPE_SETTINGS_APP, XfpmSettingsAppClass))
-typedef struct _XfpmSettingsApp XfpmSettingsApp;
-typedef struct _XfpmSettingsAppClass XfpmSettingsAppClass;
-typedef struct _XfpmSettingsAppPrivate XfpmSettingsAppPrivate;
+typedef struct _XfpmSettingsApp XfpmSettingsApp;
+typedef struct _XfpmSettingsAppClass XfpmSettingsAppClass;
+typedef struct _XfpmSettingsAppPrivate XfpmSettingsAppPrivate;
struct _XfpmSettingsApp
{
- GtkApplication parent;
- XfpmSettingsAppPrivate *priv;
+ GtkApplication parent;
+ XfpmSettingsAppPrivate *priv;
};
struct _XfpmSettingsAppClass
{
- GtkApplicationClass parent_class;
+ GtkApplicationClass parent_class;
};
-GType xfpm_settings_app_get_type (void) G_GNUC_CONST;
-XfpmSettingsApp *xfpm_settings_app_new (void);
+GType
+xfpm_settings_app_get_type (void) G_GNUC_CONST;
+XfpmSettingsApp *
+xfpm_settings_app_new (void);
G_END_DECLS
diff --git a/settings/xfpm-settings-main.c b/settings/xfpm-settings-main.c
index e3719b505719919f9018e37c0045a0b3e05cf8c7..24d72580431835f84e0fa299008794ecd29bf04b 100644
--- a/settings/xfpm-settings-main.c
+++ b/settings/xfpm-settings-main.c
@@ -27,9 +27,11 @@
#include <libxfce4util/libxfce4util.h>
-int main (int argc, char **argv)
+int
+main (int argc,
+ char **argv)
{
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+ xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
return g_application_run (G_APPLICATION (xfpm_settings_app_new ()), argc, argv);
}
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index fe8a34efa1feb1dfb497532da7630c72b2be766b..8ef2646a3c2d194bb9d507d6a0d6025686274b1a 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -51,44 +51,44 @@
#define WINDOWING_IS_X11() FALSE
#endif
-#define BRIGHTNESS_DISABLED 9
-
-static GtkApplication *app = NULL;
-static GtkBuilder *xml = NULL;
-static GtkWidget *nt = NULL;
-
-static GtkWidget *on_battery_dpms_sleep = NULL;
-static GtkWidget *on_battery_dpms_off = NULL;
-static GtkWidget *on_ac_dpms_sleep = NULL;
-static GtkWidget *on_ac_dpms_off = NULL;
-static GtkWidget *sideview = NULL; /* Sidebar tree view - all devices are in the sideview */
-static GtkWidget *device_details_notebook = NULL; /* Displays the details of a deivce */
-static GtkWidget *brightness_step_count = NULL;
-static GtkWidget *brightness_exponential = NULL;
-
-static GtkWidget *label_inactivity_on_ac = NULL;
-static GtkWidget *label_inactivity_on_battery = NULL;
-static GtkWidget *label_dpms_sleep_on_battery = NULL;
-static GtkWidget *label_dpms_sleep_on_ac = NULL;
-static GtkWidget *label_dpms_off_on_battery = NULL;
-static GtkWidget *label_dpms_off_on_ac = NULL;
-static GtkWidget *label_brightness_level_on_battery = NULL;
-static GtkWidget *label_brightness_level_on_ac = NULL;
-static GtkWidget *label_brightness_inactivity_on_battery = NULL;
-static GtkWidget *label_brightness_inactivity_on_ac = NULL;
-static GtkWidget *label_light_locker_late_locking_scale = NULL;
+#define BRIGHTNESS_DISABLED 9
+
+static GtkApplication *app = NULL;
+static GtkBuilder *xml = NULL;
+static GtkWidget *nt = NULL;
+
+static GtkWidget *on_battery_dpms_sleep = NULL;
+static GtkWidget *on_battery_dpms_off = NULL;
+static GtkWidget *on_ac_dpms_sleep = NULL;
+static GtkWidget *on_ac_dpms_off = NULL;
+static GtkWidget *sideview = NULL; /* Sidebar tree view - all devices are in the sideview */
+static GtkWidget *device_details_notebook = NULL; /* Displays the details of a deivce */
+static GtkWidget *brightness_step_count = NULL;
+static GtkWidget *brightness_exponential = NULL;
+
+static GtkWidget *label_inactivity_on_ac = NULL;
+static GtkWidget *label_inactivity_on_battery = NULL;
+static GtkWidget *label_dpms_sleep_on_battery = NULL;
+static GtkWidget *label_dpms_sleep_on_ac = NULL;
+static GtkWidget *label_dpms_off_on_battery = NULL;
+static GtkWidget *label_dpms_off_on_ac = NULL;
+static GtkWidget *label_brightness_level_on_battery = NULL;
+static GtkWidget *label_brightness_level_on_ac = NULL;
+static GtkWidget *label_brightness_inactivity_on_battery = NULL;
+static GtkWidget *label_brightness_inactivity_on_ac = NULL;
+static GtkWidget *label_light_locker_late_locking_scale = NULL;
/* Light Locker Integration */
-static GtkWidget *light_locker_tab = NULL;
-static GtkWidget *light_locker_autolock = NULL;
-static GtkWidget *light_locker_delay = NULL;
-static GtkWidget *light_locker_sleep = NULL;
-static GSettings *light_locker_settings = NULL;
+static GtkWidget *light_locker_tab = NULL;
+static GtkWidget *light_locker_autolock = NULL;
+static GtkWidget *light_locker_delay = NULL;
+static GtkWidget *light_locker_sleep = NULL;
+static GSettings *light_locker_settings = NULL;
/* END Light Locker Integration */
-static gboolean lcd_brightness = FALSE;
-static gchar *starting_device_id = NULL;
-static UpClient *upower = NULL;
+static gboolean lcd_brightness = FALSE;
+static gchar *starting_device_id = NULL;
+static UpClient *upower = NULL;
static gint devices_page_num;
@@ -99,9 +99,9 @@ enum
COL_SIDEBAR_NAME,
COL_SIDEBAR_INT,
COL_SIDEBAR_BATTERY_DEVICE, /* Pointer to the UpDevice */
- COL_SIDEBAR_OBJECT_PATH, /* UpDevice object path */
- COL_SIDEBAR_SIGNAL_ID, /* device changed callback id */
- COL_SIDEBAR_VIEW, /* Pointer to GtkTreeView of the devcie details */
+ COL_SIDEBAR_OBJECT_PATH, /* UpDevice object path */
+ COL_SIDEBAR_SIGNAL_ID, /* device changed callback id */
+ COL_SIDEBAR_VIEW, /* Pointer to GtkTreeView of the devcie details */
NCOLS_SIDEBAR
};
@@ -113,85 +113,124 @@ enum
};
/*
- * GtkBuilder callbacks
+ * GtkBuilder callbacks (can't be set static)
*/
-void brightness_level_on_ac (GtkWidget *w,
- XfconfChannel *channel);
-void brightness_level_on_battery (GtkWidget *w,
- XfconfChannel *channel);
-void battery_critical_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void inactivity_on_ac_value_changed_cb (GtkWidget *widget,
- XfconfChannel *channel);
-void inactivity_on_battery_value_changed_cb (GtkWidget *widget,
- XfconfChannel *channel);
-void button_sleep_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void button_power_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void button_hibernate_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void button_battery_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void combo_box_xfconf_property_changed_cb (XfconfChannel *channel,
- char *property,
- GValue *value,
- GtkWidget *combo_box);
-void set_combo_box_active_by_value (guint new_value,
- GtkComboBox *combo_box);
-void on_sleep_mode_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-gboolean dpms_toggled_cb (GtkWidget *w,
- gboolean is_active,
- XfconfChannel *channel);
-void sleep_on_battery_value_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void off_on_battery_value_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void sleep_on_ac_value_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void off_on_ac_value_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-gchar *format_dpms_value_cb (gint value);
-gchar *format_inactivity_value_cb (gint value);
-gchar *format_brightness_value_cb (gint value);
-gchar *format_brightness_percentage_cb (gint value);
-void brightness_on_battery_value_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void brightness_on_ac_value_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void on_battery_lid_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void on_ac_lid_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void critical_level_value_changed_cb (GtkSpinButton *w,
- XfconfChannel *channel);
-void lock_screen_toggled_cb (GtkWidget *w,
- XfconfChannel *channel);
-static void view_cursor_changed_cb (GtkTreeView *view,
- gpointer *user_data);
-void on_ac_sleep_mode_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void on_battery_sleep_mode_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void on_ac_power_profile_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void on_battery_power_profile_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-gboolean handle_brightness_keys_toggled_cb (GtkWidget *w,
- gboolean is_active,
- XfconfChannel *channel);
+void
+brightness_level_on_ac (GtkWidget *w,
+ XfconfChannel *channel);
+void
+brightness_level_on_battery (GtkWidget *w,
+ XfconfChannel *channel);
+void
+battery_critical_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+inactivity_on_ac_value_changed_cb (GtkWidget *widget,
+ XfconfChannel *channel);
+void
+inactivity_on_battery_value_changed_cb (GtkWidget *widget,
+ XfconfChannel *channel);
+void
+button_sleep_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+button_power_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+button_hibernate_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+button_battery_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+gboolean
+dpms_toggled_cb (GtkWidget *w,
+ gboolean is_active,
+ XfconfChannel *channel);
+void
+sleep_on_battery_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+off_on_battery_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+sleep_on_ac_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+off_on_ac_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+brightness_on_battery_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+brightness_on_ac_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+on_battery_lid_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+on_ac_lid_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+critical_level_value_changed_cb (GtkSpinButton *w,
+ XfconfChannel *channel);
+void
+lock_screen_toggled_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+on_ac_sleep_mode_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+on_battery_sleep_mode_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+on_ac_power_profile_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+on_battery_power_profile_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+gboolean
+handle_brightness_keys_toggled_cb (GtkWidget *w,
+ gboolean is_active,
+ XfconfChannel *channel);
/* Light Locker Integration */
-gchar *format_light_locker_value_cb (gint value);
-void light_locker_late_locking_value_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void light_locker_automatic_locking_changed_cb (GtkWidget *w,
- XfconfChannel *channel);
-void xfpm_update_logind_handle_lid_switch (XfconfChannel *channel);
+void
+light_locker_late_locking_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+void
+light_locker_automatic_locking_changed_cb (GtkWidget *w,
+ XfconfChannel *channel);
+static gchar *
+format_light_locker_value_cb (gint value);
+static void
+xfpm_update_logind_handle_lid_switch (XfconfChannel *channel);
/* END Light Locker Integration */
+
+static void
+combo_box_xfconf_property_changed_cb (XfconfChannel *channel,
+ char *property,
+ GValue *value,
+ GtkWidget *combo_box);
static void
-update_label (GtkWidget *label, GtkWidget *scale, gchar* (*format)(gint))
+set_combo_box_active_by_value (guint new_value,
+ GtkComboBox *combo_box);
+static gchar *
+format_dpms_value_cb (gint value);
+static gchar *
+format_inactivity_value_cb (gint value);
+static gchar *
+format_brightness_value_cb (gint value);
+static gchar *
+format_brightness_percentage_cb (gint value);
+static void
+view_cursor_changed_cb (GtkTreeView *view,
+ gpointer *user_data);
+
+
+static void
+update_label (GtkWidget *label,
+ GtkWidget *scale,
+ gchar *(*format) (gint))
{
gint value = (gint) gtk_range_get_value (GTK_RANGE (scale));
@@ -200,11 +239,13 @@ update_label (GtkWidget *label, GtkWidget *scale, gchar* (*format)(gint))
g_free (formatted_value);
}
-void brightness_level_on_ac (GtkWidget *w, XfconfChannel *channel)
+void
+brightness_level_on_ac (GtkWidget *w,
+ XfconfChannel *channel)
{
guint val = (guint) gtk_range_get_value (GTK_RANGE (w));
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_AC, val) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_AC, val))
{
g_critical ("Unable to set value %u for property %s", val, BRIGHTNESS_LEVEL_ON_AC);
}
@@ -212,11 +253,13 @@ void brightness_level_on_ac (GtkWidget *w, XfconfChannel *channel)
update_label (label_brightness_level_on_ac, w, format_brightness_percentage_cb);
}
-void brightness_level_on_battery (GtkWidget *w, XfconfChannel *channel)
+void
+brightness_level_on_battery (GtkWidget *w,
+ XfconfChannel *channel)
{
- guint val = (guint) gtk_range_get_value (GTK_RANGE (w));
+ guint val = (guint) gtk_range_get_value (GTK_RANGE (w));
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_BATTERY, val) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_BATTERY, val))
{
g_critical ("Unable to set value %u for property %s", val, BRIGHTNESS_LEVEL_ON_BATTERY);
}
@@ -225,33 +268,30 @@ void brightness_level_on_battery (GtkWidget *w, XfconfChannel *channel)
}
void
-battery_critical_changed_cb (GtkWidget *w, XfconfChannel *channel)
+battery_critical_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- GtkTreeModel *model;
- GtkTreeIter selected_row;
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
gint value = 0;
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
- model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
- gtk_tree_model_get(model,
- &selected_row,
- 1,
- &value,
- -1);
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
+ gtk_tree_model_get (model, &selected_row, 1, &value, -1);
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_BATT_ACTION_CFG, value) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_BATT_ACTION_CFG, value))
{
g_critical ("Cannot set value for property %s", CRITICAL_BATT_ACTION_CFG);
}
}
void
-inactivity_on_ac_value_changed_cb (GtkWidget *widget, XfconfChannel *channel)
+inactivity_on_ac_value_changed_cb (GtkWidget *widget,
+ XfconfChannel *channel)
{
- gint value = (gint)gtk_range_get_value (GTK_RANGE (widget));
+ gint value = (gint) gtk_range_get_value (GTK_RANGE (widget));
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX ON_AC_INACTIVITY_TIMEOUT, value))
{
@@ -262,9 +302,10 @@ inactivity_on_ac_value_changed_cb (GtkWidget *widget, XfconfChannel *channel)
}
void
-inactivity_on_battery_value_changed_cb (GtkWidget *widget, XfconfChannel *channel)
+inactivity_on_battery_value_changed_cb (GtkWidget *widget,
+ XfconfChannel *channel)
{
- gint value = (gint)gtk_range_get_value (GTK_RANGE (widget));
+ gint value = (gint) gtk_range_get_value (GTK_RANGE (widget));
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX ON_BATTERY_INACTIVITY_TIMEOUT, value))
{
@@ -275,104 +316,90 @@ inactivity_on_battery_value_changed_cb (GtkWidget *widget, XfconfChannel *channe
}
void
-button_sleep_changed_cb (GtkWidget *w, XfconfChannel *channel)
+button_sleep_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- GtkTreeModel *model;
- GtkTreeIter selected_row;
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
gint value = 0;
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
- model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
- gtk_tree_model_get(model,
- &selected_row,
- 1,
- &value,
- -1);
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
+ gtk_tree_model_get (model, &selected_row, 1, &value, -1);
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX SLEEP_SWITCH_CFG, value ) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX SLEEP_SWITCH_CFG, value))
{
g_critical ("Cannot set value for property %s", SLEEP_SWITCH_CFG);
}
}
void
-button_power_changed_cb (GtkWidget *w, XfconfChannel *channel)
+button_power_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- GtkTreeModel *model;
- GtkTreeIter selected_row;
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
gint value = 0;
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
- model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
- gtk_tree_model_get(model,
- &selected_row,
- 1,
- &value,
- -1);
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
+ gtk_tree_model_get (model, &selected_row, 1, &value, -1);
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX POWER_SWITCH_CFG, value) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX POWER_SWITCH_CFG, value))
{
g_critical ("Cannot set value for property %s", POWER_SWITCH_CFG);
}
}
void
-button_hibernate_changed_cb (GtkWidget *w, XfconfChannel *channel)
+button_hibernate_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- GtkTreeModel *model;
- GtkTreeIter selected_row;
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
gint value = 0;
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
- model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
- gtk_tree_model_get (model,
- &selected_row,
- 1,
- &value,
- -1);
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
+ gtk_tree_model_get (model, &selected_row, 1, &value, -1);
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX HIBERNATE_SWITCH_CFG, value ) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX HIBERNATE_SWITCH_CFG, value))
{
g_critical ("Cannot set value for property %s", HIBERNATE_SWITCH_CFG);
}
}
void
-button_battery_changed_cb (GtkWidget *w, XfconfChannel *channel)
+button_battery_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- GtkTreeModel *model;
- GtkTreeIter selected_row;
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
gint value = 0;
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
- model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
- gtk_tree_model_get (model,
- &selected_row,
- 1,
- &value,
- -1);
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
+ gtk_tree_model_get (model, &selected_row, 1, &value, -1);
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BATTERY_SWITCH_CFG, value ) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BATTERY_SWITCH_CFG, value))
{
g_critical ("Cannot set value for property %s", BATTERY_SWITCH_CFG);
}
}
-void
-combo_box_xfconf_property_changed_cb (XfconfChannel *channel, char *property,
- GValue *value, GtkWidget *combo_box)
+static void
+combo_box_xfconf_property_changed_cb (XfconfChannel *channel,
+ char *property,
+ GValue *value,
+ GtkWidget *combo_box)
{
if (G_VALUE_TYPE (value) == G_TYPE_INVALID)
set_combo_box_active_by_value (XFPM_DO_NOTHING, GTK_COMBO_BOX (combo_box));
@@ -380,7 +407,9 @@ combo_box_xfconf_property_changed_cb (XfconfChannel *channel, char *property,
set_combo_box_active_by_value (g_value_get_uint (value), GTK_COMBO_BOX (combo_box));
}
-void set_combo_box_active_by_value (guint new_value, GtkComboBox *combo_box)
+static void
+set_combo_box_active_by_value (guint new_value,
+ GtkComboBox *combo_box)
{
GtkTreeModel *list_store;
GtkTreeIter iter;
@@ -389,13 +418,12 @@ void set_combo_box_active_by_value (guint new_value, GtkComboBox *combo_box)
list_store = gtk_combo_box_get_model (combo_box);
- for ( valid = gtk_tree_model_get_iter_first (list_store, &iter);
- valid;
- valid = gtk_tree_model_iter_next (list_store, &iter) )
+ for (valid = gtk_tree_model_get_iter_first (list_store, &iter);
+ valid;
+ valid = gtk_tree_model_iter_next (list_store, &iter))
{
- gtk_tree_model_get (list_store, &iter,
- 1, &list_value, -1);
- if ( new_value == list_value )
+ gtk_tree_model_get (list_store, &iter, 1, &list_value, -1);
+ if (new_value == list_value)
{
gtk_combo_box_set_active_iter (combo_box, &iter);
break;
@@ -404,55 +432,48 @@ void set_combo_box_active_by_value (guint new_value, GtkComboBox *combo_box)
}
void
-on_ac_sleep_mode_changed_cb (GtkWidget *w, XfconfChannel *channel)
+on_ac_sleep_mode_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- GtkTreeModel *model;
- GtkTreeIter selected_row;
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
guint value = 0;
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
- return;
-
- model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
+ return;
- gtk_tree_model_get(model,
- &selected_row,
- 1,
- &value,
- -1);
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
+ gtk_tree_model_get (model, &selected_row, 1, &value, -1);
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_AC, value) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_AC, value))
{
g_critical ("Cannot set value for property %s", INACTIVITY_SLEEP_MODE_ON_AC);
}
}
void
-on_battery_sleep_mode_changed_cb (GtkWidget *w, XfconfChannel *channel)
+on_battery_sleep_mode_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- GtkTreeModel *model;
- GtkTreeIter selected_row;
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
guint value = 0;
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
- return;
-
- model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
+ return;
- gtk_tree_model_get(model,
- &selected_row,
- 1,
- &value,
- -1);
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
+ gtk_tree_model_get (model, &selected_row, 1, &value, -1);
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_BATTERY, value) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_BATTERY, value))
{
g_critical ("Cannot set value for property %s", INACTIVITY_SLEEP_MODE_ON_BATTERY);
}
}
void
-on_ac_power_profile_changed_cb (GtkWidget *w, XfconfChannel *channel)
+on_ac_power_profile_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
GtkTreeModel *model;
GtkTreeIter selected_row;
@@ -462,12 +483,7 @@ on_ac_power_profile_changed_cb (GtkWidget *w, XfconfChannel *channel)
return;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
-
- gtk_tree_model_get(model,
- &selected_row,
- 0,
- &profile,
- -1);
+ gtk_tree_model_get (model, &selected_row, 0, &profile, -1);
if (!xfconf_channel_set_string (channel, XFPM_PROPERTIES_PREFIX PROFILE_ON_AC, profile))
{
@@ -478,7 +494,8 @@ on_ac_power_profile_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
void
-on_battery_power_profile_changed_cb (GtkWidget *w, XfconfChannel *channel)
+on_battery_power_profile_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
GtkTreeModel *model;
GtkTreeIter selected_row;
@@ -488,12 +505,7 @@ on_battery_power_profile_changed_cb (GtkWidget *w, XfconfChannel *channel)
return;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
-
- gtk_tree_model_get(model,
- &selected_row,
- 0,
- &profile,
- -1);
+ gtk_tree_model_get (model, &selected_row, 0, &profile, -1);
if (!xfconf_channel_set_string (channel, XFPM_PROPERTIES_PREFIX PROFILE_ON_BATTERY, profile))
{
@@ -505,7 +517,9 @@ on_battery_power_profile_changed_cb (GtkWidget *w, XfconfChannel *channel)
gboolean
-dpms_toggled_cb (GtkWidget *w, gboolean is_active, XfconfChannel *channel)
+dpms_toggled_cb (GtkWidget *w,
+ gboolean is_active,
+ XfconfChannel *channel)
{
xfconf_channel_set_bool (channel, XFPM_PROPERTIES_PREFIX DPMS_ENABLED_CFG, is_active);
@@ -514,7 +528,7 @@ dpms_toggled_cb (GtkWidget *w, gboolean is_active, XfconfChannel *channel)
gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "dpms-sleep-label")), is_active);
gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "dpms-off-label")), is_active);
- if ( GTK_IS_WIDGET (on_battery_dpms_off ) )
+ if (GTK_IS_WIDGET (on_battery_dpms_off))
{
gtk_widget_set_sensitive (on_battery_dpms_off, is_active);
gtk_widget_set_sensitive (on_battery_dpms_sleep, is_active);
@@ -524,29 +538,30 @@ dpms_toggled_cb (GtkWidget *w, gboolean is_active, XfconfChannel *channel)
}
void
-sleep_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
+sleep_on_battery_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
GtkWidget *brg;
- gint off_value = (gint) gtk_range_get_value (GTK_RANGE (on_battery_dpms_off));
- gint sleep_value = (gint) gtk_range_get_value (GTK_RANGE (w));
+ gint off_value = (gint) gtk_range_get_value (GTK_RANGE (on_battery_dpms_off));
+ gint sleep_value = (gint) gtk_range_get_value (GTK_RANGE (w));
gint brightness_value;
- if ( off_value != 0 )
+ if (off_value != 0)
{
- if ( sleep_value >= off_value )
+ if (sleep_value >= off_value)
{
- gtk_range_set_value (GTK_RANGE(on_battery_dpms_off), sleep_value + 1 );
+ gtk_range_set_value (GTK_RANGE (on_battery_dpms_off), sleep_value + 1);
}
}
- if ( lcd_brightness )
+ if (lcd_brightness)
{
brg = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-inactivity-on-battery"));
brightness_value = MAX (BRIGHTNESS_DISABLED, 10 * (gint) gtk_range_get_value (GTK_RANGE (brg)));
- if ( sleep_value * 60 <= brightness_value && brightness_value != BRIGHTNESS_DISABLED)
+ if (sleep_value * 60 <= brightness_value && brightness_value != BRIGHTNESS_DISABLED)
{
- gtk_range_set_value (GTK_RANGE (brg), 0);
+ gtk_range_set_value (GTK_RANGE (brg), 0);
}
}
@@ -559,16 +574,17 @@ sleep_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
void
-off_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
+off_on_battery_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- gint off_value = (gint)gtk_range_get_value (GTK_RANGE(w));
- gint sleep_value = (gint)gtk_range_get_value (GTK_RANGE(on_battery_dpms_sleep));
+ gint off_value = (gint) gtk_range_get_value (GTK_RANGE (w));
+ gint sleep_value = (gint) gtk_range_get_value (GTK_RANGE (on_battery_dpms_sleep));
- if ( sleep_value != 0 )
+ if (sleep_value != 0)
{
- if ( off_value <= sleep_value )
+ if (off_value <= sleep_value)
{
- gtk_range_set_value (GTK_RANGE(on_battery_dpms_sleep), off_value -1 );
+ gtk_range_set_value (GTK_RANGE (on_battery_dpms_sleep), off_value - 1);
}
}
@@ -581,32 +597,33 @@ off_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
void
-sleep_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
+sleep_on_ac_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
GtkWidget *brg;
gint brightness_value;
- gint off_value = (gint)gtk_range_get_value (GTK_RANGE (on_ac_dpms_off));
- gint sleep_value = (gint)gtk_range_get_value (GTK_RANGE (w));
+ gint off_value = (gint) gtk_range_get_value (GTK_RANGE (on_ac_dpms_off));
+ gint sleep_value = (gint) gtk_range_get_value (GTK_RANGE (w));
- if ( off_value > 60 || sleep_value > 60 )
+ if (off_value > 60 || sleep_value > 60)
return;
- if ( off_value != 0 )
+ if (off_value != 0)
{
- if ( sleep_value >= off_value )
+ if (sleep_value >= off_value)
{
- gtk_range_set_value (GTK_RANGE(on_ac_dpms_off), sleep_value + 1 );
+ gtk_range_set_value (GTK_RANGE (on_ac_dpms_off), sleep_value + 1);
}
}
- if ( lcd_brightness )
+ if (lcd_brightness)
{
brg = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-inactivity-on-ac"));
brightness_value = MAX (BRIGHTNESS_DISABLED, 10 * (gint) gtk_range_get_value (GTK_RANGE (brg)));
- if ( sleep_value * 60 <= brightness_value && brightness_value != BRIGHTNESS_DISABLED)
+ if (sleep_value * 60 <= brightness_value && brightness_value != BRIGHTNESS_DISABLED)
{
gtk_range_set_value (GTK_RANGE (brg), 0);
}
@@ -621,19 +638,20 @@ sleep_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
void
-off_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
+off_on_ac_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- gint off_value = (gint)gtk_range_get_value (GTK_RANGE(w));
- gint sleep_value = (gint)gtk_range_get_value (GTK_RANGE(on_ac_dpms_sleep));
+ gint off_value = (gint) gtk_range_get_value (GTK_RANGE (w));
+ gint sleep_value = (gint) gtk_range_get_value (GTK_RANGE (on_ac_dpms_sleep));
- if ( off_value > 60 || sleep_value > 60 )
+ if (off_value > 60 || sleep_value > 60)
return;
- if ( sleep_value != 0 )
+ if (sleep_value != 0)
{
- if ( off_value <= sleep_value )
+ if (off_value <= sleep_value)
{
- gtk_range_set_value (GTK_RANGE(on_ac_dpms_sleep), off_value -1 );
+ gtk_range_set_value (GTK_RANGE (on_ac_dpms_sleep), off_value - 1);
}
}
@@ -648,85 +666,94 @@ off_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
/*
* Format value of GtkRange used with DPMS
*/
-gchar *
+static gchar *
format_dpms_value_cb (gint value)
{
- if ( value == 0 )
+ if (value == 0)
return g_strdup (_("Never"));
- if ( value == 1 )
+ if (value == 1)
return g_strdup (_("One minute"));
return g_strdup_printf ("%d %s", value, _("minutes"));
}
-gchar *
+static gchar *
format_inactivity_value_cb (gint value)
{
gint h, min;
- if ( value == 0 )
+ if (value == 0)
return g_strdup (_("Never"));
- else if ( value < 60 )
+ else if (value < 60)
return g_strdup_printf ("%d %s", value, _("minutes"));
- else if ( value == 60 )
+ else if (value == 60)
return g_strdup (_("One hour"));
/* value > 60 */
- h = value/60;
- min = value%60;
-
- if ( h <= 1 )
- if ( min == 0 ) return g_strdup_printf ("%s", _("One hour"));
- else if ( min == 1 ) return g_strdup_printf ("%s %s", _("One hour"), _("one minute"));
- else return g_strdup_printf ("%s %d %s", _("One hour"), min, _("minutes"));
+ h = value / 60;
+ min = value % 60;
+
+ if (h <= 1)
+ if (min == 0)
+ return g_strdup_printf ("%s", _("One hour"));
+ else if (min == 1)
+ return g_strdup_printf ("%s %s", _("One hour"), _("one minute"));
+ else
+ return g_strdup_printf ("%s %d %s", _("One hour"), min, _("minutes"));
+ else if (min == 0)
+ return g_strdup_printf ("%d %s", h, _("hours"));
+ else if (min == 1)
+ return g_strdup_printf ("%d %s %s", h, _("hours"), _("one minute"));
else
- if ( min == 0 ) return g_strdup_printf ("%d %s", h, _("hours"));
- else if ( min == 1 ) return g_strdup_printf ("%d %s %s", h, _("hours"), _("one minute"));
- else return g_strdup_printf ("%d %s %d %s", h, _("hours"), min, _("minutes"));
+ return g_strdup_printf ("%d %s %d %s", h, _("hours"), min, _("minutes"));
}
/*
* Format value of GtkRange used with Brightness
*/
-gchar *
+static gchar *
format_brightness_value_cb (gint value)
{
gint min, sec;
- if ( value < 1 )
+ if (value < 1)
return g_strdup (_("Never"));
/* value > 6 */
- min = value/6;
- sec = 10*(value%6);
+ min = value / 6;
+ sec = 10 * (value % 6);
- if ( min == 0 )
+ if (min == 0)
return g_strdup_printf ("%d %s", sec, _("seconds"));
- else if ( min == 1 )
- if ( sec == 0 ) return g_strdup_printf ("%s", _("One minute"));
- else return g_strdup_printf ("%s %d %s", _("One minute"), sec, _("seconds"));
+ else if (min == 1)
+ if (sec == 0)
+ return g_strdup_printf ("%s", _("One minute"));
+ else
+ return g_strdup_printf ("%s %d %s", _("One minute"), sec, _("seconds"));
+ else if (sec == 0)
+ return g_strdup_printf ("%d %s", min, _("minutes"));
else
- if ( sec == 0 ) return g_strdup_printf ("%d %s", min, _("minutes"));
- else return g_strdup_printf ("%d %s %d %s", min, _("minutes"), sec, _("seconds"));
+ return g_strdup_printf ("%d %s %d %s", min, _("minutes"), sec, _("seconds"));
}
-gchar *
+static gchar *
format_brightness_percentage_cb (gint value)
{
return g_strdup_printf ("%d %s", value, _("%"));
}
void
-brightness_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
+brightness_on_battery_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- gint value = MAX (BRIGHTNESS_DISABLED, 10 * (gint)gtk_range_get_value (GTK_RANGE (w)));
- gint dpms_sleep = (gint) gtk_range_get_value (GTK_RANGE (on_battery_dpms_sleep) );
+ gint value = MAX (BRIGHTNESS_DISABLED, 10 * (gint) gtk_range_get_value (GTK_RANGE (w)));
+ gint dpms_sleep = (gint) gtk_range_get_value (GTK_RANGE (on_battery_dpms_sleep));
- if ( value != BRIGHTNESS_DISABLED )
+ if (value != BRIGHTNESS_DISABLED)
{
- if ( dpms_sleep != 0 && dpms_sleep * 60 <= value)
+ if (dpms_sleep != 0 && dpms_sleep * 60 <= value)
{
gtk_range_set_value (GTK_RANGE (on_battery_dpms_sleep), (value / 60) + 1);
}
@@ -741,14 +768,15 @@ brightness_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
void
-brightness_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
+brightness_on_ac_value_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- gint value = MAX (BRIGHTNESS_DISABLED, 10 * (gint)gtk_range_get_value (GTK_RANGE (w)));
- gint dpms_sleep = (gint) gtk_range_get_value (GTK_RANGE (on_ac_dpms_sleep) );
+ gint value = MAX (BRIGHTNESS_DISABLED, 10 * (gint) gtk_range_get_value (GTK_RANGE (w)));
+ gint dpms_sleep = (gint) gtk_range_get_value (GTK_RANGE (on_ac_dpms_sleep));
- if ( value != BRIGHTNESS_DISABLED )
+ if (value != BRIGHTNESS_DISABLED)
{
- if ( dpms_sleep != 0 && dpms_sleep * 60 <= value)
+ if (dpms_sleep != 0 && dpms_sleep * 60 <= value)
{
gtk_range_set_value (GTK_RANGE (on_ac_dpms_sleep), (value / 60) + 1);
}
@@ -763,30 +791,26 @@ brightness_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
void
-on_battery_lid_changed_cb (GtkWidget *w, XfconfChannel *channel)
+on_battery_lid_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- GtkTreeModel *model;
- GtkTreeIter selected_row;
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
gint value = 0;
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
- model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
- gtk_tree_model_get (model,
- &selected_row,
- 1,
- &value,
- -1);
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
+ gtk_tree_model_get (model, &selected_row, 1, &value, -1);
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_BATTERY_CFG, value) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_BATTERY_CFG, value))
{
g_critical ("Cannot set value for property %s", LID_SWITCH_ON_BATTERY_CFG);
}
/* Light Locker Integration */
- if ( light_locker_settings )
+ if (light_locker_settings)
{
xfpm_update_logind_handle_lid_switch (channel);
}
@@ -794,30 +818,26 @@ on_battery_lid_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
void
-on_ac_lid_changed_cb (GtkWidget *w, XfconfChannel *channel)
+on_ac_lid_changed_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- GtkTreeModel *model;
- GtkTreeIter selected_row;
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
gint value = 0;
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
- model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
- gtk_tree_model_get (model,
- &selected_row,
- 1,
- &value,
- -1);
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (w));
+ gtk_tree_model_get (model, &selected_row, 1, &value, -1);
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_AC_CFG, value) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_AC_CFG, value))
{
g_critical ("Cannot set value for property %s", LID_SWITCH_ON_AC_CFG);
}
/* Light Locker Integration */
- if ( light_locker_settings )
+ if (light_locker_settings)
{
xfpm_update_logind_handle_lid_switch (channel);
}
@@ -825,18 +845,21 @@ on_ac_lid_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
void
-critical_level_value_changed_cb (GtkSpinButton *w, XfconfChannel *channel)
+critical_level_value_changed_cb (GtkSpinButton *w,
+ XfconfChannel *channel)
{
guint val = (guint) gtk_spin_button_get_value (w);
- if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_POWER_LEVEL, val) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_POWER_LEVEL, val))
{
g_critical ("Unable to set value %d for property %s", val, CRITICAL_POWER_LEVEL);
}
}
gboolean
-handle_brightness_keys_toggled_cb (GtkWidget *w, gboolean is_active, XfconfChannel *channel)
+handle_brightness_keys_toggled_cb (GtkWidget *w,
+ gboolean is_active,
+ XfconfChannel *channel)
{
gtk_widget_set_sensitive (brightness_step_count, is_active);
gtk_widget_set_sensitive (brightness_exponential, is_active);
@@ -846,30 +869,31 @@ handle_brightness_keys_toggled_cb (GtkWidget *w, gboolean is_active, XfconfChann
}
void
-lock_screen_toggled_cb (GtkWidget *w, XfconfChannel *channel)
+lock_screen_toggled_cb (GtkWidget *w,
+ XfconfChannel *channel)
{
- gboolean val = (gint) gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
+ gboolean val = (gint) gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- if ( !xfconf_channel_set_bool (channel, XFPM_PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, val) )
+ if (!xfconf_channel_set_bool (channel, XFPM_PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, val))
{
g_critical ("Unable to set value for property %s", LOCK_SCREEN_ON_SLEEP);
}
/* Light Locker Integration */
- if ( light_locker_settings )
+ if (light_locker_settings)
{
GVariant *variant;
variant = g_variant_new_boolean (val);
if (!g_settings_set_value (light_locker_settings, "lock-on-suspend", variant))
g_critical ("Cannot set value for property lock-on-suspend");
- xfpm_update_logind_handle_lid_switch (channel);
+ xfpm_update_logind_handle_lid_switch (channel);
}
/* END Light Locker Integration */
}
/* Light Locker Integration */
-void
+static void
xfpm_update_logind_handle_lid_switch (XfconfChannel *channel)
{
gboolean lock_on_suspend = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, TRUE);
@@ -882,10 +906,14 @@ xfpm_update_logind_handle_lid_switch (XfconfChannel *channel)
/* END Light Locker Integration */
static void
-xfpm_settings_on_battery (XfconfChannel *channel, GDBusProxy *profiles_proxy,
- gboolean auth_suspend, gboolean auth_hibernate,
- gboolean can_suspend, gboolean can_hibernate,
- gboolean can_shutdown, gboolean has_lcd_brightness,
+xfpm_settings_on_battery (XfconfChannel *channel,
+ GDBusProxy *profiles_proxy,
+ gboolean auth_suspend,
+ gboolean auth_hibernate,
+ gboolean can_suspend,
+ gboolean can_hibernate,
+ gboolean can_shutdown,
+ gboolean has_lcd_brightness,
gboolean has_lid)
{
gboolean valid, handle_dpms;
@@ -906,14 +934,14 @@ xfpm_settings_on_battery (XfconfChannel *channel, GDBusProxy *profiles_proxy,
*/
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
inact_action = GTK_WIDGET (gtk_builder_get_object (xml, "system-sleep-mode-on-battery"));
- gtk_combo_box_set_model (GTK_COMBO_BOX(inact_action), GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (inact_action), GTK_TREE_MODEL (list_store));
- if ( can_suspend )
+ if (can_suspend)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- else if ( !auth_suspend )
+ else if (!auth_suspend)
{
gtk_widget_set_tooltip_text (inact_action, _("Suspend operation not permitted"));
}
@@ -922,12 +950,12 @@ xfpm_settings_on_battery (XfconfChannel *channel, GDBusProxy *profiles_proxy,
gtk_widget_set_tooltip_text (inact_action, _("Suspend operation not supported"));
}
- if ( can_hibernate )
+ if (can_hibernate)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
}
- else if ( !auth_hibernate )
+ else if (!auth_hibernate)
{
gtk_widget_set_tooltip_text (inact_action, _("Hibernate operation not permitted"));
}
@@ -942,13 +970,12 @@ xfpm_settings_on_battery (XfconfChannel *channel, GDBusProxy *profiles_proxy,
XFPM_PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_BATTERY,
XFPM_DO_HIBERNATE);
- for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
- valid;
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
+ for (valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
+ valid;
+ valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter))
{
- gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
- 1, &list_value, -1);
- if ( val == list_value )
+ gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, 1, &list_value, -1);
+ if (val == list_value)
{
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (inact_action), &iter);
break;
@@ -960,12 +987,12 @@ xfpm_settings_on_battery (XfconfChannel *channel, GDBusProxy *profiles_proxy,
*/
inact_timeout = GTK_WIDGET (gtk_builder_get_object (xml, "system-sleep-inactivity-on-battery"));
- if ( !can_suspend && !can_hibernate )
+ if (!can_suspend && !can_hibernate)
{
gtk_widget_set_sensitive (inact_timeout, FALSE);
gtk_widget_set_tooltip_text (inact_timeout, _("Hibernate and suspend operations not supported"));
}
- else if ( !auth_suspend && !auth_hibernate )
+ else if (!auth_suspend && !auth_hibernate)
{
gtk_widget_set_sensitive (inact_timeout, FALSE);
gtk_widget_set_tooltip_text (inact_timeout, _("Hibernate and suspend operations not permitted"));
@@ -982,41 +1009,40 @@ xfpm_settings_on_battery (XfconfChannel *channel, GDBusProxy *profiles_proxy,
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
- gtk_combo_box_set_model (GTK_COMBO_BOX(battery_critical), GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (battery_critical), GTK_TREE_MODEL (list_store));
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, XFPM_DO_NOTHING, -1);
- if ( can_suspend && auth_suspend )
+ if (can_suspend && auth_suspend)
{
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- if ( can_hibernate && auth_hibernate )
+ if (can_hibernate && auth_hibernate)
{
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
}
- if ( can_shutdown )
+ if (can_shutdown)
{
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, XFPM_DO_SHUTDOWN, -1);
}
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, XFPM_ASK, -1);
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_BATT_ACTION_CFG, XFPM_DO_NOTHING);
- for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
- valid;
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
+ for (valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
+ valid;
+ valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter))
{
- gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
- 1, &list_value, -1);
- if ( val == list_value )
+ gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, 1, &list_value, -1);
+ if (val == list_value)
{
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (battery_critical), &iter);
break;
@@ -1029,61 +1055,60 @@ xfpm_settings_on_battery (XfconfChannel *channel, GDBusProxy *profiles_proxy,
handle_dpms = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX ON_BATT_DPMS_SLEEP, 5);
- gtk_range_set_value (GTK_RANGE(on_battery_dpms_sleep), val);
+ gtk_range_set_value (GTK_RANGE (on_battery_dpms_sleep), val);
gtk_widget_set_sensitive (on_battery_dpms_sleep, handle_dpms);
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX ON_BATT_DPMS_OFF, 10);
- gtk_range_set_value (GTK_RANGE(on_battery_dpms_off), val);
+ gtk_range_set_value (GTK_RANGE (on_battery_dpms_off), val);
gtk_widget_set_sensitive (on_battery_dpms_off, handle_dpms);
/*
* Lid switch settings on battery
*/
lid = GTK_WIDGET (gtk_builder_get_object (xml, "lid-on-battery-combo"));
- if ( has_lid )
+ if (has_lid)
{
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
- gtk_combo_box_set_model (GTK_COMBO_BOX(lid), GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (lid), GTK_TREE_MODEL (list_store));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Switch off display"), 1, LID_TRIGGER_DPMS, -1);
- if ( can_suspend && auth_suspend )
+ if (can_suspend && auth_suspend)
{
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, LID_TRIGGER_SUSPEND, -1);
}
- if ( can_hibernate && auth_hibernate)
+ if (can_hibernate && auth_hibernate)
{
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, LID_TRIGGER_HIBERNATE, -1);
}
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Lock screen"), 1, LID_TRIGGER_LOCK_SCREEN, -1);
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, LID_TRIGGER_NOTHING, -1);
gtk_combo_box_set_active (GTK_COMBO_BOX (lid), 0);
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_BATTERY_CFG, LID_TRIGGER_LOCK_SCREEN);
- for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
- valid;
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
+ for (valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
+ valid;
+ valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter))
{
- gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
- 1, &list_value, -1);
- if ( val == list_value )
+ gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, 1, &list_value, -1);
+ if (val == list_value)
{
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (lid), &iter);
break;
}
}
- }
+ }
else
{
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml, "lid-action-label")));
@@ -1118,8 +1143,7 @@ xfpm_settings_on_battery (XfconfChannel *channel, GDBusProxy *profiles_proxy,
{
gchar *profile_value;
- gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
- 0, &profile_value, -1);
+ gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, 0, &profile_value, -1);
if (g_strcmp0 (profile_value, enabled_profile) == 0)
{
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (power_profile), &iter);
@@ -1143,12 +1167,12 @@ xfpm_settings_on_battery (XfconfChannel *channel, GDBusProxy *profiles_proxy,
/*
* Brightness on battery
*/
- brg = GTK_WIDGET (gtk_builder_get_object (xml ,"brightness-inactivity-on-battery"));
- brg_level = GTK_WIDGET (gtk_builder_get_object (xml ,"brightness-level-on-battery"));
- if ( has_lcd_brightness )
+ brg = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-inactivity-on-battery"));
+ brg_level = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-level-on-battery"));
+ if (has_lcd_brightness)
{
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_ON_BATTERY, 300);
- gtk_range_set_value (GTK_RANGE(brg), val / 10);
+ gtk_range_set_value (GTK_RANGE (brg), val / 10);
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_BATTERY, 20);
gtk_range_set_value (GTK_RANGE (brg_level), val);
@@ -1173,10 +1197,14 @@ xfpm_settings_on_battery (XfconfChannel *channel, GDBusProxy *profiles_proxy,
}
static void
-xfpm_settings_on_ac (XfconfChannel *channel, GDBusProxy *profiles_proxy,
- gboolean auth_suspend, gboolean auth_hibernate,
- gboolean can_suspend, gboolean can_hibernate,
- gboolean has_lcd_brightness, gboolean has_lid)
+xfpm_settings_on_ac (XfconfChannel *channel,
+ GDBusProxy *profiles_proxy,
+ gboolean auth_suspend,
+ gboolean auth_hibernate,
+ gboolean can_suspend,
+ gboolean can_hibernate,
+ gboolean has_lcd_brightness,
+ gboolean has_lid)
{
gboolean valid, handle_dpms;
GtkWidget *inact_timeout, *inact_action;
@@ -1195,14 +1223,14 @@ xfpm_settings_on_ac (XfconfChannel *channel, GDBusProxy *profiles_proxy,
*/
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
inact_action = GTK_WIDGET (gtk_builder_get_object (xml, "system-sleep-mode-on-ac"));
- gtk_combo_box_set_model (GTK_COMBO_BOX(inact_action), GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (inact_action), GTK_TREE_MODEL (list_store));
- if ( can_suspend )
+ if (can_suspend)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- else if ( !auth_suspend )
+ else if (!auth_suspend)
{
gtk_widget_set_tooltip_text (inact_action, _("Suspend operation not permitted"));
}
@@ -1211,12 +1239,12 @@ xfpm_settings_on_ac (XfconfChannel *channel, GDBusProxy *profiles_proxy,
gtk_widget_set_tooltip_text (inact_action, _("Suspend operation not supported"));
}
- if ( can_hibernate )
+ if (can_hibernate)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
}
- else if ( !auth_hibernate )
+ else if (!auth_hibernate)
{
gtk_widget_set_tooltip_text (inact_action, _("Hibernate operation not permitted"));
}
@@ -1231,13 +1259,12 @@ xfpm_settings_on_ac (XfconfChannel *channel, GDBusProxy *profiles_proxy,
XFPM_PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_AC,
XFPM_DO_SUSPEND);
- for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
- valid;
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
+ for (valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
+ valid;
+ valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter))
{
- gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
- 1, &list_value, -1);
- if ( val == list_value )
+ gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, 1, &list_value, -1);
+ if (val == list_value)
{
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (inact_action), &iter);
break;
@@ -1249,12 +1276,12 @@ xfpm_settings_on_ac (XfconfChannel *channel, GDBusProxy *profiles_proxy,
*/
inact_timeout = GTK_WIDGET (gtk_builder_get_object (xml, "system-sleep-inactivity-on-ac"));
- if ( !can_suspend && !can_hibernate )
+ if (!can_suspend && !can_hibernate)
{
gtk_widget_set_sensitive (inact_timeout, FALSE);
gtk_widget_set_tooltip_text (inact_timeout, _("Hibernate and suspend operations not supported"));
}
- else if ( !auth_suspend && !auth_hibernate )
+ else if (!auth_suspend && !auth_hibernate)
{
gtk_widget_set_sensitive (inact_timeout, FALSE);
gtk_widget_set_tooltip_text (inact_timeout, _("Hibernate and suspend operations not permitted"));
@@ -1273,50 +1300,49 @@ xfpm_settings_on_ac (XfconfChannel *channel, GDBusProxy *profiles_proxy,
gtk_widget_set_sensitive (on_ac_dpms_sleep, handle_dpms);
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX ON_AC_DPMS_OFF, 15);
- gtk_range_set_value (GTK_RANGE(on_ac_dpms_off), val);
+ gtk_range_set_value (GTK_RANGE (on_ac_dpms_off), val);
gtk_widget_set_sensitive (on_ac_dpms_off, handle_dpms);
/*
* Lid switch settings on AC power
*/
lid = GTK_WIDGET (gtk_builder_get_object (xml, "lid-on-ac-combo"));
- if ( has_lid )
+ if (has_lid)
{
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
- gtk_combo_box_set_model (GTK_COMBO_BOX(lid), GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (lid), GTK_TREE_MODEL (list_store));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Switch off display"), 1, LID_TRIGGER_DPMS, -1);
- if ( can_suspend && auth_suspend )
+ if (can_suspend && auth_suspend)
{
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, LID_TRIGGER_SUSPEND, -1);
}
- if ( can_hibernate && auth_hibernate )
+ if (can_hibernate && auth_hibernate)
{
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, LID_TRIGGER_HIBERNATE, -1);
}
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Lock screen"), 1, LID_TRIGGER_LOCK_SCREEN, -1);
- gtk_list_store_append(list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, LID_TRIGGER_NOTHING, -1);
gtk_combo_box_set_active (GTK_COMBO_BOX (lid), 0);
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_AC_CFG, LID_TRIGGER_LOCK_SCREEN);
- for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
- valid;
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
+ for (valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
+ valid;
+ valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter))
{
- gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
- 1, &list_value, -1);
- if ( val == list_value )
+ gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, 1, &list_value, -1);
+ if (val == list_value)
{
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (lid), &iter);
break;
@@ -1357,8 +1383,7 @@ xfpm_settings_on_ac (XfconfChannel *channel, GDBusProxy *profiles_proxy,
{
gchar *profile_value;
- gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
- 0, &profile_value, -1);
+ gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, 0, &profile_value, -1);
if (g_strcmp0 (profile_value, enabled_profile) == 0)
{
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (power_profile), &iter);
@@ -1380,12 +1405,12 @@ xfpm_settings_on_ac (XfconfChannel *channel, GDBusProxy *profiles_proxy,
/*
* Brightness on AC power
*/
- brg = GTK_WIDGET (gtk_builder_get_object (xml ,"brightness-inactivity-on-ac"));
- brg_level = GTK_WIDGET (gtk_builder_get_object (xml ,"brightness-level-on-ac"));
- if ( has_lcd_brightness )
+ brg = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-inactivity-on-ac"));
+ brg_level = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-level-on-ac"));
+ if (has_lcd_brightness)
{
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_ON_AC, BRIGHTNESS_DISABLED);
- gtk_range_set_value (GTK_RANGE(brg), val / 10);
+ gtk_range_set_value (GTK_RANGE (brg), val / 10);
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_AC, 80);
gtk_range_set_value (GTK_RANGE (brg_level), val);
@@ -1410,11 +1435,16 @@ xfpm_settings_on_ac (XfconfChannel *channel, GDBusProxy *profiles_proxy,
}
static void
-xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
- gboolean auth_hibernate, gboolean can_suspend,
- gboolean can_hibernate, gboolean can_shutdown,
- gboolean has_sleep_button, gboolean has_hibernate_button,
- gboolean has_power_button, gboolean has_battery_button)
+xfpm_settings_general (XfconfChannel *channel,
+ gboolean auth_suspend,
+ gboolean auth_hibernate,
+ gboolean can_suspend,
+ gboolean can_hibernate,
+ gboolean can_shutdown,
+ gboolean has_sleep_button,
+ gboolean has_hibernate_button,
+ gboolean has_power_button,
+ gboolean has_battery_button)
{
GtkWidget *power;
GtkWidget *power_label;
@@ -1426,7 +1456,7 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
GtkWidget *battery_label;
GtkWidget *dpms;
- guint value;
+ guint value;
gboolean valid;
gboolean val;
@@ -1448,26 +1478,26 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
power = GTK_WIDGET (gtk_builder_get_object (xml, "button-power-combo"));
power_label = GTK_WIDGET (gtk_builder_get_object (xml, "button-power-label"));
- if ( has_power_button )
+ if (has_power_button)
{
- gtk_combo_box_set_model (GTK_COMBO_BOX(power), GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (power), GTK_TREE_MODEL (list_store));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, XFPM_DO_NOTHING, -1);
- if ( can_suspend && auth_suspend)
+ if (can_suspend && auth_suspend)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- if ( can_hibernate && auth_hibernate )
+ if (can_hibernate && auth_hibernate)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
}
- if ( can_shutdown )
+ if (can_shutdown)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, XFPM_DO_SHUTDOWN, -1);
@@ -1498,20 +1528,20 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
hibernate = GTK_WIDGET (gtk_builder_get_object (xml, "button-hibernate-combo"));
hibernate_label = GTK_WIDGET (gtk_builder_get_object (xml, "button-hibernate-label"));
- if (has_hibernate_button )
+ if (has_hibernate_button)
{
- gtk_combo_box_set_model (GTK_COMBO_BOX(hibernate), GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (hibernate), GTK_TREE_MODEL (list_store));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, XFPM_DO_NOTHING, -1);
- if ( can_suspend && auth_suspend)
+ if (can_suspend && auth_suspend)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- if ( can_hibernate && auth_hibernate )
+ if (can_hibernate && auth_hibernate)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
@@ -1542,20 +1572,20 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
sleep_w = GTK_WIDGET (gtk_builder_get_object (xml, "button-sleep-combo"));
sleep_label = GTK_WIDGET (gtk_builder_get_object (xml, "button-sleep-label"));
- if ( has_sleep_button )
+ if (has_sleep_button)
{
- gtk_combo_box_set_model (GTK_COMBO_BOX(sleep_w), GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (sleep_w), GTK_TREE_MODEL (list_store));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, XFPM_DO_NOTHING, -1);
- if ( can_suspend && auth_suspend )
+ if (can_suspend && auth_suspend)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- if ( can_hibernate && auth_hibernate)
+ if (can_hibernate && auth_hibernate)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
@@ -1586,20 +1616,20 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
battery_w = GTK_WIDGET (gtk_builder_get_object (xml, "button-battery-combo"));
battery_label = GTK_WIDGET (gtk_builder_get_object (xml, "button-battery-label"));
- if ( has_battery_button )
+ if (has_battery_button)
{
- gtk_combo_box_set_model (GTK_COMBO_BOX(battery_w), GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (battery_w), GTK_TREE_MODEL (list_store));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, XFPM_DO_NOTHING, -1);
- if ( can_suspend && auth_suspend )
+ if (can_suspend && auth_suspend)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- if ( can_hibernate && auth_hibernate)
+ if (can_hibernate && auth_hibernate)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
@@ -1628,7 +1658,7 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
*/
brightness_step_count = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-step-count-spin"));
gtk_widget_set_tooltip_text (brightness_step_count,
- _("Number of brightness steps available using keys"));
+ _("Number of brightness steps available using keys"));
xfconf_g_property_bind (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_STEP_COUNT,
G_TYPE_UINT, brightness_step_count, "value");
@@ -1648,9 +1678,12 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
}
static void
-xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
- gboolean auth_hibernate, gboolean can_suspend,
- gboolean can_hibernate, gboolean has_battery)
+xfpm_settings_advanced (XfconfChannel *channel,
+ gboolean auth_suspend,
+ gboolean auth_hibernate,
+ gboolean can_suspend,
+ gboolean can_hibernate,
+ gboolean has_battery)
{
guint val;
GtkWidget *critical_level;
@@ -1661,24 +1694,24 @@ xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
* Critical battery level
*/
critical_level = GTK_WIDGET (gtk_builder_get_object (xml, "critical-power-level-spin"));
- if ( has_battery )
+ if (has_battery)
{
gtk_widget_set_tooltip_text (critical_level,
- _("When all the power sources of the computer reach this charge level"));
+ _("When all the power sources of the computer reach this charge level"));
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_POWER_LEVEL, 10);
- if ( val > 20 || val < 1)
+ if (val > 20 || val < 1)
{
g_critical ("Value %d if out of range for property %s", val, CRITICAL_POWER_LEVEL);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(critical_level), 10);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (critical_level), 10);
}
else
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(critical_level), val);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (critical_level), val);
}
else
{
- label = GTK_WIDGET (gtk_builder_get_object (xml, "critical-power-level-label" ));
+ label = GTK_WIDGET (gtk_builder_get_object (xml, "critical-power-level-label"));
gtk_widget_hide (critical_level);
gtk_widget_hide (label);
}
@@ -1688,36 +1721,37 @@ xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
*/
lock = GTK_WIDGET (gtk_builder_get_object (xml, "lock-screen"));
- if ( !can_suspend && !can_hibernate )
+ if (!can_suspend && !can_hibernate)
{
gtk_widget_set_sensitive (lock, FALSE);
gtk_widget_set_tooltip_text (lock, _("Hibernate and suspend operations not supported"));
}
- else if ( !auth_hibernate && !auth_suspend)
+ else if (!auth_hibernate && !auth_suspend)
{
gtk_widget_set_sensitive (lock, FALSE);
gtk_widget_set_tooltip_text (lock, _("Hibernate and suspend operations not permitted"));
}
val = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(lock), val);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lock), val);
}
/* Light Locker Integration */
-static gchar*
+static gchar *
get_light_locker_path (void)
{
- gchar** paths = NULL;
- gchar* path = NULL;
+ gchar **paths = NULL;
+ gchar *path = NULL;
unsigned int i = 0;
/* Check if executable is in path */
paths = g_strsplit (g_getenv ("PATH"), ":", 0);
- for (i = 0; i < g_strv_length (paths); i++) {
+ for (i = 0; i < g_strv_length (paths); i++)
+ {
path = g_strdup (g_build_filename (paths[i], "light-locker", NULL));
if (g_file_test (path, G_FILE_TEST_EXISTS))
{
- break;
+ break;
}
g_free (path);
path = NULL;
@@ -1727,12 +1761,12 @@ get_light_locker_path (void)
return path;
}
-gchar *
+static gchar *
format_light_locker_value_cb (gint value)
{
- if ( value <= 0 )
+ if (value <= 0)
return g_strdup (_("Never"));
- else if ( value < 60 )
+ else if (value < 60)
return g_strdup_printf ("%d %s", value, _("seconds"));
else
{
@@ -1742,12 +1776,14 @@ format_light_locker_value_cb (gint value)
}
void
-light_locker_late_locking_value_changed_cb (GtkWidget *widget, XfconfChannel *channel)
+light_locker_late_locking_value_changed_cb (GtkWidget *widget,
+ XfconfChannel *channel)
{
GVariant *variant;
- gint value = (gint)gtk_range_get_value (GTK_RANGE (widget));
+ gint value = (gint) gtk_range_get_value (GTK_RANGE (widget));
- if (value > 60) {
+ if (value > 60)
+ {
value = ((value - 60) + 1) * 60;
}
@@ -1762,22 +1798,25 @@ light_locker_late_locking_value_changed_cb (GtkWidget *widget, XfconfChannel *ch
}
void
-light_locker_automatic_locking_changed_cb (GtkWidget *widget, XfconfChannel *channel)
+light_locker_automatic_locking_changed_cb (GtkWidget *widget,
+ XfconfChannel *channel)
{
GVariant *variant;
- gint value;
- gint lock_after_screensaver;
- gboolean late_locking = FALSE;
+ gint value;
+ gint lock_after_screensaver;
+ gboolean late_locking = FALSE;
- value = gtk_combo_box_get_active (GTK_COMBO_BOX(widget));
+ value = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
gtk_widget_set_sensitive (light_locker_delay, value != 0);
if (value == 0)
lock_after_screensaver = 0;
- else {
- lock_after_screensaver = (gint)gtk_range_get_value (GTK_RANGE (light_locker_delay));
- if (lock_after_screensaver > 60) {
- lock_after_screensaver = (lock_after_screensaver - 60) * 60;
+ else
+ {
+ lock_after_screensaver = (gint) gtk_range_get_value (GTK_RANGE (light_locker_delay));
+ if (lock_after_screensaver > 60)
+ {
+ lock_after_screensaver = (lock_after_screensaver - 60) * 60;
}
}
@@ -1793,16 +1832,19 @@ light_locker_automatic_locking_changed_cb (GtkWidget *widget, XfconfChannel *cha
g_critical ("Cannot set value for property late-locking");
}
-static void xfpm_settings_light_locker (XfconfChannel *channel,
- gboolean auth_suspend, gboolean auth_hibernate,
- gboolean can_suspend, gboolean can_hibernate)
+static void
+xfpm_settings_light_locker (XfconfChannel *channel,
+ gboolean auth_suspend,
+ gboolean auth_hibernate,
+ gboolean can_suspend,
+ gboolean can_hibernate)
{
GSettingsSchemaSource *schema_source;
- GSettingsSchema *schema;
- GVariant *variant;
- gboolean late_locking, lock_on_suspend, xfpm_lock_on_suspend;
- guint32 lock_after_screensaver;
- GtkWidget *security_frame;
+ GSettingsSchema *schema;
+ GVariant *variant;
+ gboolean late_locking, lock_on_suspend, xfpm_lock_on_suspend;
+ guint32 lock_after_screensaver;
+ GtkWidget *security_frame;
/* Collect the Light Locker widgets */
light_locker_tab = GTK_WIDGET (gtk_builder_get_object (xml, "light-locker-vbox1"));
@@ -1810,21 +1852,21 @@ static void xfpm_settings_light_locker (XfconfChannel *channel,
light_locker_delay = GTK_WIDGET (gtk_builder_get_object (xml, "light-locker-late-locking-scale"));
light_locker_sleep = GTK_WIDGET (gtk_builder_get_object (xml, "light-locker-suspend"));
- if ( !can_suspend && !can_hibernate )
+ if (!can_suspend && !can_hibernate)
{
gtk_widget_set_sensitive (light_locker_sleep, FALSE);
gtk_widget_set_tooltip_text (light_locker_sleep, _("Hibernate and suspend operations not supported"));
}
- else if ( !auth_hibernate && !auth_suspend)
+ else if (!auth_hibernate && !auth_suspend)
{
gtk_widget_set_sensitive (light_locker_sleep, FALSE);
gtk_widget_set_tooltip_text (light_locker_sleep, _("Hibernate and suspend operations not permitted"));
}
- schema_source = g_settings_schema_source_get_default();
+ schema_source = g_settings_schema_source_get_default ();
schema = g_settings_schema_source_lookup (schema_source, "apps.light-locker", TRUE);
- if (schema != NULL && get_light_locker_path() != NULL)
+ if (schema != NULL && get_light_locker_path () != NULL)
{
security_frame = GTK_WIDGET (gtk_builder_get_object (xml, "security-frame"));
gtk_widget_hide (security_frame);
@@ -1860,22 +1902,22 @@ static void xfpm_settings_light_locker (XfconfChannel *channel,
/* Apply the settings */
if (lock_after_screensaver == 0)
{
- gtk_combo_box_set_active (GTK_COMBO_BOX(light_locker_autolock), 0);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (light_locker_autolock), 0);
}
else
{
if (!late_locking)
{
- gtk_combo_box_set_active (GTK_COMBO_BOX(light_locker_autolock), 1);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (light_locker_autolock), 1);
}
else
{
- gtk_combo_box_set_active (GTK_COMBO_BOX(light_locker_autolock), 2);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (light_locker_autolock), 2);
}
- gtk_range_set_value (GTK_RANGE(light_locker_delay), lock_after_screensaver);
+ gtk_range_set_value (GTK_RANGE (light_locker_delay), lock_after_screensaver);
}
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(light_locker_sleep), lock_on_suspend);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (light_locker_sleep), lock_on_suspend);
g_settings_schema_unref (schema);
}
@@ -1891,47 +1933,49 @@ static void xfpm_settings_light_locker (XfconfChannel *channel,
/* END Light Locker Integration */
/* Call gtk_tree_iter_free when done with the tree iter */
-static GtkTreeIter*
+static GtkTreeIter *
find_device_in_tree (const gchar *object_path)
{
GtkTreeModel *model;
GtkTreeIter iter;
- if ( !sideview )
+ if (!sideview)
return NULL;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(sideview));
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (sideview));
if (!model)
return NULL;
- if(gtk_tree_model_get_iter_first(model, &iter))
+ if (gtk_tree_model_get_iter_first (model, &iter))
{
- do {
+ do
+ {
gchar *path = NULL;
- gtk_tree_model_get(model, &iter, COL_SIDEBAR_OBJECT_PATH, &path, -1);
+ gtk_tree_model_get (model, &iter, COL_SIDEBAR_OBJECT_PATH, &path, -1);
- if(g_strcmp0(path, object_path) == 0)
+ if (g_strcmp0 (path, object_path) == 0)
{
- g_free(path);
- return gtk_tree_iter_copy(&iter);
+ g_free (path);
+ return gtk_tree_iter_copy (&iter);
}
g_free (path);
- } while (gtk_tree_model_iter_next(model, &iter));
+ } while (gtk_tree_model_iter_next (model, &iter));
}
return NULL;
}
/* Call gtk_tree_iter_free when done with the tree iter */
-static GtkTreeIter*
-find_device_info_name_in_tree (GtkTreeView *view, const gchar *device_info_name)
+static GtkTreeIter *
+find_device_info_name_in_tree (GtkTreeView *view,
+ const gchar *device_info_name)
{
GtkTreeModel *model;
GtkTreeIter iter;
- if ( !view )
+ if (!view)
return NULL;
model = gtk_tree_view_get_model (view);
@@ -1939,25 +1983,29 @@ find_device_info_name_in_tree (GtkTreeView *view, const gchar *device_info_name)
if (!model)
return NULL;
- if (gtk_tree_model_get_iter_first (model, &iter)) {
- do {
+ if (gtk_tree_model_get_iter_first (model, &iter))
+ {
+ do
+ {
gchar *name = NULL;
gtk_tree_model_get (model, &iter, XFPM_DEVICE_INFO_NAME, &name, -1);
- if(g_strcmp0 (name, device_info_name) == 0) {
- g_free (name);
- return gtk_tree_iter_copy (&iter);
+ if (g_strcmp0 (name, device_info_name) == 0)
+ {
+ g_free (name);
+ return gtk_tree_iter_copy (&iter);
}
g_free (name);
- } while(gtk_tree_model_iter_next(model, &iter));
+ } while (gtk_tree_model_iter_next (model, &iter));
}
return NULL;
}
static gchar *
-xfpm_info_get_energy_property (gdouble energy, const gchar *unit)
+xfpm_info_get_energy_property (gdouble energy,
+ const gchar *unit)
{
gchar *val = NULL;
@@ -1974,8 +2022,8 @@ update_device_info_value_for_name (GtkTreeView *view,
{
GtkTreeIter *iter;
- g_return_if_fail (GTK_IS_TREE_VIEW(view));
- g_return_if_fail (GTK_IS_LIST_STORE(list_store));
+ g_return_if_fail (GTK_IS_TREE_VIEW (view));
+ g_return_if_fail (GTK_IS_LIST_STORE (list_store));
g_return_if_fail (name != NULL);
/* Value can be NULL */
@@ -2016,7 +2064,7 @@ update_sideview_icon (UpDevice *device,
cairo_surface_t *surface = NULL;
guint type = 0;
gchar *name = NULL, *icon_name = NULL, *model = NULL, *vendor = NULL;
- const gchar *object_path = up_device_get_object_path(device);
+ const gchar *object_path = up_device_get_object_path (device);
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (sideview)));
@@ -2045,7 +2093,7 @@ update_sideview_icon (UpDevice *device,
48,
scale_factor,
GTK_ICON_LOOKUP_USE_BUILTIN
- | GTK_ICON_LOOKUP_FORCE_SIZE,
+ | GTK_ICON_LOOKUP_FORCE_SIZE,
NULL);
if (G_LIKELY (pix != NULL))
{
@@ -2081,7 +2129,7 @@ update_device_details (UpDevice *device)
gboolean p_supply = FALSE;
gchar *model = NULL, *vendor = NULL, *serial = NULL;
const gchar *battery_type = NULL;
- const gchar *object_path = up_device_get_object_path(device);
+ const gchar *object_path = up_device_get_object_path (device);
sideview_iter = find_device_in_tree (object_path);
@@ -2089,7 +2137,7 @@ update_device_details (UpDevice *device)
if (sideview_iter == NULL)
return;
- gtk_tree_model_get (gtk_tree_view_get_model (GTK_TREE_VIEW(sideview)), sideview_iter,
+ gtk_tree_model_get (gtk_tree_view_get_model (GTK_TREE_VIEW (sideview)), sideview_iter,
COL_SIDEBAR_VIEW, &view,
-1);
@@ -2100,9 +2148,9 @@ update_device_details (UpDevice *device)
**/
/*Device*/
update_device_info_value_for_name (view,
- list_store,
- _("Device"),
- g_str_has_prefix (object_path, UPOWER_PATH_DEVICE) ? object_path + strlen (UPOWER_PATH_DEVICE) : object_path);
+ list_store,
+ _("Device"),
+ g_str_has_prefix (object_path, UPOWER_PATH_DEVICE) ? object_path + strlen (UPOWER_PATH_DEVICE) : object_path);
/*Type*/
/* hack, this depends on XFPM_DEVICE_TYPE_* being in sync with UP_DEVICE_KIND_* */
@@ -2132,7 +2180,7 @@ update_device_details (UpDevice *device)
_("PowerSupply"),
p_supply ? _("True") : _("False"));
- if ( type != UP_DEVICE_KIND_LINE_POWER )
+ if (type != UP_DEVICE_KIND_LINE_POWER)
{
/*Model*/
if (model && strlen (model) > 0)
@@ -2145,11 +2193,11 @@ update_device_details (UpDevice *device)
/*Percentage*/
if (percent >= 0)
{
- str = g_strdup_printf("%d%%", (guint) percent);
+ str = g_strdup_printf ("%d%%", (guint) percent);
update_device_info_value_for_name (view, list_store, _("Current charge"), str);
- g_free(str);
+ g_free (str);
}
if (energy_full_design > 0)
@@ -2168,7 +2216,7 @@ update_device_details (UpDevice *device)
/* TRANSLATORS: Unit here is Watt hour*/
str = xfpm_info_get_energy_property (energy_full, _("Wh"));
- str2 = g_strdup_printf ("%s (%d%%)", str, (guint) (energy_full / energy_full_design *100));
+ str2 = g_strdup_printf ("%s (%d%%)", str, (guint) (energy_full / energy_full_design * 100));
update_device_info_value_for_name (view, list_store, _("Fully charged"), str2);
@@ -2218,13 +2266,15 @@ update_device_details (UpDevice *device)
}
update_sideview_icon (device, gtk_widget_get_scale_factor (GTK_WIDGET (view)));
- gtk_widget_show_all (GTK_WIDGET(view));
+ gtk_widget_show_all (GTK_WIDGET (view));
}
static void
-device_changed_cb (UpDevice *device, GParamSpec *pspec, gpointer user_data)
+device_changed_cb (UpDevice *device,
+ GParamSpec *pspec,
+ gpointer user_data)
{
- update_device_details (device);
+ update_device_details (device);
}
static void
@@ -2235,7 +2285,7 @@ add_device (UpDevice *device)
GtkTreeViewColumn *col;
GtkCellRenderer *renderer;
GtkWidget *frame, *view;
- const gchar *object_path = up_device_get_object_path(device);
+ const gchar *object_path = up_device_get_object_path (device);
gulong signal_id;
guint index;
static gboolean first_run = TRUE;
@@ -2273,13 +2323,13 @@ add_device (UpDevice *device)
renderer = gtk_cell_renderer_text_new ();
/*Device Attribute*/
- col = gtk_tree_view_column_new();
+ col = gtk_tree_view_column_new ();
gtk_tree_view_column_pack_start (col, renderer, FALSE);
gtk_tree_view_column_set_attributes (col, renderer, "text", XFPM_DEVICE_INFO_NAME, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (view), col);
/*Device Attribute Value*/
- col = gtk_tree_view_column_new();
+ col = gtk_tree_view_column_new ();
gtk_tree_view_column_pack_start (col, renderer, FALSE);
gtk_tree_view_column_set_attributes (col, renderer, "text", XFPM_DEVICE_INFO_VALUE, NULL);
@@ -2302,8 +2352,7 @@ add_device (UpDevice *device)
* the starting_device_id must be unset and the this is the first
* time add_device is called (i.e. select the first device) or
* our current device matches starting_device_id. */
- if ((starting_device_id == NULL && first_run) ||
- (g_strcmp0 (object_path, starting_device_id) == 0))
+ if ((starting_device_id == NULL && first_run) || (g_strcmp0 (object_path, starting_device_id) == 0))
{
GtkTreeSelection *selection;
@@ -2329,9 +2378,9 @@ remove_device (const gchar *object_path)
if (iter == NULL)
return;
- list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(sideview)));
+ list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (sideview)));
- gtk_tree_model_get (GTK_TREE_MODEL(list_store), iter,
+ gtk_tree_model_get (GTK_TREE_MODEL (list_store), iter,
COL_SIDEBAR_SIGNAL_ID, &signal_id,
COL_SIDEBAR_BATTERY_DEVICE, &device,
-1);
@@ -2345,18 +2394,22 @@ remove_device (const gchar *object_path)
gtk_list_store_remove (list_store, iter);
/* If there are no devices left, hide the devices tab */
- if(!gtk_tree_model_get_iter_first (GTK_TREE_MODEL(list_store), iter))
+ if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), iter))
gtk_widget_hide (gtk_notebook_get_nth_page (GTK_NOTEBOOK (nt), devices_page_num));
}
static void
-device_added_cb (UpClient *upclient, UpDevice *device, gpointer user_data)
+device_added_cb (UpClient *upclient,
+ UpDevice *device,
+ gpointer user_data)
{
add_device (device);
}
static void
-device_removed_cb (UpClient *upclient, const gchar *object_path, gpointer user_data)
+device_removed_cb (UpClient *upclient,
+ const gchar *object_path,
+ gpointer user_data)
{
remove_device (object_path);
}
@@ -2367,9 +2420,9 @@ add_all_devices (void)
GPtrArray *array = up_client_get_devices2 (upower);
guint i;
- if ( array )
+ if (array)
{
- for ( i = 0; i < array->len; i++)
+ for (i = 0; i < array->len; i++)
{
UpDevice *device = g_ptr_array_index (array, i);
@@ -2393,29 +2446,29 @@ settings_create_devices_list (void)
}
static void
-view_cursor_changed_cb (GtkTreeView *view, gpointer *user_data)
+view_cursor_changed_cb (GtkTreeView *view,
+ gpointer *user_data)
{
GtkTreeSelection *sel;
- GtkTreeModel *model;
- GtkTreeIter selected_row;
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
gint int_data = 0;
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
- if ( !gtk_tree_selection_get_selected (sel, &model, &selected_row))
+ if (!gtk_tree_selection_get_selected (sel, &model, &selected_row))
return;
- gtk_tree_model_get (model,
- &selected_row,
- COL_SIDEBAR_INT,
- &int_data,
+ gtk_tree_model_get (model, &selected_row,
+ COL_SIDEBAR_INT, &int_data,
-1);
gtk_notebook_set_current_page (GTK_NOTEBOOK (device_details_notebook), int_data);
}
static void
-settings_quit (GtkWidget *widget, XfconfChannel *channel)
+settings_quit (GtkWidget *widget,
+ XfconfChannel *channel)
{
g_object_unref (channel);
xfconf_shutdown ();
@@ -2424,37 +2477,48 @@ settings_quit (GtkWidget *widget, XfconfChannel *channel)
g_object_unref (upower);
/* initiate the quit action on the application so it terminates */
- g_action_group_activate_action (G_ACTION_GROUP(app), "quit", NULL);
+ g_action_group_activate_action (G_ACTION_GROUP (app), "quit", NULL);
}
-static void dialog_response_cb (GtkDialog *dialog, gint response, XfconfChannel *channel)
+static void
+dialog_response_cb (GtkDialog *dialog,
+ gint response,
+ XfconfChannel *channel)
{
- switch(response)
+ switch (response)
{
- case GTK_RESPONSE_HELP:
- xfce_dialog_show_help_with_version (NULL, "xfce4-power-manager", "start", NULL, XFPM_VERSION_SHORT);
- break;
- default:
- settings_quit (GTK_WIDGET (dialog), channel);
- break;
+ case GTK_RESPONSE_HELP:
+ xfce_dialog_show_help_with_version (NULL, "xfce4-power-manager", "start", NULL, XFPM_VERSION_SHORT);
+ break;
+ default:
+ settings_quit (GTK_WIDGET (dialog), channel);
+ break;
}
}
#ifdef ENABLE_X11
static void
-delete_event_cb (GtkWidget *plug, GdkEvent *ev, XfconfChannel *channel)
+delete_event_cb (GtkWidget *plug,
+ GdkEvent *ev,
+ XfconfChannel *channel)
{
settings_quit (plug, channel);
}
#endif
GtkWidget *
-xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
- gboolean auth_hibernate, gboolean can_suspend,
- gboolean can_hibernate, gboolean can_shutdown,
- gboolean has_battery, gboolean has_lcd_brightness,
- gboolean has_lid, gboolean has_sleep_button,
- gboolean has_hibernate_button, gboolean has_power_button,
+xfpm_settings_dialog_new (XfconfChannel *channel,
+ gboolean auth_suspend,
+ gboolean auth_hibernate,
+ gboolean can_suspend,
+ gboolean can_hibernate,
+ gboolean can_shutdown,
+ gboolean has_battery,
+ gboolean has_lcd_brightness,
+ gboolean has_lid,
+ gboolean has_sleep_button,
+ gboolean has_hibernate_button,
+ gboolean has_power_button,
gboolean has_battery_button,
#ifdef ENABLE_X11
Window id,
@@ -2475,8 +2539,8 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
GtkCssProvider *css_provider;
GDBusProxy *profiles_proxy = xfpm_ppd_g_dbus_proxy_new ();
- XFPM_DEBUG ("auth_hibernate=%s auth_suspend=%s can_shutdown=%s can_suspend=%s can_hibernate=%s " \
- "has_battery=%s has_lcd_brightness=%s has_lid=%s has_sleep_button=%s " \
+ XFPM_DEBUG ("auth_hibernate=%s auth_suspend=%s can_shutdown=%s can_suspend=%s can_hibernate=%s "
+ "has_battery=%s has_lcd_brightness=%s has_lid=%s has_sleep_button=%s "
"has_hibernate_button=%s has_power_button=%s has_battery_button=%s",
xfpm_bool_to_string (has_battery), xfpm_bool_to_string (auth_hibernate),
xfpm_bool_to_string (can_shutdown), xfpm_bool_to_string (auth_suspend),
@@ -2487,7 +2551,7 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
xml = xfpm_builder_new_from_string (xfpm_settings_ui, &error);
- if ( G_UNLIKELY (error) )
+ if (G_UNLIKELY (error))
{
xfce_dialog_show_error (NULL, error, "%s", _("Check your power manager installation"));
g_error ("%s", error->message);
@@ -2521,8 +2585,8 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
gtk_css_provider_load_from_data (css_provider,
".xfce4-scale-label { padding-bottom: 0; }",
-1, NULL);
- gtk_style_context_add_provider_for_screen (gdk_screen_get_default(),
- GTK_STYLE_PROVIDER(css_provider),
+ gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+ GTK_STYLE_PROVIDER (css_provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_object_unref (css_provider);
@@ -2530,13 +2594,13 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
sideview = gtk_tree_view_new ();
list_store = gtk_list_store_new (NCOLS_SIDEBAR,
CAIRO_GOBJECT_TYPE_SURFACE, /* COL_SIDEBAR_ICON */
- G_TYPE_STRING, /* COL_SIDEBAR_NAME */
- G_TYPE_INT, /* COL_SIDEBAR_INT */
- G_TYPE_OBJECT, /* COL_SIDEBAR_BATTERY_DEVICE */
- G_TYPE_STRING, /* COL_SIDEBAR_OBJECT_PATH */
- G_TYPE_ULONG, /* COL_SIDEBAR_SIGNAL_ID */
- G_TYPE_POINTER /* COL_SIDEBAR_VIEW */
- );
+ G_TYPE_STRING, /* COL_SIDEBAR_NAME */
+ G_TYPE_INT, /* COL_SIDEBAR_INT */
+ G_TYPE_OBJECT, /* COL_SIDEBAR_BATTERY_DEVICE */
+ G_TYPE_STRING, /* COL_SIDEBAR_OBJECT_PATH */
+ G_TYPE_ULONG, /* COL_SIDEBAR_SIGNAL_ID */
+ G_TYPE_POINTER /* COL_SIDEBAR_VIEW */
+ );
gtk_tree_view_set_model (GTK_TREE_VIEW (sideview), GTK_TREE_MODEL (list_store));
@@ -2570,7 +2634,7 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
gtk_box_pack_start (GTK_BOX (hbox), viewport, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), device_details_notebook, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
- devices_page_num = gtk_notebook_append_page (GTK_NOTEBOOK (nt), hbox, gtk_label_new (_("Devices")) );
+ devices_page_num = gtk_notebook_append_page (GTK_NOTEBOOK (nt), hbox, gtk_label_new (_("Devices")));
gtk_widget_show_all (sideview);
gtk_widget_show_all (viewport);
@@ -2589,24 +2653,24 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
has_lid);
if (has_battery)
- xfpm_settings_on_battery (channel,
- profiles_proxy,
- auth_suspend,
- auth_hibernate,
- can_suspend,
- can_hibernate,
- can_shutdown,
- has_lcd_brightness,
- has_lid);
+ xfpm_settings_on_battery (channel,
+ profiles_proxy,
+ auth_suspend,
+ auth_hibernate,
+ can_suspend,
+ can_hibernate,
+ can_shutdown,
+ has_lcd_brightness,
+ has_lid);
else
{
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml ,"critical-power-frame")));
- stack = GTK_WIDGET (gtk_builder_get_object (xml ,"system-stack"));
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml, "critical-power-frame")));
+ stack = GTK_WIDGET (gtk_builder_get_object (xml, "system-stack"));
gtk_widget_hide (gtk_stack_get_child_by_name (GTK_STACK (stack), "page0"));
- stack = GTK_WIDGET (gtk_builder_get_object (xml ,"display-stack"));
+ stack = GTK_WIDGET (gtk_builder_get_object (xml, "display-stack"));
gtk_widget_hide (gtk_stack_get_child_by_name (GTK_STACK (stack), "page0"));
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml ,"system-stack-switcher")));
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml ,"display-stack-switcher")));
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml, "system-stack-switcher")));
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml, "display-stack-switcher")));
}
xfpm_settings_general (channel, auth_suspend, auth_hibernate, can_suspend, can_hibernate, can_shutdown,
@@ -2618,7 +2682,7 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
xfpm_settings_light_locker (channel, auth_suspend, auth_hibernate, can_suspend, can_hibernate);
/* END Light Locker Integration */
- if ( !has_lcd_brightness )
+ if (!has_lcd_brightness)
{
GtkWidget *widget = GTK_WIDGET (gtk_builder_get_object (xml, "label4"));
gtk_widget_hide (widget);
@@ -2682,8 +2746,7 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
g_object_unref (plugged_box);
}
- g_signal_connect (plug, "delete-event",
- G_CALLBACK (delete_event_cb), channel);
+ g_signal_connect (plug, "delete-event", G_CALLBACK (delete_event_cb), channel);
gdk_notify_startup_complete ();
}
else
diff --git a/settings/xfpm-settings.h b/settings/xfpm-settings.h
index d7dbc4fedc0b0eac5e5899f6aa0a97d165332b9f..220777f56796d8e7d962dbe9dba8cc45ae8ad379 100644
--- a/settings/xfpm-settings.h
+++ b/settings/xfpm-settings.h
@@ -28,24 +28,26 @@
#include <gtk/gtkx.h>
#endif
-GtkWidget *xfpm_settings_dialog_new (XfconfChannel *channel,
- gboolean auth_suspend,
- gboolean auth_hibernate,
- gboolean can_suspend,
- gboolean can_hibernate,
- gboolean can_shutdown,
- gboolean has_battery,
- gboolean has_lcd_brightness,
- gboolean has_lid,
- gboolean has_sleep_button,
- gboolean has_hibernate_button,
- gboolean has_power_button,
- gboolean has_battery_button,
+GtkWidget *
+xfpm_settings_dialog_new (XfconfChannel *channel,
+ gboolean auth_suspend,
+ gboolean auth_hibernate,
+ gboolean can_suspend,
+ gboolean can_hibernate,
+ gboolean can_shutdown,
+ gboolean has_battery,
+ gboolean has_lcd_brightness,
+ gboolean has_lid,
+ gboolean has_sleep_button,
+ gboolean has_hibernate_button,
+ gboolean has_power_button,
+ gboolean has_battery_button,
#ifdef ENABLE_X11
- Window id,
+ Window id,
#endif
- gchar *device_id,
- GtkApplication *gtk_app);
-void xfpm_settings_show_device_id (gchar *device_id);
+ gchar *device_id,
+ GtkApplication *gtk_app);
+void
+xfpm_settings_show_device_id (gchar *device_id);
#endif /* __XFPM_SETTINGS_H */
diff --git a/src/xfpm-backlight-helper.c b/src/xfpm-backlight-helper.c
index b73084dff9acc49a568d06602d423f781abf3675..9181ce572fed7ff555a32fcac5bc6a3c5c6ebb8a 100644
--- a/src/xfpm-backlight-helper.c
+++ b/src/xfpm-backlight-helper.c
@@ -27,23 +27,23 @@
#include <glib-object.h>
#include <stdio.h>
-#if defined(BACKEND_TYPE_FREEBSD)
+#ifdef BACKEND_TYPE_FREEBSD
#include <sys/sysctl.h>
#endif
-#define EXIT_CODE_SUCCESS 0
-#define EXIT_CODE_FAILED 1
+#define EXIT_CODE_SUCCESS 0
+#define EXIT_CODE_FAILED 1
#define EXIT_CODE_ARGUMENTS_INVALID 3
-#define EXIT_CODE_INVALID_USER 4
-#define EXIT_CODE_NO_BRIGHTNESS_SWITCH 5
+#define EXIT_CODE_INVALID_USER 4
+#define EXIT_CODE_NO_BRIGHTNESS_SWITCH 5
-#if !defined(BACKEND_TYPE_FREEBSD)
-#define BACKLIGHT_SYSFS_LOCATION "/sys/class/backlight"
-#define BRIGHTNESS_SWITCH_LOCATION "/sys/module/video/parameters/brightness_switch_enabled"
+#ifndef BACKEND_TYPE_FREEBSD
+#define BACKLIGHT_SYSFS_LOCATION "/sys/class/backlight"
+#define BRIGHTNESS_SWITCH_LOCATION "/sys/module/video/parameters/brightness_switch_enabled"
#endif
-#if defined(BACKEND_TYPE_FREEBSD)
+#ifdef BACKEND_TYPE_FREEBSD
gboolean
acpi_video_is_enabled (gchar *device)
{
@@ -105,15 +105,16 @@ backlight_helper_get_levels (gchar *device)
sysctlbyname (name, NULL, &size, NULL, 0);
levels = (int *) malloc (size);
- if (sysctlbyname (name, levels, &size, NULL, 0) == 0) {
+ if (sysctlbyname (name, levels, &size, NULL, 0) == 0)
+ {
nlevels = size / sizeof (gint);
- for (i = 0; i < nlevels; i++) {
+ for (i = 0; i < nlevels; i++)
+ {
/* no duplicate item */
item = g_list_find (list, GINT_TO_POINTER (levels[i]));
if (item == NULL)
- list = g_list_append (list,
- GINT_TO_POINTER (levels[i]));
+ list = g_list_append (list, GINT_TO_POINTER (levels[i]));
}
}
@@ -138,12 +139,14 @@ backlight_helper_set_switch (gchar *device, gint value)
name = g_strdup_printf ("hw.acpi.video.%s.active", device);
res = backlight_helper_get_switch (device);
- if (res != -1) {
+ if (res != -1)
+ {
old_buf = res;
size = sizeof (buf);
/* we change value and check if it's really different */
- if (sysctlbyname (name, &buf, &size, &value, sizeof (value)) == 0) {
+ if (sysctlbyname (name, &buf, &size, &value, sizeof (value)) == 0)
+ {
res = backlight_helper_get_switch (device);
if (res != -1 && res != old_buf)
result = TRUE;
@@ -166,12 +169,14 @@ backlight_helper_set_brightness (gchar *device, gint value)
name = g_strdup_printf ("hw.acpi.video.%s.brightness", device);
res = backlight_helper_get_brightness (device);
- if (res != -1) {
+ if (res != -1)
+ {
old_buf = res;
size = sizeof (buf);
/* we change value, and check if it's really different */
- if (sysctlbyname (name, &buf, &size, &value, sizeof (value)) == 0) {
+ if (sysctlbyname (name, &buf, &size, &value, sizeof (value)) == 0)
+ {
res = backlight_helper_get_brightness (device);
if (res != -1 && res != old_buf)
result = TRUE;
@@ -196,7 +201,8 @@ backlight_helper_get_device (void)
device = (gchar *) g_malloc (sizeof (gchar));
- for (i = 0; types[i] != NULL; i++) {
+ for (i = 0; types[i] != NULL; i++)
+ {
g_snprintf (device, (gulong) strlen (types[i]), "%s0", types[i]);
/* stop, when first device is found */
@@ -229,19 +235,19 @@ main (gint argc, gchar *argv[])
const GOptionEntry options[] = {
{ "set-brightness", '\0', 0, G_OPTION_ARG_INT, &set_brightness,
- /* command line argument */
+ /* command line argument */
"Set the current brightness", NULL },
{ "get-brightness", '\0', 0, G_OPTION_ARG_NONE, &get_brightness,
- /* command line argument */
+ /* command line argument */
"Get the current brightness", NULL },
{ "get-max-brightness", '\0', 0, G_OPTION_ARG_NONE, &get_max_brightness,
- /* command line argument */
+ /* command line argument */
"Get the number of brightness levels supported", NULL },
{ "set-brightness-switch", '\0', 0, G_OPTION_ARG_INT, &set_brightness_switch,
- /* command line argument */
+ /* command line argument */
"Enable or disable ACPI video brightness switch handling", NULL },
{ "get-brightness-switch", '\0', 0, G_OPTION_ARG_NONE, &get_brightness_switch,
- /* command line argument */
+ /* command line argument */
"Get the current setting of the ACPI video brightness switch handling", NULL },
{ NULL }
};
@@ -253,8 +259,9 @@ main (gint argc, gchar *argv[])
g_option_context_free (context);
/* no input */
- if (set_brightness == -1 && !get_brightness && !get_max_brightness &&
- set_brightness_switch == -1 && !get_brightness_switch) {
+ if (set_brightness == -1 && !get_brightness && !get_max_brightness
+ && set_brightness_switch == -1 && !get_brightness_switch)
+ {
g_printerr ("No valid option was specified\n");
retval = EXIT_CODE_ARGUMENTS_INVALID;
goto out;
@@ -263,9 +270,11 @@ main (gint argc, gchar *argv[])
/* find backlight device */
device = backlight_helper_get_device ();
- if (device != NULL) {
+ if (device != NULL)
+ {
/* get the current setting of the ACPI video brightness switch handling */
- if (get_brightness_switch) {
+ if (get_brightness_switch)
+ {
ret = backlight_helper_get_switch (device);
/* just print result to stdout */
if (ret == -1)
@@ -282,7 +291,8 @@ main (gint argc, gchar *argv[])
}
/* get current brightness level */
- if (get_brightness) {
+ if (get_brightness)
+ {
ret = backlight_helper_get_brightness (device);
/* just print result to stdout */
if (ret == -1)
@@ -299,16 +309,19 @@ main (gint argc, gchar *argv[])
}
/* get maximum brightness level */
- if (get_max_brightness) {
+ if (get_max_brightness)
+ {
list = backlight_helper_get_levels (device);
- if (list != NULL) {
+ if (list != NULL)
+ {
/* just print result to stdout */
g_print ("%d", (gint) g_list_last (list)->data);
g_list_free (list);
retval = EXIT_CODE_SUCCESS;
goto out;
}
- else {
+ else
+ {
g_printerr ("Could not get the maximum value of the backlight\n");
retval = EXIT_CODE_FAILED;
goto out;
@@ -318,7 +331,8 @@ main (gint argc, gchar *argv[])
/* get calling process */
uid = getuid ();
euid = geteuid ();
- if (uid != 0 || euid != 0) {
+ if (uid != 0 || euid != 0)
+ {
g_printerr ("This program can only be used by the root user\n");
retval = EXIT_CODE_ARGUMENTS_INVALID;
goto out;
@@ -326,19 +340,23 @@ main (gint argc, gchar *argv[])
/* check we're not being spoofed */
pkexec_uid_str = g_getenv ("PKEXEC_UID");
- if (pkexec_uid_str == NULL) {
+ if (pkexec_uid_str == NULL)
+ {
g_printerr ("This program must only be run through pkexec\n");
retval = EXIT_CODE_INVALID_USER;
goto out;
}
/* set the brightness level */
- if (set_brightness != -1) {
- if (backlight_helper_set_brightness (device, set_brightness)) {
+ if (set_brightness != -1)
+ {
+ if (backlight_helper_set_brightness (device, set_brightness))
+ {
retval = EXIT_CODE_SUCCESS;
goto out;
}
- else {
+ else
+ {
g_printerr ("Could not set the value of the backlight\n");
retval = EXIT_CODE_FAILED;
goto out;
@@ -346,27 +364,34 @@ main (gint argc, gchar *argv[])
}
/* enable or disable ACPI video brightness switch handling */
- if (set_brightness_switch != -1) {
- if (backlight_helper_set_switch (device, set_brightness_switch)) {
+ if (set_brightness_switch != -1)
+ {
+ if (backlight_helper_set_switch (device, set_brightness_switch))
+ {
retval = EXIT_CODE_SUCCESS;
goto out;
}
- else {
+ else
+ {
g_printerr ("Could not set the value of the brightness switch\n");
retval = EXIT_CODE_FAILED;
goto out;
}
}
}
- else {
+ else
+ {
retval = ret;
goto out;
}
out:
return retval;
}
-#else
-typedef enum {
+
+#else /* !BACKEND_TYPE_FREEBSD */
+
+typedef enum
+{
BACKLIGHT_TYPE_UNKNOWN,
BACKLIGHT_TYPE_FIRMWARE,
BACKLIGHT_TYPE_PLATFORM,
@@ -382,12 +407,10 @@ backlight_helper_get_type (const gchar *sysfs_path)
gchar *type_tmp = NULL;
BacklightType type = BACKLIGHT_TYPE_UNKNOWN;
- filename = g_build_filename (sysfs_path,
- "type", NULL);
- ret = g_file_get_contents (filename,
- &type_tmp,
- NULL, &error);
- if (!ret) {
+ filename = g_build_filename (sysfs_path, "type", NULL);
+ ret = g_file_get_contents (filename, &type_tmp, NULL, &error);
+ if (!ret)
+ {
if (error)
{
g_warning ("failed to get type: %s", error->message);
@@ -395,15 +418,18 @@ backlight_helper_get_type (const gchar *sysfs_path)
}
goto out;
}
- if (g_str_has_prefix (type_tmp, "platform")) {
+ if (g_str_has_prefix (type_tmp, "platform"))
+ {
type = BACKLIGHT_TYPE_PLATFORM;
goto out;
}
- if (g_str_has_prefix (type_tmp, "firmware")) {
+ if (g_str_has_prefix (type_tmp, "firmware"))
+ {
type = BACKLIGHT_TYPE_FIRMWARE;
goto out;
}
- if (g_str_has_prefix (type_tmp, "raw")) {
+ if (g_str_has_prefix (type_tmp, "raw"))
+ {
type = BACKLIGHT_TYPE_RAW;
goto out;
}
@@ -432,7 +458,8 @@ backlight_helper_get_best_backlight (void)
/* search the backlight devices and prefer the types:
* firmware -> platform -> raw */
dir = g_dir_open (BACKLIGHT_SYSFS_LOCATION, 0, &error);
- if (dir == NULL) {
+ if (dir == NULL)
+ {
if (error)
{
g_warning ("failed to find any devices: %s", error->message);
@@ -442,9 +469,9 @@ backlight_helper_get_best_backlight (void)
}
sysfs_paths = g_ptr_array_new_with_free_func (g_free);
device_name = g_dir_read_name (dir);
- while (device_name != NULL) {
- filename = g_build_filename (BACKLIGHT_SYSFS_LOCATION,
- device_name, NULL);
+ while (device_name != NULL)
+ {
+ filename = g_build_filename (BACKLIGHT_SYSFS_LOCATION, device_name, NULL);
g_ptr_array_add (sysfs_paths, filename);
device_name = g_dir_read_name (dir);
}
@@ -455,26 +482,33 @@ backlight_helper_get_best_backlight (void)
/* find out the type of each backlight */
backlight_types = g_new0 (BacklightType, sysfs_paths->len);
- for (i = 0; i < sysfs_paths->len; i++) {
+ for (i = 0; i < sysfs_paths->len; i++)
+ {
filename_tmp = g_ptr_array_index (sysfs_paths, i);
backlight_types[i] = backlight_helper_get_type (filename_tmp);
}
/* any devices of type firmware -> platform -> raw? */
- for (i = 0; i < sysfs_paths->len; i++) {
- if (backlight_types[i] == BACKLIGHT_TYPE_FIRMWARE) {
+ for (i = 0; i < sysfs_paths->len; i++)
+ {
+ if (backlight_types[i] == BACKLIGHT_TYPE_FIRMWARE)
+ {
best_device = g_strdup (g_ptr_array_index (sysfs_paths, i));
goto out;
}
}
- for (i = 0; i < sysfs_paths->len; i++) {
- if (backlight_types[i] == BACKLIGHT_TYPE_PLATFORM) {
+ for (i = 0; i < sysfs_paths->len; i++)
+ {
+ if (backlight_types[i] == BACKLIGHT_TYPE_PLATFORM)
+ {
best_device = g_strdup (g_ptr_array_index (sysfs_paths, i));
goto out;
}
}
- for (i = 0; i < sysfs_paths->len; i++) {
- if (backlight_types[i] == BACKLIGHT_TYPE_RAW) {
+ for (i = 0; i < sysfs_paths->len; i++)
+ {
+ if (backlight_types[i] == BACKLIGHT_TYPE_RAW)
+ {
best_device = g_strdup (g_ptr_array_index (sysfs_paths, i));
goto out;
}
@@ -501,7 +535,8 @@ backlight_helper_write (const gchar *filename, gint value, GError **error)
gboolean ret = TRUE;
fd = open (filename, O_WRONLY);
- if (fd < 0) {
+ if (fd < 0)
+ {
ret = FALSE;
g_set_error (error, 1, 0, "failed to open filename: %s", filename);
goto out;
@@ -513,7 +548,8 @@ backlight_helper_write (const gchar *filename, gint value, GError **error)
/* write to device file */
retval = write (fd, text, length);
- if (retval != length) {
+ if (retval != length)
+ {
ret = FALSE;
g_set_error (error, 1, 0, "writing '%s' to %s failed", text, filename);
goto out;
@@ -549,19 +585,19 @@ main (gint argc, gchar *argv[])
const GOptionEntry options[] = {
{ "set-brightness", '\0', 0, G_OPTION_ARG_INT, &set_brightness,
- /* command line argument */
+ /* command line argument */
"Set the current brightness", NULL },
{ "get-brightness", '\0', 0, G_OPTION_ARG_NONE, &get_brightness,
- /* command line argument */
+ /* command line argument */
"Get the current brightness", NULL },
{ "get-max-brightness", '\0', 0, G_OPTION_ARG_NONE, &get_max_brightness,
- /* command line argument */
+ /* command line argument */
"Get the number of brightness levels supported", NULL },
{ "set-brightness-switch", '\0', 0, G_OPTION_ARG_INT, &set_brightness_switch,
- /* command line argument */
+ /* command line argument */
"Enable or disable ACPI video brightness switch handling", NULL },
{ "get-brightness-switch", '\0', 0, G_OPTION_ARG_NONE, &get_brightness_switch,
- /* command line argument */
+ /* command line argument */
"Get the current setting of the ACPI video brightness switch handling", NULL },
{ NULL }
};
@@ -573,24 +609,30 @@ main (gint argc, gchar *argv[])
g_option_context_free (context);
/* no input */
- if (set_brightness == -1 && !get_brightness && !get_max_brightness &&
- set_brightness_switch == -1 && !get_brightness_switch) {
+ if (set_brightness == -1 && !get_brightness && !get_max_brightness
+ && set_brightness_switch == -1 && !get_brightness_switch)
+ {
puts ("No valid option was specified");
retval = EXIT_CODE_ARGUMENTS_INVALID;
goto out;
}
/* for brightness switch modifications, check for existence of the sysfs entry */
- if (set_brightness_switch != -1 || get_brightness_switch) {
+ if (set_brightness_switch != -1 || get_brightness_switch)
+ {
ret = g_file_test (BRIGHTNESS_SWITCH_LOCATION, G_FILE_TEST_EXISTS);
- if (!ret) {
+ if (!ret)
+ {
g_printerr ("Video brightness switch setting not available.\n");
retval = EXIT_CODE_NO_BRIGHTNESS_SWITCH;
goto out;
}
- } else { /* find backlight device */
+ }
+ else
+ { /* find backlight device */
filename = backlight_helper_get_best_backlight ();
- if (filename == NULL) {
+ if (filename == NULL)
+ {
puts ("No backlights were found on your system");
retval = EXIT_CODE_INVALID_USER;
goto out;
@@ -598,9 +640,11 @@ main (gint argc, gchar *argv[])
}
/* get the current setting of the ACPI video brightness switch handling */
- if (get_brightness_switch) {
+ if (get_brightness_switch)
+ {
ret = g_file_get_contents (BRIGHTNESS_SWITCH_LOCATION, &contents, NULL, &error);
- if (!ret) {
+ if (!ret)
+ {
if (error)
{
g_printerr ("Could not get the value of the brightness switch: %s\n", error->message);
@@ -617,10 +661,12 @@ main (gint argc, gchar *argv[])
}
/* get current brightness level */
- if (get_brightness) {
+ if (get_brightness)
+ {
filename_file = g_build_filename (filename, "brightness", NULL);
ret = g_file_get_contents (filename_file, &contents, NULL, &error);
- if (!ret) {
+ if (!ret)
+ {
if (error)
{
g_printerr ("Could not get the value of the backlight: %s\n", error->message);
@@ -637,10 +683,12 @@ main (gint argc, gchar *argv[])
}
/* get maximum brightness level */
- if (get_max_brightness) {
+ if (get_max_brightness)
+ {
filename_file = g_build_filename (filename, "max_brightness", NULL);
ret = g_file_get_contents (filename_file, &contents, NULL, &error);
- if (!ret) {
+ if (!ret)
+ {
if (error)
{
g_printerr ("Could not get the maximum value of the backlight: %s\n", error->message);
@@ -659,7 +707,8 @@ main (gint argc, gchar *argv[])
/* get calling process */
uid = getuid ();
euid = geteuid ();
- if (uid != 0 || euid != 0) {
+ if (uid != 0 || euid != 0)
+ {
puts ("This program can only be used by the root user");
retval = EXIT_CODE_ARGUMENTS_INVALID;
goto out;
@@ -667,17 +716,20 @@ main (gint argc, gchar *argv[])
/* check we're not being spoofed */
pkexec_uid_str = g_getenv ("PKEXEC_UID");
- if (pkexec_uid_str == NULL) {
+ if (pkexec_uid_str == NULL)
+ {
puts ("This program must only be run through pkexec");
retval = EXIT_CODE_INVALID_USER;
goto out;
}
/* set the brightness level */
- if (set_brightness != -1) {
+ if (set_brightness != -1)
+ {
filename_file = g_build_filename (filename, "brightness", NULL);
ret = backlight_helper_write (filename_file, set_brightness, &error);
- if (!ret) {
+ if (!ret)
+ {
if (error)
{
g_printerr ("Could not set the value of the backlight: %s\n", error->message);
@@ -691,10 +743,11 @@ main (gint argc, gchar *argv[])
}
/* enable or disable ACPI video brightness switch handling */
- if (set_brightness_switch != -1) {
- ret = backlight_helper_write (BRIGHTNESS_SWITCH_LOCATION,
- set_brightness_switch, &error);
- if (!ret) {
+ if (set_brightness_switch != -1)
+ {
+ ret = backlight_helper_write (BRIGHTNESS_SWITCH_LOCATION, set_brightness_switch, &error);
+ if (!ret)
+ {
if (error)
{
g_printerr ("Could not set the value of the brightness switch: %s\n", error->message);
@@ -713,4 +766,4 @@ out:
g_free (contents);
return retval;
}
-#endif
+#endif /* !BACKEND_TYPE_FREEBSD */
diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
index 3ae927914710c4c52f534a5b4584b5dc0ff2ee1a..c2e88b5ab544b4e4d7b5cdad29708497271a5c9e 100644
--- a/src/xfpm-backlight.c
+++ b/src/xfpm-backlight.c
@@ -39,45 +39,48 @@
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
-static void xfpm_backlight_finalize (GObject *object);
+static void
+xfpm_backlight_finalize (GObject *object);
-static void xfpm_backlight_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void
+xfpm_backlight_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
-static void xfpm_backlight_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+static void
+xfpm_backlight_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
#define ALARM_DISABLED 9
struct XfpmBacklightPrivate
{
XfpmBrightness *brightness;
- XfpmPower *power;
- XfpmIdle *idle;
- XfpmXfconf *conf;
- XfpmButton *button;
- XfpmNotify *notify;
+ XfpmPower *power;
+ XfpmIdle *idle;
+ XfpmXfconf *conf;
+ XfpmButton *button;
+ XfpmNotify *notify;
NotifyNotification *n;
- gboolean on_battery;
+ gboolean on_battery;
- gint32 last_level;
- gint32 max_level;
+ gint32 last_level;
+ gint32 max_level;
- guint brightness_step_count;
- gboolean brightness_exponential;
+ guint brightness_step_count;
+ gboolean brightness_exponential;
- gint brightness_switch;
- gint brightness_switch_save;
- gboolean brightness_switch_initialized;
+ gint brightness_switch;
+ gint brightness_switch_save;
+ gboolean brightness_switch_initialized;
- gboolean dimmed;
- gboolean block;
+ gboolean dimmed;
+ gboolean block;
};
enum
@@ -106,7 +109,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
ret = xfpm_brightness_get_level (backlight->priv->brightness, &backlight->priv->last_level);
- if ( !ret )
+ if (!ret)
{
XFPM_DEBUG ("Unable to get current brightness level");
return;
@@ -133,7 +136,7 @@ xfpm_backlight_destroy_popup (gpointer data)
backlight = XFPM_BACKLIGHT (data);
- if ( backlight->priv->n )
+ if (backlight->priv->n)
{
g_object_unref (backlight->priv->n);
backlight->priv->n = NULL;
@@ -143,14 +146,15 @@ xfpm_backlight_destroy_popup (gpointer data)
}
static void
-xfpm_backlight_show_notification (XfpmBacklight *backlight, gfloat value)
+xfpm_backlight_show_notification (XfpmBacklight *backlight,
+ gfloat value)
{
gchar *summary;
/* generate a human-readable summary for the notification */
summary = g_strdup_printf (_("Brightness: %.0f percent"), value);
/* create the notification on demand */
- if ( backlight->priv->n == NULL )
+ if (backlight->priv->n == NULL)
{
backlight->priv->n = xfpm_notify_new_notification (backlight->priv->notify,
_("Power Manager"),
@@ -187,7 +191,9 @@ xfpm_backlight_show (XfpmBacklight *backlight, gint level)
static void
-xfpm_backlight_alarm_timeout_cb (XfpmIdle *idle, XfpmAlarmId id, XfpmBacklight *backlight)
+xfpm_backlight_alarm_timeout_cb (XfpmIdle *idle,
+ XfpmAlarmId id,
+ XfpmBacklight *backlight)
{
backlight->priv->block = FALSE;
@@ -198,11 +204,12 @@ xfpm_backlight_alarm_timeout_cb (XfpmIdle *idle, XfpmAlarmId id, XfpmBacklight *
}
static void
-xfpm_backlight_reset_cb (XfpmIdle *idle, XfpmBacklight *backlight)
+xfpm_backlight_reset_cb (XfpmIdle *idle,
+ XfpmBacklight *backlight)
{
- if ( backlight->priv->dimmed)
+ if (backlight->priv->dimmed)
{
- if ( !backlight->priv->block)
+ if (!backlight->priv->block)
{
XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level);
xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level);
@@ -223,19 +230,21 @@ xfpm_backlight_reset_cb (XfpmIdle *idle, XfpmBacklight *backlight)
* the backlight brightness which does not provide any visual feedback.
*/
static void
-xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight)
+xfpm_backlight_button_pressed_cb (XfpmButton *button,
+ XfpmButtonKey type,
+ XfpmBacklight *backlight)
{
- gint32 level;
+ gint32 level;
gboolean ret = TRUE;
gboolean handle_brightness_keys, show_popup;
- guint brightness_step_count;
+ guint brightness_step_count;
gboolean brightness_exponential;
XFPM_DEBUG_ENUM (type, XFPM_TYPE_BUTTON_KEY, "Received button press event");
/* this check is required; we are notified about keys used by other functions
* e.g. keyboard brightness, sleep key. */
- if ( type != BUTTON_MON_BRIGHTNESS_UP && type != BUTTON_MON_BRIGHTNESS_DOWN )
+ if (type != BUTTON_MON_BRIGHTNESS_UP && type != BUTTON_MON_BRIGHTNESS_DOWN)
return;
g_object_get (G_OBJECT (backlight->priv->conf),
@@ -248,12 +257,12 @@ xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBa
backlight->priv->block = TRUE;
/* optionally, handle updating the level and setting the screen brightness */
- if ( handle_brightness_keys )
+ if (handle_brightness_keys)
{
xfpm_brightness_set_step_count (backlight->priv->brightness,
brightness_step_count,
brightness_exponential);
- if ( type == BUTTON_MON_BRIGHTNESS_UP )
+ if (type == BUTTON_MON_BRIGHTNESS_UP)
{
xfpm_brightness_increase (backlight->priv->brightness);
}
@@ -267,7 +276,7 @@ xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBa
ret = xfpm_brightness_get_level (backlight->priv->brightness, &level);
/* optionally, show the result in a popup (even if it did not change) */
- if ( ret && show_popup )
+ if (ret && show_popup)
xfpm_backlight_show (backlight, level);
}
@@ -296,7 +305,7 @@ xfpm_backlight_brightness_on_ac_settings_changed (XfpmBacklight *backlight)
XFPM_DEBUG ("Alarm on ac timeout changed %u", timeout_on_ac);
- if ( timeout_on_ac == ALARM_DISABLED )
+ if (timeout_on_ac == ALARM_DISABLED)
{
xfpm_idle_alarm_remove (backlight->priv->idle, XFPM_ALARM_ID_BRIGHTNESS_ON_AC);
}
@@ -309,7 +318,7 @@ xfpm_backlight_brightness_on_ac_settings_changed (XfpmBacklight *backlight)
static void
xfpm_backlight_brightness_on_battery_settings_changed (XfpmBacklight *backlight)
{
- guint timeout_on_battery ;
+ guint timeout_on_battery;
g_object_get (G_OBJECT (backlight->priv->conf),
BRIGHTNESS_ON_BATTERY, &timeout_on_battery,
@@ -317,7 +326,7 @@ xfpm_backlight_brightness_on_battery_settings_changed (XfpmBacklight *backlight)
XFPM_DEBUG ("Alarm on battery timeout changed %u", timeout_on_battery);
- if ( timeout_on_battery == ALARM_DISABLED )
+ if (timeout_on_battery == ALARM_DISABLED)
{
xfpm_idle_alarm_remove (backlight->priv->idle, XFPM_ALARM_ID_BRIGHTNESS_ON_BATTERY);
}
@@ -329,7 +338,9 @@ xfpm_backlight_brightness_on_battery_settings_changed (XfpmBacklight *backlight)
static void
-xfpm_backlight_on_battery_changed_cb (XfpmPower *power, gboolean on_battery, XfpmBacklight *backlight)
+xfpm_backlight_on_battery_changed_cb (XfpmPower *power,
+ gboolean on_battery,
+ XfpmBacklight *backlight)
{
backlight->priv->on_battery = on_battery;
}
@@ -347,18 +358,14 @@ xfpm_backlight_class_init (XfpmBacklightClass *klass)
PROP_BRIGHTNESS_SWITCH,
g_param_spec_int (BRIGHTNESS_SWITCH,
NULL, NULL,
- -1,
- 1,
- -1,
+ -1, 1, -1,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_BRIGHTNESS_SWITCH_SAVE,
g_param_spec_int (BRIGHTNESS_SWITCH_SAVE,
NULL, NULL,
- -1,
- 1,
- -1,
+ -1, 1, -1,
G_PARAM_READWRITE));
}
@@ -370,10 +377,10 @@ xfpm_backlight_init (XfpmBacklight *backlight)
backlight->priv->brightness = xfpm_brightness_new ();
backlight->priv->notify = NULL;
- backlight->priv->idle = NULL;
- backlight->priv->conf = NULL;
+ backlight->priv->idle = NULL;
+ backlight->priv->conf = NULL;
backlight->priv->button = NULL;
- backlight->priv->power = NULL;
+ backlight->priv->power = NULL;
backlight->priv->dimmed = FALSE;
backlight->priv->block = FALSE;
backlight->priv->brightness_step_count = 10;
@@ -384,10 +391,10 @@ xfpm_backlight_init (XfpmBacklight *backlight)
{
gboolean handle_keys;
- backlight->priv->idle = xfpm_idle_new ();
- backlight->priv->conf = xfpm_xfconf_new ();
+ backlight->priv->idle = xfpm_idle_new ();
+ backlight->priv->conf = xfpm_xfconf_new ();
backlight->priv->button = xfpm_button_new ();
- backlight->priv->power = xfpm_power_get ();
+ backlight->priv->power = xfpm_power_get ();
backlight->priv->notify = xfpm_notify_new ();
backlight->priv->max_level = xfpm_brightness_get_max_level (backlight->priv->brightness);
backlight->priv->brightness_switch = -1;
@@ -405,17 +412,17 @@ xfpm_backlight_init (XfpmBacklight *backlight)
* will use this saved value instead of the one found at the
* current startup so the setting is restored properly.
*/
- backlight->priv->brightness_switch_save =
- xfconf_channel_get_int (xfpm_xfconf_get_channel(backlight->priv->conf),
- XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE,
- -1);
+ backlight->priv->brightness_switch_save
+ = xfconf_channel_get_int (xfpm_xfconf_get_channel (backlight->priv->conf),
+ XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE,
+ -1);
if (backlight->priv->brightness_switch_save == -1)
{
- if (!xfconf_channel_set_int (xfpm_xfconf_get_channel(backlight->priv->conf),
- XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE,
- backlight->priv->brightness_switch))
- g_critical ("Cannot set value for property %s", BRIGHTNESS_SWITCH_SAVE);
+ if (!xfconf_channel_set_int (xfpm_xfconf_get_channel (backlight->priv->conf),
+ XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE,
+ backlight->priv->brightness_switch))
+ g_critical ("Cannot set value for property %s", BRIGHTNESS_SWITCH_SAVE);
backlight->priv->brightness_switch_save = backlight->priv->brightness_switch;
}
@@ -426,29 +433,32 @@ xfpm_backlight_init (XfpmBacklight *backlight)
"will try to restore it this time.");
}
- /* check whether to change the brightness switch */
- handle_keys = xfconf_channel_get_bool (xfpm_xfconf_get_channel(backlight->priv->conf),
- XFPM_PROPERTIES_PREFIX HANDLE_BRIGHTNESS_KEYS,
- TRUE);
+ /* check whether to change the brightness switch */
+ handle_keys = xfconf_channel_get_bool (xfpm_xfconf_get_channel (backlight->priv->conf),
+ XFPM_PROPERTIES_PREFIX HANDLE_BRIGHTNESS_KEYS,
+ TRUE);
backlight->priv->brightness_switch = handle_keys ? 0 : 1;
g_object_set (G_OBJECT (backlight),
- BRIGHTNESS_SWITCH,
- backlight->priv->brightness_switch,
- NULL);
+ BRIGHTNESS_SWITCH,
+ backlight->priv->brightness_switch,
+ NULL);
xfpm_button_set_handle_brightness_keys (backlight->priv->button, handle_keys);
g_signal_connect_object (backlight->priv->conf, "notify::" HANDLE_BRIGHTNESS_KEYS,
- G_CALLBACK (xfpm_backlight_handle_brightness_keys_changed), backlight, G_CONNECT_SWAPPED);
+ G_CALLBACK (xfpm_backlight_handle_brightness_keys_changed),
+ backlight, G_CONNECT_SWAPPED);
if (backlight->priv->idle != NULL)
{
g_signal_connect_object (backlight->priv->idle, "alarm-expired",
G_CALLBACK (xfpm_backlight_alarm_timeout_cb), backlight, 0);
g_signal_connect_object (backlight->priv->idle, "reset",
- G_CALLBACK(xfpm_backlight_reset_cb), backlight, 0);
+ G_CALLBACK (xfpm_backlight_reset_cb), backlight, 0);
g_signal_connect_object (backlight->priv->conf, "notify::" BRIGHTNESS_ON_AC,
- G_CALLBACK (xfpm_backlight_brightness_on_ac_settings_changed), backlight, G_CONNECT_SWAPPED);
+ G_CALLBACK (xfpm_backlight_brightness_on_ac_settings_changed),
+ backlight, G_CONNECT_SWAPPED);
g_signal_connect_object (backlight->priv->conf, "notify::" BRIGHTNESS_ON_BATTERY,
- G_CALLBACK (xfpm_backlight_brightness_on_battery_settings_changed), backlight, G_CONNECT_SWAPPED);
+ G_CALLBACK (xfpm_backlight_brightness_on_battery_settings_changed),
+ backlight, G_CONNECT_SWAPPED);
xfpm_backlight_brightness_on_ac_settings_changed (backlight);
xfpm_backlight_brightness_on_battery_settings_changed (backlight);
}
@@ -463,12 +473,12 @@ xfpm_backlight_init (XfpmBacklight *backlight)
xfpm_brightness_get_level (backlight->priv->brightness, &backlight->priv->last_level);
/* setup step count */
- backlight->priv->brightness_step_count =
- xfconf_channel_get_int (xfpm_xfconf_get_channel(backlight->priv->conf),
+ backlight->priv->brightness_step_count
+ = xfconf_channel_get_int (xfpm_xfconf_get_channel (backlight->priv->conf),
XFPM_PROPERTIES_PREFIX BRIGHTNESS_STEP_COUNT,
10);
- backlight->priv->brightness_exponential =
- xfconf_channel_get_bool (xfpm_xfconf_get_channel(backlight->priv->conf),
+ backlight->priv->brightness_exponential
+ = xfconf_channel_get_bool (xfpm_xfconf_get_channel (backlight->priv->conf),
XFPM_PROPERTIES_PREFIX BRIGHTNESS_EXPONENTIAL,
FALSE);
}
@@ -510,15 +520,15 @@ xfpm_backlight_set_property (GObject *object,
case PROP_BRIGHTNESS_SWITCH:
backlight->priv->brightness_switch = g_value_get_int (value);
if (!backlight->priv->brightness_switch_initialized)
- break;
+ break;
ret = xfpm_brightness_set_switch (backlight->priv->brightness,
backlight->priv->brightness_switch);
if (!ret)
- XFPM_DEBUG ("Unable to set the kernel brightness switch parameter to %d.",
- backlight->priv->brightness_switch);
+ XFPM_DEBUG ("Unable to set the kernel brightness switch parameter to %d.",
+ backlight->priv->brightness_switch);
else
- XFPM_DEBUG ("Set kernel brightness switch to %d",
- backlight->priv->brightness_switch);
+ XFPM_DEBUG ("Set kernel brightness switch to %d",
+ backlight->priv->brightness_switch);
break;
case PROP_BRIGHTNESS_SWITCH_SAVE:
@@ -539,44 +549,43 @@ xfpm_backlight_finalize (GObject *object)
xfpm_backlight_destroy_popup (backlight);
- if ( backlight->priv->idle )
+ if (backlight->priv->idle)
g_object_unref (backlight->priv->idle);
- if ( backlight->priv->conf )
- {
- /* restore video module brightness switch setting */
- if ( backlight->priv->brightness_switch_save != -1 )
+ if (backlight->priv->conf)
{
- gboolean ret =
- xfpm_brightness_set_switch (backlight->priv->brightness,
- backlight->priv->brightness_switch_save);
- /* unset the xfconf saved value after the restore */
- if (!xfconf_channel_set_int (xfpm_xfconf_get_channel(backlight->priv->conf),
- XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE, -1))
- g_critical ("Cannot set value for property %s", BRIGHTNESS_SWITCH_SAVE);
-
- if (ret)
+ /* restore video module brightness switch setting */
+ if (backlight->priv->brightness_switch_save != -1)
{
- backlight->priv->brightness_switch = backlight->priv->brightness_switch_save;
- XFPM_DEBUG ("Restored brightness switch value to: %d", backlight->priv->brightness_switch);
- }
- else
- XFPM_DEBUG ("Unable to restore the kernel brightness switch parameter to its original value, "
- "still resetting the saved value.");
+ gboolean ret = xfpm_brightness_set_switch (backlight->priv->brightness,
+ backlight->priv->brightness_switch_save);
+ /* unset the xfconf saved value after the restore */
+ if (!xfconf_channel_set_int (xfpm_xfconf_get_channel (backlight->priv->conf),
+ XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE, -1))
+ g_critical ("Cannot set value for property %s", BRIGHTNESS_SWITCH_SAVE);
+
+ if (ret)
+ {
+ backlight->priv->brightness_switch = backlight->priv->brightness_switch_save;
+ XFPM_DEBUG ("Restored brightness switch value to: %d", backlight->priv->brightness_switch);
+ }
+ else
+ XFPM_DEBUG ("Unable to restore the kernel brightness switch parameter to its original value, "
+ "still resetting the saved value.");
}
g_object_unref (backlight->priv->conf);
}
- if ( backlight->priv->brightness )
+ if (backlight->priv->brightness)
g_object_unref (backlight->priv->brightness);
- if ( backlight->priv->button )
+ if (backlight->priv->button)
g_object_unref (backlight->priv->button);
- if ( backlight->priv->power )
+ if (backlight->priv->power)
g_object_unref (backlight->priv->power);
- if ( backlight->priv->notify)
+ if (backlight->priv->notify)
g_object_unref (backlight->priv->notify);
G_OBJECT_CLASS (xfpm_backlight_parent_class)->finalize (object);
diff --git a/src/xfpm-backlight.h b/src/xfpm-backlight.h
index 1095e68473d151d4ef61a100044716c5ed2374bc..6f9845bb90bba501baf552e357a219017afac576 100644
--- a/src/xfpm-backlight.h
+++ b/src/xfpm-backlight.h
@@ -25,25 +25,27 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_BACKLIGHT (xfpm_backlight_get_type () )
-#define XFPM_BACKLIGHT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_BACKLIGHT, XfpmBacklight))
-#define XFPM_IS_BACKLIGHT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_BACKLIGHT))
+#define XFPM_TYPE_BACKLIGHT (xfpm_backlight_get_type ())
+#define XFPM_BACKLIGHT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_BACKLIGHT, XfpmBacklight))
+#define XFPM_IS_BACKLIGHT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_BACKLIGHT))
typedef struct XfpmBacklightPrivate XfpmBacklightPrivate;
typedef struct
{
- GObject parent;
- XfpmBacklightPrivate *priv;
+ GObject parent;
+ XfpmBacklightPrivate *priv;
} XfpmBacklight;
typedef struct
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
} XfpmBacklightClass;
-GType xfpm_backlight_get_type (void) G_GNUC_CONST;
-XfpmBacklight *xfpm_backlight_new (void);
+GType
+xfpm_backlight_get_type (void) G_GNUC_CONST;
+XfpmBacklight *
+xfpm_backlight_new (void);
G_END_DECLS
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index 6fca97e57cdfb19f9249d20b526c5cd6302b2054..2bd0cf28931cd2f65e57907fcc9eab4f6a610e69 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -37,32 +37,33 @@
#include <libxfce4util/libxfce4util.h>
-static void xfpm_battery_finalize (GObject *object);
+static void
+xfpm_battery_finalize (GObject *object);
struct XfpmBatteryPrivate
{
- XfpmXfconf *conf;
- XfpmNotify *notify;
- XfpmButton *button;
- UpDevice *device;
- UpClient *client;
-
- XfpmBatteryCharge charge;
- UpDeviceState state;
- UpDeviceKind type;
- gboolean ac_online;
- gboolean present;
- guint percentage;
- gint64 time_to_full;
- gint64 time_to_empty;
-
- const gchar *battery_name;
-
- gulong sig;
- gulong sig_bt;
- gulong sig_up;
-
- guint notify_idle;
+ XfpmXfconf *conf;
+ XfpmNotify *notify;
+ XfpmButton *button;
+ UpDevice *device;
+ UpClient *client;
+
+ XfpmBatteryCharge charge;
+ UpDeviceState state;
+ UpDeviceKind type;
+ gboolean ac_online;
+ gboolean present;
+ guint percentage;
+ gint64 time_to_full;
+ gint64 time_to_empty;
+
+ const gchar *battery_name;
+
+ gulong sig;
+ gulong sig_bt;
+ gulong sig_up;
+
+ guint notify_idle;
};
enum
@@ -79,7 +80,7 @@ enum
LAST_SIGNAL
};
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE_WITH_PRIVATE (XfpmBattery, xfpm_battery, GTK_TYPE_WIDGET)
@@ -87,7 +88,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (XfpmBattery, xfpm_battery, GTK_TYPE_WIDGET)
static gchar *
xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
{
- gchar *msg = NULL;
+ gchar *msg = NULL;
if (battery->priv->type == UP_DEVICE_KIND_BATTERY || battery->priv->type == UP_DEVICE_KIND_UPS)
@@ -100,7 +101,7 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
case UP_DEVICE_STATE_CHARGING:
msg = g_strdup_printf (_("Your %s is charging"), battery->priv->battery_name);
- if ( battery->priv->time_to_full != 0 )
+ if (battery->priv->time_to_full != 0)
{
gchar *tmp, *est_time_str;
tmp = g_strdup (msg);
@@ -108,7 +109,8 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_full);
- msg = g_strdup_printf (_("%s (%i%%)\n%s until fully charged"), tmp, battery->priv->percentage, est_time_str);
+ msg = g_strdup_printf (_("%s (%i%%)\n%s until fully charged"),
+ tmp, battery->priv->percentage, est_time_str);
g_free (est_time_str);
g_free (tmp);
}
@@ -116,21 +118,22 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
break;
case UP_DEVICE_STATE_DISCHARGING:
if (battery->priv->ac_online)
- msg = g_strdup_printf (_("Your %s is discharging"), battery->priv->battery_name);
+ msg = g_strdup_printf (_("Your %s is discharging"), battery->priv->battery_name);
else
- msg = g_strdup_printf (_("System is running on %s power"), battery->priv->battery_name);
+ msg = g_strdup_printf (_("System is running on %s power"), battery->priv->battery_name);
- if ( battery->priv->time_to_empty != 0 )
+ if (battery->priv->time_to_empty != 0)
{
- gchar *tmp, *est_time_str;
- tmp = g_strdup (msg);
- g_free (msg);
+ gchar *tmp, *est_time_str;
+ tmp = g_strdup (msg);
+ g_free (msg);
- est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_empty);
+ est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_empty);
- msg = g_strdup_printf (_("%s (%i%%)\nEstimated time left is %s"), tmp, battery->priv->percentage, est_time_str);
- g_free (tmp);
- g_free (est_time_str);
+ msg = g_strdup_printf (_("%s (%i%%)\nEstimated time left is %s"),
+ tmp, battery->priv->percentage, est_time_str);
+ g_free (tmp);
+ g_free (est_time_str);
}
break;
case UP_DEVICE_STATE_EMPTY:
@@ -139,7 +142,6 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
default:
break;
}
-
}
else if (battery->priv->type >= UP_DEVICE_KIND_MONITOR)
{
@@ -152,7 +154,7 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
msg = g_strdup_printf (_("Your %s is charging"), battery->priv->battery_name);
break;
case UP_DEVICE_STATE_DISCHARGING:
- msg = g_strdup_printf (_("Your %s is discharging"), battery->priv->battery_name);
+ msg = g_strdup_printf (_("Your %s is discharging"), battery->priv->battery_name);
break;
case UP_DEVICE_STATE_EMPTY:
msg = g_strdup_printf (_("Your %s is empty"), battery->priv->battery_name);
@@ -172,7 +174,7 @@ xfpm_battery_notify (XfpmBattery *battery)
message = xfpm_battery_get_message_from_battery_state (battery);
- if ( !message )
+ if (!message)
return;
xfpm_notify_show_notification (battery->priv->notify,
@@ -201,10 +203,9 @@ xfpm_battery_notify_state (XfpmBattery *battery)
gboolean notify;
static gboolean starting_up = TRUE;
- if ( battery->priv->type == UP_DEVICE_KIND_BATTERY ||
- battery->priv->type == UP_DEVICE_KIND_UPS )
+ if (battery->priv->type == UP_DEVICE_KIND_BATTERY || battery->priv->type == UP_DEVICE_KIND_UPS)
{
- if ( starting_up )
+ if (starting_up)
{
starting_up = FALSE;
return;
@@ -214,7 +215,7 @@ xfpm_battery_notify_state (XfpmBattery *battery)
GENERAL_NOTIFICATION_CFG, ¬ify,
NULL);
- if ( notify )
+ if (notify)
{
if (battery->priv->notify_idle == 0)
battery->priv->notify_idle = g_idle_add (xfpm_battery_notify_idle, battery);
@@ -234,29 +235,30 @@ xfpm_battery_check_charge (XfpmBattery *battery)
low_level = critical_level + 10;
- if ( battery->priv->percentage > low_level )
+ if (battery->priv->percentage > low_level)
charge = XFPM_BATTERY_CHARGE_OK;
- else if ( battery->priv->percentage <= low_level && battery->priv->percentage > critical_level )
+ else if (battery->priv->percentage <= low_level && battery->priv->percentage > critical_level)
charge = XFPM_BATTERY_CHARGE_LOW;
- else if ( battery->priv->percentage <= critical_level )
+ else if (battery->priv->percentage <= critical_level)
charge = XFPM_BATTERY_CHARGE_CRITICAL;
else
charge = XFPM_BATTERY_CHARGE_UNKNOWN;
- if ( charge != battery->priv->charge)
+ if (charge != battery->priv->charge)
{
battery->priv->charge = charge;
/*
* only emit signal when when battery charge changes from ok->low->critical
* and not the other way round.
*/
- if ( battery->priv->charge != XFPM_BATTERY_CHARGE_CRITICAL || charge != XFPM_BATTERY_CHARGE_LOW )
- g_signal_emit (G_OBJECT (battery), signals [BATTERY_CHARGE_CHANGED], 0);
+ if (battery->priv->charge != XFPM_BATTERY_CHARGE_CRITICAL || charge != XFPM_BATTERY_CHARGE_LOW)
+ g_signal_emit (G_OBJECT (battery), signals[BATTERY_CHARGE_CHANGED], 0);
}
}
static void
-xfpm_battery_refresh (XfpmBattery *battery, UpDevice *device)
+xfpm_battery_refresh (XfpmBattery *battery,
+ UpDevice *device)
{
gboolean present;
guint state;
@@ -272,7 +274,7 @@ xfpm_battery_refresh (XfpmBattery *battery, UpDevice *device)
NULL);
battery->priv->present = present;
- if ( state != battery->priv->state )
+ if (state != battery->priv->state)
{
battery->priv->state = state;
xfpm_battery_notify_state (battery);
@@ -281,11 +283,10 @@ xfpm_battery_refresh (XfpmBattery *battery, UpDevice *device)
xfpm_battery_check_charge (battery);
- if ( battery->priv->type == UP_DEVICE_KIND_BATTERY ||
- battery->priv->type == UP_DEVICE_KIND_UPS )
+ if (battery->priv->type == UP_DEVICE_KIND_BATTERY || battery->priv->type == UP_DEVICE_KIND_UPS)
{
battery->priv->time_to_empty = to_empty;
- battery->priv->time_to_full = to_empty;
+ battery->priv->time_to_full = to_empty;
}
}
@@ -355,14 +356,13 @@ xfpm_battery_class_init (XfpmBatteryClass *klass)
object_class->get_property = xfpm_battery_get_property;
object_class->set_property = xfpm_battery_set_property;
- signals [BATTERY_CHARGE_CHANGED] =
- g_signal_new ("battery-charge-changed",
- XFPM_TYPE_BATTERY,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmBatteryClass, battery_charge_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0, G_TYPE_NONE);
+ signals[BATTERY_CHARGE_CHANGED] = g_signal_new ("battery-charge-changed",
+ XFPM_TYPE_BATTERY,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmBatteryClass, battery_charge_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0, G_TYPE_NONE);
g_object_class_install_property (object_class,
PROP_AC_ONLINE,
@@ -394,17 +394,17 @@ xfpm_battery_init (XfpmBattery *battery)
{
battery->priv = xfpm_battery_get_instance_private (battery);
- battery->priv->conf = xfpm_xfconf_new ();
- battery->priv->notify = xfpm_notify_new ();
- battery->priv->device = NULL;
- battery->priv->client = NULL;
- battery->priv->state = UP_DEVICE_STATE_UNKNOWN;
- battery->priv->type = UP_DEVICE_KIND_UNKNOWN;
- battery->priv->charge = XFPM_BATTERY_CHARGE_UNKNOWN;
- battery->priv->time_to_full = 0;
+ battery->priv->conf = xfpm_xfconf_new ();
+ battery->priv->notify = xfpm_notify_new ();
+ battery->priv->device = NULL;
+ battery->priv->client = NULL;
+ battery->priv->state = UP_DEVICE_STATE_UNKNOWN;
+ battery->priv->type = UP_DEVICE_KIND_UNKNOWN;
+ battery->priv->charge = XFPM_BATTERY_CHARGE_UNKNOWN;
+ battery->priv->time_to_full = 0;
battery->priv->time_to_empty = 0;
- battery->priv->button = xfpm_button_new ();
- battery->priv->ac_online = TRUE;
+ battery->priv->button = xfpm_button_new ();
+ battery->priv->ac_online = TRUE;
}
static void
@@ -417,13 +417,13 @@ xfpm_battery_finalize (GObject *object)
if (battery->priv->notify_idle != 0)
g_source_remove (battery->priv->notify_idle);
- if ( g_signal_handler_is_connected (battery->priv->device, battery->priv->sig_up ) )
+ if (g_signal_handler_is_connected (battery->priv->device, battery->priv->sig_up))
g_signal_handler_disconnect (G_OBJECT (battery->priv->device), battery->priv->sig_up);
- if ( g_signal_handler_is_connected (battery->priv->conf, battery->priv->sig ) )
+ if (g_signal_handler_is_connected (battery->priv->conf, battery->priv->sig))
g_signal_handler_disconnect (G_OBJECT (battery->priv->conf), battery->priv->sig);
- if ( g_signal_handler_is_connected (battery->priv->button, battery->priv->sig_bt ) )
+ if (g_signal_handler_is_connected (battery->priv->button, battery->priv->sig_bt))
g_signal_handler_disconnect (G_OBJECT (battery->priv->button), battery->priv->sig_bt);
g_object_unref (battery->priv->device);
@@ -453,10 +453,10 @@ xfpm_battery_monitor_device (XfpmBattery *battery,
{
UpDevice *device;
battery->priv->type = device_type;
- battery->priv->client = up_client_new();
+ battery->priv->client = up_client_new ();
battery->priv->battery_name = xfpm_power_translate_device_type (device_type);
- device = up_device_new();
+ device = up_device_new ();
up_device_set_object_path_sync (device, object_path, NULL, NULL);
battery->priv->device = device;
battery->priv->sig_up = g_signal_connect (battery->priv->device, "notify", G_CALLBACK (xfpm_battery_changed_cb), battery);
@@ -471,7 +471,7 @@ xfpm_battery_monitor_device (XfpmBattery *battery,
UpDeviceKind
xfpm_battery_get_device_type (XfpmBattery *battery)
{
- g_return_val_if_fail (XFPM_IS_BATTERY (battery), UP_DEVICE_KIND_UNKNOWN );
+ g_return_val_if_fail (XFPM_IS_BATTERY (battery), UP_DEVICE_KIND_UNKNOWN);
return battery->priv->type;
}
@@ -500,7 +500,7 @@ xfpm_battery_get_time_left (XfpmBattery *battery)
return xfpm_battery_get_time_string (battery->priv->time_to_empty);
}
-const gchar*
+const gchar *
xfpm_battery_get_icon_name (XfpmBattery *battery)
{
const gchar *icon_name = NULL;
diff --git a/src/xfpm-battery.h b/src/xfpm-battery.h
index bffefd4226fd4a735d09b330b738e9dc6c1880db..e03f19050a3eb2425fd8c6da1f34204c781a48ab 100644
--- a/src/xfpm-battery.h
+++ b/src/xfpm-battery.h
@@ -29,34 +29,42 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_BATTERY (xfpm_battery_get_type () )
-#define XFPM_BATTERY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_BATTERY, XfpmBattery))
-#define XFPM_IS_BATTERY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_BATTERY))
+#define XFPM_TYPE_BATTERY (xfpm_battery_get_type ())
+#define XFPM_BATTERY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_BATTERY, XfpmBattery))
+#define XFPM_IS_BATTERY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_BATTERY))
typedef struct XfpmBatteryPrivate XfpmBatteryPrivate;
typedef struct
{
- GtkWidget parent;
- XfpmBatteryPrivate *priv;
+ GtkWidget parent;
+ XfpmBatteryPrivate *priv;
} XfpmBattery;
typedef struct
{
- GtkWidgetClass parent_class;
- void (*battery_charge_changed) (XfpmBattery *battery);
+ GtkWidgetClass parent_class;
+ void (*battery_charge_changed) (XfpmBattery *battery);
} XfpmBatteryClass;
-GType xfpm_battery_get_type (void) G_GNUC_CONST;
-GtkWidget *xfpm_battery_new (void);
-void xfpm_battery_monitor_device (XfpmBattery *battery,
- const char *object_path,
- UpDeviceKind device_type);
-UpDeviceKind xfpm_battery_get_device_type (XfpmBattery *battery);
-XfpmBatteryCharge xfpm_battery_get_charge (XfpmBattery *battery);
-const gchar *xfpm_battery_get_battery_name (XfpmBattery *battery);
-gchar *xfpm_battery_get_time_left (XfpmBattery *battery);
-const gchar *xfpm_battery_get_icon_name (XfpmBattery *battery);
+GType
+xfpm_battery_get_type (void) G_GNUC_CONST;
+GtkWidget *
+xfpm_battery_new (void);
+void
+xfpm_battery_monitor_device (XfpmBattery *battery,
+ const char *object_path,
+ UpDeviceKind device_type);
+UpDeviceKind
+xfpm_battery_get_device_type (XfpmBattery *battery);
+XfpmBatteryCharge
+xfpm_battery_get_charge (XfpmBattery *battery);
+const gchar *
+xfpm_battery_get_battery_name (XfpmBattery *battery);
+gchar *
+xfpm_battery_get_time_left (XfpmBattery *battery);
+const gchar *
+xfpm_battery_get_icon_name (XfpmBattery *battery);
G_END_DECLS
diff --git a/src/xfpm-button.c b/src/xfpm-button.c
index 74c523d1796eeeb0169e2d4242f39b430a2a0ad8..f5b28b57eadcefaa4bc643fede57604cfb1d3127 100644
--- a/src/xfpm-button.c
+++ b/src/xfpm-button.c
@@ -44,22 +44,23 @@
#include <gdk/gdkx.h>
#endif
-static void xfpm_button_finalize (GObject *object);
+static void
+xfpm_button_finalize (GObject *object);
#ifdef ENABLE_X11
static struct
{
- XfpmButtonKey key;
- guint key_code;
-} xfpm_key_map [NUMBER_OF_BUTTONS] = { {0, 0}, };
+ XfpmButtonKey key;
+ guint key_code;
+} xfpm_key_map[NUMBER_OF_BUTTONS] = { 0 };
#endif
struct XfpmButtonPrivate
{
- GdkScreen *screen;
- GdkWindow *window;
- gboolean handle_brightness_keys;
- guint16 mapped_buttons;
+ GdkScreen *screen;
+ GdkWindow *window;
+ gboolean handle_brightness_keys;
+ guint16 mapped_buttons;
};
enum
@@ -82,35 +83,37 @@ xfpm_button_get_key (unsigned int keycode)
XfpmButtonKey key = BUTTON_UNKNOWN;
guint i;
- for ( i = 0; i < G_N_ELEMENTS (xfpm_key_map); i++)
+ for (i = 0; i < G_N_ELEMENTS (xfpm_key_map); i++)
{
- if ( xfpm_key_map [i].key_code == keycode )
- key = xfpm_key_map [i].key;
+ if (xfpm_key_map[i].key_code == keycode)
+ key = xfpm_key_map[i].key;
}
return key;
}
static GdkFilterReturn
-xfpm_button_filter_x_events (GdkXEvent *xevent, GdkEvent *ev, gpointer data)
+xfpm_button_filter_x_events (GdkXEvent *xevent,
+ GdkEvent *ev,
+ gpointer data)
{
XfpmButtonKey key;
XfpmButton *button;
XEvent *xev = (XEvent *) xevent;
- if ( xev->type != KeyPress )
+ if (xev->type != KeyPress)
return GDK_FILTER_CONTINUE;
key = xfpm_button_get_key (xev->xkey.keycode);
- if ( key != BUTTON_UNKNOWN )
+ if (key != BUTTON_UNKNOWN)
{
button = (XfpmButton *) data;
XFPM_DEBUG_ENUM (key, XFPM_TYPE_BUTTON_KEY, "Key press");
- g_signal_emit (G_OBJECT(button), signals[BUTTON_PRESSED], 0, key);
+ g_signal_emit (G_OBJECT (button), signals[BUTTON_PRESSED], 0, key);
return GDK_FILTER_REMOVE;
}
@@ -118,7 +121,8 @@ xfpm_button_filter_x_events (GdkXEvent *xevent, GdkEvent *ev, gpointer data)
}
static gboolean
-xfpm_button_grab_keystring (XfpmButton *button, guint keycode)
+xfpm_button_grab_keystring (XfpmButton *button,
+ guint keycode)
{
Display *display;
GdkDisplay *gdisplay;
@@ -134,7 +138,7 @@ xfpm_button_grab_keystring (XfpmButton *button, guint keycode)
GDK_WINDOW_XID (button->priv->window), True,
GrabModeAsync, GrabModeAsync);
- if ( ret == BadAccess )
+ if (ret == BadAccess)
{
g_warning ("Failed to grab modmask=%u, keycode=%li", modmask, (long int) keycode);
return FALSE;
@@ -158,34 +162,38 @@ xfpm_button_grab_keystring (XfpmButton *button, guint keycode)
static gboolean
-xfpm_button_xevent_key (XfpmButton *button, guint keysym , XfpmButtonKey key)
+xfpm_button_xevent_key (XfpmButton *button,
+ guint keysym,
+ XfpmButtonKey key)
{
- guint keycode = XKeysymToKeycode (gdk_x11_get_default_xdisplay(), keysym);
+ guint keycode = XKeysymToKeycode (gdk_x11_get_default_xdisplay (), keysym);
- if ( keycode == 0 )
+ if (keycode == 0)
{
XFPM_DEBUG ("could not map keysym %x to keycode\n", keysym);
return FALSE;
}
- if ( !xfpm_button_grab_keystring(button, keycode))
+ if (!xfpm_button_grab_keystring (button, keycode))
return FALSE;
XFPM_DEBUG_ENUM (key, XFPM_TYPE_BUTTON_KEY, "Grabbed key %li ", (long int) keycode);
- xfpm_key_map [key].key_code = keycode;
- xfpm_key_map [key].key = key;
+ xfpm_key_map[key].key_code = keycode;
+ xfpm_key_map[key].key = key;
return TRUE;
}
static void
-xfpm_button_ungrab (XfpmButton *button, guint keysym, XfpmButtonKey key)
+xfpm_button_ungrab (XfpmButton *button,
+ guint keysym,
+ XfpmButtonKey key)
{
Display *display;
GdkDisplay *gdisplay;
guint modmask = AnyModifier;
- guint keycode = XKeysymToKeycode (gdk_x11_get_default_xdisplay(), keysym);
+ guint keycode = XKeysymToKeycode (gdk_x11_get_default_xdisplay (), keysym);
if (keycode == 0)
{
@@ -208,8 +216,8 @@ xfpm_button_ungrab (XfpmButton *button, guint keysym, XfpmButtonKey key)
XFPM_DEBUG_ENUM (key, XFPM_TYPE_BUTTON_KEY, "Ungrabbed key %li ", (long int) keycode);
- xfpm_key_map [key].key_code = 0;
- xfpm_key_map [key].key = 0;
+ xfpm_key_map[key].key_code = 0;
+ xfpm_key_map[key].key = 0;
}
static void
@@ -218,41 +226,41 @@ xfpm_button_setup (XfpmButton *button)
button->priv->screen = gdk_screen_get_default ();
button->priv->window = gdk_screen_get_root_window (button->priv->screen);
- if ( xfpm_button_xevent_key (button, XF86XK_PowerOff, BUTTON_POWER_OFF) )
+ if (xfpm_button_xevent_key (button, XF86XK_PowerOff, BUTTON_POWER_OFF))
button->priv->mapped_buttons |= POWER_KEY;
#ifdef HAVE_XF86XK_HIBERNATE
- if ( xfpm_button_xevent_key (button, XF86XK_Hibernate, BUTTON_HIBERNATE) )
+ if (xfpm_button_xevent_key (button, XF86XK_Hibernate, BUTTON_HIBERNATE))
button->priv->mapped_buttons |= HIBERNATE_KEY;
#endif
#ifdef HAVE_XF86XK_SUSPEND
- if ( xfpm_button_xevent_key (button, XF86XK_Suspend, BUTTON_HIBERNATE) )
+ if (xfpm_button_xevent_key (button, XF86XK_Suspend, BUTTON_HIBERNATE))
button->priv->mapped_buttons |= HIBERNATE_KEY;
#endif
- if ( xfpm_button_xevent_key (button, XF86XK_Sleep, BUTTON_SLEEP) )
+ if (xfpm_button_xevent_key (button, XF86XK_Sleep, BUTTON_SLEEP))
button->priv->mapped_buttons |= SLEEP_KEY;
if (button->priv->handle_brightness_keys)
{
- if ( xfpm_button_xevent_key (button, XF86XK_MonBrightnessUp, BUTTON_MON_BRIGHTNESS_UP) )
+ if (xfpm_button_xevent_key (button, XF86XK_MonBrightnessUp, BUTTON_MON_BRIGHTNESS_UP))
button->priv->mapped_buttons |= BRIGHTNESS_KEY_UP;
- if (xfpm_button_xevent_key (button, XF86XK_MonBrightnessDown, BUTTON_MON_BRIGHTNESS_DOWN) )
+ if (xfpm_button_xevent_key (button, XF86XK_MonBrightnessDown, BUTTON_MON_BRIGHTNESS_DOWN))
button->priv->mapped_buttons |= BRIGHTNESS_KEY_DOWN;
}
if (xfpm_button_xevent_key (button, XF86XK_Battery, BUTTON_BATTERY))
button->priv->mapped_buttons |= BATTERY_KEY;
- if ( xfpm_button_xevent_key (button, XF86XK_KbdBrightnessUp, BUTTON_KBD_BRIGHTNESS_UP) )
+ if (xfpm_button_xevent_key (button, XF86XK_KbdBrightnessUp, BUTTON_KBD_BRIGHTNESS_UP))
button->priv->mapped_buttons |= KBD_BRIGHTNESS_KEY_UP;
- if (xfpm_button_xevent_key (button, XF86XK_KbdBrightnessDown, BUTTON_KBD_BRIGHTNESS_DOWN) )
+ if (xfpm_button_xevent_key (button, XF86XK_KbdBrightnessDown, BUTTON_KBD_BRIGHTNESS_DOWN))
button->priv->mapped_buttons |= KBD_BRIGHTNESS_KEY_DOWN;
- if (xfpm_button_xevent_key (button, XF86XK_KbdLightOnOff, BUTTON_KBD_BRIGHTNESS_CYCLE) )
+ if (xfpm_button_xevent_key (button, XF86XK_KbdLightOnOff, BUTTON_KBD_BRIGHTNESS_CYCLE))
button->priv->mapped_buttons |= KBD_BRIGHTNESS_CYCLE;
gdk_window_add_filter (button->priv->window, xfpm_button_filter_x_events, button);
@@ -261,18 +269,17 @@ xfpm_button_setup (XfpmButton *button)
#endif /* ENABLE_X11 */
static void
-xfpm_button_class_init(XfpmButtonClass *klass)
+xfpm_button_class_init (XfpmButtonClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS(klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
- signals [BUTTON_PRESSED] =
- g_signal_new ("button-pressed",
- XFPM_TYPE_BUTTON,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfpmButtonClass, button_pressed),
- NULL, NULL,
- g_cclosure_marshal_VOID__ENUM,
- G_TYPE_NONE, 1, XFPM_TYPE_BUTTON_KEY);
+ signals[BUTTON_PRESSED] = g_signal_new ("button-pressed",
+ XFPM_TYPE_BUTTON,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmButtonClass, button_pressed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__ENUM,
+ G_TYPE_NONE, 1, XFPM_TYPE_BUTTON_KEY);
object_class->finalize = xfpm_button_finalize;
}
@@ -296,7 +303,7 @@ xfpm_button_init (XfpmButton *button)
static void
xfpm_button_finalize (GObject *object)
{
- G_OBJECT_CLASS(xfpm_button_parent_class)->finalize(object);
+ G_OBJECT_CLASS (xfpm_button_parent_class)->finalize (object);
}
XfpmButton *
@@ -304,7 +311,7 @@ xfpm_button_new (void)
{
static gpointer xfpm_button_object = NULL;
- if ( G_LIKELY (xfpm_button_object != NULL) )
+ if (G_LIKELY (xfpm_button_object != NULL))
{
g_object_ref (xfpm_button_object);
}
@@ -314,7 +321,7 @@ xfpm_button_new (void)
g_object_add_weak_pointer (xfpm_button_object, &xfpm_button_object);
}
- return XFPM_BUTTON (xfpm_button_object);
+ return XFPM_BUTTON (xfpm_button_object);
}
guint16
diff --git a/src/xfpm-button.h b/src/xfpm-button.h
index f08a1dab8928a6e6a39aa58a80289f534947a3fc..a02fdf1136f75a9b421b85d0086cb96a4cb9c6c5 100644
--- a/src/xfpm-button.h
+++ b/src/xfpm-button.h
@@ -27,31 +27,35 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_BUTTON (xfpm_button_get_type () )
-#define XFPM_BUTTON(o) (G_TYPE_CHECK_INSTANCE_CAST((o), XFPM_TYPE_BUTTON, XfpmButton))
-#define XFPM_IS_BUTTON(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), XFPM_TYPE_BUTTON))
+#define XFPM_TYPE_BUTTON (xfpm_button_get_type ())
+#define XFPM_BUTTON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_BUTTON, XfpmButton))
+#define XFPM_IS_BUTTON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_BUTTON))
typedef struct XfpmButtonPrivate XfpmButtonPrivate;
typedef struct
{
- GObject parent;
- XfpmButtonPrivate *priv;
+ GObject parent;
+ XfpmButtonPrivate *priv;
} XfpmButton;
typedef struct
{
- GObjectClass parent_class;
- void (*button_pressed) (XfpmButton *button,
- XfpmButtonKey type);
+ GObjectClass parent_class;
+ void (*button_pressed) (XfpmButton *button,
+ XfpmButtonKey type);
} XfpmButtonClass;
-GType xfpm_button_get_type (void) G_GNUC_CONST;
-XfpmButton *xfpm_button_new (void);
-guint16 xfpm_button_get_mapped (XfpmButton *button) G_GNUC_PURE;
+GType
+xfpm_button_get_type (void) G_GNUC_CONST;
+XfpmButton *
+xfpm_button_new (void);
+guint16
+xfpm_button_get_mapped (XfpmButton *button) G_GNUC_PURE;
-void xfpm_button_set_handle_brightness_keys (XfpmButton *button,
- gboolean handle_brightness_keys);
+void
+xfpm_button_set_handle_brightness_keys (XfpmButton *button,
+ gboolean handle_brightness_keys);
G_END_DECLS
diff --git a/src/xfpm-dpms-wayland.c b/src/xfpm-dpms-wayland.c
index 84448283154a205d9d3ad6562ef5e82bb734be15..b26e2ff9ef0826cc8492f341a6086ce6731c1f88 100644
--- a/src/xfpm-dpms-wayland.c
+++ b/src/xfpm-dpms-wayland.c
@@ -30,20 +30,28 @@
#include <gdk/gdkwayland.h>
-static void xfpm_dpms_wayland_finalize (GObject *object);
-static void xfpm_dpms_wayland_set_mode (XfpmDpms *dpms,
- XfpmDpmsMode mode);
-static void xfpm_dpms_wayland_set_enabled (XfpmDpms *dpms,
- gboolean enabled);
-static void xfpm_dpms_wayland_set_timeouts (XfpmDpms *dpms,
- gboolean standby,
- guint sleep_timemout,
- guint off_timemout);
-
-static void registry_global (void *data, struct wl_registry *registry, uint32_t id, const char *interface, uint32_t version);
-static void registry_global_remove (void *data, struct wl_registry *registry, uint32_t id);
-static void power_mode (void *data, struct zwlr_output_power_v1 *wl_power, uint32_t wl_mode);
-static void power_failed (void *data, struct zwlr_output_power_v1 *wl_power);
+static void
+xfpm_dpms_wayland_finalize (GObject *object);
+static void
+xfpm_dpms_wayland_set_mode (XfpmDpms *dpms,
+ XfpmDpmsMode mode);
+static void
+xfpm_dpms_wayland_set_enabled (XfpmDpms *dpms,
+ gboolean enabled);
+static void
+xfpm_dpms_wayland_set_timeouts (XfpmDpms *dpms,
+ gboolean standby,
+ guint sleep_timemout,
+ guint off_timemout);
+
+static void
+registry_global (void *data, struct wl_registry *registry, uint32_t id, const char *interface, uint32_t version);
+static void
+registry_global_remove (void *data, struct wl_registry *registry, uint32_t id);
+static void
+power_mode (void *data, struct zwlr_output_power_v1 *wl_power, uint32_t wl_mode);
+static void
+power_failed (void *data, struct zwlr_output_power_v1 *wl_power);
struct _XfpmDpmsWayland
{
@@ -63,14 +71,12 @@ typedef struct _Power
gchar *model;
} Power;
-static const struct wl_registry_listener registry_listener =
-{
+static const struct wl_registry_listener registry_listener = {
.global = registry_global,
.global_remove = registry_global_remove,
};
-static const struct zwlr_output_power_v1_listener power_listener =
-{
+static const struct zwlr_output_power_v1_listener power_listener = {
.mode = power_mode,
.failed = power_failed,
};
diff --git a/src/xfpm-dpms-wayland.h b/src/xfpm-dpms-wayland.h
index 0e82845c76a68b450102d2aca22595b5af44a9cb..645d2ad78064242c5fb51252dfc67440186504ab 100644
--- a/src/xfpm-dpms-wayland.h
+++ b/src/xfpm-dpms-wayland.h
@@ -28,7 +28,8 @@ G_BEGIN_DECLS
#define XFPM_TYPE_DPMS_WAYLAND (xfpm_dpms_wayland_get_type ())
G_DECLARE_FINAL_TYPE (XfpmDpmsWayland, xfpm_dpms_wayland, XFPM, DPMS_WAYLAND, XfpmDpms)
-XfpmDpms *xfpm_dpms_wayland_new (void);
+XfpmDpms *
+xfpm_dpms_wayland_new (void);
G_END_DECLS
diff --git a/src/xfpm-dpms-x11.c b/src/xfpm-dpms-x11.c
index 44a24c88636de8f3d6a068e3d51ab09a8ecaa9b3..6b2c7610638a59e1084ebe86a8d8595e99cc9be6 100644
--- a/src/xfpm-dpms-x11.c
+++ b/src/xfpm-dpms-x11.c
@@ -31,14 +31,17 @@
#include <X11/extensions/dpms.h>
#include <gdk/gdkx.h>
-static void xfpm_dpms_x11_set_mode (XfpmDpms *dpms,
- XfpmDpmsMode mode);
-static void xfpm_dpms_x11_set_enabled (XfpmDpms *dpms,
- gboolean enabled);
-static void xfpm_dpms_x11_set_timeouts (XfpmDpms *dpms,
- gboolean standby,
- guint sleep_timemout,
- guint off_timemout);
+static void
+xfpm_dpms_x11_set_mode (XfpmDpms *dpms,
+ XfpmDpmsMode mode);
+static void
+xfpm_dpms_x11_set_enabled (XfpmDpms *dpms,
+ gboolean enabled);
+static void
+xfpm_dpms_x11_set_timeouts (XfpmDpms *dpms,
+ gboolean standby,
+ guint sleep_timemout,
+ guint off_timemout);
struct _XfpmDpmsX11
{
diff --git a/src/xfpm-dpms-x11.h b/src/xfpm-dpms-x11.h
index 2c0e2f20c187d37f0ef3f3f162364ce9c144a950..44f3f77b25280c62951933b8fc3d52ff1aa4f647 100644
--- a/src/xfpm-dpms-x11.h
+++ b/src/xfpm-dpms-x11.h
@@ -28,7 +28,8 @@ G_BEGIN_DECLS
#define XFPM_TYPE_DPMS_X11 (xfpm_dpms_x11_get_type ())
G_DECLARE_FINAL_TYPE (XfpmDpmsX11, xfpm_dpms_x11, XFPM, DPMS_X11, XfpmDpms)
-XfpmDpms *xfpm_dpms_x11_new (void);
+XfpmDpms *
+xfpm_dpms_x11_new (void);
G_END_DECLS
diff --git a/src/xfpm-dpms.c b/src/xfpm-dpms.c
index f59c0f77e0eeccaf4cc5d2b4b96b62a57313f885..0f1bf0d6c24a6275345fca9952ff3fbedec2f9e1 100644
--- a/src/xfpm-dpms.c
+++ b/src/xfpm-dpms.c
@@ -39,10 +39,11 @@
#include <gdk/gdkwayland.h>
#endif
-#define get_instance_private(instance) ((XfpmDpmsPrivate *) \
- xfpm_dpms_get_instance_private (XFPM_DPMS (instance)))
+#define get_instance_private(instance) \
+ ((XfpmDpmsPrivate *) xfpm_dpms_get_instance_private (XFPM_DPMS (instance)))
-static void xfpm_dpms_finalize (GObject *object);
+static void
+xfpm_dpms_finalize (GObject *object);
typedef struct _XfpmDpmsPrivate
{
@@ -112,7 +113,8 @@ refresh (XfpmDpms *dpms)
g_object_get (G_OBJECT (priv->conf), DPMS_SLEEP_MODE, &sleep_mode, NULL);
XFPM_DPMS_GET_CLASS (dpms)->set_enabled (dpms, TRUE);
- XFPM_DPMS_GET_CLASS (dpms)->set_timeouts (dpms, g_strcmp0 (sleep_mode, "Standby") == 0, sleep_timeout * 60, off_timeout * 60);
+ XFPM_DPMS_GET_CLASS (dpms)->set_timeouts (dpms, g_strcmp0 (sleep_mode, "Standby") == 0,
+ sleep_timeout * 60, off_timeout * 60);
g_free (sleep_mode);
}
diff --git a/src/xfpm-dpms.h b/src/xfpm-dpms.h
index ba4bef1f45d6a8d4447afb0ffda5bafb368b99d0..4698b90ab5b104a3f76c79ecd56c709f837d32f7 100644
--- a/src/xfpm-dpms.h
+++ b/src/xfpm-dpms.h
@@ -41,24 +41,28 @@ struct _XfpmDpmsClass
{
GObjectClass parent_class;
- void (*set_mode) (XfpmDpms *dpms,
- XfpmDpmsMode mode);
- void (*set_enabled) (XfpmDpms *dpms,
- gboolean enabled);
- void (*set_timeouts) (XfpmDpms *dpms,
- gboolean standby,
- guint sleep_timeout,
- guint off_timeout);
+ void (*set_mode) (XfpmDpms *dpms,
+ XfpmDpmsMode mode);
+ void (*set_enabled) (XfpmDpms *dpms,
+ gboolean enabled);
+ void (*set_timeouts) (XfpmDpms *dpms,
+ gboolean standby,
+ guint sleep_timeout,
+ guint off_timeout);
};
-XfpmDpms *xfpm_dpms_new (void);
-void xfpm_dpms_set_inhibited (XfpmDpms *dpms,
- gboolean inhibited);
-void xfpm_dpms_set_on_battery (XfpmDpms *dpms,
- gboolean on_battery);
+XfpmDpms *
+xfpm_dpms_new (void);
+void
+xfpm_dpms_set_inhibited (XfpmDpms *dpms,
+ gboolean inhibited);
+void
+xfpm_dpms_set_on_battery (XfpmDpms *dpms,
+ gboolean on_battery);
-void xfpm_dpms_set_mode (XfpmDpms *dpms,
- XfpmDpmsMode mode);
+void
+xfpm_dpms_set_mode (XfpmDpms *dpms,
+ XfpmDpmsMode mode);
G_END_DECLS
diff --git a/src/xfpm-errors.c b/src/xfpm-errors.c
index b83f700a431520845193de5e438f8e7a79cfc2de..f96884c7dd91cbbcbfa590791fcfbbc6f87ce02e 100644
--- a/src/xfpm-errors.c
+++ b/src/xfpm-errors.c
@@ -32,8 +32,7 @@ xfpm_get_error_quark (void)
static volatile gsize xfpm_error_quark = 0;
if (xfpm_error_quark == 0)
{
- static const GDBusErrorEntry values[] =
- {
+ static const GDBusErrorEntry values[] = {
{ XFPM_ERROR_UNKNOWN, "org.xfce.PowerManager.Error.Unknown" },
{ XFPM_ERROR_PERMISSION_DENIED, "org.xfce.PowerManager.Error.PermissionDenied" },
{ XFPM_ERROR_NO_HARDWARE_SUPPORT, "org.xfce.PowerManager.Error.NoHardwareSupport" },
diff --git a/src/xfpm-errors.h b/src/xfpm-errors.h
index 7baf3d74aa54f23fea9b4448bce0d8fd98641e15..682acac440cf4e96c8f39376f9079622a8fe5f6a 100644
--- a/src/xfpm-errors.h
+++ b/src/xfpm-errors.h
@@ -25,7 +25,7 @@
G_BEGIN_DECLS
-#define XFPM_ERROR (xfpm_get_error_quark ())
+#define XFPM_ERROR (xfpm_get_error_quark ())
typedef enum
@@ -39,7 +39,8 @@ typedef enum
} XfpmError;
-GQuark xfpm_get_error_quark (void);
+GQuark
+xfpm_get_error_quark (void);
G_END_DECLS
diff --git a/src/xfpm-idle-wayland.c b/src/xfpm-idle-wayland.c
index 533ec03cb2bc1dbb2f82c07536d9ad94999a0d06..93d5c16d95c97172269e5942ffe5e54f27abbf14 100644
--- a/src/xfpm-idle-wayland.c
+++ b/src/xfpm-idle-wayland.c
@@ -28,18 +28,26 @@
#include <gdk/gdkwayland.h>
-static void xfpm_idle_wayland_finalize (GObject *object);
-static void xfpm_idle_wayland_alarm_reset_all (XfpmIdle *idle);
-static void xfpm_idle_wayland_alarm_add (XfpmIdle *idle,
- XfpmAlarmId id,
- guint timeout);
-static void xfpm_idle_wayland_alarm_remove (XfpmIdle *idle,
- XfpmAlarmId id);
-
-static void registry_global (void *data, struct wl_registry *registry, uint32_t id, const char *interface, uint32_t version);
-static void registry_global_remove (void *data, struct wl_registry *registry, uint32_t id);
-static void notification_idled (void *data, struct ext_idle_notification_v1 *notification);
-static void notification_resumed (void *data, struct ext_idle_notification_v1 *notification);
+static void
+xfpm_idle_wayland_finalize (GObject *object);
+static void
+xfpm_idle_wayland_alarm_reset_all (XfpmIdle *idle);
+static void
+xfpm_idle_wayland_alarm_add (XfpmIdle *idle,
+ XfpmAlarmId id,
+ guint timeout);
+static void
+xfpm_idle_wayland_alarm_remove (XfpmIdle *idle,
+ XfpmAlarmId id);
+
+static void
+registry_global (void *data, struct wl_registry *registry, uint32_t id, const char *interface, uint32_t version);
+static void
+registry_global_remove (void *data, struct wl_registry *registry, uint32_t id);
+static void
+notification_idled (void *data, struct ext_idle_notification_v1 *notification);
+static void
+notification_resumed (void *data, struct ext_idle_notification_v1 *notification);
struct _XfpmIdleWayland
{
@@ -58,14 +66,12 @@ typedef struct _Alarm
guint timeout;
} Alarm;
-static const struct wl_registry_listener registry_listener =
-{
+static const struct wl_registry_listener registry_listener = {
.global = registry_global,
.global_remove = registry_global_remove,
};
-static const struct ext_idle_notification_v1_listener notification_listener =
-{
+static const struct ext_idle_notification_v1_listener notification_listener = {
.idled = notification_idled,
.resumed = notification_resumed,
};
@@ -215,7 +221,6 @@ notification_resumed (void *data,
-
XfpmIdle *
xfpm_idle_wayland_new (void)
{
diff --git a/src/xfpm-idle-wayland.h b/src/xfpm-idle-wayland.h
index 0c9f4a37d61a041eec580257c8ee868da0aac664..c7874d553aefcc62789c189355cb7681c75a17a3 100644
--- a/src/xfpm-idle-wayland.h
+++ b/src/xfpm-idle-wayland.h
@@ -28,7 +28,8 @@ G_BEGIN_DECLS
#define XFPM_TYPE_IDLE_WAYLAND (xfpm_idle_wayland_get_type ())
G_DECLARE_FINAL_TYPE (XfpmIdleWayland, xfpm_idle_wayland, XFPM, IDLE_WAYLAND, XfpmIdle)
-XfpmIdle *xfpm_idle_wayland_new (void);
+XfpmIdle *
+xfpm_idle_wayland_new (void);
G_END_DECLS
diff --git a/src/xfpm-idle-x11.c b/src/xfpm-idle-x11.c
index f2f11d935d1a73fc0fb47f5d2ca63117c81a6459..b02c37587e35d50b750ef134e816c4ec3088cd1a 100644
--- a/src/xfpm-idle-x11.c
+++ b/src/xfpm-idle-x11.c
@@ -34,13 +34,17 @@
#undef XSyncValueAdd
#endif
-static void xfpm_idle_x11_finalize (GObject *object);
-static void xfpm_idle_x11_alarm_reset_all (XfpmIdle *idle);
-static void xfpm_idle_x11_alarm_add (XfpmIdle *idle,
- XfpmAlarmId id,
- guint timeout);
-static void xfpm_idle_x11_alarm_remove (XfpmIdle *idle,
- XfpmAlarmId id);
+static void
+xfpm_idle_x11_finalize (GObject *object);
+static void
+xfpm_idle_x11_alarm_reset_all (XfpmIdle *idle);
+static void
+xfpm_idle_x11_alarm_add (XfpmIdle *idle,
+ XfpmAlarmId id,
+ guint timeout);
+static void
+xfpm_idle_x11_alarm_remove (XfpmIdle *idle,
+ XfpmAlarmId id);
struct _XfpmIdleX11
{
diff --git a/src/xfpm-idle-x11.h b/src/xfpm-idle-x11.h
index 09024e082b4d92119fa6261f2a9c1a37c8f82f41..b5aa282dad8dd7fe04abba586193de36f4bdc4fb 100644
--- a/src/xfpm-idle-x11.h
+++ b/src/xfpm-idle-x11.h
@@ -28,7 +28,8 @@ G_BEGIN_DECLS
#define XFPM_TYPE_IDLE_X11 (xfpm_idle_x11_get_type ())
G_DECLARE_FINAL_TYPE (XfpmIdleX11, xfpm_idle_x11, XFPM, IDLE_X11, XfpmIdle)
-XfpmIdle *xfpm_idle_x11_new (void);
+XfpmIdle *
+xfpm_idle_x11_new (void);
G_END_DECLS
diff --git a/src/xfpm-idle.c b/src/xfpm-idle.c
index 21dd7653ff8fba89a4516f30b2cf0d33cb05b583..2f14bc154a27f7e0c9be4c6bda2f3f26c43fab2a 100644
--- a/src/xfpm-idle.c
+++ b/src/xfpm-idle.c
@@ -37,8 +37,8 @@
#include <gdk/gdkwayland.h>
#endif
-#define get_instance_private(instance) ((XfpmIdlePrivate *) \
- xfpm_idle_get_instance_private (XFPM_IDLE (instance)))
+#define get_instance_private(instance) \
+ ((XfpmIdlePrivate *) xfpm_idle_get_instance_private (XFPM_IDLE (instance)))
typedef struct _XfpmIdlePrivate
{
@@ -63,18 +63,16 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (XfpmIdle, xfpm_idle, G_TYPE_OBJECT)
static void
xfpm_idle_class_init (XfpmIdleClass *klass)
{
- signals[SIGNAL_ALARM_EXPIRED] =
- g_signal_new ("alarm-expired",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0, NULL, NULL, g_cclosure_marshal_VOID__UINT,
- G_TYPE_NONE, 1, G_TYPE_UINT);
- signals[SIGNAL_RESET] =
- g_signal_new ("reset",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0, NULL, NULL, g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ signals[SIGNAL_ALARM_EXPIRED] = g_signal_new ("alarm-expired",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, g_cclosure_marshal_VOID__UINT,
+ G_TYPE_NONE, 1, G_TYPE_UINT);
+ signals[SIGNAL_RESET] = g_signal_new ("reset",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
static void
diff --git a/src/xfpm-idle.h b/src/xfpm-idle.h
index f0ec8886b86b70eb0532872d63fd26d24443d085..6f64a90c7a0eae3a7397a527d5ee68ee9f48ff09 100644
--- a/src/xfpm-idle.h
+++ b/src/xfpm-idle.h
@@ -31,35 +31,39 @@ G_DECLARE_DERIVABLE_TYPE (XfpmIdle, xfpm_idle, XFPM, IDLE, GObject)
typedef enum _XfpmAlarmId
{
- XFPM_ALARM_ID_USER_INPUT = 0,
- XFPM_ALARM_ID_BRIGHTNESS_ON_AC = 1 << 0,
+ XFPM_ALARM_ID_USER_INPUT = 0,
+ XFPM_ALARM_ID_BRIGHTNESS_ON_AC = 1 << 0,
XFPM_ALARM_ID_BRIGHTNESS_ON_BATTERY = 1 << 1,
- XFPM_ALARM_ID_INACTIVITY_ON_AC = 1 << 2,
+ XFPM_ALARM_ID_INACTIVITY_ON_AC = 1 << 2,
XFPM_ALARM_ID_INACTIVITY_ON_BATTERY = 1 << 3,
- XFPM_ALARM_ID_DPMS = 1 << 4,
+ XFPM_ALARM_ID_DPMS = 1 << 4,
} XfpmAlarmId;
struct _XfpmIdleClass
{
GObjectClass parent_class;
- void (*alarm_reset_all) (XfpmIdle *idle);
- void (*alarm_add) (XfpmIdle *idle,
- XfpmAlarmId id,
- guint timeout);
- void (*alarm_remove) (XfpmIdle *idle,
- XfpmAlarmId id);
+ void (*alarm_reset_all) (XfpmIdle *idle);
+ void (*alarm_add) (XfpmIdle *idle,
+ XfpmAlarmId id,
+ guint timeout);
+ void (*alarm_remove) (XfpmIdle *idle,
+ XfpmAlarmId id);
};
-XfpmIdle *xfpm_idle_new (void);
+XfpmIdle *
+xfpm_idle_new (void);
-void xfpm_idle_alarm_reset_all (XfpmIdle *idle);
-void xfpm_idle_alarm_add (XfpmIdle *idle,
- XfpmAlarmId id,
- guint timeout);
-void xfpm_idle_alarm_remove (XfpmIdle *idle,
- XfpmAlarmId id);
+void
+xfpm_idle_alarm_reset_all (XfpmIdle *idle);
+void
+xfpm_idle_alarm_add (XfpmIdle *idle,
+ XfpmAlarmId id,
+ guint timeout);
+void
+xfpm_idle_alarm_remove (XfpmIdle *idle,
+ XfpmAlarmId id);
G_END_DECLS
-#endif /* __XFPM_IDLE_H__ */
+#endif /* __XFPM_IDLE_H__ */
diff --git a/src/xfpm-inhibit.c b/src/xfpm-inhibit.c
index 35c364b3a38e5f538d8f8c9a6db787d76c4d56ff..dd995f5a1417752d4cff2f76ec3a36fe05b6ac2f 100644
--- a/src/xfpm-inhibit.c
+++ b/src/xfpm-inhibit.c
@@ -30,22 +30,25 @@
#include <libxfce4util/libxfce4util.h>
-static void xfpm_inhibit_finalize (GObject *object);
-static void xfpm_inhibit_dbus_class_init (XfpmInhibitClass *klass);
-static void xfpm_inhibit_dbus_init (XfpmInhibit *inhibit);
+static void
+xfpm_inhibit_finalize (GObject *object);
+static void
+xfpm_inhibit_dbus_class_init (XfpmInhibitClass *klass);
+static void
+xfpm_inhibit_dbus_init (XfpmInhibit *inhibit);
struct XfpmInhibitPrivate
{
XfpmDBusMonitor *monitor;
- GPtrArray *array;
- gboolean inhibited;
+ GPtrArray *array;
+ gboolean inhibited;
};
typedef struct
{
gchar *app_name;
gchar *unique_name;
- guint cookie;
+ guint cookie;
} Inhibitor;
enum
@@ -60,9 +63,10 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE_WITH_PRIVATE (XfpmInhibit, xfpm_inhibit, G_TYPE_OBJECT)
static void
-xfpm_inhibit_free_inhibitor (XfpmInhibit *inhibit, Inhibitor *inhibitor)
+xfpm_inhibit_free_inhibitor (XfpmInhibit *inhibit,
+ Inhibitor *inhibitor)
{
- g_return_if_fail (inhibitor != NULL );
+ g_return_if_fail (inhibitor != NULL);
g_ptr_array_remove (inhibit->priv->array, inhibitor);
@@ -76,20 +80,20 @@ xfpm_inhibit_has_inhibit_changed (XfpmInhibit *inhibit)
{
if (inhibit->priv->array->len == 0 && inhibit->priv->inhibited)
{
- XFPM_DEBUG("Inhibit removed");
+ XFPM_DEBUG ("Inhibit removed");
inhibit->priv->inhibited = FALSE;
- g_signal_emit (G_OBJECT(inhibit), signals[HAS_INHIBIT_CHANGED], 0, inhibit->priv->inhibited);
+ g_signal_emit (G_OBJECT (inhibit), signals[HAS_INHIBIT_CHANGED], 0, inhibit->priv->inhibited);
}
else if (inhibit->priv->array->len != 0 && !inhibit->priv->inhibited)
{
- XFPM_DEBUG("Inhibit added");
+ XFPM_DEBUG ("Inhibit added");
inhibit->priv->inhibited = TRUE;
- g_signal_emit (G_OBJECT(inhibit), signals[HAS_INHIBIT_CHANGED], 0, inhibit->priv->inhibited);
+ g_signal_emit (G_OBJECT (inhibit), signals[HAS_INHIBIT_CHANGED], 0, inhibit->priv->inhibited);
}
/* Always emite the INHIBIT_LIST_CHANGED for any change so the panel plugin
* stays in sync */
- g_signal_emit (G_OBJECT(inhibit), signals[INHIBIT_LIST_CHANGED], 0, inhibit->priv->inhibited);
+ g_signal_emit (G_OBJECT (inhibit), signals[INHIBIT_LIST_CHANGED], 0, inhibit->priv->inhibited);
return inhibit->priv->inhibited;
}
@@ -101,17 +105,19 @@ xfpm_inhibit_get_cookie (XfpmInhibit *inhibit)
guint i;
Inhibitor *inhibitor;
- for ( i = 0; i<inhibit->priv->array->len; i++)
+ for (i = 0; i < inhibit->priv->array->len; i++)
{
inhibitor = g_ptr_array_index (inhibit->priv->array, i);
max = MAX (max, inhibitor->cookie);
}
- return (guint) g_random_int_range ( max + 1, max + 40);
+ return (guint) g_random_int_range (max + 1, max + 40);
}
static guint
-xfpm_inhibit_add_application (XfpmInhibit *inhibit, const gchar *app_name, const gchar *unique_name)
+xfpm_inhibit_add_application (XfpmInhibit *inhibit,
+ const gchar *app_name,
+ const gchar *unique_name)
{
guint cookie;
Inhibitor *inhibitor;
@@ -130,14 +136,15 @@ xfpm_inhibit_add_application (XfpmInhibit *inhibit, const gchar *app_name, const
}
static Inhibitor *
-xfpm_inhibit_find_application_by_cookie (XfpmInhibit *inhibit, guint cookie)
+xfpm_inhibit_find_application_by_cookie (XfpmInhibit *inhibit,
+ guint cookie)
{
guint i;
Inhibitor *inhibitor;
- for ( i = 0; i < inhibit->priv->array->len; i++)
+ for (i = 0; i < inhibit->priv->array->len; i++)
{
inhibitor = g_ptr_array_index (inhibit->priv->array, i);
- if ( inhibitor->cookie == cookie )
+ if (inhibitor->cookie == cookie)
{
return inhibitor;
}
@@ -147,14 +154,15 @@ xfpm_inhibit_find_application_by_cookie (XfpmInhibit *inhibit, guint cookie)
}
static Inhibitor *
-xfpm_inhibit_find_application_by_unique_connection_name (XfpmInhibit *inhibit, const gchar *unique_name)
+xfpm_inhibit_find_application_by_unique_connection_name (XfpmInhibit *inhibit,
+ const gchar *unique_name)
{
guint i;
Inhibitor *inhibitor;
- for ( i = 0; i < inhibit->priv->array->len; i++)
+ for (i = 0; i < inhibit->priv->array->len; i++)
{
inhibitor = g_ptr_array_index (inhibit->priv->array, i);
- if ( g_strcmp0 (inhibitor->unique_name, unique_name ) == 0 )
+ if (g_strcmp0 (inhibitor->unique_name, unique_name) == 0)
{
return inhibitor;
}
@@ -164,13 +172,14 @@ xfpm_inhibit_find_application_by_unique_connection_name (XfpmInhibit *inhibit, c
}
static gboolean
-xfpm_inhibit_remove_application_by_cookie (XfpmInhibit *inhibit, guint cookie)
+xfpm_inhibit_remove_application_by_cookie (XfpmInhibit *inhibit,
+ guint cookie)
{
Inhibitor *inhibitor;
inhibitor = xfpm_inhibit_find_application_by_cookie (inhibit, cookie);
- if ( inhibitor )
+ if (inhibitor)
{
xfpm_dbus_monitor_remove_unique_name (inhibit->priv->monitor, G_BUS_TYPE_SESSION, inhibitor->unique_name);
xfpm_inhibit_free_inhibitor (inhibit, inhibitor);
@@ -180,46 +189,47 @@ xfpm_inhibit_remove_application_by_cookie (XfpmInhibit *inhibit, guint cookie)
}
static void
-xfpm_inhibit_connection_lost_cb (XfpmDBusMonitor *monitor, gchar *unique_name,
- gboolean on_session, XfpmInhibit *inhibit)
+xfpm_inhibit_connection_lost_cb (XfpmDBusMonitor *monitor,
+ gchar *unique_name,
+ gboolean on_session,
+ XfpmInhibit *inhibit)
{
Inhibitor *inhibitor;
- if ( !on_session)
+ if (!on_session)
return;
- inhibitor = xfpm_inhibit_find_application_by_unique_connection_name (inhibit, unique_name );
+ inhibitor = xfpm_inhibit_find_application_by_unique_connection_name (inhibit, unique_name);
- if ( inhibitor )
+ if (inhibitor)
{
- XFPM_DEBUG ("Application=%s with unique connection name=%s disconnected", inhibitor->app_name, inhibitor->unique_name);
+ XFPM_DEBUG ("Application=%s with unique connection name=%s disconnected",
+ inhibitor->app_name, inhibitor->unique_name);
xfpm_inhibit_free_inhibitor (inhibit, inhibitor);
xfpm_inhibit_has_inhibit_changed (inhibit);
}
}
static void
-xfpm_inhibit_class_init(XfpmInhibitClass *klass)
+xfpm_inhibit_class_init (XfpmInhibitClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
- signals[HAS_INHIBIT_CHANGED] =
- g_signal_new ("has-inhibit-changed",
- XFPM_TYPE_INHIBIT,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmInhibitClass, has_inhibit_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-
- signals[INHIBIT_LIST_CHANGED] =
- g_signal_new ("inhibitors-list-changed",
- XFPM_TYPE_INHIBIT,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmInhibitClass, inhibitors_list_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ signals[HAS_INHIBIT_CHANGED] = g_signal_new ("has-inhibit-changed",
+ XFPM_TYPE_INHIBIT,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmInhibitClass, has_inhibit_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+ signals[INHIBIT_LIST_CHANGED] = g_signal_new ("inhibitors-list-changed",
+ XFPM_TYPE_INHIBIT,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmInhibitClass, inhibitors_list_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
object_class->finalize = xfpm_inhibit_finalize;
@@ -231,7 +241,7 @@ xfpm_inhibit_init (XfpmInhibit *inhibit)
{
inhibit->priv = xfpm_inhibit_get_instance_private (inhibit);
- inhibit->priv->array = g_ptr_array_new ();
+ inhibit->priv->array = g_ptr_array_new ();
inhibit->priv->monitor = xfpm_dbus_monitor_new ();
g_signal_connect_object (inhibit->priv->monitor, "unique-name-lost",
@@ -247,11 +257,11 @@ xfpm_inhibit_finalize (GObject *object)
Inhibitor *inhibitor;
guint i;
- inhibit = XFPM_INHIBIT(object);
+ inhibit = XFPM_INHIBIT (object);
g_object_unref (inhibit->priv->monitor);
- for ( i = 0; i<inhibit->priv->array->len; i++)
+ for (i = 0; i < inhibit->priv->array->len; i++)
{
inhibitor = g_ptr_array_index (inhibit->priv->array, i);
xfpm_inhibit_free_inhibitor (inhibit, inhibitor);
@@ -259,7 +269,7 @@ xfpm_inhibit_finalize (GObject *object)
g_ptr_array_free (inhibit->priv->array, TRUE);
- G_OBJECT_CLASS (xfpm_inhibit_parent_class)->finalize(object);
+ G_OBJECT_CLASS (xfpm_inhibit_parent_class)->finalize (object);
}
XfpmInhibit *
@@ -267,7 +277,7 @@ xfpm_inhibit_new (void)
{
static gpointer xfpm_inhibit_object = NULL;
- if ( G_LIKELY (xfpm_inhibit_object != NULL) )
+ if (G_LIKELY (xfpm_inhibit_object != NULL))
{
g_object_ref (xfpm_inhibit_object);
}
@@ -295,7 +305,7 @@ xfpm_inhibit_get_inhibit_list (XfpmInhibit *inhibit)
OUT_inhibitors = g_new (const gchar *, inhibit->priv->array->len + 1);
- for ( i = 0; i<inhibit->priv->array->len; i++)
+ for (i = 0; i < inhibit->priv->array->len; i++)
{
inhibitor = g_ptr_array_index (inhibit->priv->array, i);
OUT_inhibitors[i] = inhibitor->app_name;
@@ -311,24 +321,28 @@ xfpm_inhibit_get_inhibit_list (XfpmInhibit *inhibit)
* DBus server implementation for org.freedesktop.PowerManagement.Inhibit
*
*/
-static gboolean xfpm_inhibit_inhibit (XfpmInhibit *inhibit,
- GDBusMethodInvocation *invocation,
- const gchar *IN_appname,
- const gchar *IN_reason,
- gpointer user_data);
+static gboolean
+xfpm_inhibit_inhibit (XfpmInhibit *inhibit,
+ GDBusMethodInvocation *invocation,
+ const gchar *IN_appname,
+ const gchar *IN_reason,
+ gpointer user_data);
-static gboolean xfpm_inhibit_un_inhibit (XfpmInhibit *inhibit,
- GDBusMethodInvocation *invocation,
- guint IN_cookie,
- gpointer user_data);
+static gboolean
+xfpm_inhibit_un_inhibit (XfpmInhibit *inhibit,
+ GDBusMethodInvocation *invocation,
+ guint IN_cookie,
+ gpointer user_data);
-static gboolean xfpm_inhibit_has_inhibit (XfpmInhibit *inhibit,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_inhibit_has_inhibit (XfpmInhibit *inhibit,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_inhibit_get_inhibitors (XfpmInhibit *inhibit,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_inhibit_get_inhibitors (XfpmInhibit *inhibit,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
#include "org.freedesktop.PowerManagement.Inhibit.h"
@@ -349,20 +363,16 @@ xfpm_inhibit_dbus_init (XfpmInhibit *inhibit)
"/org/freedesktop/PowerManagement/Inhibit",
NULL);
- g_signal_connect_object (inhibit_dbus,
- "handle-inhibit",
+ g_signal_connect_object (inhibit_dbus, "handle-inhibit",
G_CALLBACK (xfpm_inhibit_inhibit),
inhibit, G_CONNECT_SWAPPED);
- g_signal_connect_object (inhibit_dbus,
- "handle-un-inhibit",
+ g_signal_connect_object (inhibit_dbus, "handle-un-inhibit",
G_CALLBACK (xfpm_inhibit_un_inhibit),
inhibit, G_CONNECT_SWAPPED);
- g_signal_connect_object (inhibit_dbus,
- "handle-has-inhibit",
+ g_signal_connect_object (inhibit_dbus, "handle-has-inhibit",
G_CALLBACK (xfpm_inhibit_has_inhibit),
inhibit, G_CONNECT_SWAPPED);
- g_signal_connect_object (inhibit_dbus,
- "handle-get-inhibitors",
+ g_signal_connect_object (inhibit_dbus, "handle-get-inhibitors",
G_CALLBACK (xfpm_inhibit_get_inhibitors),
inhibit, G_CONNECT_SWAPPED);
}
@@ -377,11 +387,9 @@ xfpm_inhibit_inhibit (XfpmInhibit *inhibit,
const gchar *sender;
guint cookie;
- if ( IN_appname == NULL || IN_reason == NULL )
+ if (IN_appname == NULL || IN_reason == NULL)
{
- g_dbus_method_invocation_return_error (invocation,
- XFPM_ERROR,
- XFPM_ERROR_INVALID_ARGUMENTS,
+ g_dbus_method_invocation_return_error (invocation, XFPM_ERROR, XFPM_ERROR_INVALID_ARGUMENTS,
_("Invalid arguments"));
return TRUE;
@@ -390,15 +398,11 @@ xfpm_inhibit_inhibit (XfpmInhibit *inhibit,
sender = g_dbus_method_invocation_get_sender (invocation);
cookie = xfpm_inhibit_add_application (inhibit, IN_appname, sender);
- XFPM_DEBUG("Inhibit send application name=%s reason=%s sender=%s", IN_appname, IN_reason ,sender);
+ XFPM_DEBUG ("Inhibit send application name=%s reason=%s sender=%s", IN_appname, IN_reason, sender);
xfpm_inhibit_has_inhibit_changed (inhibit);
-
xfpm_dbus_monitor_add_unique_name (inhibit->priv->monitor, G_BUS_TYPE_SESSION, sender);
-
- xfpm_power_management_inhibit_complete_inhibit (user_data,
- invocation,
- cookie);
+ xfpm_power_management_inhibit_complete_inhibit (user_data, invocation, cookie);
return TRUE;
}
@@ -409,7 +413,7 @@ xfpm_inhibit_un_inhibit (XfpmInhibit *inhibit,
guint IN_cookie,
gpointer user_data)
{
- XFPM_DEBUG("UnHibit message received");
+ XFPM_DEBUG ("UnHibit message received");
if (!xfpm_inhibit_remove_application_by_cookie (inhibit, IN_cookie))
{
@@ -421,7 +425,6 @@ xfpm_inhibit_un_inhibit (XfpmInhibit *inhibit,
}
xfpm_inhibit_has_inhibit_changed (inhibit);
-
xfpm_power_management_inhibit_complete_un_inhibit (user_data, invocation);
return TRUE;
@@ -432,11 +435,9 @@ xfpm_inhibit_has_inhibit (XfpmInhibit *inhibit,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
- XFPM_DEBUG("Has Inhibit message received");
+ XFPM_DEBUG ("Has Inhibit message received");
- xfpm_power_management_inhibit_complete_has_inhibit (user_data,
- invocation,
- inhibit->priv->inhibited);
+ xfpm_power_management_inhibit_complete_has_inhibit (user_data, invocation, inhibit->priv->inhibited);
return TRUE;
}
@@ -451,11 +452,7 @@ xfpm_inhibit_get_inhibitors (XfpmInhibit *inhibit,
XFPM_DEBUG ("Get Inhibitors message received");
OUT_inhibitors = xfpm_inhibit_get_inhibit_list (inhibit);
-
- xfpm_power_management_inhibit_complete_get_inhibitors (user_data,
- invocation,
- OUT_inhibitors);
-
+ xfpm_power_management_inhibit_complete_get_inhibitors (user_data, invocation, OUT_inhibitors);
g_free (OUT_inhibitors);
return TRUE;
diff --git a/src/xfpm-inhibit.h b/src/xfpm-inhibit.h
index b9b1b95f2fbb9834b622405eb2931755f770c630..49458fe7c4baf53e7cc016b3de2f025d00e82dde 100644
--- a/src/xfpm-inhibit.h
+++ b/src/xfpm-inhibit.h
@@ -25,34 +25,39 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_INHIBIT (xfpm_inhibit_get_type () )
-#define XFPM_INHIBIT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), XFPM_TYPE_INHIBIT, XfpmInhibit))
-#define XFPM_IS_INHIBIT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), XFPM_TYPE_INHIBIT))
+#define XFPM_TYPE_INHIBIT (xfpm_inhibit_get_type ())
+#define XFPM_INHIBIT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_INHIBIT, XfpmInhibit))
+#define XFPM_IS_INHIBIT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_INHIBIT))
typedef struct XfpmInhibitPrivate XfpmInhibitPrivate;
typedef struct
{
- GObject parent;
- XfpmInhibitPrivate *priv;
+ GObject parent;
+ XfpmInhibitPrivate *priv;
} XfpmInhibit;
typedef struct
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
- /* signals */
- void (*has_inhibit_changed) (XfpmInhibit *inhibit,
- gboolean is_inhibit);
- void (*inhibitors_list_changed) (XfpmInhibit *inhibit,
- gboolean is_inhibit);
+ /* signals */
+ void (*has_inhibit_changed) (XfpmInhibit *inhibit,
+ gboolean is_inhibit);
+ void (*inhibitors_list_changed) (XfpmInhibit *inhibit,
+ gboolean is_inhibit);
} XfpmInhibitClass;
-GType xfpm_inhibit_get_type (void) G_GNUC_CONST;
-GType xfpm_inhibit_error_get_type (void) G_GNUC_CONST;
-GQuark xfpm_inhibit_get_error_quark ();
-XfpmInhibit *xfpm_inhibit_new (void);
-const gchar **xfpm_inhibit_get_inhibit_list (XfpmInhibit *inhibit);
+GType
+xfpm_inhibit_get_type (void) G_GNUC_CONST;
+GType
+xfpm_inhibit_error_get_type (void) G_GNUC_CONST;
+GQuark
+xfpm_inhibit_get_error_quark ();
+XfpmInhibit *
+xfpm_inhibit_new (void);
+const gchar **
+xfpm_inhibit_get_inhibit_list (XfpmInhibit *inhibit);
G_END_DECLS
diff --git a/src/xfpm-kbd-backlight.c b/src/xfpm-kbd-backlight.c
index 3369213335d6ba67c4bf627ff5954295459c9a2d..3287ac424b0016bead28d489901c0b51f6bfdd8d 100644
--- a/src/xfpm-kbd-backlight.c
+++ b/src/xfpm-kbd-backlight.c
@@ -31,23 +31,24 @@
#include <libxfce4util/libxfce4util.h>
-static void xfpm_kbd_backlight_finalize (GObject *object);
+static void
+xfpm_kbd_backlight_finalize (GObject *object);
struct XfpmKbdBacklightPrivate
{
- XfpmPower *power;
- XfpmButton *button;
+ XfpmPower *power;
+ XfpmButton *button;
- GDBusConnection *bus;
- GDBusProxy *proxy;
+ GDBusConnection *bus;
+ GDBusProxy *proxy;
- gboolean dimmed;
- gboolean on_battery;
- gint32 max_level;
- gint min_level;
- gint step;
+ gboolean dimmed;
+ gboolean on_battery;
+ gint32 max_level;
+ gint min_level;
+ gint step;
- XfpmNotify *notify;
+ XfpmNotify *notify;
NotifyNotification *n;
};
@@ -55,9 +56,9 @@ G_DEFINE_TYPE_WITH_PRIVATE (XfpmKbdBacklight, xfpm_kbd_backlight, G_TYPE_OBJECT)
static gint
-calculate_step( gint max_level )
+calculate_step (gint max_level)
{
- if ( max_level < 20 )
+ if (max_level < 20)
return 1;
else
return max_level / 20;
@@ -65,7 +66,9 @@ calculate_step( gint max_level )
static void
-xfpm_kbd_backlight_on_battery_changed_cb (XfpmPower *power, gboolean on_battery, XfpmKbdBacklight *backlight)
+xfpm_kbd_backlight_on_battery_changed_cb (XfpmPower *power,
+ gboolean on_battery,
+ XfpmKbdBacklight *backlight)
{
backlight->priv->on_battery = on_battery;
}
@@ -94,9 +97,10 @@ xfpm_kbd_backlight_init_max_level (XfpmKbdBacklight *backlight)
static void
-xfpm_kbd_backlight_show_notification (XfpmKbdBacklight *self, gfloat value)
+xfpm_kbd_backlight_show_notification (XfpmKbdBacklight *self,
+ gfloat value)
{
- if ( self->priv->n == NULL )
+ if (self->priv->n == NULL)
{
/* generate a human-readable summary for the notification */
gchar *summary = g_strdup_printf (_("Keyboard Brightness: %.0f percent"), value);
@@ -142,7 +146,8 @@ xfpm_kbd_backlight_get_level (XfpmKbdBacklight *backlight)
static void
-xfpm_kbd_backlight_set_level (XfpmKbdBacklight *backlight, gint32 level)
+xfpm_kbd_backlight_set_level (XfpmKbdBacklight *backlight,
+ gint32 level)
{
GError *error = NULL;
GVariant *var = g_dbus_proxy_call_sync (backlight->priv->proxy, "SetBrightness",
@@ -168,15 +173,15 @@ xfpm_kbd_backlight_up (XfpmKbdBacklight *backlight)
{
gint level = xfpm_kbd_backlight_get_level (backlight);
- if ( level == -1)
+ if (level == -1)
return;
- if ( level == backlight->priv->max_level )
+ if (level == backlight->priv->max_level)
return;
level += backlight->priv->step;
- if ( level > backlight->priv->max_level )
+ if (level > backlight->priv->max_level)
level = backlight->priv->max_level;
xfpm_kbd_backlight_set_level (backlight, level);
@@ -188,15 +193,15 @@ xfpm_kbd_backlight_down (XfpmKbdBacklight *backlight)
{
gint level = xfpm_kbd_backlight_get_level (backlight);
- if ( level == -1)
+ if (level == -1)
return;
- if ( level == backlight->priv->min_level )
+ if (level == backlight->priv->min_level)
return;
level -= backlight->priv->step;
- if ( level < backlight->priv->min_level )
+ if (level < backlight->priv->min_level)
level = backlight->priv->min_level;
xfpm_kbd_backlight_set_level (backlight, level);
@@ -207,32 +212,34 @@ xfpm_kbd_backlight_cycle (XfpmKbdBacklight *backlight)
{
gint level = xfpm_kbd_backlight_get_level (backlight);
- if ( level == -1)
+ if (level == -1)
return;
- if ( level >= backlight->priv->max_level )
+ if (level >= backlight->priv->max_level)
level = backlight->priv->min_level;
else
level += backlight->priv->step;
- if ( level > backlight->priv->max_level )
+ if (level > backlight->priv->max_level)
level = backlight->priv->max_level;
xfpm_kbd_backlight_set_level (backlight, level);
}
static void
-xfpm_kbd_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmKbdBacklight *backlight)
+xfpm_kbd_backlight_button_pressed_cb (XfpmButton *button,
+ XfpmButtonKey type,
+ XfpmKbdBacklight *backlight)
{
- if ( type == BUTTON_KBD_BRIGHTNESS_UP )
+ if (type == BUTTON_KBD_BRIGHTNESS_UP)
{
xfpm_kbd_backlight_up (backlight);
}
- else if ( type == BUTTON_KBD_BRIGHTNESS_DOWN )
+ else if (type == BUTTON_KBD_BRIGHTNESS_DOWN)
{
xfpm_kbd_backlight_down (backlight);
}
- else if ( type == BUTTON_KBD_BRIGHTNESS_CYCLE )
+ else if (type == BUTTON_KBD_BRIGHTNESS_CYCLE)
{
xfpm_kbd_backlight_cycle (backlight);
}
@@ -268,7 +275,7 @@ xfpm_kbd_backlight_init (XfpmKbdBacklight *backlight)
backlight->priv->bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
- if ( error )
+ if (error)
{
g_critical ("Unable to get system bus connection : %s", error->message);
g_error_free (error);
@@ -276,15 +283,15 @@ xfpm_kbd_backlight_init (XfpmKbdBacklight *backlight)
}
backlight->priv->proxy = g_dbus_proxy_new_sync (backlight->priv->bus,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
- G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
+ | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
NULL,
"org.freedesktop.UPower",
"/org/freedesktop/UPower/KbdBacklight",
"org.freedesktop.UPower.KbdBacklight",
NULL,
NULL);
- if ( backlight->priv->proxy == NULL )
+ if (backlight->priv->proxy == NULL)
{
g_warning ("Unable to get the interface, org.freedesktop.UPower.KbdBacklight");
goto out;
@@ -292,7 +299,7 @@ xfpm_kbd_backlight_init (XfpmKbdBacklight *backlight)
xfpm_kbd_backlight_init_max_level (backlight);
- if ( backlight->priv->max_level == 0 )
+ if (backlight->priv->max_level == 0)
goto out;
backlight->priv->step = calculate_step (backlight->priv->max_level);
@@ -310,8 +317,7 @@ xfpm_kbd_backlight_init (XfpmKbdBacklight *backlight)
"on-battery", &backlight->priv->on_battery,
NULL);
-out:
- ;
+out:;
}
@@ -320,22 +326,22 @@ xfpm_kbd_backlight_finalize (GObject *object)
{
XfpmKbdBacklight *backlight = XFPM_KBD_BACKLIGHT (object);
- if ( backlight->priv->power )
- g_object_unref (backlight->priv->power );
+ if (backlight->priv->power)
+ g_object_unref (backlight->priv->power);
- if ( backlight->priv->button )
+ if (backlight->priv->button)
g_object_unref (backlight->priv->button);
- if ( backlight->priv->notify )
+ if (backlight->priv->notify)
g_object_unref (backlight->priv->notify);
- if ( backlight->priv->n )
+ if (backlight->priv->n)
g_object_unref (backlight->priv->n);
- if ( backlight->priv->proxy )
+ if (backlight->priv->proxy)
g_object_unref (backlight->priv->proxy);
- if ( backlight->priv->bus )
+ if (backlight->priv->bus)
g_object_unref (backlight->priv->bus);
G_OBJECT_CLASS (xfpm_kbd_backlight_parent_class)->finalize (object);
@@ -349,7 +355,8 @@ xfpm_kbd_backlight_new (void)
}
-gboolean xfpm_kbd_backlight_has_hw (XfpmKbdBacklight *backlight)
+gboolean
+xfpm_kbd_backlight_has_hw (XfpmKbdBacklight *backlight)
{
return backlight->priv->proxy != NULL;
}
diff --git a/src/xfpm-kbd-backlight.h b/src/xfpm-kbd-backlight.h
index 5326f6c1a239de61be1a526485a27bc004824b99..1d11edbe4182df63b4cb64dab6dc8324afd85b73 100644
--- a/src/xfpm-kbd-backlight.h
+++ b/src/xfpm-kbd-backlight.h
@@ -25,28 +25,31 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_KBD_BACKLIGHT (xfpm_kbd_backlight_get_type () )
-#define XFPM_KBD_BACKLIGHT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_KBD_BACKLIGHT, XfpmKbdBacklight))
-#define XFPM_IS_KBD_BACKLIGHT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_KBD_BACKLIGHT))
+#define XFPM_TYPE_KBD_BACKLIGHT (xfpm_kbd_backlight_get_type ())
+#define XFPM_KBD_BACKLIGHT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_KBD_BACKLIGHT, XfpmKbdBacklight))
+#define XFPM_IS_KBD_BACKLIGHT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_KBD_BACKLIGHT))
typedef struct XfpmKbdBacklightPrivate XfpmKbdBacklightPrivate;
typedef struct
{
- GObject parent;
- XfpmKbdBacklightPrivate *priv;
+ GObject parent;
+ XfpmKbdBacklightPrivate *priv;
} XfpmKbdBacklight;
typedef struct
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
} XfpmKbdBacklightClass;
-GType xfpm_kbd_backlight_get_type (void) G_GNUC_CONST;
-XfpmKbdBacklight *xfpm_kbd_backlight_new (void);
-gboolean xfpm_kbd_backlight_has_hw (XfpmKbdBacklight *backlight);
+GType
+xfpm_kbd_backlight_get_type (void) G_GNUC_CONST;
+XfpmKbdBacklight *
+xfpm_kbd_backlight_new (void);
+gboolean
+xfpm_kbd_backlight_has_hw (XfpmKbdBacklight *backlight);
G_END_DECLS
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 3ccee93b61d772899e6f0db2cfde55c1b601b1fc..a02554d6b89c9298b074a661b196561598ee8aa4 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -44,19 +44,21 @@ show_version (void)
"Xfce Power Manager %s\n\n"
"Part of the Xfce Goodies Project\n"
"http://goodies.xfce.org\n\n"
- "Licensed under the GNU GPL.\n\n"), VERSION);
+ "Licensed under the GNU GPL.\n\n"),
+ VERSION);
exit (EXIT_SUCCESS);
}
static void
-xfpm_quit_signal (gint sig, gpointer data)
+xfpm_quit_signal (gint sig,
+ gpointer data)
{
XfpmManager *manager = (XfpmManager *) data;
XFPM_DEBUG ("sig %d", sig);
- if ( sig != SIGHUP )
+ if (sig != SIGHUP)
xfpm_manager_stop (manager);
}
@@ -90,18 +92,20 @@ xfpm_dump (GHashTable *hash)
g_print (_("Without policykit support\n"));
#endif
g_print ("---------------------------------------------------\n");
- g_print ( "%s: %s\n"
- "%s: %s\n"
- "%s: %s\n"
- "%s: %s\n"
- "%s: %s\n"
- "%s: %s\n"
- "%s: %s\n"
- "%s: %s\n"
- "%s: %s\n"
- "%s: %s\n"
- "%s: %s\n"
- "%s: %s\n",
+ /* see https://github.com/llvm/llvm-project/issues/55443#issuecomment-2077910853 */
+ /* clang-format off */
+ g_print ("%s: %s\n"
+ "%s: %s\n"
+ "%s: %s\n"
+ "%s: %s\n"
+ "%s: %s\n"
+ "%s: %s\n"
+ "%s: %s\n"
+ "%s: %s\n"
+ "%s: %s\n"
+ "%s: %s\n"
+ "%s: %s\n"
+ "%s: %s\n",
_("Can suspend"), xfpm_bool_to_local_string (can_suspend),
_("Can hibernate"), xfpm_bool_to_local_string (can_hibernate),
_("Authorized to suspend"), xfpm_bool_to_local_string (auth_suspend),
@@ -114,6 +118,7 @@ xfpm_dump (GHashTable *hash)
_("Has sleep button"), xfpm_bool_to_local_string (has_sleep_button),
_("Has battery button"), xfpm_bool_to_local_string (has_battery_button),
_("Has LID"), xfpm_bool_to_local_string (has_lid));
+ /* clang-format on */
}
static void
@@ -163,7 +168,9 @@ xfpm_dump_remote (GDBusConnection *bus)
}
static void G_GNUC_NORETURN
-xfpm_start (GDBusConnection *bus, const gchar *client_id, gboolean dump)
+xfpm_start (GDBusConnection *bus,
+ const gchar *client_id,
+ gboolean dump)
{
XfpmManager *manager;
GError *error = NULL;
@@ -172,7 +179,7 @@ xfpm_start (GDBusConnection *bus, const gchar *client_id, gboolean dump)
manager = xfpm_manager_new (bus, client_id);
- if ( xfce_posix_signal_handler_init (&error))
+ if (xfce_posix_signal_handler_init (&error))
{
xfce_posix_signal_handler_set_handler (SIGHUP,
xfpm_quit_signal,
@@ -180,13 +187,13 @@ xfpm_start (GDBusConnection *bus, const gchar *client_id, gboolean dump)
xfce_posix_signal_handler_set_handler (SIGINT,
xfpm_quit_signal,
- manager, NULL);
+ manager, NULL);
xfce_posix_signal_handler_set_handler (SIGTERM,
xfpm_quit_signal,
manager, NULL);
}
- else if (error)
+ else if (error != NULL)
{
g_warning ("Unable to set up POSIX signal handlers: %s", error->message);
g_error_free (error);
@@ -194,7 +201,7 @@ xfpm_start (GDBusConnection *bus, const gchar *client_id, gboolean dump)
xfpm_manager_start (manager);
- if ( dump )
+ if (dump)
{
GHashTable *hash;
hash = xfpm_manager_get_config (manager);
@@ -210,61 +217,62 @@ xfpm_start (GDBusConnection *bus, const gchar *client_id, gboolean dump)
exit (EXIT_SUCCESS);
}
-int main (int argc, char **argv)
+int
+main (int argc,
+ char **argv)
{
GDBusConnection *bus;
GError *error = NULL;
XfpmPowerManager *proxy;
GOptionContext *octx;
- gboolean run = FALSE;
- gboolean quit = FALSE;
- gboolean config = FALSE;
- gboolean version = FALSE;
- gboolean reload = FALSE;
- gboolean daemonize = FALSE;
- gboolean debug = FALSE;
- gboolean dump = FALSE;
- gchar *client_id = NULL;
-
- GOptionEntry option_entries[] =
- {
- { "run",'r', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &run, NULL, NULL },
- { "daemon",'\0' , G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &daemonize, N_("Daemonize"), NULL },
- { "debug",'\0' , G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &debug, N_("Enable debugging"), NULL },
- { "dump",'\0' , G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &dump, N_("Dump all information"), NULL },
- { "restart", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &reload, N_("Restart the running instance of Xfce power manager"), NULL},
- { "customize", 'c', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &config, N_("Show the configuration dialog"), NULL },
- { "quit", 'q', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &quit, N_("Quit any running xfce power manager"), NULL },
- { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version, N_("Version information"), NULL },
+ gboolean run = FALSE;
+ gboolean quit = FALSE;
+ gboolean config = FALSE;
+ gboolean version = FALSE;
+ gboolean reload = FALSE;
+ gboolean daemonize = FALSE;
+ gboolean debug = FALSE;
+ gboolean dump = FALSE;
+ gchar *client_id = NULL;
+
+ GOptionEntry option_entries[] = {
+ { "run", 'r', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &run, NULL, NULL },
+ { "daemon", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &daemonize, N_ ("Daemonize"), NULL },
+ { "debug", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &debug, N_ ("Enable debugging"), NULL },
+ { "dump", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &dump, N_ ("Dump all information"), NULL },
+ { "restart", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &reload, N_ ("Restart the running instance of Xfce power manager"), NULL },
+ { "customize", 'c', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &config, N_ ("Show the configuration dialog"), NULL },
+ { "quit", 'q', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &quit, N_ ("Quit any running xfce power manager"), NULL },
+ { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version, N_ ("Version information"), NULL },
{ "sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &client_id, NULL, NULL },
- { NULL, },
+ { NULL },
};
/* Parse the options */
- octx = g_option_context_new("");
- g_option_context_set_ignore_unknown_options(octx, TRUE);
- g_option_context_add_main_entries(octx, option_entries, NULL);
+ octx = g_option_context_new ("");
+ g_option_context_set_ignore_unknown_options (octx, TRUE);
+ g_option_context_add_main_entries (octx, option_entries, NULL);
#ifdef ENABLE_X11
- g_option_context_add_group(octx, xfce_sm_client_get_option_group(argc, argv));
+ g_option_context_add_group (octx, xfce_sm_client_get_option_group (argc, argv));
#endif
/* We can't add the following command because it will invoke gtk_init
before we have a chance to fork.
g_option_context_add_group(octx, gtk_get_option_group(TRUE));
*/
- if (!g_option_context_parse(octx, &argc, &argv, &error))
+ if (!g_option_context_parse (octx, &argc, &argv, &error))
{
- g_printerr(_("Failed to parse arguments: %s\n"), error->message);
- g_error_free(error);
- g_option_context_free(octx);
+ g_printerr (_("Failed to parse arguments: %s\n"), error->message);
+ g_error_free (error);
+ g_option_context_free (octx);
return EXIT_FAILURE;
}
- g_option_context_free(octx);
+ g_option_context_free (octx);
- if ( version )
+ if (version)
show_version ();
/* Fork if needed */
@@ -294,9 +302,9 @@ int main (int argc, char **argv)
return EXIT_FAILURE;
}
- if ( quit )
+ if (quit)
{
- if (!xfpm_dbus_name_has_owner (bus, "org.xfce.PowerManager") )
+ if (!xfpm_dbus_name_has_owner (bus, "org.xfce.PowerManager"))
{
g_print (_("Xfce power manager is not running"));
g_print ("\n");
@@ -305,22 +313,22 @@ int main (int argc, char **argv)
else
{
proxy = xfpm_power_manager_proxy_new_sync (bus,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
- G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
- "org.xfce.PowerManager",
- "/org/xfce/PowerManager",
- NULL,
- NULL);
- if ( !proxy )
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
+ | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+ "org.xfce.PowerManager",
+ "/org/xfce/PowerManager",
+ NULL,
+ NULL);
+ if (proxy == NULL)
{
g_critical ("Failed to get proxy");
- g_object_unref(bus);
+ g_object_unref (bus);
return EXIT_FAILURE;
}
xfpm_power_manager_call_quit_sync (proxy, NULL, &error);
g_object_unref (proxy);
- if ( error)
+ if (error != NULL)
{
g_critical ("Failed to send quit message: %s", error->message);
g_error_free (error);
@@ -331,24 +339,24 @@ int main (int argc, char **argv)
return EXIT_SUCCESS;
}
- if ( config )
+ if (config)
{
g_spawn_command_line_async ("xfce4-power-manager-settings", &error);
- if ( error )
+ if (error != NULL)
{
- g_critical ("Failed to execute xfce4-power-manager-settings: %s", error->message);
- g_error_free (error);
- return EXIT_FAILURE;
+ g_critical ("Failed to execute xfce4-power-manager-settings: %s", error->message);
+ g_error_free (error);
+ return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}
- if ( reload )
+ if (reload)
{
- if (!xfpm_dbus_name_has_owner (bus, "org.xfce.PowerManager") &&
- !xfpm_dbus_name_has_owner (bus, "org.freedesktop.PowerManagement"))
+ if (!xfpm_dbus_name_has_owner (bus, "org.xfce.PowerManager")
+ && !xfpm_dbus_name_has_owner (bus, "org.freedesktop.PowerManagement"))
{
g_print (_("Xfce power manager is not running"));
g_print ("\n");
@@ -356,8 +364,8 @@ int main (int argc, char **argv)
}
proxy = xfpm_power_manager_proxy_new_sync (bus,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
- G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
+ | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
"org.xfce.PowerManager",
"/org/xfce/PowerManager",
NULL,
@@ -370,7 +378,7 @@ int main (int argc, char **argv)
return EXIT_FAILURE;
}
- if ( !xfpm_power_manager_call_restart_sync (proxy, NULL, NULL) )
+ if (!xfpm_power_manager_call_restart_sync (proxy, NULL, NULL))
{
g_critical ("Unable to send reload message");
g_object_unref (proxy);
@@ -387,7 +395,7 @@ int main (int argc, char **argv)
return EXIT_SUCCESS;
}
- if (xfpm_dbus_name_has_owner (bus, "org.freedesktop.PowerManagement") )
+ if (xfpm_dbus_name_has_owner (bus, "org.freedesktop.PowerManagement"))
{
g_print ("%s: %s\n", _("Xfce Power Manager"), _("Another power manager is already running"));
}
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index 9a1e40434bafc43dfe1d596a49a48528b0da0bc5..ea491d95bd594437bcc8d8c0b5be546b72c92c57 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -59,59 +59,67 @@
#define WINDOWING_IS_X11() FALSE
#endif
-static void xfpm_manager_finalize (GObject *object);
-static void xfpm_manager_set_property(GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec);
-static void xfpm_manager_get_property(GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec);
+static void
+xfpm_manager_finalize (GObject *object);
+static void
+xfpm_manager_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void
+xfpm_manager_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
-static void xfpm_manager_dbus_class_init (XfpmManagerClass *klass);
-static void xfpm_manager_dbus_init (XfpmManager *manager);
+static void
+xfpm_manager_dbus_class_init (XfpmManagerClass *klass);
+static void
+xfpm_manager_dbus_init (XfpmManager *manager);
-static gboolean xfpm_manager_quit (XfpmManager *manager);
+static gboolean
+xfpm_manager_quit (XfpmManager *manager);
-static void xfpm_manager_show_tray_icon (XfpmManager *manager);
-static void xfpm_manager_hide_tray_icon (XfpmManager *manager);
+static void
+xfpm_manager_show_tray_icon (XfpmManager *manager);
+static void
+xfpm_manager_hide_tray_icon (XfpmManager *manager);
#define SLEEP_KEY_TIMEOUT 6.0f
struct XfpmManagerPrivate
{
- GDBusConnection *session_bus;
- GDBusConnection *system_bus;
+ GDBusConnection *session_bus;
+ GDBusConnection *system_bus;
#ifdef ENABLE_X11
- XfceSMClient *client;
- gboolean session_managed;
+ XfceSMClient *client;
+ gboolean session_managed;
#endif
- XfpmPower *power;
- XfpmButton *button;
- XfpmXfconf *conf;
- XfpmBacklight *backlight;
- XfpmKbdBacklight *kbd_backlight;
- XfceConsolekit *console;
- XfceSystemd *systemd;
- XfpmDBusMonitor *monitor;
- XfpmInhibit *inhibit;
- XfpmPPD *ppd;
- XfceScreensaver *screensaver;
- XfpmIdle *idle;
- GtkStatusIcon *adapter_icon;
- GtkWidget *power_button;
- gint show_tray_icon;
-
- XfpmDpms *dpms;
-
- GTimer *timer;
-
- gboolean inhibited;
-
- gint inhibit_fd;
+ XfpmPower *power;
+ XfpmButton *button;
+ XfpmXfconf *conf;
+ XfpmBacklight *backlight;
+ XfpmKbdBacklight *kbd_backlight;
+ XfceConsolekit *console;
+ XfceSystemd *systemd;
+ XfpmDBusMonitor *monitor;
+ XfpmInhibit *inhibit;
+ XfpmPPD *ppd;
+ XfceScreensaver *screensaver;
+ XfpmIdle *idle;
+ GtkStatusIcon *adapter_icon;
+ GtkWidget *power_button;
+ gint show_tray_icon;
+
+ XfpmDpms *dpms;
+
+ GTimer *timer;
+
+ gboolean inhibited;
+
+ gint inhibit_fd;
};
enum
@@ -125,24 +133,24 @@ G_DEFINE_TYPE_WITH_PRIVATE (XfpmManager, xfpm_manager, G_TYPE_OBJECT)
static void
xfpm_manager_class_init (XfpmManagerClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS(klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = xfpm_manager_finalize;
object_class->set_property = xfpm_manager_set_property;
object_class->get_property = xfpm_manager_get_property;
-#define XFPM_PARAM_FLAGS (G_PARAM_READWRITE \
- | G_PARAM_CONSTRUCT \
- | G_PARAM_STATIC_NAME \
- | G_PARAM_STATIC_NICK \
- | G_PARAM_STATIC_BLURB)
+#define XFPM_PARAM_FLAGS (G_PARAM_READWRITE \
+ | G_PARAM_CONSTRUCT \
+ | G_PARAM_STATIC_NAME \
+ | G_PARAM_STATIC_NICK \
+ | G_PARAM_STATIC_BLURB)
g_object_class_install_property (object_class, PROP_SHOW_TRAY_ICON,
- g_param_spec_int (SHOW_TRAY_ICON_CFG,
- SHOW_TRAY_ICON_CFG,
- SHOW_TRAY_ICON_CFG,
- 0, 5, 0,
- XFPM_PARAM_FLAGS));
+ g_param_spec_int (SHOW_TRAY_ICON_CFG,
+ SHOW_TRAY_ICON_CFG,
+ SHOW_TRAY_ICON_CFG,
+ 0, 5, 0,
+ XFPM_PARAM_FLAGS));
#undef XFPM_PARAM_FLAGS
}
@@ -159,14 +167,12 @@ xfpm_manager_init (XfpmManager *manager)
static void
xfpm_manager_finalize (GObject *object)
{
- XfpmManager *manager;
+ XfpmManager *manager = XFPM_MANAGER (object);
- manager = XFPM_MANAGER(object);
-
- if ( manager->priv->session_bus )
+ if (manager->priv->session_bus)
g_object_unref (manager->priv->session_bus);
- if ( manager->priv->system_bus )
+ if (manager->priv->system_bus)
g_object_unref (manager->priv->system_bus);
g_object_unref (manager->priv->power);
@@ -176,9 +182,9 @@ xfpm_manager_finalize (GObject *object)
if (manager->priv->client != NULL)
g_object_unref (manager->priv->client);
#endif
- if ( manager->priv->systemd != NULL )
+ if (manager->priv->systemd != NULL)
g_object_unref (manager->priv->systemd);
- if ( manager->priv->console != NULL )
+ if (manager->priv->console != NULL)
g_object_unref (manager->priv->console);
g_object_unref (manager->priv->monitor);
g_object_unref (manager->priv->inhibit);
@@ -205,10 +211,11 @@ xfpm_manager_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- XfpmManager *manager = XFPM_MANAGER(object);
+ XfpmManager *manager = XFPM_MANAGER (object);
gint new_value;
- switch(property_id) {
+ switch (property_id)
+ {
case PROP_SHOW_TRAY_ICON:
new_value = g_value_get_int (value);
if (new_value != manager->priv->show_tray_icon)
@@ -228,9 +235,9 @@ xfpm_manager_set_property (GObject *object,
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
- }
+ }
}
static void
@@ -239,27 +246,25 @@ xfpm_manager_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- XfpmManager *manager = XFPM_MANAGER(object);
+ XfpmManager *manager = XFPM_MANAGER (object);
- switch(property_id) {
+ switch (property_id)
+ {
case PROP_SHOW_TRAY_ICON:
g_value_set_int (value, manager->priv->show_tray_icon);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
- }
+ }
}
static void
xfpm_manager_release_names (XfpmManager *manager)
{
- xfpm_dbus_release_name (manager->priv->session_bus,
- "org.xfce.PowerManager");
-
- xfpm_dbus_release_name (manager->priv->session_bus,
- "org.freedesktop.PowerManagement");
+ xfpm_dbus_release_name (manager->priv->session_bus, "org.xfce.PowerManager");
+ xfpm_dbus_release_name (manager->priv->session_bus, "org.freedesktop.PowerManagement");
}
static gboolean
@@ -277,7 +282,9 @@ xfpm_manager_quit (XfpmManager *manager)
}
static void
-xfpm_manager_system_bus_connection_changed_cb (XfpmDBusMonitor *monitor, gboolean connected, XfpmManager *manager)
+xfpm_manager_system_bus_connection_changed_cb (XfpmDBusMonitor *monitor,
+ gboolean connected,
+ XfpmManager *manager)
{
if (connected)
{
@@ -290,18 +297,16 @@ xfpm_manager_system_bus_connection_changed_cb (XfpmDBusMonitor *monitor, gboolea
static gboolean
xfpm_manager_reserve_names (XfpmManager *manager)
{
- if ( !xfpm_dbus_register_name (manager->priv->session_bus,
- "org.xfce.PowerManager") ||
- !xfpm_dbus_register_name (manager->priv->session_bus,
- "org.freedesktop.PowerManagement") )
+ if (!xfpm_dbus_register_name (manager->priv->session_bus, "org.xfce.PowerManager")
+ || !xfpm_dbus_register_name (manager->priv->session_bus, "org.freedesktop.PowerManagement"))
{
g_warning ("Unable to reserve bus name: Maybe any already running instance?");
-
g_object_unref (G_OBJECT (manager));
gtk_main_quit ();
return FALSE;
}
+
return TRUE;
}
@@ -315,13 +320,13 @@ xfpm_manager_shutdown (XfpmManager *manager)
else
xfce_consolekit_power_off (manager->priv->console, TRUE, &error);
- if ( error )
+ if (error)
{
g_warning ("Failed to shutdown the system : %s", error->message);
g_error_free (error);
/* Try with the session then */
#ifdef ENABLE_X11
- if ( manager->priv->session_managed )
+ if (manager->priv->session_managed)
xfce_sm_client_request_shutdown (manager->priv->client, XFCE_SM_CLIENT_SHUTDOWN_HINT_HALT);
#endif
}
@@ -331,13 +336,15 @@ static void
xfpm_manager_ask_shutdown (XfpmManager *manager)
{
#ifdef ENABLE_X11
- if ( manager->priv->session_managed )
+ if (manager->priv->session_managed)
xfce_sm_client_request_shutdown (manager->priv->client, XFCE_SM_CLIENT_SHUTDOWN_HINT_ASK);
#endif
}
static void
-xfpm_manager_sleep_request (XfpmManager *manager, XfpmShutdownRequest req, gboolean force)
+xfpm_manager_sleep_request (XfpmManager *manager,
+ XfpmShutdownRequest req,
+ gboolean force)
{
switch (req)
{
@@ -368,37 +375,39 @@ xfpm_manager_reset_sleep_timer (XfpmManager *manager)
}
static void
-xfpm_manager_button_pressed_cb (XfpmButton *bt, XfpmButtonKey type, XfpmManager *manager)
+xfpm_manager_button_pressed_cb (XfpmButton *bt,
+ XfpmButtonKey type,
+ XfpmManager *manager)
{
XfpmShutdownRequest req = XFPM_DO_NOTHING;
XFPM_DEBUG_ENUM (type, XFPM_TYPE_BUTTON_KEY, "Received button press event");
- if ( type == BUTTON_MON_BRIGHTNESS_DOWN || type == BUTTON_MON_BRIGHTNESS_UP )
+ if (type == BUTTON_MON_BRIGHTNESS_DOWN || type == BUTTON_MON_BRIGHTNESS_UP)
return;
- if ( type == BUTTON_KBD_BRIGHTNESS_DOWN || type == BUTTON_KBD_BRIGHTNESS_UP || type == BUTTON_KBD_BRIGHTNESS_CYCLE )
+ if (type == BUTTON_KBD_BRIGHTNESS_DOWN || type == BUTTON_KBD_BRIGHTNESS_UP || type == BUTTON_KBD_BRIGHTNESS_CYCLE)
return;
- if ( type == BUTTON_POWER_OFF )
+ if (type == BUTTON_POWER_OFF)
{
g_object_get (G_OBJECT (manager->priv->conf),
POWER_SWITCH_CFG, &req,
NULL);
}
- else if ( type == BUTTON_SLEEP )
+ else if (type == BUTTON_SLEEP)
{
g_object_get (G_OBJECT (manager->priv->conf),
SLEEP_SWITCH_CFG, &req,
NULL);
}
- else if ( type == BUTTON_HIBERNATE )
- {
+ else if (type == BUTTON_HIBERNATE)
+ {
g_object_get (G_OBJECT (manager->priv->conf),
HIBERNATE_SWITCH_CFG, &req,
NULL);
}
- else if ( type == BUTTON_BATTERY )
+ else if (type == BUTTON_BATTERY)
{
g_object_get (G_OBJECT (manager->priv->conf),
BATTERY_SWITCH_CFG, &req,
@@ -411,11 +420,11 @@ xfpm_manager_button_pressed_cb (XfpmButton *bt, XfpmButtonKey type, XfpmManager
XFPM_DEBUG_ENUM (req, XFPM_TYPE_SHUTDOWN_REQUEST, "Shutdown request : ");
- if ( req == XFPM_ASK )
+ if (req == XFPM_ASK)
xfpm_manager_ask_shutdown (manager);
else
{
- if ( g_timer_elapsed (manager->priv->timer, NULL) > SLEEP_KEY_TIMEOUT )
+ if (g_timer_elapsed (manager->priv->timer, NULL) > SLEEP_KEY_TIMEOUT)
{
g_timer_reset (manager->priv->timer);
xfpm_manager_sleep_request (manager, req, FALSE);
@@ -424,7 +433,9 @@ xfpm_manager_button_pressed_cb (XfpmButton *bt, XfpmButtonKey type, XfpmManager
}
static void
-xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManager *manager)
+xfpm_manager_lid_changed_cb (XfpmPower *power,
+ gboolean lid_is_closed,
+ XfpmManager *manager)
{
XfpmLidTriggerAction action;
gboolean on_battery, logind_handle_lid_switch;
@@ -447,18 +458,18 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
on_battery ? LID_SWITCH_ON_BATTERY_CFG : LID_SWITCH_ON_AC_CFG, &action,
NULL);
- if ( lid_is_closed )
+ if (lid_is_closed)
{
XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID close event");
- if ( action == LID_TRIGGER_DPMS )
+ if (action == LID_TRIGGER_DPMS)
{
if (manager->priv->dpms != NULL && !xfpm_is_multihead_connected ())
xfpm_dpms_set_mode (manager->priv->dpms, XFPM_DPMS_MODE_OFF);
}
- else if ( action == LID_TRIGGER_LOCK_SCREEN )
+ else if (action == LID_TRIGGER_LOCK_SCREEN)
{
- if ( !xfpm_is_multihead_connected () )
+ if (!xfpm_is_multihead_connected ())
{
if (!xfce_screensaver_lock (manager->priv->screensaver))
{
@@ -469,7 +480,7 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
}
}
}
- else if ( action != LID_TRIGGER_NOTHING )
+ else if (action != LID_TRIGGER_NOTHING)
{
/*
* Force sleep here as lid is closed and no point of asking the
@@ -489,13 +500,17 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
}
static void
-xfpm_manager_inhibit_changed_cb (XfpmInhibit *inhibit, gboolean inhibited, XfpmManager *manager)
+xfpm_manager_inhibit_changed_cb (XfpmInhibit *inhibit,
+ gboolean inhibited,
+ XfpmManager *manager)
{
manager->priv->inhibited = inhibited;
}
static void
-xfpm_manager_alarm_timeout_cb (XfpmIdle *idle, XfpmAlarmId id, XfpmManager *manager)
+xfpm_manager_alarm_timeout_cb (XfpmIdle *idle,
+ XfpmAlarmId id,
+ XfpmManager *manager)
{
if (xfpm_power_is_in_presentation_mode (manager->priv->power))
return;
@@ -507,7 +522,7 @@ xfpm_manager_alarm_timeout_cb (XfpmIdle *idle, XfpmAlarmId id, XfpmManager *mana
XfpmShutdownRequest sleep_mode = XFPM_DO_NOTHING;
gboolean on_battery;
- if ( manager->priv->inhibited )
+ if (manager->priv->inhibited)
{
XFPM_DEBUG ("Idle sleep alarm timeout, but power manager is currently inhibited, action ignored");
return;
@@ -527,7 +542,7 @@ xfpm_manager_alarm_timeout_cb (XfpmIdle *idle, XfpmAlarmId id, XfpmManager *mana
NULL);
if ((id == XFPM_ALARM_ID_INACTIVITY_ON_AC && !on_battery)
- || (id == XFPM_ALARM_ID_INACTIVITY_ON_BATTERY && on_battery))
+ || (id == XFPM_ALARM_ID_INACTIVITY_ON_BATTERY && on_battery))
xfpm_manager_sleep_request (manager, sleep_mode, FALSE);
}
}
@@ -575,14 +590,16 @@ xfpm_manager_set_idle_alarm_on_battery (XfpmManager *manager)
}
static void
-xfpm_manager_on_battery_changed_cb (XfpmPower *power, gboolean on_battery, XfpmManager *manager)
+xfpm_manager_on_battery_changed_cb (XfpmPower *power,
+ gboolean on_battery,
+ XfpmManager *manager)
{
if (manager->priv->idle != NULL)
xfpm_idle_alarm_reset_all (manager->priv->idle);
}
-static gchar*
-xfpm_manager_get_systemd_events(XfpmManager *manager)
+static gchar *
+xfpm_manager_get_systemd_events (XfpmManager *manager)
{
GSList *events = NULL, *current_event;
gchar *what = g_strdup ("");
@@ -596,28 +613,28 @@ xfpm_manager_get_systemd_events(XfpmManager *manager)
NULL);
if (!logind_handle_power_key)
- events = g_slist_append(events, "handle-power-key");
+ events = g_slist_append (events, "handle-power-key");
if (!logind_handle_suspend_key)
- events = g_slist_append(events, "handle-suspend-key");
+ events = g_slist_append (events, "handle-suspend-key");
if (!logind_handle_hibernate_key)
- events = g_slist_append(events, "handle-hibernate-key");
+ events = g_slist_append (events, "handle-hibernate-key");
if (!logind_handle_lid_switch)
- events = g_slist_append(events, "handle-lid-switch");
+ events = g_slist_append (events, "handle-lid-switch");
if (events != NULL)
{
- g_free(what);
+ g_free (what);
current_event = events;
- what = g_strdup ( (gchar *) current_event->data );
+ what = g_strdup ((gchar *) current_event->data);
while ((current_event = g_slist_next (current_event)))
{
gchar *what_temp = g_strconcat (what, ":", (gchar *) current_event->data, NULL);
- g_free(what);
+ g_free (what);
what = what_temp;
}
- g_slist_free(events);
+ g_slist_free (events);
}
return what;
@@ -631,7 +648,7 @@ xfpm_manager_inhibit_sleep_systemd (XfpmManager *manager)
GError *error = NULL;
GUnixFDList *fd_list = NULL;
gint fd = -1;
- char *what = xfpm_manager_get_systemd_events(manager);
+ char *what = xfpm_manager_get_systemd_events (manager);
const char *who = "xfce4-power-manager";
const char *why = "xfce4-power-manager handles these events";
const char *mode = "block";
@@ -702,7 +719,8 @@ xfpm_manager_systemd_events_changed (XfpmManager *manager)
}
static void
-xfpm_manager_tray_update_tooltip (PowerManagerButton *button, XfpmManager *manager)
+xfpm_manager_tray_update_tooltip (PowerManagerButton *button,
+ XfpmManager *manager)
{
g_return_if_fail (XFPM_IS_MANAGER (manager));
g_return_if_fail (POWER_MANAGER_IS_BUTTON (manager->priv->power_button));
@@ -710,31 +728,39 @@ xfpm_manager_tray_update_tooltip (PowerManagerButton *button, XfpmManager *manag
XFPM_DEBUG ("updating tooltip");
- if (power_manager_button_get_tooltip (POWER_MANAGER_BUTTON(manager->priv->power_button)) == NULL)
+ if (power_manager_button_get_tooltip (POWER_MANAGER_BUTTON (manager->priv->power_button)) == NULL)
return;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_status_icon_set_tooltip_markup (manager->priv->adapter_icon, power_manager_button_get_tooltip (POWER_MANAGER_BUTTON(manager->priv->power_button)));
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_status_icon_set_tooltip_markup (
+ manager->priv->adapter_icon,
+ power_manager_button_get_tooltip (POWER_MANAGER_BUTTON (manager->priv->power_button)));
+ G_GNUC_END_IGNORE_DEPRECATIONS
}
static void
-xfpm_manager_tray_update_icon (PowerManagerButton *button, XfpmManager *manager)
+xfpm_manager_tray_update_icon (PowerManagerButton *button,
+ XfpmManager *manager)
{
g_return_if_fail (XFPM_IS_MANAGER (manager));
g_return_if_fail (POWER_MANAGER_IS_BUTTON (manager->priv->power_button));
XFPM_DEBUG ("updating icon");
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_status_icon_set_from_icon_name (manager->priv->adapter_icon, power_manager_button_get_icon_name (POWER_MANAGER_BUTTON(manager->priv->power_button)));
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_status_icon_set_from_icon_name (
+ manager->priv->adapter_icon,
+ power_manager_button_get_icon_name (POWER_MANAGER_BUTTON (manager->priv->power_button)));
+ G_GNUC_END_IGNORE_DEPRECATIONS
}
static void
-xfpm_manager_show_tray_menu (GtkStatusIcon *icon, guint button, guint activate_time, XfpmManager *manager)
+xfpm_manager_show_tray_menu (GtkStatusIcon *icon,
+ guint button,
+ guint activate_time,
+ XfpmManager *manager)
{
- power_manager_button_show_menu (POWER_MANAGER_BUTTON(manager->priv->power_button));
+ power_manager_button_show_menu (POWER_MANAGER_BUTTON (manager->priv->power_button));
}
static void
@@ -746,29 +772,32 @@ xfpm_manager_show_tray_icon (XfpmManager *manager)
return;
}
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
manager->priv->adapter_icon = gtk_status_icon_new ();
manager->priv->power_button = g_object_ref_sink (power_manager_button_new ());
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_END_IGNORE_DEPRECATIONS
XFPM_DEBUG ("Showing tray icon");
/* send a show event to startup the button */
- power_manager_button_show (POWER_MANAGER_BUTTON(manager->priv->power_button));
+ power_manager_button_show (POWER_MANAGER_BUTTON (manager->priv->power_button));
/* initial update the tray icon + tooltip */
- xfpm_manager_tray_update_icon (POWER_MANAGER_BUTTON(manager->priv->power_button), manager);
- xfpm_manager_tray_update_tooltip (POWER_MANAGER_BUTTON(manager->priv->power_button), manager);
+ xfpm_manager_tray_update_icon (POWER_MANAGER_BUTTON (manager->priv->power_button), manager);
+ xfpm_manager_tray_update_tooltip (POWER_MANAGER_BUTTON (manager->priv->power_button), manager);
/* Listen to the tooltip and icon changes */
- g_signal_connect (G_OBJECT(manager->priv->power_button), "tooltip-changed", G_CALLBACK(xfpm_manager_tray_update_tooltip), manager);
- g_signal_connect (G_OBJECT(manager->priv->power_button), "icon-name-changed", G_CALLBACK(xfpm_manager_tray_update_icon), manager);
+ g_signal_connect (G_OBJECT (manager->priv->power_button), "tooltip-changed",
+ G_CALLBACK (xfpm_manager_tray_update_tooltip), manager);
+ g_signal_connect (G_OBJECT (manager->priv->power_button), "icon-name-changed",
+ G_CALLBACK (xfpm_manager_tray_update_icon), manager);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_status_icon_set_visible (manager->priv->adapter_icon, TRUE);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_END_IGNORE_DEPRECATIONS
- g_signal_connect (manager->priv->adapter_icon, "popup-menu", G_CALLBACK (xfpm_manager_show_tray_menu), manager);
+ g_signal_connect (manager->priv->adapter_icon, "popup-menu",
+ G_CALLBACK (xfpm_manager_show_tray_menu), manager);
}
static void
@@ -777,29 +806,26 @@ xfpm_manager_hide_tray_icon (XfpmManager *manager)
if (manager->priv->adapter_icon == NULL)
return;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_status_icon_set_visible (manager->priv->adapter_icon, FALSE);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_END_IGNORE_DEPRECATIONS
- /* disconnect from all the signals */
- g_signal_handlers_disconnect_by_func (G_OBJECT(manager->priv->power_button), G_CALLBACK(xfpm_manager_tray_update_tooltip), manager);
- g_signal_handlers_disconnect_by_func (G_OBJECT(manager->priv->power_button), G_CALLBACK(xfpm_manager_tray_update_icon), manager);
- g_signal_handlers_disconnect_by_func (G_OBJECT(manager->priv->adapter_icon), G_CALLBACK(xfpm_manager_show_tray_menu), manager);
+ /* disconnect from all the signals */
+ g_signal_handlers_disconnect_by_func (manager->priv->power_button, xfpm_manager_tray_update_tooltip, manager);
+ g_signal_handlers_disconnect_by_func (manager->priv->power_button, xfpm_manager_tray_update_icon, manager);
+ g_signal_handlers_disconnect_by_func (manager->priv->adapter_icon, xfpm_manager_show_tray_menu, manager);
g_object_unref (manager->priv->power_button);
g_object_unref (manager->priv->adapter_icon);
-
manager->priv->power_button = NULL;
manager->priv->adapter_icon = NULL;
}
XfpmManager *
-xfpm_manager_new (GDBusConnection *bus, const gchar *client_id)
+xfpm_manager_new (GDBusConnection *bus,
+ const gchar *client_id)
{
- XfpmManager *manager = NULL;
-
- manager = g_object_new (XFPM_TYPE_MANAGER, NULL);
-
+ XfpmManager *manager = g_object_new (XFPM_TYPE_MANAGER, NULL);
manager->priv->session_bus = bus;
#ifdef ENABLE_X11
@@ -807,8 +833,7 @@ xfpm_manager_new (GDBusConnection *bus, const gchar *client_id)
{
GError *error = NULL;
gchar *current_dir = g_get_current_dir ();
- const gchar *restart_command[] =
- {
+ const gchar *restart_command[] = {
"xfce4-power-manager",
"--restart",
NULL
@@ -841,12 +866,13 @@ xfpm_manager_new (GDBusConnection *bus, const gchar *client_id)
return manager;
}
-void xfpm_manager_start (XfpmManager *manager)
+void
+xfpm_manager_start (XfpmManager *manager)
{
GError *error = NULL;
- if ( !xfpm_manager_reserve_names (manager) )
- goto out;
+ if (!xfpm_manager_reserve_names (manager))
+ goto out;
manager->priv->power = xfpm_power_get ();
manager->priv->button = xfpm_button_new ();
@@ -855,7 +881,7 @@ void xfpm_manager_start (XfpmManager *manager)
manager->priv->console = NULL;
manager->priv->systemd = NULL;
- if ( LOGIND_RUNNING () )
+ if (LOGIND_RUNNING ())
manager->priv->systemd = xfce_systemd_get ();
else
manager->priv->console = xfce_consolekit_get ();
@@ -865,8 +891,8 @@ void xfpm_manager_start (XfpmManager *manager)
manager->priv->ppd = xfpm_ppd_new ();
manager->priv->idle = xfpm_idle_new ();
- /* Don't allow systemd to handle power/suspend/hibernate buttons
- * and lid-switch */
+ /* Don't allow systemd to handle power/suspend/hibernate buttons
+ * and lid-switch */
manager->priv->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
if (manager->priv->system_bus)
manager->priv->inhibit_fd = xfpm_manager_inhibit_sleep_systemd (manager);
@@ -902,9 +928,7 @@ void xfpm_manager_start (XfpmManager *manager)
G_CALLBACK (xfpm_manager_system_bus_connection_changed_cb), manager, 0);
manager->priv->backlight = xfpm_backlight_new ();
-
manager->priv->kbd_backlight = xfpm_kbd_backlight_new ();
-
manager->priv->dpms = xfpm_dpms_new ();
g_signal_connect_object (manager->priv->button, "button_pressed",
@@ -912,39 +936,35 @@ void xfpm_manager_start (XfpmManager *manager)
g_signal_connect_object (manager->priv->power, "lid-changed",
G_CALLBACK (xfpm_manager_lid_changed_cb), manager, 0);
-
g_signal_connect_object (manager->priv->power, "on-battery-changed",
G_CALLBACK (xfpm_manager_on_battery_changed_cb), manager, 0);
-
g_signal_connect_object (manager->priv->power, "waking-up",
G_CALLBACK (xfpm_manager_reset_sleep_timer), manager, G_CONNECT_SWAPPED);
-
g_signal_connect_object (manager->priv->power, "sleeping",
G_CALLBACK (xfpm_manager_reset_sleep_timer), manager, G_CONNECT_SWAPPED);
-
g_signal_connect_object (manager->priv->power, "ask-shutdown",
G_CALLBACK (xfpm_manager_ask_shutdown), manager, G_CONNECT_SWAPPED);
-
g_signal_connect_object (manager->priv->power, "shutdown",
G_CALLBACK (xfpm_manager_shutdown), manager, G_CONNECT_SWAPPED);
xfconf_g_property_bind (xfpm_xfconf_get_channel (manager->priv->conf),
- XFPM_PROPERTIES_PREFIX SHOW_TRAY_ICON_CFG,
- G_TYPE_INT,
- G_OBJECT(manager),
- SHOW_TRAY_ICON_CFG);
-out:
- ;
+ XFPM_PROPERTIES_PREFIX SHOW_TRAY_ICON_CFG,
+ G_TYPE_INT,
+ G_OBJECT (manager),
+ SHOW_TRAY_ICON_CFG);
+out:;
}
-void xfpm_manager_stop (XfpmManager *manager)
+void
+xfpm_manager_stop (XfpmManager *manager)
{
XFPM_DEBUG ("Stopping");
g_return_if_fail (XFPM_IS_MANAGER (manager));
xfpm_manager_quit (manager);
}
-GHashTable *xfpm_manager_get_config (XfpmManager *manager)
+GHashTable *
+xfpm_manager_get_config (XfpmManager *manager)
{
GHashTable *hash;
@@ -985,13 +1005,13 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
has_battery = xfpm_power_has_battery (manager->priv->power);
mapped_buttons = xfpm_button_get_mapped (manager->priv->button);
- if ( mapped_buttons & SLEEP_KEY )
+ if (mapped_buttons & SLEEP_KEY)
has_sleep_button = TRUE;
- if ( mapped_buttons & HIBERNATE_KEY )
+ if (mapped_buttons & HIBERNATE_KEY)
has_hibernate_button = TRUE;
- if ( mapped_buttons & POWER_KEY )
+ if (mapped_buttons & POWER_KEY)
has_power_button = TRUE;
- if ( mapped_buttons & BATTERY_KEY )
+ if (mapped_buttons & BATTERY_KEY)
has_battery_button = TRUE;
g_hash_table_insert (hash, g_strdup ("sleep-button"), g_strdup (xfpm_bool_to_string (has_sleep_button)));
@@ -1003,10 +1023,8 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
g_hash_table_insert (hash, g_strdup ("can-suspend"), g_strdup (xfpm_bool_to_string (can_suspend)));
g_hash_table_insert (hash, g_strdup ("can-hibernate"), g_strdup (xfpm_bool_to_string (can_hibernate)));
g_hash_table_insert (hash, g_strdup ("can-shutdown"), g_strdup (xfpm_bool_to_string (can_shutdown && auth_shutdown)));
-
g_hash_table_insert (hash, g_strdup ("has-battery"), g_strdup (xfpm_bool_to_string (has_battery)));
g_hash_table_insert (hash, g_strdup ("has-lid"), g_strdup (xfpm_bool_to_string (has_lid)));
-
g_hash_table_insert (hash, g_strdup ("has-brightness"), g_strdup (xfpm_bool_to_string (has_lcd_brightness)));
return hash;
@@ -1017,21 +1035,25 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
* DBus server implementation
*
*/
-static gboolean xfpm_manager_dbus_quit (XfpmManager *manager,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_manager_dbus_quit (XfpmManager *manager,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_manager_dbus_restart (XfpmManager *manager,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_manager_dbus_restart (XfpmManager *manager,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_manager_dbus_get_config (XfpmManager *manager,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_manager_dbus_get_config (XfpmManager *manager,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_manager_dbus_get_info (XfpmManager *manager,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_manager_dbus_get_info (XfpmManager *manager,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
#include "xfce-power-manager-dbus.h"
@@ -1043,27 +1065,22 @@ xfpm_manager_dbus_class_init (XfpmManagerClass *klass)
static void
xfpm_manager_dbus_init (XfpmManager *manager)
{
- XfpmPowerManager *manager_dbus;
- manager_dbus = xfpm_power_manager_skeleton_new ();
+ XfpmPowerManager *manager_dbus = xfpm_power_manager_skeleton_new ();
g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (manager_dbus),
manager->priv->session_bus,
"/org/xfce/PowerManager",
NULL);
- g_signal_connect_object (manager_dbus,
- "handle-quit",
+ g_signal_connect_object (manager_dbus, "handle-quit",
G_CALLBACK (xfpm_manager_dbus_quit),
manager, G_CONNECT_SWAPPED);
- g_signal_connect_object (manager_dbus,
- "handle-restart",
+ g_signal_connect_object (manager_dbus, "handle-restart",
G_CALLBACK (xfpm_manager_dbus_restart),
manager, G_CONNECT_SWAPPED);
- g_signal_connect_object (manager_dbus,
- "handle-get-config",
+ g_signal_connect_object (manager_dbus, "handle-get-config",
G_CALLBACK (xfpm_manager_dbus_get_config),
manager, G_CONNECT_SWAPPED);
- g_signal_connect_object (manager_dbus,
- "handle-get-info",
+ g_signal_connect_object (manager_dbus, "handle-get-info",
G_CALLBACK (xfpm_manager_dbus_get_info),
manager, G_CONNECT_SWAPPED);
}
@@ -1073,10 +1090,9 @@ xfpm_manager_dbus_quit (XfpmManager *manager,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
- XFPM_DEBUG("Quit message received\n");
+ XFPM_DEBUG ("Quit message received");
xfpm_manager_quit (manager);
-
xfpm_power_manager_complete_quit (user_data, invocation);
return TRUE;
@@ -1087,18 +1103,19 @@ xfpm_manager_dbus_restart (XfpmManager *manager,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
- XFPM_DEBUG("Restart message received");
+ XFPM_DEBUG ("Restart message received");
xfpm_manager_quit (manager);
-
g_spawn_command_line_async ("xfce4-power-manager", NULL);
-
xfpm_power_manager_complete_restart (user_data, invocation);
return TRUE;
}
-static void hash_to_variant (gpointer key, gpointer value, gpointer user_data)
+static void
+hash_to_variant (gpointer key,
+ gpointer value,
+ gpointer user_data)
{
g_variant_builder_add (user_data, "{ss}", key, value);
}
@@ -1115,16 +1132,11 @@ xfpm_manager_dbus_get_config (XfpmManager *manager,
config = xfpm_manager_get_config (manager);
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{ss}"));
-
g_hash_table_foreach (config, hash_to_variant, &builder);
-
g_hash_table_unref (config);
variant = g_variant_builder_end (&builder);
-
- xfpm_power_manager_complete_get_config (user_data,
- invocation,
- variant);
+ xfpm_power_manager_complete_get_config (user_data, invocation, variant);
return TRUE;
}
@@ -1134,12 +1146,6 @@ xfpm_manager_dbus_get_info (XfpmManager *manager,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
-
- xfpm_power_manager_complete_get_info (user_data,
- invocation,
- PACKAGE,
- VERSION,
- "Xfce-goodies");
-
+ xfpm_power_manager_complete_get_info (user_data, invocation, PACKAGE, VERSION, "Xfce-goodies");
return TRUE;
}
diff --git a/src/xfpm-manager.h b/src/xfpm-manager.h
index 2635a3b909ab3e6113de22f0d0c2d90f9dcdbcdd..bea16a5187b8ad5cb51e15237e9dae008b7879d8 100644
--- a/src/xfpm-manager.h
+++ b/src/xfpm-manager.h
@@ -26,30 +26,35 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_MANAGER (xfpm_manager_get_type () )
-#define XFPM_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST((o), XFPM_TYPE_MANAGER, XfpmManager))
-#define XFPM_IS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), XFPM_TYPE_MANAGER))
-#define XFPM_MANAGER_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS((k), XFPM_TYPE_MANAGER, XfpmManagerClass))
+#define XFPM_TYPE_MANAGER (xfpm_manager_get_type ())
+#define XFPM_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_MANAGER, XfpmManager))
+#define XFPM_IS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_MANAGER))
+#define XFPM_MANAGER_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS ((k), XFPM_TYPE_MANAGER, XfpmManagerClass))
typedef struct XfpmManagerPrivate XfpmManagerPrivate;
typedef struct
{
- GObject parent;
- XfpmManagerPrivate *priv;
+ GObject parent;
+ XfpmManagerPrivate *priv;
} XfpmManager;
typedef struct
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
} XfpmManagerClass;
-GType xfpm_manager_get_type (void) G_GNUC_CONST;
-XfpmManager *xfpm_manager_new (GDBusConnection *bus,
- const gchar *client_id);
-void xfpm_manager_start (XfpmManager *manager);
-void xfpm_manager_stop (XfpmManager *manager);
-GHashTable *xfpm_manager_get_config (XfpmManager *manager);
+GType
+xfpm_manager_get_type (void) G_GNUC_CONST;
+XfpmManager *
+xfpm_manager_new (GDBusConnection *bus,
+ const gchar *client_id);
+void
+xfpm_manager_start (XfpmManager *manager);
+void
+xfpm_manager_stop (XfpmManager *manager);
+GHashTable *
+xfpm_manager_get_config (XfpmManager *manager);
G_END_DECLS
diff --git a/src/xfpm-notify.c b/src/xfpm-notify.c
index 926d909432f475bfd8a1deb1ad8522f1ec750e18..dd8e935e54f93c2ec38deeed08463da32bc16729 100644
--- a/src/xfpm-notify.c
+++ b/src/xfpm-notify.c
@@ -29,25 +29,27 @@
#include <libxfce4util/libxfce4util.h>
-static void xfpm_notify_finalize (GObject *object);
+static void
+xfpm_notify_finalize (GObject *object);
-static NotifyNotification * xfpm_notify_new_notification_internal (const gchar *title,
- const gchar *message,
- const gchar *icon_name,
- XfpmNotifyUrgency urgency) G_GNUC_MALLOC;
+static NotifyNotification *
+xfpm_notify_new_notification_internal (const gchar *title,
+ const gchar *message,
+ const gchar *icon_name,
+ XfpmNotifyUrgency urgency) G_GNUC_MALLOC;
struct XfpmNotifyPrivate
{
- XfpmDBusMonitor *monitor;
+ XfpmDBusMonitor *monitor;
NotifyNotification *notification;
NotifyNotification *critical;
- gulong critical_id;
- gulong notify_id;
+ gulong critical_id;
+ gulong notify_id;
- gboolean supports_actions;
- gboolean supports_sync; /* For x-canonical-private-synchronous */
+ gboolean supports_actions;
+ gboolean supports_sync; /* For x-canonical-private-synchronous */
};
enum
@@ -62,11 +64,9 @@ G_DEFINE_TYPE_WITH_PRIVATE (XfpmNotify, xfpm_notify, G_TYPE_OBJECT)
static void
xfpm_notify_get_server_caps (XfpmNotify *notify)
{
- GList *caps = NULL;
+ GList *caps = notify_get_server_caps ();
notify->priv->supports_actions = FALSE;
- notify->priv->supports_sync = FALSE;
-
- caps = notify_get_server_caps ();
+ notify->priv->supports_sync = FALSE;
if (caps != NULL)
{
@@ -91,10 +91,11 @@ xfpm_notify_check_server (XfpmDBusMonitor *monitor,
xfpm_notify_get_server_caps (notify);
}
-static void xfpm_notify_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+static void
+xfpm_notify_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
XfpmNotify *notify;
@@ -144,9 +145,8 @@ xfpm_notify_init (XfpmNotify *notify)
notify->priv->notification = NULL;
notify->priv->critical = NULL;
-
notify->priv->critical_id = 0;
- notify->priv->notify_id = 0;
+ notify->priv->notify_id = 0;
notify->priv->monitor = xfpm_dbus_monitor_new ();
xfpm_dbus_monitor_add_service (notify->priv->monitor, G_BUS_TYPE_SESSION, "org.freedesktop.Notifications");
@@ -159,21 +159,19 @@ xfpm_notify_init (XfpmNotify *notify)
static void
xfpm_notify_finalize (GObject *object)
{
- XfpmNotify *notify;
-
- notify = XFPM_NOTIFY (object);
+ XfpmNotify *notify = XFPM_NOTIFY (object);
xfpm_notify_close_normal (notify);
xfpm_notify_close_critical (notify);
- G_OBJECT_CLASS (xfpm_notify_parent_class)->finalize(object);
+ G_OBJECT_CLASS (xfpm_notify_parent_class)->finalize (object);
}
static NotifyNotification *
-xfpm_notify_new_notification_internal (const gchar *title,
- const gchar *message,
- const gchar *icon_name,
- XfpmNotifyUrgency urgency)
+xfpm_notify_new_notification_internal (const gchar *title,
+ const gchar *message,
+ const gchar *icon_name,
+ XfpmNotifyUrgency urgency)
{
NotifyNotification *n = notify_notification_new (title, message, icon_name);
@@ -183,14 +181,14 @@ xfpm_notify_new_notification_internal (const gchar *title,
notify_notification_set_hint (n, "transient", g_variant_new_boolean (FALSE));
notify_notification_set_hint (n, "image-path", g_variant_new_string (icon_name));
- notify_notification_set_urgency (n, (NotifyUrgency)urgency);
+ notify_notification_set_urgency (n, (NotifyUrgency) urgency);
return n;
}
static void
xfpm_notify_close_critical_cb (NotifyNotification *n,
- XfpmNotify *notify)
+ XfpmNotify *notify)
{
notify->priv->critical = NULL;
g_object_unref (G_OBJECT (n));
@@ -225,13 +223,13 @@ xfpm_notify_close_notification (XfpmNotify *notify)
notify->priv->notify_id = 0;
}
- if ( notify->priv->notification )
+ if (notify->priv->notification)
{
if (!notify_notification_close (notify->priv->notification, NULL))
g_warning ("Failed to close notification");
- g_object_unref (G_OBJECT(notify->priv->notification) );
- notify->priv->notification = NULL;
+ g_object_unref (G_OBJECT (notify->priv->notification));
+ notify->priv->notification = NULL;
}
}
@@ -240,7 +238,7 @@ xfpm_notify_new (void)
{
static gpointer xfpm_notify_object = NULL;
- if ( xfpm_notify_object != NULL )
+ if (xfpm_notify_object != NULL)
{
g_object_ref (xfpm_notify_object);
}
@@ -254,11 +252,11 @@ xfpm_notify_new (void)
}
void
-xfpm_notify_show_notification (XfpmNotify *notify,
- const gchar *title,
- const gchar *text,
- const gchar *icon_name,
- XfpmNotifyUrgency urgency)
+xfpm_notify_show_notification (XfpmNotify *notify,
+ const gchar *title,
+ const gchar *text,
+ const gchar *icon_name,
+ XfpmNotifyUrgency urgency)
{
NotifyNotification *n;
@@ -268,49 +266,48 @@ xfpm_notify_show_notification (XfpmNotify *notify,
}
NotifyNotification *
-xfpm_notify_new_notification (XfpmNotify *notify,
- const gchar *title,
- const gchar *text,
- const gchar *icon_name,
- XfpmNotifyUrgency urgency)
+xfpm_notify_new_notification (XfpmNotify *notify,
+ const gchar *title,
+ const gchar *text,
+ const gchar *icon_name,
+ XfpmNotifyUrgency urgency)
{
- NotifyNotification *n = xfpm_notify_new_notification_internal (title,
- text, icon_name,
- urgency);
+ NotifyNotification *n = xfpm_notify_new_notification_internal (title, text, icon_name, urgency);
return n;
}
void
-xfpm_notify_add_action_to_notification (XfpmNotify *notify,
- NotifyNotification *n,
- const gchar *id,
- const gchar *action_label,
- NotifyActionCallback callback,
- gpointer data)
+xfpm_notify_add_action_to_notification (XfpmNotify *notify,
+ NotifyNotification *n,
+ const gchar *id,
+ const gchar *action_label,
+ NotifyActionCallback callback,
+ gpointer data)
{
- g_return_if_fail (XFPM_IS_NOTIFY(notify));
+ g_return_if_fail (XFPM_IS_NOTIFY (notify));
notify_notification_add_action (n, id, action_label,
- (NotifyActionCallback)callback,
+ (NotifyActionCallback) callback,
data, NULL);
}
static void
-xfpm_notify_closed_cb (NotifyNotification *n, XfpmNotify *notify)
+xfpm_notify_closed_cb (NotifyNotification *n,
+ XfpmNotify *notify)
{
notify->priv->notification = NULL;
g_object_unref (G_OBJECT (n));
}
void
-xfpm_notify_present_notification (XfpmNotify *notify,
+xfpm_notify_present_notification (XfpmNotify *notify,
NotifyNotification *n)
{
- g_return_if_fail (XFPM_IS_NOTIFY(notify));
+ g_return_if_fail (XFPM_IS_NOTIFY (notify));
xfpm_notify_close_notification (notify);
- g_signal_connect_object (G_OBJECT (n),"closed",
+ g_signal_connect_object (G_OBJECT (n), "closed",
G_CALLBACK (xfpm_notify_closed_cb), notify, 0);
notify->priv->notification = n;
@@ -318,7 +315,7 @@ xfpm_notify_present_notification (XfpmNotify *notify,
}
void
-xfpm_notify_critical (XfpmNotify *notify,
+xfpm_notify_critical (XfpmNotify *notify,
NotifyNotification *n)
{
g_return_if_fail (XFPM_IS_NOTIFY (notify));
@@ -346,7 +343,7 @@ xfpm_notify_close_critical (XfpmNotify *notify)
notify->priv->critical_id = 0;
}
- if ( notify->priv->critical )
+ if (notify->priv->critical)
{
if (!notify_notification_close (notify->priv->critical, &error))
{
@@ -357,8 +354,8 @@ xfpm_notify_close_critical (XfpmNotify *notify)
}
}
- g_object_unref (G_OBJECT(notify->priv->critical) );
- notify->priv->critical = NULL;
+ g_object_unref (G_OBJECT (notify->priv->critical));
+ notify->priv->critical = NULL;
}
}
diff --git a/src/xfpm-notify.h b/src/xfpm-notify.h
index e74ae0f936c857e3858615382e504f9a7c0e48b2..a07e0ea15ebb28d16d06f1ebc61e5a5e39e7b58c 100644
--- a/src/xfpm-notify.h
+++ b/src/xfpm-notify.h
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_NOTIFY (xfpm_notify_get_type () )
-#define XFPM_NOTIFY(o) (G_TYPE_CHECK_INSTANCE_CAST((o), XFPM_TYPE_NOTIFY, XfpmNotify))
-#define XFPM_IS_NOTIFY(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), XFPM_TYPE_NOTIFY))
+#define XFPM_TYPE_NOTIFY (xfpm_notify_get_type ())
+#define XFPM_NOTIFY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_NOTIFY, XfpmNotify))
+#define XFPM_IS_NOTIFY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_NOTIFY))
typedef enum
{
@@ -42,39 +42,48 @@ typedef struct XfpmNotifyPrivate XfpmNotifyPrivate;
typedef struct
{
- GObject parent;
- XfpmNotifyPrivate *priv;
+ GObject parent;
+ XfpmNotifyPrivate *priv;
} XfpmNotify;
typedef struct
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
} XfpmNotifyClass;
-GType xfpm_notify_get_type (void) G_GNUC_CONST;
-XfpmNotify *xfpm_notify_new (void);
-void xfpm_notify_show_notification (XfpmNotify *notify,
- const gchar *title,
- const gchar *text,
- const gchar *icon_name,
- XfpmNotifyUrgency urgency);
-NotifyNotification *xfpm_notify_new_notification (XfpmNotify *notify,
- const gchar *title,
- const gchar *text,
- const gchar *icon_name,
- XfpmNotifyUrgency urgency) G_GNUC_MALLOC;
-void xfpm_notify_add_action_to_notification (XfpmNotify *notify,
- NotifyNotification *n,
- const gchar *id,
- const gchar *action_label,
- NotifyActionCallback callback,
- gpointer data);
-void xfpm_notify_present_notification (XfpmNotify *notify,
- NotifyNotification *n);
-void xfpm_notify_critical (XfpmNotify *notify,
- NotifyNotification *n);
-void xfpm_notify_close_critical (XfpmNotify *notify);
-void xfpm_notify_close_normal (XfpmNotify *notify);
+GType
+xfpm_notify_get_type (void) G_GNUC_CONST;
+XfpmNotify *
+xfpm_notify_new (void);
+void
+xfpm_notify_show_notification (XfpmNotify *notify,
+ const gchar *title,
+ const gchar *text,
+ const gchar *icon_name,
+ XfpmNotifyUrgency urgency);
+NotifyNotification *
+xfpm_notify_new_notification (XfpmNotify *notify,
+ const gchar *title,
+ const gchar *text,
+ const gchar *icon_name,
+ XfpmNotifyUrgency urgency) G_GNUC_MALLOC;
+void
+xfpm_notify_add_action_to_notification (XfpmNotify *notify,
+ NotifyNotification *n,
+ const gchar *id,
+ const gchar *action_label,
+ NotifyActionCallback callback,
+ gpointer data);
+void
+xfpm_notify_present_notification (XfpmNotify *notify,
+ NotifyNotification *n);
+void
+xfpm_notify_critical (XfpmNotify *notify,
+ NotifyNotification *n);
+void
+xfpm_notify_close_critical (XfpmNotify *notify);
+void
+xfpm_notify_close_normal (XfpmNotify *notify);
G_END_DECLS
diff --git a/src/xfpm-pm-helper.c b/src/xfpm-pm-helper.c
index 2d0824ca6bb87c7a338781d313a492e177044de2..752c462b23a1137843b1915df2eeea350e876441 100644
--- a/src/xfpm-pm-helper.c
+++ b/src/xfpm-pm-helper.c
@@ -31,10 +31,10 @@
#include <stdio.h>
/* XXX */
-#define EXIT_CODE_SUCCESS 0
-#define EXIT_CODE_FAILED 1
+#define EXIT_CODE_SUCCESS 0
+#define EXIT_CODE_FAILED 1
#define EXIT_CODE_ARGUMENTS_INVALID 3
-#define EXIT_CODE_INVALID_USER 4
+#define EXIT_CODE_INVALID_USER 4
#ifdef UP_BACKEND_SUSPEND_COMMAND
@@ -54,7 +54,7 @@
#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/pm-hibernate"
#endif
#ifdef BACKEND_TYPE_OPENBSD
-#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"
+#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"
#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
#endif
@@ -76,7 +76,7 @@ run (const gchar *command)
setsid ();
#endif
-#if defined (HAVE_SIGPROCMASK)
+#if defined(HAVE_SIGPROCMASK)
sigemptyset (&sigset);
sigaddset (&sigset, SIGHUP);
sigaddset (&sigset, SIGINT);
@@ -86,31 +86,31 @@ run (const gchar *command)
result = g_shell_parse_argv (command, &argc, &argv, &err);
if (result)
- {
- envp = g_new0 (gchar *, 1);
+ {
+ envp = g_new0 (gchar *, 1);
- result = g_spawn_sync (NULL, argv, envp,
- G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL |
- G_SPAWN_STDERR_TO_DEV_NULL,
- NULL, NULL, NULL, NULL, &status, &err);
+ result = g_spawn_sync (NULL, argv, envp,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+ NULL, NULL, NULL, NULL, &status, &err);
- g_strfreev (envp);
- g_strfreev (argv);
- }
+ g_strfreev (envp);
+ g_strfreev (argv);
+ }
if (!result)
- {
- if (err)
- g_error_free (err);
- return FALSE;
- }
+ {
+ if (err)
+ g_error_free (err);
+ return FALSE;
+ }
return (WIFEXITED (status) && WEXITSTATUS (status) == 0);
}
int
-main (int argc, char **argv)
+main (int argc,
+ char **argv)
{
GOptionContext *context;
gint uid;
@@ -120,7 +120,7 @@ main (int argc, char **argv)
gboolean hibernate = FALSE;
const GOptionEntry options[] = {
- { "suspend", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &suspend, "Suspend the system", NULL },
+ { "suspend", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &suspend, "Suspend the system", NULL },
{ "hibernate", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &hibernate, "Hibernate the system", NULL },
{ NULL }
};
@@ -156,7 +156,7 @@ main (int argc, char **argv)
}
/* run the command */
- if(suspend)
+ if (suspend)
{
if (run (UP_BACKEND_SUSPEND_COMMAND))
{
@@ -169,7 +169,7 @@ main (int argc, char **argv)
}
else if (hibernate)
{
- if(run (UP_BACKEND_HIBERNATE_COMMAND))
+ if (run (UP_BACKEND_HIBERNATE_COMMAND))
{
return EXIT_CODE_SUCCESS;
}
diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c
index d840850f9e4f77e7cd42164ee1a7da42ada91767..13dab70b805590f361fa1d68e9124d0c1b72c654 100644
--- a/src/xfpm-polkit.c
+++ b/src/xfpm-polkit.c
@@ -34,19 +34,20 @@
#include <procfs.h>
#endif
-static void xfpm_polkit_finalize (GObject *object);
+static void
+xfpm_polkit_finalize (GObject *object);
struct XfpmPolkitPrivate
{
- GDBusConnection *bus;
+ GDBusConnection *bus;
#ifdef HAVE_POLKIT
- GDBusProxy *proxy;
- GVariant *subject;
- GVariant *details;
+ GDBusProxy *proxy;
+ GVariant *subject;
+ GVariant *details;
- gulong destroy_id;
- gboolean subject_valid;
+ gulong destroy_id;
+ gboolean subject_valid;
#endif
};
@@ -56,7 +57,7 @@ enum
LAST_SIGNAL
};
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE_WITH_PRIVATE (XfpmPolkit, xfpm_polkit, G_TYPE_OBJECT)
@@ -70,7 +71,8 @@ G_DEFINE_TYPE_WITH_PRIVATE (XfpmPolkit, xfpm_polkit, G_TYPE_OBJECT)
*
**/
static gboolean
-get_kinfo_proc (pid_t pid, struct kinfo_proc *p)
+get_kinfo_proc (pid_t pid,
+ struct kinfo_proc *p)
{
int mib[4];
size_t len;
@@ -145,7 +147,7 @@ get_start_time_for_pid (pid_t pid)
}
g_strfreev (tokens);
- out:
+out:
g_free (filename);
g_free (contents);
@@ -155,7 +157,7 @@ get_start_time_for_pid (pid_t pid)
start_time = 0;
- if (! get_kinfo_proc (pid, &p))
+ if (!get_kinfo_proc (pid, &p))
{
g_warning ("Error obtaining start time for %d (%s)",
(gint) pid,
@@ -190,7 +192,7 @@ out:
goto out;
}
start_time = (guint64) p.pr_start.tv_sec;
- close(fd);
+ close (fd);
out:
g_free (filename);
#endif
@@ -210,9 +212,8 @@ xfpm_polkit_free_data (XfpmPolkit *polkit)
g_variant_unref (polkit->priv->details);
g_variant_unref (polkit->priv->subject);
-
- polkit->priv->details = NULL;
- polkit->priv->subject = NULL;
+ polkit->priv->details = NULL;
+ polkit->priv->subject = NULL;
polkit->priv->destroy_id = 0;
polkit->priv->subject_valid = FALSE;
@@ -221,9 +222,7 @@ xfpm_polkit_free_data (XfpmPolkit *polkit)
static gboolean
xfpm_polkit_free_data_cb (gpointer user_data)
{
- XfpmPolkit *polkit;
-
- polkit = XFPM_POLKIT (user_data);
+ XfpmPolkit *polkit = XFPM_POLKIT (user_data);
xfpm_polkit_free_data (polkit);
return FALSE;
@@ -246,13 +245,13 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
start_time = get_start_time_for_pid (pid);
- if ( G_LIKELY (start_time != 0 ) )
+ if (G_LIKELY (start_time != 0))
{
GVariant *var;
subject_kind = "unix-process";
- var = g_variant_new ("u", (guint32)pid);
+ var = g_variant_new ("u", (guint32) pid);
g_variant_builder_add (&builder, "{sv}", "pid", var);
var = g_variant_new ("t", start_time);
@@ -265,17 +264,13 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
g_warning ("Unable to create polkit subject");
}
- polkit->priv->subject =
- g_variant_ref_sink (g_variant_new ("(sa{sv})",
- subject_kind,
- &builder));
+ polkit->priv->subject = g_variant_ref_sink (g_variant_new ("(sa{sv})", subject_kind, &builder));
/**
* Polkit details, will leave it empty.
**/
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{ss}"));
- polkit->priv->details = g_variant_ref_sink (g_variant_new ("a{ss}",
- &builder));
+ polkit->priv->details = g_variant_ref_sink (g_variant_new ("a{ss}", &builder));
/*Clean these data after 1 minute*/
polkit->priv->destroy_id = g_timeout_add_seconds (60, xfpm_polkit_free_data_cb, polkit);
@@ -285,7 +280,8 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
#endif /*HAVE_POLKIT*/
static gboolean
-xfpm_polkit_check_auth_intern (XfpmPolkit *polkit, const gchar *action_id)
+xfpm_polkit_check_auth_intern (XfpmPolkit *polkit,
+ const gchar *action_id)
{
#ifdef HAVE_POLKIT
GError *error = NULL;
@@ -322,14 +318,14 @@ xfpm_polkit_check_auth_intern (XfpmPolkit *polkit, const gchar *action_id)
-1, NULL,
&error);
- if ( G_LIKELY (var) )
+ if (G_LIKELY (var))
{
g_variant_get (var, "((bba{ss}))",
&is_authorized, NULL, NULL);
g_variant_unref (var);
}
- else if ( error )
+ else if (error)
{
g_warning ("'CheckAuthorization' failed with %s", error->message);
g_error_free (error);
@@ -345,15 +341,15 @@ xfpm_polkit_check_auth_intern (XfpmPolkit *polkit, const gchar *action_id)
#ifdef HAVE_POLKIT
static void
xfpm_polkit_changed_cb (GDBusProxy *proxy,
- gchar *sender_name,
- gchar *signal_name,
- GVariant *parameters,
+ gchar *sender_name,
+ gchar *signal_name,
+ GVariant *parameters,
XfpmPolkit *polkit)
{
if (g_strcmp0 (signal_name, "Changed") == 0)
{
XFPM_DEBUG ("Auth changed");
- g_signal_emit (G_OBJECT (polkit), signals [AUTH_CHANGED], 0);
+ g_signal_emit (G_OBJECT (polkit), signals[AUTH_CHANGED], 0);
}
}
#endif
@@ -365,14 +361,13 @@ xfpm_polkit_class_init (XfpmPolkitClass *klass)
object_class->finalize = xfpm_polkit_finalize;
- signals [AUTH_CHANGED] =
- g_signal_new ("auth-changed",
- XFPM_TYPE_POLKIT,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmPolkitClass, auth_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0, G_TYPE_NONE);
+ signals[AUTH_CHANGED] = g_signal_new ("auth-changed",
+ XFPM_TYPE_POLKIT,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmPolkitClass, auth_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0, G_TYPE_NONE);
}
static void
@@ -383,16 +378,16 @@ xfpm_polkit_init (XfpmPolkit *polkit)
polkit->priv = xfpm_polkit_get_instance_private (polkit);
#ifdef HAVE_POLKIT
- polkit->priv->destroy_id = 0;
- polkit->priv->subject_valid = FALSE;
- polkit->priv->proxy = NULL;
- polkit->priv->subject = NULL;
- polkit->priv->details = NULL;
+ polkit->priv->destroy_id = 0;
+ polkit->priv->subject_valid = FALSE;
+ polkit->priv->proxy = NULL;
+ polkit->priv->subject = NULL;
+ polkit->priv->details = NULL;
#endif /*HAVE_POLKIT*/
polkit->priv->bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
- if ( error )
+ if (error)
{
g_critical ("Error getting system bus connection : %s", error->message);
g_error_free (error);
@@ -400,20 +395,18 @@ xfpm_polkit_init (XfpmPolkit *polkit)
}
#ifdef HAVE_POLKIT
- polkit->priv->proxy =
- g_dbus_proxy_new_sync (polkit->priv->bus,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
- NULL,
- "org.freedesktop.PolicyKit1",
- "/org/freedesktop/PolicyKit1/Authority",
- "org.freedesktop.PolicyKit1.Authority",
- NULL,
- NULL);
-
- if (G_LIKELY (polkit->priv->proxy) )
+ polkit->priv->proxy = g_dbus_proxy_new_sync (polkit->priv->bus,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ NULL,
+ "org.freedesktop.PolicyKit1",
+ "/org/freedesktop/PolicyKit1/Authority",
+ "org.freedesktop.PolicyKit1.Authority",
+ NULL,
+ NULL);
+
+ if (G_LIKELY (polkit->priv->proxy))
{
- g_signal_connect (polkit->priv->proxy, "g-signal",
- G_CALLBACK (xfpm_polkit_changed_cb), polkit);
+ g_signal_connect (polkit->priv->proxy, "g-signal", G_CALLBACK (xfpm_polkit_changed_cb), polkit);
}
else
{
@@ -421,35 +414,31 @@ xfpm_polkit_init (XfpmPolkit *polkit)
}
#endif /*HAVE_POLKIT*/
-out:
- ;
+out:;
}
static void
xfpm_polkit_finalize (GObject *object)
{
- XfpmPolkit *polkit;
-
- polkit = XFPM_POLKIT (object);
+ XfpmPolkit *polkit = XFPM_POLKIT (object);
#ifdef HAVE_POLKIT
- if ( polkit->priv->proxy )
+ if (polkit->priv->proxy)
{
- g_signal_handlers_disconnect_by_func (polkit->priv->proxy,
- G_CALLBACK (xfpm_polkit_changed_cb), polkit);
+ g_signal_handlers_disconnect_by_func (polkit->priv->proxy, xfpm_polkit_changed_cb, polkit);
g_object_unref (polkit->priv->proxy);
}
- if ( polkit->priv->subject_valid )
+ if (polkit->priv->subject_valid)
{
xfpm_polkit_free_data (polkit);
- if (polkit->priv->destroy_id != 0 )
+ if (polkit->priv->destroy_id != 0)
g_source_remove (polkit->priv->destroy_id);
}
#endif /*HAVE_POLKIT*/
- if ( polkit->priv->bus )
+ if (polkit->priv->bus)
g_object_unref (polkit->priv->bus);
G_OBJECT_CLASS (xfpm_polkit_parent_class)->finalize (object);
@@ -460,7 +449,7 @@ xfpm_polkit_get (void)
{
static gpointer xfpm_polkit_obj = NULL;
- if ( G_LIKELY (xfpm_polkit_obj) )
+ if (G_LIKELY (xfpm_polkit_obj))
{
g_object_ref (xfpm_polkit_obj);
}
@@ -474,7 +463,8 @@ xfpm_polkit_get (void)
}
gboolean
-xfpm_polkit_check_auth (XfpmPolkit *polkit, const gchar *action_id)
+xfpm_polkit_check_auth (XfpmPolkit *polkit,
+ const gchar *action_id)
{
#ifdef HAVE_POLKIT
xfpm_polkit_init_data (polkit);
diff --git a/src/xfpm-polkit.h b/src/xfpm-polkit.h
index 56389c22966993440443c061827ccce6e29440c3..5311bea0327a6a2486a16f9076ef670ab0d818b7 100644
--- a/src/xfpm-polkit.h
+++ b/src/xfpm-polkit.h
@@ -25,29 +25,32 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_POLKIT (xfpm_polkit_get_type () )
-#define XFPM_POLKIT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_POLKIT, XfpmPolkit))
-#define XFPM_IS_POLKIT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_POLKIT))
+#define XFPM_TYPE_POLKIT (xfpm_polkit_get_type ())
+#define XFPM_POLKIT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_POLKIT, XfpmPolkit))
+#define XFPM_IS_POLKIT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_POLKIT))
typedef struct XfpmPolkitPrivate XfpmPolkitPrivate;
typedef struct
{
- GObject parent;
- XfpmPolkitPrivate *priv;
+ GObject parent;
+ XfpmPolkitPrivate *priv;
} XfpmPolkit;
typedef struct
{
- GObjectClass parent_class;
- void (*auth_changed) (XfpmPolkit *polkit);
+ GObjectClass parent_class;
+ void (*auth_changed) (XfpmPolkit *polkit);
} XfpmPolkitClass;
-GType xfpm_polkit_get_type (void) G_GNUC_CONST;
-XfpmPolkit *xfpm_polkit_get (void);
-gboolean xfpm_polkit_check_auth (XfpmPolkit *polkit,
- const gchar *action_id);
+GType
+xfpm_polkit_get_type (void) G_GNUC_CONST;
+XfpmPolkit *
+xfpm_polkit_get (void);
+gboolean
+xfpm_polkit_check_auth (XfpmPolkit *polkit,
+ const gchar *action_id);
G_END_DECLS
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index 0527dd010aa3e046cfc162fce5cd041161d79564..a0b3cf65c2363ff4ed42aa1bbda282f88fb02bc0 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -51,71 +51,80 @@
#include <gdk/gdkx.h>
#endif
-static void xfpm_power_finalize (GObject *object);
+static void
+xfpm_power_finalize (GObject *object);
-static void xfpm_power_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void
+xfpm_power_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
-static void xfpm_power_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+static void
+xfpm_power_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
-static void xfpm_power_change_presentation_mode (XfpmPower *power,
- gboolean presentation_mode);
+static void
+xfpm_power_change_presentation_mode (XfpmPower *power,
+ gboolean presentation_mode);
-static void xfpm_power_toggle_screensaver (XfpmPower *power);
+static void
+xfpm_power_toggle_screensaver (XfpmPower *power);
-static void xfpm_power_dbus_class_init (XfpmPowerClass * klass);
-static void xfpm_power_dbus_init (XfpmPower *power);
-static void xfpm_power_can_suspend (XfpmPower *power,
- gboolean *can_suspend,
- gboolean *auth_suspend);
-static void xfpm_power_can_hibernate (XfpmPower *power,
- gboolean *can_hibernate,
- gboolean *auth_hibernate);
+static void
+xfpm_power_dbus_class_init (XfpmPowerClass *klass);
+static void
+xfpm_power_dbus_init (XfpmPower *power);
+static void
+xfpm_power_can_suspend (XfpmPower *power,
+ gboolean *can_suspend,
+ gboolean *auth_suspend);
+static void
+xfpm_power_can_hibernate (XfpmPower *power,
+ gboolean *can_hibernate,
+ gboolean *auth_hibernate);
struct XfpmPowerPrivate
{
- GDBusConnection *bus;
+ GDBusConnection *bus;
- UpClient *upower;
+ UpClient *upower;
- GHashTable *hash;
+ GHashTable *hash;
- XfceSystemd *systemd;
- XfceConsolekit *console;
- XfpmInhibit *inhibit;
- XfpmXfconf *conf;
+ XfceSystemd *systemd;
+ XfceConsolekit *console;
+ XfpmInhibit *inhibit;
+ XfpmXfconf *conf;
XfpmBatteryCharge overall_state;
- gboolean critical_action_done;
+ gboolean critical_action_done;
- XfpmDpms *dpms;
- XfceScreensaver *screensaver;
- gboolean presentation_mode;
- gboolean inhibited;
+ XfpmDpms *dpms;
+ XfceScreensaver *screensaver;
+ gboolean presentation_mode;
+ gboolean inhibited;
- XfpmNotify *notify;
+ XfpmNotify *notify;
#ifdef HAVE_POLKIT
- XfpmPolkit *polkit;
+ XfpmPolkit *polkit;
#endif
/* Properties */
- gboolean on_low_battery;
- gboolean lid_is_present;
- gboolean lid_is_closed;
- gboolean on_battery;
- gchar *daemon_version;
+ gboolean on_low_battery;
+ gboolean lid_is_present;
+ gboolean lid_is_closed;
+ gboolean on_battery;
+ gchar *daemon_version;
/**
* Warning dialog to use when notification daemon
* doesn't support actions.
**/
- GtkWidget *dialog;
+ GtkWidget *dialog;
};
enum
@@ -144,25 +153,26 @@ enum
LAST_SIGNAL
};
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE_WITH_PRIVATE (XfpmPower, xfpm_power, G_TYPE_OBJECT)
static void
-xfpm_power_check_power (XfpmPower *power, gboolean on_battery)
+xfpm_power_check_power (XfpmPower *power,
+ gboolean on_battery)
{
- if (on_battery != power->priv->on_battery )
+ if (on_battery != power->priv->on_battery)
{
GList *list;
- g_signal_emit (G_OBJECT (power), signals [ON_BATTERY_CHANGED], 0, on_battery);
+ g_signal_emit (G_OBJECT (power), signals[ON_BATTERY_CHANGED], 0, on_battery);
if (power->priv->dpms != NULL)
xfpm_dpms_set_on_battery (power->priv->dpms, on_battery);
- /* Dismiss critical notifications on battery state changes */
+ /* Dismiss critical notifications on battery state changes */
xfpm_notify_close_critical (power->priv->notify);
power->priv->on_battery = on_battery;
@@ -178,16 +188,18 @@ xfpm_power_check_power (XfpmPower *power, gboolean on_battery)
}
static void
-xfpm_power_check_lid (XfpmPower *power, gboolean present, gboolean closed)
+xfpm_power_check_lid (XfpmPower *power,
+ gboolean present,
+ gboolean closed)
{
power->priv->lid_is_present = present;
if (power->priv->lid_is_present)
{
- if (closed != power->priv->lid_is_closed )
+ if (closed != power->priv->lid_is_closed)
{
power->priv->lid_is_closed = closed;
- g_signal_emit (G_OBJECT (power), signals [LID_CHANGED], 0, power->priv->lid_is_closed);
+ g_signal_emit (G_OBJECT (power), signals[LID_CHANGED], 0, power->priv->lid_is_closed);
}
}
}
@@ -222,7 +234,9 @@ xfpm_power_get_properties (XfpmPower *power)
}
static void
-xfpm_power_report_error (XfpmPower *power, const gchar *error, const gchar *icon_name)
+xfpm_power_report_error (XfpmPower *power,
+ const gchar *error,
+ const gchar *icon_name)
{
xfpm_notify_show_notification (power->priv->notify,
_("Power Manager"),
@@ -232,7 +246,9 @@ xfpm_power_report_error (XfpmPower *power, const gchar *error, const gchar *icon
}
static void
-xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
+xfpm_power_sleep (XfpmPower *power,
+ const gchar *sleep_time,
+ gboolean force)
{
GError *error = NULL;
gboolean lock_screen;
@@ -251,16 +267,17 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
_("An application is currently disabling the automatic sleep. "
"Doing this action now may damage the working state of this application.\n"
"Are you sure you want to hibernate the system?"));
- ret = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
+ ret = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
- if ( !ret || ret == GTK_RESPONSE_NO)
- return;
+ if (!ret || ret == GTK_RESPONSE_NO)
+ return;
}
- g_signal_emit (G_OBJECT (power), signals [SLEEPING], 0);
- /* Get the current brightness level so we can use it after we suspend */
- brightness = xfpm_brightness_new();
+ g_signal_emit (G_OBJECT (power), signals[SLEEPING], 0);
+
+ /* Get the current brightness level so we can use it after we suspend */
+ brightness = xfpm_brightness_new ();
if (brightness != NULL)
xfpm_brightness_get_level (brightness, &brightness_level);
@@ -268,7 +285,7 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
LOCK_SCREEN_ON_SLEEP, &lock_screen,
NULL);
- if ( lock_screen )
+ if (lock_screen)
{
if (!xfce_screensaver_lock (power->priv->screensaver) && !force)
{
@@ -287,7 +304,7 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
ret = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
- if ( !ret || ret == GTK_RESPONSE_NO)
+ if (!ret || ret == GTK_RESPONSE_NO)
{
if (brightness != NULL)
g_object_unref (brightness);
@@ -341,9 +358,9 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
g_clear_error (&error);
}
- if ( error )
+ if (error)
{
- if ( g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_NO_REPLY) )
+ if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_NO_REPLY))
{
XFPM_DEBUG ("D-Bus time out, but should be harmless");
}
@@ -354,10 +371,12 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
}
}
- g_signal_emit (G_OBJECT (power), signals [WAKING_UP], 0);
- /* Check/update any changes while we slept */
+ g_signal_emit (G_OBJECT (power), signals[WAKING_UP], 0);
+
+ /* Check/update any changes while we slept */
xfpm_power_get_properties (power);
- /* Restore the brightness level from before we suspended */
+
+ /* Restore the brightness level from before we suspended */
if (brightness != NULL)
{
xfpm_brightness_set_level (brightness, brightness_level);
@@ -368,7 +387,7 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
static void
xfpm_power_hibernate_clicked (XfpmPower *power)
{
- gtk_widget_destroy (power->priv->dialog );
+ gtk_widget_destroy (power->priv->dialog);
power->priv->dialog = NULL;
xfpm_power_sleep (power, "Hibernate", TRUE);
}
@@ -376,7 +395,7 @@ xfpm_power_hibernate_clicked (XfpmPower *power)
static void
xfpm_power_suspend_clicked (XfpmPower *power)
{
- gtk_widget_destroy (power->priv->dialog );
+ gtk_widget_destroy (power->priv->dialog);
power->priv->dialog = NULL;
xfpm_power_sleep (power, "Suspend", TRUE);
}
@@ -384,9 +403,9 @@ xfpm_power_suspend_clicked (XfpmPower *power)
static void
xfpm_power_shutdown_clicked (XfpmPower *power)
{
- gtk_widget_destroy (power->priv->dialog );
+ gtk_widget_destroy (power->priv->dialog);
power->priv->dialog = NULL;
- g_signal_emit (G_OBJECT (power), signals [SHUTDOWN], 0);
+ g_signal_emit (G_OBJECT (power), signals[SHUTDOWN], 0);
}
static XfpmBatteryCharge
@@ -403,13 +422,11 @@ xfpm_power_get_current_charge_state (XfpmPower *power)
gboolean power_supply;
g_object_get (G_OBJECT (lp->data),
- "charge-status", &battery_charge,
- "device-type", &type,
- "ac-online", &power_supply,
- NULL);
- if ( type != UP_DEVICE_KIND_BATTERY &&
- type != UP_DEVICE_KIND_UPS &&
- power_supply != TRUE)
+ "charge-status", &battery_charge,
+ "device-type", &type,
+ "ac-online", &power_supply,
+ NULL);
+ if (type != UP_DEVICE_KIND_BATTERY && type != UP_DEVICE_KIND_UPS && power_supply != TRUE)
continue;
max_charge_status = MAX (max_charge_status, battery_charge);
@@ -420,41 +437,44 @@ xfpm_power_get_current_charge_state (XfpmPower *power)
}
static void
-xfpm_power_notify_action_callback (NotifyNotification *n, gchar *action, XfpmPower *power)
+xfpm_power_notify_action_callback (NotifyNotification *n,
+ gchar *action,
+ XfpmPower *power)
{
if (g_strcmp0 (action, "Shutdown") == 0)
- g_signal_emit (G_OBJECT (power), signals [SHUTDOWN], 0);
+ g_signal_emit (G_OBJECT (power), signals[SHUTDOWN], 0);
else
xfpm_power_sleep (power, action, TRUE);
}
static void
-xfpm_power_add_actions_to_notification (XfpmPower *power, NotifyNotification *n)
+xfpm_power_add_actions_to_notification (XfpmPower *power,
+ NotifyNotification *n)
{
gboolean can_method, auth_method;
xfpm_power_can_hibernate (power, &can_method, &auth_method);
if (can_method && auth_method)
{
- xfpm_notify_add_action_to_notification(
- power->priv->notify,
- n,
- "Hibernate",
- _("Hibernate the system"),
- (NotifyActionCallback)xfpm_power_notify_action_callback,
- power);
+ xfpm_notify_add_action_to_notification (
+ power->priv->notify,
+ n,
+ "Hibernate",
+ _("Hibernate the system"),
+ (NotifyActionCallback) xfpm_power_notify_action_callback,
+ power);
}
xfpm_power_can_suspend (power, &can_method, &auth_method);
if (can_method && auth_method)
{
- xfpm_notify_add_action_to_notification(
- power->priv->notify,
- n,
- "Suspend",
- _("Suspend the system"),
- (NotifyActionCallback)xfpm_power_notify_action_callback,
- power);
+ xfpm_notify_add_action_to_notification (
+ power->priv->notify,
+ n,
+ "Suspend",
+ _("Suspend the system"),
+ (NotifyActionCallback) xfpm_power_notify_action_callback,
+ power);
}
if (power->priv->systemd != NULL)
@@ -469,18 +489,18 @@ xfpm_power_add_actions_to_notification (XfpmPower *power, NotifyNotification *n)
if (can_method && auth_method)
{
xfpm_notify_add_action_to_notification (
- power->priv->notify,
- n,
- "Shutdown",
- _("Shutdown the system"),
- (NotifyActionCallback)xfpm_power_notify_action_callback,
- power);
+ power->priv->notify,
+ n,
+ "Shutdown",
+ _("Shutdown the system"),
+ (NotifyActionCallback) xfpm_power_notify_action_callback,
+ power);
}
-
}
static void
-xfpm_power_show_critical_action_notification (XfpmPower *power, XfpmBattery *battery)
+xfpm_power_show_critical_action_notification (XfpmPower *power,
+ XfpmBattery *battery)
{
const gchar *message;
NotifyNotification *n;
@@ -488,16 +508,14 @@ xfpm_power_show_critical_action_notification (XfpmPower *power, XfpmBattery *bat
message = _("System is running on low power. "\
"Save your work to avoid losing data");
- n =
- xfpm_notify_new_notification (power->priv->notify,
- _("Power Manager"),
- message,
- xfpm_battery_get_icon_name (battery),
- XFPM_NOTIFY_CRITICAL);
+ n = xfpm_notify_new_notification (power->priv->notify,
+ _("Power Manager"),
+ message,
+ xfpm_battery_get_icon_name (battery),
+ XFPM_NOTIFY_CRITICAL);
xfpm_power_add_actions_to_notification (power, n);
xfpm_notify_critical (power->priv->notify, n);
-
}
static void
@@ -581,7 +599,7 @@ xfpm_power_show_critical_action_gtk (XfpmPower *power)
g_signal_connect_object (dialog, "destroy",
G_CALLBACK (xfpm_power_close_critical_dialog), power, G_CONNECT_SWAPPED);
- if ( power->priv->dialog )
+ if (power->priv->dialog)
{
gtk_widget_destroy (power->priv->dialog);
power->priv->dialog = NULL;
@@ -591,7 +609,8 @@ xfpm_power_show_critical_action_gtk (XfpmPower *power)
}
static void
-xfpm_power_show_critical_action (XfpmPower *power, XfpmBattery *battery)
+xfpm_power_show_critical_action (XfpmPower *power,
+ XfpmBattery *battery)
{
gboolean supports_actions;
@@ -599,27 +618,29 @@ xfpm_power_show_critical_action (XfpmPower *power, XfpmBattery *battery)
"actions", &supports_actions,
NULL);
- if ( supports_actions )
+ if (supports_actions)
xfpm_power_show_critical_action_notification (power, battery);
else
xfpm_power_show_critical_action_gtk (power);
}
static void
-xfpm_power_process_critical_action (XfpmPower *power, XfpmShutdownRequest req)
+xfpm_power_process_critical_action (XfpmPower *power,
+ XfpmShutdownRequest req)
{
- if ( req == XFPM_ASK )
- g_signal_emit (G_OBJECT (power), signals [ASK_SHUTDOWN], 0);
- else if ( req == XFPM_DO_SUSPEND )
+ if (req == XFPM_ASK)
+ g_signal_emit (G_OBJECT (power), signals[ASK_SHUTDOWN], 0);
+ else if (req == XFPM_DO_SUSPEND)
xfpm_power_sleep (power, "Suspend", TRUE);
- else if ( req == XFPM_DO_HIBERNATE )
+ else if (req == XFPM_DO_HIBERNATE)
xfpm_power_sleep (power, "Hibernate", TRUE);
- else if ( req == XFPM_DO_SHUTDOWN )
- g_signal_emit (G_OBJECT (power), signals [SHUTDOWN], 0);
+ else if (req == XFPM_DO_SHUTDOWN)
+ g_signal_emit (G_OBJECT (power), signals[SHUTDOWN], 0);
}
static void
-xfpm_power_system_on_critical_power (XfpmPower *power, XfpmBattery *battery)
+xfpm_power_system_on_critical_power (XfpmPower *power,
+ XfpmBattery *battery)
{
XfpmShutdownRequest critical_action;
@@ -630,7 +651,7 @@ xfpm_power_system_on_critical_power (XfpmPower *power, XfpmBattery *battery)
XFPM_DEBUG ("System is running on low power");
XFPM_DEBUG_ENUM (critical_action, XFPM_TYPE_SHUTDOWN_REQUEST, "Critical battery action");
- if ( critical_action == XFPM_DO_NOTHING )
+ if (critical_action == XFPM_DO_NOTHING)
{
xfpm_power_show_critical_action (power, battery);
}
@@ -649,7 +670,8 @@ xfpm_power_system_on_critical_power (XfpmPower *power, XfpmBattery *battery)
}
static void
-xfpm_power_battery_charge_changed_cb (XfpmBattery *battery, XfpmPower *power)
+xfpm_power_battery_charge_changed_cb (XfpmBattery *battery,
+ XfpmPower *power)
{
gboolean notify;
XfpmBatteryCharge battery_charge;
@@ -668,40 +690,38 @@ xfpm_power_battery_charge_changed_cb (XfpmBattery *battery, XfpmPower *power)
power->priv->overall_state = current_charge;
- if ( current_charge == XFPM_BATTERY_CHARGE_CRITICAL && power->priv->on_battery)
+ if (current_charge == XFPM_BATTERY_CHARGE_CRITICAL && power->priv->on_battery)
{
xfpm_power_system_on_critical_power (power, battery);
power->priv->on_low_battery = TRUE;
- g_signal_emit (G_OBJECT (power), signals [LOW_BATTERY_CHANGED], 0, power->priv->on_low_battery);
+ g_signal_emit (G_OBJECT (power), signals[LOW_BATTERY_CHANGED], 0, power->priv->on_low_battery);
return;
}
- if ( power->priv->on_low_battery )
+ if (power->priv->on_low_battery)
{
power->priv->on_low_battery = FALSE;
- g_signal_emit (G_OBJECT (power), signals [LOW_BATTERY_CHANGED], 0, power->priv->on_low_battery);
+ g_signal_emit (G_OBJECT (power), signals[LOW_BATTERY_CHANGED], 0, power->priv->on_low_battery);
}
g_object_get (G_OBJECT (power->priv->conf),
GENERAL_NOTIFICATION_CFG, ¬ify,
NULL);
- if ( power->priv->on_battery )
+ if (power->priv->on_battery)
{
- if ( current_charge == XFPM_BATTERY_CHARGE_LOW )
+ if (current_charge == XFPM_BATTERY_CHARGE_LOW)
{
- if ( notify )
+ if (notify)
xfpm_notify_show_notification (power->priv->notify,
- _("Power Manager"),
- _("System is running on low power"),
- xfpm_battery_get_icon_name (battery),
- XFPM_NOTIFY_NORMAL);
-
- }
- else if ( battery_charge == XFPM_BATTERY_CHARGE_LOW )
+ _("Power Manager"), _("System is running on low power"),
+ xfpm_battery_get_icon_name (battery),
+ XFPM_NOTIFY_NORMAL);
+ }
+ else if (battery_charge == XFPM_BATTERY_CHARGE_LOW)
{
- if ( notify )
+ if (notify)
{
gchar *msg;
gchar *time_str;
@@ -714,18 +734,18 @@ xfpm_power_battery_charge_changed_cb (XfpmBattery *battery, XfpmPower *power)
xfpm_notify_show_notification (power->priv->notify,
- _("Power Manager"),
- msg,
- xfpm_battery_get_icon_name (battery),
- XFPM_NOTIFY_NORMAL);
+ _("Power Manager"),
+ msg,
+ xfpm_battery_get_icon_name (battery),
+ XFPM_NOTIFY_NORMAL);
g_free (msg);
g_free (time_str);
}
}
}
- /*Current charge is okay now, then close the dialog*/
- if ( power->priv->dialog )
+ /*Current charge is okay now, then close the dialog*/
+ if (power->priv->dialog)
{
gtk_widget_destroy (power->priv->dialog);
power->priv->dialog = NULL;
@@ -733,27 +753,28 @@ xfpm_power_battery_charge_changed_cb (XfpmBattery *battery, XfpmPower *power)
}
static void
-xfpm_power_add_device (UpDevice *device, XfpmPower *power)
+xfpm_power_add_device (UpDevice *device,
+ XfpmPower *power)
{
guint device_type = UP_DEVICE_KIND_UNKNOWN;
- const gchar *object_path = up_device_get_object_path(device);
+ const gchar *object_path = up_device_get_object_path (device);
- /* hack, this depends on XFPM_DEVICE_TYPE_* being in sync with UP_DEVICE_KIND_* */
+ /* hack, this depends on XFPM_DEVICE_TYPE_* being in sync with UP_DEVICE_KIND_* */
g_object_get (device,
"kind", &device_type,
NULL);
- XFPM_DEBUG ("'%s' device added", up_device_kind_to_string(device_type));
+ XFPM_DEBUG ("'%s' device added", up_device_kind_to_string (device_type));
- if ( device_type == UP_DEVICE_KIND_BATTERY ||
- device_type == UP_DEVICE_KIND_UPS ||
- device_type == UP_DEVICE_KIND_MOUSE ||
- device_type == UP_DEVICE_KIND_KEYBOARD ||
- device_type == UP_DEVICE_KIND_PHONE)
+ if (device_type == UP_DEVICE_KIND_BATTERY
+ || device_type == UP_DEVICE_KIND_UPS
+ || device_type == UP_DEVICE_KIND_MOUSE
+ || device_type == UP_DEVICE_KIND_KEYBOARD
+ || device_type == UP_DEVICE_KIND_PHONE)
{
GtkWidget *battery;
- XFPM_DEBUG( "Battery device type '%s' detected at: %s",
- up_device_kind_to_string(device_type), object_path);
+ XFPM_DEBUG ("Battery device type '%s' detected at: %s",
+ up_device_kind_to_string (device_type), object_path);
battery = g_object_ref_sink (xfpm_battery_new ());
xfpm_battery_monitor_device (XFPM_BATTERY (battery),
@@ -772,27 +793,30 @@ xfpm_power_get_power_devices (XfpmPower *power)
GPtrArray *array = up_client_get_devices2 (power->priv->upower);
guint i;
- if ( array )
+ if (array)
{
- for ( i = 0; i < array->len; i++)
+ for (i = 0; i < array->len; i++)
{
UpDevice *device = g_ptr_array_index (array, i);
- const gchar *object_path = up_device_get_object_path(device);
+ const gchar *object_path = up_device_get_object_path (device);
XFPM_DEBUG ("Power device detected at : %s", object_path);
xfpm_power_add_device (device, power);
}
- g_ptr_array_free (array, TRUE);
+ g_ptr_array_free (array, TRUE);
}
}
static void
-xfpm_power_remove_device (XfpmPower *power, const gchar *object_path)
+xfpm_power_remove_device (XfpmPower *power,
+ const gchar *object_path)
{
g_hash_table_remove (power->priv->hash, object_path);
}
static void
-xfpm_power_inhibit_changed_cb (XfpmInhibit *inhibit, gboolean is_inhibit, XfpmPower *power)
+xfpm_power_inhibit_changed_cb (XfpmInhibit *inhibit,
+ gboolean is_inhibit,
+ XfpmPower *power)
{
/* no change, exit */
if (power->priv->inhibited == is_inhibit)
@@ -823,13 +847,17 @@ xfpm_power_changed_cb (UpClient *upower,
}
static void
-xfpm_power_device_added_cb (UpClient *upower, UpDevice *device, XfpmPower *power)
+xfpm_power_device_added_cb (UpClient *upower,
+ UpDevice *device,
+ XfpmPower *power)
{
xfpm_power_add_device (device, power);
}
static void
-xfpm_power_device_removed_cb (UpClient *upower, const gchar *object_path, XfpmPower *power)
+xfpm_power_device_removed_cb (UpClient *upower,
+ const gchar *object_path,
+ XfpmPower *power)
{
xfpm_power_remove_device (power, object_path);
}
@@ -844,74 +872,67 @@ xfpm_power_class_init (XfpmPowerClass *klass)
object_class->get_property = xfpm_power_get_property;
object_class->set_property = xfpm_power_set_property;
- signals [ON_BATTERY_CHANGED] =
- g_signal_new ("on-battery-changed",
- XFPM_TYPE_POWER,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmPowerClass, on_battery_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-
- signals [LOW_BATTERY_CHANGED] =
- g_signal_new ("low-battery-changed",
- XFPM_TYPE_POWER,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmPowerClass, low_battery_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-
- signals [LID_CHANGED] =
- g_signal_new ("lid-changed",
- XFPM_TYPE_POWER,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmPowerClass, lid_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-
- signals [WAKING_UP] =
- g_signal_new ("waking-up",
- XFPM_TYPE_POWER,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmPowerClass, waking_up),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0, G_TYPE_NONE);
-
- signals [SLEEPING] =
- g_signal_new ("sleeping",
- XFPM_TYPE_POWER,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmPowerClass, sleeping),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0, G_TYPE_NONE);
-
- signals [ASK_SHUTDOWN] =
- g_signal_new ("ask-shutdown",
- XFPM_TYPE_POWER,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmPowerClass, ask_shutdown),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0, G_TYPE_NONE);
-
- signals [SHUTDOWN] =
- g_signal_new ("shutdown",
- XFPM_TYPE_POWER,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmPowerClass, shutdown),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0, G_TYPE_NONE);
-
-#define XFPM_PARAM_FLAGS ( G_PARAM_READWRITE \
- | G_PARAM_CONSTRUCT \
- | G_PARAM_STATIC_NAME \
- | G_PARAM_STATIC_NICK \
- | G_PARAM_STATIC_BLURB)
+ signals[ON_BATTERY_CHANGED] = g_signal_new ("on-battery-changed",
+ XFPM_TYPE_POWER,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmPowerClass, on_battery_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+ signals[LOW_BATTERY_CHANGED] = g_signal_new ("low-battery-changed",
+ XFPM_TYPE_POWER,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmPowerClass, low_battery_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+ signals[LID_CHANGED] = g_signal_new ("lid-changed",
+ XFPM_TYPE_POWER,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmPowerClass, lid_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+ signals[WAKING_UP] = g_signal_new ("waking-up",
+ XFPM_TYPE_POWER,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmPowerClass, waking_up),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0, G_TYPE_NONE);
+
+ signals[SLEEPING] = g_signal_new ("sleeping",
+ XFPM_TYPE_POWER,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmPowerClass, sleeping),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0, G_TYPE_NONE);
+
+ signals[ASK_SHUTDOWN] = g_signal_new ("ask-shutdown",
+ XFPM_TYPE_POWER,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmPowerClass, ask_shutdown),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0, G_TYPE_NONE);
+
+ signals[SHUTDOWN] = g_signal_new ("shutdown",
+ XFPM_TYPE_POWER,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfpmPowerClass, shutdown),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0, G_TYPE_NONE);
+
+#define XFPM_PARAM_FLAGS (G_PARAM_READWRITE \
+ | G_PARAM_CONSTRUCT \
+ | G_PARAM_STATIC_NAME \
+ | G_PARAM_STATIC_NICK \
+ | G_PARAM_STATIC_BLURB)
g_object_class_install_property (object_class,
PROP_ON_BATTERY,
@@ -981,34 +1002,34 @@ xfpm_power_init (XfpmPower *power)
power->priv = xfpm_power_get_instance_private (power);
power->priv->hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
- power->priv->lid_is_present = FALSE;
- power->priv->lid_is_closed = FALSE;
- power->priv->on_battery = FALSE;
- power->priv->on_low_battery = FALSE;
- power->priv->daemon_version = NULL;
- power->priv->dialog = NULL;
- power->priv->overall_state = XFPM_BATTERY_CHARGE_OK;
+ power->priv->lid_is_present = FALSE;
+ power->priv->lid_is_closed = FALSE;
+ power->priv->on_battery = FALSE;
+ power->priv->on_low_battery = FALSE;
+ power->priv->daemon_version = NULL;
+ power->priv->dialog = NULL;
+ power->priv->overall_state = XFPM_BATTERY_CHARGE_OK;
power->priv->critical_action_done = FALSE;
- power->priv->dpms = xfpm_dpms_new ();
+ power->priv->dpms = xfpm_dpms_new ();
- power->priv->presentation_mode = FALSE;
+ power->priv->presentation_mode = FALSE;
power->priv->inhibit = xfpm_inhibit_new ();
- power->priv->notify = xfpm_notify_new ();
- power->priv->conf = xfpm_xfconf_new ();
- power->priv->upower = up_client_new ();
+ power->priv->notify = xfpm_notify_new ();
+ power->priv->conf = xfpm_xfconf_new ();
+ power->priv->upower = up_client_new ();
power->priv->screensaver = xfce_screensaver_new ();
power->priv->systemd = NULL;
power->priv->console = NULL;
- if ( LOGIND_RUNNING () )
+ if (LOGIND_RUNNING ())
power->priv->systemd = xfce_systemd_get ();
else
power->priv->console = xfce_consolekit_get ();
#ifdef HAVE_POLKIT
- power->priv->polkit = xfpm_polkit_get ();
+ power->priv->polkit = xfpm_polkit_get ();
#endif
g_signal_connect_object (power->priv->inhibit, "has-inhibit-changed",
@@ -1016,7 +1037,7 @@ xfpm_power_init (XfpmPower *power)
power->priv->bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
- if ( error )
+ if (error)
{
g_critical ("Unable to connect to the system bus : %s", error->message);
g_error_free (error);
@@ -1039,7 +1060,7 @@ out:
/*
* Emit org.freedesktop.PowerManagement session signals on startup
*/
- g_signal_emit (G_OBJECT (power), signals [ON_BATTERY_CHANGED], 0, power->priv->on_battery);
+ g_signal_emit (G_OBJECT (power), signals[ON_BATTERY_CHANGED], 0, power->priv->on_battery);
}
static void
@@ -1119,9 +1140,9 @@ xfpm_power_finalize (GObject *object)
if (power->priv->upower != NULL)
g_object_unref (power->priv->upower);
- if ( power->priv->systemd != NULL )
+ if (power->priv->systemd != NULL)
g_object_unref (power->priv->systemd);
- if ( power->priv->console != NULL )
+ if (power->priv->console != NULL)
g_object_unref (power->priv->console);
g_object_unref (power->priv->bus);
@@ -1133,19 +1154,19 @@ xfpm_power_finalize (GObject *object)
#endif
if (power->priv->dpms != NULL)
- g_object_unref(power->priv->dpms);
+ g_object_unref (power->priv->dpms);
G_OBJECT_CLASS (xfpm_power_parent_class)->finalize (object);
}
-static XfpmPower*
+static XfpmPower *
xfpm_power_new (void)
{
- XfpmPower *power = XFPM_POWER(g_object_new (XFPM_TYPE_POWER, NULL));
+ XfpmPower *power = XFPM_POWER (g_object_new (XFPM_TYPE_POWER, NULL));
- xfconf_g_property_bind (xfpm_xfconf_get_channel(power->priv->conf),
+ xfconf_g_property_bind (xfpm_xfconf_get_channel (power->priv->conf),
XFPM_PROPERTIES_PREFIX PRESENTATION_MODE, G_TYPE_BOOLEAN,
- G_OBJECT(power), PRESENTATION_MODE);
+ G_OBJECT (power), PRESENTATION_MODE);
return power;
}
@@ -1155,7 +1176,7 @@ xfpm_power_get (void)
{
static gpointer xfpm_power_object = NULL;
- if ( G_LIKELY (xfpm_power_object != NULL ) )
+ if (G_LIKELY (xfpm_power_object != NULL))
{
g_object_ref (xfpm_power_object);
}
@@ -1168,17 +1189,22 @@ xfpm_power_get (void)
return XFPM_POWER (xfpm_power_object);
}
-void xfpm_power_suspend (XfpmPower *power, gboolean force)
+void
+xfpm_power_suspend (XfpmPower *power,
+ gboolean force)
{
xfpm_power_sleep (power, "Suspend", force);
}
-void xfpm_power_hibernate (XfpmPower *power, gboolean force)
+void
+xfpm_power_hibernate (XfpmPower *power,
+ gboolean force)
{
xfpm_power_sleep (power, "Hibernate", force);
}
-gboolean xfpm_power_has_battery (XfpmPower *power)
+gboolean
+xfpm_power_has_battery (XfpmPower *power)
{
GList *list;
gboolean ret = FALSE;
@@ -1188,8 +1214,7 @@ gboolean xfpm_power_has_battery (XfpmPower *power)
{
UpDeviceKind type;
type = xfpm_battery_get_device_type (XFPM_BATTERY (lp->data));
- if ( type == UP_DEVICE_KIND_BATTERY ||
- type == UP_DEVICE_KIND_UPS )
+ if (type == UP_DEVICE_KIND_BATTERY || type == UP_DEVICE_KIND_UPS)
{
ret = TRUE;
break;
@@ -1204,7 +1229,7 @@ static void
xfpm_power_toggle_screensaver (XfpmPower *power)
{
#ifdef ENABLE_X11
- Display* display;
+ Display *display;
static int timeout = -2, interval, prefer_blanking, allow_exposures;
if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
@@ -1216,16 +1241,16 @@ xfpm_power_toggle_screensaver (XfpmPower *power)
if (power->priv->presentation_mode || power->priv->inhibited)
{
if (timeout == -2)
- XGetScreenSaver(display, &timeout, &interval, &prefer_blanking, &allow_exposures);
+ XGetScreenSaver (display, &timeout, &interval, &prefer_blanking, &allow_exposures);
XFPM_DEBUG ("Disabling screensaver, timeout stored: %d", timeout);
- XSetScreenSaver(display, 0, interval, prefer_blanking, allow_exposures);
+ XSetScreenSaver (display, 0, interval, prefer_blanking, allow_exposures);
XSync (display, FALSE);
}
else if (timeout != -2)
{
XFPM_DEBUG ("Enabling screensaver, timeout restored: %d", timeout);
- XSetScreenSaver(display, timeout, interval, prefer_blanking, allow_exposures);
+ XSetScreenSaver (display, timeout, interval, prefer_blanking, allow_exposures);
XSync (display, FALSE);
timeout = -2;
}
@@ -1233,7 +1258,8 @@ xfpm_power_toggle_screensaver (XfpmPower *power)
}
static void
-xfpm_power_change_presentation_mode (XfpmPower *power, gboolean presentation_mode)
+xfpm_power_change_presentation_mode (XfpmPower *power,
+ gboolean presentation_mode)
{
/* no change, exit */
if (power->priv->presentation_mode == presentation_mode)
@@ -1269,50 +1295,60 @@ xfpm_power_is_in_presentation_mode (XfpmPower *power)
* DBus server implementation for org.freedesktop.PowerManagement
*
*/
-static gboolean xfpm_power_dbus_shutdown (XfpmPower *power,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_power_dbus_shutdown (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_power_dbus_reboot (XfpmPower *power,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_power_dbus_reboot (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_power_dbus_hibernate (XfpmPower * power,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_power_dbus_hibernate (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_power_dbus_suspend (XfpmPower * power,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_power_dbus_suspend (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_power_dbus_can_reboot (XfpmPower * power,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_power_dbus_can_reboot (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_power_dbus_can_shutdown (XfpmPower * power,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_power_dbus_can_shutdown (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_power_dbus_can_hibernate (XfpmPower * power,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_power_dbus_can_hibernate (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_power_dbus_can_suspend (XfpmPower * power,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_power_dbus_can_suspend (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_power_dbus_get_on_battery (XfpmPower * power,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_power_dbus_get_on_battery (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
-static gboolean xfpm_power_dbus_get_low_battery (XfpmPower * power,
- GDBusMethodInvocation *invocation,
- gpointer user_data);
+static gboolean
+xfpm_power_dbus_get_low_battery (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data);
#include "org.freedesktop.PowerManagement.h"
static void
-xfpm_power_dbus_class_init (XfpmPowerClass * klass)
+xfpm_power_dbus_class_init (XfpmPowerClass *klass)
{
}
@@ -1370,9 +1406,10 @@ xfpm_power_dbus_init (XfpmPower *power)
power, G_CONNECT_SWAPPED);
}
-static gboolean xfpm_power_dbus_shutdown (XfpmPower *power,
- GDBusMethodInvocation *invocation,
- gpointer user_data)
+static gboolean
+xfpm_power_dbus_shutdown (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data)
{
GError *error = NULL;
gboolean can_shutdown, auth_shutdown;
@@ -1414,9 +1451,9 @@ static gboolean xfpm_power_dbus_shutdown (XfpmPower *power,
}
static gboolean
-xfpm_power_dbus_reboot (XfpmPower *power,
- GDBusMethodInvocation *invocation,
- gpointer user_data)
+xfpm_power_dbus_reboot (XfpmPower *power,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data)
{
GError *error = NULL;
gboolean can_reboot, auth_reboot;
@@ -1458,7 +1495,7 @@ xfpm_power_dbus_reboot (XfpmPower *power,
}
static gboolean
-xfpm_power_dbus_hibernate (XfpmPower * power,
+xfpm_power_dbus_hibernate (XfpmPower *power,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
@@ -1492,7 +1529,7 @@ xfpm_power_dbus_hibernate (XfpmPower * power,
}
static gboolean
-xfpm_power_dbus_suspend (XfpmPower * power,
+xfpm_power_dbus_suspend (XfpmPower *power,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
@@ -1526,7 +1563,7 @@ xfpm_power_dbus_suspend (XfpmPower * power,
}
static gboolean
-xfpm_power_dbus_can_reboot (XfpmPower * power,
+xfpm_power_dbus_can_reboot (XfpmPower *power,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
@@ -1549,7 +1586,7 @@ xfpm_power_dbus_can_reboot (XfpmPower * power,
}
static gboolean
-xfpm_power_dbus_can_shutdown (XfpmPower * power,
+xfpm_power_dbus_can_shutdown (XfpmPower *power,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
@@ -1572,7 +1609,7 @@ xfpm_power_dbus_can_shutdown (XfpmPower * power,
}
static gboolean
-xfpm_power_dbus_can_hibernate (XfpmPower * power,
+xfpm_power_dbus_can_hibernate (XfpmPower *power,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
@@ -1585,7 +1622,7 @@ xfpm_power_dbus_can_hibernate (XfpmPower * power,
}
static gboolean
-xfpm_power_dbus_can_suspend (XfpmPower * power,
+xfpm_power_dbus_can_suspend (XfpmPower *power,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
@@ -1599,7 +1636,7 @@ xfpm_power_dbus_can_suspend (XfpmPower * power,
}
static gboolean
-xfpm_power_dbus_get_on_battery (XfpmPower * power,
+xfpm_power_dbus_get_on_battery (XfpmPower *power,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
@@ -1611,7 +1648,7 @@ xfpm_power_dbus_get_on_battery (XfpmPower * power,
}
static gboolean
-xfpm_power_dbus_get_low_battery (XfpmPower * power,
+xfpm_power_dbus_get_low_battery (XfpmPower *power,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
diff --git a/src/xfpm-power.h b/src/xfpm-power.h
index 9c7a3ee1acd57451ff191d508d7da9ce6d772611..323a92396f2b61150bad91249d2be8ce9abcab66 100644
--- a/src/xfpm-power.h
+++ b/src/xfpm-power.h
@@ -29,42 +29,48 @@ G_BEGIN_DECLS
#define LOGIND_RUNNING() (access ("/run/systemd/seats/", F_OK) >= 0)
-#define XFPM_TYPE_POWER (xfpm_power_get_type () )
-#define XFPM_POWER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_POWER, XfpmPower))
-#define XFPM_IS_POWER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_POWER))
+#define XFPM_TYPE_POWER (xfpm_power_get_type ())
+#define XFPM_POWER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_POWER, XfpmPower))
+#define XFPM_IS_POWER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_POWER))
typedef struct XfpmPowerPrivate XfpmPowerPrivate;
typedef struct
{
- GObject parent;
- XfpmPowerPrivate *priv;
+ GObject parent;
+ XfpmPowerPrivate *priv;
} XfpmPower;
typedef struct
{
- GObjectClass parent_class;
- void (*on_battery_changed) (XfpmPower *power,
- gboolean on_battery);
- void (*low_battery_changed) (XfpmPower *power,
- gboolean low_battery);
- void (*lid_changed) (XfpmPower *power,
- gboolean lid_is_closed);
- void (*waking_up) (XfpmPower *power);
- void (*sleeping) (XfpmPower *power);
- void (*ask_shutdown) (XfpmPower *power);
- void (*shutdown) (XfpmPower *power);
+ GObjectClass parent_class;
+ void (*on_battery_changed) (XfpmPower *power,
+ gboolean on_battery);
+ void (*low_battery_changed) (XfpmPower *power,
+ gboolean low_battery);
+ void (*lid_changed) (XfpmPower *power,
+ gboolean lid_is_closed);
+ void (*waking_up) (XfpmPower *power);
+ void (*sleeping) (XfpmPower *power);
+ void (*ask_shutdown) (XfpmPower *power);
+ void (*shutdown) (XfpmPower *power);
} XfpmPowerClass;
-GType xfpm_power_get_type (void) G_GNUC_CONST;
-XfpmPower *xfpm_power_get (void);
-void xfpm_power_suspend (XfpmPower *power,
- gboolean force);
-void xfpm_power_hibernate (XfpmPower *power,
- gboolean force);
-gboolean xfpm_power_has_battery (XfpmPower *power);
-gboolean xfpm_power_is_in_presentation_mode (XfpmPower *power);
+GType
+xfpm_power_get_type (void) G_GNUC_CONST;
+XfpmPower *
+xfpm_power_get (void);
+void
+xfpm_power_suspend (XfpmPower *power,
+ gboolean force);
+void
+xfpm_power_hibernate (XfpmPower *power,
+ gboolean force);
+gboolean
+xfpm_power_has_battery (XfpmPower *power);
+gboolean
+xfpm_power_is_in_presentation_mode (XfpmPower *power);
G_END_DECLS
diff --git a/src/xfpm-ppd.c b/src/xfpm-ppd.c
index 9dfe9b333a4ea541951c94009919e35095066b21..17984393ea180944c9d8fb7a843f87a32a6206ac 100644
--- a/src/xfpm-ppd.c
+++ b/src/xfpm-ppd.c
@@ -32,17 +32,20 @@
#include <gio/gio.h>
-static void xfpm_ppd_finalize (GObject *object);
+static void
+xfpm_ppd_finalize (GObject *object);
-static void xfpm_ppd_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void
+xfpm_ppd_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
-static void xfpm_ppd_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+static void
+xfpm_ppd_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
struct _XfpmPPD
{
@@ -68,7 +71,8 @@ enum
G_DEFINE_FINAL_TYPE (XfpmPPD, xfpm_ppd, G_TYPE_OBJECT)
static void
-xfpm_ppd_set_active_profile (XfpmPPD *ppd, const gchar *profile)
+xfpm_ppd_set_active_profile (XfpmPPD *ppd,
+ const gchar *profile)
{
GVariant *var = NULL;
GError *error = NULL;
@@ -94,7 +98,9 @@ xfpm_ppd_set_active_profile (XfpmPPD *ppd, const gchar *profile)
}
static void
-xfpm_ppd_on_battery_changed (XfpmPower *power, gboolean on_battery, XfpmPPD *ppd)
+xfpm_ppd_on_battery_changed (XfpmPower *power,
+ gboolean on_battery,
+ XfpmPPD *ppd)
{
xfpm_ppd_set_active_profile (ppd, on_battery ? ppd->profile_on_battery : ppd->profile_on_ac);
}
@@ -105,7 +111,6 @@ xfpm_ppd_class_init (XfpmPPDClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = xfpm_ppd_finalize;
-
object_class->get_property = xfpm_ppd_get_property;
object_class->set_property = xfpm_ppd_set_property;
@@ -157,9 +162,11 @@ xfpm_ppd_get_property (GObject *object,
case PROP_PROFILE_ON_AC:
g_value_set_string (value, ppd->profile_on_ac);
break;
+
case PROP_PROFILE_ON_BATTERY:
g_value_set_string (value, ppd->profile_on_battery);
break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -186,12 +193,14 @@ xfpm_ppd_set_property (GObject *object,
if (!on_battery)
xfpm_ppd_set_active_profile (ppd, ppd->profile_on_ac);
break;
+
case PROP_PROFILE_ON_BATTERY:
g_free (ppd->profile_on_battery);
ppd->profile_on_battery = g_value_dup_string (value);
if (on_battery)
xfpm_ppd_set_active_profile (ppd, ppd->profile_on_battery);
break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
diff --git a/src/xfpm-ppd.h b/src/xfpm-ppd.h
index 0577bdf43c92cef35ca588d7ae076635a8fcdd02..09ce8e2a9c1fbb6c738c4aeb4830377adc31bb3b 100644
--- a/src/xfpm-ppd.h
+++ b/src/xfpm-ppd.h
@@ -28,7 +28,8 @@ G_BEGIN_DECLS
#define XFPM_TYPE_PPD (xfpm_ppd_get_type ())
G_DECLARE_FINAL_TYPE (XfpmPPD, xfpm_ppd, XFPM, PPD, GObject)
-XfpmPPD *xfpm_ppd_new (void);
+XfpmPPD *
+xfpm_ppd_new (void);
G_END_DECLS
diff --git a/src/xfpm-suspend.c b/src/xfpm-suspend.c
index 5f913785114c419e21fd84c4310a1009e154c49f..e85d54fe96bf396abdd7735489b76bb57ca14f93 100644
--- a/src/xfpm-suspend.c
+++ b/src/xfpm-suspend.c
@@ -32,14 +32,16 @@
#ifdef BACKEND_TYPE_FREEBSD
static gchar *
-get_string_sysctl (GError **err, const gchar *format, ...)
+get_string_sysctl (GError **err,
+ const gchar *format,
+ ...)
{
va_list args;
gchar *name;
size_t value_len;
gchar *str = NULL;
- g_return_val_if_fail(format != NULL, FALSE);
+ g_return_val_if_fail (format != NULL, FALSE);
va_start (args, format);
name = g_strdup_vprintf (format, args);
@@ -51,16 +53,17 @@ get_string_sysctl (GError **err, const gchar *format, ...)
if (sysctlbyname (name, str, &value_len, NULL, 0) == 0)
str[value_len] = 0;
- else {
+ else
+ {
g_free (str);
str = NULL;
}
}
if (!str)
- g_set_error (err, 0, 0, "%s", g_strerror(errno));
+ g_set_error (err, 0, 0, "%s", g_strerror (errno));
- g_free(name);
+ g_free (name);
return str;
}
@@ -69,11 +72,10 @@ static gboolean
freebsd_supports_sleep_state (const gchar *state)
{
gboolean ret = FALSE;
- gchar *sleep_states;
+ gchar *sleep_states = get_string_sysctl (NULL, "hw.acpi.supported_sleep_state");
- sleep_states = get_string_sysctl (NULL, "hw.acpi.supported_sleep_state");
-
- if (sleep_states != NULL) {
+ if (sleep_states != NULL)
+ {
if (strstr (sleep_states, state) != NULL)
ret = TRUE;
}
diff --git a/src/xfpm-suspend.h b/src/xfpm-suspend.h
index 8d16df07d26d4aed7055b6052df5d80b3509d5df..445690e4157d5f4ab393b5d41ce333113681c42e 100644
--- a/src/xfpm-suspend.h
+++ b/src/xfpm-suspend.h
@@ -29,8 +29,11 @@ typedef enum
XFPM_HIBERNATE,
} XfpmActionType;
-gboolean xfpm_suspend_can_suspend (void);
-gboolean xfpm_suspend_can_hibernate (void);
-gboolean xfpm_suspend_try_action (XfpmActionType type);
+gboolean
+xfpm_suspend_can_suspend (void);
+gboolean
+xfpm_suspend_can_hibernate (void);
+gboolean
+xfpm_suspend_try_action (XfpmActionType type);
#endif /* __XFPM_SUSPEND_H */
diff --git a/src/xfpm-xfconf.c b/src/xfpm-xfconf.c
index 098522fd070f8aefb40bf3012be73f295371be4f..d81a004f4f366540a4a80f7b911b78ca5332df4f 100644
--- a/src/xfpm-xfconf.c
+++ b/src/xfpm-xfconf.c
@@ -33,12 +33,13 @@
#include <libxfce4util/libxfce4util.h>
-static void xfpm_xfconf_finalize (GObject *object);
+static void
+xfpm_xfconf_finalize (GObject *object);
struct XfpmXfconfPrivate
{
- XfconfChannel *channel;
- GValue *values;
+ XfconfChannel *channel;
+ GValue *values;
};
enum
@@ -99,20 +100,16 @@ xfpm_xfconf_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- XfpmXfconf *conf;
- GValue *dst;
-
- conf = XFPM_XFCONF (object);
-
- dst = conf->priv->values + prop_id;
+ XfpmXfconf *conf = XFPM_XFCONF (object);
+ GValue *dst = conf->priv->values + prop_id;
- if ( !G_IS_VALUE (dst) )
+ if (!G_IS_VALUE (dst))
{
g_value_init (dst, pspec->value_type);
g_param_value_set_default (pspec, dst);
}
- if ( g_param_values_cmp (pspec, value, dst) != 0)
+ if (g_param_values_cmp (pspec, value, dst) != 0)
{
g_value_copy (value, dst);
g_object_notify (object, pspec->name);
@@ -125,14 +122,10 @@ xfpm_xfconf_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- XfpmXfconf *conf;
- GValue *src;
+ XfpmXfconf *conf = XFPM_XFCONF (object);
+ GValue *src = conf->priv->values + prop_id;
- conf = XFPM_XFCONF (object);
-
- src = conf->priv->values + prop_id;
-
- if ( G_VALUE_HOLDS (src, pspec->value_type) )
+ if (G_VALUE_HOLDS (src, pspec->value_type))
g_value_copy (src, value);
else
g_param_value_set_default (pspec, value);
@@ -141,14 +134,11 @@ xfpm_xfconf_get_property (GObject *object,
static void
xfpm_xfconf_load (XfpmXfconf *conf)
{
- GParamSpec **specs;
- GValue value = G_VALUE_INIT;
guint nspecs;
- guint i;
-
- specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (conf), &nspecs);
+ GParamSpec **specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (conf), &nspecs);
+ GValue value = G_VALUE_INIT;
- for ( i = 0; i < nspecs; i++)
+ for (guint i = 0; i < nspecs; i++)
{
gchar *prop_name;
prop_name = g_strdup_printf ("%s%s", XFPM_PROPERTIES_PREFIX, specs[i]->name);
@@ -156,7 +146,7 @@ xfpm_xfconf_load (XfpmXfconf *conf)
if (conf->priv->channel != NULL)
{
- if ( !xfconf_channel_get_property (conf->priv->channel, prop_name, &value) )
+ if (!xfconf_channel_get_property (conf->priv->channel, prop_name, &value))
{
XFPM_DEBUG ("Using default configuration for %s", specs[i]->name);
g_param_value_set_default (specs[i], &value);
@@ -171,27 +161,31 @@ xfpm_xfconf_load (XfpmXfconf *conf)
g_object_set_property (G_OBJECT (conf), specs[i]->name, &value);
g_value_unset (&value);
}
+
g_free (specs);
}
static void
-xfpm_xfconf_property_changed_cb (XfconfChannel *channel, gchar *property,
- GValue *value, XfpmXfconf *conf)
+xfpm_xfconf_property_changed_cb (XfconfChannel *channel,
+ gchar *property,
+ GValue *value,
+ XfpmXfconf *conf)
{
/*FIXME: Set default for this key*/
- if ( G_VALUE_TYPE(value) == G_TYPE_INVALID )
+ if (G_VALUE_TYPE (value) == G_TYPE_INVALID)
return;
- if ( !g_str_has_prefix (property, XFPM_PROPERTIES_PREFIX) || strlen (property) <= strlen (XFPM_PROPERTIES_PREFIX) )
+ if (!g_str_has_prefix (property, XFPM_PROPERTIES_PREFIX)
+ || strlen (property) <= strlen (XFPM_PROPERTIES_PREFIX))
return;
/* We handle presentation mode in xfpm-power directly */
- if ( g_strcmp0 (property, XFPM_PROPERTIES_PREFIX PRESENTATION_MODE) == 0 )
+ if (g_strcmp0 (property, XFPM_PROPERTIES_PREFIX PRESENTATION_MODE) == 0)
return;
/* We handle brightness switch in xfpm-backlight directly */
- if ( g_strcmp0 (property, XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH) == 0 ||
- g_strcmp0 (property, XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE) == 0 )
+ if (g_strcmp0 (property, XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH) == 0
+ || g_strcmp0 (property, XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE) == 0)
return;
XFPM_DEBUG ("Property modified: %s\n", property);
@@ -202,11 +196,10 @@ xfpm_xfconf_property_changed_cb (XfconfChannel *channel, gchar *property,
static void
xfpm_xfconf_class_init (XfpmXfconfClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS(klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->set_property = xfpm_xfconf_set_property;
object_class->get_property = xfpm_xfconf_get_property;
-
object_class->finalize = xfpm_xfconf_finalize;
/**
@@ -365,12 +358,12 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
LID_TRIGGER_LOCK_SCREEN,
G_PARAM_READWRITE));
- /**
+ /**
* XfpmXfconf::brightness-level-on-ac
**/
g_object_class_install_property (object_class,
PROP_BRIGHTNESS_LEVEL_ON_AC,
- g_param_spec_uint (BRIGHTNESS_LEVEL_ON_AC,
+ g_param_spec_uint (BRIGHTNESS_LEVEL_ON_AC,
NULL, NULL,
1,
100,
@@ -382,7 +375,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
**/
g_object_class_install_property (object_class,
PROP_BRIGHTNESS_LEVEL_ON_BATTERY,
- g_param_spec_uint (BRIGHTNESS_LEVEL_ON_BATTERY,
+ g_param_spec_uint (BRIGHTNESS_LEVEL_ON_BATTERY,
NULL, NULL,
1,
100,
@@ -459,10 +452,10 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
**/
g_object_class_install_property (object_class,
PROP_DPMS_SLEEP_MODE,
- g_param_spec_string (DPMS_SLEEP_MODE,
- NULL, NULL,
- "Standby",
- G_PARAM_READWRITE));
+ g_param_spec_string (DPMS_SLEEP_MODE,
+ NULL, NULL,
+ "Standby",
+ G_PARAM_READWRITE));
/**
* XfpmXfconf::inactivity-on-ac
@@ -541,19 +534,19 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
**/
g_object_class_install_property (object_class,
PROP_PROFILE_ON_AC,
- g_param_spec_string (PROFILE_ON_AC,
- NULL, NULL,
- NULL,
- G_PARAM_READWRITE));
+ g_param_spec_string (PROFILE_ON_AC,
+ NULL, NULL,
+ NULL,
+ G_PARAM_READWRITE));
/**
* XfpmXfconf::profile-on-ac
**/
g_object_class_install_property (object_class,
PROP_PROFILE_ON_BATTERY,
- g_param_spec_string (PROFILE_ON_BATTERY,
- NULL, NULL,
- NULL,
- G_PARAM_READWRITE));
+ g_param_spec_string (PROFILE_ON_BATTERY,
+ NULL, NULL,
+ NULL,
+ G_PARAM_READWRITE));
/**
@@ -613,10 +606,10 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
**/
g_object_class_install_property (object_class,
PROP_HEARTBEAT_COMMAND,
- g_param_spec_string (HEARTBEAT_COMMAND,
- NULL, NULL,
- NULL,
- G_PARAM_READWRITE));
+ g_param_spec_string (HEARTBEAT_COMMAND,
+ NULL, NULL,
+ NULL,
+ G_PARAM_READWRITE));
/**
* XfpmXfconf::show-panel-label
@@ -647,10 +640,9 @@ xfpm_xfconf_init (XfpmXfconf *conf)
GError *error = NULL;
conf->priv = xfpm_xfconf_get_instance_private (conf);
-
conf->priv->values = g_new0 (GValue, N_PROPERTIES);
- if ( !xfconf_init (&error) )
+ if (!xfconf_init (&error))
{
if (error)
{
@@ -668,25 +660,21 @@ xfpm_xfconf_init (XfpmXfconf *conf)
}
static void
-xfpm_xfconf_finalize(GObject *object)
+xfpm_xfconf_finalize (GObject *object)
{
- XfpmXfconf *conf;
- guint i;
+ XfpmXfconf *conf = XFPM_XFCONF (object);
- conf = XFPM_XFCONF (object);
-
- for ( i = 0; i < N_PROPERTIES; i++)
+ for (guint i = 0; i < N_PROPERTIES; i++)
{
- if ( G_IS_VALUE (conf->priv->values + i) )
+ if (G_IS_VALUE (conf->priv->values + i))
g_value_unset (conf->priv->values + i);
}
g_free (conf->priv->values);
-
if (conf->priv->channel != NULL)
xfconf_shutdown ();
- G_OBJECT_CLASS (xfpm_xfconf_parent_class)->finalize(object);
+ G_OBJECT_CLASS (xfpm_xfconf_parent_class)->finalize (object);
}
XfpmXfconf *
@@ -694,7 +682,7 @@ xfpm_xfconf_new (void)
{
static gpointer xfpm_xfconf_object = NULL;
- if ( G_LIKELY (xfpm_xfconf_object != NULL) )
+ if (G_LIKELY (xfpm_xfconf_object != NULL))
{
g_object_ref (xfpm_xfconf_object);
}
diff --git a/src/xfpm-xfconf.h b/src/xfpm-xfconf.h
index 39c99453c35a687a329b80ac6d63f3215f632f44..7e2d8451f664567e82ca1c249c981ec8a1c6faa1 100644
--- a/src/xfpm-xfconf.h
+++ b/src/xfpm-xfconf.h
@@ -26,26 +26,29 @@
G_BEGIN_DECLS
-#define XFPM_TYPE_XFCONF (xfpm_xfconf_get_type () )
-#define XFPM_XFCONF(o) (G_TYPE_CHECK_INSTANCE_CAST((o), XFPM_TYPE_XFCONF, XfpmXfconf))
-#define XFPM_IS_XFCONF(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), XFPM_TYPE_XFCONF))
+#define XFPM_TYPE_XFCONF (xfpm_xfconf_get_type ())
+#define XFPM_XFCONF(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_XFCONF, XfpmXfconf))
+#define XFPM_IS_XFCONF(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_XFCONF))
-typedef struct XfpmXfconfPrivate XfpmXfconfPrivate;
+typedef struct XfpmXfconfPrivate XfpmXfconfPrivate;
typedef struct
{
- GObject parent;
- XfpmXfconfPrivate *priv;
+ GObject parent;
+ XfpmXfconfPrivate *priv;
} XfpmXfconf;
typedef struct
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
} XfpmXfconfClass;
-GType xfpm_xfconf_get_type (void) G_GNUC_CONST;
-XfpmXfconf *xfpm_xfconf_new (void);
-XfconfChannel *xfpm_xfconf_get_channel (XfpmXfconf *conf);
+GType
+xfpm_xfconf_get_type (void) G_GNUC_CONST;
+XfpmXfconf *
+xfpm_xfconf_new (void);
+XfconfChannel *
+xfpm_xfconf_get_channel (XfpmXfconf *conf);
G_END_DECLS