mirror of
https://gitlab.freedesktop.org/upower/upower.git
synced 2026-05-05 12:18:09 +02:00
trivial: DkpBackend -> UpBackend (no ABI or API break)
This commit is contained in:
Richard Hughes
parent
15ac5102c8
commit
2562bc6aa6
9 changed files with 216 additions and 216 deletions
|
|
@ -34,13 +34,13 @@
|
|||
#include "up-marshal.h"
|
||||
#include "up-device.h"
|
||||
|
||||
static void dkp_backend_class_init (DkpBackendClass *klass);
|
||||
static void dkp_backend_init (DkpBackend *backend);
|
||||
static void dkp_backend_finalize (GObject *object);
|
||||
static void up_backend_class_init (UpBackendClass *klass);
|
||||
static void up_backend_init (UpBackend *backend);
|
||||
static void up_backend_finalize (GObject *object);
|
||||
|
||||
#define DKP_BACKEND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DKP_TYPE_BACKEND, DkpBackendPrivate))
|
||||
#define UP_BACKEND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UP_TYPE_BACKEND, UpBackendPrivate))
|
||||
|
||||
struct DkpBackendPrivate
|
||||
struct UpBackendPrivate
|
||||
{
|
||||
DkpDaemon *daemon;
|
||||
DkpDevice *device;
|
||||
|
|
@ -56,13 +56,13 @@ enum {
|
|||
|
||||
static guint signals [SIGNAL_LAST] = { 0 };
|
||||
|
||||
G_DEFINE_TYPE (DkpBackend, dkp_backend, G_TYPE_OBJECT)
|
||||
G_DEFINE_TYPE (UpBackend, up_backend, G_TYPE_OBJECT)
|
||||
|
||||
/**
|
||||
* dkp_backend_changed_time_cb:
|
||||
* up_backend_changed_time_cb:
|
||||
**/
|
||||
static gboolean
|
||||
dkp_backend_changed_time_cb (DkpBackend *backend)
|
||||
up_backend_changed_time_cb (UpBackend *backend)
|
||||
{
|
||||
DkpDevice *device;
|
||||
GTimeVal timeval;
|
||||
|
|
@ -77,10 +77,10 @@ dkp_backend_changed_time_cb (DkpBackend *backend)
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_add_cb:
|
||||
* up_backend_add_cb:
|
||||
**/
|
||||
static gboolean
|
||||
dkp_backend_add_cb (DkpBackend *backend)
|
||||
up_backend_add_cb (UpBackend *backend)
|
||||
{
|
||||
gboolean ret;
|
||||
|
||||
|
|
@ -95,14 +95,14 @@ dkp_backend_add_cb (DkpBackend *backend)
|
|||
g_signal_emit (backend, signals[SIGNAL_DEVICE_ADDED], 0, backend->priv->native, backend->priv->device);
|
||||
|
||||
/* setup poll */
|
||||
g_timeout_add_seconds (2, (GSourceFunc) dkp_backend_changed_time_cb, backend);
|
||||
g_timeout_add_seconds (2, (GSourceFunc) up_backend_changed_time_cb, backend);
|
||||
out:
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_coldplug:
|
||||
* @backend: The %DkpBackend class instance
|
||||
* up_backend_coldplug:
|
||||
* @backend: The %UpBackend class instance
|
||||
* @daemon: The %DkpDaemon controlling instance
|
||||
*
|
||||
* Finds all the devices already plugged in, and emits device-add signals for
|
||||
|
|
@ -111,50 +111,50 @@ out:
|
|||
* Return value: %TRUE for success
|
||||
**/
|
||||
gboolean
|
||||
dkp_backend_coldplug (DkpBackend *backend, DkpDaemon *daemon)
|
||||
up_backend_coldplug (UpBackend *backend, DkpDaemon *daemon)
|
||||
{
|
||||
backend->priv->daemon = g_object_ref (daemon);
|
||||
backend->priv->device_list = dkp_daemon_get_device_list (daemon);
|
||||
|
||||
/* small delay until first device is added */
|
||||
g_timeout_add_seconds (1, (GSourceFunc) dkp_backend_add_cb, backend);
|
||||
g_timeout_add_seconds (1, (GSourceFunc) up_backend_add_cb, backend);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_class_init:
|
||||
* @klass: The DkpBackendClass
|
||||
* up_backend_class_init:
|
||||
* @klass: The UpBackendClass
|
||||
**/
|
||||
static void
|
||||
dkp_backend_class_init (DkpBackendClass *klass)
|
||||
up_backend_class_init (UpBackendClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
object_class->finalize = dkp_backend_finalize;
|
||||
object_class->finalize = up_backend_finalize;
|
||||
|
||||
signals [SIGNAL_DEVICE_ADDED] =
|
||||
g_signal_new ("device-added",
|
||||
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (DkpBackendClass, device_added),
|
||||
G_STRUCT_OFFSET (UpBackendClass, device_added),
|
||||
NULL, NULL, dkp_marshal_VOID__POINTER_POINTER,
|
||||
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
|
||||
signals [SIGNAL_DEVICE_REMOVED] =
|
||||
g_signal_new ("device-removed",
|
||||
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (DkpBackendClass, device_removed),
|
||||
G_STRUCT_OFFSET (UpBackendClass, device_removed),
|
||||
NULL, NULL, dkp_marshal_VOID__POINTER_POINTER,
|
||||
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
|
||||
|
||||
g_type_class_add_private (klass, sizeof (DkpBackendPrivate));
|
||||
g_type_class_add_private (klass, sizeof (UpBackendPrivate));
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_init:
|
||||
* up_backend_init:
|
||||
**/
|
||||
static void
|
||||
dkp_backend_init (DkpBackend *backend)
|
||||
up_backend_init (UpBackend *backend)
|
||||
{
|
||||
backend->priv = DKP_BACKEND_GET_PRIVATE (backend);
|
||||
backend->priv = UP_BACKEND_GET_PRIVATE (backend);
|
||||
backend->priv->daemon = NULL;
|
||||
backend->priv->device_list = NULL;
|
||||
backend->priv->native = g_object_new (DKP_TYPE_DEVICE, NULL);
|
||||
|
|
@ -184,16 +184,16 @@ dkp_backend_init (DkpBackend *backend)
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_finalize:
|
||||
* up_backend_finalize:
|
||||
**/
|
||||
static void
|
||||
dkp_backend_finalize (GObject *object)
|
||||
up_backend_finalize (GObject *object)
|
||||
{
|
||||
DkpBackend *backend;
|
||||
UpBackend *backend;
|
||||
|
||||
g_return_if_fail (DKP_IS_BACKEND (object));
|
||||
g_return_if_fail (UP_IS_BACKEND (object));
|
||||
|
||||
backend = DKP_BACKEND (object);
|
||||
backend = UP_BACKEND (object);
|
||||
|
||||
if (backend->priv->daemon != NULL)
|
||||
g_object_unref (backend->priv->daemon);
|
||||
|
|
@ -203,20 +203,20 @@ dkp_backend_finalize (GObject *object)
|
|||
g_object_unref (backend->priv->native);
|
||||
g_object_unref (backend->priv->device);
|
||||
|
||||
G_OBJECT_CLASS (dkp_backend_parent_class)->finalize (object);
|
||||
G_OBJECT_CLASS (up_backend_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_new:
|
||||
* up_backend_new:
|
||||
*
|
||||
* Return value: a new %DkpBackend object.
|
||||
* Return value: a new %UpBackend object.
|
||||
**/
|
||||
DkpBackend *
|
||||
dkp_backend_new (void)
|
||||
UpBackend *
|
||||
up_backend_new (void)
|
||||
{
|
||||
DkpBackend *backend;
|
||||
backend = g_object_new (DKP_TYPE_BACKEND, NULL);
|
||||
return DKP_BACKEND (backend);
|
||||
UpBackend *backend;
|
||||
backend = g_object_new (UP_TYPE_BACKEND, NULL);
|
||||
return UP_BACKEND (backend);
|
||||
}
|
||||
|
||||
/***************************************************************************
|
||||
|
|
@ -226,17 +226,17 @@ dkp_backend_new (void)
|
|||
#include "egg-test.h"
|
||||
|
||||
void
|
||||
dkp_backend_test (gpointer user_data)
|
||||
up_backend_test (gpointer user_data)
|
||||
{
|
||||
EggTest *test = (EggTest *) user_data;
|
||||
DkpBackend *backend;
|
||||
UpBackend *backend;
|
||||
|
||||
if (!egg_test_start (test, "DkpBackend"))
|
||||
if (!egg_test_start (test, "UpBackend"))
|
||||
return;
|
||||
|
||||
/************************************************************/
|
||||
egg_test_title (test, "get instance");
|
||||
backend = dkp_backend_new ();
|
||||
backend = up_backend_new ();
|
||||
egg_test_assert (test, backend != NULL);
|
||||
|
||||
/* unref */
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
*
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef _DKP_BACKEND_ACPI_H
|
||||
#define _DKP_BACKEND_ACPI_H
|
||||
#ifndef _UP_BACKEND_ACPI_H
|
||||
#define _UP_BACKEND_ACPI_H
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "up-devd.h"
|
||||
|
||||
extern DkpDevdHandler dkp_backend_acpi_devd_handler;
|
||||
extern DkpDevdHandler up_backend_acpi_devd_handler;
|
||||
|
||||
#endif /* _DKP_BACKEND_ACPI_H */
|
||||
#endif /* _UP_BACKEND_ACPI_H */
|
||||
|
|
|
|||
|
|
@ -45,23 +45,23 @@
|
|||
#include "up-marshal.h"
|
||||
#include "up-device.h"
|
||||
|
||||
#define DKP_BACKEND_REFRESH_TIMEOUT 30 /* seconds */
|
||||
#define DKP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"
|
||||
#define DKP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4"
|
||||
#define UP_BACKEND_REFRESH_TIMEOUT 30 /* seconds */
|
||||
#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"
|
||||
#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4"
|
||||
|
||||
static void dkp_backend_class_init (DkpBackendClass *klass);
|
||||
static void dkp_backend_init (DkpBackend *backend);
|
||||
static void dkp_backend_finalize (GObject *object);
|
||||
static void up_backend_class_init (UpBackendClass *klass);
|
||||
static void up_backend_init (UpBackend *backend);
|
||||
static void up_backend_finalize (GObject *object);
|
||||
|
||||
static gboolean dkp_backend_refresh_devices (gpointer user_data);
|
||||
static gboolean dkp_backend_acpi_devd_notify (DkpBackend *backend, const gchar *system, const gchar *subsystem, const gchar *type, const gchar *data);
|
||||
static gboolean dkp_backend_create_new_device (DkpBackend *backend, DkpAcpiNative *native);
|
||||
static void dkp_backend_lid_coldplug (DkpBackend *backend);
|
||||
static gboolean dkp_backend_supports_sleep_state (const gchar *state);
|
||||
static gboolean up_backend_refresh_devices (gpointer user_data);
|
||||
static gboolean up_backend_acpi_devd_notify (UpBackend *backend, const gchar *system, const gchar *subsystem, const gchar *type, const gchar *data);
|
||||
static gboolean up_backend_create_new_device (UpBackend *backend, DkpAcpiNative *native);
|
||||
static void up_backend_lid_coldplug (UpBackend *backend);
|
||||
static gboolean up_backend_supports_sleep_state (const gchar *state);
|
||||
|
||||
#define DKP_BACKEND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DKP_TYPE_BACKEND, DkpBackendPrivate))
|
||||
#define UP_BACKEND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UP_TYPE_BACKEND, UpBackendPrivate))
|
||||
|
||||
struct DkpBackendPrivate
|
||||
struct UpBackendPrivate
|
||||
{
|
||||
DkpDaemon *daemon;
|
||||
DkpDeviceList *device_list;
|
||||
|
|
@ -77,28 +77,28 @@ enum {
|
|||
|
||||
static guint signals [SIGNAL_LAST] = { 0 };
|
||||
|
||||
G_DEFINE_TYPE (DkpBackend, dkp_backend, G_TYPE_OBJECT)
|
||||
G_DEFINE_TYPE (UpBackend, up_backend, G_TYPE_OBJECT)
|
||||
|
||||
static const gchar *handlers[] = {
|
||||
"battery",
|
||||
};
|
||||
|
||||
DkpDevdHandler dkp_backend_acpi_devd_handler = {
|
||||
.notify = dkp_backend_acpi_devd_notify
|
||||
DkpDevdHandler up_backend_acpi_devd_handler = {
|
||||
.notify = up_backend_acpi_devd_notify
|
||||
};
|
||||
|
||||
/**
|
||||
* dkp_backend_refresh_devices:
|
||||
* up_backend_refresh_devices:
|
||||
**/
|
||||
static gboolean
|
||||
dkp_backend_refresh_devices (gpointer user_data)
|
||||
up_backend_refresh_devices (gpointer user_data)
|
||||
{
|
||||
DkpBackend *backend;
|
||||
UpBackend *backend;
|
||||
GPtrArray *array;
|
||||
DkpDevice *device;
|
||||
guint i;
|
||||
|
||||
backend = DKP_BACKEND (user_data);
|
||||
backend = UP_BACKEND (user_data);
|
||||
array = dkp_device_list_get_array (backend->priv->device_list);
|
||||
|
||||
for (i = 0; i < array->len; i++) {
|
||||
|
|
@ -112,10 +112,10 @@ dkp_backend_refresh_devices (gpointer user_data)
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_acpi_devd_notify:
|
||||
* up_backend_acpi_devd_notify:
|
||||
**/
|
||||
static gboolean
|
||||
dkp_backend_acpi_devd_notify (DkpBackend *backend, const gchar *system, const gchar *subsystem, const gchar *type, const gchar *data)
|
||||
up_backend_acpi_devd_notify (UpBackend *backend, const gchar *system, const gchar *subsystem, const gchar *type, const gchar *data)
|
||||
{
|
||||
GObject *object = NULL;
|
||||
DkpAcpiNative *native = NULL;
|
||||
|
|
@ -152,7 +152,7 @@ dkp_backend_acpi_devd_notify (DkpBackend *backend, const gchar *system, const gc
|
|||
"lid-is-present", &is_present, NULL);
|
||||
if (!is_present) {
|
||||
egg_warning ("received lid event without a configured lid; cold-plugging one");
|
||||
dkp_backend_lid_coldplug (backend);
|
||||
up_backend_lid_coldplug (backend);
|
||||
/* FALLTHROUGH */
|
||||
}
|
||||
|
||||
|
|
@ -167,7 +167,7 @@ dkp_backend_acpi_devd_notify (DkpBackend *backend, const gchar *system, const gc
|
|||
|
||||
if (object == NULL) {
|
||||
egg_warning ("did not find existing %s device; cold-plugging a new one", subsystem);
|
||||
dkp_backend_create_new_device (backend, native);
|
||||
up_backend_create_new_device (backend, native);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
@ -183,10 +183,10 @@ out:
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_create_new_device:
|
||||
* up_backend_create_new_device:
|
||||
**/
|
||||
static gboolean
|
||||
dkp_backend_create_new_device (DkpBackend *backend, DkpAcpiNative *native)
|
||||
up_backend_create_new_device (UpBackend *backend, DkpAcpiNative *native)
|
||||
{
|
||||
DkpDevice *device;
|
||||
gboolean ret;
|
||||
|
|
@ -222,10 +222,10 @@ dkp_backend_create_new_device (DkpBackend *backend, DkpAcpiNative *native)
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_lid_coldplug:
|
||||
* up_backend_lid_coldplug:
|
||||
**/
|
||||
static void
|
||||
dkp_backend_lid_coldplug (DkpBackend *backend)
|
||||
up_backend_lid_coldplug (UpBackend *backend)
|
||||
{
|
||||
gchar *lid_state;
|
||||
|
||||
|
|
@ -237,8 +237,8 @@ dkp_backend_lid_coldplug (DkpBackend *backend)
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_coldplug:
|
||||
* @backend: The %DkpBackend class instance
|
||||
* up_backend_coldplug:
|
||||
* @backend: The %UpBackend class instance
|
||||
* @daemon: The %DkpDaemon controlling instance
|
||||
*
|
||||
* Finds all the devices already plugged in, and emits device-add signals for
|
||||
|
|
@ -247,7 +247,7 @@ dkp_backend_lid_coldplug (DkpBackend *backend)
|
|||
* Return value: %TRUE for success
|
||||
**/
|
||||
gboolean
|
||||
dkp_backend_coldplug (DkpBackend *backend, DkpDaemon *daemon)
|
||||
up_backend_coldplug (UpBackend *backend, DkpDaemon *daemon)
|
||||
{
|
||||
DkpAcpiNative *acnative;
|
||||
int i;
|
||||
|
|
@ -270,7 +270,7 @@ dkp_backend_coldplug (DkpBackend *backend, DkpDaemon *daemon)
|
|||
egg_warning ("treating add event as change event on %s", dkp_device_get_object_path (device));
|
||||
dkp_device_refresh_internal (device);
|
||||
} else {
|
||||
dkp_backend_create_new_device (backend, native);
|
||||
up_backend_create_new_device (backend, native);
|
||||
}
|
||||
|
||||
if (object != NULL) {
|
||||
|
|
@ -282,77 +282,77 @@ dkp_backend_coldplug (DkpBackend *backend, DkpDaemon *daemon)
|
|||
}
|
||||
}
|
||||
|
||||
dkp_backend_lid_coldplug (backend);
|
||||
up_backend_lid_coldplug (backend);
|
||||
|
||||
acnative = dkp_acpi_native_new ("hw.acpi.acline");
|
||||
dkp_backend_create_new_device (backend, acnative);
|
||||
up_backend_create_new_device (backend, acnative);
|
||||
g_object_unref (acnative);
|
||||
|
||||
dkp_devd_init (backend);
|
||||
|
||||
backend->priv->poll_timer_id =
|
||||
g_timeout_add_seconds (DKP_BACKEND_REFRESH_TIMEOUT,
|
||||
(GSourceFunc) dkp_backend_refresh_devices,
|
||||
g_timeout_add_seconds (UP_BACKEND_REFRESH_TIMEOUT,
|
||||
(GSourceFunc) up_backend_refresh_devices,
|
||||
backend);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_get_powersave_command:
|
||||
* up_backend_get_powersave_command:
|
||||
**/
|
||||
gchar *
|
||||
dkp_backend_get_powersave_command (DkpBackend *backend, gboolean powersave)
|
||||
up_backend_get_powersave_command (UpBackend *backend, gboolean powersave)
|
||||
{
|
||||
/* XXX: Do we want to use powerd here? */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_get_suspend_command:
|
||||
* up_backend_get_suspend_command:
|
||||
**/
|
||||
gchar *
|
||||
dkp_backend_get_suspend_command (DkpBackend *backend)
|
||||
up_backend_get_suspend_command (UpBackend *backend)
|
||||
{
|
||||
return g_strdup (DKP_BACKEND_SUSPEND_COMMAND);
|
||||
return g_strdup (UP_BACKEND_SUSPEND_COMMAND);
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_get_hibernate_command:
|
||||
* up_backend_get_hibernate_command:
|
||||
**/
|
||||
gchar *
|
||||
dkp_backend_get_hibernate_command (DkpBackend *backend)
|
||||
up_backend_get_hibernate_command (UpBackend *backend)
|
||||
{
|
||||
return g_strdup (DKP_BACKEND_HIBERNATE_COMMAND);
|
||||
return g_strdup (UP_BACKEND_HIBERNATE_COMMAND);
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_can_suspend:
|
||||
* up_backend_can_suspend:
|
||||
**/
|
||||
gboolean
|
||||
dkp_backend_can_suspend (DkpBackend *backend)
|
||||
up_backend_can_suspend (UpBackend *backend)
|
||||
{
|
||||
return dkp_backend_supports_sleep_state ("S3");
|
||||
return up_backend_supports_sleep_state ("S3");
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_can_hibernate:
|
||||
* up_backend_can_hibernate:
|
||||
**/
|
||||
gboolean
|
||||
dkp_backend_can_hibernate (DkpBackend *backend)
|
||||
up_backend_can_hibernate (UpBackend *backend)
|
||||
{
|
||||
return dkp_backend_supports_sleep_state ("S4");
|
||||
return up_backend_supports_sleep_state ("S4");
|
||||
}
|
||||
|
||||
gboolean
|
||||
dkp_backend_has_encrypted_swap (DkpBackend *backend)
|
||||
up_backend_has_encrypted_swap (UpBackend *backend)
|
||||
{
|
||||
/* XXX: Add support for GELI? */
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
gfloat
|
||||
dkp_backend_get_used_swap (DkpBackend *backend)
|
||||
up_backend_get_used_swap (UpBackend *backend)
|
||||
{
|
||||
gfloat percent;
|
||||
kvm_t *kd;
|
||||
|
|
@ -386,10 +386,10 @@ out:
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_supports_sleep_state:
|
||||
* up_backend_supports_sleep_state:
|
||||
**/
|
||||
static gboolean
|
||||
dkp_backend_supports_sleep_state (const gchar *state)
|
||||
up_backend_supports_sleep_state (const gchar *state)
|
||||
{
|
||||
gchar *sleep_states;
|
||||
gboolean ret = FALSE;
|
||||
|
|
@ -406,38 +406,38 @@ dkp_backend_supports_sleep_state (const gchar *state)
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_class_init:
|
||||
* @klass: The DkpBackendClass
|
||||
* up_backend_class_init:
|
||||
* @klass: The UpBackendClass
|
||||
**/
|
||||
static void
|
||||
dkp_backend_class_init (DkpBackendClass *klass)
|
||||
up_backend_class_init (UpBackendClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
object_class->finalize = dkp_backend_finalize;
|
||||
object_class->finalize = up_backend_finalize;
|
||||
|
||||
signals [SIGNAL_DEVICE_ADDED] =
|
||||
g_signal_new ("device-added",
|
||||
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (DkpBackendClass, device_added),
|
||||
G_STRUCT_OFFSET (UpBackendClass, device_added),
|
||||
NULL, NULL, dkp_marshal_VOID__POINTER_POINTER,
|
||||
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
|
||||
signals [SIGNAL_DEVICE_REMOVED] =
|
||||
g_signal_new ("device-removed",
|
||||
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (DkpBackendClass, device_removed),
|
||||
G_STRUCT_OFFSET (UpBackendClass, device_removed),
|
||||
NULL, NULL, dkp_marshal_VOID__POINTER_POINTER,
|
||||
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
|
||||
|
||||
g_type_class_add_private (klass, sizeof (DkpBackendPrivate));
|
||||
g_type_class_add_private (klass, sizeof (UpBackendPrivate));
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_init:
|
||||
* up_backend_init:
|
||||
**/
|
||||
static void
|
||||
dkp_backend_init (DkpBackend *backend)
|
||||
up_backend_init (UpBackend *backend)
|
||||
{
|
||||
backend->priv = DKP_BACKEND_GET_PRIVATE (backend);
|
||||
backend->priv = UP_BACKEND_GET_PRIVATE (backend);
|
||||
backend->priv->daemon = NULL;
|
||||
backend->priv->device_list = NULL;
|
||||
backend->priv->handle_map = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref);
|
||||
|
|
@ -445,16 +445,16 @@ dkp_backend_init (DkpBackend *backend)
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_finalize:
|
||||
* up_backend_finalize:
|
||||
**/
|
||||
static void
|
||||
dkp_backend_finalize (GObject *object)
|
||||
up_backend_finalize (GObject *object)
|
||||
{
|
||||
DkpBackend *backend;
|
||||
UpBackend *backend;
|
||||
|
||||
g_return_if_fail (DKP_IS_BACKEND (object));
|
||||
g_return_if_fail (UP_IS_BACKEND (object));
|
||||
|
||||
backend = DKP_BACKEND (object);
|
||||
backend = UP_BACKEND (object);
|
||||
|
||||
if (backend->priv->daemon != NULL)
|
||||
g_object_unref (backend->priv->daemon);
|
||||
|
|
@ -465,20 +465,20 @@ dkp_backend_finalize (GObject *object)
|
|||
if (backend->priv->poll_timer_id > 0)
|
||||
g_source_remove (backend->priv->poll_timer_id);
|
||||
|
||||
G_OBJECT_CLASS (dkp_backend_parent_class)->finalize (object);
|
||||
G_OBJECT_CLASS (up_backend_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_new:
|
||||
* up_backend_new:
|
||||
*
|
||||
* Return value: a new %DkpBackend object.
|
||||
* Return value: a new %UpBackend object.
|
||||
**/
|
||||
DkpBackend *
|
||||
dkp_backend_new (void)
|
||||
UpBackend *
|
||||
up_backend_new (void)
|
||||
{
|
||||
DkpBackend *backend;
|
||||
backend = g_object_new (DKP_TYPE_BACKEND, NULL);
|
||||
return DKP_BACKEND (backend);
|
||||
UpBackend *backend;
|
||||
backend = g_object_new (UP_TYPE_BACKEND, NULL);
|
||||
return UP_BACKEND (backend);
|
||||
}
|
||||
|
||||
/***************************************************************************
|
||||
|
|
@ -488,17 +488,17 @@ dkp_backend_new (void)
|
|||
#include "egg-test.h"
|
||||
|
||||
void
|
||||
dkp_backend_test (gpointer user_data)
|
||||
up_backend_test (gpointer user_data)
|
||||
{
|
||||
EggTest *test = (EggTest *) user_data;
|
||||
DkpBackend *backend;
|
||||
UpBackend *backend;
|
||||
|
||||
if (!egg_test_start (test, "DkpBackend"))
|
||||
if (!egg_test_start (test, "UpBackend"))
|
||||
return;
|
||||
|
||||
/************************************************************/
|
||||
egg_test_title (test, "get instance");
|
||||
backend = dkp_backend_new ();
|
||||
backend = up_backend_new ();
|
||||
egg_test_assert (test, backend != NULL);
|
||||
|
||||
/* unref */
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
#define DKP_DEVD_EVENT_NOMATCH '?'
|
||||
|
||||
static DkpDevdHandler *handlers[] = {
|
||||
&dkp_backend_acpi_devd_handler,
|
||||
&up_backend_acpi_devd_handler,
|
||||
};
|
||||
|
||||
static gboolean dkp_devd_inited = FALSE;
|
||||
|
|
@ -118,7 +118,7 @@ end:
|
|||
}
|
||||
|
||||
static void
|
||||
dkp_devd_process_notify_event (DkpBackend *backend,
|
||||
dkp_devd_process_notify_event (UpBackend *backend,
|
||||
const gchar *system,
|
||||
const gchar *subsystem,
|
||||
const gchar *type,
|
||||
|
|
@ -142,11 +142,11 @@ dkp_devd_process_notify_event (DkpBackend *backend,
|
|||
static void
|
||||
dkp_devd_process_event (const gchar *event, gpointer user_data)
|
||||
{
|
||||
DkpBackend *backend;
|
||||
UpBackend *backend;
|
||||
|
||||
g_return_if_fail(event != NULL);
|
||||
|
||||
backend = DKP_BACKEND(user_data);
|
||||
backend = UP_BACKEND(user_data);
|
||||
|
||||
egg_debug("received devd event: '%s'", event);
|
||||
|
||||
|
|
@ -198,7 +198,7 @@ dkp_devd_event_cb (GIOChannel *source, GIOCondition condition,
|
|||
dkp_devd_process_event(event, user_data);
|
||||
g_free(event);
|
||||
} else if (status == G_IO_STATUS_AGAIN) {
|
||||
dkp_devd_init (DKP_BACKEND(user_data));
|
||||
dkp_devd_init (UP_BACKEND(user_data));
|
||||
if (dkp_devd_inited) {
|
||||
int fd;
|
||||
|
||||
|
|
@ -214,7 +214,7 @@ dkp_devd_event_cb (GIOChannel *source, GIOCondition condition,
|
|||
}
|
||||
|
||||
void
|
||||
dkp_devd_init (DkpBackend *backend)
|
||||
dkp_devd_init (UpBackend *backend)
|
||||
{
|
||||
int event_fd;
|
||||
struct sockaddr_un addr;
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ typedef struct
|
|||
{
|
||||
/* return TRUE to consume the event and stop processing */
|
||||
|
||||
gboolean (*notify) (DkpBackend *backend,
|
||||
gboolean (*notify) (UpBackend *backend,
|
||||
const char *system,
|
||||
const char *subsystem,
|
||||
const char *type,
|
||||
const char *data); /* may be NULL */
|
||||
} DkpDevdHandler;
|
||||
|
||||
void dkp_devd_init (DkpBackend *backend);
|
||||
void dkp_devd_init (UpBackend *backend);
|
||||
|
||||
#endif /* _DKP_DEVD_H */
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@
|
|||
#include "up-device-hid.h"
|
||||
#include "up-input.h"
|
||||
|
||||
static void dkp_backend_class_init (DkpBackendClass *klass);
|
||||
static void dkp_backend_init (DkpBackend *backend);
|
||||
static void dkp_backend_finalize (GObject *object);
|
||||
static void up_backend_class_init (UpBackendClass *klass);
|
||||
static void up_backend_init (UpBackend *backend);
|
||||
static void up_backend_finalize (GObject *object);
|
||||
|
||||
#define DKP_BACKEND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DKP_TYPE_BACKEND, DkpBackendPrivate))
|
||||
#define UP_BACKEND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UP_TYPE_BACKEND, UpBackendPrivate))
|
||||
|
||||
struct DkpBackendPrivate
|
||||
struct UpBackendPrivate
|
||||
{
|
||||
DkpDaemon *daemon;
|
||||
DkpDeviceList *device_list;
|
||||
|
|
@ -63,16 +63,16 @@ enum {
|
|||
|
||||
static guint signals [SIGNAL_LAST] = { 0 };
|
||||
|
||||
G_DEFINE_TYPE (DkpBackend, dkp_backend, G_TYPE_OBJECT)
|
||||
G_DEFINE_TYPE (UpBackend, up_backend, G_TYPE_OBJECT)
|
||||
|
||||
static gboolean dkp_backend_device_add (DkpBackend *backend, GUdevDevice *native);
|
||||
static void dkp_backend_device_remove (DkpBackend *backend, GUdevDevice *native);
|
||||
static gboolean up_backend_device_add (UpBackend *backend, GUdevDevice *native);
|
||||
static void up_backend_device_remove (UpBackend *backend, GUdevDevice *native);
|
||||
|
||||
/**
|
||||
* dkp_backend_device_new:
|
||||
* up_backend_device_new:
|
||||
**/
|
||||
static DkpDevice *
|
||||
dkp_backend_device_new (DkpBackend *backend, GUdevDevice *native)
|
||||
up_backend_device_new (UpBackend *backend, GUdevDevice *native)
|
||||
{
|
||||
const gchar *subsys;
|
||||
const gchar *native_path;
|
||||
|
|
@ -154,10 +154,10 @@ out:
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_device_changed:
|
||||
* up_backend_device_changed:
|
||||
**/
|
||||
static void
|
||||
dkp_backend_device_changed (DkpBackend *backend, GUdevDevice *native)
|
||||
up_backend_device_changed (UpBackend *backend, GUdevDevice *native)
|
||||
{
|
||||
GObject *object;
|
||||
DkpDevice *device;
|
||||
|
|
@ -167,7 +167,7 @@ dkp_backend_device_changed (DkpBackend *backend, GUdevDevice *native)
|
|||
object = dkp_device_list_lookup (backend->priv->device_list, G_OBJECT (native));
|
||||
if (object == NULL) {
|
||||
egg_warning ("treating change event as add on %s", g_udev_device_get_sysfs_path (native));
|
||||
dkp_backend_device_add (backend, native);
|
||||
up_backend_device_add (backend, native);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
@ -184,10 +184,10 @@ out:
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_device_add:
|
||||
* up_backend_device_add:
|
||||
**/
|
||||
static gboolean
|
||||
dkp_backend_device_add (DkpBackend *backend, GUdevDevice *native)
|
||||
up_backend_device_add (UpBackend *backend, GUdevDevice *native)
|
||||
{
|
||||
GObject *object;
|
||||
DkpDevice *device;
|
||||
|
|
@ -199,12 +199,12 @@ dkp_backend_device_add (DkpBackend *backend, GUdevDevice *native)
|
|||
device = DKP_DEVICE (object);
|
||||
/* we already have the device; treat as change event */
|
||||
egg_warning ("treating add event as change event on %s", dkp_device_get_object_path (device));
|
||||
dkp_backend_device_changed (backend, native);
|
||||
up_backend_device_changed (backend, native);
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* get the right sort of device */
|
||||
device = dkp_backend_device_new (backend, native);
|
||||
device = up_backend_device_new (backend, native);
|
||||
if (device == NULL) {
|
||||
ret = FALSE;
|
||||
goto out;
|
||||
|
|
@ -219,10 +219,10 @@ out:
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_device_remove:
|
||||
* up_backend_device_remove:
|
||||
**/
|
||||
static void
|
||||
dkp_backend_device_remove (DkpBackend *backend, GUdevDevice *native)
|
||||
up_backend_device_remove (UpBackend *backend, GUdevDevice *native)
|
||||
{
|
||||
GObject *object;
|
||||
DkpDevice *device;
|
||||
|
|
@ -245,31 +245,31 @@ out:
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_uevent_signal_handler_cb:
|
||||
* up_backend_uevent_signal_handler_cb:
|
||||
**/
|
||||
static void
|
||||
dkp_backend_uevent_signal_handler_cb (GUdevClient *client, const gchar *action,
|
||||
up_backend_uevent_signal_handler_cb (GUdevClient *client, const gchar *action,
|
||||
GUdevDevice *device, gpointer user_data)
|
||||
{
|
||||
DkpBackend *backend = DKP_BACKEND (user_data);
|
||||
UpBackend *backend = UP_BACKEND (user_data);
|
||||
|
||||
if (g_strcmp0 (action, "add") == 0) {
|
||||
egg_debug ("SYSFS add %s", g_udev_device_get_sysfs_path (device));
|
||||
dkp_backend_device_add (backend, device);
|
||||
up_backend_device_add (backend, device);
|
||||
} else if (g_strcmp0 (action, "remove") == 0) {
|
||||
egg_debug ("SYSFS remove %s", g_udev_device_get_sysfs_path (device));
|
||||
dkp_backend_device_remove (backend, device);
|
||||
up_backend_device_remove (backend, device);
|
||||
} else if (g_strcmp0 (action, "change") == 0) {
|
||||
egg_debug ("SYSFS change %s", g_udev_device_get_sysfs_path (device));
|
||||
dkp_backend_device_changed (backend, device);
|
||||
up_backend_device_changed (backend, device);
|
||||
} else {
|
||||
egg_warning ("unhandled action '%s' on %s", action, g_udev_device_get_sysfs_path (device));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_coldplug:
|
||||
* @backend: The %DkpBackend class instance
|
||||
* up_backend_coldplug:
|
||||
* @backend: The %UpBackend class instance
|
||||
* @daemon: The %DkpDaemon controlling instance
|
||||
*
|
||||
* Finds all the devices already plugged in, and emits device-add signals for
|
||||
|
|
@ -278,7 +278,7 @@ dkp_backend_uevent_signal_handler_cb (GUdevClient *client, const gchar *action,
|
|||
* Return value: %TRUE for success
|
||||
**/
|
||||
gboolean
|
||||
dkp_backend_coldplug (DkpBackend *backend, DkpDaemon *daemon)
|
||||
up_backend_coldplug (UpBackend *backend, DkpDaemon *daemon)
|
||||
{
|
||||
GUdevDevice *native;
|
||||
GList *devices;
|
||||
|
|
@ -290,7 +290,7 @@ dkp_backend_coldplug (DkpBackend *backend, DkpDaemon *daemon)
|
|||
backend->priv->device_list = dkp_daemon_get_device_list (daemon);
|
||||
backend->priv->gudev_client = g_udev_client_new (subsystems);
|
||||
g_signal_connect (backend->priv->gudev_client, "uevent",
|
||||
G_CALLBACK (dkp_backend_uevent_signal_handler_cb), backend);
|
||||
G_CALLBACK (up_backend_uevent_signal_handler_cb), backend);
|
||||
|
||||
/* add all subsystems */
|
||||
for (i=0; subsystems[i] != NULL; i++) {
|
||||
|
|
@ -298,7 +298,7 @@ dkp_backend_coldplug (DkpBackend *backend, DkpDaemon *daemon)
|
|||
devices = g_udev_client_query_by_subsystem (backend->priv->gudev_client, subsystems[i]);
|
||||
for (l = devices; l != NULL; l = l->next) {
|
||||
native = l->data;
|
||||
dkp_backend_device_add (backend, native);
|
||||
up_backend_device_add (backend, native);
|
||||
}
|
||||
g_list_foreach (devices, (GFunc) g_object_unref, NULL);
|
||||
g_list_free (devices);
|
||||
|
|
@ -308,54 +308,54 @@ dkp_backend_coldplug (DkpBackend *backend, DkpDaemon *daemon)
|
|||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_class_init:
|
||||
* @klass: The DkpBackendClass
|
||||
* up_backend_class_init:
|
||||
* @klass: The UpBackendClass
|
||||
**/
|
||||
static void
|
||||
dkp_backend_class_init (DkpBackendClass *klass)
|
||||
up_backend_class_init (UpBackendClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
object_class->finalize = dkp_backend_finalize;
|
||||
object_class->finalize = up_backend_finalize;
|
||||
|
||||
signals [SIGNAL_DEVICE_ADDED] =
|
||||
g_signal_new ("device-added",
|
||||
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (DkpBackendClass, device_added),
|
||||
G_STRUCT_OFFSET (UpBackendClass, device_added),
|
||||
NULL, NULL, dkp_marshal_VOID__POINTER_POINTER,
|
||||
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
|
||||
signals [SIGNAL_DEVICE_REMOVED] =
|
||||
g_signal_new ("device-removed",
|
||||
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (DkpBackendClass, device_removed),
|
||||
G_STRUCT_OFFSET (UpBackendClass, device_removed),
|
||||
NULL, NULL, dkp_marshal_VOID__POINTER_POINTER,
|
||||
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
|
||||
|
||||
g_type_class_add_private (klass, sizeof (DkpBackendPrivate));
|
||||
g_type_class_add_private (klass, sizeof (UpBackendPrivate));
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_init:
|
||||
* up_backend_init:
|
||||
**/
|
||||
static void
|
||||
dkp_backend_init (DkpBackend *backend)
|
||||
up_backend_init (UpBackend *backend)
|
||||
{
|
||||
backend->priv = DKP_BACKEND_GET_PRIVATE (backend);
|
||||
backend->priv = UP_BACKEND_GET_PRIVATE (backend);
|
||||
backend->priv->daemon = NULL;
|
||||
backend->priv->device_list = NULL;
|
||||
backend->priv->managed_devices = dkp_device_list_new ();
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_finalize:
|
||||
* up_backend_finalize:
|
||||
**/
|
||||
static void
|
||||
dkp_backend_finalize (GObject *object)
|
||||
up_backend_finalize (GObject *object)
|
||||
{
|
||||
DkpBackend *backend;
|
||||
UpBackend *backend;
|
||||
|
||||
g_return_if_fail (DKP_IS_BACKEND (object));
|
||||
g_return_if_fail (UP_IS_BACKEND (object));
|
||||
|
||||
backend = DKP_BACKEND (object);
|
||||
backend = UP_BACKEND (object);
|
||||
|
||||
if (backend->priv->daemon != NULL)
|
||||
g_object_unref (backend->priv->daemon);
|
||||
|
|
@ -366,19 +366,19 @@ dkp_backend_finalize (GObject *object)
|
|||
|
||||
g_object_unref (backend->priv->managed_devices);
|
||||
|
||||
G_OBJECT_CLASS (dkp_backend_parent_class)->finalize (object);
|
||||
G_OBJECT_CLASS (up_backend_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
/**
|
||||
* dkp_backend_new:
|
||||
* up_backend_new:
|
||||
*
|
||||
* Return value: a new %DkpBackend object.
|
||||
* Return value: a new %UpBackend object.
|
||||
**/
|
||||
DkpBackend *
|
||||
dkp_backend_new (void)
|
||||
UpBackend *
|
||||
up_backend_new (void)
|
||||
{
|
||||
DkpBackend *backend;
|
||||
backend = g_object_new (DKP_TYPE_BACKEND, NULL);
|
||||
return DKP_BACKEND (backend);
|
||||
UpBackend *backend;
|
||||
backend = g_object_new (UP_TYPE_BACKEND, NULL);
|
||||
return UP_BACKEND (backend);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __DKP_BACKEND_H
|
||||
#define __DKP_BACKEND_H
|
||||
#ifndef __UP_BACKEND_H
|
||||
#define __UP_BACKEND_H
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <dkp-enum.h>
|
||||
|
|
@ -30,45 +30,45 @@
|
|||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define DKP_TYPE_BACKEND (dkp_backend_get_type ())
|
||||
#define DKP_BACKEND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DKP_TYPE_BACKEND, DkpBackend))
|
||||
#define DKP_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), DKP_TYPE_BACKEND, DkpBackendClass))
|
||||
#define DKP_IS_BACKEND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), DKP_TYPE_BACKEND))
|
||||
#define DKP_IS_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DKP_TYPE_BACKEND))
|
||||
#define DKP_BACKEND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DKP_TYPE_BACKEND, DkpBackendClass))
|
||||
#define DKP_BACKEND_ERROR (dkp_backend_error_quark ())
|
||||
#define DKP_BACKEND_TYPE_ERROR (dkp_backend_error_get_type ())
|
||||
#define UP_TYPE_BACKEND (up_backend_get_type ())
|
||||
#define UP_BACKEND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UP_TYPE_BACKEND, UpBackend))
|
||||
#define UP_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), UP_TYPE_BACKEND, UpBackendClass))
|
||||
#define UP_IS_BACKEND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UP_TYPE_BACKEND))
|
||||
#define UP_IS_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), UP_TYPE_BACKEND))
|
||||
#define UP_BACKEND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UP_TYPE_BACKEND, UpBackendClass))
|
||||
#define UP_BACKEND_ERROR (up_backend_error_quark ())
|
||||
#define UP_BACKEND_TYPE_ERROR (up_backend_error_get_type ())
|
||||
|
||||
typedef struct DkpBackendPrivate DkpBackendPrivate;
|
||||
typedef struct UpBackendPrivate UpBackendPrivate;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
GObject parent;
|
||||
DkpBackendPrivate *priv;
|
||||
} DkpBackend;
|
||||
UpBackendPrivate *priv;
|
||||
} UpBackend;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
GObjectClass parent_class;
|
||||
void (* device_added) (DkpBackend *backend,
|
||||
void (* device_added) (UpBackend *backend,
|
||||
GObject *native,
|
||||
DkpDevice *device);
|
||||
void (* device_changed) (DkpBackend *backend,
|
||||
void (* device_changed) (UpBackend *backend,
|
||||
GObject *native,
|
||||
DkpDevice *device);
|
||||
void (* device_removed) (DkpBackend *backend,
|
||||
void (* device_removed) (UpBackend *backend,
|
||||
GObject *native,
|
||||
DkpDevice *device);
|
||||
} DkpBackendClass;
|
||||
} UpBackendClass;
|
||||
|
||||
GType dkp_backend_get_type (void);
|
||||
DkpBackend *dkp_backend_new (void);
|
||||
void dkp_backend_test (gpointer user_data);
|
||||
GType up_backend_get_type (void);
|
||||
UpBackend *up_backend_new (void);
|
||||
void up_backend_test (gpointer user_data);
|
||||
|
||||
gboolean dkp_backend_coldplug (DkpBackend *backend,
|
||||
gboolean up_backend_coldplug (UpBackend *backend,
|
||||
DkpDaemon *daemon);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __DKP_BACKEND_H */
|
||||
#endif /* __UP_BACKEND_H */
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ struct DkpDaemonPrivate
|
|||
DBusGConnection *connection;
|
||||
DBusGProxy *proxy;
|
||||
DkpPolkit *polkit;
|
||||
DkpBackend *backend;
|
||||
UpBackend *backend;
|
||||
DkpDeviceList *power_devices;
|
||||
gboolean on_battery;
|
||||
gboolean on_low_battery;
|
||||
|
|
@ -665,7 +665,7 @@ dkp_daemon_startup (DkpDaemon *daemon)
|
|||
daemon->priv->during_coldplug = TRUE;
|
||||
|
||||
/* coldplug backend backend */
|
||||
ret = dkp_backend_coldplug (daemon->priv->backend, daemon);
|
||||
ret = up_backend_coldplug (daemon->priv->backend, daemon);
|
||||
if (!ret) {
|
||||
egg_warning ("failed to coldplug backend");
|
||||
goto out;
|
||||
|
|
@ -789,7 +789,7 @@ dkp_daemon_device_changed_cb (DkpDevice *device, DkpDaemon *daemon)
|
|||
* dkp_daemon_device_added_cb:
|
||||
**/
|
||||
static void
|
||||
dkp_daemon_device_added_cb (DkpBackend *backend, GObject *native, DkpDevice *device, DkpDaemon *daemon)
|
||||
dkp_daemon_device_added_cb (UpBackend *backend, GObject *native, DkpDevice *device, DkpDaemon *daemon)
|
||||
{
|
||||
DkpDeviceType type;
|
||||
const gchar *object_path;
|
||||
|
|
@ -830,7 +830,7 @@ dkp_daemon_device_added_cb (DkpBackend *backend, GObject *native, DkpDevice *dev
|
|||
* dkp_daemon_device_removed_cb:
|
||||
**/
|
||||
static void
|
||||
dkp_daemon_device_removed_cb (DkpBackend *backend, GObject *native, DkpDevice *device, DkpDaemon *daemon)
|
||||
dkp_daemon_device_removed_cb (UpBackend *backend, GObject *native, DkpDevice *device, DkpDaemon *daemon)
|
||||
{
|
||||
DkpDeviceType type;
|
||||
const gchar *object_path;
|
||||
|
|
@ -904,7 +904,7 @@ dkp_daemon_init (DkpDaemon *daemon)
|
|||
daemon->priv->battery_poll_id = 0;
|
||||
daemon->priv->battery_poll_count = 0;
|
||||
|
||||
daemon->priv->backend = dkp_backend_new ();
|
||||
daemon->priv->backend = up_backend_new ();
|
||||
g_signal_connect (daemon->priv->backend, "device-added",
|
||||
G_CALLBACK (dkp_daemon_device_added_cb), daemon);
|
||||
g_signal_connect (daemon->priv->backend, "device-removed",
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ main (int argc, char **argv)
|
|||
egg_debug_init (&argc, &argv);
|
||||
|
||||
/* tests go here */
|
||||
dkp_backend_test (test);
|
||||
up_backend_test (test);
|
||||
dkp_device_test (test);
|
||||
dkp_device_list_test (test);
|
||||
dkp_history_test (test);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue