diff --git a/configure.ac.in b/configure.ac.in
index 6480324b5ef5944ff0a7a25e2db70ed52b7a0dfa..3c03ded356fe8265f832129e5a5855fc947a45da 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,9 +1,9 @@
m4_define([intltool_minimum_version], [0.31])
m4_define([xfpm_version_major], [0])
m4_define([xfpm_version_minor], [6])
-m4_define([xfpm_version_micro], [0])
+m4_define([xfpm_version_micro], [1])
m4_define([xfpm_version_build], [r@REVISION@])
-m4_define([xfpm_version_tag],[svn])
+m4_define([xfpm_version_tag],[])
m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [svn], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
diff --git a/doc/C/xfce4-power-manager.html b/doc/C/xfce4-power-manager.html
index bfc89042eb8e86af6ef5feb1957033d6665073ee..6e893890a2be692687fa821534e1efad09e36a7a 100644
--- a/doc/C/xfce4-power-manager.html
+++ b/doc/C/xfce4-power-manager.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>Xfce 4 Power Manager</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.2"><link rel="start" href="#xfce4-power-manager" title="Xfce 4 Power Manager"><link rel="next" href="#xfpm-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="xfce4-power-manager"></a>Xfce 4 Power Manager</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Ali</span> <span class="surname">Abdallah</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:aliov@xfce.org">aliov@xfce.org</a>></code></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">This manual describes <strong xmlns="" class="application"><code>xfce4-power-manager</code></strong> version 0.6.0
-<br></br></span></div><div><p class="copyright">Copyright © 2008 Ali Abdallah</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#xfpm-intro">Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-started">Getting Started</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm-configuration">Power Manager Configuration</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-general">General Settings</a></span></dt><dt><span class="sect2"><a href="#xfpm-cpu">CPU Settings</a></span></dt><dt><span class="sect2"><a href="#xfpm-battery">Battery settings</a></span></dt><dt><span class="sect2"><a href="#xfpm-button">Keyboard shortcuts</a></span></dt><dt><span class="sect2"><a href="#xfpm-monitor">Monitor settings</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm-systray-notify">System Tray Icon and Notification</a></span></dt><dt><span class="sect1"><a href="#xfpm-faq">FAQ</a></span></dt><dt><span class="sect1"><a href="#xfpm-about">About <strong class="application"><code>xfce4-power-manager</code></strong></a></span></dt></dl></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-intro"></a>Introduction</h2></div></div></div>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Xfce 4 Power Manager</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.2"><link rel="start" href="#xfce4-power-manager" title="Xfce 4 Power Manager"><link rel="next" href="#xfpm-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="xfce4-power-manager"></a>Xfce 4 Power Manager</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Ali</span> <span class="surname">Abdallah</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:aliov@xfce.org">aliov@xfce.org</a>></code></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">This manual describes <strong xmlns="" class="application"><code>xfce4-power-manager</code></strong> version 0.6.1
+<br></br></span></div><div><p class="copyright">Copyright © 2008 Ali Abdallah</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#xfpm-intro">Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-started">Getting Started</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm-configuration">Power Manager Configuration</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-general">General Settings</a></span></dt><dt><span class="sect2"><a href="#xfpm-cpu">CPU Settings</a></span></dt><dt><span class="sect2"><a href="#xfpm-battery">Battery settings</a></span></dt><dt><span class="sect2"><a href="#xfpm-button">Keyboard shortcuts</a></span></dt><dt><span class="sect2"><a href="#xfpm-monitor">Monitor settings</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm-systray-notify">System Tray Icon and Notification</a></span></dt><dt><span class="sect1"><a href="#xfpm-faq">FAQ</a></span></dt><dt><span class="sect1"><a href="#xfpm-about">About <strong class="application"><code>xfce4-power-manager</code></strong></a></span></dt></dl></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-intro"></a>Introduction</h2></div></div></div>
The Xfce4 power manager is a part of the Xfce goodies project and features cpu frequency control,
battery monitoring, monitor DPMS control, LCD brightness control, lid sleep and power buttons controls.
All those features can be controlled from the user interface settings dialog.
@@ -8,19 +8,19 @@
a popup will be displayed to run the power manger if it is not already running.
Once the power manager is launched for the first time, it will place an autostart desktop file in your .config/autostart
in order to be able to be launched automatically each time you log into your Xfce desktop.
- </p></div></div><p> </p><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><div class="figure"><a name="id2763457"></a><p class="title"><b>Figure 1. Power Manager settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/settings.png" alt="Power Manager settings"></div></div></div></div><p><br class="figure-break"></p><p>
+ </p></div></div><p> </p><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><div class="figure"><a name="id2859704"></a><p class="title"><b>Figure 1. Power Manager settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/settings.png" alt="Power Manager settings"></div></div></div></div><p><br class="figure-break"></p><p>
Almost all the <strong class="application"><code>xfce4-power-manager</code></strong> items are configurable from the configuration window, laptop users can set up
- a power profile for two different modes “on battery power” and “on ac power”, desktop users still can change
+ a power profile for two different modes “on battery power†and “on ac powerâ€, desktop users still can change
DPMS settings and CPU frequency.
</p><p>
The settings dialog differs from one system to another depending on the computer (PC,laptop,...) and on
the available manageabale interfaces.
</p><p>
In this section we will describe the possible configuration for the power manager.
- </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-general"></a>General Settings</h3></div></div></div><div class="figure"><a name="id2782441"></a><p class="title"><b>Figure 2. General settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/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 Settings</h3></div></div></div><div class="figure"><a name="id2820977"></a><p class="title"><b>Figure 2. General settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/general-settings.png" alt="General settings"></div></div></div></div><p><br class="figure-break"></p><p>
Here you can select the configuration of the system tray icon, enable/disable cpu frequency and DPMS controls.
For example, you would need to disable DPMS control when watching a movie.
- </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-cpu"></a>CPU Settings</h3></div></div></div><div class="figure"><a name="id2793311"></a><p class="title"><b>Figure 3. CPU Linux governors</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/cpu-settings.png" alt="CPU Linux governors"></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-cpu"></a>CPU Settings</h3></div></div></div><div class="figure"><a name="id2821023"></a><p class="title"><b>Figure 3. CPU Linux governors</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/cpu-settings.png" alt="CPU Linux governors"></div></div></div></div><p><br class="figure-break"></p><p>
The linux governors found in the system are listed as radio buttons.
If the acpi_cpufreq module is not loaded in the kernel or the cpu itself does not support frequency
changes these options might not show.
@@ -34,8 +34,8 @@
Same as Ondemand but differs in behaviour in that it gracefully increases and decreases
the CPU speed rather than jumping to max speed the moment there is any load on the CPU.
</p></dd></dl></div><p>
-NOTE:In <strong class="application"><code>xfce4-power-manager</code></strong> version 0.6.0 only Linux is supported for changing the CPU frequency.
-</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-battery"></a>Battery settings</h3></div></div></div><div class="figure"><a name="id2799687"></a><p class="title"><b>Figure 4. Battery settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery-settings.png" alt="Battery settings"></div></div></div></div><p><br class="figure-break"></p><p>
+NOTE:In <strong class="application"><code>xfce4-power-manager</code></strong> version 0.6.1 only Linux is supported for changing the CPU frequency.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-battery"></a>Battery settings</h3></div></div></div><div class="figure"><a name="id2826012"></a><p class="title"><b>Figure 4. Battery settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery-settings.png" alt="Battery settings"></div></div></div></div><p><br class="figure-break"></p><p>
The user can select the his critical battery percentage, usually this is for a laptop or
UPS battery, this option is important for a broken battery for example, which lasts only 5 minutes when it
is 10% charged.
@@ -46,11 +46,11 @@ NOTE:In <strong class="application"><code>xfce4-power-manager</code></strong> ve
The battery notification is a way to notify the user when the battery state changes ( ex: battery charge is full )
<p>
- </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-button"></a>Keyboard shortcuts</h3></div></div></div><div class="figure"><a name="id2781617"></a><p class="title"><b>Figure 5. button control</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/button-settings.png" alt="button control"></div></div></div></div><p><br class="figure-break"></p>
+ </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-button"></a>Keyboard shortcuts</h3></div></div></div><div class="figure"><a name="id2826069"></a><p class="title"><b>Figure 5. button control</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/button-settings.png" alt="button control"></div></div></div></div><p><br class="figure-break"></p>
For those buttons you can define an action to be taken by the power manager when pressing to one of them
- for example when you close the laptop screen.
- </div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-monitor"></a>Monitor settings</h3></div></div></div><div class="figure"><a name="id2800782"></a><p class="title"><b>Figure 6. Monitor DPMS and LCD brightness</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/monitor-settings.png" alt="Monitor DPMS and LCD brightness"></div></div></div></div><p><br class="figure-break"></p><p>
+ </div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-monitor"></a>Monitor settings</h3></div></div></div><div class="figure"><a name="id2821268"></a><p class="title"><b>Figure 6. Monitor DPMS and LCD brightness</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/monitor-settings.png" alt="Monitor DPMS and LCD brightness"></div></div></div></div><p><br class="figure-break"></p><p>
DPMS is an old X extension that allows standby/suspend/turn off options of the monitor, usually the timeouts
have to be consecutive, so standby timeout is less than suspend timeout and so on, but any option can always
be disabled.
@@ -58,8 +58,8 @@ NOTE:In <strong class="application"><code>xfce4-power-manager</code></strong> ve
For laptop users, clicking on the checkbox allows the power manager to reduce the screen luminosity when
it detects that system in running on battery power and increase it again when the system is running
on AC power.
- </p></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-systray-notify"></a>System Tray Icon and Notification</h2></div></div></div><p>
-</p><div class="figure"><a name="id2788178"></a><p class="title"><b>Figure 7. Battery icon in the system tray</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery.png" alt="Battery icon in the system tray"></div></div></div></div><p><br class="figure-break"></p><p>
+ </p></div></div><p>Â </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-systray-notify"></a>System Tray Icon and Notification</h2></div></div></div><p>
+</p><div class="figure"><a name="id2821329"></a><p class="title"><b>Figure 7. Battery icon in the system tray</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery.png" alt="Battery icon in the system tray"></div></div></div></div><p><br class="figure-break"></p><p>
The "system tray" is an application running on a given X screen that can display small icons
provided by running applications. In Xfce, it is a panel plugin that catches the icon and resizes it
@@ -68,11 +68,11 @@ tray icon, for example pidgin places an icon in the system tray as well as many
</p><p>
<strong class="application"><code>xfce4-power-manager</code></strong> uses GtkStatusIcon to display the different kinds of batteries found in the system.
</p><p>
-</p><div class="figure"><a name="id2802112"></a><p class="title"><b>Figure 8. Battery Notification</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery-discharging.png" alt="Battery Notification"></div></div></div></div><p><br class="figure-break"></p><p>
+</p><div class="figure"><a name="id2821378"></a><p class="title"><b>Figure 8. Battery Notification</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery-discharging.png" alt="Battery Notification"></div></div></div></div><p><br class="figure-break"></p><p>
To notify the user about the status of the battery, serious errors occured, the notification daemon is used
to display such messages.
-</p></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-faq"></a>FAQ</h2></div></div></div><div class="variablelist"><dl><dt><span class="term">Q: Why the icons look very similar to the icon of gnome power manager?</span></dt><dd><p>A: No, they are not similar, they are the same, just there is no point of re-drawing icons,
+</p></div><p>Â </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-faq"></a>FAQ</h2></div></div></div><div class="variablelist"><dl><dt><span class="term">Q: Why the icons look very similar to the icon of gnome power manager?</span></dt><dd><p>A: No, they are not similar, they are the same, just there is no point of re-drawing icons,
gnome power manager icons are good enough. Not all of them are used.
</p></dd><dt><span class="term">Q: What is the difference between suspend and hibernate?</span></dt><dd><p>A: Suspend is a power save feature. When suspending, the computer is still using power,
since the running applications are kept in the memory, but it is the lowest power level that the computer
@@ -88,7 +88,7 @@ to display such messages.
In the best cases, it will display a warning popup with different options.
</p></dd><dt><span class="term">Q: I select the option of the LCD brightness control but I do not see the brightness changing when I switch
from AC adapter to battery power?</span></dt><dd><p>A: Your kernel does not have the right driver, or the driver is not loaded.
- </p></dd></dl></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-about"></a>About <strong class="application"><code>xfce4-power-manager</code></strong></h2></div></div></div><p>
+ </p></dd></dl></div></div><p>Â </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-about"></a>About <strong class="application"><code>xfce4-power-manager</code></strong></h2></div></div></div><p>
This power manager was written following the philosophy of Xfce, having light weight application that does
what the user is expecting from it.
</p><p>To report a bug or make a suggestion regarding this application or
@@ -97,7 +97,7 @@ to display such messages.
please ask on the <a class="ulink" href="http://lunar-linux.org/mailman/listinfo/xfce" target="_top">xfce</a> mailing list. Development discussion takes
place on the <a class="ulink" href="http://lunar-linux.org/mailman/listinfo/xfce4-dev" target="_top">xfce4-dev</a> mailing list
or on <a class="ulink" href="http://lunar-linux.org/mailman/listinfo/xfce4-goodies-dev" target="_top">xfce4-goodies-dev</a> mailing list.
- </p></div><p> </p><p> This program is distributed under the terms of the
+ </p></div><p>Â </p><p> This program is distributed under the terms of the
GNU General Public License as published by the Free Software Foundation;
either version 2 of the License, or (at your option) any later version.
</p><p>You should have received a copy of the GNU General Public License
diff --git a/doc/C/xfce4-power-manager.xml b/doc/C/xfce4-power-manager.xml
index b21603077fffd857d5be597de717913c9d054129..704cbd5ea484013eef124b4bb61ef4384ac880f9 100644
--- a/doc/C/xfce4-power-manager.xml
+++ b/doc/C/xfce4-power-manager.xml
@@ -2,7 +2,7 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY date "October 2008">
- <!ENTITY appversion "0.6.0">
+ <!ENTITY appversion "0.6.1">
<!ENTITY app "<application>xfce4-power-manager</application>">
]>
@@ -403,4 +403,4 @@ to display such messages.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
</para>
-</article>
\ No newline at end of file
+</article>
diff --git a/src/xfpm-driver.c b/src/xfpm-driver.c
index b02d506bd0b0fd22146b44053ca99a62377449bc..df3ed1f073c05a263ca27322304f75bc18df25e1 100644
--- a/src/xfpm-driver.c
+++ b/src/xfpm-driver.c
@@ -1184,13 +1184,6 @@ static DBusHandlerResult xfpm_driver_signal_filter
return DBUS_HANDLER_RESULT_HANDLED;
}
- if ( dbus_message_is_signal(message,"xfpm.power.manager","Running" ) )
- {
- XFPM_DEBUG("message running received\n");
- xfpm_driver_send_reply(connection,message);
- return DBUS_HANDLER_RESULT_HANDLED;
- }
-
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 4e237d86ae20cdb7492db1391ba929211bbd24fc..7910bc0887cb05805c2b7124e4bfff9a148053a4 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -58,6 +58,7 @@ static gboolean config = FALSE;
static gboolean version = FALSE;
static GOptionEntry option_entries[] = {
+ { "run",'r', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE,&run,NULL,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 },
{ "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, &socket_id, N_("Settings manager socket"), N_("SOCKET ID") },
@@ -116,7 +117,7 @@ autostart()
g_key_file_set_string(key,"Desktop Entry","Type","Application");
g_key_file_set_string(key,"Desktop Entry","Name","Xfce4 Power Manager");
g_key_file_set_string(key,"Desktop Entry","Icon","gpm-ac-adapter");
- g_key_file_set_string(key,"Desktop Entry","Exec","xfce4-power-manager -r");
+ g_key_file_set_string(key,"Desktop Entry","Exec","xfce4-power-manager");
g_key_file_set_boolean(key,"Desktop Entry","StartupNotify",FALSE);
g_key_file_set_boolean(key,"Desktop Entry","Terminal",FALSE);
g_key_file_set_boolean(key,"Desktop Entry","Hidden",FALSE);
@@ -150,7 +151,7 @@ autostart()
int main(int argc,char **argv)
{
xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
+
GError *error = NULL;
if(!gtk_init_with_args(&argc, &argv, "", option_entries, PACKAGE, &error))
@@ -242,7 +243,7 @@ int main(int argc,char **argv)
}
}
- if (!xfpm_dbus_name_has_owner(connection,XFPM_PM_IFACE))
+ if (!xfpm_dbus_name_has_owner(connection,XFPM_PM_IFACE) )
{
XfpmDriver *driver = xfpm_driver_new();