fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-05-05 14:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

trivial: Rename a lot of the source files from dkp-foo to up-foo, no API or ABI changes

Browse source
This commit is contained in:
Richard Hughes 2010-01-18 12:26:55 +00:00
parent 7be60e43e2
commit 15ac5102c8
62 changed files with 220 additions and 201 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devkit-power-gobject/.gitignore vendored
View file

@ -9,4 +9,6 @@
*.gcda
*.gcno
dkp-version.h
*.gir
*.typelib

8
devkit-power-gobject/Makefile.am
View file

@ -65,6 +65,14 @@ libdevkit_power_gobject_la_CFLAGS = \
$(NULL)
EXTRA_DIST = \
up-client.h \
up-device.h \
up-enum.h \
up-history-obj.h \
up-qos-obj.h \
up-stats-obj.h \
up-wakeups-obj.h \
up-wakeups.h \
dkp-version.h.in
CLEANFILES = $(BUILT_SOURCES)

1
devkit-power-gobject/up-client.h Symbolic link
View file

@ -0,0 +1 @@
dkp-client.h

1
devkit-power-gobject/up-device.h Symbolic link
View file

@ -0,0 +1 @@
dkp-device.h

1
devkit-power-gobject/up-enum.h Symbolic link
View file

@ -0,0 +1 @@
dkp-enum.h

1
devkit-power-gobject/up-history-obj.h Symbolic link
View file

@ -0,0 +1 @@
dkp-history-obj.h

1
devkit-power-gobject/up-qos-obj.h Symbolic link
View file

@ -0,0 +1 @@
dkp-qos-obj.h

1
devkit-power-gobject/up-stats-obj.h Symbolic link
View file

@ -0,0 +1 @@
dkp-stats-obj.h

1
devkit-power-gobject/up-wakeups-obj.h Symbolic link
View file

@ -0,0 +1 @@
dkp-wakeups-obj.h

1
devkit-power-gobject/up-wakeups.h Symbolic link
View file

@ -0,0 +1 @@
dkp-wakeups.h

4
po/POTFILES.in
View file

@ -3,7 +3,7 @@
[encoding: UTF-8]
policy/org.freedesktop.devicekit.power.policy.in
policy/org.freedesktop.devicekit.power.qos.policy.in
src/dkp-main.c
tools/dkp-tool.c
src/up-main.c
tools/up-tool.c
src/egg-debug.c

117
src/Makefile.am
View file

