dkp-enum.h   dkp-enum.h 
skipping to change at line 75 skipping to change at line 75
DKP_DEVICE_TECHNOLOGY_LAST DKP_DEVICE_TECHNOLOGY_LAST
} DkpDeviceTechnology; } DkpDeviceTechnology;
typedef enum { typedef enum {
DKP_QOS_TYPE_UNKNOWN, DKP_QOS_TYPE_UNKNOWN,
DKP_QOS_TYPE_NETWORK, DKP_QOS_TYPE_NETWORK,
DKP_QOS_TYPE_CPU_DMA, DKP_QOS_TYPE_CPU_DMA,
DKP_QOS_TYPE_LAST DKP_QOS_TYPE_LAST
} DkpQosType; } DkpQosType;
/* compat */
typedef DkpDeviceType UpDeviceKind;
typedef DkpDeviceState UpDeviceState;
typedef DkpDeviceTechnology UpDeviceTechnology;
typedef DkpQosType UpQosType;
#define up_device_kind_to_text dkp_device_type_to_text
#define up_device_state_to_text dkp_device_state_to_
text
#define up_device_technology_to_text dkp_device_technology_to_tex
t
#define up_qos_type_to_text dkp_qos_type_to_text
#define up_device_kind_from_text dkp_device_type_from_text
#define up_device_state_from_text dkp_device_state_from_text
#define up_device_technology_from_text dkp_device_technology_from_t
ext
#define up_qos_type_from_text dkp_qos_type_from_text
#define UP_DEVICE_KIND_UNKNOWN DKP_DEVICE_TYPE_UNKNOWN
#define UP_DEVICE_KIND_LINE_POWER DKP_DEVICE_TYPE_LINE_POWER
#define UP_DEVICE_KIND_BATTERY DKP_DEVICE_TYPE_BATTERY
#define UP_DEVICE_KIND_UPS DKP_DEVICE_TYPE_UPS
#define UP_DEVICE_KIND_MONITOR DKP_DEVICE_TYPE_MONITOR
#define UP_DEVICE_KIND_MOUSE DKP_DEVICE_TYPE_MOUSE
#define UP_DEVICE_KIND_KEYBOARD DKP_DEVICE_TYPE_KEYB
OARD
#define UP_DEVICE_KIND_PDA DKP_DEVICE_TYPE_PDA
#define UP_DEVICE_KIND_PHONE DKP_DEVICE_TYPE_PHONE
#define UP_DEVICE_KIND_LAST DKP_DEVICE_TYPE_LAST
#define UP_DEVICE_STATE_UNKNOWN DKP_DEVICE_STATE_UNK
NOWN
#define UP_DEVICE_STATE_CHARGING DKP_DEVICE_STATE_CHARGING
#define UP_DEVICE_STATE_DISCHARGING DKP_DEVICE_STATE_DISCHARGING
#define UP_DEVICE_STATE_EMPTY DKP_DEVICE_STATE_EMPTY
#define UP_DEVICE_STATE_FULLY_CHARGED DKP_DEVICE_STATE_FULLY_CHARG
ED
#define UP_DEVICE_STATE_PENDING_CHARGE DKP_DEVICE_STATE_PENDING_CHA
RGE
#define UP_DEVICE_STATE_PENDING_DISCHARGE DKP_DEVICE_STATE_PENDING_DIS
CHARGE
#define UP_DEVICE_STATE_LAST DKP_DEVICE_STATE_LAST
#define UP_DEVICE_TECHNOLOGY_UNKNOWN DKP_DEVICE_TECHNOLOGY_UNKNOW
N
#define UP_DEVICE_TECHNOLOGY_LITHIUM_ION DKP_DEVICE_TECHNOLOGY_LITHIU
M_ION
#define UP_DEVICE_TECHNOLOGY_LITHIUM_POLYMER DKP_DEVICE_TECHNOLOGY_LITHIU
M_POLYMER
#define UP_DEVICE_TECHNOLOGY_LITHIUM_IRON_PHOSPHATE DKP_DEVICE_TECHNOLOG
Y_LITHIUM_IRON_PHOSPHATE
#define UP_DEVICE_TECHNOLOGY_LEAD_ACID DKP_DEVICE_TECHNOLOGY_LEAD_A
CID
#define UP_DEVICE_TECHNOLOGY_NICKEL_CADMIUM DKP_DEVICE_TECHNOLOGY_NICKEL
_CADMIUM
#define UP_DEVICE_TECHNOLOGY_NICKEL_METAL_HYDRIDE DKP_DEVICE_TECHNOLOG
Y_NICKEL_METAL_HYDRIDE
#define UP_DEVICE_TECHNOLOGY_LAST DKP_DEVICE_TECHNOLOGY_LAST
#define UP_QOS_KIND_UNKNOWN DKP_QOS_TYPE_UNKNOWN
#define UP_QOS_KIND_NETWORK DKP_QOS_TYPE_NETWORK
#define UP_QOS_KIND_CPU_DMA DKP_QOS_TYPE_CPU_DMA
#define UP_QOS_KIND_LAST DKP_QOS_TYPE_LAST
const gchar *dkp_device_type_to_text (DkpDeviceType typ e_enum); const gchar *dkp_device_type_to_text (DkpDeviceType typ e_enum);
const gchar *dkp_device_state_to_text (DkpDeviceState sta te_enum); const gchar *dkp_device_state_to_text (DkpDeviceState sta te_enum);
const gchar *dkp_device_technology_to_text (DkpDeviceTechnology tec hnology_enum); const gchar *dkp_device_technology_to_text (DkpDeviceTechnology tec hnology_enum);
DkpDeviceType dkp_device_type_from_text (const gchar *typ e); DkpDeviceType dkp_device_type_from_text (const gchar *typ e);
DkpDeviceState dkp_device_state_from_text (const gchar *sta te); DkpDeviceState dkp_device_state_from_text (const gchar *sta te);
DkpDeviceTechnology dkp_device_technology_from_text (const gchar *tec hnology); DkpDeviceTechnology dkp_device_technology_from_text (const gchar *tec hnology);
const gchar *dkp_qos_type_to_text (DkpQosType typ e); const gchar *dkp_qos_type_to_text (DkpQosType typ e);
DkpQosType dkp_qos_type_from_text (const gchar *typ e); DkpQosType dkp_qos_type_from_text (const gchar *typ e);
G_END_DECLS G_END_DECLS
 End of changes. 1 change blocks. 
