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

Ali Abdallah aliov at xfce.org
Mon Oct 20 17:39:21 CEST 2008


Author: aliov
Date: 2008-10-20 15:39:21 +0000 (Mon, 20 Oct 2008)
New Revision: 5725

Modified:
   xfce4-power-manager/trunk/src/xfpm-dbus-messages.c
   xfce4-power-manager/trunk/src/xfpm-dbus-messages.h
   xfce4-power-manager/trunk/src/xfpm-hal.c
Log:
Removed not used calls

Modified: xfce4-power-manager/trunk/src/xfpm-dbus-messages.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dbus-messages.c	2008-10-20 15:18:41 UTC (rev 5724)
+++ xfce4-power-manager/trunk/src/xfpm-dbus-messages.c	2008-10-20 15:39:21 UTC (rev 5725)
@@ -91,22 +91,6 @@
     }    
 }    
 
-DBusMessage *xfpm_dbus_new_message(const gchar *service  ,const gchar *remote_object,
-                                   const gchar *interface,const gchar *method)
-{       
-    DBusMessage *message;
-    message = dbus_message_new_method_call(service,
-                                           remote_object,
-                                           interface,
-                                           method);
-	if (!message) {
-	    g_printerr("Cannot create DBus message out of memmory\n");
-		return NULL;
-	}	
-
-    return message;
-}
-
 gboolean xfpm_dbus_send_message(const char *signal)
 {
     DBusConnection *connection;
@@ -223,7 +207,7 @@
         return;
     }
     
