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

[Ali Abdallah]

Author: aliov
Date: 2008-10-26 18:08:59 +0000 (Sun, 26 Oct 2008)
New Revision: 5820

Modified:
   xfce4-power-manager/trunk/src/xfpm-dbus-messages.c
   xfce4-power-manager/trunk/src/xfpm-hal.c
   xfce4-power-manager/trunk/src/xfpm-hal.h
Log:
Use 2000 as dbus timeouts

Modified: xfce4-power-manager/trunk/src/xfpm-dbus-messages.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dbus-messages.c	2008-10-26 17:16:47 UTC (rev 5819)
+++ xfce4-power-manager/trunk/src/xfpm-dbus-messages.c	2008-10-26 18:08:59 UTC (rev 5820)
@@ -150,7 +150,7 @@
     if(!dbus_connection_send_with_reply(connection,
                                         message,
                                         &pend,
-                                        100))
+                                        200))
     {
         dbus_message_unref(message);
         dbus_connection_unref(connection);

Modified: xfce4-power-manager/trunk/src/xfpm-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-hal.c	2008-10-26 17:16:47 UTC (rev 5819)
+++ xfce4-power-manager/trunk/src/xfpm-hal.c	2008-10-26 18:08:59 UTC (rev 5820)
@@ -289,7 +289,7 @@
                                            
     dbus_error_init(&error);                                       
                                            
-    reply = dbus_connection_send_with_reply_and_block(priv->connection,message,-1,&error);
+    reply = dbus_connection_send_with_reply_and_block(priv->connection,message,2000,&error);
     dbus_message_unref(message);
     
 	if ( reply ) dbus_message_unref(reply);
@@ -331,7 +331,7 @@
                                            
     dbus_error_init(&error);                                       
                                            
-    reply = dbus_connection_send_with_reply_and_block(priv->connection,message,-1,&error);
+    reply = dbus_connection_send_with_reply_and_block(priv->connection,message,2000,&error);
     dbus_message_unref(message);
     
     if ( reply ) dbus_message_unref(reply);
@@ -645,7 +645,7 @@
 
 	reply = dbus_connection_send_with_reply_and_block(priv->connection,
                                                     mess,
-                                                    SLEEP_TIMEOUT,
+                                                    2000,
                                                     &error);
     dbus_message_unref(mess);
              	
@@ -736,7 +736,7 @@
     dbus_error_init(&error);
 	reply = dbus_connection_send_with_reply_and_block(priv->connection,
                                                     mess,
-                                                    SLEEP_TIMEOUT,
+                                                    2000,
                                                     &error);
     dbus_message_unref(mess);
          	
@@ -827,7 +827,7 @@
         
     dbus_error_init(&error);
     
-    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
+    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
     dbus_message_unref(mess);
     
     if ( dbus_error_is_set(&error) )
@@ -874,7 +874,7 @@
     
     dbus_error_init(&error);
     
-    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
+    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
     dbus_message_unref(mess);
         
     if ( dbus_error_is_set(&error) )
@@ -923,7 +923,7 @@
 	}	
 	
     dbus_error_init(&error);
-    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
+    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
 
     dbus_message_unref(mess);
          
@@ -976,7 +976,7 @@
 	
     dbus_error_init(&error);
     
-    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
+    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
     dbus_message_unref(mess);
     
     if ( dbus_error_is_set(&error) )
@@ -1029,7 +1029,7 @@
     dbus_message_append_args(mess,DBUS_TYPE_STRING,&governor,DBUS_TYPE_INVALID);
     
     dbus_error_init(&error);
-    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
+    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
     dbus_message_unref(mess);
     
     if ( dbus_error_is_set(&error) )
@@ -1075,7 +1075,7 @@
     dbus_message_append_args(mess,DBUS_TYPE_BOOLEAN,&power_save,DBUS_TYPE_INVALID);
     
     dbus_error_init(&error);
-    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
+    reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
     dbus_message_unref(mess);
     
     if ( dbus_error_is_set(&error) )

Modified: xfce4-power-manager/trunk/src/xfpm-hal.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-hal.h	2008-10-26 17:16:47 UTC (rev 5819)
+++ xfce4-power-manager/trunk/src/xfpm-hal.h	2008-10-26 18:08:59 UTC (rev 5820)
@@ -32,8 +32,6 @@
 #define HAL_DBUS_INTERFACE_CPU       "org.freedesktop.Hal.Device.CPUFreq"
 #define HAL_DBUS_INTERFACE_LCD       "org.freedesktop.Hal.Device.LaptopPanel"
 
-#define SLEEP_TIMEOUT -1
-
 G_BEGIN_DECLS
 
 #define XFPM_TYPE_HAL                  (xfpm_hal_get_type ())