gnome-power-manager r3026 - in trunk: . applets/brightness applets/inhibit libhal-glib src test



Author: rhughes
Date: Mon Oct 20 21:50:54 2008
New Revision: 3026
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3026&view=rev

Log:
2008-10-20  Richard Hughes  <richard hughsie com>

* applets/brightness/Makefile.am:
* applets/brightness/brightness-applet.c:
* applets/brightness/egg-dbus-monitor.c:
* applets/brightness/egg-dbus-monitor.h:
* applets/brightness/egg-debug.c:
* applets/brightness/egg-debug.h:
* applets/brightness/gpm-common.h:
* applets/inhibit/Makefile.am:
* applets/inhibit/egg-dbus-monitor.c:
* applets/inhibit/egg-dbus-monitor.h:
* applets/inhibit/egg-debug.c:
* applets/inhibit/egg-debug.h:
* applets/inhibit/gpm-common.h:
* applets/inhibit/inhibit-applet.c:
* libhal-glib/Makefile.am:
* libhal-glib/hal-device-power.c:
* libhal-glib/hal-device-power.h:
* libhal-glib/hal-device-store.c:
* libhal-glib/hal-device-store.h:
* libhal-glib/hal-device.c:
* libhal-glib/hal-device.h:
* libhal-glib/hal-manager.c:
* libhal-glib/hal-manager.h:
* libhal-glib/libhal-gdevice.c:
* libhal-glib/libhal-gdevice.h:
* libhal-glib/libhal-gdevicestore.c:
* libhal-glib/libhal-gdevicestore.h:
* libhal-glib/libhal-gmanager.c:
* libhal-glib/libhal-gmanager.h:
* libhal-glib/libhal-gpower.c:
* libhal-glib/libhal-gpower.h:
* libhal-glib/libhal-marshal.list:
* src/Makefile.am:
* src/gpm-ac-adapter.c: (gpm_ac_adapter_is_present),
(hal_device_property_modified_cb), (gpm_ac_adapter_init):
* src/gpm-backlight.c: (gpm_backlight_init):
* src/gpm-brightness-hal.c: (gpm_brightness_hal_init):
* src/gpm-brightness-kbd.c: (gpm_brightness_kbd_init),
(gpm_brightness_kbd_has_hw):
* src/gpm-button.c: (emit_button_pressed),
(hal_device_property_modified_cb), (hal_device_condition_cb),
(watch_add_button), (coldplug_buttons), (hal_daemon_start_cb),
(hal_daemon_stop_cb), (gpm_button_init):
* src/gpm-cell-array.c: (gpm_check_device_key),
(gpm_cell_array_coldplug), (hal_device_removed_cb),
(hal_new_capability_cb), (hal_device_added_cb),
(hal_daemon_start_cb), (hal_daemon_stop_cb), (gpm_cell_array_init):
* src/gpm-cell.c: (gpm_cell_refresh_hal_all),
(battery_key_changed), (hal_device_property_modified_cb),
(gpm_cell_set_device_id), (gpm_cell_get_device_id),
(gpm_cell_init), (gpm_cell_get_battery):
* src/gpm-control.c: (gpm_control_allowed_suspend),
(gpm_control_allowed_hibernate), (gpm_control_shutdown),
(gpm_control_reboot), (gpm_control_suspend),
(gpm_control_hibernate), (gpm_control_finalize),
(gpm_control_init):
* src/gpm-engine.c: (hal_daemon_start_cb), (hal_daemon_stop_cb),
(gpm_engine_init):
* src/gpm-info.c: (gpm_info_init):
* src/gpm-light-sensor.c: (gpm_light_sensor_init):
* src/gpm-load.c:
* src/gpm-manager.c: (gpm_manager_sync_policy_sleep),
(gpm_manager_action_suspend), (gpm_manager_action_hibernate),
(gpm_manager_suspend), (gpm_manager_hibernate),
(gpm_manager_check_sleep_errors), (screensaver_auth_request_cb),
(gpm_manager_at_exit), (has_inhibit_changed_cb),
(gpm_manager_init), (gpm_manager_finalize):
* src/gpm-prefs-core.c:
* src/gpm-self-test.c: (main):
* src/gpm-self-test.h:
* test/gpm-st-hal-device.c: (egg_test_hal_device):
* test/gpm-st-hal-devicestore.c: (egg_test_hal_devicestore):
* test/gpm-st-hal-manager.c: (egg_test_hal_manager):
* test/gpm-st-hal-power.c: (egg_test_hal_device_power):
Rename the libhal-glib files to be a single library with a proper
prefix. Cleanup, no real code changes.


Added:
   trunk/applets/brightness/egg-dbus-monitor.c   (contents, props changed)
   trunk/applets/brightness/egg-dbus-monitor.h   (contents, props changed)
   trunk/applets/brightness/egg-debug.c   (contents, props changed)
   trunk/applets/brightness/egg-debug.h   (contents, props changed)
   trunk/applets/brightness/gpm-common.h   (contents, props changed)
   trunk/applets/inhibit/egg-dbus-monitor.c   (contents, props changed)
   trunk/applets/inhibit/egg-dbus-monitor.h   (contents, props changed)
   trunk/applets/inhibit/egg-debug.c   (contents, props changed)
   trunk/applets/inhibit/egg-debug.h   (contents, props changed)
   trunk/applets/inhibit/gpm-common.h   (contents, props changed)
   trunk/libhal-glib/hal-device-power.c   (contents, props changed)
      - copied, changed from r3025, /trunk/libhal-glib/libhal-gpower.c
   trunk/libhal-glib/hal-device-power.h   (contents, props changed)
      - copied, changed from r3024, /trunk/libhal-glib/libhal-gpower.h
   trunk/libhal-glib/hal-device-store.c   (contents, props changed)
      - copied, changed from r3025, /trunk/libhal-glib/libhal-gdevicestore.c
   trunk/libhal-glib/hal-device-store.h   (contents, props changed)
      - copied, changed from r3024, /trunk/libhal-glib/libhal-gdevicestore.h
   trunk/libhal-glib/hal-device.c   (contents, props changed)
      - copied, changed from r3025, /trunk/libhal-glib/libhal-gdevice.c
   trunk/libhal-glib/hal-device.h   (contents, props changed)
      - copied, changed from r3024, /trunk/libhal-glib/libhal-gdevice.h
   trunk/libhal-glib/hal-manager.c   (contents, props changed)
      - copied, changed from r3025, /trunk/libhal-glib/libhal-gmanager.c
   trunk/libhal-glib/hal-manager.h   (contents, props changed)
      - copied, changed from r3024, /trunk/libhal-glib/libhal-gmanager.h
   trunk/libhal-glib/hal-marshal.list   (props changed)
      - copied unchanged from r3024, /trunk/libhal-glib/libhal-marshal.list
Removed:
   trunk/libhal-glib/libhal-gdevice.c
   trunk/libhal-glib/libhal-gdevice.h
   trunk/libhal-glib/libhal-gdevicestore.c
   trunk/libhal-glib/libhal-gdevicestore.h
   trunk/libhal-glib/libhal-gmanager.c
   trunk/libhal-glib/libhal-gmanager.h
   trunk/libhal-glib/libhal-gpower.c
   trunk/libhal-glib/libhal-gpower.h
   trunk/libhal-glib/libhal-marshal.list
Modified:
   trunk/ChangeLog
   trunk/applets/brightness/Makefile.am
   trunk/applets/brightness/brightness-applet.c
   trunk/applets/inhibit/Makefile.am
   trunk/applets/inhibit/inhibit-applet.c
   trunk/libhal-glib/Makefile.am
   trunk/src/Makefile.am
   trunk/src/gpm-ac-adapter.c
   trunk/src/gpm-backlight.c
   trunk/src/gpm-brightness-hal.c
   trunk/src/gpm-brightness-kbd.c
   trunk/src/gpm-button.c
   trunk/src/gpm-cell-array.c
   trunk/src/gpm-cell.c
   trunk/src/gpm-control.c
   trunk/src/gpm-engine.c
   trunk/src/gpm-info.c
   trunk/src/gpm-light-sensor.c
   trunk/src/gpm-load.c
   trunk/src/gpm-manager.c
   trunk/src/gpm-prefs-core.c
   trunk/src/gpm-self-test.c
   trunk/src/gpm-self-test.h
   trunk/test/gpm-st-hal-device.c
   trunk/test/gpm-st-hal-devicestore.c
   trunk/test/gpm-st-hal-manager.c
   trunk/test/gpm-st-hal-power.c

Modified: trunk/applets/brightness/Makefile.am
==============================================================================
--- trunk/applets/brightness/Makefile.am	(original)
+++ trunk/applets/brightness/Makefile.am	Mon Oct 20 21:50:54 2008
@@ -20,7 +20,7 @@
 
 libexec_PROGRAMS=gnome-brightness-applet
 
-gnome_brightness_applet_SOURCES = brightness-applet.c ../../src/egg-dbus-monitor.c ../../src/egg-debug.c
+gnome_brightness_applet_SOURCES = brightness-applet.c egg-dbus-monitor.c egg-dbus-monitor.h egg-debug.c egg-debug.h gpm-common.h
 gnome_brightness_applet_LDADD =					\
 	$(DBUS_LIBS)						\
 	$(GNOME_LIBS)

Modified: trunk/applets/brightness/brightness-applet.c
==============================================================================
--- trunk/applets/brightness/brightness-applet.c	(original)
+++ trunk/applets/brightness/brightness-applet.c	Mon Oct 20 21:50:54 2008
@@ -35,9 +35,9 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 
-#include "../src/egg-debug.h"
-#include "../src/egg-dbus-monitor.h"
-#include "../src/gpm-common.h"
+#include "egg-debug.h"
+#include "egg-dbus-monitor.h"
+#include "gpm-common.h"
 
 #define GPM_TYPE_BRIGHTNESS_APPLET		(gpm_brightness_applet_get_type ())
 #define GPM_BRIGHTNESS_APPLET(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GPM_TYPE_BRIGHTNESS_APPLET, GpmBrightnessApplet))

Added: trunk/applets/brightness/egg-dbus-monitor.c
==============================================================================
--- (empty file)
+++ trunk/applets/brightness/egg-dbus-monitor.c	Mon Oct 20 21:50:54 2008
@@ -0,0 +1 @@
+link ../../src/egg-dbus-monitor.c
\ No newline at end of file

Added: trunk/applets/brightness/egg-dbus-monitor.h
==============================================================================
--- (empty file)
+++ trunk/applets/brightness/egg-dbus-monitor.h	Mon Oct 20 21:50:54 2008
@@ -0,0 +1 @@
+link ../../src/egg-dbus-monitor.h
\ No newline at end of file

Added: trunk/applets/brightness/egg-debug.c
==============================================================================
--- (empty file)
+++ trunk/applets/brightness/egg-debug.c	Mon Oct 20 21:50:54 2008
@@ -0,0 +1 @@
+link ../../src/egg-debug.c
\ No newline at end of file

Added: trunk/applets/brightness/egg-debug.h
==============================================================================
--- (empty file)
+++ trunk/applets/brightness/egg-debug.h	Mon Oct 20 21:50:54 2008
@@ -0,0 +1 @@
+link ../../src/egg-debug.h
\ No newline at end of file

Added: trunk/applets/brightness/gpm-common.h
==============================================================================
--- (empty file)
+++ trunk/applets/brightness/gpm-common.h	Mon Oct 20 21:50:54 2008
@@ -0,0 +1 @@
+link ../../src/gpm-common.h
\ No newline at end of file

Modified: trunk/applets/inhibit/Makefile.am
==============================================================================
--- trunk/applets/inhibit/Makefile.am	(original)
+++ trunk/applets/inhibit/Makefile.am	Mon Oct 20 21:50:54 2008
@@ -20,7 +20,7 @@
 
 libexec_PROGRAMS=gnome-inhibit-applet
 
-gnome_inhibit_applet_SOURCES = inhibit-applet.c ../../src/egg-dbus-monitor.c ../../src/egg-debug.c
+gnome_inhibit_applet_SOURCES = inhibit-applet.c egg-dbus-monitor.c egg-dbus-monitor.h egg-debug.c egg-debug.h gpm-common.h
 gnome_inhibit_applet_LDADD =					\
 	$(DBUS_LIBS)						\
 	$(GNOME_LIBS)

Added: trunk/applets/inhibit/egg-dbus-monitor.c
==============================================================================
--- (empty file)
+++ trunk/applets/inhibit/egg-dbus-monitor.c	Mon Oct 20 21:50:54 2008
@@ -0,0 +1 @@
+link ../../src/egg-dbus-monitor.c
\ No newline at end of file

Added: trunk/applets/inhibit/egg-dbus-monitor.h
==============================================================================
--- (empty file)
+++ trunk/applets/inhibit/egg-dbus-monitor.h	Mon Oct 20 21:50:54 2008
@@ -0,0 +1 @@
+link ../../src/egg-dbus-monitor.h
\ No newline at end of file

Added: trunk/applets/inhibit/egg-debug.c
==============================================================================
--- (empty file)
+++ trunk/applets/inhibit/egg-debug.c	Mon Oct 20 21:50:54 2008
@@ -0,0 +1 @@
+link ../../src/egg-debug.c
\ No newline at end of file

Added: trunk/applets/inhibit/egg-debug.h
==============================================================================
--- (empty file)
+++ trunk/applets/inhibit/egg-debug.h	Mon Oct 20 21:50:54 2008
@@ -0,0 +1 @@
+link ../../src/egg-debug.h
\ No newline at end of file

Added: trunk/applets/inhibit/gpm-common.h
==============================================================================
--- (empty file)
+++ trunk/applets/inhibit/gpm-common.h	Mon Oct 20 21:50:54 2008
@@ -0,0 +1 @@
+link ../../src/gpm-common.h
\ No newline at end of file

Modified: trunk/applets/inhibit/inhibit-applet.c
==============================================================================
--- trunk/applets/inhibit/inhibit-applet.c	(original)
+++ trunk/applets/inhibit/inhibit-applet.c	Mon Oct 20 21:50:54 2008
@@ -34,9 +34,9 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 
-#include "../src/egg-debug.h"
-#include "../src/egg-dbus-monitor.h"
-#include "../src/gpm-common.h"
+#include "egg-debug.h"
+#include "egg-dbus-monitor.h"
+#include "gpm-common.h"
 
 #define GPM_TYPE_INHIBIT_APPLET		(gpm_inhibit_applet_get_type ())
 #define GPM_INHIBIT_APPLET(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GPM_TYPE_INHIBIT_APPLET, GpmInhibitApplet))

Modified: trunk/libhal-glib/Makefile.am
==============================================================================
--- trunk/libhal-glib/Makefile.am	(original)
+++ trunk/libhal-glib/Makefile.am	Mon Oct 20 21:50:54 2008
@@ -6,89 +6,48 @@
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
 noinst_LTLIBRARIES =						\
-	libhal-gmanager.la					\
-	libhal-gdevice.la					\
-	libhal-gdevicestore.la					\
-	libhal-gpower.la
+	libhal.la
 
-libhal_gmanager_la_SOURCES =					\
+libhal_la_SOURCES =						\
 	egg-dbus-proxy.h					\
 	egg-dbus-proxy.c					\
 	egg-dbus-monitor.h					\
 	egg-dbus-monitor.c					\
 	egg-debug.h						\
 	egg-debug.c						\
-	libhal-marshal.h					\
-	libhal-marshal.c					\
-	libhal-gdevice.c					\
-	libhal-gdevice.h					\
-	libhal-gmanager.c					\
-	libhal-gmanager.h
-libhal_gmanager_la_LIBADD =					\
-	$(DBUS_LIBS)						\
-	$(INTLLIBS)						\
-	$(GLIB_LIBS)
-
-libhal_gdevice_la_SOURCES =					\
-	egg-dbus-proxy.h					\
-	egg-dbus-proxy.c					\
-	egg-dbus-monitor.h					\
-	egg-dbus-monitor.c					\
-	egg-debug.h						\
-	egg-debug.c						\
-	libhal-marshal.h					\
-	libhal-marshal.c					\
-	libhal-gdevice.c					\
-	libhal-gdevice.h
-libhal_gdevice_la_LIBADD =					\
-	$(DBUS_LIBS)						\
-	$(INTLLIBS)						\
-	$(GLIB_LIBS)
-
-libhal_gdevicestore_la_SOURCES =				\
-	libhal-marshal.h					\
-	libhal-marshal.c					\
-	libhal-gdevice.c					\
-	libhal-gdevice.h					\
-	libhal-gdevicestore.c					\
-	libhal-gdevicestore.h
-libhal_gdevicestore_la_LIBADD =					\
-	$(DBUS_LIBS)						\
-	$(INTLLIBS)						\
-	$(GLIB_LIBS)
+	hal-marshal.h						\
+	hal-marshal.c						\
+	hal-device.c						\
+	hal-device.h						\
+	hal-manager.c						\
+	hal-manager.h						\
+	hal-device-store.c					\
+	hal-device-store.h					\
+	hal-device-power.c					\
+	hal-device-power.h
 
-libhal_gpower_la_SOURCES =					\
-	egg-dbus-proxy.h					\
-	egg-dbus-proxy.c					\
-	egg-dbus-monitor.h					\
-	egg-dbus-monitor.c					\
-	egg-debug.h						\
-	egg-debug.c						\
-	libhal-marshal.h					\
-	libhal-marshal.c					\
-	libhal-gpower.c						\
-	libhal-gpower.h
-libhal_gpower_la_LIBADD =					\
+libhal_la_LIBADD =						\
 	$(DBUS_LIBS)						\
 	$(INTLLIBS)						\
 	$(GLIB_LIBS)
 
 EXTRA_DIST =							\
-	libhal-marshal.list
+	hal-marshal.list
 
 BUILT_SOURCES = 						\
-	libhal-marshal.c					\
-	libhal-marshal.h
+	hal-marshal.c						\
+	hal-marshal.h
 
-libhal-marshal.c: libhal-marshal.list
-	echo "#include \"libhal-marshal.h\"" > $@ && \
-	@GLIB_GENMARSHAL@ $< --prefix=libhal_marshal --body >> $@
+hal-marshal.c: hal-marshal.list
+	echo "#include \"hal-marshal.h\"" > $@ && \
+	@GLIB_GENMARSHAL@ $< --prefix=hal_marshal --body >> $@
 
-libhal-marshal.h: libhal-marshal.list
-	@GLIB_GENMARSHAL@ $< --prefix=libhal_marshal --header > $@
+hal-marshal.h: hal-marshal.list
+	@GLIB_GENMARSHAL@ $< --prefix=hal_marshal --header > $@
 
 clean-local:
 	rm -f *~
-	rm -f libhal-marshal.c libhal-marshal.h
+	rm -f hal-marshal.c hal-marshal.h
 
 CLEANFILES = $(BUILT_SOURCES)
+

Copied: trunk/libhal-glib/hal-device-power.c (from r3025, /trunk/libhal-glib/libhal-gpower.c)
==============================================================================
--- /trunk/libhal-glib/libhal-gpower.c	(original)
+++ trunk/libhal-glib/hal-device-power.c	Mon Oct 20 21:50:54 2008
@@ -32,48 +32,48 @@
 #include "egg-debug.h"
 #include "egg-dbus-proxy.h"
 
-#include "libhal-marshal.h"
-#include "libhal-gpower.h"
-#include "libhal-gdevice.h"
-#include "libhal-gmanager.h"
+#include "hal-marshal.h"
+#include "hal-device-power.h"
+#include "hal-device.h"
+#include "hal-manager.h"
 
-static void     hal_gpower_class_init (HalGPowerClass *klass);
-static void     hal_gpower_init       (HalGPower      *power);
-static void     hal_gpower_finalize   (GObject	      *object);
+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 LIBHAL_GPOWER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBHAL_TYPE_GPOWER, HalGPowerPrivate))
+#define HAL_DEVICE_POWER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), HAL_TYPE_DEVICE_POWER, HalDevicePowerPrivate))
 
-struct HalGPowerPrivate
+struct HalDevicePowerPrivate
 {
-	HalGDevice		*computer;
+	HalDevice		*computer;
 	EggDbusProxy		*gproxy;
 };
 
-static gpointer hal_gpower_object = NULL;
-G_DEFINE_TYPE (HalGPower, hal_gpower, G_TYPE_OBJECT)
+static gpointer hal_device_power_object = NULL;
+G_DEFINE_TYPE (HalDevicePower, hal_device_power, G_TYPE_OBJECT)
 
 /**
- * hal_gpower_class_init:
+ * hal_device_power_class_init:
  * @klass: This class instance
  **/
 static void
-hal_gpower_class_init (HalGPowerClass *klass)
+hal_device_power_class_init (HalDevicePowerClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = hal_gpower_finalize;
-	g_type_class_add_private (klass, sizeof (HalGPowerPrivate));
+	object_class->finalize = hal_device_power_finalize;
+	g_type_class_add_private (klass, sizeof (HalDevicePowerPrivate));
 }
 
 /**
- * hal_gpower_init:
+ * hal_device_power_init:
  *
  * @power: This class instance
  **/
 static void
