Commit 0c79551d authored by Michael Biebl's avatar Michael Biebl

Imported Upstream version 0.99.4

parent d899d429
......@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = etc libupower-glib src doc tools po
SUBDIRS = etc dbus libupower-glib src doc tools po
if BACKEND_TYPE_LINUX
SUBDIRS += rules
......@@ -52,8 +52,9 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = upower-glib.pc
# xsltproc barfs on 'make distcheck'; disable for now
DISTCHECK_CONFIGURE_FLAGS=--disable-man-pages --enable-gtk-doc \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
DISTCHECK_CONFIGURE_FLAGS=--disable-man-pages --enable-gtk-doc \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
--with-udevrulesdir='$${libdir}/udev/rules.d-distcheck'
clean-local :
rm -f *~
......
......@@ -197,7 +197,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = etc libupower-glib src doc tools po rules
DIST_SUBDIRS = etc dbus libupower-glib src doc tools po rules
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/upower-glib.pc.in $(top_srcdir)/build-aux/compile \
$(top_srcdir)/build-aux/config.guess \
......@@ -208,8 +208,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/build-aux/missing ABOUT-NLS AUTHORS COPYING \
ChangeLog INSTALL NEWS README build-aux/compile \
build-aux/config.guess build-aux/config.rpath \
build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \
build-aux/missing
build-aux/config.sub build-aux/depcomp build-aux/install-sh \
build-aux/ltmain.sh build-aux/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -268,10 +268,6 @@ CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_LIBS = @DBUS_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
......@@ -447,7 +443,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
udevrulesdir = @udevrulesdir@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = etc libupower-glib src doc tools po $(am__append_1)
SUBDIRS = etc dbus libupower-glib src doc tools po $(am__append_1)
EXTRA_DIST = \
HACKING \
ChangeLog
......@@ -472,8 +468,9 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = upower-glib.pc
# xsltproc barfs on 'make distcheck'; disable for now
DISTCHECK_CONFIGURE_FLAGS = --disable-man-pages --enable-gtk-doc \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
DISTCHECK_CONFIGURE_FLAGS = --disable-man-pages --enable-gtk-doc \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
--with-udevrulesdir='$${libdir}/udev/rules.d-distcheck'
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
......
Version 0.99.4
~~~~~~~~~~~~~~
Released: 2016-02-16
New Features:
- Add support for Logitech G700s/G700 Gaming Mouse (muzena)
- Port to GDBus (Cosimo Cecchi)
- Support g_autoptr() for all libupower-glib object types (Kalev Lember)
Bugfixes:
- Add critical action support for *BSD (Eric Koegel)
- Change the default low battery policy to percentage (Bastien Nocera)
- Fix deprecation warning in integration-test (Bastien Nocera)
- Fix memory leak in up_client_get_devices() (Bastien Nocera)
- Fix possible double-free (Bastien Nocera)
- Update HID rules and fix build regression (Arnaud Quette)
Version 0.99.3
~~~~~~~~~~~~~~
Released: 2015-05-28
......
This diff is collapsed.
......@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
m4_define([up_major_version], [0])
m4_define([up_minor_version], [99])
m4_define([up_micro_version], [3])
m4_define([up_micro_version], [4])
m4_define([up_version],
[up_major_version.up_minor_version.up_micro_version])
......@@ -152,9 +152,7 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now],
[RELRO_LDFLAGS="-Wl,-z,relro,-z,now"])
AC_SUBST([RELRO_LDFLAGS])
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.34.0])
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.76])
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.34.0 gobject-2.0])
PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.16.1])
PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0])
......@@ -244,11 +242,13 @@ AC_CONFIG_FILES([
Makefile
upower-glib.pc
etc/Makefile
dbus/Makefile
src/Makefile
src/dummy/Makefile
src/freebsd/Makefile
src/openbsd/Makefile
src/linux/Makefile
src/bsd/Makefile
tools/Makefile
doc/Makefile
doc/version.xml
......
noinst_LTLIBRARIES=libupower-dbus.la
AM_CPPFLAGS = \
$(GIO_CFLAGS) \
$(GIO_UNIX_CFLAGS) \
$(GLIB_CFLAGS)
libupower_dbus_la_LIBADD = \
$(GIO_LIBS) \
$(GIO_UNIX_LIBS) \
$(GLIB_LIBS)
BUILT_SOURCES = \
up-daemon-generated.h \
up-daemon-generated.c \
up-device-generated.h \
up-device-generated.c \
up-kbd-backlight-generated.h \
up-kbd-backlight-generated.c \
up-wakeups-generated.h \
up-wakeups-generated.c
libupower_dbus_la_SOURCES = $(BUILT_SOURCES)
up-daemon-generated.h: org.freedesktop.UPower.xml Makefile.am
$(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.UPower. \
--generate-c-code up-daemon-generated \
--c-namespace Up \
--annotate "org.freedesktop.UPower" "org.gtk.GDBus.C.Name" ExportedDaemon \
$(srcdir)/org.freedesktop.UPower.xml
up-daemon-generated.c: up-daemon-generated.h
up-device-generated.h: org.freedesktop.UPower.Device.xml Makefile.am
$(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.UPower.Device. \
--generate-c-code up-device-generated \
--c-namespace Up \
--annotate "org.freedesktop.UPower.Device" "org.gtk.GDBus.C.Name" ExportedDevice \
$(srcdir)/org.freedesktop.UPower.Device.xml
up-device-generated.c: up-device-generated.h
up-kbd-backlight-generated.h: org.freedesktop.UPower.KbdBacklight.xml Makefile.am
$(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.UPower.KbdBacklight. \
--generate-c-code up-kbd-backlight-generated \
--c-namespace Up \
--annotate "org.freedesktop.UPower.KbdBacklight" "org.gtk.GDBus.C.Name" ExportedKbdBacklight \
$(srcdir)/org.freedesktop.UPower.KbdBacklight.xml
up-kbd-backlight-generated.c: up-kbd-backlight-generated.h
up-wakeups-generated.h: org.freedesktop.UPower.Wakeups.xml Makefile.am
$(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.UPower.Wakeups. \
--generate-c-code up-wakeups-generated \
--c-namespace Up \
--annotate "org.freedesktop.UPower.Wakeups" "org.gtk.GDBus.C.Name" ExportedWakeups \
$(srcdir)/org.freedesktop.UPower.Wakeups.xml
up-wakeups-generated.c: up-wakeups-generated.h
dbusifdir = $(datadir)/dbus-1/interfaces
dist_dbusif_DATA = \
org.freedesktop.UPower.xml \
org.freedesktop.UPower.Device.xml \
org.freedesktop.UPower.KbdBacklight.xml \
org.freedesktop.UPower.Wakeups.xml
-include $(top_srcdir)/git.mk
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/*
* Generated by gdbus-codegen 2.44.1. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
#ifndef __UP_KBD_BACKLIGHT_GENERATED_H__
#define __UP_KBD_BACKLIGHT_GENERATED_H__
#include <gio/gio.h>
G_BEGIN_DECLS
/* ------------------------------------------------------------------------ */
/* Declarations for org.freedesktop.UPower.KbdBacklight */
#define UP_TYPE_EXPORTED_KBD_BACKLIGHT (up_exported_kbd_backlight_get_type ())
#define UP_EXPORTED_KBD_BACKLIGHT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UP_TYPE_EXPORTED_KBD_BACKLIGHT, UpExportedKbdBacklight))
#define UP_IS_EXPORTED_KBD_BACKLIGHT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UP_TYPE_EXPORTED_KBD_BACKLIGHT))
#define UP_EXPORTED_KBD_BACKLIGHT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), UP_TYPE_EXPORTED_KBD_BACKLIGHT, UpExportedKbdBacklightIface))
struct _UpExportedKbdBacklight;
typedef struct _UpExportedKbdBacklight UpExportedKbdBacklight;
typedef struct _UpExportedKbdBacklightIface UpExportedKbdBacklightIface;
struct _UpExportedKbdBacklightIface
{
GTypeInterface parent_iface;
gboolean (*handle_get_brightness) (
UpExportedKbdBacklight *object,
GDBusMethodInvocation *invocation);
gboolean (*handle_get_max_brightness) (
UpExportedKbdBacklight *object,
GDBusMethodInvocation *invocation);
gboolean (*handle_set_brightness) (
UpExportedKbdBacklight *object,
GDBusMethodInvocation *invocation,
gint arg_value);
void (*brightness_changed) (
UpExportedKbdBacklight *object,
gint arg_value);
};
GType up_exported_kbd_backlight_get_type (void) G_GNUC_CONST;
GDBusInterfaceInfo *up_exported_kbd_backlight_interface_info (void);
guint up_exported_kbd_backlight_override_properties (GObjectClass *klass, guint property_id_begin);
/* D-Bus method call completion functions: */
void up_exported_kbd_backlight_complete_get_max_brightness (
UpExportedKbdBacklight *object,
GDBusMethodInvocation *invocation,
gint value);
void up_exported_kbd_backlight_complete_get_brightness (
UpExportedKbdBacklight *object,
GDBusMethodInvocation *invocation,
gint value);
void up_exported_kbd_backlight_complete_set_brightness (
UpExportedKbdBacklight *object,
GDBusMethodInvocation *invocation);
/* D-Bus signal emissions functions: */
void up_exported_kbd_backlight_emit_brightness_changed (
UpExportedKbdBacklight *object,
gint arg_value);
/* D-Bus method calls: */
void up_exported_kbd_backlight_call_get_max_brightness (
UpExportedKbdBacklight *proxy,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean up_exported_kbd_backlight_call_get_max_brightness_finish (
UpExportedKbdBacklight *proxy,
gint *out_value,
GAsyncResult *res,
GError **error);
gboolean up_exported_kbd_backlight_call_get_max_brightness_sync (
UpExportedKbdBacklight *proxy,
gint *out_value,
GCancellable *cancellable,
GError **error);
void up_exported_kbd_backlight_call_get_brightness (
UpExportedKbdBacklight *proxy,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean up_exported_kbd_backlight_call_get_brightness_finish (
UpExportedKbdBacklight *proxy,
gint *out_value,
GAsyncResult *res,
GError **error);
gboolean up_exported_kbd_backlight_call_get_brightness_sync (
UpExportedKbdBacklight *proxy,
gint *out_value,
GCancellable *cancellable,
GError **error);
void up_exported_kbd_backlight_call_set_brightness (
UpExportedKbdBacklight *proxy,
gint arg_value,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean up_exported_kbd_backlight_call_set_brightness_finish (
UpExportedKbdBacklight *proxy,
GAsyncResult *res,
GError **error);
gboolean up_exported_kbd_backlight_call_set_brightness_sync (
UpExportedKbdBacklight *proxy,
gint arg_value,
GCancellable *cancellable,
GError **error);
/* ---- */
#define UP_TYPE_EXPORTED_KBD_BACKLIGHT_PROXY (up_exported_kbd_backlight_proxy_get_type ())
#define UP_EXPORTED_KBD_BACKLIGHT_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UP_TYPE_EXPORTED_KBD_BACKLIGHT_PROXY, UpExportedKbdBacklightProxy))
#define UP_EXPORTED_KBD_BACKLIGHT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), UP_TYPE_EXPORTED_KBD_BACKLIGHT_PROXY, UpExportedKbdBacklightProxyClass))
#define UP_EXPORTED_KBD_BACKLIGHT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UP_TYPE_EXPORTED_KBD_BACKLIGHT_PROXY, UpExportedKbdBacklightProxyClass))
#define UP_IS_EXPORTED_KBD_BACKLIGHT_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UP_TYPE_EXPORTED_KBD_BACKLIGHT_PROXY))
#define UP_IS_EXPORTED_KBD_BACKLIGHT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), UP_TYPE_EXPORTED_KBD_BACKLIGHT_PROXY))
typedef struct _UpExportedKbdBacklightProxy UpExportedKbdBacklightProxy;
typedef struct _UpExportedKbdBacklightProxyClass UpExportedKbdBacklightProxyClass;
typedef struct _UpExportedKbdBacklightProxyPrivate UpExportedKbdBacklightProxyPrivate;
struct _UpExportedKbdBacklightProxy
{
/*< private >*/
GDBusProxy parent_instance;
UpExportedKbdBacklightProxyPrivate *priv;
};
struct _UpExportedKbdBacklightProxyClass
{
GDBusProxyClass parent_class;
};
GType up_exported_kbd_backlight_proxy_get_type (void) G_GNUC_CONST;
void up_exported_kbd_backlight_proxy_new (
GDBusConnection *connection,
GDBusProxyFlags flags,
const gchar *name,
const gchar *object_path,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
UpExportedKbdBacklight *up_exported_kbd_backlight_proxy_new_finish (
GAsyncResult *res,
GError **error);
UpExportedKbdBacklight *up_exported_kbd_backlight_proxy_new_sync (
GDBusConnection *connection,
GDBusProxyFlags flags,
const gchar *name,
const gchar *object_path,
GCancellable *cancellable,
GError **error);
void up_exported_kbd_backlight_proxy_new_for_bus (
GBusType bus_type,
GDBusProxyFlags flags,
const gchar *name,
const gchar *object_path,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
UpExportedKbdBacklight *up_exported_kbd_backlight_proxy_new_for_bus_finish (
GAsyncResult *res,
GError **error);
UpExportedKbdBacklight *up_exported_kbd_backlight_proxy_new_for_bus_sync (
GBusType bus_type,
GDBusProxyFlags flags,
const gchar *name,
const gchar *object_path,
GCancellable *cancellable,
GError **error);
/* ---- */
#define UP_TYPE_EXPORTED_KBD_BACKLIGHT_SKELETON (up_exported_kbd_backlight_skeleton_get_type ())
#define UP_EXPORTED_KBD_BACKLIGHT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UP_TYPE_EXPORTED_KBD_BACKLIGHT_SKELETON, UpExportedKbdBacklightSkeleton))
#define UP_EXPORTED_KBD_BACKLIGHT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), UP_TYPE_EXPORTED_KBD_BACKLIGHT_SKELETON, UpExportedKbdBacklightSkeletonClass))
#define UP_EXPORTED_KBD_BACKLIGHT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UP_TYPE_EXPORTED_KBD_BACKLIGHT_SKELETON, UpExportedKbdBacklightSkeletonClass))
#define UP_IS_EXPORTED_KBD_BACKLIGHT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UP_TYPE_EXPORTED_KBD_BACKLIGHT_SKELETON))
#define UP_IS_EXPORTED_KBD_BACKLIGHT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), UP_TYPE_EXPORTED_KBD_BACKLIGHT_SKELETON))
typedef struct _UpExportedKbdBacklightSkeleton UpExportedKbdBacklightSkeleton;
typedef struct _UpExportedKbdBacklightSkeletonClass UpExportedKbdBacklightSkeletonClass;
typedef struct _UpExportedKbdBacklightSkeletonPrivate UpExportedKbdBacklightSkeletonPrivate;
struct _UpExportedKbdBacklightSkeleton
{
/*< private >*/
GDBusInterfaceSkeleton parent_instance;
UpExportedKbdBacklightSkeletonPrivate *priv;
};
struct _UpExportedKbdBacklightSkeletonClass
{
GDBusInterfaceSkeletonClass parent_class;
};
GType up_exported_kbd_backlight_skeleton_get_type (void) G_GNUC_CONST;
UpExportedKbdBacklight *up_exported_kbd_backlight_skeleton_new (void);
G_END_DECLS
#endif /* __UP_KBD_BACKLIGHT_GENERATED_H__ */
......@@ -31,7 +31,6 @@ IGNORE_HFILES= \
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
AM_CPPFLAGS = \
$(DBUS_GLIB_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/libupower-glib \
-I$(top_builddir)/libupower-glib \
......@@ -43,7 +42,6 @@ UPOWER_GLIB_LIBS = \
GTKDOC_LIBS = \
$(UPOWER_GLIB_LIBS) \
$(DBUS_GLIB_LIBS) \
$(NULL)
# Extra options to supply to gtkdoc-mkdb
......
......@@ -212,10 +212,6 @@ CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_LIBS = @DBUS_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
......@@ -421,7 +417,6 @@ IGNORE_HFILES = \
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
AM_CPPFLAGS = \
$(DBUS_GLIB_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/libupower-glib \
-I$(top_builddir)/libupower-glib \
......@@ -433,7 +428,6 @@ UPOWER_GLIB_LIBS = \
GTKDOC_LIBS = \
$(UPOWER_GLIB_LIBS) \
$(DBUS_GLIB_LIBS) \
$(NULL)
......@@ -492,6 +486,7 @@ DISTCLEANFILES = \
@ENABLE_GTK_DOC_TRUE@TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
@ENABLE_GTK_DOC_TRUE@SETUP_FILES = \
@ENABLE_GTK_DOC_TRUE@ $(content_files) \
@ENABLE_GTK_DOC_TRUE@ $(expand_content_files) \
@ENABLE_GTK_DOC_TRUE@ $(DOC_MAIN_SGML_FILE) \
@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-sections.txt \
@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-overrides.txt
......@@ -794,11 +789,11 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
@ENABLE_GTK_DOC_FALSE@distclean-local:
@ENABLE_GTK_DOC_FALSE@maintainer-clean-local:
@ENABLE_GTK_DOC_FALSE@uninstall-local:
@ENABLE_GTK_DOC_FALSE@clean-local:
@ENABLE_GTK_DOC_FALSE@maintainer-clean-local:
@ENABLE_GTK_DOC_FALSE@install-data-local:
@ENABLE_GTK_DOC_FALSE@distclean-local:
clean: clean-recursive
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
......@@ -903,7 +898,7 @@ uninstall-am: uninstall-local
@ENABLE_GTK_DOC_TRUE@setup-build.stamp:
@ENABLE_GTK_DOC_TRUE@ -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
@ENABLE_GTK_DOC_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
@ENABLE_GTK_DOC_TRUE@ files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
@ENABLE_GTK_DOC_TRUE@ if test "x$$files" != "x" ; then \
@ENABLE_GTK_DOC_TRUE@ for file in $$files ; do \
@ENABLE_GTK_DOC_TRUE@ destdir=`dirname $(abs_builddir)/$$file`; \
......@@ -924,7 +919,7 @@ uninstall-am: uninstall-local
@ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
@ENABLE_GTK_DOC_TRUE@ scanobj_options=""; \
@ENABLE_GTK_DOC_TRUE@ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ if test "x$(V)" = "x1"; then \
@ENABLE_GTK_DOC_TRUE@ scanobj_options="--verbose"; \
@ENABLE_GTK_DOC_TRUE@ fi; \
......@@ -952,17 +947,17 @@ uninstall-am: uninstall-local
@ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp
@ENABLE_GTK_DOC_TRUE@ @true
@ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
@ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
@ENABLE_GTK_DOC_TRUE@ mkhtml_options=""; \
@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ if test "x$(V)" = "x1"; then \
@ENABLE_GTK_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \
@ENABLE_GTK_DOC_TRUE@ fi; \
@ENABLE_GTK_DOC_TRUE@ fi; \
@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
@ENABLE_GTK_DOC_TRUE@ fi; \
@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
......@@ -978,11 +973,11 @@ uninstall-am: uninstall-local
@ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@ENABLE_GTK_DOC_TRUE@ $(AM_V_at)touch html-build.stamp
@ENABLE_GTK_DOC_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@ENABLE_GTK_DOC_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
@ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
@ENABLE_GTK_DOC_TRUE@ mkpdf_options=""; \
@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \
@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ if test "x$(V)" = "x1"; then \
@ENABLE_GTK_DOC_TRUE@ mkpdf_options="$$mkpdf_options --verbose"; \
@ENABLE_GTK_DOC_TRUE@ fi; \
......@@ -1007,12 +1002,15 @@ uninstall-am: uninstall-local
@ENABLE_GTK_DOC_TRUE@ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
@ENABLE_GTK_DOC_TRUE@ rm -f $(DOC_MODULE).types; \
@ENABLE_GTK_DOC_TRUE@ fi
@ENABLE_GTK_DOC_TRUE@ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
@ENABLE_GTK_DOC_TRUE@ rm -f $(DOC_MODULE)-sections.txt; \
@ENABLE_GTK_DOC_TRUE@ fi
@ENABLE_GTK_DOC_TRUE@distclean-local:
@ENABLE_GTK_DOC_TRUE@ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
@ENABLE_GTK_DOC_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
@ENABLE_GTK_DOC_TRUE@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
@ENABLE_GTK_DOC_TRUE@ rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
@ENABLE_GTK_DOC_TRUE@ fi
@ENABLE_GTK_DOC_TRUE@maintainer-clean-local:
......
......@@ -31,71 +31,6 @@ UpClientPrivate
up_client_get_type
</SECTION>
<SECTION>
<FILE>up-client-glue</FILE>
<TITLE>UpClientGlueSkeleton</TITLE>
up_client_glue_interface_info
up_client_glue_override_properties
up_client_glue_complete_enumerate_devices
up_client_glue_complete_get_display_device
up_client_glue_complete_get_critical_action
up_client_glue_emit_device_added
up_client_glue_emit_device_removed
up_client_glue_call_enumerate_devices
up_client_glue_call_enumerate_devices_finish
up_client_glue_call_enumerate_devices_sync
up_client_glue_call_get_display_device
up_client_glue_call_get_display_device_finish
up_client_glue_call_get_display_device_sync
up_client_glue_call_get_critical_action
up_client_glue_call_get_critical_action_finish
up_client_glue_call_get_critical_action_sync
up_client_glue_get_daemon_version
up_client_glue_dup_daemon_version
up_client_glue_set_daemon_version
up_client_glue_get_on_battery
up_client_glue_set_on_battery
up_client_glue_get_lid_is_closed
up_client_glue_set_lid_is_closed
up_client_glue_get_lid_is_present
up_client_glue_set_lid_is_present
up_client_glue_proxy_new
up_client_glue_proxy_new_finish
up_client_glue_proxy_new_sync
up_client_glue_proxy_new_for_bus
up_client_glue_proxy_new_for_bus_finish
up_client_glue_proxy_new_for_bus_sync
up_client_glue_skeleton_new
<SUBSECTION Standard>
UP_CLIENT_GLUE
UP_CLIENT_GLUE_GET_IFACE
UP_CLIENT_GLUE_PROXY
UP_CLIENT_GLUE_PROXY_CLASS
UP_CLIENT_GLUE_PROXY_GET_CLASS
UP_CLIENT_GLUE_SKELETON
UP_CLIENT_GLUE_SKELETON_CLASS
UP_CLIENT_GLUE_SKELETON_GET_CLASS
UP_IS_CLIENT_GLUE
UP_IS_CLIENT_GLUE_PROXY
UP_IS_CLIENT_GLUE_PROXY_CLASS
UP_IS_CLIENT_GLUE_SKELETON
UP_IS_CLIENT_GLUE_SKELETON_CLASS
UP_TYPE_CLIENT_GLUE
UP_TYPE_CLIENT_GLUE_PROXY
UP_TYPE_CLIENT_GLUE_SKELETON
UpClientGlue
UpClientGlueIface
UpClientGlueProxy
UpClientGlueProxyClass
UpClientGlueProxyPrivate
UpClientGlueSkeleton
UpClientGlueSkeletonClass
UpClientGlueSkeletonPrivate
up_client_glue_get_type
up_client_glue_proxy_get_type
up_client_glue_skeleton_get_type
</SECTION>
<SECTION>
<FILE>up-device</FILE>
UP_DEVICE_ERROR
......@@ -126,121 +61,6 @@ UpDevicePrivate
up_device_get_type
</SECTION>
<SECTION>
<FILE>up-device-glue</FILE>
<TITLE>UpDeviceGlueSkeleton</TITLE>
up_device_glue_interface_info
up_device_glue_override_properties
up_device_glue_complete_refresh
up_device_glue_complete_get_history
up_device_glue_complete_get_statistics
up_device_glue_call_refresh
up_device_glue_call_refresh_finish
up_device_glue_call_refresh_sync
up_device_glue_call_get_history
up_device_glue_call_get_history_finish
up_device_glue_call_get_history_sync
up_device_glue_call_get_statistics
up_device_glue_call_get_statistics_finish
up_device_glue_call_get_statistics_sync
up_device_glue_get_native_path
up_device_glue_dup_native_path
up_device_glue_set_native_path
up_device_glue_get_vendor
up_device_glue_dup_vendor
up_device_glue_set_vendor
up_device_glue_get_model
up_device_glue_dup_model
up_device_glue_set_model
up_device_glue_get_serial
up_device_glue_dup_serial
up_device_glue_set_serial
up_device_glue_get_update_time
up_device_glue_set_update_time
up_device_glue_get_type_
up_device_glue_set_type_
up_device_glue_get_power_supply
up_device_glue_set_power_supply
up_device_glue_get_has_history
up_device_glue_set_has_history
up_device_glue_get_has_statistics
up_device_glue_set_has_statistics
up_device_glue_get_online
up_device_glue_set_online
up_device_glue_get_energy
up_device_glue_set_energy
up_device_glue_get_energy_empty
up_device_glue_set_energy_empty
up_device_glue_get_energy_full
up_device_glue_set_energy_full
up_device_glue_get_energy_full_design
up_device_glue_set_energy_full_design
up_device_glue_get_energy_rate
up_device_glue_set_energy_rate
up_device_glue_get_voltage
up_device_glue_set_voltage
up_device_glue_get_luminosity
up_device_glue_set_luminosity
up_device_glue_get_time_to_empty
up_device_glue_set_time_to_empty
up_device_glue_get_time_to_full
up_device_glue_set_time_to_full
up_device_glue_get_percentage
up_device_glue_set_percentage
up_device_glue_get_temperature
up_device_glue_set_temperature
up_device_glue_get_is_present
up_device_glue_set_is_present