up-client.h   up-client.h 
skipping to change at line 58 skipping to change at line 58
{ {
GObject parent; GObject parent;
UpClientPrivate *priv; UpClientPrivate *priv;
} UpClient; } UpClient;
typedef struct typedef struct
{ {
GObjectClass parent_class; GObjectClass parent_class;
void (*device_added) (UpClient *client, void (*device_added) (UpClient *client,
UpDevice *device); UpDevice *device);
void (*device_changed) (UpClient
*client,
UpDevice
*device);
void (*device_removed) (UpClient *client, void (*device_removed) (UpClient *client,
UpDevice const gchar
*device); *object_path);
void (*changed) (UpClient
*client);
/* FIXME: remove when we next break API */
void (*notify_sleep) (UpClient
*client,
UpSleepKind
sleep_kind);
/* FIXME: remove when we next break API */
void (*notify_resume) (UpClient
*client,
UpSleepKind
sleep_kind);
/*< private >*/ /*< private >*/
/* Padding for future expansion */ /* Padding for future expansion */
void (*_up_client_reserved1) (void); void (*_up_client_reserved1) (void);
void (*_up_client_reserved2) (void); void (*_up_client_reserved2) (void);
void (*_up_client_reserved3) (void); void (*_up_client_reserved3) (void);
void (*_up_client_reserved4) (void); void (*_up_client_reserved4) (void);
void (*_up_client_reserved5) (void); void (*_up_client_reserved5) (void);
void (*_up_client_reserved6) (void); void (*_up_client_reserved6) (void);
void (*_up_client_reserved7) (void); void (*_up_client_reserved7) (void);
void (*_up_client_reserved8) (void); void (*_up_client_reserved8) (void);
} UpClientClass; } UpClientClass;
/* general */ /* general */
GType up_client_get_type (void); GType up_client_get_type (void);
UpClient *up_client_new (void); UpClient *up_client_new (void);
/* sync versions */ /* sync versions */
gboolean up_client_get_properties_sync (UpClient UpDevice * up_client_get_display_device (UpClient *client);
*client, char * up_client_get_critical_action (UpClient *client);
GCancellable
*cancellable,
GError
**error);
gboolean up_client_enumerate_devices_sync (UpClient
*client,
GCancellable
*cancellable,
GError
**error);
#ifdef UPOWER_ENABLE_DEPRECATED
gboolean up_client_suspend_sync (UpClient
*client,
GCancellable
*cancellable,
GError
**error);
gboolean up_client_about_to_sleep_sync (UpClient
*client,
UpSleepKind
sleep_kind,
GCancellable
*cancellable,
GError
**error);
gboolean up_client_hibernate_sync (UpClient
*client,
GCancellable
*cancellable,
GError
**error);
#endif
/* accessors */ /* accessors */
GPtrArray *up_client_get_devices (UpClient *client); GPtrArray *up_client_get_devices (UpClient *client);
const gchar *up_client_get_daemon_version (UpClient *client); const gchar *up_client_get_daemon_version (UpClient *client);
#ifdef UPOWER_ENABLE_DEPRECATED
gboolean up_client_get_can_hibernate (UpClient
*client);
#endif
gboolean up_client_get_lid_is_closed (UpClient *client); gboolean up_client_get_lid_is_closed (UpClient *client);
gboolean up_client_get_lid_is_present (UpClient *client); gboolean up_client_get_lid_is_present (UpClient *client);
gboolean up_client_get_lid_force_sleep (UpClient *client);
gboolean up_client_get_is_docked (UpClient *client); gboolean up_client_get_is_docked (UpClient *client);
#ifdef UPOWER_ENABLE_DEPRECATED
gboolean up_client_get_can_suspend (UpClient
*client);
#endif
gboolean up_client_get_on_battery (UpClient *client); gboolean up_client_get_on_battery (UpClient *client);
gboolean up_client_get_on_low_battery (UpClient *client);
G_END_DECLS G_END_DECLS
#endif /* __UP_CLIENT_H */ #endif /* __UP_CLIENT_H */
 End of changes. 7 change blocks. 