@ -19,6 +19,7 @@ INCLUDES = \
-DEGG_VERBOSE="\"DKP_VERBOSE\"" \
-DEGG_LOGGING="\"DKP_LOGGING\"" \
-DEGG_CONSOLE="\"DKP_CONSOLE\"" \
-I$(top_srcdir)/libupower-glib \
-I$(top_srcdir)/devkit-power-gobject \
-I$(top_srcdir) \
$(GIO_CFLAGS) \
@ -30,30 +31,30 @@ INCLUDES = \
DEVKIT_POWER_LIBS = $(top_builddir)/devkit-power-gobject/libdevkit-power-gobject.la
BUILT_SOURCES = \
dkp-daemon-glue.h \
dkp-device-glue.h \
dkp-qos-glue.h \
dkp-wakeups-glue.h \
dkp-marshal.h \
dkp-marshal.c
up-daemon-glue.h \
up-device-glue.h \
up-qos-glue.h \
up-wakeups-glue.h \
up-marshal.h \
up-marshal.c
dkp-marshal.h: dkp-marshal.list
up-marshal.h: up-marshal.list
glib-genmarshal $< --prefix=dkp_marshal --header > $@
dkp-marshal.c: dkp-marshal.list
echo "#include \"dkp-marshal.h\"" > $@ && glib-genmarshal $< --prefix=dkp_marshal --body >> $@
up-marshal.c: up-marshal.list
echo "#include \"up-marshal.h\"" > $@ && glib-genmarshal $< --prefix=dkp_marshal --body >> $@
dkp-daemon-glue.h: org.freedesktop.DeviceKit.Power.xml Makefile.am
dbus-binding-tool --prefix=dkp_daemon --mode=glib-server --output=dkp-daemon-glue.h org.freedesktop.DeviceKit.Power.xml
up-daemon-glue.h: org.freedesktop.DeviceKit.Power.xml Makefile.am
dbus-binding-tool --prefix=dkp_daemon --mode=glib-server --output=up-daemon-glue.h org.freedesktop.DeviceKit.Power.xml
dkp-device-glue.h: org.freedesktop.DeviceKit.Power.Device.xml Makefile.am
dbus-binding-tool --prefix=dkp_device --mode=glib-server --output=dkp-device-glue.h org.freedesktop.DeviceKit.Power.Device.xml
up-device-glue.h: org.freedesktop.DeviceKit.Power.Device.xml Makefile.am
dbus-binding-tool --prefix=dkp_device --mode=glib-server --output=up-device-glue.h org.freedesktop.DeviceKit.Power.Device.xml
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
up-qos-glue.h: org.freedesktop.DeviceKit.Power.QoS.xml Makefile.am
dbus-binding-tool --prefix=dkp_qos --mode=glib-server --output=up-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
up-wakeups-glue.h: org.freedesktop.DeviceKit.Power.Wakeups.xml Makefile.am
dbus-binding-tool --prefix=dkp_wakeups --mode=glib-server --output=up-wakeups-glue.h org.freedesktop.DeviceKit.Power.Wakeups.xml
libexec_PROGRAMS = devkit-power-daemon
@ -67,28 +68,28 @@ dbusif_DATA = \
devkit_power_daemon_SOURCES = \
egg-debug.c \
egg-debug.h \
dkp-polkit.h \
dkp-polkit.c \
dkp-daemon.h \
dkp-daemon.c \
dkp-device.h \
dkp-device.c \
dkp-device-list.h \
dkp-device-list.c \
dkp-qos.h \
dkp-qos.c \
dkp-wakeups.h \
dkp-wakeups.c \
dkp-history.h \
dkp-history.c \
dkp-backend.h \
dkp-native.h \
dkp-main.c \
up-polkit.h \
up-polkit.c \
up-daemon.h \
up-daemon.c \
up-device.h \
up-device.c \
up-device-list.h \
up-device-list.c \
up-qos.h \
up-qos.c \
up-wakeups.h \
up-wakeups.c \
up-history.h \
up-history.c \
up-backend.h \
up-native.h \
up-main.c \
$(BUILT_SOURCES)
devkit_power_daemon_CPPFLAGS = \
-I$(top_srcdir)/src \
-DG_LOG_DOMAIN=\"dkp-daemon\" \
-DG_LOG_DOMAIN=\"up-daemon\" \
$(DISABLE_DEPRECATED) \
$(AM_CPPFLAGS)
@ -123,33 +124,33 @@ devkit_power_daemon_CFLAGS = \
if EGG_BUILD_TESTS
check_PROGRAMS = \
dkp-self-test
up-self-test
dkp_self_test_SOURCES = \
up_self_test_SOURCES = \
egg-test.h \
egg-test.c \
egg-debug.c \
egg-debug.h \
dkp-self-test.c \
dkp-polkit.h \
dkp-polkit.c \
dkp-daemon.h \
dkp-daemon.c \
dkp-device.h \
dkp-device.c \
dkp-device-list.h \
dkp-device-list.c \
dkp-qos.h \
dkp-qos.c \
dkp-wakeups.h \
dkp-wakeups.c \
dkp-history.h \
dkp-history.c \
dkp-backend.h \
dkp-native.h \
up-self-test.c \
up-polkit.h \
up-polkit.c \
up-daemon.h \
up-daemon.c \
up-device.h \
up-device.c \
up-device-list.h \
up-device-list.c \
up-qos.h \
up-qos.c \
up-wakeups.h \
up-wakeups.c \
up-history.h \
up-history.c \
up-backend.h \
up-native.h \
$(BUILT_SOURCES)
dkp_self_test_LDADD = \
up_self_test_LDADD = \
-lm \
dummy/libdkpshared.la \
$(GLIB_LIBS) \
@ -158,9 +159,9 @@ dkp_self_test_LDADD = \
$(DEVKIT_POWER_LIBS) \
$(POLKIT_LIBS)
dkp_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS_C)
up_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS_C)
TESTS = dkp-self-test
TESTS = up-self-test
endif
servicedir = $(datadir)/dbus-1/system-services
@ -189,7 +190,7 @@ EXTRA_DIST = \
org.freedesktop.DeviceKit.Power.Device.xml \
org.freedesktop.DeviceKit.Power.QoS.xml \
org.freedesktop.DeviceKit.Power.Wakeups.xml \
dkp-marshal.list \
up-marshal.list \
$(service_in_files) \
$(dbusconf_in_files)

