[Xfce4-commits] <xfce4-power-manager:devkit-power> Fix some typos and chane 15 to 11 as dkp version (was set for testing).

[Ali Abdallah]

Updating branch refs/heads/devkit-power
         to 54e6b0834337de07f9832588c4cbf5714cbf2769 (commit)
       from 13c68f4148f2ffd91a3c562bc5588c42a3d3219d (commit)

commit 54e6b0834337de07f9832588c4cbf5714cbf2769
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Fri Nov 6 21:14:12 2009 +0100

    Fix some typos and chane 15 to 11 as dkp version (was set for testing).

 README          |    5 ++++-
 src/xfpm-dkp.c  |    5 ++---
 src/xfpm-main.c |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README b/README
index d2746da..54a79b6 100644
--- a/README
+++ b/README
@@ -15,11 +15,14 @@ Xfce Power Manager depends on the following packages:
  - Glib 2.16 or above.
  - DBus 0.60 or above.
  - DBus glib 0.70 or above.
- - libxfcegui4 4.6.0 or above.
+ - libxfce4ui 4.7.0 or above.
  - libxfce4util 4.6.0 or above
  - libnotify 0.4.1 or above.
  - xfconf 4.6.0 or above.
  - libxfce4panel 4.6.0 or above (for the panel plugins).
+ - Xrandr 1.2.0 or above.
+ - Polkit 0.91 or above (optional but recommended).
+ - Consolekit (optional but recommended).
  - DPMS X extension ( for DPMS support);
 
  - HAL daemon version 0.5.6 or above is needed.
diff --git a/src/xfpm-dkp.c b/src/xfpm-dkp.c
index 9397869..7ceb0ca 100644
--- a/src/xfpm-dkp.c
+++ b/src/xfpm-dkp.c
@@ -269,7 +269,7 @@ xfpm_dkp_check_daemon_version (XfpmDkp *dkp, GHashTable *props)
     XFPM_DEBUG ("Dkp daemon version %s", dkp->priv->daemon_version);
     dkp_version = strtol (dkp->priv->daemon_version, NULL, 10);
     
-    if ( dkp_version < 15)
+    if ( dkp_version < 11)
     {
 	XfconfChannel *channel;
 	gboolean show_error;
@@ -290,7 +290,7 @@ xfpm_dkp_check_daemon_version (XfpmDkp *dkp, GHashTable *props)
 				   "to work properly while the version found is"), 
 				   dkp->priv->daemon_version);
 		
-	    g_set_error (&error, 0, 0, message);
+	    g_set_error (&error, 0, 0, "%s", message);
 	    xfce_dialog_show_error (NULL, error, "%s", _("Devicekit-power version 011 or above not found"));
 	    xfconf_channel_set_bool (channel, PROPERTIES_PREFIX "show-dkp-version-error", FALSE);
 	    g_free (message);
@@ -329,7 +329,6 @@ xfpm_dkp_get_properties (XfpmDkp *dkp)
     {
 	xfpm_dkp_check_daemon_version (dkp, props);
     }
-out:
     g_hash_table_destroy (props);
 }
 
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 3965d0b..b29c12e 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -71,7 +71,7 @@ xfpm_quit_signal (gint sig, gpointer data)
 static const gchar *
 xfpm_bool_to_local_string (gboolean value)
 {
-    value == TRUE ? _("True") : _("False");
+    return value == TRUE ? _("True") : _("False");
 }
 
 static void