62 lines changed or deleted 4 lines changed or added


 up-device.h   up-device.h 
skipping to change at line 56 skipping to change at line 56
typedef struct typedef struct
{ {
GObject parent; GObject parent;
UpDevicePrivate *priv; UpDevicePrivate *priv;
} UpDevice; } UpDevice;
typedef struct typedef struct
{ {
GObjectClass parent_class; GObjectClass parent_class;
void (*changed) (UpDevice
*device,
gpointer
*obj);
/*< private >*/ /*< private >*/
/* Padding for future expansion */ /* Padding for future expansion */
void (*_up_device_reserved1) (void); void (*_up_device_reserved1) (void);
void (*_up_device_reserved2) (void); void (*_up_device_reserved2) (void);
void (*_up_device_reserved3) (void); void (*_up_device_reserved3) (void);
void (*_up_device_reserved4) (void); void (*_up_device_reserved4) (void);
void (*_up_device_reserved5) (void); void (*_up_device_reserved5) (void);
void (*_up_device_reserved6) (void); void (*_up_device_reserved6) (void);
void (*_up_device_reserved7) (void); void (*_up_device_reserved7) (void);
void (*_up_device_reserved8) (void); void (*_up_device_reserved8) (void);
 End of changes. 1 change blocks. 
4 lines changed or deleted 0 lines changed or added


 up-types.h   up-types.h 
skipping to change at line 87 skipping to change at line 87
UP_DEVICE_TECHNOLOGY_LITHIUM_ION, UP_DEVICE_TECHNOLOGY_LITHIUM_ION,
UP_DEVICE_TECHNOLOGY_LITHIUM_POLYMER, UP_DEVICE_TECHNOLOGY_LITHIUM_POLYMER,
UP_DEVICE_TECHNOLOGY_LITHIUM_IRON_PHOSPHATE, UP_DEVICE_TECHNOLOGY_LITHIUM_IRON_PHOSPHATE,
UP_DEVICE_TECHNOLOGY_LEAD_ACID, UP_DEVICE_TECHNOLOGY_LEAD_ACID,
UP_DEVICE_TECHNOLOGY_NICKEL_CADMIUM, UP_DEVICE_TECHNOLOGY_NICKEL_CADMIUM,
UP_DEVICE_TECHNOLOGY_NICKEL_METAL_HYDRIDE, UP_DEVICE_TECHNOLOGY_NICKEL_METAL_HYDRIDE,
UP_DEVICE_TECHNOLOGY_LAST UP_DEVICE_TECHNOLOGY_LAST
} UpDeviceTechnology; } UpDeviceTechnology;
/** /**
* UpQosKind: * UpDeviceLevel:
* *
* The type of QOS request. * The warning level of a battery.
**/ **/
typedef enum { typedef enum {
UP_QOS_KIND_UNKNOWN, UP_DEVICE_LEVEL_UNKNOWN,
UP_QOS_KIND_NETWORK, UP_DEVICE_LEVEL_NONE,
UP_QOS_KIND_CPU_DMA, UP_DEVICE_LEVEL_DISCHARGING,
UP_QOS_KIND_LAST UP_DEVICE_LEVEL_LOW,
} UpQosKind; UP_DEVICE_LEVEL_CRITICAL,
UP_DEVICE_LEVEL_ACTION,
/** UP_DEVICE_LEVEL_LAST
* UpSleepKind: } UpDeviceLevel;
*
* The type of QOS request.
**/
typedef enum {
UP_SLEEP_KIND_UNKNOWN,
UP_SLEEP_KIND_SUSPEND,
UP_SLEEP_KIND_HIBERNATE,
UP_SLEEP_KIND_HYBRID,
UP_SLEEP_KIND_LAST
} UpSleepKind;
const gchar *up_device_kind_to_string (UpDeviceKind type_enum); const gchar *up_device_kind_to_string (UpDeviceKind type_enum);
const gchar *up_device_state_to_string (UpDeviceState state_enum); const gchar *up_device_state_to_string (UpDeviceState state_enum);
const gchar *up_device_technology_to_string (UpDeviceTechnology technology_enum); const gchar *up_device_technology_to_string (UpDeviceTechnology technology_enum);
const gchar *up_device_level_to_string (UpDeviceLevel level_enum);
UpDeviceKind up_device_kind_from_string (const gchar *type); UpDeviceKind up_device_kind_from_string (const gchar *type);
UpDeviceState up_device_state_from_string (const gchar *state); UpDeviceState up_device_state_from_string (const gchar *state);
UpDeviceTechnology up_device_technology_from_string (const gchar *technology); UpDeviceTechnology up_device_technology_from_string (const gchar *technology);
const gchar *up_qos_kind_to_string (UpQosKind UpDeviceLevel up_device_level_from_string (const gchar
type); *level);
UpQosKind up_qos_kind_from_string (const gchar
*type);
const gchar *up_sleep_kind_to_string (UpSleepKind
sleep_kind_enum);
UpSleepKind up_sleep_kind_from_string (const gchar
*sleep_kind);
G_END_DECLS G_END_DECLS
#endif /* __UP_TYPES_H */ #endif /* __UP_TYPES_H */
 End of changes. 5 change blocks. 
28 lines changed or deleted 13 lines changed or added


 up-version.h   up-version.h 
skipping to change at line 51 skipping to change at line 51
* *
* The compile-time major version * The compile-time major version
*/ */
#define UP_MAJOR_VERSION (0) #define UP_MAJOR_VERSION (0)
/** /**
* UP_CHECK_MINOR: * UP_CHECK_MINOR:
* *
* The compile-time minor version * The compile-time minor version
*/ */
#define UP_MINOR_VERSION (9) #define UP_MINOR_VERSION (99)
/** /**
* UP_MICRO_VERSION: * UP_MICRO_VERSION:
* *
* The compile-time micro version * The compile-time micro version
*/ */
#define UP_MICRO_VERSION (23) #define UP_MICRO_VERSION (0)
/* check whether a UPower version equal to or greater than /* check whether a UPower version equal to or greater than
* major.minor.micro. * major.minor.micro.
*/ */
#define UP_CHECK_VERSION(major,minor,micro) \ #define UP_CHECK_VERSION(major,minor,micro) \
(UP_MAJOR_VERSION > (major) || \ (UP_MAJOR_VERSION > (major) || \
(UP_MAJOR_VERSION == (major) && UP_MINOR_VERSION > (minor)) || \ (UP_MAJOR_VERSION == (major) && UP_MINOR_VERSION > (minor)) || \
(UP_MAJOR_VERSION == (major) && UP_MINOR_VERSION == (minor) && \ (UP_MAJOR_VERSION == (major) && UP_MINOR_VERSION == (minor) && \
UP_MICRO_VERSION >= (micro))) UP_MICRO_VERSION >= (micro)))
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 upower.h   upower.h 
skipping to change at line 41 skipping to change at line 41
#ifndef __UPOWER_H__ #ifndef __UPOWER_H__
#define __UPOWER_H__ #define __UPOWER_H__
#define __UPOWER_H_INSIDE__ #define __UPOWER_H_INSIDE__
#include <libupower-glib/up-version.h> #include <libupower-glib/up-version.h>
#include <libupower-glib/up-types.h> #include <libupower-glib/up-types.h>
#include <libupower-glib/up-client.h> #include <libupower-glib/up-client.h>
#include <libupower-glib/up-device.h> #include <libupower-glib/up-device.h>
#include <libupower-glib/up-qos-item.h>
#include <libupower-glib/up-history-item.h> #include <libupower-glib/up-history-item.h>
#include <libupower-glib/up-stats-item.h> #include <libupower-glib/up-stats-item.h>
#include <libupower-glib/up-wakeup-item.h> #include <libupower-glib/up-wakeup-item.h>
#include <libupower-glib/up-wakeups.h> #include <libupower-glib/up-wakeups.h>
#undef __UPOWER_H_INSIDE__ #undef __UPOWER_H_INSIDE__
#endif /* __UPOWER_H__ */ #endif /* __UPOWER_H__ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/