4
src/dummy/Makefile.am
View file

@ -16,8 +16,8 @@ INCLUDES = \
noinst_LTLIBRARIES = libdkpshared.la
libdkpshared_la_SOURCES = \
dkp-backend.c \
dkp-native.c \
up-backend.c \
up-native.c \
$(BUILT_SOURCES)
clean-local :

8
src/dummy/dkp-backend.c → src/dummy/up-backend.c
View file

@ -29,10 +29,10 @@
#include "egg-debug.h"
#include "dkp-backend.h"
#include "dkp-daemon.h"
#include "dkp-marshal.h"
#include "dkp-device.h"
#include "up-backend.h"
#include "up-daemon.h"
#include "up-marshal.h"
#include "up-device.h"
static void dkp_backend_class_init (DkpBackendClass *klass);
static void dkp_backend_init (DkpBackend *backend);

2
src/dummy/dkp-native.c → src/dummy/up-native.c
View file

@ -20,7 +20,7 @@
#include <glib.h>
#include "dkp-native.h"
#include "up-native.h"
/**
* dkp_native_get_native_path:

24
src/freebsd/Makefile.am
View file

@ -17,17 +17,17 @@ noinst_LTLIBRARIES = libdkpshared.la
endif
libdkpshared_la_SOURCES = \
dkp-acpi-native.c \
dkp-acpi-native.h \
dkp-backend-acpi.h \
dkp-backend.c \
dkp-devd.c \
dkp-devd.h \
dkp-device-supply.c \
dkp-device-supply.h \
dkp-native.c \
dkp-util.c \
dkp-util.h \
up-acpi-native.c \
up-acpi-native.h \
up-backend-acpi.h \
up-backend.c \
up-devd.c \
up-devd.h \
up-device-supply.c \
up-device-supply.h \
up-native.c \
up-util.c \
up-util.h \
$(BUILT_SOURCES)
libdkpshared_la_CFLAGS = \
@ -37,7 +37,7 @@ libdkpshared_la_LIBADD = \
-lkvm
EXTRA_DIST = \
dkp-acpi-native.vala \
up-acpi-native.vala \
TODO
clean-local :

0
src/freebsd/dkp-acpi-native.c → src/freebsd/up-acpi-native.c
View file

0
src/freebsd/dkp-acpi-native.h → src/freebsd/up-acpi-native.h
View file

0
src/freebsd/dkp-acpi-native.vala → src/freebsd/up-acpi-native.vala
View file

2
src/freebsd/dkp-backend-acpi.h → src/freebsd/up-backend-acpi.h
View file

@ -25,7 +25,7 @@
#include "config.h"
#include "dkp-devd.h"
#include "up-devd.h"
extern DkpDevdHandler dkp_backend_acpi_devd_handler;

18
src/freebsd/dkp-backend.c → src/freebsd/up-backend.c
View file

@ -32,18 +32,18 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
#include "dkp-acpi-native.h"
#include "dkp-backend-acpi.h"
#include "dkp-devd.h"
#include "dkp-device-supply.h"
#include "dkp-util.h"
#include "up-acpi-native.h"
#include "up-backend-acpi.h"
#include "up-devd.h"
#include "up-device-supply.h"
#include "up-util.h"
#include "egg-debug.h"
#include "dkp-backend.h"
#include "dkp-daemon.h"
#include "dkp-marshal.h"
#include "dkp-device.h"
#include "up-backend.h"
#include "up-daemon.h"
#include "up-marshal.h"
#include "up-device.h"
#define DKP_BACKEND_REFRESH_TIMEOUT 30 /* seconds */
#define DKP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"

