[Goodies-commits] r5717 - xfce4-power-manager/trunk/src

[Ali Abdallah]

Author: aliov
Date: 2008-10-20 13:53:56 +0000 (Mon, 20 Oct 2008)
New Revision: 5717

Modified:
   xfce4-power-manager/trunk/src/xfpm-dbus-messages.c
   xfce4-power-manager/trunk/src/xfpm-driver.c
   xfce4-power-manager/trunk/src/xfpm-hal.c
   xfce4-power-manager/trunk/src/xfpm-main.c
Log:
using xfce_err for errors user should now

Modified: xfce4-power-manager/trunk/src/xfpm-dbus-messages.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dbus-messages.c	2008-10-20 09:14:25 UTC (rev 5716)
+++ xfce4-power-manager/trunk/src/xfpm-dbus-messages.c	2008-10-20 13:53:56 UTC (rev 5717)
@@ -44,7 +44,7 @@
     
     if ( ret == FALSE )
     {
-        XFPM_DEBUG("Network manager is not installed \n");
+        XFPM_DEBUG("%s is not running \n",service);
     }
     
     return ret;

Modified: xfce4-power-manager/trunk/src/xfpm-driver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.c	2008-10-20 09:14:25 UTC (rev 5716)
+++ xfce4-power-manager/trunk/src/xfpm-driver.c	2008-10-20 13:53:56 UTC (rev 5717)
@@ -1082,6 +1082,7 @@
     if ( !priv->lcd_brightness_control )
     {
         g_object_unref(priv->lcd);
+        
     }
     
     /*We call the battery object to start monitoring after loading the Ac adapter*/
@@ -1179,7 +1180,7 @@
    
     priv->conn = dbus_bus_get(DBUS_BUS_SESSION,&error);
    
-    if (!priv->conn) 
+    if (!priv->conn ) 
     {
        g_critical("Failed to connect to the DBus daemon: %s\n",error.message);
        dbus_error_free(&error);

Modified: xfce4-power-manager/trunk/src/xfpm-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-hal.c	2008-10-20 09:14:25 UTC (rev 5716)
+++ xfce4-power-manager/trunk/src/xfpm-hal.c	2008-10-20 13:53:56 UTC (rev 5717)
@@ -231,13 +231,13 @@
     
     if ( !priv->connection || dbus_error_is_set(&error) )
     {
-        g_printerr("Unable to connect to DBus %s\n",error.message);
+        g_critical("Unable to connect to DBus %s\n",error.message);
         return FALSE;
     }
     
     if ( !xfpm_dbus_name_has_owner(priv->connection,HAL_DBUS_SERVICE) )
     {
-        g_printerr("HAL is not running or not responding\n");
+        g_critical("HAL is not running or not responding\n");
         return FALSE;
     }
     priv->ctx = libhal_ctx_new();

Modified: xfce4-power-manager/trunk/src/xfpm-main.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-main.c	2008-10-20 09:14:25 UTC (rev 5716)
+++ xfce4-power-manager/trunk/src/xfpm-main.c	2008-10-20 13:53:56 UTC (rev 5717)
@@ -81,7 +81,8 @@
     
     if ( ( home = getenv("HOME")) == NULL )
     {
-        g_error("Unable to read HOME evironment variable, autostart will not work\n");
+        xfce_warn(_("Unable to read HOME environment variable, autostart option may not work"));
+        g_warning("Unable to read HOME environment variable, autostart will not work\n");
         return;
     }
     
@@ -90,7 +91,8 @@
     
     if ( !g_file_test(file,G_FILE_TEST_IS_DIR) )
     {
-        g_error("Home directory doesn't contains .config/autostart subdirs\n");
+        xfce_warn(_("Unable to read .config/autostart in your home directory, autostart option may not work"));
+        g_warning("Home directory doesn't contains .config/autostart subdirs\n");
         g_free(file);
         return;
     }
@@ -259,10 +261,13 @@
         if (!xfpm_driver_monitor(driver)) 
         {
              /* g_disaster */
-            g_error("Unable to load xfce4 power manager driver\n");
+            xfce_err(_("Impossible to run Xfce4 power manager, " \
+                    "Please make sure that the hardware abstract layer (HAL) is running "\
+                    "and then message bus daemon (DBus) is running."));
+            g_error("Unable to load xfce4 power manager driver\n");        
             g_object_unref(driver);
             return 1;
-        }    
+        }
     }
         
     return 0;