From f0d113cd7438643f1661d0a0fde4db6ffff5063a Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali.slackware@gmail.com>
Date: Wed, 27 May 2009 08:42:07 +0000
Subject: [PATCH] *: use G_HAVE_ISO_VARARGS to chech if variadic macro
are supported *: Fix some English mispelling mistakes in the doc.
(Old svn revision: 7426)
---
ChangeLog | 4 ++++
doc/C/xfce4-power-manager.html | 30 +++++++++++++++---------------
doc/C/xfce4-power-manager.xml.in | 14 +++++++-------
src/xfpm-debug.c | 4 ++--
src/xfpm-debug.h | 19 ++-----------------
src/xfpm-main.c | 10 +++++-----
6 files changed, 35 insertions(+), 46 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 70e97bec..deba5412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27: 11:00 Ali aliov@xfce.org
+ *: use G_HAVE_ISO_VARARGS to chech if variadic macro are supported
+ *: Fix some English mispelling mistakes in the doc.
+
2009-05-26 10:00 Ali aliov@xfce.org
*: Provide the possibility to disable the brightness popup
indicator in a hidden option.
diff --git a/doc/C/xfce4-power-manager.html b/doc/C/xfce4-power-manager.html
index 2846f3f0..34c3dd1a 100644
--- a/doc/C/xfce4-power-manager.html
+++ b/doc/C/xfce4-power-manager.html
@@ -20,7 +20,7 @@
Causes the running power manager to restart.
</p></dd><dt><span class="term"><span class="keycap"><strong>--quit</strong></span></span></dt><dd><p>
Causes any running instance of the power manager to exit.
- </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-menu"></a>Context menu</h3></div></div></div><div class="figure"><a name="id2968838"></a><p class="title"><b>Figure 1. Context menu</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-context-menu.png" alt="Context menu"></div></div></div></div><p><br class="figure-break"></p><p>
+ </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-menu"></a>Context menu</h3></div></div></div><div class="figure"><a name="id2882617"></a><p class="title"><b>Figure 1. Context menu</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-context-menu.png" alt="Context menu"></div></div></div></div><p><br class="figure-break"></p><p>
The context menu is popped up when you click on the icon placed in your notification area, say a battery or an adapter icon, it contains some useful options like suspend/hibernate,
display information of the battery device open the settings dialog, it contains as well option to inhibit the power manager, if enabled, the power manager will not attempt
to dim the screen or switch off the monitor.
@@ -31,15 +31,15 @@ if it is enabled in the settings dialog, only critical actions are processed.</p
</p></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-configuration"></a>Power Manager Configuration</h2></div></div></div><p>
In this section we will explain in details the possible configuration of the power manager running on laptop computer, please note that the configurations are different when
the power manager is running on a desktop computer, for example you will not have LCD brightness or so.
- </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-general"></a>General options</h3></div></div></div><div class="figure"><a name="id2973768"></a><p class="title"><b>Figure 2. General settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-general-settings.png" alt="General settings"></div></div></div></div><p><br class="figure-break"></p><p>
+ </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-general"></a>General options</h3></div></div></div><div class="figure"><a name="id2887548"></a><p class="title"><b>Figure 2. General settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-general-settings.png" alt="General settings"></div></div></div></div><p><br class="figure-break"></p><p>
-</p><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>Notification area:</strong></span></span></dt><dd><p>The notification area settings allows you to control when the icon placed in your notification are is shown, you can set it to be always visible, for battery devices
+</p><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>Notification area:</strong></span></span></dt><dd><p>The notification area settings allows you to control the behaviour of the icon placed in your notification are, you can set it to be always visible, for battery devices
you can select the icon to be visible only when your are running on battery for example.</p></dd><dt><span class="term"><span class="keycap"><strong>Keyboard special keys:</strong></span></span></dt><dd><p>
Enables you to specify which key will trigger which action, these keys are not found on all the systems, in the screen shot for example the hibernate key is missing,
since the screen shot was taken on a computer which doesn't have this key.
The default action of all these keys is set to do nothing.
- </p></dd><dt><span class="term"><span class="keycap"><strong>Monitor power management control:</strong></span></span></dt><dd><p>Enable/Disable Display Power Management Signaling (DPMS).</p></dd><dt><span class="term"><span class="keycap"><strong>Power manager Notification:</strong></span></span></dt><dd><p>If the notification of a battery status change are annoying you, you can always disabling them by unselecting the checkbox, please note this
- doesn't apply on the notification that the power manager sends them to notify the user of error or when the system is running out of power,
+ </p></dd><dt><span class="term"><span class="keycap"><strong>Monitor power management control:</strong></span></span></dt><dd><p>Enable/Disable Display Power Management Signaling (DPMS).</p></dd><dt><span class="term"><span class="keycap"><strong>Power manager Notification:</strong></span></span></dt><dd><p>If the notification of a battery status change are annoying you, you can always disable them by unselecting the checkbox, please note this
+ doesn't apply on the notification that the power manager sends to notify the user of error or when the system is running out of power,
so it is safe to disable them.</p></dd></dl></div><p>
</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-on-ac"></a>Running on AC power</h3></div></div></div><p>
The on AC power tab contains self explanatory options such as lid close system idle and monitor sleep configurations.
@@ -47,16 +47,16 @@ if it is enabled in the settings dialog, only critical actions are processed.</p
The on battery tab is only shown on systems that have battery devices, it contains the same options as the AC power tabs plus two other important options
</p><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>Power is critical</strong></span></span></dt><dd><p>
- With this option you can tell the power manager what it should do if the system is running on low power, if this option is disabled and the computer
+ With this option you can specify the action taken by the power manager in case the system is running on low power, if this option is disabled and the computer
is running on low battery power, the power manager will display a warning message.
</p></dd><dt><span class="term"><span class="keycap"><strong>Prefer power savings over performance:</strong></span></span></dt><dd><p>
- This is the power profile when running on battery, enabling this allows you to run more time on your battery power, but this might be over the performance of your system,
- enabling this option is always a good idea.
+ This is the power profile when running on battery, with this option you battery will last more when running on battery power,
+ having this option enabled is always a good idea.
</p></dd></dl></div><p>
-</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-extended"></a>Extended options</h3></div></div></div><div class="figure"><a name="id2969134"></a><p class="title"><b>Figure 3. Extended settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-extended-settings.png" alt="Extended settings"></div></div></div></div><p><br class="figure-break"></p><p>
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-extended"></a>Extended options</h3></div></div></div><div class="figure"><a name="id2882912"></a><p class="title"><b>Figure 3. Extended settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-extended-settings.png" alt="Extended settings"></div></div></div></div><p><br class="figure-break"></p><p>
</p><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>Inactivity sleep mode:</strong></span></span></dt><dd><p>You can select the inactivity sleep action to be taken by the power manger when the system is idle for a interval of time specified by you,
either on ac power or on battery power, expired. Of course if you disable idle timeout those settings will have no effects.</p></dd><dt><span class="term"><span class="keycap"><strong>Monitor sleep mode:</strong></span></span></dt><dd><p>
- DPMS to modes before switching off the monitor, standby and suspend, they are technically different, this option is provided for convenience.
+ DPMS sleep modes before switching off the monitor, standby and suspend, they are technically different, this option is provided for convenience.
</p></dd><dt><span class="term"><span class="keycap"><strong>Computer on low power level:</strong></span></span></dt><dd><p>
Ideally when the battery giving the main power to the computer reaches 10 percent of charge the computer can be considered on low power, but for some broken or old
batteries between 10 percent and a power cut there is a matter of minutes if not seconds, so you can adjust the level at which your computer will be considered on low power.
@@ -86,7 +86,7 @@ Since <strong class="application"><code>xfce4-power-manager</code></strong> reli
</p><pre class="programlisting">xfconf-query -c <strong class="application"><code>xfce4-power-manager</code></strong> -n -p "/<strong class="application"><code>xfce4-power-manager</code></strong>/show-brightness-popup" -t bool -s false</pre><p>
- </p></dd></dl></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-plugins"></a> Panel plugins </h2></div></div></div><div class="figure"><a name="id2973343"></a><p class="title"><b>Figure 4. Brightness plugin</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-brightness-plugin.png" alt="Brightness plugin"></div></div></div></div><p><br class="figure-break"></p><p>
+ </p></dd></dl></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-plugins"></a> Panel plugins </h2></div></div></div><div class="figure"><a name="id2887121"></a><p class="title"><b>Figure 4. Brightness plugin</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-brightness-plugin.png" alt="Brightness plugin"></div></div></div></div><p><br class="figure-break"></p><p>
<strong class="application"><code>xfce4-power-manager</code></strong> version 0.8.0r07387 includes one panel plugin for LCD brightness control, possible other plugins might be added for future releases, the usage of the brightness plugin
is simple, just add the plugin to the panel same way you add any other plugin, then click on the plugin it will pop up a slider that you move/scroll on it to change
the brightness level of your screen, of course the plugin will not work on a system with no back light panel.
@@ -121,17 +121,17 @@ Ideally these details should go in a technical guide not the user guide but we n
</p><span class="keycap"><strong>Power management DBus interface.</strong></span><p>
-</p><div class="table"><a name="id3016706"></a><p class="title"><b>Table 1. Standard methods (org.freedesktop.PowerManagement):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard methods (org.freedesktop.PowerManagement):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns=""><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Input parameter</th><th align="left">Return Values</th><th align="left">Errors</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">CanHibernate</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is able to hibernate</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">CanSuspend</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is able to suspend</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetOnBattery</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is running on battery</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetLowBattery</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is running on low battery</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Hibernate</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Suspend</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Shutdown</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead></table></div></div><p><br class="table-break">
+</p><div class="table"><a name="id2930483"></a><p class="title"><b>Table 1. Standard methods (org.freedesktop.PowerManagement):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard methods (org.freedesktop.PowerManagement):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns=""><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Input parameter</th><th align="left">Return Values</th><th align="left">Errors</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">CanHibernate</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is able to hibernate</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">CanSuspend</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is able to suspend</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetOnBattery</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is running on battery</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetLowBattery</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is running on low battery</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Hibernate</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Suspend</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Shutdown</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead></table></div></div><p><br class="table-break">
- </p><div class="table"><a name="id3016958"></a><p class="title"><b>Table 2. Standard signals (org.freedesktop.PowerManagement):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard signals (org.freedesktop.PowerManagement):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Values</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">OnBatteryChanged</th><th align="left">bool</th><th align="left">whether on battery status changed</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">LowBatteryChanged</th><th align="left">bool</th><th align="left">whether on low battery status changed</th></tr></thead></table></div></div><p><br class="table-break">
+ </p><div class="table"><a name="id2930736"></a><p class="title"><b>Table 2. Standard signals (org.freedesktop.PowerManagement):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard signals (org.freedesktop.PowerManagement):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Values</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">OnBatteryChanged</th><th align="left">bool</th><th align="left">whether on battery status changed</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">LowBatteryChanged</th><th align="left">bool</th><th align="left">whether on low battery status changed</th></tr></thead></table></div></div><p><br class="table-break">
</p><span class="keycap"><strong>Power management DBus inhibit interface.</strong></span><p>
-</p><div class="table"><a name="id3017066"></a><p class="title"><b>Table 3. Standard methods (org.freedesktop.PowerManagement.Inhibit):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard methods (org.freedesktop.PowerManagement.Inhibit):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns=""><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Input parameter</th><th align="left">Return Values</th><th align="left">Errors</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Inhibit</th><th align="left">string application name, string reason</th><th align="left">uint32 (random cookie)</th><th align="left"> </th><th align="left">Inhibit the power manager.</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">UnInhibit</th><th align="left">uint32 cookie</th><th align="left"> </th><th align="left">InvalidCookie</th><th align="left">Unihibit the power manager.</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">HasInhibit</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">Whether the power manager is currently inhibited or not.</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetInhibitors</th><th align="left"> </th><th align="left">Array of strings</th><th align="left"> </th><th align="left">List all the applications currently inhibiting the power manager (Not standard, use just for debugging)</th></tr></thead></table></div></div><p><br class="table-break">
+</p><div class="table"><a name="id2930845"></a><p class="title"><b>Table 3. Standard methods (org.freedesktop.PowerManagement.Inhibit):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard methods (org.freedesktop.PowerManagement.Inhibit):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns=""><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Input parameter</th><th align="left">Return Values</th><th align="left">Errors</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Inhibit</th><th align="left">string application name, string reason</th><th align="left">uint32 (random cookie)</th><th align="left"> </th><th align="left">Inhibit the power manager.</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">UnInhibit</th><th align="left">uint32 cookie</th><th align="left"> </th><th align="left">InvalidCookie</th><th align="left">Unihibit the power manager.</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">HasInhibit</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">Whether the power manager is currently inhibited or not.</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetInhibitors</th><th align="left"> </th><th align="left">Array of strings</th><th align="left"> </th><th align="left">List all the applications currently inhibiting the power manager (Not standard, use just for debugging)</th></tr></thead></table></div></div><p><br class="table-break">
- </p><div class="table"><a name="id3017246"></a><p class="title"><b>Table 4. Standard signals (org.freedesktop.PowerManagement.Inhibit):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard signals (org.freedesktop.PowerManagement.Inhibit):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Values</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">HasInhibitChanged</th><th align="left">bool</th><th align="left">whether the inhibit status changed.</th></tr></thead></table></div></div><p><br class="table-break">
+ </p><div class="table"><a name="id2931024"></a><p class="title"><b>Table 4. Standard signals (org.freedesktop.PowerManagement.Inhibit):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard signals (org.freedesktop.PowerManagement.Inhibit):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Values</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">HasInhibitChanged</th><th align="left">bool</th><th align="left">whether the inhibit status changed.</th></tr></thead></table></div></div><p><br class="table-break">
</p><p>
In addition, <strong class="application"><code>xfce4-power-manager</code></strong> has other interfaces, but those interfaces are mainly used internally, for example the settings application uses such interface to
diff --git a/doc/C/xfce4-power-manager.xml.in b/doc/C/xfce4-power-manager.xml.in
index d45c6fea..85fc02d3 100644
--- a/doc/C/xfce4-power-manager.xml.in
+++ b/doc/C/xfce4-power-manager.xml.in
@@ -174,7 +174,7 @@ if it is enabled in the settings dialog, only critical actions are processed.</p
<varlistentry>
<term><keycap>Notification area:</keycap></term>
<listitem>
- <para>The notification area settings allows you to control when the icon placed in your notification are is shown, you can set it to be always visible, for battery devices
+ <para>The notification area settings allows you to control the behaviour of the icon placed in your notification are, you can set it to be always visible, for battery devices
you can select the icon to be visible only when your are running on battery for example.</para>
</listitem>
</varlistentry>
@@ -200,8 +200,8 @@ if it is enabled in the settings dialog, only critical actions are processed.</p
<varlistentry>
<term><keycap>Power manager Notification:</keycap></term>
<listitem>
- <para>If the notification of a battery status change are annoying you, you can always disabling them by unselecting the checkbox, please note this
- doesn't apply on the notification that the power manager sends them to notify the user of error or when the system is running out of power,
+ <para>If the notification of a battery status change are annoying you, you can always disable them by unselecting the checkbox, please note this
+ doesn't apply on the notification that the power manager sends to notify the user of error or when the system is running out of power,
so it is safe to disable them.</para>
</listitem>
</varlistentry>
@@ -231,7 +231,7 @@ The on battery tab is only shown on systems that have battery devices, it contai
<varlistentry><term><keycap>Power is critical</keycap></term>
<listitem>
<para>
- With this option you can tell the power manager what it should do if the system is running on low power, if this option is disabled and the computer
+ With this option you can specify the action taken by the power manager in case the system is running on low power, if this option is disabled and the computer
is running on low battery power, the power manager will display a warning message.
</para></listitem>
</varlistentry>
@@ -239,8 +239,8 @@ The on battery tab is only shown on systems that have battery devices, it contai
<varlistentry><term><keycap>Prefer power savings over performance:</keycap></term>
<listitem>
<para>
- This is the power profile when running on battery, enabling this allows you to run more time on your battery power, but this might be over the performance of your system,
- enabling this option is always a good idea.
+ This is the power profile when running on battery, with this option you battery will last more when running on battery power,
+ having this option enabled is always a good idea.
</para></listitem>
</varlistentry>
@@ -279,7 +279,7 @@ The on battery tab is only shown on systems that have battery devices, it contai
<term><keycap>Monitor sleep mode:</keycap></term>
<listitem>
<para>
- DPMS to modes before switching off the monitor, standby and suspend, they are technically different, this option is provided for convenience.
+ DPMS sleep modes before switching off the monitor, standby and suspend, they are technically different, this option is provided for convenience.
</para>
</listitem>
</varlistentry>
diff --git a/src/xfpm-debug.c b/src/xfpm-debug.c
index dc0e48fd..7228926c 100644
--- a/src/xfpm-debug.c
+++ b/src/xfpm-debug.c
@@ -31,7 +31,7 @@
#include "xfpm-debug.h"
-#if defined(DEBUG) && defined(VARIADIC_MACRO_SUPPORTED)
+#if defined(DEBUG) && defined(G_HAVE_ISO_VARARGS)
void xfpm_debug_enum (const gchar *func, const gchar *file, gint line,
const gchar *text, gint v_enum, GType type)
@@ -78,4 +78,4 @@ void xfpm_debug_enum_full (const gchar *func, const gchar *file, gint line,
g_free (buffer);
}
-#endif /*DEBUG && VARIADIC_MACRO_SUPPORTED*/
+#endif /* #ifdef DEBUG && defined(G_HAVE_ISO_VARARGS)*/
diff --git a/src/xfpm-debug.h b/src/xfpm-debug.h
index 242c9633..ff4cace2 100644
--- a/src/xfpm-debug.h
+++ b/src/xfpm-debug.h
@@ -30,15 +30,7 @@
G_BEGIN_DECLS
-#ifdef DEBUG
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#define VARIADIC_MACRO_SUPPORTED
-#elif defined(__GNUC__) && __GNUC__ >= 3
-#define VARIADIC_MACRO_SUPPORTED
-#endif
-
-#ifdef VARIADIC_MACRO_SUPPORTED
+#if defined(DEBUG) && defined(G_HAVE_ISO_VARARGS)
#define XFPM_DEBUG_ENUM(_text, _value, _type)\
xfpm_debug_enum (__func__, __FILE__, __LINE__, _text, _value, _type)
@@ -61,14 +53,7 @@ void xfpm_debug_enum_full (const gchar *func,
const gchar *format,
...);
-#else /* !VARIADIC_MACRO_SUPPORTED */
-
-#define XFPM_DEBUG_ENUM(_text, _value, _type)
-#define XFPM_DEBUG_ENUM_FULL(_value, _type, ...)
-
-#endif /* VARIADIC_MACRO_SUPPORTED */
-
-#else /* DEBUG */
+#else
#define XFPM_DEBUG_ENUM(_text, _value, _type)
#define XFPM_DEBUG_ENUM_FULL(_value, _type, ...)
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 99456294..10849761 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -134,6 +134,11 @@ int main(int argc, char **argv)
{ NULL, },
};
+ if ( !g_thread_supported () )
+ g_thread_init (NULL);
+
+ dbus_g_thread_init ();
+
xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
if (!gtk_init_with_args (&argc, &argv, (gchar *)"", option_entries, (gchar *)PACKAGE, &error))
@@ -167,11 +172,6 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
- if ( !g_thread_supported () )
- g_thread_init (NULL);
-
- dbus_g_thread_init ();
-
if ( no_daemon == FALSE && daemon(0,0) )
{
g_critical ("Could not daemonize");
--
GitLab