6
src/freebsd/dkp-devd.c → src/freebsd/up-devd.c
View file

@ -32,9 +32,9 @@
#include "egg-debug.h"
#include "dkp-backend.h"
#include "dkp-backend-acpi.h"
#include "dkp-devd.h"
#include "up-backend.h"
#include "up-backend-acpi.h"
#include "up-devd.h"
#define DKP_DEVD_SOCK_PATH "/var/run/devd.pipe"

2
src/freebsd/dkp-devd.h → src/freebsd/up-devd.h
View file

@ -25,7 +25,7 @@
#include "config.h"
#include "dkp-backend.h"
#include "up-backend.h"
#include <glib.h>

8
src/freebsd/dkp-device-supply.c → src/freebsd/up-device-supply.c
View file

@ -37,13 +37,13 @@
#include <glib/gi18n-lib.h>
#include <glib-object.h>
#include "dkp-acpi-native.h"
#include "dkp-util.h"
#include "up-acpi-native.h"
#include "up-util.h"
#include "egg-debug.h"
#include "dkp-enum.h"
#include "dkp-device-supply.h"
#include "up-enum.h"
#include "up-device-supply.h"
#define DKP_ACPIDEV "/dev/acpi"

2
src/linux/dkp-device-supply.h → src/freebsd/up-device-supply.h
View file

@ -23,7 +23,7 @@
#define __DKP_DEVICE_SUPPLY_H__
#include <glib-object.h>
#include "dkp-device.h"
#include "up-device.h"
G_BEGIN_DECLS

4
src/freebsd/dkp-native.c → src/freebsd/up-native.c
View file

@ -19,9 +19,9 @@
*/
#include <glib.h>
#include "dkp-acpi-native.h"
#include "up-acpi-native.h"
#include "dkp-native.h"
#include "up-native.h"
/**
* dkp_native_get_native_path:

2
src/freebsd/dkp-util.c → src/freebsd/up-util.c
View file

@ -31,7 +31,7 @@
#include "egg-debug.h"
#include "dkp-util.h"
#include "up-util.h"
gboolean
dkp_has_sysctl (const gchar *format, ...)

0
src/freebsd/dkp-util.h → src/freebsd/up-util.h
View file

24
src/linux/Makefile.am
View file

@ -20,18 +20,18 @@ noinst_LTLIBRARIES = libdkpshared.la
endif
libdkpshared_la_SOURCES = \
dkp-device-supply.c \
dkp-device-supply.h \
dkp-device-csr.c \
dkp-device-csr.h \
dkp-device-hid.c \
dkp-device-hid.h \
dkp-device-wup.c \
dkp-device-wup.h \
dkp-input.c \
dkp-input.h \
dkp-backend.c \
dkp-native.c \
up-device-supply.c \
up-device-supply.h \
up-device-csr.c \
up-device-csr.h \
up-device-hid.c \
up-device-hid.h \
up-device-wup.c \
up-device-wup.h \
up-input.c \
up-input.h \
up-backend.c \
up-native.c \
sysfs-utils.c \
sysfs-utils.h \
$(BUILT_SOURCES)

18
src/linux/dkp-backend.c → src/linux/up-backend.c
View file

@ -30,16 +30,16 @@
#include "egg-debug.h"
#include "dkp-backend.h"
#include "dkp-daemon.h"
#include "dkp-marshal.h"
#include "dkp-device.h"
#include "up-backend.h"
#include "up-daemon.h"
#include "up-marshal.h"
#include "up-device.h"
#include "dkp-device-supply.h"
#include "dkp-device-csr.h"
#include "dkp-device-wup.h"
#include "dkp-device-hid.h"
#include "dkp-input.h"
#include "up-device-supply.h"
#include "up-device-csr.h"
#include "up-device-wup.h"
#include "up-device-hid.h"
#include "up-input.h"
static void dkp_backend_class_init (DkpBackendClass *klass);
static void dkp_backend_init (DkpBackend *backend);

4
src/linux/dkp-device-csr.c → src/linux/up-device-csr.c
View file

@ -37,8 +37,8 @@
#include "sysfs-utils.h"
#include "egg-debug.h"
#include "dkp-enum.h"
#include "dkp-device-csr.h"
#include "up-enum.h"
#include "up-device-csr.h"
#define DKP_DEVICE_CSR_REFRESH_TIMEOUT 30L

2
src/linux/dkp-device-csr.h → src/linux/up-device-csr.h
View file

@ -23,7 +23,7 @@
#define __DKP_DEVICE_CSR_H__
#include <glib-object.h>
#include "dkp-device.h"
#include "up-device.h"
G_BEGIN_DECLS

4
src/linux/dkp-device-hid.c → src/linux/up-device-hid.c
View file

@ -50,8 +50,8 @@
#include "sysfs-utils.h"
#include "egg-debug.h"
#include "dkp-enum.h"
#include "dkp-device-hid.h"
#include "up-enum.h"
#include "up-device-hid.h"
#define DKP_DEVICE_HID_REFRESH_TIMEOUT 30l

2
src/linux/dkp-device-hid.h → src/linux/up-device-hid.h
View file

@ -22,7 +22,7 @@
#define __DKP_DEVICE_HID_H__
#include <glib-object.h>
#include "dkp-device.h"
#include "up-device.h"
G_BEGIN_DECLS

4
src/linux/dkp-device-supply.c → src/linux/up-device-supply.c
View file

@ -36,8 +36,8 @@
#include "sysfs-utils.h"
#include "egg-debug.h"
#include "dkp-enum.h"
#include "dkp-device-supply.h"
#include "up-enum.h"
#include "up-device-supply.h"
#define DKP_DEVICE_SUPPLY_REFRESH_TIMEOUT 30 /* seconds */
#define DKP_DEVICE_SUPPLY_UNKNOWN_TIMEOUT 2 /* seconds */