59 lines changed or deleted 0 lines changed or added


 dkp-version.h   dkp-version.h 
skipping to change at line 31 skipping to change at line 31
#if !defined (__UPOWER_H_INSIDE__) && !defined (UP_COMPILATION) #if !defined (__UPOWER_H_INSIDE__) && !defined (UP_COMPILATION)
#error "Only <devicekit-power.h> can be included directly." #error "Only <devicekit-power.h> can be included directly."
#endif #endif
#ifndef __DKP_VERSION_H #ifndef __DKP_VERSION_H
#define __DKP_VERSION_H #define __DKP_VERSION_H
/* compile time version /* compile time version
*/ */
#define DKP_COMPILE_VERSION (0x0.9.0) #define DKP_COMPILE_VERSION (0x0.9.1)
/* check whether a the version is above the compile time version. /* check whether a the version is above the compile time version.
*/ */
#define DKP_CHECK_VERSION(ver) (1) #define DKP_CHECK_VERSION(ver) (1)
#endif /* __DKP_VERSION_H */ #endif /* __DKP_VERSION_H */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 up-client.h   up-client.h 
skipping to change at line 30 skipping to change at line 30
*/ */
#if !defined (__UPOWER_H_INSIDE__) && !defined (UP_COMPILATION) #if !defined (__UPOWER_H_INSIDE__) && !defined (UP_COMPILATION)
#error "Only <upower.h> can be included directly." #error "Only <upower.h> can be included directly."
#endif #endif
#ifndef __UP_CLIENT_H #ifndef __UP_CLIENT_H
#define __UP_CLIENT_H #define __UP_CLIENT_H
#include <glib-object.h> #include <glib-object.h>
#include <gio/gio.h>
#include <libupower-glib/up-device.h> #include <libupower-glib/up-device.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define UP_TYPE_CLIENT (up_client_get_type ()) #define UP_TYPE_CLIENT (up_client_get_type ())
#define UP_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UP _TYPE_CLIENT, UpClient)) #define UP_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UP _TYPE_CLIENT, UpClient))
#define UP_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), UP_TYP E_CLIENT, UpClientClass)) #define UP_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), UP_TYP E_CLIENT, UpClientClass))
#define UP_IS_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UP_TYPE_CLIENT)) #define UP_IS_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UP_TYPE_CLIENT))
#define UP_IS_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), UP_TY PE_CLIENT)) #define UP_IS_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), UP_TY PE_CLIENT))
#define UP_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UP_ TYPE_CLIENT, UpClientClass)) #define UP_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UP_ TYPE_CLIENT, UpClientClass))
skipping to change at line 79 skipping to change at line 81
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 *client, gboolean up_client_get_properties_sync (UpClient *client,
GCancellable *cancellable,
GError **error); GError **error);
gboolean up_client_enumerate_devices_sync (UpClient *client, gboolean up_client_enumerate_devices_sync (UpClient *client,
GCancellable *cancellable,
GError **error); GError **error);
gboolean up_client_suspend_sync (UpClient *client, gboolean up_client_suspend_sync (UpClient *client,
GCancellable
*cancellable,
GError
**error);
gboolean up_client_about_to_sleep_sync (UpClient
*client,
GCancellable
*cancellable,
GError **error); GError **error);
gboolean up_client_hibernate_sync (UpClient *client, gboolean up_client_hibernate_sync (UpClient *client,
GCancellable *cancellable,
GError **error); GError **error);
/* 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);
gboolean up_client_get_can_hibernate (UpClient *client); gboolean up_client_get_can_hibernate (UpClient *client);
gboolean up_client_get_lid_is_closed (UpClient *client); gboolean up_client_get_lid_is_closed (UpClient *client);
gboolean up_client_get_can_suspend (UpClient *client); gboolean up_client_get_can_suspend (UpClient *client);
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); gboolean up_client_get_on_low_battery (UpClient *client);
 End of changes. 5 change blocks. 
0 lines changed or deleted 13 lines changed or added


 up-device.h   up-device.h 
skipping to change at line 30 skipping to change at line 30
*/ */
#if !defined (__UPOWER_H_INSIDE__) && !defined (UP_COMPILATION) #if !defined (__UPOWER_H_INSIDE__) && !defined (UP_COMPILATION)
#error "Only <upower.h> can be included directly." #error "Only <upower.h> can be included directly."
#endif #endif
#ifndef __UP_DEVICE_H #ifndef __UP_DEVICE_H
#define __UP_DEVICE_H #define __UP_DEVICE_H
#include <glib-object.h> #include <glib-object.h>
#include <up-types.h> #include <gio/gio.h>
#include <libupower-glib/up-types.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define UP_TYPE_DEVICE (up_device_get_type ()) #define UP_TYPE_DEVICE (up_device_get_type ())
#define UP_DEVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UP_TYPE_DE VICE, UpDevice)) #define UP_DEVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UP_TYPE_DE VICE, UpDevice))
#define UP_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), UP_TYPE_DEVICE , UpDeviceClass)) #define UP_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), UP_TYPE_DEVICE , UpDeviceClass))
#define UP_IS_DEVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UP _TYPE_DEVICE)) #define UP_IS_DEVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UP _TYPE_DEVICE))
#define UP_IS_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), UP_TYPE_DEVIC E)) #define UP_IS_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), UP_TYPE_DEVIC E))
#define UP_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UP_TYPE_DEV ICE, UpDeviceClass)) #define UP_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UP_TYPE_DEV ICE, UpDeviceClass))
#define UP_DEVICE_ERROR (up_device_error_quark ()) #define UP_DEVICE_ERROR (up_device_error_quark ())
skipping to change at line 75 skipping to change at line 77
void (*_up_device_reserved8) (void); void (*_up_device_reserved8) (void);
} UpDeviceClass; } UpDeviceClass;
/* general */ /* general */
GType up_device_get_type (void); GType up_device_get_type (void);
UpDevice *up_device_new (void); UpDevice *up_device_new (void);
gchar *up_device_to_text (UpDevice *device); gchar *up_device_to_text (UpDevice *device);
/* sync versions */ /* sync versions */
gboolean up_device_refresh_sync (UpDevice *device, gboolean up_device_refresh_sync (UpDevice *device,
GCancellable *cancellable,
GError **error); GError **error);
gboolean up_device_set_object_path_sync (UpDevice *device, gboolean up_device_set_object_path_sync (UpDevice *device,
const gchar *object_path, const gchar *object_path,
GCancellable *cancellable,
GError **error); GError **error);
GPtrArray *up_device_get_history_sync (UpDevice *device, GPtrArray *up_device_get_history_sync (UpDevice *device,
const gchar *type, const gchar *type,
guint timespec, guint timespec,
guint resolution, guint resolution,
GCancellable *cancellable,
GError **error); GError **error);
GPtrArray *up_device_get_statistics_sync (UpDevice *device, GPtrArray *up_device_get_statistics_sync (UpDevice *device,
const gchar *type, const gchar *type,
GCancellable *cancellable,
GError **error); GError **error);
/* accessors */ /* accessors */
const gchar *up_device_get_object_path (UpDevice *device); const gchar *up_device_get_object_path (UpDevice *device);
G_END_DECLS G_END_DECLS
#endif /* __UP_DEVICE_H */ #endif /* __UP_DEVICE_H */
 End of changes. 5 change blocks. 
1 lines changed or deleted 7 lines changed or added


 up-version.h   up-version.h 
skipping to change at line 58 skipping to change at line 58
* *
* The compile-time minor version * The compile-time minor version
*/ */
#define UP_MINOR_VERSION (9) #define UP_MINOR_VERSION (9)
/** /**
* UP_MICRO_VERSION: * UP_MICRO_VERSION:
* *
* The compile-time micro version * The compile-time micro version
*/ */
#define UP_MICRO_VERSION (0) #define UP_MICRO_VERSION (1)
/* 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. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 upower.h   upower.h 
skipping to change at line 45 skipping to change at line 45
#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-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>
#undef __UPOWER_H_INSIDE__ #undef __UPOWER_H_INSIDE__
#endif /* __UPOWER_H__ */ #endif /* __UPOWER_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 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/