-hal_gpower_init (HalGPower *power)
+hal_device_power_init (HalDevicePower *power)
 {
 	DBusGConnection *connection;
-	power->priv = LIBHAL_GPOWER_GET_PRIVATE (power);
+	power->priv = HAL_DEVICE_POWER_GET_PRIVATE (power);
 
 	/* get the power connection */
 	power->priv->gproxy = egg_dbus_proxy_new ();
@@ -83,12 +83,12 @@
 	if (power->priv->gproxy == NULL)
 		egg_warning ("HAL does not support power management!");
 
-	power->priv->computer = hal_gdevice_new ();
-	hal_gdevice_set_udi (power->priv->computer, HAL_ROOT_COMPUTER);
+	power->priv->computer = hal_device_new ();
+	hal_device_set_udi (power->priv->computer, HAL_ROOT_COMPUTER);
 }
 
 /**
- * hal_gpower_is_laptop:
+ * hal_device_power_is_laptop:
  *
  * @power: This class instance
  * Return value: TRUE is computer is identified as a laptop
@@ -96,15 +96,15 @@
  * Returns true if system.formfactor is "laptop"
  **/
 gboolean
-hal_gpower_is_laptop (HalGPower *power)
+hal_device_power_is_laptop (HalDevicePower *power)
 {
 	gboolean ret = TRUE;
 	gchar *formfactor = NULL;
 
-	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
 
 	/* always present */
-	hal_gdevice_get_string (power->priv->computer, "system.formfactor", &formfactor, NULL);
+	hal_device_get_string (power->priv->computer, "system.formfactor", &formfactor, NULL);
 	if (formfactor == NULL) {
 		/* no need to free */
 		return FALSE;
@@ -119,7 +119,7 @@
 }
 
 /**
- * hal_gpower_has_support:
+ * hal_device_power_has_support:
  *
  * @power: This class instance
  * Return value: TRUE if haldaemon has power management capability
@@ -127,13 +127,13 @@
  * Finds out if power management functions are running (only ACPI, PMU, APM)
  **/
 gboolean
-hal_gpower_has_support (HalGPower *power)
+hal_device_power_has_support (HalDevicePower *power)
 {
 	gchar *type = NULL;
 
-	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
 
-	hal_gdevice_get_string (power->priv->computer, "power_management.type", &type, NULL);
+	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);
@@ -143,7 +143,7 @@
 }
 
 /**
- * hal_gpower_can_suspend:
+ * hal_device_power_can_suspend:
  *
  * @power: This class instance
  * Return value: TRUE if kernel suspend support is compiled in
@@ -151,15 +151,15 @@
  * Finds out if HAL indicates that we can suspend
  **/
 gboolean
-hal_gpower_can_suspend (HalGPower *power)
+hal_device_power_can_suspend (HalDevicePower *power)
 {
 	gboolean exists;
 	gboolean can_suspend;
 
-	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
 
 	/* TODO: Change to can_suspend when rely on newer HAL */
-	exists = hal_gdevice_get_bool (power->priv->computer,
+	exists = hal_device_get_bool (power->priv->computer,
 					  "power_management.can_suspend",
 					  &can_suspend, NULL);
 	if (exists == FALSE) {
@@ -170,7 +170,7 @@
 }
 
 /**
- * hal_gpower_can_hibernate:
+ * hal_device_power_can_hibernate:
  *
  * @power: This class instance
  * Return value: TRUE if kernel hibernation support is compiled in
@@ -178,15 +178,15 @@
  * Finds out if HAL indicates that we can hibernate
  **/
 gboolean
-hal_gpower_can_hibernate (HalGPower *power)
+hal_device_power_can_hibernate (HalDevicePower *power)
 {
 	gboolean exists;
 	gboolean can_hibernate;
 
-	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
 
 	/* TODO: Change to can_hibernate when rely on newer HAL */
-	exists = hal_gdevice_get_bool (power->priv->computer,
+	exists = hal_device_get_bool (power->priv->computer,
 					  "power_management.can_hibernate",
 					  &can_hibernate, NULL);
 	if (exists == FALSE) {
@@ -197,12 +197,12 @@
 }
 
 /**
- * hal_gpower_filter_error:
+ * hal_device_power_filter_error:
  *
  * We have to ignore dbus timeouts sometimes
  **/
 static gboolean
-hal_gpower_filter_error (GError **error)
+hal_device_power_filter_error (GError **error)
 {
 	/* short cut for speed, no error */
 	if (error == NULL || *error == NULL)
@@ -221,7 +221,7 @@
 }
 
 /**
- * hal_gpower_suspend:
+ * hal_device_power_suspend:
  *
  * @power: This class instance
  * @wakeup: Seconds to wakeup, currently unsupported
@@ -230,7 +230,7 @@
  * Uses org.freedesktop.Hal.Device.SystemPowerManagement.Suspend ()
  **/
 gboolean
-hal_gpower_suspend (HalGPower *power, guint wakeup, GError **error)
+hal_device_power_suspend (HalDevicePower *power, guint wakeup, GError **error)
 {
 	time_t start;
 	time_t end;
@@ -238,7 +238,7 @@
 	gboolean ret;
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), 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) {
@@ -253,7 +253,7 @@
 				 G_TYPE_INT, &retval,
 				 G_TYPE_INVALID);
 	/* we might have to ignore the error */
-	if (error != NULL && hal_gpower_filter_error (error))
+	if (error != NULL && hal_device_power_filter_error (error))
 		return TRUE;
 	if (retval != 0)
 		egg_warning ("Suspend failed without error message");
@@ -270,7 +270,7 @@
 }
 
 /**
- * hal_gpower_pm_method_void:
+ * hal_device_power_pm_method_void:
  *
  * @power: This class instance
  * @method: The method name, e.g. "Hibernate"
@@ -280,7 +280,7 @@
  * with no arguments.
  **/
 static gboolean
-hal_gpower_pm_method_void (HalGPower *power, const gchar *method, GError **error)
+hal_device_power_pm_method_void (HalDevicePower *power, const gchar *method, GError **error)
 {
 	time_t start;
 	time_t end;
@@ -288,7 +288,7 @@
 	gboolean ret;
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), FALSE);
+	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);
@@ -307,7 +307,7 @@
 				 G_TYPE_INT, &retval,
 				 G_TYPE_INVALID);
 	/* we might have to ignore the error */
-	if (error != NULL && hal_gpower_filter_error (error))
+	if (error != NULL && hal_device_power_filter_error (error))
 		return TRUE;
 	if (retval != 0)
 		egg_warning ("%s failed in a horrible way!", method);
@@ -324,7 +324,7 @@
 }
 
 /**
- * hal_gpower_hibernate:
+ * hal_device_power_hibernate:
  *
  * @power: This class instance
  * Return value: Success, true if we hibernated OK
@@ -332,28 +332,28 @@
  * Uses org.freedesktop.Hal.Device.SystemPowerManagement.Hibernate ()
  **/
 gboolean
-hal_gpower_hibernate (HalGPower *power, GError **error)
+hal_device_power_hibernate (HalDevicePower *power, GError **error)
 {
-	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), FALSE);
-	return hal_gpower_pm_method_void (power, "Hibernate", error);
+	g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
+	return hal_device_power_pm_method_void (power, "Hibernate", error);
 }
 
 /**
- * hal_gpower_shutdown:
+ * hal_device_power_shutdown:
  *
  * Return value: Success, true if we shutdown OK
  *
  * Uses org.freedesktop.Hal.Device.SystemPowerManagement.Shutdown ()
  **/
 gboolean
-hal_gpower_shutdown (HalGPower *power, GError **error)
+hal_device_power_shutdown (HalDevicePower *power, GError **error)
 {
-	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), FALSE);
-	return hal_gpower_pm_method_void (power, "Shutdown", error);
+	g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
+	return hal_device_power_pm_method_void (power, "Shutdown", error);
 }
 
 /**
- * hal_gpower_reboot:
+ * hal_device_power_reboot:
  *
  * @power: This class instance
  * Return value: Success, true if we shutdown OK
@@ -361,14 +361,14 @@
  * Uses org.freedesktop.Hal.Device.SystemPowerManagement.Reboot ()
  **/
 gboolean
-hal_gpower_reboot (HalGPower *power, GError **error)
+hal_device_power_reboot (HalDevicePower *power, GError **error)
 {
-	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), FALSE);
-	return hal_gpower_pm_method_void (power, "Reboot", error);
+	g_return_val_if_fail (HAL_IS_DEVICE_POWER (power), FALSE);
+	return hal_device_power_pm_method_void (power, "Reboot", error);
 }
 
 /**
- * hal_gpower_enable_power_save:
+ * hal_device_power_enable_power_save:
  *
  * @power: This class instance
  * @enable: True to enable low power mode
@@ -377,7 +377,7 @@
  * Uses org.freedesktop.Hal.Device.SystemPowerManagement.SetPowerSave ()
  **/
 gboolean
-hal_gpower_enable_power_save (HalGPower *power, gboolean enable)
+hal_device_power_enable_power_save (HalDevicePower *power, gboolean enable)
 {
 	gint retval = 0;
 	GError *error = NULL;
@@ -385,7 +385,7 @@
 	DBusGProxy *proxy;
 
 	g_return_val_if_fail (power != NULL, FALSE);
-	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), 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) {
@@ -394,7 +394,7 @@
 	}
 
 	/* abort if we are not a "qualified" laptop */
-	if (hal_gpower_is_laptop (power) == FALSE) {
+	if (hal_device_power_is_laptop (power) == FALSE) {
 		egg_debug ("We are not a laptop, so not even trying");
 		return FALSE;
 	}
@@ -410,7 +410,7 @@
 }
 
 /**
- * hal_gpower_has_suspend_error:
+ * hal_device_power_has_suspend_error:
  *
  * @power: This class instance
  * @enable: Return true if there was a suspend error
@@ -419,17 +419,17 @@
  * TODO: should call a method on HAL and also return the ouput of the file
  **/
 gboolean