2
src/freebsd/dkp-device-supply.h → src/linux/up-device-supply.h
View file

@ -23,7 +23,7 @@
#define __DKP_DEVICE_SUPPLY_H__
#include <glib-object.h>
#include "dkp-device.h"
#include "up-device.h"
G_BEGIN_DECLS

4
src/linux/dkp-device-wup.c → src/linux/up-device-wup.c
View file

@ -44,8 +44,8 @@
#include "sysfs-utils.h"
#include "egg-debug.h"
#include "dkp-enum.h"
#include "dkp-device-wup.h"
#include "up-enum.h"
#include "up-device-wup.h"
#define DKP_DEVICE_WUP_REFRESH_TIMEOUT 10 /* seconds */
#define DKP_DEVICE_WUP_RESPONSE_OFFSET_WATTS 0x0

2
src/linux/dkp-device-wup.h → src/linux/up-device-wup.h
View file

@ -22,7 +22,7 @@
#define __DKP_DEVICE_WUP_H__
#include <glib-object.h>
#include "dkp-device.h"
#include "up-device.h"
G_BEGIN_DECLS

8
src/linux/dkp-input.c → src/linux/up-input.c
View file

@ -42,10 +42,10 @@
#include "sysfs-utils.h"
#include "egg-debug.h"
#include "dkp-enum.h"
#include "dkp-daemon.h"
#include "dkp-input.h"
#include "dkp-daemon.h"
#include "up-enum.h"
#include "up-daemon.h"
#include "up-input.h"
#include "up-daemon.h"
struct DkpInputPrivate
{

2
src/linux/dkp-input.h → src/linux/up-input.h
View file

@ -23,7 +23,7 @@
#include <glib-object.h>
#include "dkp-daemon.h"
#include "up-daemon.h"
G_BEGIN_DECLS

2
src/linux/dkp-native.c → src/linux/up-native.c
View file

@ -21,7 +21,7 @@
#include <glib.h>
#include <gudev/gudev.h>
#include "dkp-native.h"
#include "up-native.h"
/**
* dkp_native_get_native_path:

4
src/dkp-backend.h → src/up-backend.h
View file

@ -25,8 +25,8 @@
#include <glib-object.h>
#include <dkp-enum.h>
#include "dkp-device.h"
#include "dkp-daemon.h"
#include "up-device.h"
#include "up-daemon.h"
G_BEGIN_DECLS

14
src/dkp-daemon.c → src/up-daemon.c
View file

@ -34,14 +34,14 @@
#include "egg-debug.h"
#include "dkp-polkit.h"
#include "dkp-device-list.h"
#include "dkp-device.h"
#include "dkp-backend.h"
#include "dkp-daemon.h"
#include "up-polkit.h"
#include "up-device-list.h"
#include "up-device.h"
#include "up-backend.h"
#include "up-daemon.h"
#include "dkp-daemon-glue.h"
#include "dkp-marshal.h"
#include "up-daemon-glue.h"
#include "up-marshal.h"
enum
{

4
src/dkp-daemon.h → src/up-daemon.h
View file

@ -25,8 +25,8 @@
#include <polkit/polkit.h>
#include <dbus/dbus-glib.h>
#include "dkp-enum.h"
#include "dkp-device-list.h"
#include "up-enum.h"
#include "up-device-list.h"
G_BEGIN_DECLS

4
src/dkp-device-list.c → src/up-device-list.c
View file

@ -27,8 +27,8 @@
#include "egg-debug.h"
#include "dkp-native.h"
#include "dkp-device-list.h"
#include "up-native.h"
#include "up-device-list.h"
static void dkp_device_list_finalize (GObject *object);

0
src/dkp-device-list.h → src/up-device-list.h
View file

14
src/dkp-device.c → src/up-device.c
View file

@ -34,13 +34,13 @@
#include "egg-debug.h"
#include "dkp-native.h"
#include "dkp-device.h"
#include "dkp-history.h"
#include "dkp-history-obj.h"
#include "dkp-stats-obj.h"
#include "dkp-marshal.h"
#include "dkp-device-glue.h"
#include "up-native.h"
#include "up-device.h"
#include "up-history.h"
#include "up-history-obj.h"
#include "up-stats-obj.h"
#include "up-marshal.h"
#include "up-device-glue.h"
struct DkpDevicePrivate
{

2
src/dkp-device.h → src/up-device.h
View file

@ -26,7 +26,7 @@
#include <polkit/polkit.h>
#include <dbus/dbus-glib.h>
#include "dkp-daemon.h"
#include "up-daemon.h"
G_BEGIN_DECLS

6
src/dkp-history.c → src/up-history.c
View file

@ -28,9 +28,9 @@
#include <gio/gio.h>
#include "egg-debug.h"
#include "dkp-history.h"
#include "dkp-stats-obj.h"
#include "dkp-history-obj.h"
#include "up-history.h"
#include "up-stats-obj.h"
#include "up-history-obj.h"
static void dkp_history_finalize (GObject *object);

0
src/dkp-history.h → src/up-history.h
View file

6
src/dkp-main.c → src/up-main.c
View file

@ -38,9 +38,9 @@
#include "egg-debug.h"
#include "dkp-daemon.h"
#include "dkp-qos.h"
#include "dkp-wakeups.h"
#include "up-daemon.h"
#include "up-qos.h"
#include "up-wakeups.h"
#define DEVKIT_POWER_SERVICE_NAME "org.freedesktop.DeviceKit.Power"
static GMainLoop *loop = NULL;

0
src/dkp-marshal.list → src/up-marshal.list
View file

0
src/dkp-native.h → src/up-native.h
View file

4
src/dkp-polkit.c → src/up-polkit.c
View file

@ -32,8 +32,8 @@
#include "egg-debug.h"
#include "dkp-polkit.h"
#include "dkp-daemon.h"
#include "up-polkit.h"
#include "up-daemon.h"
#define DKP_POLKIT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DKP_TYPE_POLKIT, DkpPolkitPrivate))

0
src/dkp-polkit.h → src/up-polkit.h
View file

12
src/dkp-qos.c → src/up-qos.c
View file

@ -34,12 +34,12 @@
#include "egg-debug.h"
#include "dkp-qos.h"
#include "dkp-marshal.h"
#include "dkp-daemon.h"
#include "dkp-polkit.h"
#include "dkp-qos-obj.h"
#include "dkp-qos-glue.h"
#include "up-qos.h"
#include "up-marshal.h"
#include "up-daemon.h"
#include "up-polkit.h"
#include "up-qos-obj.h"
#include "up-qos-glue.h"
static void dkp_qos_finalize (GObject *object);

0
src/dkp-qos.h → src/up-qos.h
View file

18
src/dkp-self-test.c → src/up-self-test.c
View file

@ -25,15 +25,15 @@
#include "egg-test.h"
#include "egg-debug.h"
#include "dkp-backend.h"
#include "dkp-daemon.h"
#include "dkp-device.h"
#include "dkp-device-list.h"
#include "dkp-history.h"
#include "dkp-native.h"
#include "dkp-polkit.h"
#include "dkp-qos.h"
#include "dkp-wakeups.h"
#include "up-backend.h"
#include "up-daemon.h"
#include "up-device.h"
#include "up-device-list.h"
#include "up-history.h"
#include "up-native.h"
#include "up-polkit.h"
#include "up-qos.h"
#include "up-wakeups.h"
int
main (int argc, char **argv)

10
src/dkp-wakeups.c → src/up-wakeups.c
View file

@ -29,11 +29,11 @@
#include "egg-debug.h"
#include "dkp-wakeups.h"
#include "dkp-daemon.h"
#include "dkp-marshal.h"
#include "dkp-wakeups-glue.h"
#include "dkp-wakeups-obj.h"
#include "up-wakeups.h"
#include "up-daemon.h"
#include "up-marshal.h"
#include "up-wakeups-glue.h"
#include "up-wakeups-obj.h"
static void dkp_wakeups_finalize (GObject *object);
static gboolean dkp_wakeups_timerstats_enable (DkpWakeups *wakeups);

0
src/dkp-wakeups.h → src/up-wakeups.h
View file

16
tools/Makefile.am
View file

@ -24,24 +24,24 @@ INCLUDES = \
DEVKIT_POWER_LIBS = $(top_builddir)/devkit-power-gobject/libdevkit-power-gobject.la
BUILT_SOURCES = \
dkp-daemon-glue.h \
dkp-marshal.h dkp-marshal.c
up-daemon-glue.h \
up-marshal.h up-marshal.c
dkp-marshal.h: $(top_srcdir)/src/dkp-marshal.list
up-marshal.h: $(top_srcdir)/src/up-marshal.list
glib-genmarshal $< --prefix=devkit_power_marshal --header > $@
dkp-marshal.c: $(top_srcdir)/src/dkp-marshal.list
echo "#include \"dkp-marshal.h\"" > $@ && glib-genmarshal $< --prefix=devkit_power_marshal --body >> $@
up-marshal.c: $(top_srcdir)/src/up-marshal.list
echo "#include \"up-marshal.h\"" > $@ && glib-genmarshal $< --prefix=devkit_power_marshal --body >> $@
dkp-daemon-glue.h: $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.xml Makefile.am
dbus-binding-tool --prefix=devkit_power_daemon --mode=glib-client --output=dkp-daemon-glue.h $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.xml
up-daemon-glue.h: $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.xml Makefile.am
dbus-binding-tool --prefix=devkit_power_daemon --mode=glib-client --output=up-daemon-glue.h $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.xml
bin_PROGRAMS = devkit-power
devkit_power_SOURCES = \
egg-debug.c \
egg-debug.h \
dkp-tool.c \
up-tool.c \
$(BUILT_SOURCES)
devkit_power_CPPFLAGS = \

8
tools/dkp-tool.c → tools/up-tool.c
View file

@ -30,10 +30,10 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
#include "dkp-marshal.h"
#include "dkp-client.h"
#include "dkp-device.h"
#include "dkp-wakeups.h"
#include "up-marshal.h"
#include "up-client.h"
#include "up-device.h"
#include "up-wakeups.h"
#include "egg-debug.h"