fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-01-31 16:50:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

trivial: actually load the new module, and register on the bus

Browse source
This commit is contained in:
Richard Hughes 2009-01-30 13:04:09 +00:00
parent a239eff3bf
commit 3ca11019c0
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Makefile.am
View file

@ -27,6 +27,7 @@ BUILT_SOURCES = \
dkp-daemon-glue.h \
dkp-device-glue.h \
dkp-qos-glue.h \
dkp-wakeups-glue.h \
dkp-marshal.h \
dkp-marshal.c
@ -45,13 +46,17 @@ dkp-device-glue.h: org.freedesktop.DeviceKit.Power.Device.xml Makefile.am
dkp-qos-glue.h: org.freedesktop.DeviceKit.Power.QoS.xml Makefile.am
dbus-binding-tool --prefix=dkp_qos --mode=glib-server --output=dkp-qos-glue.h org.freedesktop.DeviceKit.Power.QoS.xml
dkp-wakeups-glue.h: org.freedesktop.DeviceKit.Power.Wakeups.xml Makefile.am
dbus-binding-tool --prefix=dkp_wakeups --mode=glib-server --output=dkp-wakeups-glue.h org.freedesktop.DeviceKit.Power.Wakeups.xml
libexec_PROGRAMS = devkit-power-daemon
dbusifdir = $(datadir)/dbus-1/interfaces
dbusif_DATA = \
org.freedesktop.DeviceKit.Power.xml \
org.freedesktop.DeviceKit.Power.Device.xml \
org.freedesktop.DeviceKit.Power.QoS.xml
org.freedesktop.DeviceKit.Power.QoS.xml \
org.freedesktop.DeviceKit.Power.Wakeups.xml
devkit_power_daemon_SOURCES = \
egg-debug.c \
@ -65,6 +70,7 @@ devkit_power_daemon_SOURCES = \
dkp-wup.h dkp-wup.c \
dkp-hid.h dkp-hid.c \
dkp-qos.h dkp-qos.c \
dkp-wakeups.h dkp-wakeups.c \
dkp-history.h dkp-history.c \
sysfs-utils.h sysfs-utils.c \
dkp-main.c \
@ -115,7 +121,8 @@ CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
org.freedesktop.DeviceKit.Power.xml \
org.freedesktop.DeviceKit.Power.Device.xml \
org.freedesktop.DeviceKit.Power.QoS.xml \
org.freedesktop.DeviceKit.Power.QoS.xml \
org.freedesktop.DeviceKit.Power.Wakeups.xml \
dkp-marshal.list \
95-devkit-power-csr.rules \
95-devkit-power-hid.rules \

4
src/dkp-main.c
View file

@ -45,6 +45,7 @@
#include "dkp-daemon.h"
#include "dkp-qos.h"
#include "dkp-wakeups.h"
#define NAME_TO_CLAIM "org.freedesktop.DeviceKit.Power"
static GMainLoop *loop = NULL;
@ -121,6 +122,7 @@ main (int argc, char **argv)
GError *error;
DkpDaemon *daemon;
DkpQos *qos;
DkpWakeups *wakeups;
GOptionContext *context;
DBusGProxy *bus_proxy;
DBusGConnection *bus;
@ -167,6 +169,7 @@ main (int argc, char **argv)
egg_debug ("Starting devkit-power-daemon version %s", PACKAGE_VERSION);
qos = dkp_qos_new ();
wakeups = dkp_wakeups_new ();
daemon = dkp_daemon_new ();
if (daemon == NULL)
goto out;
@ -175,6 +178,7 @@ main (int argc, char **argv)
g_main_loop_run (loop);
g_object_unref (qos);
g_object_unref (wakeups);
g_object_unref (daemon);
g_main_loop_unref (loop);
ret = 0;