[gnome-power-manager] Remove some unused code
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-power-manager] Remove some unused code
- Date: Wed, 6 May 2009 11:36:31 -0400 (EDT)
commit 98d08a3087ffc4fe3f42014c336e8ac3f00d8761
Author: Richard Hughes <richard hughsie com>
Date: Wed May 6 14:30:20 2009 +0100
Remove some unused code
---
libhal-glib/Makefile.am | 4 +-
libhal-glib/hal-device-power.c | 541 ----------------------------------------
libhal-glib/hal-device-power.h | 77 ------
libhal-glib/hal-device.c | 3 +-
libhal-glib/hal-device.h | 4 -
libhal-glib/hal-manager.c | 215 ----------------
libhal-glib/hal-manager.h | 19 --
src/gpm-brightness-hal.c | 2 +-
src/gpm-brightness-kbd.c | 2 +-
src/gpm-button.c | 2 +-
src/gpm-light-sensor.c | 2 +-
src/gpm-self-test.c | 2 -
test/gpm-st-hal-manager.c | 2 +-
test/gpm-st-hal-power.c | 59 -----
14 files changed, 7 insertions(+), 927 deletions(-)
diff --git a/libhal-glib/Makefile.am b/libhal-glib/Makefile.am
index 3bf2f91..5103b6f 100644
--- a/libhal-glib/Makefile.am
+++ b/libhal-glib/Makefile.am
@@ -25,9 +25,7 @@ libhal_la_SOURCES = \
hal-manager.c \
hal-manager.h \
hal-device-store.c \
- hal-device-store.h \
- hal-device-power.c \
- hal-device-power.h
+ hal-device-store.h
libhal_la_LIBADD = \
$(DBUS_LIBS) \
diff --git a/libhal-glib/hal-device-power.c b/libhal-glib/hal-device-power.c
deleted file mode 100644
index 69c8061..0000000
--- a/libhal-glib/hal-device-power.c
+++ /dev/null
@@ -1,541 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2005-2007 Richard Hughes <richard hughsie com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <dbus/dbus-glib.h>
-#include <time.h>
-
-#include "egg-debug.h"
-#include "egg-dbus-proxy.h"
-
-#include "hal-marshal.h"
-#include "hal-device-power.h"
-#include "hal-device.h"
-#include "hal-manager.h"
-
-static void hal_device_power_class_init (HalDevicePowerClass *klass);
-static void hal_device_power_init (HalDevicePower *power);
-static void hal_device_power_finalize (GObject *object);
-
-#define HAL_DEVICE_POWER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), HAL_TYPE_DEVICE_POWER, HalDevicePowerPrivate))
-
-struct HalDevicePowerPrivate
-{
- HalDevice *computer;
- EggDbusProxy *gproxy;
-};
-
-static gpointer hal_device_power_object = NULL;
-G_DEFINE_TYPE (HalDevicePower, hal_device_power, G_TYPE_OBJECT)
-
-/**
- * hal_device_power_class_init:
- * @klass: This class instance
- **/
-static void
-hal_device_power_class_init (HalDevicePowerClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = hal_device_power_finalize;
- g_type_class_add_private (klass, sizeof (HalDevicePowerPrivate));
-}
-
-/**
- * hal_device_power_init:
- *
- * @power: This class instance
- **/
-static void
-hal_device_power_init (HalDevicePower *power)
-{
- DBusGConnection *connection;
- power->priv = HAL_DEVICE_POWER_GET_PRIVATE (power);
-
- /* get the power connection */
- power->priv->gproxy = egg_dbus_proxy_new ();
- connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
- egg_dbus_proxy_assign (power->priv->gproxy, connection, HAL_DBUS_SERVICE,
- HAL_ROOT_COMPUTER, HAL_DBUS_INTERFACE_POWER);
- if (power->priv->gproxy == NULL)
- egg_warning ("HAL does not support power management!");
-
- power->priv->computer = hal_device_new ();
- hal_device_set_udi (power->priv->computer, HAL_ROOT_COMPUTER);
-}
-
-/**
- * hal_device_power_is_laptop:
- *
- * @power: This class instance
- * Return value: TRUE is computer is identified as a laptop
- *
- * Returns true if system.formfactor is "laptop"
- **/
-gboolean
-hal_device_power_is_laptop (HalDevicePower *power)
-{
- gboolean ret = TRUE;
- gchar *formfactor = NULL;
-
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
-
- /* always present */
- hal_device_get_string (power->priv->computer, "system.formfactor", &formfactor, NULL);
- if (formfactor == NULL) {
- /* no need to free */
- return FALSE;
- }
- if (strcmp (formfactor, "laptop") != 0) {
- egg_debug ("This machine is not identified as a laptop."
- "system.formfactor is %s.", formfactor);
- ret = FALSE;
- }
- g_free (formfactor);
- return ret;
-}
-
-/**
- * hal_device_power_has_support:
- *
- * @power: This class instance
- * Return value: TRUE if haldaemon has power management capability
- *
- * Finds out if power management functions are running (only ACPI, PMU, APM)
- **/
-gboolean
-hal_device_power_has_support (HalDevicePower *power)
-{
- gchar *type = NULL;
-
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
-
- hal_device_get_string (power->priv->computer, "power_management.type", &type, NULL);
- /* this key only has to exist to be pm okay */
- if (type != NULL) {
- g_free (type);
- return TRUE;
- }
- return FALSE;
-}
-
-/**
- * hal_device_power_can_suspend:
- *
- * @power: This class instance
- * Return value: TRUE if kernel suspend support is compiled in
- *
- * Finds out if HAL indicates that we can suspend
- **/
-gboolean
-hal_device_power_can_suspend (HalDevicePower *power)
-{
- gboolean exists;
- gboolean can_suspend;
-
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
-
- /* TODO: Change to can_suspend when rely on newer HAL */
- exists = hal_device_get_bool (power->priv->computer,
- "power_management.can_suspend",
- &can_suspend, NULL);
- if (exists == FALSE) {
- egg_warning ("Key can_suspend missing");
- return FALSE;
- }
- return can_suspend;
-}
-
-/**
- * hal_device_power_can_hibernate:
- *
- * @power: This class instance
- * Return value: TRUE if kernel hibernation support is compiled in
- *
- * Finds out if HAL indicates that we can hibernate
- **/
-gboolean
-hal_device_power_can_hibernate (HalDevicePower *power)
-{
- gboolean exists;
- gboolean can_hibernate;
-
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
-
- /* TODO: Change to can_hibernate when rely on newer HAL */
- exists = hal_device_get_bool (power->priv->computer,
- "power_management.can_hibernate",
- &can_hibernate, NULL);
- if (exists == FALSE) {
- egg_warning ("Key can_hibernate missing");
- return FALSE;
- }
- return can_hibernate;
-}
-
-/**
- * hal_device_power_filter_error:
- *
- * We have to ignore dbus timeouts sometimes
- **/
-static gboolean
-hal_device_power_filter_error (GError **error)
-{
- /* short cut for speed, no error */
- if (error == NULL || *error == NULL)
- return FALSE;
-
- /* DBUS might time out, which is okay. We can remove this code
- when the dbus glib bindings are fixed. See #332888 */
- if (g_error_matches (*error, DBUS_GERROR, DBUS_GERROR_NO_REPLY)) {
- egg_warning ("DBUS timed out, but recovering");
- g_error_free (*error);
- *error = NULL;
- return TRUE;
- }
- egg_warning ("Method failed\n(%s)", (*error)->message);
- return FALSE;
-}
-
-/**
- * hal_device_power_suspend:
- *
- * @power: This class instance
- * @wakeup: Seconds to wakeup, currently unsupported
- * Return value: Success, true if we suspended OK
- *
- * Uses org.freedesktop.Hal.Device.SystemPowerManagement.Suspend ()
- **/
-gboolean
-hal_device_power_suspend (HalDevicePower *power, guint wakeup, GError **error)
-{
- time_t start;
- time_t end;
- gint retval = 0;
- gboolean ret;
- DBusGProxy *proxy;
-
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
-
- proxy = egg_dbus_proxy_get_proxy (power->priv->gproxy);
- if (DBUS_IS_G_PROXY (proxy) == FALSE) {
- egg_warning ("proxy NULL!!");
- return FALSE;
- }
-
- time (&start);
- ret = dbus_g_proxy_call (proxy, "Suspend", error,
- G_TYPE_INT, wakeup,
- G_TYPE_INVALID,
- G_TYPE_INT, &retval,
- G_TYPE_INVALID);
- /* we might have to ignore the error */
- if (error != NULL && hal_device_power_filter_error (error))
- return TRUE;
- if (retval != 0)
- egg_warning ("Suspend failed without error message");
-
- /* compare the amount of time that has passed - if it's more than 6 hours
- * then the dbus call timed out (dbus-pending-call.c) */
- if (ret != 0) {
- time (&end);
- if (difftime (start, end) >= 6*60*60*1000)
- return TRUE;
- }
-
- return ret;
-}
-
-/**
- * hal_device_power_pm_method_void:
- *
- * @power: This class instance
- * @method: The method name, e.g. "Hibernate"
- * Return value: Success, true if we did OK
- *
- * Do a method on org.freedesktop.Hal.Device.SystemPowerManagement.*
- * with no arguments.
- **/
-static gboolean
-hal_device_power_pm_method_void (HalDevicePower *power, const gchar *method, GError **error)
-{
- time_t start;
- time_t end;
- guint retval = 0;
- gboolean ret;
- DBusGProxy *proxy;
-
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
- g_return_val_if_fail (method != NULL, FALSE);
-
- proxy = egg_dbus_proxy_get_proxy (power->priv->gproxy);
- if (DBUS_IS_G_PROXY (proxy) == FALSE) {
- egg_warning ("proxy NULL!!");
- return FALSE;
- }
- if (DBUS_IS_G_PROXY (proxy) == FALSE) {
- egg_warning ("not connected");
- return FALSE;
- }
-
- time (&start);
- ret = dbus_g_proxy_call (proxy, method, error,
- G_TYPE_INVALID,
- G_TYPE_INT, &retval,
- G_TYPE_INVALID);
- /* we might have to ignore the error */
- if (error != NULL && hal_device_power_filter_error (error))
- return TRUE;
- if (retval != 0)
- egg_warning ("%s failed in a horrible way!", method);
-
- /* compare the amount of time that has passed - if it's more than 6 hours
- * then the dbus call timed out (dbus-pending-call.c) */
- if (ret != 0) {
- time (&end);
- if (difftime (start,end) >= 6*60*60*1000)
- return TRUE;
- }
-
- return ret;
-}
-
-/**
- * hal_device_power_hibernate:
- *
- * @power: This class instance
- * Return value: Success, true if we hibernated OK
- *
- * Uses org.freedesktop.Hal.Device.SystemPowerManagement.Hibernate ()
- **/
-gboolean
-hal_device_power_hibernate (HalDevicePower *power, GError **error)
-{
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
- return hal_device_power_pm_method_void (power, "Hibernate", error);
-}
-
-/**
- * hal_device_power_shutdown:
- *
- * Return value: Success, true if we shutdown OK
- *
- * Uses org.freedesktop.Hal.Device.SystemPowerManagement.Shutdown ()
- **/
-gboolean
-hal_device_power_shutdown (HalDevicePower *power, GError **error)
-{
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
- return hal_device_power_pm_method_void (power, "Shutdown", error);
-}
-
-/**
- * hal_device_power_reboot:
- *
- * @power: This class instance
- * Return value: Success, true if we shutdown OK
- *
- * Uses org.freedesktop.Hal.Device.SystemPowerManagement.Reboot ()
- **/
-gboolean
-hal_device_power_reboot (HalDevicePower *power, GError **error)
-{
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
- return hal_device_power_pm_method_void (power, "Reboot", error);
-}
-
-/**
- * hal_device_power_enable_power_save:
- *
- * @power: This class instance
- * @enable: True to enable low power mode
- * Return value: Success, true if we set the mode
- *
- * Uses org.freedesktop.Hal.Device.SystemPowerManagement.SetPowerSave ()
- **/
-gboolean
-hal_device_power_enable_power_save (HalDevicePower *power, gboolean enable)
-{
- gint retval = 0;
- GError *error = NULL;
- gboolean ret;
- DBusGProxy *proxy;
-
- g_return_val_if_fail (power != NULL, FALSE);
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
-
- proxy = egg_dbus_proxy_get_proxy (power->priv->gproxy);
- if (DBUS_IS_G_PROXY (proxy) == FALSE) {
- egg_warning ("proxy NULL!!");
- return FALSE;
- }
-
- /* abort if we are not a "qualified" laptop */
- if (hal_device_power_is_laptop (power) == FALSE) {
- egg_debug ("We are not a laptop, so not even trying");
- return FALSE;
- }
-
- ret = dbus_g_proxy_call (proxy, "SetPowerSave", &error,
- G_TYPE_BOOLEAN, enable,
- G_TYPE_INVALID,
- G_TYPE_INT, &retval,
- G_TYPE_INVALID);
- if (retval != 0)
- egg_warning ("SetPowerSave failed in a horrible way!");
- return ret;
-}
-
-/**
- * hal_device_power_has_suspend_error:
- *
- * @power: This class instance
- * @enable: Return true if there was a suspend error
- * Return value: Success
- *
- * TODO: should call a method on HAL and also return the ouput of the file
- **/
-gboolean
-hal_device_power_has_suspend_error (HalDevicePower *power, gboolean *state)
-{
- g_return_val_if_fail (power != NULL, FALSE);
- g_return_val_if_fail (state != NULL, FALSE);
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
- *state = g_file_test ("/var/lib/hal/system-power-suspend-output", G_FILE_TEST_EXISTS);
- return TRUE;
-}
-
-/**
- * hal_device_power_has_hibernate_error:
- *
- * @power: This class instance
- * @enable: Return true if there was a hibernate error
- * Return value: Success
- *
- * TODO: should call a method on HAL and also return the ouput of the file
- **/
-gboolean
-hal_device_power_has_hibernate_error (HalDevicePower *power, gboolean *state)
-{
- g_return_val_if_fail (power != NULL, FALSE);
- g_return_val_if_fail (state != NULL, FALSE);
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
- *state = g_file_test ("/var/lib/hal/system-power-hibernate-output", G_FILE_TEST_EXISTS);
- return TRUE;
-}
-
-/**
- * hal_device_power_clear_suspend_error:
- *
- * @power: This class instance
- * Return value: Success
- *
- * Tells HAL to try and clear the suspend error as we appear to be okay
- **/
-gboolean
-hal_device_power_clear_suspend_error (HalDevicePower *power, GError **error)
-{
- gboolean ret;
- DBusGProxy *proxy;
-
- g_return_val_if_fail (power != NULL, FALSE);
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
-
- proxy = egg_dbus_proxy_get_proxy (power->priv->gproxy);
- if (DBUS_IS_G_PROXY (proxy) == FALSE) {
- egg_warning ("proxy NULL!!");
- return FALSE;
- }
-
- ret = dbus_g_proxy_call (proxy, "SuspendClearError", error,
- G_TYPE_INVALID, G_TYPE_INVALID);
- return ret;
-}
-
-/**
- * hal_device_power_clear_hibernate_error:
- *
- * @power: This class instance
- * Return value: Success
- *
- * Tells HAL to try and clear the hibernate error as we appear to be okay
- **/
-gboolean
-hal_device_power_clear_hibernate_error (HalDevicePower *power, GError **error)
-{
- gboolean ret;
- DBusGProxy *proxy;
-
- g_return_val_if_fail (power != NULL, FALSE);
- g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
-
- proxy = egg_dbus_proxy_get_proxy (power->priv->gproxy);
- if (DBUS_IS_G_PROXY (proxy) == FALSE) {
- egg_warning ("proxy NULL!!");
- return FALSE;
- }
-
- ret = dbus_g_proxy_call (proxy, "HibernateClearError", error,
- G_TYPE_INVALID, G_TYPE_INVALID);
- return ret;
-}
-
-/**
- * hal_device_power_finalize:
- * @object: This class instance
- **/
-static void
-hal_device_power_finalize (GObject *object)
-{
- HalDevicePower *power;
- g_return_if_fail (object != NULL);
- g_return_if_fail (HAL_IS_DEVICE_POWER (object));
-
- power = HAL_DEVICE_POWER (object);
- power->priv = HAL_DEVICE_POWER_GET_PRIVATE (power);
-
- g_object_unref (power->priv->gproxy);
- g_object_unref (power->priv->computer);
-
- G_OBJECT_CLASS (hal_device_power_parent_class)->finalize (object);
-}
-
-/**
- * hal_device_power_new:
- * Return value: new HalDevicePower instance.
- **/
-HalDevicePower *
-hal_device_power_new (void)
-{
- if (hal_device_power_object != NULL) {
- g_object_ref (hal_device_power_object);
- } else {
- hal_device_power_object = g_object_new (HAL_TYPE_DEVICE_POWER, NULL);
- g_object_add_weak_pointer (hal_device_power_object, &hal_device_power_object);
- }
- return HAL_DEVICE_POWER (hal_device_power_object);
-}
-
diff --git a/libhal-glib/hal-device-power.h b/libhal-glib/hal-device-power.h
deleted file mode 100644
index 702c9a1..0000000
--- a/libhal-glib/hal-device-power.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2005-2007 Richard Hughes <richard hughsie com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __HALDEVICEPOWER_H
-#define __HALDEVICEPOWER_H
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define HAL_TYPE_DEVICE_POWER (hal_device_power_get_type ())
-#define HAL_DEVICE_POWER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), HAL_TYPE_DEVICE_POWER, HalDevicePower))
-#define HAL_DEVICE_POWER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), HAL_TYPE_DEVICE_POWER, HalDevicePowerClass))
-#define HAL_IS_DEVICE_POWER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), HAL_TYPE_DEVICE_POWER))
-#define HAL_IS_DEVICE_POWER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), HAL_TYPE_DEVICE_POWER))
-#define HAL_DEVICE_POWER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), HAL_TYPE_DEVICE_POWER, HalDevicePowerClass))
-
-typedef struct HalDevicePowerPrivate HalDevicePowerPrivate;
-
-typedef struct
-{
- GObject parent;
- HalDevicePowerPrivate *priv;
-} HalDevicePower;
-
-typedef struct
-{
- GObjectClass parent_class;
-} HalDevicePowerClass;
-
-GType hal_device_power_get_type (void);
-HalDevicePower *hal_device_power_new (void);
-
-gboolean hal_device_power_has_support (HalDevicePower *power);
-gboolean hal_device_power_can_suspend (HalDevicePower *power);
-gboolean hal_device_power_can_hibernate (HalDevicePower *power);
-gboolean hal_device_power_suspend (HalDevicePower *power,
- guint wakeup,
- GError **error);
-gboolean hal_device_power_hibernate (HalDevicePower *power,
- GError **error);
-gboolean hal_device_power_shutdown (HalDevicePower *power,
- GError **error);
-gboolean hal_device_power_reboot (HalDevicePower *power,
- GError **error);
-gboolean hal_device_power_has_suspend_error (HalDevicePower *power,
- gboolean *state);
-gboolean hal_device_power_has_hibernate_error (HalDevicePower *power,
- gboolean *state);
-gboolean hal_device_power_clear_suspend_error (HalDevicePower *power,
- GError **error);
-gboolean hal_device_power_clear_hibernate_error (HalDevicePower *power,
- GError **error);
-gboolean hal_device_power_enable_power_save (HalDevicePower *power,
- gboolean enable);
-
-G_END_DECLS
-
-#endif /* __HALDEVICEPOWER_H */
diff --git a/libhal-glib/hal-device.c b/libhal-glib/hal-device.c
index b4d73a6..02d0629 100644
--- a/libhal-glib/hal-device.c
+++ b/libhal-glib/hal-device.c
@@ -32,7 +32,6 @@
#include "egg-dbus-proxy.h"
#include "hal-marshal.h"
-#include "hal-device-power.h"
#include "hal-device.h"
#include "hal-manager.h"
@@ -202,7 +201,7 @@ hal_device_get_string (HalDevice *device,
* @value: return value, passed by ref
* Return value: TRUE for success, FALSE for failure
**/
-gboolean
+static gboolean
hal_device_get_int (HalDevice *device,
const gchar *key,
gint *value,
diff --git a/libhal-glib/hal-device.h b/libhal-glib/hal-device.h
index ffd7e19..8a505be 100644
--- a/libhal-glib/hal-device.h
+++ b/libhal-glib/hal-device.h
@@ -74,10 +74,6 @@ gboolean hal_device_get_string (HalDevice *device,
const gchar *key,
gchar **value,
GError **error);
-gboolean hal_device_get_int (HalDevice *device,
- const gchar *key,
- gint *value,
- GError **error);
gboolean hal_device_get_uint (HalDevice *device,
const gchar *key,
guint *value,
diff --git a/libhal-glib/hal-manager.c b/libhal-glib/hal-manager.c
index 37ac076..c386461 100644
--- a/libhal-glib/hal-manager.c
+++ b/libhal-glib/hal-manager.c
@@ -33,7 +33,6 @@
#include "egg-dbus-proxy.h"
#include "hal-marshal.h"
-#include "hal-device-power.h"
#include "hal-device.h"
#include "hal-manager.h"
@@ -54,16 +53,12 @@ struct HalManagerPrivate
*
* device-added
* device-removed
- * new-capability
- * lost-capability
* daemon-start
* daemon-stop
*/
enum {
DEVICE_ADDED,
DEVICE_REMOVED,
- NEW_CAPABILITY,
- LOST_CAPABILITY,
DAEMON_START,
DAEMON_STOP,
LAST_SIGNAL
@@ -75,27 +70,6 @@ static gpointer hal_manager_object = NULL;
G_DEFINE_TYPE (HalManager, hal_manager, G_TYPE_OBJECT)
/**
- * hal_manager_is_running:
- *
- * @hal_manager: This class instance
- * Return value: TRUE if hal_managerdaemon is running
- *
- * Finds out if hal_manager is running
- **/
-gboolean
-hal_manager_is_running (HalManager *manager)
-{
- gchar *udi = NULL;
- gboolean running;
-
- g_return_val_if_fail (HAL_IS_MANAGER (manager), FALSE);
-
- running = hal_device_get_string (manager->priv->computer, "info.udi", &udi, NULL);
- g_free (udi);
- return running;
-}
-
-/**
* hal_manager_find_capability:
*
* @hal_manager: This class instance
@@ -132,145 +106,6 @@ hal_manager_find_capability (HalManager *manager,
}
/**
- * hal_manager_find_device_string_match:
- *
- * @hal_manager: This class instance
- * @key: The key, e.g. "battery.type"
- * @value: The value, e.g. "primary"
- * @devices: return value, passed by ref
- * Return value: TRUE for success, FALSE for failure
- **/
-gboolean
-hal_manager_find_device_string_match (HalManager *manager,
- const gchar *key,
- const gchar *value,
- gchar ***devices,
- GError **error)
-{
- DBusGProxy *proxy = NULL;
- gboolean ret;
-
- g_return_val_if_fail (HAL_IS_MANAGER (manager), FALSE);
- g_return_val_if_fail (key != NULL, FALSE);
- g_return_val_if_fail (value != NULL, FALSE);
- g_return_val_if_fail (devices != NULL, FALSE);
-
- proxy = dbus_g_proxy_new_for_name (manager->priv->connection,
- HAL_DBUS_SERVICE,
- HAL_DBUS_PATH_MANAGER,
- HAL_DBUS_INTERFACE_MANAGER);
- ret = dbus_g_proxy_call (proxy, "FindDeviceStringMatch", error,
- G_TYPE_STRING, key,
- G_TYPE_STRING, value,
- G_TYPE_INVALID,
- G_TYPE_STRV, devices,
- G_TYPE_INVALID);
- if (!ret) {
- *devices = NULL;
- }
- return ret;
-}
-
-/**
- * hal_manager_free_capability:
- *
- * @value: The list of strings to free
- *
- * Frees value result of hal_manager_find_capability. Safe to call with NULL.
- **/
-void
-hal_manager_free_capability (gchar **value)
-{
- gint i;
-
- if (value == NULL) {
- return;
- }
- for (i=0; value[i]; i++) {
- g_free (value[i]);
- }
- g_free (value);
-}
-
-/**
- * hal_manager_num_devices_of_capability:
- *
- * @manager: This class instance
- * @capability: The capability, e.g. "battery"
- * Return value: Number of devices of that capability
- *
- * Get the number of devices on system with a specific capability
- **/
-gint
-hal_manager_num_devices_of_capability (HalManager *manager,
- const gchar *capability)
-{
- gint i;
- gchar **names;
- gboolean ret;
-
- g_return_val_if_fail (HAL_IS_MANAGER (manager), 0);
- g_return_val_if_fail (capability != NULL, 0);
-
- ret = hal_manager_find_capability (manager, capability, &names, NULL);
- if (!ret) {
- return 0;
- }
- /* iterate to find number of items */
- for (i = 0; names[i]; i++) {};
- hal_manager_free_capability (names);
- return i;
-}
-
-/**
- * hal_manager_num_devices_of_capability_with_value:
- *
- * @manager: This class instance
- * @capability: The capability, e.g. "battery"
- * @key: The key to match, e.g. "button.type"
- * @value: The key match, e.g. "power"
- * Return value: Number of devices of that capability
- *
- * Get the number of devices on system with a specific capability and key value
- **/
-gint
-hal_manager_num_devices_of_capability_with_value (HalManager *manager,
- const gchar *capability,
- const gchar *key,
- const gchar *value)
-{
- gint i;
- gint valid = 0;
- gchar **names;
- gboolean ret;
- HalDevice *hal_device;
-
- g_return_val_if_fail (HAL_IS_MANAGER (manager), 0);
- g_return_val_if_fail (capability != NULL, 0);
- g_return_val_if_fail (key != NULL, 0);
- g_return_val_if_fail (value != NULL, 0);
-
- ret = hal_manager_find_capability (manager, capability, &names, NULL);
- if (!ret) {
- return 0;
- }
- for (i = 0; names[i]; i++) {
- gchar *type = NULL;
- hal_device = hal_device_new ();
- hal_device_set_udi (hal_device, names[i]);
- hal_device_get_string (hal_device, key, &type, NULL);
- g_object_unref (hal_device);
- if (type != NULL) {
- if (strcmp (type, value) == 0)
- valid++;
- g_free (type);
- }
- }
- hal_manager_free_capability (names);
- return valid;
-}
-
-/**
* hal_manager_class_init:
* @klass: This class instance
**/
@@ -303,28 +138,6 @@ hal_manager_class_init (HalManagerClass *klass)
G_TYPE_NONE,
1, G_TYPE_STRING);
- signals [NEW_CAPABILITY] =
- g_signal_new ("new-capability",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (HalManagerClass, new_capability),
- NULL,
- NULL,
- hal_marshal_VOID__STRING_STRING,
- G_TYPE_NONE,
- 2, G_TYPE_STRING, G_TYPE_STRING);
-
- signals [LOST_CAPABILITY] =
- g_signal_new ("lost-capability",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (HalManagerClass, lost_capability),
- NULL,
- NULL,
- hal_marshal_VOID__STRING_STRING,
- G_TYPE_NONE,
- 2, G_TYPE_STRING, G_TYPE_STRING);
-
signals [DAEMON_START] =
g_signal_new ("daemon-start",
G_TYPE_FROM_CLASS (object_class),
@@ -379,25 +192,6 @@ hal_manager_device_removed_cb (DBusGProxy *proxy,
}
/**
- * hal_manager_new_capability_cb:
- *
- * @proxy: The org.freedesktop.Hal.Manager proxy
- * @udi: Univerisal Device Id
- * @capability: The new capability, e.g. "battery"
- * @manager: This class instance
- *
- * Invoked when a device gets a new condition.
- */
-static void
-hal_manager_new_capability_cb (DBusGProxy *proxy,
- const gchar *udi,
- const gchar *capability,
- HalManager *manager)
-{
- g_signal_emit (manager, signals [NEW_CAPABILITY], 0, udi, capability);
-}
-
-/**
* hal_manager_proxy_connect_more:
*
* @manager: This class instance
@@ -429,13 +223,6 @@ hal_manager_proxy_connect_more (HalManager *manager)
dbus_g_proxy_connect_signal (proxy, "DeviceRemoved",
G_CALLBACK (hal_manager_device_removed_cb), manager, NULL);
- dbus_g_object_register_marshaller (hal_marshal_VOID__STRING_STRING,
- G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
- dbus_g_proxy_add_signal (proxy, "NewCapability",
- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (proxy, "NewCapability",
- G_CALLBACK (hal_manager_new_capability_cb), manager, NULL);
-
return TRUE;
}
@@ -462,8 +249,6 @@ hal_manager_proxy_disconnect_more (HalManager *manager)
dbus_g_proxy_disconnect_signal (proxy, "DeviceRemoved",
G_CALLBACK (hal_manager_device_removed_cb), manager);
- dbus_g_proxy_disconnect_signal (proxy, "NewCapability",
- G_CALLBACK (hal_manager_new_capability_cb), manager);
return TRUE;
}
diff --git a/libhal-glib/hal-manager.h b/libhal-glib/hal-manager.h
index dd60dc2..fdb0c95 100644
--- a/libhal-glib/hal-manager.h
+++ b/libhal-glib/hal-manager.h
@@ -69,12 +69,6 @@ typedef struct
const gchar *udi);
void (* device_removed) (HalManager *manager,
const gchar *udi);
- void (* new_capability) (HalManager *manager,
- const gchar *udi,
- const gchar *capability);
- void (* lost_capability) (HalManager *manager,
- const gchar *udi,
- const gchar *capability);
void (* daemon_start) (HalManager *manager);
void (* daemon_stop) (HalManager *manager);
} HalManagerClass;
@@ -82,23 +76,10 @@ typedef struct
GType hal_manager_get_type (void);
HalManager *hal_manager_new (void);
-gboolean hal_manager_is_running (HalManager *manager);
-gint hal_manager_num_devices_of_capability (HalManager *manager,
- const gchar *capability);
-gint hal_manager_num_devices_of_capability_with_value (HalManager *manager,
- const gchar *capability,
- const gchar *key,
- const gchar *value);
gboolean hal_manager_find_capability (HalManager *manager,
const gchar *capability,
gchar ***value,
GError **error);
-gboolean hal_manager_find_device_string_match (HalManager *manager,
- const gchar *key,
- const gchar *value,
- gchar ***devices,
- GError **error);
-void hal_manager_free_capability (gchar **value);
gboolean hal_manager_is_laptop (HalManager *manager);
G_END_DECLS
diff --git a/src/gpm-brightness-hal.c b/src/gpm-brightness-hal.c
index d198c81..546f47f 100644
--- a/src/gpm-brightness-hal.c
+++ b/src/gpm-brightness-hal.c
@@ -465,7 +465,7 @@ gpm_brightness_hal_init (GpmBrightnessHal *brightness)
/* We only want first laptop_panel object (should only be one) */
brightness->priv->udi = g_strdup (names[0]);
- hal_manager_free_capability (names);
+ g_strfreev (names);
device = hal_device_new ();
hal_device_set_udi (device, brightness->priv->udi);
diff --git a/src/gpm-brightness-kbd.c b/src/gpm-brightness-kbd.c
index 8193d18..39edb19 100644
--- a/src/gpm-brightness-kbd.c
+++ b/src/gpm-brightness-kbd.c
@@ -757,7 +757,7 @@ gpm_brightness_kbd_init (GpmBrightnessKbd *brightness)
/* choose a start value */
adjust_kbd_brightness_according_to_ambient_light (brightness, TRUE);
out:
- hal_manager_free_capability (names);
+ g_strfreev (names);
g_object_unref (manager);
}
diff --git a/src/gpm-button.c b/src/gpm-button.c
index e42390f..b9cb8df 100644
--- a/src/gpm-button.c
+++ b/src/gpm-button.c
@@ -465,7 +465,7 @@ coldplug_buttons (GpmButton *button)
egg_debug ("Couldn't obtain list of buttons");
}
- hal_manager_free_capability (device_names);
+ g_strfreev (device_names);
}
/**
diff --git a/src/gpm-light-sensor.c b/src/gpm-light-sensor.c
index 2ce8268..143a3ef 100644
--- a/src/gpm-light-sensor.c
+++ b/src/gpm-light-sensor.c
@@ -334,7 +334,7 @@ gpm_light_sensor_init (GpmLightSensor *sensor)
sensor->priv->udi = g_strdup (names[0]);
sensor->priv->has_sensor = TRUE;
}
- hal_manager_free_capability (names);
+ g_strfreev (names);
/* connect to the devices */
if (sensor->priv->has_sensor) {
diff --git a/src/gpm-self-test.c b/src/gpm-self-test.c
index be612ce..4b4ef06 100644
--- a/src/gpm-self-test.c
+++ b/src/gpm-self-test.c
@@ -43,7 +43,6 @@ void gpm_phone_test (EggTest *test);
void gpm_dpms_test (EggTest *test);
void gpm_graph_widget_test (EggTest *test);
void gpm_proxy_test (EggTest *test);
-void gpm_hal_device_power_test (EggTest *test);
void gpm_hal_manager_test (EggTest *test);
void gpm_device_test (EggTest *test);
void gpm_device_teststore (EggTest *test);
@@ -75,7 +74,6 @@ main (int argc, char **argv)
#if 0
gpm_proxy_test (test);
- gpm_hal_device_power_test (test);
gpm_hal_manager_test (test);
gpm_device_test (test);
gpm_device_teststore (test);
diff --git a/test/gpm-st-hal-manager.c b/test/gpm-st-hal-manager.c
index d321d4c..12927d7 100644
--- a/test/gpm-st-hal-manager.c
+++ b/test/gpm-st-hal-manager.c
@@ -62,7 +62,7 @@ egg_test_hal_manager (GpmSelfTest *test)
} else {
egg_test_failed (test, "did not find battery device");
}
- hal_manager_free_capability (value);
+ g_strfreev (value);
g_object_unref (manager);
diff --git a/test/gpm-st-hal-power.c b/test/gpm-st-hal-power.c
deleted file mode 100644
index 9572089..0000000
--- a/test/gpm-st-hal-power.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2007 Richard Hughes <richard hughsie com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <glib.h>
-#include "gpm-st-main.h"
-
-#include <hal-device-power.h>
-
-void
-egg_test_hal_device_power (GpmSelfTest *test)
-{
- HalDevicePower *power;
- gboolean ret;
-
- if (egg_test_start (test, "HalDevicePower") == FALSE) {
- return;
- }
-
- /************************************************************/
- egg_test_title (test, "make sure we get a non null device");
- power = hal_device_power_new ();
- if (power != NULL) {
- egg_test_success (test, "got HalDevicePower");
- } else {
- egg_test_failed (test, "could not get HalDevicePower");
- }
-
- /************************************************************/
- egg_test_title (test, "make sure we have pm support");
- ret = hal_device_power_has_support (power);
- if (ret) {
- egg_test_success (test, "has pm support");
- } else {
- egg_test_failed (test, "does not have pm support");
- }
-
- g_object_unref (power);
-
- egg_test_end (test);
-}
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
