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

[Ali Abdallah]

Author: aliov
Date: 2008-10-11 10:07:19 +0000 (Sat, 11 Oct 2008)
New Revision: 5566

Modified:
   xfce4-power-manager/trunk/src/xfpm-ac-adapter.c
   xfce4-power-manager/trunk/src/xfpm-ac-adapter.h
   xfce4-power-manager/trunk/src/xfpm-driver.c
   xfce4-power-manager/trunk/src/xfpm-driver.h
   xfce4-power-manager/trunk/src/xfpm-hal.c
Log:
bug fixes

Modified: xfce4-power-manager/trunk/src/xfpm-ac-adapter.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-ac-adapter.c	2008-10-10 14:03:40 UTC (rev 5565)
+++ xfce4-power-manager/trunk/src/xfpm-ac-adapter.c	2008-10-11 10:07:19 UTC (rev 5566)
@@ -50,6 +50,7 @@
 #include <glib/gi18n.h>
 
 #include "xfpm-hal.h"
+#include "xfpm-driver.h"
 #include "xfpm-ac-adapter.h"
 #include "xfpm-common.h"
 #include "xfpm-notify.h"
@@ -65,7 +66,8 @@
 static gboolean xfpm_ac_adapter_size_changed_cb(GtkStatusIcon *adapter,
                                                 gint size,
                                                 gpointer data);
-static void xfpm_ac_adapter_get_adapter(XfpmAcAdapter *adapter);
+static void xfpm_ac_adapter_get_adapter(XfpmAcAdapter *adapter,
+                                        SystemFormFactor factor);
 static void xfpm_ac_adapter_property_changed_cb(XfpmHal *hal,const gchar *udi,
                                                 const gchar *key,gboolean is_removed,
                                                 gboolean is_added,XfpmAcAdapter *adapter);
@@ -142,10 +144,6 @@
         g_error_free(error);
     }            
     
-    
-    g_signal_connect(priv->hal,"xfpm-device-property-changed",
-                     G_CALLBACK(xfpm_ac_adapter_property_changed_cb),adapter);
-    
     g_signal_connect(adapter,"size-changed",
                     G_CALLBACK(xfpm_ac_adapter_size_changed_cb),NULL);
     g_signal_connect(adapter,"popup-menu",
@@ -182,11 +180,17 @@
 }
 
 static void
-xfpm_ac_adapter_get_adapter(XfpmAcAdapter *adapter)
+xfpm_ac_adapter_get_adapter(XfpmAcAdapter *adapter,SystemFormFactor factor)
 {
     XfpmAcAdapterPrivate *priv;
     priv = XFPM_AC_ADAPTER_GET_PRIVATE(adapter);
     
+    if ( factor != SYSTEM_LAPTOP )
+    {
+        priv->present = TRUE;
+        goto l1;
+    }
+    
     gchar **udi = NULL;
     gint num;
     GError *error = NULL;
@@ -225,6 +229,9 @@
         }
     }
     libhal_free_string_array(udi);
+    g_signal_connect(priv->hal,"xfpm-device-property-changed",
+                     G_CALLBACK(xfpm_ac_adapter_property_changed_cb),adapter);
+    l1:
     gtk_status_icon_set_tooltip(GTK_STATUS_ICON(adapter),
                 priv->present ? _("Adapter is online") : _("Adapter is offline"));    
     g_signal_emit(G_OBJECT(adapter),signals[XFPM_AC_ADAPTER_CHANGED],0,priv->present);
@@ -272,9 +279,8 @@
                        GTK_STATUS_ICON(adapter),
                        icon_name,
                        0);
-
+#endif
 }
-#endif
 
 static gboolean
 xfpm_ac_adapter_do_hibernate(XfpmAcAdapter *adapter)
@@ -416,7 +422,7 @@
 }
 
 void
-xfpm_ac_adapter_monitor(XfpmAcAdapter *adapter)
+xfpm_ac_adapter_monitor(XfpmAcAdapter *adapter,SystemFormFactor factor)
 {
-    xfpm_ac_adapter_get_adapter(adapter);
+    xfpm_ac_adapter_get_adapter(adapter,factor);
 }    

Modified: xfce4-power-manager/trunk/src/xfpm-ac-adapter.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-ac-adapter.h	2008-10-10 14:03:40 UTC (rev 5565)
+++ xfce4-power-manager/trunk/src/xfpm-ac-adapter.h	2008-10-11 10:07:19 UTC (rev 5566)
@@ -48,6 +48,7 @@
 
 GType          xfpm_ac_adapter_get_type(void) G_GNUC_CONST;
 GtkStatusIcon *xfpm_ac_adapter_new     (gboolean visible);
-void           xfpm_ac_adapter_monitor (XfpmAcAdapter *adapter);
+void           xfpm_ac_adapter_monitor (XfpmAcAdapter *adapter,
+                                        SystemFormFactor factor);
 
 #endif

Modified: xfce4-power-manager/trunk/src/xfpm-driver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.c	2008-10-10 14:03:40 UTC (rev 5565)
+++ xfce4-power-manager/trunk/src/xfpm-driver.c	2008-10-11 10:07:19 UTC (rev 5566)
@@ -98,15 +98,6 @@
 #define XFPM_DRIVER_GET_PRIVATE(o) \
 (G_TYPE_INSTANCE_GET_PRIVATE((o),XFPM_TYPE_DRIVER,XfpmDriverPrivate))
 
-typedef enum 
-{
-    SYSTEM_LAPTOP,
-    SYSTEM_DESKTOP,
-    SYSTEM_SERVER,
-    SYSTEM_UNKNOWN
-    
-} SystemFormFactor;
-
 struct XfpmDriverPrivate 
 {
     DBusConnection *conn;
@@ -647,7 +638,7 @@
      * so we get the callback and then we set up the ac adapter
      * status for dpms and cpu lcd,...
      */                    
-    xfpm_ac_adapter_monitor(XFPM_AC_ADAPTER(priv->adapter));
+    xfpm_ac_adapter_monitor(XFPM_AC_ADAPTER(priv->adapter),priv->formfactor);
     
     xfpm_battery_monitor(priv->batt);
     g_main_loop_run(priv->loop);

Modified: xfce4-power-manager/trunk/src/xfpm-driver.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.h	2008-10-10 14:03:40 UTC (rev 5565)
+++ xfce4-power-manager/trunk/src/xfpm-driver.h	2008-10-11 10:07:19 UTC (rev 5566)
@@ -35,6 +35,15 @@
 #include "xfpm-dpms.h"
 #endif
 
+typedef enum 
+{
+    SYSTEM_LAPTOP,
+    SYSTEM_DESKTOP,
+    SYSTEM_SERVER,
+    SYSTEM_UNKNOWN
+    
+} SystemFormFactor;
+
 G_BEGIN_DECLS
 
 #define XFPM_TYPE_DRIVER   (xfpm_driver_get_type())

Modified: xfce4-power-manager/trunk/src/xfpm-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-hal.c	2008-10-10 14:03:40 UTC (rev 5565)
+++ xfce4-power-manager/trunk/src/xfpm-hal.c	2008-10-11 10:07:19 UTC (rev 5566)
@@ -773,7 +773,7 @@
     DBusMessage *mess;
     DBusPendingCall *pend;
     DBusMessage *reply;
-    gchar **govs;
+    gchar **govs = NULL;
     int dummy;
     
     mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,