-    message = xfpm_dbus_new_message(NM_SERVICE,NM_PATH,NM_INTERFACE,signal);
+    message = dbus_message_new_method_call(NM_SERVICE,NM_PATH,NM_INTERFACE,signal);
     
     if (!message)
     {

Modified: xfce4-power-manager/trunk/src/xfpm-dbus-messages.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dbus-messages.h	2008-10-20 15:18:41 UTC (rev 5724)
+++ xfce4-power-manager/trunk/src/xfpm-dbus-messages.h	2008-10-20 15:39:21 UTC (rev 5725)
@@ -32,8 +32,6 @@
 #include <glib.h>
 #include <dbus/dbus.h>
 
-DBusMessage *xfpm_dbus_new_message(const gchar *service  ,const gchar *remote_object,
-                                   const gchar *interface,const gchar *method);
 gboolean xfpm_dbus_name_has_owner(DBusConnection *connection,
                                   const gchar *service);
 gboolean xfpm_dbus_send_message            (const gchar *signal);

Modified: xfce4-power-manager/trunk/src/xfpm-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-hal.c	2008-10-20 15:18:41 UTC (rev 5724)
+++ xfce4-power-manager/trunk/src/xfpm-hal.c	2008-10-20 15:39:21 UTC (rev 5725)
@@ -537,10 +537,10 @@
     
     DBusMessage *mess;
 	
-	mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,
-					             HAL_ROOT_COMPUTER,
-					             HAL_DBUS_INTERFACE_POWER,
-					             "Shutdown");
+	mess = dbus_message_new_method_call(HAL_DBUS_SERVICE,
+					                    HAL_ROOT_COMPUTER,
+					                    HAL_DBUS_INTERFACE_POWER,
+					                    "Shutdown");
 	
 	if (!mess) {
 		return FALSE;
@@ -590,10 +590,10 @@
 	DBusError error;
 	gint exit_code;
     
-	mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,
-                                 HAL_ROOT_COMPUTER,
-                                 HAL_DBUS_INTERFACE_POWER,
-                                 "Hibernate");
+	mess = dbus_message_new_method_call(HAL_DBUS_SERVICE,
+                                        HAL_ROOT_COMPUTER,
+                                        HAL_DBUS_INTERFACE_POWER,
+                                        "Hibernate");
 	if (!mess) 
 	{
 	    *critical = 1;
@@ -680,10 +680,10 @@
 	int seconds = 0;
 	gint exit_code;
 
-	mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,
-                                 HAL_ROOT_COMPUTER,
-                                 HAL_DBUS_INTERFACE_POWER,
-                                 "Suspend");
+	mess = dbus_message_new_method_call(HAL_DBUS_SERVICE,
+                                        HAL_ROOT_COMPUTER,
+                                        HAL_DBUS_INTERFACE_POWER,
+                                        "Suspend");
 	if (!mess) 
 	{
 	    g_set_error(gerror,0,0,_("Out of memmory"));
@@ -773,10 +773,10 @@
     DBusMessage *mess,*reply;
 	DBusError error;
 
-	mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,
-                                 interface,
-                                 HAL_DBUS_INTERFACE_LCD,
-                                 "SetBrightness");
+	mess = dbus_message_new_method_call(HAL_DBUS_SERVICE,
+                                        interface,
+                                        HAL_DBUS_INTERFACE_LCD,
+                                        "SetBrightness");
 	if (!mess) 
 	{
 	    g_set_error(gerror,0,0,_("Out of memmory"));
@@ -822,10 +822,10 @@
 	DBusError error;
 	gint32 brightness_level;
 
-	mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,
-                                 interface,
-                                 HAL_DBUS_INTERFACE_LCD,
-                                 "GetBrightness");
+	mess = dbus_message_new_method_call(HAL_DBUS_SERVICE,
+                                        interface,
+                                        HAL_DBUS_INTERFACE_LCD,
+                                        "GetBrightness");
 	if (!mess) 
 	{
 	    g_set_error(gerror,0,0,_("Out of memmory"));
@@ -872,10 +872,10 @@
     gchar **govs = NULL;
     int dummy;
     
-    mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,
-                                 HAL_ROOT_COMPUTER,
-                                 HAL_DBUS_INTERFACE_CPU,
-                                 "GetCPUFreqAvailableGovernors");
+    mess = dbus_message_new_method_call(HAL_DBUS_SERVICE,
+                                        HAL_ROOT_COMPUTER,
+                                        HAL_DBUS_INTERFACE_CPU,
+                                        "GetCPUFreqAvailableGovernors");
     if (!mess) 
 	{
 	    g_set_error(gerror,0,0,_("Out of memmory"));
@@ -923,10 +923,10 @@
     DBusError error;
     gchar *gov = NULL;
     
-    mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,
-                                 HAL_ROOT_COMPUTER,
-                                 HAL_DBUS_INTERFACE_CPU,
-                                 "GetCPUFreqGovernor");
+    mess = dbus_message_new_method_call(HAL_DBUS_SERVICE,
+                                        HAL_ROOT_COMPUTER,
+                                        HAL_DBUS_INTERFACE_CPU,
+                                        "GetCPUFreqGovernor");
     
     if (!mess) 
 	{
@@ -976,10 +976,10 @@
     DBusMessage *mess;
     DBusMessage *reply;
     DBusError error;
-    mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,
-                                 HAL_ROOT_COMPUTER,
-                                 HAL_DBUS_INTERFACE_CPU,
-                                 "SetCPUFreqGovernor");
+    mess = dbus_message_new_method_call(HAL_DBUS_SERVICE,
+                                        HAL_ROOT_COMPUTER,
+                                        HAL_DBUS_INTERFACE_CPU,
+                                        "SetCPUFreqGovernor");
     if (!mess) 
 	{
 	    g_set_error(gerror,0,0,_("Out of memmory"));
@@ -1022,10 +1022,10 @@
     DBusMessage *mess;
     DBusMessage *reply;
     DBusError error;
-    mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,
-                                 HAL_ROOT_COMPUTER,
-                                 HAL_DBUS_INTERFACE_POWER,
-                                 "SetPowerSave");
+    mess = dbus_message_new_method_call(HAL_DBUS_SERVICE,
+                                        HAL_ROOT_COMPUTER,
+                                        HAL_DBUS_INTERFACE_POWER,
+                                        "SetPowerSave");
     if (!mess) 
 	{
 	    g_set_error(gerror,0,0,_("Out of memmory"));




More information about the Goodies-commits mailing list