-hal_gpower_has_suspend_error (HalGPower *power, gboolean *state)
+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 (LIBHAL_IS_GPOWER (power), 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_gpower_has_hibernate_error:
+ * hal_device_power_has_hibernate_error:
  *
  * @power: This class instance
  * @enable: Return true if there was a hibernate error
@@ -438,17 +438,17 @@
  * TODO: should call a method on HAL and also return the ouput of the file
  **/
 gboolean
-hal_gpower_has_hibernate_error (HalGPower *power, gboolean *state)
+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 (LIBHAL_IS_GPOWER (power), 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_gpower_clear_suspend_error:
+ * hal_device_power_clear_suspend_error:
  *
  * @power: This class instance
  * Return value: Success
@@ -456,13 +456,13 @@
  * Tells HAL to try and clear the suspend error as we appear to be okay
  **/
 gboolean
-hal_gpower_clear_suspend_error (HalGPower *power, GError **error)
+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 (LIBHAL_IS_GPOWER (power), 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) {
@@ -476,7 +476,7 @@
 }
 
 /**
- * hal_gpower_clear_hibernate_error:
+ * hal_device_power_clear_hibernate_error:
  *
  * @power: This class instance
  * Return value: Success
@@ -484,13 +484,13 @@
  * Tells HAL to try and clear the hibernate error as we appear to be okay
  **/
 gboolean
-hal_gpower_clear_hibernate_error (HalGPower *power, GError **error)
+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 (LIBHAL_IS_GPOWER (power), 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) {
@@ -504,38 +504,38 @@
 }
 
 /**
- * hal_gpower_finalize:
+ * hal_device_power_finalize:
  * @object: This class instance
  **/
 static void
-hal_gpower_finalize (GObject *object)
+hal_device_power_finalize (GObject *object)
 {
-	HalGPower *power;
+	HalDevicePower *power;
 	g_return_if_fail (object != NULL);
-	g_return_if_fail (LIBHAL_IS_GPOWER (object));
+	g_return_if_fail (HAL_IS_DEVICE_POWER (object));
 
-	power = LIBHAL_GPOWER (object);
-	power->priv = LIBHAL_GPOWER_GET_PRIVATE (power);
+	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_gpower_parent_class)->finalize (object);
+	G_OBJECT_CLASS (hal_device_power_parent_class)->finalize (object);
 }
 
 /**
- * hal_gpower_new:
- * Return value: new HalGPower instance.
+ * hal_device_power_new:
+ * Return value: new HalDevicePower instance.
  **/
-HalGPower *
-hal_gpower_new (void)
+HalDevicePower *
+hal_device_power_new (void)
 {
-	if (hal_gpower_object != NULL) {
-		g_object_ref (hal_gpower_object);
+	if (hal_device_power_object != NULL) {
+		g_object_ref (hal_device_power_object);
 	} else {
-		hal_gpower_object = g_object_new (LIBHAL_TYPE_GPOWER, NULL);
-		g_object_add_weak_pointer (hal_gpower_object, &hal_gpower_object);
+		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 LIBHAL_GPOWER (hal_gpower_object);
+	return HAL_DEVICE_POWER (hal_device_power_object);
 }
 

Copied: trunk/libhal-glib/hal-device-power.h (from r3024, /trunk/libhal-glib/libhal-gpower.h)
==============================================================================
--- /trunk/libhal-glib/libhal-gpower.h	(original)
+++ trunk/libhal-glib/hal-device-power.h	Mon Oct 20 21:50:54 2008
@@ -19,59 +19,59 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef __LIBGPOWER_H
-#define __LIBGPOWER_H
+#ifndef __HALDEVICEPOWER_H
+#define __HALDEVICEPOWER_H
 
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#define LIBHAL_TYPE_GPOWER		(hal_gpower_get_type ())
-#define LIBHAL_GPOWER(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), LIBHAL_TYPE_GPOWER, HalGPower))
-#define LIBHAL_GPOWER_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), LIBHAL_TYPE_GPOWER, HalGPowerClass))
-#define LIBHAL_IS_GPOWER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), LIBHAL_TYPE_GPOWER))
-#define LIBHAL_IS_GPOWER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), LIBHAL_TYPE_GPOWER))
-#define LIBHAL_GPOWER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), LIBHAL_TYPE_GPOWER, HalGPowerClass))
+#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 HalGPowerPrivate HalGPowerPrivate;
+typedef struct HalDevicePowerPrivate HalDevicePowerPrivate;
 
 typedef struct
 {
 	GObject		  parent;
-	HalGPowerPrivate *priv;
-} HalGPower;
+	HalDevicePowerPrivate *priv;
+} HalDevicePower;
 
 typedef struct
 {
 	GObjectClass	parent_class;
-} HalGPowerClass;
+} HalDevicePowerClass;
 
-GType		 hal_gpower_get_type			(void);
-HalGPower	*hal_gpower_new				(void);
+GType		 hal_device_power_get_type		(void);
+HalDevicePower	*hal_device_power_new			(void);
 
-gboolean	 hal_gpower_has_support			(HalGPower	*power);
-gboolean	 hal_gpower_can_suspend			(HalGPower	*power);
-gboolean	 hal_gpower_can_hibernate		(HalGPower	*power);
-gboolean	 hal_gpower_suspend			(HalGPower	*power,
+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_gpower_hibernate			(HalGPower	*power,
+gboolean	 hal_device_power_hibernate		(HalDevicePower	*power,
 							 GError		**error);
-gboolean	 hal_gpower_shutdown			(HalGPower	*power,
+gboolean	 hal_device_power_shutdown		(HalDevicePower	*power,
 							 GError		**error);
-gboolean	 hal_gpower_reboot			(HalGPower	*power,
+gboolean	 hal_device_power_reboot		(HalDevicePower	*power,
 							 GError		**error);
-gboolean	 hal_gpower_has_suspend_error		(HalGPower	*power,
+gboolean	 hal_device_power_has_suspend_error	(HalDevicePower	*power,
 							 gboolean	*state);
-gboolean	 hal_gpower_has_hibernate_error		(HalGPower	*power,
+gboolean	 hal_device_power_has_hibernate_error	(HalDevicePower	*power,
 							 gboolean	*state);
-gboolean	 hal_gpower_clear_suspend_error		(HalGPower	*power,
+gboolean	 hal_device_power_clear_suspend_error	(HalDevicePower	*power,
 							 GError		**error);
-gboolean	 hal_gpower_clear_hibernate_error	(HalGPower	*power,
+gboolean	 hal_device_power_clear_hibernate_error	(HalDevicePower	*power,
 							 GError		**error);
-gboolean	 hal_gpower_enable_power_save		(HalGPower	*power,
+gboolean	 hal_device_power_enable_power_save	(HalDevicePower	*power,
 							 gboolean	 enable);
 
 G_END_DECLS
 
-#endif	/* __LIBGPOWER_H */
+#endif	/* __HALDEVICEPOWER_H */

Copied: trunk/libhal-glib/hal-device-store.c (from r3025, /trunk/libhal-glib/libhal-gdevicestore.c)
==============================================================================
--- /trunk/libhal-glib/libhal-gdevicestore.c	(original)
+++ trunk/libhal-glib/hal-device-store.c	Mon Oct 20 21:50:54 2008
@@ -29,17 +29,17 @@
 
 #include "egg-debug.h"
 
-#include "libhal-marshal.h"
-#include "libhal-gdevice.h"
-#include "libhal-gdevicestore.h"
+#include "hal-marshal.h"
+#include "hal-device.h"
+#include "hal-device-store.h"
 
-static void     hal_gdevicestore_class_init (HalGDevicestoreClass *klass);
-static void     hal_gdevicestore_init       (HalGDevicestore      *devicestore);
-static void     hal_gdevicestore_finalize   (GObject	          *object);
+static void     hal_device_store_class_init (HalDevicestoreClass *klass);
+static void     hal_device_store_init       (HalDevicestore      *device_store);
+static void     hal_device_store_finalize   (GObject	          *object);
 
-#define LIBHAL_GDEVICESTORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBHAL_TYPE_GDEVICESTORE, HalGDevicestorePrivate))
+#define HAL_DEVICE_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), HAL_TYPE_DEVICE_STORE, HalDevicestorePrivate))
 
-struct HalGDevicestorePrivate
+struct HalDevicestorePrivate
 {
 	GPtrArray		*array;		/* the device array */
 };
@@ -51,27 +51,27 @@
 
 static guint	     signals [LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (HalGDevicestore, hal_gdevicestore, G_TYPE_OBJECT)
+G_DEFINE_TYPE (HalDevicestore, hal_device_store, G_TYPE_OBJECT)
 
 /**
- * hal_devicestore_index_udi:
+ * hal_device_store_index_udi:
  *
  * Returns -1 if not found
  *
- * @devicestore: This store instance
+ * @device_store: This store instance
  * @device: The device
  */
 static gint
-hal_gdevicestore_index_udi (HalGDevicestore *devicestore, const gchar *udi)
+hal_device_store_index_udi (HalDevicestore *device_store, const gchar *udi)
 {
 	gint i;
 	guint length;
-	HalGDevice *d;
+	HalDevice *d;
 
-	length = devicestore->priv->array->len;
+	length = device_store->priv->array->len;
 	for (i=0;i<length;i++) {
-		d = (HalGDevice *) g_ptr_array_index (devicestore->priv->array, i);
-		if (strcmp (hal_gdevice_get_udi (d), udi) == 0) {
+		d = (HalDevice *) g_ptr_array_index (device_store->priv->array, i);
+		if (strcmp (hal_device_get_udi (d), udi) == 0) {
 			return i;
 		}
 	}
@@ -79,231 +79,231 @@
 }
 
 /**
- * hal_devicestore_index:
+ * hal_device_store_index:
  *
  * Returns -1 if not found
  *
- * @devicestore: This store instance
+ * @device_store: This store instance
  * @device: The device
  */
 static gint
-hal_gdevicestore_index (HalGDevicestore *devicestore, HalGDevice *device)
+hal_device_store_index (HalDevicestore *device_store, HalDevice *device)
 {
-	HalGDevice *d;
+	HalDevice *d;
 	gint i;
 	guint length;
 	const gchar *udi;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICESTORE (devicestore), FALSE);
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE_STORE (device_store), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 
-	length = devicestore->priv->array->len;
-	udi = hal_gdevice_get_udi (device);
+	length = device_store->priv->array->len;
+	udi = hal_device_get_udi (device);
 
 	/* trivial check, is instance the same (FAST) */
 	for (i=0;i<length;i++) {
-		d = (HalGDevice *) g_ptr_array_index (devicestore->priv->array, i);
+		d = (HalDevice *) g_ptr_array_index (device_store->priv->array, i);
 		if (d == device) {
 			return i;
 		}
 	}
 
 	/* non trivial check, is udi the same (SLOW) */
-	return hal_gdevicestore_index_udi (devicestore, udi);
+	return hal_device_store_index_udi (device_store, udi);
 }
 
 /**
- * hal_gdevicestore_find_udi:
+ * hal_device_store_find_udi:
  *
  * NULL return value is not found
  *
- * @devicestore: This store instance
+ * @device_store: This store instance
  * @device: The device
  */
-HalGDevice *
-hal_gdevicestore_find_udi (HalGDevicestore *devicestore, const gchar *udi)
+HalDevice *
+hal_device_store_find_udi (HalDevicestore *device_store, const gchar *udi)
 {
 	gint index;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICESTORE (devicestore), NULL);
+	g_return_val_if_fail (HAL_IS_DEVICE_STORE (device_store), NULL);
 	g_return_val_if_fail (udi != NULL, NULL);
 
-	index = hal_gdevicestore_index_udi (devicestore, udi);
+	index = hal_device_store_index_udi (device_store, udi);
 	if (index == -1) {
 		return NULL;
 	}
 
 	/* return the device */
-	return (HalGDevice *) g_ptr_array_index (devicestore->priv->array, index);
+	return (HalDevice *) g_ptr_array_index (device_store->priv->array, index);
 }
 
 /**
- * hal_devicestore_present:
+ * hal_device_store_present:
  *
- * @devicestore: This store instance
+ * @device_store: This store instance
  * @device: The device
  */
 gboolean
-hal_gdevicestore_present (HalGDevicestore *devicestore, HalGDevice *device)
+hal_device_store_present (HalDevicestore *device_store, HalDevice *device)
 {
-	g_return_val_if_fail (LIBHAL_IS_GDEVICESTORE (devicestore), FALSE);
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE_STORE (device_store), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 
 	/* if we have an index, we have the device */
-	if (hal_gdevicestore_index (devicestore, device) != -1) {
+	if (hal_device_store_index (device_store, device) != -1) {
 		return TRUE;
 	}
 	return FALSE;
 }
 
 /**
- * hal_devicestore_insert:
+ * hal_device_store_insert:
  *
- * @devicestore: This store instance
+ * @device_store: This store instance
  * @device: The device
  */
 gboolean
-hal_gdevicestore_insert (HalGDevicestore *devicestore, HalGDevice *device)
+hal_device_store_insert (HalDevicestore *device_store, HalDevice *device)
 {
-	g_return_val_if_fail (LIBHAL_IS_GDEVICESTORE (devicestore), FALSE);
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE_STORE (device_store), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 
-	if (hal_gdevicestore_present (devicestore, device)) {
+	if (hal_device_store_present (device_store, device)) {
 		return FALSE;
 	}
 
-	g_ptr_array_add (devicestore->priv->array, (gpointer) device);
+	g_ptr_array_add (device_store->priv->array, (gpointer) device);
 	return TRUE;
 }
 
 /**
- * hal_devicestore_remove:
+ * hal_device_store_remove:
  *
- * @devicestore: This store instance
+ * @device_store: This store instance
  * @device: The device
  */
 gboolean
-hal_gdevicestore_remove (HalGDevicestore *devicestore, HalGDevice *device)
+hal_device_store_remove (HalDevicestore *device_store, HalDevice *device)
 {
 	gint index;
-	HalGDevice *d;
+	HalDevice *d;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICESTORE (devicestore), FALSE);
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE_STORE (device_store), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 
-	index = hal_gdevicestore_index (devicestore, device);
+	index = hal_device_store_index (device_store, device);
 	if (index == -1) {
 		return FALSE;
 	}
 
 	/* we unref because this may be the only pointer to this instance */
-	d = (HalGDevice *) g_ptr_array_index (devicestore->priv->array, index);
+	d = (HalDevice *) g_ptr_array_index (device_store->priv->array, index);
 	g_object_unref (d);
 
-	/* remove from the devicestore */
-	g_ptr_array_remove_index (devicestore->priv->array, index);
+	/* remove from the device_store */
+	g_ptr_array_remove_index (device_store->priv->array, index);
 
 	return TRUE;
 }
 
 /**
- * hal_devicestore_print:
+ * hal_device_store_print:
  *
- * @devicestore: This store instance
+ * @device_store: This store instance
  */
 gboolean
-hal_gdevicestore_print (HalGDevicestore *devicestore)
+hal_device_store_print (HalDevicestore *device_store)
 {
-	HalGDevice *d;
+	HalDevice *d;
 	guint i;
 	guint length;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICESTORE (devicestore), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE_STORE (device_store), FALSE);
 
-	length = devicestore->priv->array->len;
-	g_print ("Printing device list in %p\n", devicestore);
+	length = device_store->priv->array->len;
+	g_print ("Printing device list in %p\n", device_store);
 	for (i=0;i<length;i++) {
-		d = (HalGDevice *) g_ptr_array_index (devicestore->priv->array, i);
-		g_print ("%i: %s\n", i, hal_gdevice_get_udi (d));
+		d = (HalDevice *) g_ptr_array_index (device_store->priv->array, i);
+		g_print ("%i: %s\n", i, hal_device_get_udi (d));
 	}	
 
 	return TRUE;
 }
 
 /**
- * hal_gdevicestore_class_init:
+ * hal_device_store_class_init:
  * @klass: This class instance
  **/
 static void
-hal_gdevicestore_class_init (HalGDevicestoreClass *klass)
+hal_device_store_class_init (HalDevicestoreClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = hal_gdevicestore_finalize;
-	g_type_class_add_private (klass, sizeof (HalGDevicestorePrivate));
+	object_class->finalize = hal_device_store_finalize;
+	g_type_class_add_private (klass, sizeof (HalDevicestorePrivate));
 
 	signals [DEVICE_REMOVED] =
 		g_signal_new ("device-removed",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (HalGDevicestoreClass, device_removed),
+			      G_STRUCT_OFFSET (HalDevicestoreClass, device_removed),
 			      NULL,
 			      NULL,
-			      libhal_marshal_VOID__STRING_STRING,
+			      hal_marshal_VOID__STRING_STRING,
 			      G_TYPE_NONE,
 			      2, G_TYPE_STRING, G_TYPE_STRING);
 }
 
 /**
- * hal_gdevicestore_init:
+ * hal_device_store_init:
  *
- * @hal_gdevicestore: This class instance
+ * @hal_device_store: This class instance
  **/
 static void
-hal_gdevicestore_init (HalGDevicestore *devicestore)
+hal_device_store_init (HalDevicestore *device_store)
 {
-	devicestore->priv = LIBHAL_GDEVICESTORE_GET_PRIVATE (devicestore);
+	device_store->priv = HAL_DEVICE_STORE_GET_PRIVATE (device_store);
 
-	devicestore->priv->array = g_ptr_array_new ();
+	device_store->priv->array = g_ptr_array_new ();
 }
 
 /**
- * hal_gdevicestore_finalize:
+ * hal_device_store_finalize:
  * @object: This class instance
  **/
 static void
-hal_gdevicestore_finalize (GObject *object)
+hal_device_store_finalize (GObject *object)
 {
-	HalGDevicestore *devicestore;
-	HalGDevice *d;
+	HalDevicestore *device_store;
+	HalDevice *d;
 	gint i;
 	guint length;
 
 	g_return_if_fail (object != NULL);
-	g_return_if_fail (LIBHAL_IS_GDEVICESTORE (object));
+	g_return_if_fail (HAL_IS_DEVICE_STORE (object));
 
-	devicestore = LIBHAL_GDEVICESTORE (object);
-	devicestore->priv = LIBHAL_GDEVICESTORE_GET_PRIVATE (devicestore);
+	device_store = HAL_DEVICE_STORE (object);
+	device_store->priv = HAL_DEVICE_STORE_GET_PRIVATE (device_store);
 
-	length = devicestore->priv->array->len;
+	length = device_store->priv->array->len;
 
 	/* unref all */
 	for (i=0;i<length;i++) {
-		d = (HalGDevice *) g_ptr_array_index (devicestore->priv->array, i);
+		d = (HalDevice *) g_ptr_array_index (device_store->priv->array, i);
 		g_object_unref (d);
 	}
-	g_ptr_array_free (devicestore->priv->array, TRUE);
+	g_ptr_array_free (device_store->priv->array, TRUE);
 
-	G_OBJECT_CLASS (hal_gdevicestore_parent_class)->finalize (object);
+	G_OBJECT_CLASS (hal_device_store_parent_class)->finalize (object);
 }
 
 /**
- * hal_gdevicestore_new:
- * Return value: new HalGDevicestore instance.
+ * hal_device_store_new:
+ * Return value: new HalDevicestore instance.
  **/
-HalGDevicestore *
-hal_gdevicestore_new (void)
+HalDevicestore *
+hal_device_store_new (void)
 {
-	HalGDevicestore *devicestore = g_object_new (LIBHAL_TYPE_GDEVICESTORE, NULL);
-	return LIBHAL_GDEVICESTORE (devicestore);
+	HalDevicestore *device_store = g_object_new (HAL_TYPE_DEVICE_STORE, NULL);
+	return HAL_DEVICE_STORE (device_store);
 }
 

Copied: trunk/libhal-glib/hal-device-store.h (from r3024, /trunk/libhal-glib/libhal-gdevicestore.h)
==============================================================================
--- /trunk/libhal-glib/libhal-gdevicestore.h	(original)
+++ trunk/libhal-glib/hal-device-store.h	Mon Oct 20 21:50:54 2008
@@ -19,49 +19,49 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef __LIBHAL_GDEVICESTORE_H
-#define __LIBHAL_GDEVICESTORE_H
+#ifndef __HAL_DEVICE_STORE_H
+#define __HAL_DEVICE_STORE_H
 
 #include <glib-object.h>
-#include "libhal-gdevice.h"
+#include "hal-device.h"
 
 G_BEGIN_DECLS
 
-#define LIBHAL_TYPE_GDEVICESTORE		(hal_gdevicestore_get_type ())
-#define LIBHAL_GDEVICESTORE(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), LIBHAL_TYPE_GDEVICESTORE, HalGDevicestore))
-#define LIBHAL_GDEVICESTORE_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), LIBHAL_TYPE_GDEVICESTORE, HalGDevicestoreClass))
-#define LIBHAL_IS_GDEVICESTORE(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), LIBHAL_TYPE_GDEVICESTORE))
-#define LIBHAL_IS_GDEVICESTORE_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), LIBHAL_TYPE_GDEVICESTORE))
-#define LIBHAL_GDEVICESTORE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), LIBHAL_TYPE_GDEVICESTORE, HalGDevicestoreClass))
+#define HAL_TYPE_DEVICE_STORE		(hal_device_store_get_type ())
+#define HAL_DEVICE_STORE(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), HAL_TYPE_DEVICE_STORE, HalDevicestore))
+#define HAL_DEVICE_STORE_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), HAL_TYPE_DEVICE_STORE, HalDevicestoreClass))
+#define HAL_IS_DEVICE_STORE(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), HAL_TYPE_DEVICE_STORE))
+#define HAL_IS_DEVICE_STORE_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), HAL_TYPE_DEVICE_STORE))
+#define HAL_DEVICE_STORE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), HAL_TYPE_DEVICE_STORE, HalDevicestoreClass))
 
-typedef struct HalGDevicestorePrivate HalGDevicestorePrivate;
+typedef struct HalDevicestorePrivate HalDevicestorePrivate;
 
 typedef struct
 {
 	GObject		     parent;
-	HalGDevicestorePrivate *priv;
-} HalGDevicestore;
+	HalDevicestorePrivate *priv;
+} HalDevicestore;
 
 typedef struct
 {
 	GObjectClass	parent_class;
-	void		(* device_removed)		(HalGDevicestore *devicestore,
-							 HalGDevice	 *device);
-} HalGDevicestoreClass;
-
-GType		 hal_gdevicestore_get_type		(void);
-HalGDevicestore	*hal_gdevicestore_new			(void);
-
-HalGDevice	*hal_gdevicestore_find_udi		(HalGDevicestore *devicestore,
-							 const gchar	 *udi);
-gboolean	 hal_gdevicestore_insert		(HalGDevicestore *devicestore,
-							 HalGDevice	 *device);
-gboolean	 hal_gdevicestore_present		(HalGDevicestore *devicestore,
-							 HalGDevice	 *device);
-gboolean	 hal_gdevicestore_remove		(HalGDevicestore *devicestore,
-							 HalGDevice	 *device);
-gboolean	 hal_gdevicestore_print			(HalGDevicestore *devicestore);
+	void		(* device_removed)	(HalDevicestore *device_store,
+						 HalDevice	 *device);
+} HalDevicestoreClass;
+
+GType		 hal_device_store_get_type	(void);
+HalDevicestore	*hal_device_store_new		(void);
+
+HalDevice	*hal_device_store_find_udi	(HalDevicestore *device_store,
+						 const gchar	 *udi);
+gboolean	 hal_device_store_insert	(HalDevicestore *device_store,
+						 HalDevice	 *device);
+gboolean	 hal_device_store_present	(HalDevicestore *device_store,
+						 HalDevice	 *device);
+gboolean	 hal_device_store_remove	(HalDevicestore *device_store,
+						 HalDevice	 *device);
+gboolean	 hal_device_store_print		(HalDevicestore *device_store);
 
 G_END_DECLS
 
-#endif	/* __LIBHAL_GDEVICESTORE_H */
+#endif	/* __HAL_DEVICE_STORE_H */

Copied: trunk/libhal-glib/hal-device.c (from r3025, /trunk/libhal-glib/libhal-gdevice.c)
==============================================================================
--- /trunk/libhal-glib/libhal-gdevice.c	(original)
+++ trunk/libhal-glib/hal-device.c	Mon Oct 20 21:50:54 2008
@@ -31,18 +31,18 @@
 #include "egg-debug.h"
 #include "egg-dbus-proxy.h"
 
-#include "libhal-marshal.h"
-#include "libhal-gpower.h"
-#include "libhal-gdevice.h"
-#include "libhal-gmanager.h"
-
-static void     hal_gdevice_class_init (HalGDeviceClass *klass);
-static void     hal_gdevice_init       (HalGDevice      *device);
-static void     hal_gdevice_finalize   (GObject	     *object);
+#include "hal-marshal.h"
+#include "hal-device-power.h"
+#include "hal-device.h"
+#include "hal-manager.h"
+
+static void     hal_device_class_init (HalDeviceClass *klass);
+static void     hal_device_init       (HalDevice      *device);
+static void     hal_device_finalize   (GObject	     *object);
 
-#define LIBHAL_GDEVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBHAL_TYPE_GDEVICE, HalGDevicePrivate))
+#define HAL_DEVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), HAL_TYPE_DEVICE, HalDevicePrivate))
 
-struct HalGDevicePrivate
+struct HalDevicePrivate
 {
 	DBusGConnection		*connection;
 	gboolean		 use_property_modified;
@@ -51,7 +51,7 @@
 	gchar			*udi;
 };
 
-/* Signals emitted from HalGDevice are:
+/* Signals emitted from HalDevice are:
  *
  * device-added
  * device-removed
@@ -70,20 +70,20 @@
 
 static guint	     signals [LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (HalGDevice, hal_gdevice, G_TYPE_OBJECT)
+G_DEFINE_TYPE (HalDevice, hal_device, G_TYPE_OBJECT)
 
 /**
- * hal_gdevice_set_udi:
+ * hal_device_set_udi:
  *
  * Return value: TRUE for success, FALSE for failure
  **/
 gboolean
-hal_gdevice_set_udi (HalGDevice  *device, const gchar *udi)
+hal_device_set_udi (HalDevice  *device, const gchar *udi)
 {
 	DBusGProxy *proxy;
 	DBusGConnection *connection;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 	g_return_val_if_fail (udi != NULL, FALSE);
 
 	if (device->priv->udi != NULL) {
@@ -104,28 +104,28 @@
 }
 
 /**
- * hal_gdevice_get_udi:
+ * hal_device_get_udi:
  *
  * Return value: UDI
  **/
 const gchar *
-hal_gdevice_get_udi (HalGDevice *device)
+hal_device_get_udi (HalDevice *device)
 {
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), NULL);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), NULL);
 
 	return device->priv->udi;
 }
 
 /**
- * hal_gdevice_get_bool:
+ * hal_device_get_bool:
  *
- * @hal_gdevice: This class instance
+ * @hal_device: This class instance
  * @key: The key to query
  * @value: return value, passed by ref
  * Return value: TRUE for success, FALSE for failure
  **/
 gboolean
-hal_gdevice_get_bool (HalGDevice  *device,
+hal_device_get_bool (HalDevice  *device,
 		      const gchar *key,
 		      gboolean    *value,
 		      GError     **error)
@@ -133,7 +133,7 @@
 	gboolean ret;
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 	g_return_val_if_fail (key != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 	g_return_val_if_fail (device->priv->udi != NULL, FALSE);
@@ -155,9 +155,9 @@
 }
 
 /**
- * hal_gdevice_get_string:
+ * hal_device_get_string:
  *
- * @hal_gdevice: This class instance
+ * @hal_device: This class instance
  * @key: The key to query
  * @value: return value, passed by ref
  * Return value: TRUE for success, FALSE for failure
@@ -165,7 +165,7 @@
  * You must g_free () the return value.
  **/
 gboolean
-hal_gdevice_get_string (HalGDevice   *device,
+hal_device_get_string (HalDevice   *device,
 			const gchar  *key,
 			gchar       **value,
 			GError      **error)
@@ -173,7 +173,7 @@
 	gboolean ret;
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 	g_return_val_if_fail (key != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 	g_return_val_if_fail (device->priv->udi != NULL, FALSE);
@@ -195,15 +195,15 @@
 }
 
 /**
- * hal_gdevice_get_int:
+ * hal_device_get_int:
  *
- * @hal_gdevice: This class instance
+ * @hal_device: This class instance
  * @key: The key to query
  * @value: return value, passed by ref
  * Return value: TRUE for success, FALSE for failure
  **/
 gboolean
-hal_gdevice_get_int (HalGDevice   *device,
+hal_device_get_int (HalDevice   *device,
 		     const gchar  *key,
 		     gint         *value,
 		     GError      **error)
@@ -211,7 +211,7 @@
 	gboolean ret;
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 	g_return_val_if_fail (key != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 	g_return_val_if_fail (device->priv->udi != NULL, FALSE);
@@ -233,12 +233,12 @@
 }
 
 /**
- * hal_gdevice_get_uint:
+ * hal_device_get_uint:
  *
  * HAL has no concept of a UINT, only INT
  **/
 gboolean
-hal_gdevice_get_uint (HalGDevice   *device,
+hal_device_get_uint (HalDevice   *device,
 		      const gchar  *key,
 		      guint        *value,
 		      GError      **error)
@@ -247,21 +247,21 @@
 	gboolean ret;
 
 	/* bodge */
-	ret = hal_gdevice_get_int (device, key, &tvalue, error);
+	ret = hal_device_get_int (device, key, &tvalue, error);
 	*value = (guint) tvalue;
 	return ret;
 }
 
 /**
- * hal_gdevice_query_capability:
+ * hal_device_query_capability:
  *
- * @hal_gdevice: This class instance
+ * @hal_device: This class instance
  * @capability: The capability, e.g. "battery"
  * @value: return value, passed by ref
  * Return value: TRUE for success, FALSE for failure
  **/
 gboolean
-hal_gdevice_query_capability (HalGDevice  *device,
+hal_device_query_capability (HalDevice  *device,
 			      const gchar *capability,
 			      gboolean    *has_capability,
 			      GError     **error)
@@ -269,7 +269,7 @@
 	gboolean ret;
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 	g_return_val_if_fail (capability != NULL, FALSE);
 	g_return_val_if_fail (has_capability != NULL, FALSE);
 	g_return_val_if_fail (device->priv->udi != NULL, FALSE);
@@ -306,7 +306,7 @@
 				gboolean     is_added,
 				gboolean     is_removed,
 				gboolean     finally,
-				HalGDevice  *device)
+				HalDevice  *device)
 {
 	g_signal_emit (device, signals [DEVICE_PROPERTY_MODIFIED], 0,
 		       key, is_added, is_removed, finally);
@@ -324,7 +324,7 @@
 watch_device_properties_modified_cb (DBusGProxy *proxy,
 				     gint	 type,
 				     GPtrArray  *properties,
-				     HalGDevice *device)
+				     HalDevice *device)
 {
 	GValueArray *array;
 	const gchar *udi;
@@ -361,18 +361,18 @@
 }
 
 /**
- * hal_gdevice_watch_property_modified:
+ * hal_device_watch_property_modified:
  *
  * Watch the specified device, so it emits device-property-modified and
  * adds to the gpm cache so we don't get asked to add it again.
  */
 gboolean
-hal_gdevice_watch_property_modified (HalGDevice *device)
+hal_device_watch_property_modified (HalDevice *device)
 {
 	DBusGProxy *proxy;
 	GType struct_array_type, struct_type;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 	g_return_val_if_fail (device->priv->udi != NULL, FALSE);
 
 	if (device->priv->use_property_modified) {
@@ -390,7 +390,7 @@
 
 	struct_array_type = dbus_g_type_get_collection ("GPtrArray", struct_type);
 
-	dbus_g_object_register_marshaller (libhal_marshal_VOID__INT_BOXED,
+	dbus_g_object_register_marshaller (hal_marshal_VOID__INT_BOXED,
 					   G_TYPE_NONE, G_TYPE_INT,
 					   struct_array_type, G_TYPE_INVALID);
 
@@ -420,22 +420,22 @@
 watch_device_condition_cb (DBusGProxy  *proxy,
 			   const gchar *condition,
 			   const gchar *details,
-			   HalGDevice  *device)
+			   HalDevice  *device)
 {
 	g_signal_emit (device, signals [DEVICE_CONDITION], 0, condition, details);
 }
 
 /**
- * hal_gdevice_watch_condition:
+ * hal_device_watch_condition:
  *
  * Watch the specified device, so it emits a device-condition
  */
 gboolean
-hal_gdevice_watch_condition (HalGDevice *device)
+hal_device_watch_condition (HalDevice *device)
 {
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 	g_return_val_if_fail (device->priv->udi != NULL, FALSE);
 
 	if (device->priv->use_condition) {
@@ -445,7 +445,7 @@
 
 	device->priv->use_condition = TRUE;
 
-	dbus_g_object_register_marshaller (libhal_marshal_VOID__STRING_STRING,
+	dbus_g_object_register_marshaller (hal_marshal_VOID__STRING_STRING,
 					   G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING,
 					   G_TYPE_INVALID);
 
@@ -462,16 +462,16 @@
 }
 
 /**
- * hal_gdevice_remove_condition:
+ * hal_device_remove_condition:
  *
  * Remove the specified device, so it does not emit device-condition signals.
  */
 gboolean
-hal_gdevice_remove_condition (HalGDevice *device)
+hal_device_remove_condition (HalDevice *device)
 {
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 
 	if (device->priv->use_condition == FALSE) {
 		/* already connected */
@@ -491,16 +491,16 @@
 }
 
 /**
- * hal_gdevice_remove_property_modified:
+ * hal_device_remove_property_modified:
  *
  * Remove the specified device, so it does not emit device-propery-modified.
  */
 gboolean
-hal_gdevice_remove_property_modified (HalGDevice *device)
+hal_device_remove_property_modified (HalDevice *device)
 {
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
+	g_return_val_if_fail (HAL_IS_DEVICE (device), FALSE);
 
 	if (device->priv->use_property_modified == FALSE) {
 		/* already disconnected */
@@ -528,9 +528,9 @@
 static void
 proxy_status_cb (DBusGProxy *proxy,
 		 gboolean    status,
-		 HalGDevice *device)
+		 HalDevice *device)
 {
-	g_return_if_fail (LIBHAL_IS_GDEVICE (device));
+	g_return_if_fail (HAL_IS_DEVICE (device));
 	if (status) {
 		/* should join */
 	} else {
@@ -539,48 +539,48 @@
 }
 
 /**
- * hal_gdevice_class_init:
+ * hal_device_class_init:
  * @klass: This class instance
  **/
 static void
-hal_gdevice_class_init (HalGDeviceClass *klass)
+hal_device_class_init (HalDeviceClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = hal_gdevice_finalize;
-	g_type_class_add_private (klass, sizeof (HalGDevicePrivate));
+	object_class->finalize = hal_device_finalize;
+	g_type_class_add_private (klass, sizeof (HalDevicePrivate));
 
 	signals [DEVICE_PROPERTY_MODIFIED] =
 		g_signal_new ("property-modified",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (HalGDeviceClass, device_property_modified),
+			      G_STRUCT_OFFSET (HalDeviceClass, device_property_modified),
 			      NULL,
 			      NULL,
-			      libhal_marshal_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN,
+			      hal_marshal_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN,
 			      G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 	signals [DEVICE_CONDITION] =
 		g_signal_new ("device-condition",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (HalGDeviceClass, device_condition),
+			      G_STRUCT_OFFSET (HalDeviceClass, device_condition),
 			      NULL,
 			      NULL,
-			      libhal_marshal_VOID__STRING_STRING,
+			      hal_marshal_VOID__STRING_STRING,
 			      G_TYPE_NONE,
 			      2, G_TYPE_STRING, G_TYPE_STRING);
 }
 
 /**
- * hal_gdevice_init:
+ * hal_device_init:
  *
- * @hal_gdevice: This class instance
+ * @hal_device: This class instance
  **/
 static void
-hal_gdevice_init (HalGDevice *device)
+hal_device_init (HalDevice *device)
 {
 	GError *error = NULL;
 
-	device->priv = LIBHAL_GDEVICE_GET_PRIVATE (device);
+	device->priv = HAL_DEVICE_GET_PRIVATE (device);
 
 	device->priv->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
 	if (error != NULL) {
@@ -598,39 +598,39 @@
 }
 
 /**
- * hal_gdevice_finalize:
+ * hal_device_finalize:
  * @object: This class instance
  **/
 static void
-hal_gdevice_finalize (GObject *object)
+hal_device_finalize (GObject *object)
 {
-	HalGDevice *device;
+	HalDevice *device;
 	g_return_if_fail (object != NULL);
-	g_return_if_fail (LIBHAL_IS_GDEVICE (object));
+	g_return_if_fail (HAL_IS_DEVICE (object));
 
-	device = LIBHAL_GDEVICE (object);
-	device->priv = LIBHAL_GDEVICE_GET_PRIVATE (device);
+	device = HAL_DEVICE (object);
+	device->priv = HAL_DEVICE_GET_PRIVATE (device);
 
 	if (device->priv->use_property_modified) {
-		hal_gdevice_remove_property_modified (device);
+		hal_device_remove_property_modified (device);
 	}
 	if (device->priv->use_condition) {
-		hal_gdevice_remove_condition (device);
+		hal_device_remove_condition (device);
 	}
 
 	g_object_unref (device->priv->gproxy);
 	g_free (device->priv->udi);
 
-	G_OBJECT_CLASS (hal_gdevice_parent_class)->finalize (object);
+	G_OBJECT_CLASS (hal_device_parent_class)->finalize (object);
 }
 
 /**
- * hal_gdevice_new:
- * Return value: new HalGDevice instance.
+ * hal_device_new:
+ * Return value: new HalDevice instance.
  **/
-HalGDevice *
-hal_gdevice_new (void)
+HalDevice *
+hal_device_new (void)
 {
-	HalGDevice *device = g_object_new (LIBHAL_TYPE_GDEVICE, NULL);
-	return LIBHAL_GDEVICE (device);
+	HalDevice *device = g_object_new (HAL_TYPE_DEVICE, NULL);
+	return HAL_DEVICE (device);
 }

Copied: trunk/libhal-glib/hal-device.h (from r3024, /trunk/libhal-glib/libhal-gdevice.h)
==============================================================================
--- /trunk/libhal-glib/libhal-gdevice.h	(original)
+++ trunk/libhal-glib/hal-device.h	Mon Oct 20 21:50:54 2008
@@ -19,29 +19,29 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef __LIBHAL_GDEVICE_H
-#define __LIBHAL_GDEVICE_H
+#ifndef __HAL_DEVICE_H
+#define __HAL_DEVICE_H
 
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#define LIBHAL_TYPE_GDEVICE		(hal_gdevice_get_type ())
-#define LIBHAL_GDEVICE(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), LIBHAL_TYPE_GDEVICE, HalGDevice))
-#define LIBHAL_GDEVICE_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), LIBHAL_TYPE_GDEVICE, HalGDeviceClass))
-#define LIBHAL_IS_GDEVICE(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), LIBHAL_TYPE_GDEVICE))
-#define LIBHAL_IS_GDEVICE_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), LIBHAL_TYPE_GDEVICE))
-#define LIBHAL_GDEVICE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), LIBHAL_TYPE_GDEVICE, HalGDeviceClass))
+#define HAL_TYPE_DEVICE		(hal_device_get_type ())
+#define HAL_DEVICE(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), HAL_TYPE_DEVICE, HalDevice))
+#define HAL_DEVICE_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), HAL_TYPE_DEVICE, HalDeviceClass))
+#define HAL_IS_DEVICE(o)	(G_TYPE_CHECK_INSTANCE_TYPE ((o), HAL_TYPE_DEVICE))
+#define HAL_IS_DEVICE_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), HAL_TYPE_DEVICE))
+#define HAL_DEVICE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), HAL_TYPE_DEVICE, HalDeviceClass))
 
-typedef struct HalGDevicePrivate HalGDevicePrivate;
+typedef struct HalDevicePrivate HalDevicePrivate;
 
 typedef struct
 {
 	GObject		     parent;
-	HalGDevicePrivate *priv;
-} HalGDevice;
+	HalDevicePrivate *priv;
+} HalDevice;
 
-/* Signals emitted from HalGDevice are:
+/* Signals emitted from HalDevice are:
  *
  * device-property-modified
  * device-condition
@@ -50,47 +50,47 @@
 typedef struct
 {
 	GObjectClass	parent_class;
-	void		(* device_property_modified)	(HalGDevice	*device,
+	void		(* device_property_modified)	(HalDevice	*device,
 							 const gchar	*key,
 							 gboolean	 is_added,
 							 gboolean	 is_removed,
 							 gboolean	 finally);
-	void		(* device_condition)		(HalGDevice	*device,
+	void		(* device_condition)		(HalDevice	*device,
 							 const gchar	*condition,
 							 const gchar	*details);
-} HalGDeviceClass;
+} HalDeviceClass;
 
-GType		 hal_gdevice_get_type			(void);
-HalGDevice	*hal_gdevice_new			(void);
+GType		 hal_device_get_type			(void);
+HalDevice	*hal_device_new				(void);
 
-gboolean	 hal_gdevice_set_udi			(HalGDevice	*device,
+gboolean	 hal_device_set_udi			(HalDevice	*device,
 							 const gchar	*udi);
-const gchar	*hal_gdevice_get_udi			(HalGDevice	*device);
-gboolean	 hal_gdevice_get_bool			(HalGDevice	*device,
+const gchar	*hal_device_get_udi			(HalDevice	*device);
+gboolean	 hal_device_get_bool			(HalDevice	*device,
 							 const gchar	*key,
 							 gboolean	*value,
 							 GError		**error);
-gboolean	 hal_gdevice_get_string			(HalGDevice	*device,
+gboolean	 hal_device_get_string			(HalDevice	*device,
 							 const gchar	*key,
 							 gchar		**value,
 							 GError		**error);
-gboolean	 hal_gdevice_get_int			(HalGDevice	*device,
+gboolean	 hal_device_get_int			(HalDevice	*device,
 							 const gchar	*key,
 							 gint		*value,
 							 GError		**error);
-gboolean	 hal_gdevice_get_uint			(HalGDevice	*device,
+gboolean	 hal_device_get_uint			(HalDevice	*device,
 							 const gchar	*key,
 							 guint		*value,
 							 GError		**error);
-gboolean	 hal_gdevice_query_capability		(HalGDevice	*device,
+gboolean	 hal_device_query_capability		(HalDevice	*device,
 							 const gchar	*capability,
 							 gboolean	*has_capability,
 							 GError		**error);
-gboolean	 hal_gdevice_watch_condition		(HalGDevice	*device);
-gboolean	 hal_gdevice_watch_property_modified	(HalGDevice	*device);
-gboolean	 hal_gdevice_remove_condition		(HalGDevice	*device);
-gboolean	 hal_gdevice_remove_property_modified	(HalGDevice	*device);
+gboolean	 hal_device_watch_condition		(HalDevice	*device);
+gboolean	 hal_device_watch_property_modified	(HalDevice	*device);
+gboolean	 hal_device_remove_condition		(HalDevice	*device);
+gboolean	 hal_device_remove_property_modified	(HalDevice	*device);
 
 G_END_DECLS
 
-#endif	/* __LIBHAL_GDEVICE_H */
+#endif	/* __HAL_DEVICE_H */

Copied: trunk/libhal-glib/hal-manager.c (from r3025, /trunk/libhal-glib/libhal-gmanager.c)
==============================================================================
--- /trunk/libhal-glib/libhal-gmanager.c	(original)
+++ trunk/libhal-glib/hal-manager.c	Mon Oct 20 21:50:54 2008
@@ -32,25 +32,25 @@
 #include "egg-debug.h"
 #include "egg-dbus-proxy.h"
 
-#include "libhal-marshal.h"
-#include "libhal-gpower.h"
-#include "libhal-gdevice.h"
-#include "libhal-gmanager.h"
-
-static void     hal_gmanager_class_init (HalGManagerClass *klass);
-static void     hal_gmanager_init       (HalGManager      *hal_gmanager);
-static void     hal_gmanager_finalize   (GObject	  *object);
+#include "hal-marshal.h"
+#include "hal-device-power.h"
+#include "hal-device.h"
+#include "hal-manager.h"
+
+static void     hal_manager_class_init (HalManagerClass *klass);
+static void     hal_manager_init       (HalManager      *hal_manager);
+static void     hal_manager_finalize   (GObject	  *object);
 
-#define LIBHAL_GMANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBHAL_TYPE_GMANAGER, HalGManagerPrivate))
+#define HAL_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), HAL_TYPE_MANAGER, HalManagerPrivate))
 
-struct HalGManagerPrivate
+struct HalManagerPrivate
 {
 	DBusGConnection		*connection;
-	HalGDevice		*computer;
+	HalDevice		*computer;
 	EggDbusProxy		*gproxy;
 };
 
-/* Signals emitted from HalGManager are:
+/* Signals emitted from HalManager are:
  *
  * device-added
  * device-removed
@@ -70,41 +70,41 @@
 };
 
 static guint signals [LAST_SIGNAL] = { 0 };
-static gpointer hal_gmanager_object = NULL;
+static gpointer hal_manager_object = NULL;
 
-G_DEFINE_TYPE (HalGManager, hal_gmanager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (HalManager, hal_manager, G_TYPE_OBJECT)
 
 /**
- * hal_gmanager_is_running:
+ * hal_manager_is_running:
  *
- * @hal_gmanager: This class instance
- * Return value: TRUE if hal_gmanagerdaemon is running
+ * @hal_manager: This class instance
+ * Return value: TRUE if hal_managerdaemon is running
  *
- * Finds out if hal_gmanager is running
+ * Finds out if hal_manager is running
  **/
 gboolean
-hal_gmanager_is_running (HalGManager *manager)
+hal_manager_is_running (HalManager *manager)
 {
 	gchar *udi = NULL;
 	gboolean running;
 
-	g_return_val_if_fail (LIBHAL_IS_GMANAGER (manager), FALSE);
+	g_return_val_if_fail (HAL_IS_MANAGER (manager), FALSE);
 
-	running = hal_gdevice_get_string (manager->priv->computer, "info.udi", &udi, NULL);
+	running = hal_device_get_string (manager->priv->computer, "info.udi", &udi, NULL);
 	g_free (udi);
 	return running;
 }
 
 /**
- * hal_gmanager_find_capability:
+ * hal_manager_find_capability:
  *
- * @hal_gmanager: This class instance
+ * @hal_manager: This class instance
  * @capability: The capability, e.g. "battery"
  * @value: return value, passed by ref
  * Return value: TRUE for success, FALSE for failure
  **/
 gboolean
-hal_gmanager_find_capability (HalGManager *manager,
+hal_manager_find_capability (HalManager *manager,
 			      const gchar *capability,
 			      gchar     ***value,
 			      GError     **error)
@@ -112,7 +112,7 @@
 	DBusGProxy *proxy = NULL;
 	gboolean ret;
 
-	g_return_val_if_fail (LIBHAL_IS_GMANAGER (manager), FALSE);
+	g_return_val_if_fail (HAL_IS_MANAGER (manager), FALSE);
 	g_return_val_if_fail (capability != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
@@ -132,16 +132,16 @@
 }
 
 /**
- * hal_gmanager_find_device_string_match:
+ * hal_manager_find_device_string_match:
  *
- * @hal_gmanager: This class instance
+ * @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_gmanager_find_device_string_match (HalGManager *manager,
+hal_manager_find_device_string_match (HalManager *manager,
 			               const gchar *key,
 			               const gchar *value,
 			               gchar     ***devices,
@@ -150,7 +150,7 @@
 	DBusGProxy *proxy = NULL;
 	gboolean ret;
 
-	g_return_val_if_fail (LIBHAL_IS_GMANAGER (manager), FALSE);
+	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);
@@ -172,14 +172,14 @@
 }
 
 /**
- * hal_gmanager_free_capability:
+ * hal_manager_free_capability:
  *
  * @value: The list of strings to free
  *
- * Frees value result of hal_gmanager_find_capability. Safe to call with NULL.
+ * Frees value result of hal_manager_find_capability. Safe to call with NULL.
  **/
 void
-hal_gmanager_free_capability (gchar **value)
+hal_manager_free_capability (gchar **value)
 {
 	gint i;
 
@@ -193,7 +193,7 @@
 }
 
 /**
- * hal_gmanager_num_devices_of_capability:
+ * hal_manager_num_devices_of_capability:
  *
  * @manager: This class instance
  * @capability: The capability, e.g. "battery"
@@ -202,28 +202,28 @@
  * Get the number of devices on system with a specific capability
  **/
 gint
-hal_gmanager_num_devices_of_capability (HalGManager *manager,
+hal_manager_num_devices_of_capability (HalManager *manager,
 					const gchar *capability)
 {
 	gint i;
 	gchar **names;
 	gboolean ret;
 
-	g_return_val_if_fail (LIBHAL_IS_GMANAGER (manager), 0);
+	g_return_val_if_fail (HAL_IS_MANAGER (manager), 0);
 	g_return_val_if_fail (capability != NULL, 0);
 
-	ret = hal_gmanager_find_capability (manager, capability, &names, NULL);
+	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_gmanager_free_capability (names);
+	hal_manager_free_capability (names);
 	return i;
 }
 
 /**
- * hal_gmanager_num_devices_of_capability_with_value:
+ * hal_manager_num_devices_of_capability_with_value:
  *
  * @manager: This class instance
  * @capability: The capability, e.g. "battery"
@@ -234,7 +234,7 @@
  * Get the number of devices on system with a specific capability and key value
  **/
 gint
-hal_gmanager_num_devices_of_capability_with_value (HalGManager *manager,
+hal_manager_num_devices_of_capability_with_value (HalManager *manager,
 					      const gchar *capability,
 					      const gchar *key,
 					      const gchar *value)
@@ -243,22 +243,22 @@
 	gint valid = 0;
 	gchar **names;
 	gboolean ret;
-	HalGDevice *hal_device;
+	HalDevice *hal_device;
 
-	g_return_val_if_fail (LIBHAL_IS_GMANAGER (manager), 0);
+	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_gmanager_find_capability (manager, capability, &names, NULL);
+	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_gdevice_new ();
-		hal_gdevice_set_udi (hal_device, names[i]);
-		hal_gdevice_get_string (hal_device, key, &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)
@@ -266,29 +266,29 @@
 			g_free (type);
 		}
 	}
-	hal_gmanager_free_capability (names);
+	hal_manager_free_capability (names);
 	return valid;
 }
 
 /**
- * hal_gmanager_class_init:
+ * hal_manager_class_init:
  * @klass: This class instance
  **/
 static void
-hal_gmanager_class_init (HalGManagerClass *klass)
+hal_manager_class_init (HalManagerClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = hal_gmanager_finalize;
-	g_type_class_add_private (klass, sizeof (HalGManagerPrivate));
+	object_class->finalize = hal_manager_finalize;
+	g_type_class_add_private (klass, sizeof (HalManagerPrivate));
 
 	signals [DEVICE_ADDED] =
 		g_signal_new ("device-added",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (HalGManagerClass, device_added),
+			      G_STRUCT_OFFSET (HalManagerClass, device_added),
 			      NULL,
 			      NULL,
-			      libhal_marshal_VOID__STRING,
+			      hal_marshal_VOID__STRING,
 			      G_TYPE_NONE,
 			      1, G_TYPE_STRING);
 
@@ -296,10 +296,10 @@
 		g_signal_new ("device-removed",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (HalGManagerClass, device_removed),
+			      G_STRUCT_OFFSET (HalManagerClass, device_removed),
 			      NULL,
 			      NULL,
-			      libhal_marshal_VOID__STRING,
+			      hal_marshal_VOID__STRING,
 			      G_TYPE_NONE,
 			      1, G_TYPE_STRING);
 
@@ -307,10 +307,10 @@
 		g_signal_new ("new-capability",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (HalGManagerClass, new_capability),
+			      G_STRUCT_OFFSET (HalManagerClass, new_capability),
 			      NULL,
 			      NULL,
-			      libhal_marshal_VOID__STRING_STRING,
+			      hal_marshal_VOID__STRING_STRING,
 			      G_TYPE_NONE,
 			      2, G_TYPE_STRING, G_TYPE_STRING);
 
@@ -318,10 +318,10 @@
 		g_signal_new ("lost-capability",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (HalGManagerClass, lost_capability),
+			      G_STRUCT_OFFSET (HalManagerClass, lost_capability),
 			      NULL,
 			      NULL,
-			      libhal_marshal_VOID__STRING_STRING,
+			      hal_marshal_VOID__STRING_STRING,
 			      G_TYPE_NONE,
 			      2, G_TYPE_STRING, G_TYPE_STRING);
 
@@ -329,7 +329,7 @@
 		g_signal_new ("daemon-start",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (HalGManagerClass, daemon_start),
+			      G_STRUCT_OFFSET (HalManagerClass, daemon_start),
 			      NULL,
 			      NULL,
 			      g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
@@ -338,14 +338,14 @@
 		g_signal_new ("daemon-stop",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (HalGManagerClass, daemon_stop),
+			      G_STRUCT_OFFSET (HalManagerClass, daemon_stop),
 			      NULL,
 			      NULL,
 			      g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 }
 
 /**
- * hal_gmanager_device_added_cb:
+ * hal_manager_device_added_cb:
  *
  * @proxy: The org.freedesktop.Hal.Manager proxy
  * @udi: Univerisal Device Id
@@ -354,15 +354,15 @@
  * Invoked when a device is added.
  */
 static void
-hal_gmanager_device_added_cb (DBusGProxy  *proxy,
+hal_manager_device_added_cb (DBusGProxy  *proxy,
 		              const gchar *udi,
-		              HalGManager *manager)
+		              HalManager *manager)
 {
 	g_signal_emit (manager, signals [DEVICE_ADDED], 0, udi);
 }
 
 /**
- * hal_gmanager_device_removed_cb:
+ * hal_manager_device_removed_cb:
  *
  * @proxy: The org.freedesktop.Hal.Manager proxy
  * @udi: Univerisal Device Id
@@ -371,15 +371,15 @@
  * Invoked when a device is removed.
  */
 static void
-hal_gmanager_device_removed_cb (DBusGProxy  *proxy,
+hal_manager_device_removed_cb (DBusGProxy  *proxy,
 		                const gchar *udi,
-		                HalGManager *manager)
+		                HalManager *manager)
 {
 	g_signal_emit (manager, signals [DEVICE_REMOVED], 0, udi);
 }
 
 /**
- * hal_gmanager_new_capability_cb:
+ * hal_manager_new_capability_cb:
  *
  * @proxy: The org.freedesktop.Hal.Manager proxy
  * @udi: Univerisal Device Id
@@ -389,16 +389,16 @@
  * Invoked when a device gets a new condition.
  */
 static void
-hal_gmanager_new_capability_cb (DBusGProxy  *proxy,
+hal_manager_new_capability_cb (DBusGProxy  *proxy,
 		                const gchar *udi,
 		                const gchar *capability,
-		                HalGManager *manager)
+		                HalManager *manager)
 {
 	g_signal_emit (manager, signals [NEW_CAPABILITY], 0, udi, capability);
 }
 
 /**
- * hal_gmanager_proxy_connect_more:
+ * hal_manager_proxy_connect_more:
  *
  * @manager: This class instance
  * Return value: Success
@@ -406,11 +406,11 @@
  * Connect the manager proxy to HAL and register some basic callbacks
  */
 static gboolean
-hal_gmanager_proxy_connect_more (HalGManager *manager)
+hal_manager_proxy_connect_more (HalManager *manager)
 {
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GMANAGER (manager), FALSE);
+	g_return_val_if_fail (HAL_IS_MANAGER (manager), FALSE);
 
 	proxy = egg_dbus_proxy_get_proxy (manager->priv->gproxy);
 	if (DBUS_IS_G_PROXY (proxy) == FALSE) {
@@ -422,37 +422,37 @@
 	dbus_g_proxy_add_signal (proxy, "DeviceAdded",
 				 G_TYPE_STRING, G_TYPE_INVALID);
 	dbus_g_proxy_connect_signal (proxy, "DeviceAdded",
-				     G_CALLBACK (hal_gmanager_device_added_cb), manager, NULL);
+				     G_CALLBACK (hal_manager_device_added_cb), manager, NULL);
 
 	dbus_g_proxy_add_signal (proxy, "DeviceRemoved",
 				 G_TYPE_STRING, G_TYPE_INVALID);
 	dbus_g_proxy_connect_signal (proxy, "DeviceRemoved",
-				     G_CALLBACK (hal_gmanager_device_removed_cb), manager, NULL);
+				     G_CALLBACK (hal_manager_device_removed_cb), manager, NULL);
 
-	dbus_g_object_register_marshaller (libhal_marshal_VOID__STRING_STRING,
+	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_gmanager_new_capability_cb), manager, NULL);
+				     G_CALLBACK (hal_manager_new_capability_cb), manager, NULL);
 
 	return TRUE;
 }
 
 /**
- * hal_gmanager_proxy_disconnect_more:
+ * hal_manager_proxy_disconnect_more:
  *
  * @manager: This class instance
  * Return value: Success
  *
- * Disconnect the manager proxy to HAL_GMANAGER and disconnect some basic callbacks
+ * Disconnect the manager proxy to HAL_MANAGER and disconnect some basic callbacks
  */
 static gboolean
-hal_gmanager_proxy_disconnect_more (HalGManager *manager)
+hal_manager_proxy_disconnect_more (HalManager *manager)
 {
 	DBusGProxy *proxy;
 
-	g_return_val_if_fail (LIBHAL_IS_GMANAGER (manager), FALSE);
+	g_return_val_if_fail (HAL_IS_MANAGER (manager), FALSE);
 
 	proxy = egg_dbus_proxy_get_proxy (manager->priv->gproxy);
 	if (DBUS_IS_G_PROXY (proxy) == FALSE) {
@@ -461,9 +461,9 @@
 	}
 
 	dbus_g_proxy_disconnect_signal (proxy, "DeviceRemoved",
-					G_CALLBACK (hal_gmanager_device_removed_cb), manager);
+					G_CALLBACK (hal_manager_device_removed_cb), manager);
 	dbus_g_proxy_disconnect_signal (proxy, "NewCapability",
-					G_CALLBACK (hal_gmanager_new_capability_cb), manager);
+					G_CALLBACK (hal_manager_new_capability_cb), manager);
 
 	return TRUE;
 }
@@ -477,32 +477,32 @@
 static void
 proxy_status_cb (DBusGProxy    *proxy,
 		 gboolean       status,
-		 HalGManager *manager)
+		 HalManager *manager)
 {
-	g_return_if_fail (LIBHAL_IS_GMANAGER (manager));
+	g_return_if_fail (HAL_IS_MANAGER (manager));
 	if (status) {
 		g_signal_emit (manager, signals [DAEMON_START], 0);
-		hal_gmanager_proxy_connect_more (manager);
+		hal_manager_proxy_connect_more (manager);
 	} else {
 		g_signal_emit (manager, signals [DAEMON_STOP], 0);
-		hal_gmanager_proxy_disconnect_more (manager);
+		hal_manager_proxy_disconnect_more (manager);
 	}
 }
 
 /**
- * hal_gmanager_init:
+ * hal_manager_init:
  *
  * @manager: This class instance
  **/
 static void
-hal_gmanager_init (HalGManager *manager)
+hal_manager_init (HalManager *manager)
 {
 	GError *error = NULL;
 	DBusGProxy *proxy;
 	DBusGConnection *connection;
 	gboolean ret;
 
-	manager->priv = LIBHAL_GMANAGER_GET_PRIVATE (manager);
+	manager->priv = HAL_MANAGER_GET_PRIVATE (manager);
 
 	manager->priv->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
 	if (error) {
@@ -525,18 +525,18 @@
 			  G_CALLBACK (proxy_status_cb), manager);
 
 	/* use the computer object */
-	manager->priv->computer = hal_gdevice_new();
-	ret = hal_gdevice_set_udi (manager->priv->computer, HAL_ROOT_COMPUTER);
+	manager->priv->computer = hal_device_new();
+	ret = hal_device_set_udi (manager->priv->computer, HAL_ROOT_COMPUTER);
 	if (!ret) {
 		egg_warning ("failed to get Computer root object");
 	}
 
 	/* blindly try to connect, assuming HAL is alive */
-	hal_gmanager_proxy_connect_more (manager);
+	hal_manager_proxy_connect_more (manager);
 }
 
 /**
- * hal_gmanager_is_laptop:
+ * hal_manager_is_laptop:
  *
  * @manager: This class instance
  * Return value: TRUE is computer is identified as a laptop
@@ -544,15 +544,15 @@
  * Returns true if system.formfactor is "laptop"
  **/
 gboolean
-hal_gmanager_is_laptop (HalGManager *manager)
+hal_manager_is_laptop (HalManager *manager)
 {
 	gboolean ret = TRUE;
 	gchar *formfactor = NULL;
 
-	g_return_val_if_fail (LIBHAL_IS_GMANAGER (manager), FALSE);
+	g_return_val_if_fail (HAL_IS_MANAGER (manager), FALSE);
 
 	/* always present */
-	hal_gdevice_get_string (manager->priv->computer, "system.formfactor", &formfactor, NULL);
+	hal_device_get_string (manager->priv->computer, "system.formfactor", &formfactor, NULL);
 	if (formfactor == NULL) {
 		/* no need to free */
 		return FALSE;
@@ -567,38 +567,38 @@
 }
 
 /**
- * hal_gmanager_finalize:
+ * hal_manager_finalize:
  * @object: This class instance
  **/
 static void
-hal_gmanager_finalize (GObject *object)
+hal_manager_finalize (GObject *object)
 {
-	HalGManager *manager;
+	HalManager *manager;
 	g_return_if_fail (object != NULL);
-	g_return_if_fail (LIBHAL_IS_GMANAGER (object));
+	g_return_if_fail (HAL_IS_MANAGER (object));
 
-	manager = LIBHAL_GMANAGER (object);
-	manager->priv = LIBHAL_GMANAGER_GET_PRIVATE (manager);
+	manager = HAL_MANAGER (object);
+	manager->priv = HAL_MANAGER_GET_PRIVATE (manager);
 
 	g_object_unref (manager->priv->gproxy);
 	g_object_unref (manager->priv->computer);
 
-	G_OBJECT_CLASS (hal_gmanager_parent_class)->finalize (object);
+	G_OBJECT_CLASS (hal_manager_parent_class)->finalize (object);
 }
 
 /**
- * hal_gmanager_new:
- * Return value: new HalGManager instance.
+ * hal_manager_new:
+ * Return value: new HalManager instance.
  **/
-HalGManager *
-hal_gmanager_new (void)
+HalManager *
+hal_manager_new (void)
 {
-	if (hal_gmanager_object != NULL) {
-		g_object_ref (hal_gmanager_object);
+	if (hal_manager_object != NULL) {
+		g_object_ref (hal_manager_object);
 	} else {
-		hal_gmanager_object = g_object_new (LIBHAL_TYPE_GMANAGER, NULL);
-		g_object_add_weak_pointer (hal_gmanager_object, &hal_gmanager_object);
+		hal_manager_object = g_object_new (HAL_TYPE_MANAGER, NULL);
+		g_object_add_weak_pointer (hal_manager_object, &hal_manager_object);
 	}
-	return LIBHAL_GMANAGER (hal_gmanager_object);
+	return HAL_MANAGER (hal_manager_object);
 }
 

Copied: trunk/libhal-glib/hal-manager.h (from r3024, /trunk/libhal-glib/libhal-gmanager.h)
==============================================================================
--- /trunk/libhal-glib/libhal-gmanager.h	(original)
+++ trunk/libhal-glib/hal-manager.h	Mon Oct 20 21:50:54 2008
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef __LIBHAL_GMANAGER_H
-#define __LIBHAL_GMANAGER_H
+#ifndef __HAL_MANAGER_H
+#define __HAL_MANAGER_H
 
 #include <glib-object.h>
 
@@ -37,22 +37,22 @@
 #define	HAL_DBUS_INTERFACE_LIGHT_SENSOR	 	"org.freedesktop.Hal.Device.LightSensor"
 #define HAL_ROOT_COMPUTER		 	"/org/freedesktop/Hal/devices/computer"
 
-#define LIBHAL_TYPE_GMANAGER		(hal_gmanager_get_type ())
-#define LIBHAL_GMANAGER(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), LIBHAL_TYPE_GMANAGER, HalGManager))
-#define LIBHAL_GMANAGER_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), LIBHAL_TYPE_GMANAGER, HalGManagerClass))
-#define LIBHAL_IS_GMANAGER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), LIBHAL_TYPE_GMANAGER))
-#define LIBHAL_IS_GMANAGER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), LIBHAL_TYPE_GMANAGER))
-#define LIBHAL_GMANAGER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), LIBHAL_TYPE_GMANAGER, HalGManagerClass))
+#define HAL_TYPE_MANAGER		(hal_manager_get_type ())
+#define HAL_MANAGER(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), HAL_TYPE_MANAGER, HalManager))
+#define HAL_MANAGER_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), HAL_TYPE_MANAGER, HalManagerClass))
+#define HAL_IS_MANAGER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), HAL_TYPE_MANAGER))
+#define HAL_IS_MANAGER_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), HAL_TYPE_MANAGER))
+#define HAL_MANAGER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), HAL_TYPE_MANAGER, HalManagerClass))
 
-typedef struct HalGManagerPrivate HalGManagerPrivate;
+typedef struct HalManagerPrivate HalManagerPrivate;
 
 typedef struct
 {
-	GObject		 parent;
-	HalGManagerPrivate	*priv;
-} HalGManager;
+	GObject			 parent;
+	HalManagerPrivate	*priv;
+} HalManager;
 
-/* Signals emitted from HalGManager are:
+/* Signals emitted from HalManager are:
  *
  * device-added
  * device-removed
@@ -65,42 +65,42 @@
 typedef struct
 {
 	GObjectClass	parent_class;
-	void		(* device_added)		(HalGManager	*manager,
+	void		(* device_added)		(HalManager	*manager,
 							 const gchar	*udi);
-	void		(* device_removed)		(HalGManager	*manager,
+	void		(* device_removed)		(HalManager	*manager,
 							 const gchar	*udi);
-	void		(* new_capability)		(HalGManager	*manager,
+	void		(* new_capability)		(HalManager	*manager,
 							 const gchar	*udi,
 							 const gchar	*capability);
-	void		(* lost_capability)		(HalGManager	*manager,
+	void		(* lost_capability)		(HalManager	*manager,
 							 const gchar	*udi,
 							 const gchar	*capability);
-	void		(* daemon_start)		(HalGManager	*manager);
-	void		(* daemon_stop)			(HalGManager	*manager);
-} HalGManagerClass;
+	void		(* daemon_start)		(HalManager	*manager);
+	void		(* daemon_stop)			(HalManager	*manager);
+} HalManagerClass;
 
-GType		 hal_gmanager_get_type			(void);
-HalGManager	*hal_gmanager_new			(void);
+GType		 hal_manager_get_type			(void);
+HalManager	*hal_manager_new			(void);
 
-gboolean	 hal_gmanager_is_running		(HalGManager	*manager);
-gint		 hal_gmanager_num_devices_of_capability (HalGManager	*manager,
+gboolean	 hal_manager_is_running			(HalManager	*manager);
+gint		 hal_manager_num_devices_of_capability	(HalManager	*manager,
 							 const gchar	*capability);
-gint		 hal_gmanager_num_devices_of_capability_with_value (HalGManager *manager,
+gint		 hal_manager_num_devices_of_capability_with_value (HalManager *manager,
 							 const gchar	*capability,
 							 const gchar	*key,
 							 const gchar	*value);
-gboolean	 hal_gmanager_find_capability		(HalGManager	*manager,
+gboolean	 hal_manager_find_capability		(HalManager	*manager,
 							 const gchar	*capability,
 							 gchar     	***value,
 							 GError		**error);
-gboolean	 hal_gmanager_find_device_string_match	(HalGManager	*manager,
+gboolean	 hal_manager_find_device_string_match	(HalManager	*manager,
 							 const gchar	*key,
 							 const gchar	*value,
 							 gchar		***devices,
 							 GError		**error);
-void		 hal_gmanager_free_capability		(gchar		**value);
-gboolean	 hal_gmanager_is_laptop			(HalGManager	*manager);
+void		 hal_manager_free_capability		(gchar		**value);
+gboolean	 hal_manager_is_laptop			(HalManager	*manager);
 
 G_END_DECLS
 
-#endif	/* __LIBHAL_GMANAGER_H */
+#endif	/* __HAL_MANAGER_H */

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Oct 20 21:50:54 2008
@@ -36,10 +36,7 @@
 	$(NULL)
 
 LOCAL_LIBHAL_LIBS =					\
-	$(top_builddir)/libhal-glib/libhal-gdevice.la	\
-	$(top_builddir)/libhal-glib/libhal-gdevicestore.la	\
-	$(top_builddir)/libhal-glib/libhal-gmanager.la	\
-	$(top_builddir)/libhal-glib/libhal-gpower.la
+	$(top_builddir)/libhal-glib/libhal.la
 
 bin_PROGRAMS =						\
 	gnome-power-manager				\

Modified: trunk/src/gpm-ac-adapter.c
==============================================================================
--- trunk/src/gpm-ac-adapter.c	(original)
+++ trunk/src/gpm-ac-adapter.c	Mon Oct 20 21:50:54 2008
@@ -38,8 +38,8 @@
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 
-#include <libhal-gdevice.h>
-#include <libhal-gmanager.h>
+#include <hal-device.h>
+#include <hal-manager.h>
 
 #include "gpm-common.h"
 #include "egg-debug.h"
@@ -50,7 +50,7 @@
 struct GpmAcAdapterPrivate
 {
 	gboolean		 has_hardware;
-	HalGDevice		*hal_device;
+	HalDevice		*hal_device;
 };
 
 enum {
@@ -84,7 +84,7 @@
 	}
 
 	error = NULL;
-	hal_gdevice_get_bool (ac_adapter->priv->hal_device,
+	hal_device_get_bool (ac_adapter->priv->hal_device,
 			      "ac_adapter.present", &is_on_ac, &error);
 	if (error != NULL) {
 		egg_warning ("could not read ac_adapter.present");
@@ -109,7 +109,7 @@
  * changed, and we have we have subscribed to changes for that device.
  */
 static void
-hal_device_property_modified_cb (HalGDevice   *hal_device,
+hal_device_property_modified_cb (HalDevice   *hal_device,
 				 const gchar  *key,
 				 gboolean      is_added,
 				 gboolean      is_removed,
@@ -179,15 +179,15 @@
 	gchar **device_names;
 	gboolean ret;
 	GError *error;
-	HalGManager *hal_manager;
+	HalManager *hal_manager;
 
 	ac_adapter->priv = GPM_AC_ADAPTER_GET_PRIVATE (ac_adapter);
-	ac_adapter->priv->hal_device = hal_gdevice_new ();
-	hal_manager = hal_gmanager_new ();
+	ac_adapter->priv->hal_device = hal_device_new ();
+	hal_manager = hal_manager_new ();
 
 	/* save udi of lcd adapter */
 	error = NULL;
-	ret = hal_gmanager_find_capability (hal_manager, "ac_adapter", &device_names, &error);
+	ret = hal_manager_find_capability (hal_manager, "ac_adapter", &device_names, &error);
 	if (!ret) {
 		egg_warning ("Couldn't obtain list of AC adapters: %s", error->message);
 		g_error_free (error);
@@ -200,8 +200,8 @@
 		egg_debug ("using %s", device_names[0]);
 
 		/* We only want first ac_adapter object (should only be one) */
-		hal_gdevice_set_udi (ac_adapter->priv->hal_device, device_names[0]);
-		hal_gdevice_watch_property_modified (ac_adapter->priv->hal_device);
+		hal_device_set_udi (ac_adapter->priv->hal_device, device_names[0]);
+		hal_device_watch_property_modified (ac_adapter->priv->hal_device);
 
 		/* we want state changes */
 		g_signal_connect (ac_adapter->priv->hal_device, "property-modified",
@@ -211,7 +211,7 @@
 		ac_adapter->priv->has_hardware = FALSE;
 		egg_debug ("No devices of capability ac_adapter");
 	}
-	hal_gmanager_free_capability (device_names);
+	hal_manager_free_capability (device_names);
 	g_object_unref (hal_manager);
 }
 

Modified: trunk/src/gpm-backlight.c
==============================================================================
--- trunk/src/gpm-backlight.c	(original)
+++ trunk/src/gpm-backlight.c	Mon Oct 20 21:50:54 2008
@@ -40,7 +40,7 @@
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 
-#include <libhal-gmanager.h>
+#include <hal-manager.h>
 
 #include "gpm-ac-adapter.h"
 #include "gpm-button.h"
@@ -853,7 +853,7 @@
 static void
 gpm_backlight_init (GpmBacklight *backlight)
 {
-	HalGManager *hal_manager;
+	HalManager *hal_manager;
 	guint value;
 	GpmPrefsServer *prefs_server;
 
@@ -878,8 +878,8 @@
 	backlight->priv->can_sense = gpm_light_sensor_has_hw (backlight->priv->light_sensor);
 
 	/* we use hal to see if we are a laptop */
-	hal_manager = hal_gmanager_new ();
-	backlight->priv->is_laptop = hal_gmanager_is_laptop (hal_manager);
+	hal_manager = hal_manager_new ();
+	backlight->priv->is_laptop = hal_manager_is_laptop (hal_manager);
 	g_object_unref (hal_manager);
 
 	/* expose ui in prefs program */

Modified: trunk/src/gpm-brightness-hal.c
==============================================================================
--- trunk/src/gpm-brightness-hal.c	(original)
+++ trunk/src/gpm-brightness-hal.c	Mon Oct 20 21:50:54 2008
@@ -38,8 +38,8 @@
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 
-#include <libhal-gdevice.h>
-#include <libhal-gmanager.h>
+#include <hal-device.h>
+#include <hal-manager.h>
 #include "egg-dbus-proxy.h"
 
 #include "egg-debug.h"
@@ -444,8 +444,8 @@
 gpm_brightness_hal_init (GpmBrightnessHal *brightness)
 {
 	gchar **names;
-	HalGManager *manager;
-	HalGDevice *device;
+	HalManager *manager;
+	HalDevice *device;
 	gboolean res;
 	DBusGConnection *connection;
 
@@ -454,8 +454,8 @@
 	brightness->priv->hw_changed = FALSE;
 
 	/* save udi of lcd adapter */
-	manager = hal_gmanager_new ();
-	hal_gmanager_find_capability (manager, "laptop_panel", &names, NULL);
+	manager = hal_manager_new ();
+	hal_manager_find_capability (manager, "laptop_panel", &names, NULL);
 	g_object_unref (manager);
 	if (names == NULL || names[0] == NULL) {
 		egg_warning ("No devices of capability laptop_panel");
@@ -464,13 +464,13 @@
 
 	/* We only want first laptop_panel object (should only be one) */
 	brightness->priv->udi = g_strdup (names[0]);
-	hal_gmanager_free_capability (names);
+	hal_manager_free_capability (names);
 
-	device = hal_gdevice_new ();
-	hal_gdevice_set_udi (device, brightness->priv->udi);
+	device = hal_device_new ();
+	hal_device_set_udi (device, brightness->priv->udi);
 
 	/* get levels that the adapter supports -- this does not change ever */
-	hal_gdevice_get_uint (device, "laptop_panel.num_levels",
+	hal_device_get_uint (device, "laptop_panel.num_levels",
 			      &brightness->priv->levels, NULL);
 	egg_debug ("Laptop panel levels: %i", brightness->priv->levels);
 	if (brightness->priv->levels == 0 || brightness->priv->levels > 256) {
@@ -478,7 +478,7 @@
 	}
 
 	/* Check if hardware handles brightness changes automatically */
-	res = hal_gdevice_get_bool (device, 
+	res = hal_device_get_bool (device, 
 				    "laptop_panel.brightness_in_hardware",
 			            &brightness->priv->does_own_updates, NULL);
 

Modified: trunk/src/gpm-brightness-kbd.c
==============================================================================
--- trunk/src/gpm-brightness-kbd.c	(original)
+++ trunk/src/gpm-brightness-kbd.c	Mon Oct 20 21:50:54 2008
@@ -39,8 +39,8 @@
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 
-#include <libhal-gdevice.h>
-#include <libhal-gmanager.h>
+#include <hal-device.h>
+#include <hal-manager.h>
 #include "egg-dbus-proxy.h"
 
 #include "egg-debug.h"
@@ -675,8 +675,8 @@
 gpm_brightness_kbd_init (GpmBrightnessKbd *brightness)
 {
 	gchar **names;
-	HalGManager *manager;
-	HalGDevice *device;
+	HalManager *manager;
+	HalDevice *device;
 	DBusGConnection *connection;
 
 	brightness->priv = GPM_BRIGHTNESS_KBD_GET_PRIVATE (brightness);
@@ -691,8 +691,8 @@
 	}
 
 	/* save udi of kbd adapter */
-	manager = hal_gmanager_new ();
-	hal_gmanager_find_capability (manager, "keyboard_backlight", &names, NULL);
+	manager = hal_manager_new ();
+	hal_manager_find_capability (manager, "keyboard_backlight", &names, NULL);
 	g_object_unref (manager);
 	if (names == NULL || names[0] == NULL) {
 		egg_warning ("No devices of capability keyboard_backlight");
@@ -701,7 +701,7 @@
 
 	/* We only want first keyboard_backlight object (should only be one) */
 	brightness->priv->udi = g_strdup (names[0]);
-	hal_gmanager_free_capability (names);
+	hal_manager_free_capability (names);
 
 	brightness->priv->does_own_dimming = FALSE;
 	brightness->priv->does_own_updates = FALSE;
@@ -714,9 +714,9 @@
 			       brightness->priv->udi, HAL_DBUS_INTERFACE_KBD_BACKLIGHT);
 
 	/* get levels that the adapter supports -- this does not change ever */
-	device = hal_gdevice_new ();
-	hal_gdevice_set_udi (device, brightness->priv->udi);
-	hal_gdevice_get_uint (device, "keyboard_backlight.num_levels",
+	device = hal_device_new ();
+	hal_device_set_udi (device, brightness->priv->udi);
+	hal_device_get_uint (device, "keyboard_backlight.num_levels",
 			      &brightness->priv->levels, NULL);
 	g_object_unref (device);
 
@@ -744,13 +744,13 @@
 gboolean
 gpm_brightness_kbd_has_hw (void)
 {
-	HalGManager *manager;
+	HalManager *manager;
 	gchar **names;
 	gboolean ret = TRUE;
 
 	/* okay, as singleton - so we don't allocate more memory */
-	manager = hal_gmanager_new ();
-	hal_gmanager_find_capability (manager, "keyboard_backlight", &names, NULL);
+	manager = hal_manager_new ();
+	hal_manager_find_capability (manager, "keyboard_backlight", &names, NULL);
 	g_object_unref (manager);
 
 	/* nothing found */
@@ -758,7 +758,7 @@
 		ret = FALSE;
 	}
 
-	hal_gmanager_free_capability (names);
+	hal_manager_free_capability (names);
 	return ret;
 }
 

Modified: trunk/src/gpm-button.c
==============================================================================
--- trunk/src/gpm-button.c	(original)
+++ trunk/src/gpm-button.c	Mon Oct 20 21:50:54 2008
@@ -30,9 +30,9 @@
 #include <gtk/gtk.h>
 #include <X11/XF86keysym.h>
 
-#include <libhal-gmanager.h>
-#include <libhal-gdevice.h>
-#include <libhal-gdevicestore.h>
+#include <hal-manager.h>
+#include <hal-device.h>
+#include <hal-device-store.h>
 
 #include "gpm-common.h"
 #include "gpm-button.h"
@@ -51,8 +51,8 @@
 	GdkWindow		*window;
 	GHashTable		*hash_to_hal;
 	gboolean		 lid_is_closed;
-	HalGManager		*hal_manager; /* remove when input events is in the kernel */
-	HalGDevicestore		*hal_devicestore;
+	HalManager		*hal_manager; /* remove when input events is in the kernel */
+	HalDevicestore		*hal_devicestore;
 };
 
 enum {
@@ -255,7 +255,7 @@
  */
 static void
 emit_button_pressed (GpmButton   *button,
-		     HalGDevice  *device,
+		     HalDevice  *device,
 		     const gchar *details)
 {
 	gchar *type = NULL;
@@ -268,10 +268,10 @@
 	if (strcmp (details, "") == 0) {
 		/* no details about the event, so we get more info
 		   for type 1 buttons */
-		hal_gdevice_get_string (device, "button.type", &type, NULL);
+		hal_device_get_string (device, "button.type", &type, NULL);
 		/* hal may no longer be there */
 		if (type == NULL) {
-			egg_warning ("cannot get button type for %s", hal_gdevice_get_udi (device));
+			egg_warning ("cannot get button type for %s", hal_device_get_udi (device));
 			return;
 		}
 	} else {
@@ -283,7 +283,7 @@
 	state = TRUE;
 	/* we need to get the button state for lid buttons */
 	if (strcmp (type, "lid") == 0) {
-		hal_gdevice_get_bool (device, "button.state.value", &state, NULL);
+		hal_device_get_bool (device, "button.state.value", &state, NULL);
 	}
 
 	/* abstact away that HAL has an extra parameter */
@@ -328,7 +328,7 @@
  * changed, and we have we have subscribed to changes for that device.
  */
 static void
-hal_device_property_modified_cb (HalGDevice    *device,
+hal_device_property_modified_cb (HalDevice    *device,
 				 const gchar   *key,
 				 gboolean       is_added,
 				 gboolean       is_removed,
@@ -345,7 +345,7 @@
 
 	/* only match button* values */
 	if (strncmp (key, "button", 6) == 0) {
-		egg_debug ("state of a button has changed : %s, %s", hal_gdevice_get_udi (device), key);
+		egg_debug ("state of a button has changed : %s, %s", hal_device_get_udi (device), key);
 		emit_button_pressed (button, device, "");
 	}
 }
@@ -361,7 +361,7 @@
  * changed, and we have we have subscribed to changes for that device.
  */
 static void
-hal_device_condition_cb (HalGDevice    *device,
+hal_device_condition_cb (HalDevice    *device,
 			 const gchar   *condition,
 			 const gchar   *details,
 			 GpmButton     *button)
@@ -382,12 +382,12 @@
 watch_add_button (GpmButton *button,
 		  const gchar   *udi)
 {
-	HalGDevice *device;
+	HalDevice *device;
 
-	device = hal_gdevice_new ();
-	hal_gdevice_set_udi (device, udi);
-	hal_gdevice_watch_condition (device);
-	hal_gdevice_watch_property_modified (device);
+	device = hal_device_new ();
+	hal_device_set_udi (device, udi);
+	hal_device_watch_condition (device);
+	hal_device_watch_property_modified (device);
 
 	g_signal_connect (device, "property-modified",
 			  G_CALLBACK (hal_device_property_modified_cb), button);
@@ -395,7 +395,7 @@
 			  G_CALLBACK (hal_device_condition_cb), button);
 
 	/* when added to the devicestore, devices are automatically unref'ed */
-	hal_gdevicestore_insert (button->priv->hal_devicestore, device);
+	hal_device_store_insert (button->priv->hal_devicestore, device);
 }
 
 /**
@@ -411,7 +411,7 @@
 
 	/* devices of type button */
 	error = NULL;
-	ret = hal_gmanager_find_capability (button->priv->hal_manager, "button", &device_names, &error);
+	ret = hal_manager_find_capability (button->priv->hal_manager, "button", &device_names, &error);
 	if (!ret) {
 		egg_warning ("Couldn't obtain list of buttons: %s", error->message);
 		g_error_free (error);
@@ -427,19 +427,19 @@
 		egg_debug ("Couldn't obtain list of buttons");
 	}
 
-	hal_gmanager_free_capability (device_names);
+	hal_manager_free_capability (device_names);
 }
 
 /**
  * hal_daemon_start_cb:
  **/
 static void
-hal_daemon_start_cb (HalGManager *hal_manager,
+hal_daemon_start_cb (HalManager *hal_manager,
 		     GpmButton   *button)
 {
 	/* get new devices, hal has come back up */
 	if (button->priv->hal_devicestore == NULL) {
-		button->priv->hal_devicestore = hal_gdevicestore_new ();
+		button->priv->hal_devicestore = hal_device_store_new ();
 		coldplug_buttons (button);
 	}
 }
@@ -448,7 +448,7 @@
  * hal_daemon_stop_cb:
  **/
 static void
-hal_daemon_stop_cb (HalGManager *hal_manager,
+hal_daemon_stop_cb (HalManager *hal_manager,
 		    GpmButton   *button)
 {
 	/* clear devices, HAL is going down */
@@ -501,13 +501,13 @@
 	}
 
 	/* remove when button support is out of HAL */
-	button->priv->hal_manager = hal_gmanager_new ();
+	button->priv->hal_manager = hal_manager_new ();
 	g_signal_connect (button->priv->hal_manager, "daemon-start",
 			  G_CALLBACK (hal_daemon_start_cb), button);
 	g_signal_connect (button->priv->hal_manager, "daemon-stop",
 			  G_CALLBACK (hal_daemon_stop_cb), button);
 
-	button->priv->hal_devicestore = hal_gdevicestore_new ();
+	button->priv->hal_devicestore = hal_device_store_new ();
 
 	coldplug_buttons (button);
 }

Modified: trunk/src/gpm-cell-array.c
==============================================================================
--- trunk/src/gpm-cell-array.c	(original)
+++ trunk/src/gpm-cell-array.c	Mon Oct 20 21:50:54 2008
@@ -26,8 +26,8 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libhal-gdevice.h>
-#include <libhal-gmanager.h>
+#include <hal-device.h>
+#include <hal-manager.h>
 
 #include "egg-debug.h"
 #include "egg-precision.h"
@@ -55,7 +55,7 @@
 
 struct GpmCellArrayPrivate
 {
-	HalGManager		*hal_manager;
+	HalManager		*hal_manager;
 	GpmCellUnit		 unit;
 	GpmAcAdapter		*ac_adapter;
 	GpmProfile		*profile;
@@ -715,22 +715,22 @@
 static gboolean
 gpm_check_device_key (GpmCellArray *cell_array, const gchar *udi, const gchar *key, const gchar *value)
 {
-	HalGDevice *device;
+	HalDevice *device;
 	gboolean ret;
 	gboolean matches = FALSE;
 	gchar *rettype;
 
 	g_return_val_if_fail (GPM_IS_CELL_ARRAY (cell_array), FALSE);
 
-	device = hal_gdevice_new ();
-	ret = hal_gdevice_set_udi (device, udi);
+	device = hal_device_new ();
+	ret = hal_device_set_udi (device, udi);
 	if (!ret) {
 		egg_warning ("failed to set UDI %s", udi);
 		return FALSE;
 	}
 
 	/* check type */
-	ret = hal_gdevice_get_string (device, key, &rettype, NULL);
+	ret = hal_device_get_string (device, key, &rettype, NULL);
 	if (!ret || rettype == NULL) {
 		egg_warning ("failed to get %s", key);
 		return FALSE;
@@ -867,7 +867,7 @@
 
 	/* get all the hal devices of this type */
 	error = NULL;
-	ret = hal_gmanager_find_capability (cell_array->priv->hal_manager, "battery", &device_names, &error);
+	ret = hal_manager_find_capability (cell_array->priv->hal_manager, "battery", &device_names, &error);
 	if (!ret) {
 		egg_warning ("Couldn't obtain list of batteries: %s", error->message);
 		g_error_free (error);
@@ -879,7 +879,7 @@
 		gpm_cell_array_add_device_id (cell_array, device_names[i]);
 	}
 
-	hal_gmanager_free_capability (device_names);
+	hal_manager_free_capability (device_names);
 	return TRUE;
 }
 
@@ -1071,7 +1071,7 @@
  * @cell_array: This cell_array instance
  */
 static gboolean
-hal_device_removed_cb (HalGManager  *hal_manager,
+hal_device_removed_cb (HalManager  *hal_manager,
 		       const gchar  *udi,
 		       GpmCellArray *cell_array)
 {
@@ -1111,7 +1111,7 @@
  * @cell_array: This cell_array instance
  */
 static void
-hal_new_capability_cb (HalGManager  *hal_manager,
+hal_new_capability_cb (HalManager  *hal_manager,
 		       const gchar  *udi,
 		       const gchar  *capability,
 		       GpmCellArray *cell_array)
@@ -1131,23 +1131,23 @@
  * @cell_array: This cell_array instance
  */
 static void
-hal_device_added_cb (HalGManager  *hal_manager,
+hal_device_added_cb (HalManager  *hal_manager,
 		     const gchar  *udi,
 		     GpmCellArray *cell_array)
 {
 	gboolean is_battery;
 	gboolean dummy;
-	HalGDevice *device;
+	HalDevice *device;
 
 	/* find out if the new device has capability battery
 	   this might fail for CSR as the addon is weird */
-	device = hal_gdevice_new ();
-	hal_gdevice_set_udi (device, udi);
-	hal_gdevice_query_capability (device, "battery", &is_battery, NULL);
+	device = hal_device_new ();
+	hal_device_set_udi (device, udi);
+	hal_device_query_capability (device, "battery", &is_battery, NULL);
 
 	/* try harder */
 	if (is_battery == FALSE) {
-		is_battery = hal_gdevice_get_bool (device, "battery.present", &dummy, NULL);
+		is_battery = hal_device_get_bool (device, "battery.present", &dummy, NULL);
 	}
 
 	/* if a battery, then add */
@@ -1255,7 +1255,7 @@
  * hal_daemon_start_cb:
  **/
 static void
-hal_daemon_start_cb (HalGManager  *hal_manager,
+hal_daemon_start_cb (HalManager  *hal_manager,
 		     GpmCellArray *cell_array)
 {
 	/* coldplug all batteries back again */
@@ -1266,7 +1266,7 @@
  * hal_daemon_stop_cb:
  **/
 static void
-hal_daemon_stop_cb (HalGManager  *hal_manager,
+hal_daemon_stop_cb (HalManager  *hal_manager,
 		    GpmCellArray *cell_array)
 {
 	/* remove old devices */
@@ -1412,7 +1412,7 @@
 
 	cell_array->priv->ac_adapter = gpm_ac_adapter_new ();
 	cell_array->priv->warnings = gpm_warnings_new ();
-	cell_array->priv->hal_manager = hal_gmanager_new ();
+	cell_array->priv->hal_manager = hal_manager_new ();
 	g_signal_connect (cell_array->priv->hal_manager, "device-added",
 			  G_CALLBACK (hal_device_added_cb), cell_array);
 	g_signal_connect (cell_array->priv->hal_manager, "device-removed",

Modified: trunk/src/gpm-cell.c
==============================================================================
--- trunk/src/gpm-cell.c	(original)
+++ trunk/src/gpm-cell.c	Mon Oct 20 21:50:54 2008
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libhal-gdevice.h>
+#include <hal-device.h>
 
 #include "gpm-common.h"
 #include "gpm-marshal.h"
@@ -42,7 +42,7 @@
 
 struct GpmCellPrivate
 {
-	HalGDevice	*hal_device;
+	HalDevice	*hal_device;
 	GpmCellUnit	 unit;
 	GpmPhone	*phone;
 	gchar		*product;
@@ -88,7 +88,7 @@
 static gboolean
 gpm_cell_refresh_hal_all (GpmCell *cell)
 {
-	HalGDevice *device;
+	HalDevice *device;
 	GpmCellUnit *unit;
 	gboolean exists;
 	gboolean is_recalled;
@@ -97,29 +97,29 @@
 	unit = gpm_cell_get_unit (cell);
 
 	/* batteries might be missing */
-	hal_gdevice_get_bool (device, "battery.present", &unit->is_present, NULL);
+	hal_device_get_bool (device, "battery.present", &unit->is_present, NULL);
 	if (unit->is_present == FALSE) {
 		egg_debug ("Battery not present, so not filling up values");
 		return FALSE;
 	}
 
-	hal_gdevice_get_uint (device, "battery.charge_level.design",
+	hal_device_get_uint (device, "battery.charge_level.design",
 				 &unit->charge_design, NULL);
-	hal_gdevice_get_uint (device, "battery.charge_level.last_full",
+	hal_device_get_uint (device, "battery.charge_level.last_full",
 				 &unit->charge_last_full, NULL);
-	hal_gdevice_get_uint (device, "battery.charge_level.current",
+	hal_device_get_uint (device, "battery.charge_level.current",
 				 &unit->charge_current, NULL);
 
 	/* battery might not be rechargeable, have to check */
-	hal_gdevice_get_bool (device, "battery.is_rechargeable",
+	hal_device_get_bool (device, "battery.is_rechargeable",
 				&unit->is_rechargeable, NULL);
 
 	if (unit->kind == GPM_CELL_UNIT_KIND_PRIMARY ||
 	    unit->kind == GPM_CELL_UNIT_KIND_UPS) {
 		if (unit->is_rechargeable) {
-			hal_gdevice_get_bool (device, "battery.rechargeable.is_charging",
+			hal_device_get_bool (device, "battery.rechargeable.is_charging",
 						&unit->is_charging, NULL);
-			hal_gdevice_get_bool (device, "battery.rechargeable.is_discharging",
+			hal_device_get_bool (device, "battery.rechargeable.is_discharging",
 						&unit->is_discharging, NULL);
 		} else {
 			/* HAL isn't being helpful here... */
@@ -134,7 +134,7 @@
 
 	/* sanity check that charge_level.rate exists (if it should) */
 	if (unit->kind == GPM_CELL_UNIT_KIND_PRIMARY) {
-		exists = hal_gdevice_get_uint (device, "battery.charge_level.rate",
+		exists = hal_device_get_uint (device, "battery.charge_level.rate",
 						  &unit->rate, NULL);
 		if (exists == FALSE && (unit->is_discharging || unit->is_charging == TRUE)) {
 			egg_warning ("could not read your battery's charge rate");
@@ -148,7 +148,7 @@
 		   world we also see it for rechargeables. Sigh */
 		if (unit->rate == 0) {
 			guint raw_last_charge;
-			hal_gdevice_get_uint (device, "battery.reporting.last_full",
+			hal_device_get_uint (device, "battery.reporting.last_full",
 					      &raw_last_charge, NULL);
 			if (raw_last_charge == 100)
 				unit->reports_percentage = TRUE;
@@ -157,7 +157,7 @@
 
 	/* sanity check that charge_level.percentage exists (if it should) */
 	guint percentage;
-	exists = hal_gdevice_get_uint (device, "battery.charge_level.percentage", &percentage, NULL);
+	exists = hal_device_get_uint (device, "battery.charge_level.percentage", &percentage, NULL);
 	unit->percentage = (gfloat) percentage;
 	if (exists == FALSE) {
 		egg_warning ("could not read your battery's percentage charge.");
@@ -166,7 +166,7 @@
 	/* sanity check that remaining time exists (if it should) */
 	if (unit->kind == GPM_CELL_UNIT_KIND_PRIMARY ||
 	    unit->kind == GPM_CELL_UNIT_KIND_UPS) {
-		exists = hal_gdevice_get_uint (device,"battery.remaining_time",
+		exists = hal_device_get_uint (device,"battery.remaining_time",
 						  &unit->time_charge, NULL);
 		if (exists == FALSE && (unit->is_discharging || unit->is_charging == TRUE)) {
 			egg_warning ("could not read your battery's remaining time");
@@ -200,20 +200,20 @@
 	}
 
 	/* get other stuff we might need to know */
-	hal_gdevice_get_string (device, "info.product", &cell->priv->product, NULL);
-	hal_gdevice_get_string (device, "battery.vendor", &cell->priv->vendor, NULL);
-	hal_gdevice_get_string (device, "battery.technology", &cell->priv->technology, NULL);
-	hal_gdevice_get_string (device, "battery.serial", &cell->priv->serial, NULL);
-	hal_gdevice_get_string (device, "battery.model", &cell->priv->model, NULL);
-	hal_gdevice_get_uint (device, "battery.voltage.current", &unit->voltage, NULL);
+	hal_device_get_string (device, "info.product", &cell->priv->product, NULL);
+	hal_device_get_string (device, "battery.vendor", &cell->priv->vendor, NULL);
+	hal_device_get_string (device, "battery.technology", &cell->priv->technology, NULL);
+	hal_device_get_string (device, "battery.serial", &cell->priv->serial, NULL);
+	hal_device_get_string (device, "battery.model", &cell->priv->model, NULL);
+	hal_device_get_uint (device, "battery.voltage.current", &unit->voltage, NULL);
 
 	/* this is more common than you might expect: hardware that might blow up */
-	hal_gdevice_get_bool (device, "info.is_recalled", &is_recalled, NULL);
+	hal_device_get_bool (device, "info.is_recalled", &is_recalled, NULL);
 	if (is_recalled) {
 		gchar *oem_vendor;
 		gchar *website;
-		hal_gdevice_get_string (device, "info.recall.vendor", &oem_vendor, NULL);
-		hal_gdevice_get_string (device, "info.recall.website_url", &website, NULL);
+		hal_device_get_string (device, "info.recall.vendor", &oem_vendor, NULL);
+		hal_device_get_string (device, "info.recall.website_url", &website, NULL);
 		egg_warning ("battery is recalled");
 		egg_debug ("** EMIT: perhaps-recall");
 		g_signal_emit (cell, signals [PERHAPS_RECALL], 0, oem_vendor, website);
@@ -228,7 +228,7 @@
  * battery_key_changed:
  **/
 static gboolean
-battery_key_changed (HalGDevice  *device,
+battery_key_changed (HalDevice  *device,
 		     const gchar *key,
 		     const gchar *oldval)
 {
@@ -240,7 +240,7 @@
 	}
 
 	/* get the new value */
-	hal_gdevice_get_string (device, key, &newval, NULL);
+	hal_device_get_string (device, key, &newval, NULL);
 
 	if (newval == NULL) {
 		return FALSE;
@@ -256,7 +256,7 @@
  * hal_device_property_modified_cb:
  */
 static void
-hal_device_property_modified_cb (HalGDevice   *device,
+hal_device_property_modified_cb (HalDevice   *device,
 				 const gchar  *key,
 				 gboolean      is_added,
 				 gboolean      is_removed,
@@ -264,7 +264,7 @@
 				 GpmCell      *cell)
 {
 	GpmCellUnit *unit;
-	const gchar *udi = hal_gdevice_get_udi (device);
+	const gchar *udi = hal_device_get_udi (device);
 	guint time_hal;
 
 	unit = gpm_cell_get_unit (cell);
@@ -280,11 +280,11 @@
 
 	/* update values in the struct */
 	if (strcmp (key, "battery.present") == 0) {
-		hal_gdevice_get_bool (device, key, &unit->is_present, NULL);
+		hal_device_get_bool (device, key, &unit->is_present, NULL);
 		gpm_cell_refresh_hal_all (cell);
 
 	} else if (strcmp (key, "battery.rechargeable.is_charging") == 0) {
-		hal_gdevice_get_bool (device, key, &unit->is_charging, NULL);
+		hal_device_get_bool (device, key, &unit->is_charging, NULL);
 		egg_debug ("** EMIT: charging-changed: %i", unit->is_charging);
 		g_signal_emit (cell, signals [CHARGING_CHANGED], 0, unit->is_charging);
 		/* reset the time, as we really can't guess this without profiling */
@@ -293,7 +293,7 @@
 		}
 
 	} else if (strcmp (key, "battery.rechargeable.is_discharging") == 0) {
-		hal_gdevice_get_bool (device, key, &unit->is_discharging, NULL);
+		hal_device_get_bool (device, key, &unit->is_discharging, NULL);
 		egg_debug ("** EMIT: discharging-changed: %i", unit->is_discharging);
 		g_signal_emit (cell, signals [DISCHARGING_CHANGED], 0, unit->is_discharging);
 		/* reset the time, as we really can't guess this without profiling */
@@ -302,16 +302,16 @@
 		}
 
 	} else if (strcmp (key, "battery.charge_level.design") == 0) {
-		hal_gdevice_get_uint (device, key, &unit->charge_design, NULL);
+		hal_device_get_uint (device, key, &unit->charge_design, NULL);
 
 	} else if (strcmp (key, "battery.charge_level.last_full") == 0) {
-		hal_gdevice_get_uint (device, key, &unit->charge_last_full, NULL);
+		hal_device_get_uint (device, key, &unit->charge_last_full, NULL);
 
 	} else if (strcmp (key, "battery.charge_level.current") == 0) {
-		hal_gdevice_get_uint (device, key, &unit->charge_current, NULL);
+		hal_device_get_uint (device, key, &unit->charge_current, NULL);
 
 	} else if (strcmp (key, "battery.charge_level.rate") == 0) {
-		hal_gdevice_get_uint (device, key, &unit->rate, NULL);
+		hal_device_get_uint (device, key, &unit->rate, NULL);
 		/* sanity check to less than 100W */
 		if (unit->rate > 100*1000) {
 			egg_warning ("sanity checking rate from %i to 0", unit->rate);
@@ -320,13 +320,13 @@
 
 	} else if (strcmp (key, "battery.charge_level.percentage") == 0) {
 		guint percent;
-		hal_gdevice_get_uint (device, key, &percent, NULL);
+		hal_device_get_uint (device, key, &percent, NULL);
 		unit->percentage = (gfloat) percent;
 		egg_debug ("** EMIT: percent-changed: %f", unit->percentage);
 		g_signal_emit (cell, signals [PERCENT_CHANGED], 0, unit->percentage);
 
 	} else if (strcmp (key, "battery.remaining_time") == 0) {
-		hal_gdevice_get_uint (device, key, &time_hal, NULL);
+		hal_device_get_uint (device, key, &time_hal, NULL);
 		/* Gahh. We have to multiplex the time as HAL shares a key. */
 		if (unit->is_charging) {
 			unit->time_charge = time_hal;
@@ -336,7 +336,7 @@
 		}
 
 	} else if (strcmp (key, "battery.voltage.current") == 0) {
-		hal_gdevice_get_uint (device, key, &unit->voltage, NULL);
+		hal_device_get_uint (device, key, &unit->voltage, NULL);
 
 	} else if (strcmp (key, "battery.model") == 0 ||
 		   strcmp (key, "battery.serial") == 0 ||
@@ -375,7 +375,7 @@
 gpm_cell_set_device_id (GpmCell *cell, const gchar *udi)
 {
 	gboolean ret;
-	HalGDevice *device;
+	HalDevice *device;
 	gchar *battery_kind_str;
 	GpmCellUnit *unit;
 
@@ -385,18 +385,18 @@
 	unit = gpm_cell_get_unit (cell);
 	device = cell->priv->hal_device;
 
-	ret = hal_gdevice_set_udi (device, udi);
+	ret = hal_device_set_udi (device, udi);
 	if (!ret) {
 		egg_warning ("cannot set udi");
 		return FALSE;
 	}
 
 	/* watch for changes */
-	hal_gdevice_watch_property_modified (device);
+	hal_device_watch_property_modified (device);
 	g_signal_connect (device, "property-modified",
 			  G_CALLBACK (hal_device_property_modified_cb), cell);
 
-	hal_gdevice_get_string (device, "battery.type", &battery_kind_str, NULL);
+	hal_device_get_string (device, "battery.type", &battery_kind_str, NULL);
 	if (battery_kind_str == NULL) {
 		egg_warning ("cannot obtain battery type");
 		return FALSE;
@@ -446,7 +446,7 @@
 	g_return_val_if_fail (cell != NULL, NULL);
 	g_return_val_if_fail (GPM_IS_CELL (cell), NULL);
 
-	return hal_gdevice_get_udi (cell->priv->hal_device);
+	return hal_device_get_udi (cell->priv->hal_device);
 }
 
 /**
@@ -753,7 +753,7 @@
 {
 	cell->priv = GPM_CELL_GET_PRIVATE (cell);
 
-	cell->priv->hal_device = hal_gdevice_new ();
+	cell->priv->hal_device = hal_device_new ();
 	cell->priv->product = NULL;
 	cell->priv->vendor = NULL;
 	cell->priv->technology = NULL;
@@ -812,7 +812,7 @@
  ***************************************************************************/
 #ifdef EGG_TEST
 #include "egg-test.h"
-#include <libhal-gmanager.h>
+#include <hal-manager.h>
 
 guint recall_count = 0;
 
@@ -828,14 +828,14 @@
 	gchar **value;
 	gchar *udi = NULL;
 	gboolean ret;
-	HalGManager *manager;
+	HalManager *manager;
 
-	manager = hal_gmanager_new ();
-	ret = hal_gmanager_find_capability (manager, "battery", &value, NULL);
+	manager = hal_manager_new ();
+	ret = hal_manager_find_capability (manager, "battery", &value, NULL);
 	if (ret && value != NULL && value[0] != NULL) {
 		udi = g_strdup (value[0]);
 	}
-	hal_gmanager_free_capability (value);
+	hal_manager_free_capability (value);
 	g_object_unref (manager);
 
 	return udi;

Modified: trunk/src/gpm-control.c
==============================================================================
--- trunk/src/gpm-control.c	(original)
+++ trunk/src/gpm-control.c	Mon Oct 20 21:50:54 2008
@@ -42,7 +42,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <gnome-keyring.h>
 
-#include <libhal-gpower.h>
+#include <hal-device-power.h>
 
 #ifdef HAVE_POLKIT
 #include <polkit/polkit.h>
@@ -61,7 +61,7 @@
 struct GpmControlPrivate
 {
 	GpmConf			*conf;
-	HalGPower		*hal_power;
+	HalDevicePower		*hal_device_power;
 };
 
 enum {
@@ -169,7 +169,7 @@
 
 	*can = FALSE;
 	gpm_conf_get_bool (control->priv->conf, GPM_CONF_CAN_SUSPEND, &conf_ok);
-	hal_ok = hal_gpower_can_suspend (control->priv->hal_power);
+	hal_ok = hal_device_power_can_suspend (control->priv->hal_device_power);
 	polkit_ok = gpm_control_is_user_privileged (control, "org.freedesktop.hal.power-management.suspend");
 	fg = gpm_control_check_foreground_console (control);
 	if (conf_ok && hal_ok && polkit_ok && fg) {
@@ -200,7 +200,7 @@
 
 	*can = FALSE;
 	gpm_conf_get_bool (control->priv->conf, GPM_CONF_CAN_HIBERNATE, &conf_ok);
-	hal_ok = hal_gpower_can_hibernate (control->priv->hal_power);
+	hal_ok = hal_device_power_can_hibernate (control->priv->hal_device_power);
 	fg = gpm_control_check_foreground_console (control);
 	polkit_ok = gpm_control_is_user_privileged (control, "org.freedesktop.hal.power-management.hibernate");
 	if (conf_ok && hal_ok && polkit_ok && fg) {
@@ -320,7 +320,7 @@
 					   FALSE, GNOME_INTERACT_NONE, FALSE,  TRUE);
 	}
 
-	ret = hal_gpower_shutdown (control->priv->hal_power, error);
+	ret = hal_device_power_shutdown (control->priv->hal_device_power, error);
 	if (!ret) {
 		gpm_control_convert_hal_error (control, error);
 	}
@@ -360,7 +360,7 @@
 					   FALSE, GNOME_INTERACT_NONE, FALSE,  TRUE);
 	}
 
-	return hal_gpower_reboot (control->priv->hal_power, error);
+	return hal_device_power_reboot (control->priv->hal_device_power, error);
 }
 
 /**
@@ -442,7 +442,7 @@
 	egg_debug ("emitting sleep");
 	g_signal_emit (control, signals [SLEEP], 0, GPM_CONTROL_ACTION_SUSPEND);
 
-	ret = hal_gpower_suspend (control->priv->hal_power, 0, error);
+	ret = hal_device_power_suspend (control->priv->hal_device_power, 0, error);
 	if (!ret) {
 		gpm_control_convert_hal_error (control, error);
 	}
@@ -517,7 +517,7 @@
 	egg_debug ("emitting sleep");
 	g_signal_emit (control, signals [SLEEP], 0, GPM_CONTROL_ACTION_HIBERNATE);
 
-	ret = hal_gpower_hibernate (control->priv->hal_power, error);
+	ret = hal_device_power_hibernate (control->priv->hal_device_power, error);
 	if (!ret) {
 		gpm_control_convert_hal_error (control, error);
 	}
@@ -557,7 +557,7 @@
 	control = GPM_CONTROL (object);
 
 	g_object_unref (control->priv->conf);
-	g_object_unref (control->priv->hal_power);
+	g_object_unref (control->priv->hal_device_power);
 
 	g_return_if_fail (control->priv != NULL);
 	G_OBJECT_CLASS (gpm_control_parent_class)->finalize (object);
@@ -621,7 +621,7 @@
 {
 	control->priv = GPM_CONTROL_GET_PRIVATE (control);
 
-	control->priv->hal_power = hal_gpower_new ();
+	control->priv->hal_device_power = hal_device_power_new ();
 	control->priv->conf = gpm_conf_new ();
 }
 

Modified: trunk/src/gpm-engine.c
==============================================================================
--- trunk/src/gpm-engine.c	(original)
+++ trunk/src/gpm-engine.c	Mon Oct 20 21:50:54 2008
@@ -25,8 +25,8 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libhal-gdevice.h>
-#include <libhal-gmanager.h>
+#include <hal-device.h>
+#include <hal-manager.h>
 
 #include "gpm-ac-adapter.h"
 #include "gpm-common.h"
@@ -61,7 +61,7 @@
 	GpmControl		*control;
 	GpmAcAdapter		*ac_adapter;
 	GpmEngineCollection	 collection;
-	HalGManager		*hal_manager;
+	HalManager		*hal_manager;
 	gboolean		 hal_connected;
 	gboolean		 during_coldplug;
 	gchar			*previous_icon;
@@ -653,7 +653,7 @@
  * hal_daemon_start_cb:
  **/
 static void
-hal_daemon_start_cb (HalGManager *hal_manager,
+hal_daemon_start_cb (HalManager *hal_manager,
 		     GpmEngine   *engine)
 {
 	/* change icon or summary */
@@ -665,7 +665,7 @@
  * hal_daemon_stop_cb:
  **/
 static void
-hal_daemon_stop_cb (HalGManager *hal_manager,
+hal_daemon_stop_cb (HalManager *hal_manager,
 		    GpmEngine   *engine)
 {
 	/* change icon or summary */
@@ -916,7 +916,7 @@
 	g_signal_connect (engine->priv->ac_adapter, "ac-adapter-changed",
 			  G_CALLBACK (ac_adaptor_changed_cb), engine);
 
-	engine->priv->hal_manager = hal_gmanager_new ();
+	engine->priv->hal_manager = hal_manager_new ();
 	g_signal_connect (engine->priv->hal_manager, "daemon-start",
 			  G_CALLBACK (hal_daemon_start_cb), engine);
 	g_signal_connect (engine->priv->hal_manager, "daemon-stop",

Modified: trunk/src/gpm-info.c
==============================================================================
--- trunk/src/gpm-info.c	(original)
+++ trunk/src/gpm-info.c	Mon Oct 20 21:50:54 2008
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <dbus/dbus-gtype-specialized.h>
 
-#include <libhal-gmanager.h>
+#include <hal-manager.h>
 
 #include "egg-color.h"
 #include "gpm-ac-adapter.h"
@@ -796,7 +796,7 @@
 static void
 gpm_info_init (GpmInfo *info)
 {
-	HalGManager *hal_manager;
+	HalManager *hal_manager;
 	info->priv = GPM_INFO_GET_PRIVATE (info);
 
 	/* record our start time */
@@ -809,8 +809,8 @@
 			  G_CALLBACK (control_sleep_failure_cb), info);
 
 	/* find out if we should log and display the extra graphs */
-	hal_manager = hal_gmanager_new ();
-	info->priv->is_laptop = hal_gmanager_is_laptop (hal_manager);
+	hal_manager = hal_manager_new ();
+	info->priv->is_laptop = hal_manager_is_laptop (hal_manager);
 	g_object_unref (hal_manager);
 
 	/* set default, we have to set these from the manager */

Modified: trunk/src/gpm-light-sensor.c
==============================================================================
--- trunk/src/gpm-light-sensor.c	(original)
+++ trunk/src/gpm-light-sensor.c	Mon Oct 20 21:50:54 2008
@@ -38,8 +38,8 @@
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 
-#include <libhal-gdevice.h>
-#include <libhal-gmanager.h>
+#include <hal-device.h>
+#include <hal-manager.h>
 #include "egg-dbus-proxy.h"
 
 #include "egg-debug.h"
@@ -329,8 +329,8 @@
 gpm_light_sensor_init (GpmLightSensor *sensor)
 {
 	gchar **names;
-	HalGManager *manager;
-	HalGDevice *device;
+	HalManager *manager;
+	HalDevice *device;
 	guint timeout;
 	DBusGConnection *connection;
 
@@ -345,8 +345,8 @@
 			  G_CALLBACK (conf_key_changed_cb), sensor);
 
 	/* see if we can find  */
-	manager = hal_gmanager_new ();
-	hal_gmanager_find_capability (manager, "light_sensor", &names, NULL);
+	manager = hal_manager_new ();
+	hal_manager_find_capability (manager, "light_sensor", &names, NULL);
 	g_object_unref (manager);
 
 	/* Significant found */
@@ -355,7 +355,7 @@
 		sensor->priv->udi = g_strdup (names[0]);
 		sensor->priv->has_sensor = TRUE;
 	}
-	hal_gmanager_free_capability (names);
+	hal_manager_free_capability (names);
 
 	/* connect to the devices */
 	if (sensor->priv->has_sensor) {
@@ -368,9 +368,9 @@
 				  sensor->priv->udi, HAL_DBUS_INTERFACE_LIGHT_SENSOR);
 
 		/* get levels that the adapter supports -- this does not change ever */
-		device = hal_gdevice_new ();
-		hal_gdevice_set_udi (device, sensor->priv->udi);
-		hal_gdevice_get_uint (device, "light_sensor.num_levels",
+		device = hal_device_new ();
+		hal_device_set_udi (device, sensor->priv->udi);
+		hal_device_get_uint (device, "light_sensor.num_levels",
 				      &sensor->priv->levels, NULL);
 		g_object_unref (device);
 

Modified: trunk/src/gpm-load.c
==============================================================================
--- trunk/src/gpm-load.c	(original)
+++ trunk/src/gpm-load.c	Mon Oct 20 21:50:54 2008
@@ -39,10 +39,10 @@
 
 #include <glib/gi18n.h>
 
-#include <libhal-gpower.h>
-#include <libhal-gdevice.h>
-#include <libhal-gdevicestore.h>
-#include <libhal-gmanager.h>
+#include <hal-device-power.h>
+#include <hal-device.h>
+#include <hal-device-store.h>
+#include <hal-manager.h>
 
 #include "gpm-common.h"
 #include "gpm-prefs.h"

Modified: trunk/src/gpm-manager.c
==============================================================================
--- trunk/src/gpm-manager.c	(original)
+++ trunk/src/gpm-manager.c	Mon Oct 20 21:50:54 2008
@@ -42,8 +42,8 @@
 #include <gconf/gconf-client.h>
 #include <canberra-gtk.h>
 
-#include <libhal-gpower.h>
-#include <libhal-gmanager.h>
+#include <hal-device-power.h>
+#include <hal-manager.h>
 
 #include "gpm-ac-adapter.h"
 #include "gpm-button.h"
@@ -93,7 +93,7 @@
 	GpmScreensaver 		*screensaver;
 	GpmTrayIcon		*tray_icon;
 	GpmEngine		*engine;
-	HalGPower		*hal_power;
+	HalDevicePower		*hal_device_power;
 	gboolean		 low_power;
 	GConfClient		*gconf_client;
 
@@ -329,7 +329,7 @@
 		gpm_conf_get_bool (manager->priv->conf, GPM_CONF_LOWPOWER_BATT, &power_save);
 	}
 
-	hal_gpower_enable_power_save (manager->priv->hal_power, power_save);
+	hal_device_power_enable_power_save (manager->priv->hal_device_power, power_save);
 
 	/* set the new sleep (inactivity) value */
 	gpm_idle_set_system_timeout (manager->priv->idle, sleep_computer);
@@ -423,7 +423,7 @@
 	}
 
 	/* check if computer able to do action */
-	allowed = hal_gpower_can_suspend (manager->priv->hal_power);
+	allowed = hal_device_power_can_suspend (manager->priv->hal_device_power);
 	if (allowed == FALSE) {
 		/* error msg as disabled in HAL */
 		gpm_notify_display (manager->priv->notify,
@@ -472,7 +472,7 @@
 	}
 
 	/* check if computer able to do action */
-	allowed = hal_gpower_can_hibernate (manager->priv->hal_power);
+	allowed = hal_device_power_can_hibernate (manager->priv->hal_device_power);
 	if (allowed == FALSE) {
 		/* error msg as disabled in HAL */
 		gpm_notify_display (manager->priv->notify,
@@ -579,7 +579,7 @@
 	}
 
 	/* check if computer able to do action */
-	allowed = hal_gpower_can_suspend (manager->priv->hal_power);
+	allowed = hal_device_power_can_suspend (manager->priv->hal_device_power);
 	if (allowed == FALSE) {
 		g_set_error (error, GPM_MANAGER_ERROR, GPM_MANAGER_ERROR_NO_HW, "Suspend is not available on this computer");
 		return FALSE;
@@ -615,7 +615,7 @@
 	}
 
 	/* check if computer able to do action */
-	allowed = hal_gpower_can_hibernate (manager->priv->hal_power);
+	allowed = hal_device_power_can_hibernate (manager->priv->hal_device_power);
 	if (allowed == FALSE) {
 		g_set_error (error, GPM_MANAGER_ERROR, GPM_MANAGER_ERROR_NO_HW, "Hibernate is not available on this computer");
 		return FALSE;
@@ -1260,8 +1260,8 @@
 	gboolean suspend_error;
 	gboolean hibernate_error;
 
-	hal_gpower_has_suspend_error (manager->priv->hal_power, &suspend_error);
-	hal_gpower_has_hibernate_error (manager->priv->hal_power, &hibernate_error);
+	hal_device_power_has_suspend_error (manager->priv->hal_device_power, &suspend_error);
+	hal_device_power_has_hibernate_error (manager->priv->hal_device_power, &hibernate_error);
 
 	if (suspend_error) {
 		gpm_notify_sleep_failed (manager->priv->notify, FALSE);
@@ -1288,13 +1288,13 @@
 	/* only clear errors if we have finished the authentication */
 	if (auth_begin == FALSE) {
 		error = NULL;
-		ret = hal_gpower_clear_suspend_error (manager->priv->hal_power, &error);
+		ret = hal_device_power_clear_suspend_error (manager->priv->hal_device_power, &error);
 		if (!ret) {
 			egg_debug ("Failed to clear suspend error; %s", error->message);
 			g_error_free (error);
 		}
 		error = NULL;
-		ret = hal_gpower_clear_hibernate_error (manager->priv->hal_power, &error);
+		ret = hal_device_power_clear_hibernate_error (manager->priv->hal_device_power, &error);
 		if (!ret) {
 			egg_debug ("Failed to clear hibernate error; %s", error->message);
 			g_error_free (error);
@@ -1312,10 +1312,10 @@
 gpm_manager_at_exit (void)
 {
 	/* we can't use manager as g_atexit has no userdata */
-	HalGPower *hal_power = hal_gpower_new ();
-	hal_gpower_clear_suspend_error (hal_power, NULL);
-	hal_gpower_clear_hibernate_error (hal_power, NULL);
-	g_object_unref (hal_power);
+	HalDevicePower *hal_device_power = hal_device_power_new ();
+	hal_device_power_clear_suspend_error (hal_device_power, NULL);
+	hal_device_power_clear_hibernate_error (hal_device_power, NULL);
+	g_object_unref (hal_device_power);
 }
 
 /**
@@ -1691,7 +1691,7 @@
 			gboolean    has_inhibit,
 		        GpmManager *manager)
 {
-	HalGManager *hal_manager;
+	HalManager *hal_manager;
 	gboolean is_laptop;
 	gboolean show_inhibit_lid;
 	gchar *action = NULL;
@@ -1709,8 +1709,8 @@
 		return;
 	}
 
-	hal_manager = hal_gmanager_new ();
-	is_laptop = hal_gmanager_is_laptop (hal_manager);
+	hal_manager = hal_manager_new ();
+	is_laptop = hal_manager_is_laptop (hal_manager);
 	g_object_unref (hal_manager);
 
 	/* we don't warn for desktops, as they do not have a lid... */
@@ -1794,7 +1794,7 @@
 	g_signal_connect (manager->priv->button, "button-pressed",
 			  G_CALLBACK (button_pressed_cb), manager);
 
-	manager->priv->hal_power = hal_gpower_new ();
+	manager->priv->hal_device_power = hal_device_power_new ();
 
 	/* try and start an interactive service */
 	manager->priv->screensaver = gpm_screensaver_new ();
@@ -1909,7 +1909,7 @@
 
 	/* compulsory gobjects */
 	g_object_unref (manager->priv->conf);
-	g_object_unref (manager->priv->hal_power);
+	g_object_unref (manager->priv->hal_device_power);
 	g_object_unref (manager->priv->dpms);
 	g_object_unref (manager->priv->idle);
 	g_object_unref (manager->priv->info);

Modified: trunk/src/gpm-prefs-core.c
==============================================================================
--- trunk/src/gpm-prefs-core.c	(original)
+++ trunk/src/gpm-prefs-core.c	Mon Oct 20 21:50:54 2008
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <gconf/gconf-client.h>
 
-#include <libhal-gmanager.h>
+#include <hal-manager.h>
 
 #include "gpm-tray-icon.h"
 #include "gpm-common.h"

Modified: trunk/src/gpm-self-test.c
==============================================================================
--- trunk/src/gpm-self-test.c	(original)
+++ trunk/src/gpm-self-test.c	Mon Oct 20 21:50:54 2008
@@ -43,7 +43,7 @@
 void gpm_phone_test (EggTest *test);
 void gpm_graph_widget_test (EggTest *test);
 void gpm_proxy_test (EggTest *test);
-void gpm_hal_power_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);
@@ -79,7 +79,7 @@
 
 #if 0
 	gpm_proxy_test (test);
-	gpm_hal_power_test (test);
+	gpm_hal_device_power_test (test);
 	gpm_hal_manager_test (test);
 	gpm_device_test (test);
 	gpm_device_teststore (test);

Modified: trunk/src/gpm-self-test.h
==============================================================================
--- trunk/src/gpm-self-test.h	(original)
+++ trunk/src/gpm-self-test.h	Mon Oct 20 21:50:54 2008
@@ -52,7 +52,7 @@
 void gpm_inhibit_test (EggTest *test);
 void gpm_device_test (EggTest *test);
 void gpm_device_teststore (EggTest *test);
-void gpm_hal_power_test (EggTest *test);
+void gpm_hal_device_power_test (EggTest *test);
 void gpm_hal_manager_test (EggTest *test);
 void gpm_graph_widget_test (EggTest *test);
 

Modified: trunk/test/gpm-st-hal-device.c
==============================================================================
--- trunk/test/gpm-st-hal-device.c	(original)
+++ trunk/test/gpm-st-hal-device.c	Mon Oct 20 21:50:54 2008
@@ -23,33 +23,33 @@
 #include <string.h>
 #include "gpm-st-main.h"
 
-#include <libhal-gmanager.h>
-#include <libhal-gdevice.h>
+#include <hal-manager.h>
+#include <hal-device.h>
 
 void
 egg_test_hal_device (GpmSelfTest *test)
 {
-	HalGDevice *device;
+	HalDevice *device;
 	const char *udi;
 	char *retstr;
 	gboolean ret;
 
-	if (egg_test_start (test, "HalGDevice") == FALSE) {
+	if (egg_test_start (test, "HalDevice") == FALSE) {
 		return;
 	}
 
 	/************************************************************/
 	egg_test_title (test, "make sure we get a non null device");
-	device = hal_gdevice_new ();
+	device = hal_device_new ();
 	if (device != NULL) {
-		egg_test_success (test, "got HalGDevice");
+		egg_test_success (test, "got HalDevice");
 	} else {
-		egg_test_failed (test, "could not get HalGDevice");
+		egg_test_failed (test, "could not get HalDevice");
 	}
 
 	/************************************************************/
 	egg_test_title (test, "make sure we get a null UDI");
-	udi = hal_gdevice_get_udi (device);
+	udi = hal_device_get_udi (device);
 	if (udi == NULL) {
 		egg_test_success (test, "got NULL UDI");
 	} else {
@@ -58,7 +58,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "make sure we can set a UDI");
-	ret = hal_gdevice_set_udi (device, HAL_ROOT_COMPUTER);
+	ret = hal_device_set_udi (device, HAL_ROOT_COMPUTER);
 	if (ret) {
 		egg_test_success (test, "set UDI");
 	} else {
@@ -67,7 +67,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "make sure we can get the UDI");
-	udi = hal_gdevice_get_udi (device);
+	udi = hal_device_get_udi (device);
 	if (udi && strcmp (udi, HAL_ROOT_COMPUTER) == 0) {
 		egg_test_success (test, "got correct UDI: %s", udi);
 	} else {
@@ -76,7 +76,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "make sure we cannot set another UDI");
-	ret = hal_gdevice_set_udi (device, "foo");
+	ret = hal_device_set_udi (device, "foo");
 	if (!ret) {
 		egg_test_success (test, "Cannot set another UDI");
 	} else {
@@ -85,7 +85,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "make sure we can get a string key");
-	ret = hal_gdevice_get_string (device, "info.product", &retstr, NULL);
+	ret = hal_device_get_string (device, "info.product", &retstr, NULL);
 	if (ret && retstr && strcmp (retstr, "Computer") == 0) {
 		egg_test_success (test, "got correct key");
 	} else {
@@ -95,7 +95,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "try to get property modified events");
-	ret = hal_gdevice_watch_property_modified (device);
+	ret = hal_device_watch_property_modified (device);
 	if (ret) {
 		egg_test_success (test, "got notification");
 	} else {
@@ -104,7 +104,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "try to get duplicate property modified events");
-	ret = hal_gdevice_watch_property_modified (device);
+	ret = hal_device_watch_property_modified (device);
 	if (!ret) {
 		egg_test_success (test, "duplicate notification refused");
 	} else {
@@ -113,7 +113,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "try to cancel property modified events");
-	ret = hal_gdevice_remove_property_modified (device);
+	ret = hal_device_remove_property_modified (device);
 	if (ret) {
 		egg_test_success (test, "cancel notification");
 	} else {
@@ -122,7 +122,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "try to get duplicate property modified cancel");
-	ret = hal_gdevice_remove_property_modified (device);
+	ret = hal_device_remove_property_modified (device);
 	if (!ret) {
 		egg_test_success (test, "duplicate cancel refused");
 	} else {

Modified: trunk/test/gpm-st-hal-devicestore.c
==============================================================================
--- trunk/test/gpm-st-hal-devicestore.c	(original)
+++ trunk/test/gpm-st-hal-devicestore.c	Mon Oct 20 21:50:54 2008
@@ -22,37 +22,37 @@
 #include <glib.h>
 #include "gpm-st-main.h"
 
-#include <libhal-gdevice.h>
-#include <libhal-gmanager.h>
-#include <libhal-gdevicestore.h>
+#include <hal-device.h>
+#include <hal-manager.h>
+#include <hal-device-store.h>
 
 void
 egg_test_hal_devicestore (GpmSelfTest *test)
 {
-	HalGDevicestore *devicestore;
-	HalGDevice *device;
-	HalGDevice *device2;
-	HalGDevice *device3;
+	HalDevicestore *devicestore;
+	HalDevice *device;
+	HalDevice *device2;
+	HalDevice *device3;
 	gboolean ret;
 
-	if (egg_test_start (test, "HalGDevicestore") == FALSE) {
+	if (egg_test_start (test, "HalDevicestore") == FALSE) {
 		return;
 	}
 
 	/************************************************************/
 	egg_test_title (test, "make sure we get a non null devicestore");
-	devicestore = hal_gdevicestore_new ();
+	devicestore = hal_device_store_new ();
 	if (devicestore != NULL) {
-		egg_test_success (test, "got HalGDevicestore");
+		egg_test_success (test, "got HalDevicestore");
 	} else {
-		egg_test_failed (test, "could not get HalGDevicestore");
+		egg_test_failed (test, "could not get HalDevicestore");
 	}
 
 	/************************************************************/
 	egg_test_title (test, "make sure device not in devicestore");
-	device = hal_gdevice_new ();
-	hal_gdevice_set_udi (device, HAL_ROOT_COMPUTER);
-	ret = hal_gdevicestore_present (devicestore, device);
+	device = hal_device_new ();
+	hal_device_set_udi (device, HAL_ROOT_COMPUTER);
+	ret = hal_device_store_present (devicestore, device);
 	if (!ret) {
 		egg_test_success (test, "could not get different device");
 	} else {
@@ -61,7 +61,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "insert device");
-	ret = hal_gdevicestore_insert (devicestore, device);
+	ret = hal_device_store_insert (devicestore, device);
 	if (ret) {
 		egg_test_success (test, "inserted device");
 	} else {
@@ -70,7 +70,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "insert duplicate device");
-	ret = hal_gdevicestore_insert (devicestore, device);
+	ret = hal_device_store_insert (devicestore, device);
 	if (!ret) {
 		egg_test_success (test, "cannot insert duplicate device");
 	} else {
@@ -79,7 +79,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "make sure device in store");
-	ret = hal_gdevicestore_present (devicestore, device);
+	ret = hal_device_store_present (devicestore, device);
 	if (ret) {
 		egg_test_success (test, "found device");
 	} else {
@@ -88,7 +88,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "find device by UDI");
-	device3 = hal_gdevicestore_find_udi (devicestore, HAL_ROOT_COMPUTER);
+	device3 = hal_device_store_find_udi (devicestore, HAL_ROOT_COMPUTER);
 	if (device3 == device) {
 		egg_test_success (test, "found device");
 	} else {
@@ -97,7 +97,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "find missing device by UDI");
-	device3 = hal_gdevicestore_find_udi (devicestore, "/foo");
+	device3 = hal_device_store_find_udi (devicestore, "/foo");
 	if (device3 == NULL) {
 		egg_test_success (test, "not found invalid device");
 	} else {
@@ -106,9 +106,9 @@
 
 	/************************************************************/
 	egg_test_title (test, "make sure we can match on UDI");
-	device2 = hal_gdevice_new ();
-	hal_gdevice_set_udi (device2, HAL_ROOT_COMPUTER);
-	ret = hal_gdevicestore_present (devicestore, device2);
+	device2 = hal_device_new ();
+	hal_device_set_udi (device2, HAL_ROOT_COMPUTER);
+	ret = hal_device_store_present (devicestore, device2);
 	if (ret) {
 		egg_test_success (test, "found device");
 	} else {
@@ -118,7 +118,7 @@
 	/************************************************************/
 	egg_test_title (test, "remove device");
 	g_object_ref (device); /* so we can test it in a minute */
-	ret = hal_gdevicestore_remove (devicestore, device);
+	ret = hal_device_store_remove (devicestore, device);
 	if (ret) {
 		egg_test_success (test, "removed device");
 	} else {
@@ -127,7 +127,7 @@
 
 	/************************************************************/
 	egg_test_title (test, "make sure device not in devicestore");
-	ret = hal_gdevicestore_present (devicestore, device);
+	ret = hal_device_store_present (devicestore, device);
 	if (!ret) {
 		egg_test_success (test, "could not get device from empty devicestore");
 	} else {

Modified: trunk/test/gpm-st-hal-manager.c
==============================================================================
--- trunk/test/gpm-st-hal-manager.c	(original)
+++ trunk/test/gpm-st-hal-manager.c	Mon Oct 20 21:50:54 2008
@@ -22,30 +22,30 @@
 #include <glib.h>
 #include "gpm-st-main.h"
 
-#include <libhal-gmanager.h>
+#include <hal-manager.h>
 
 void
 egg_test_hal_manager (GpmSelfTest *test)
 {
-	HalGManager *manager;
+	HalManager *manager;
 	gboolean ret;
 
-	if (egg_test_start (test, "HalGManager") == FALSE) {
+	if (egg_test_start (test, "HalManager") == FALSE) {
 		return;
 	}
 
 	/************************************************************/
 	egg_test_title (test, "make sure we get a non null device");
-	manager = hal_gmanager_new ();
+	manager = hal_manager_new ();
 	if (manager != NULL) {
-		egg_test_success (test, "got HalGManager");
+		egg_test_success (test, "got HalManager");
 	} else {
-		egg_test_failed (test, "could not get HalGManager");
+		egg_test_failed (test, "could not get HalManager");
 	}
 
 	/************************************************************/
 	egg_test_title (test, "check if we are a laptop");
-	ret = hal_gmanager_is_laptop (manager);
+	ret = hal_manager_is_laptop (manager);
 	if (ret) {
 		egg_test_success (test, "identified as a laptop");
 	} else {
@@ -56,13 +56,13 @@
 	/************************************************************/
 	gchar **value;
 	egg_test_title (test, "search for battery devices");
-	ret = hal_gmanager_find_capability (manager, "battery", &value, NULL);
+	ret = hal_manager_find_capability (manager, "battery", &value, NULL);
 	if (ret && value != NULL && value[0] != NULL) {
 		egg_test_success (test, "found battery device");
 	} else {
 		egg_test_failed (test, "did not find battery device");
 	}
-	hal_gmanager_free_capability (value);
+	hal_manager_free_capability (value);
 
 	g_object_unref (manager);
 

Modified: trunk/test/gpm-st-hal-power.c
==============================================================================
--- trunk/test/gpm-st-hal-power.c	(original)
+++ trunk/test/gpm-st-hal-power.c	Mon Oct 20 21:50:54 2008
@@ -22,30 +22,30 @@
 #include <glib.h>
 #include "gpm-st-main.h"
 
-#include <libhal-gpower.h>
+#include <hal-device-power.h>
 
 void
-egg_test_hal_power (GpmSelfTest *test)
+egg_test_hal_device_power (GpmSelfTest *test)
 {
-	HalGPower *power;
+	HalDevicePower *power;
 	gboolean ret;
 
-	if (egg_test_start (test, "HalGPower") == FALSE) {
+	if (egg_test_start (test, "HalDevicePower") == FALSE) {
 		return;
 	}
 
 	/************************************************************/
 	egg_test_title (test, "make sure we get a non null device");
-	power = hal_gpower_new ();
+	power = hal_device_power_new ();
 	if (power != NULL) {
-		egg_test_success (test, "got HalGPower");
+		egg_test_success (test, "got HalDevicePower");
 	} else {
-		egg_test_failed (test, "could not get HalGPower");
+		egg_test_failed (test, "could not get HalDevicePower");
 	}
 
 	/************************************************************/
 	egg_test_title (test, "make sure we have pm support");
-	ret = hal_gpower_has_support (power);
+	ret = hal_device_power_has_support (power);
 	if (ret) {
 		egg_test_success (test, "has pm support");
 	} else {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]