diff options
author | Richard Hughes <richard@hughsie.com> | 2010-01-18 12:26:55 +0000 |
---|---|---|
committer | Richard Hughes <richard@hughsie.com> | 2010-01-18 12:26:55 +0000 |
commit | 15ac5102c8abcbeac6e8da007056e493d4fef1e6 (patch) | |
tree | 644ce3fecec5540cb608ad2e22175adbd3404a0a | |
parent | 7be60e43e298a922576cafc47c89c11929c06da9 (diff) | |
download | upower-15ac5102c8abcbeac6e8da007056e493d4fef1e6.tar.gz |
trivial: Rename a lot of the source files from dkp-foo to up-foo, no API or ABI changes
-rw-r--r-- | devkit-power-gobject/.gitignore | 2 | ||||
-rw-r--r-- | devkit-power-gobject/Makefile.am | 8 | ||||
l--------- | devkit-power-gobject/up-client.h | 1 | ||||
l--------- | devkit-power-gobject/up-device.h | 1 | ||||
l--------- | devkit-power-gobject/up-enum.h | 1 | ||||
l--------- | devkit-power-gobject/up-history-obj.h | 1 | ||||
l--------- | devkit-power-gobject/up-qos-obj.h | 1 | ||||
l--------- | devkit-power-gobject/up-stats-obj.h | 1 | ||||
l--------- | devkit-power-gobject/up-wakeups-obj.h | 1 | ||||
l--------- | devkit-power-gobject/up-wakeups.h | 1 | ||||
-rw-r--r-- | po/POTFILES.in | 4 | ||||
-rw-r--r-- | src/Makefile.am | 119 | ||||
-rw-r--r-- | src/dummy/Makefile.am | 4 | ||||
-rw-r--r-- | src/dummy/up-backend.c (renamed from src/dummy/dkp-backend.c) | 8 | ||||
-rw-r--r-- | src/dummy/up-native.c (renamed from src/dummy/dkp-native.c) | 2 | ||||
-rw-r--r-- | src/freebsd/Makefile.am | 24 | ||||
-rw-r--r-- | src/freebsd/up-acpi-native.c (renamed from src/freebsd/dkp-acpi-native.c) | 0 | ||||
-rw-r--r-- | src/freebsd/up-acpi-native.h (renamed from src/freebsd/dkp-acpi-native.h) | 0 | ||||
-rw-r--r-- | src/freebsd/up-acpi-native.vala (renamed from src/freebsd/dkp-acpi-native.vala) | 0 | ||||
-rw-r--r-- | src/freebsd/up-backend-acpi.h (renamed from src/freebsd/dkp-backend-acpi.h) | 2 | ||||
-rw-r--r-- | src/freebsd/up-backend.c (renamed from src/freebsd/dkp-backend.c) | 18 | ||||
-rw-r--r-- | src/freebsd/up-devd.c (renamed from src/freebsd/dkp-devd.c) | 6 | ||||
-rw-r--r-- | src/freebsd/up-devd.h (renamed from src/freebsd/dkp-devd.h) | 2 | ||||
-rw-r--r-- | src/freebsd/up-device-supply.c (renamed from src/freebsd/dkp-device-supply.c) | 8 | ||||
-rw-r--r-- | src/freebsd/up-device-supply.h (renamed from src/freebsd/dkp-device-supply.h) | 2 | ||||
-rw-r--r-- | src/freebsd/up-native.c (renamed from src/freebsd/dkp-native.c) | 4 | ||||
-rw-r--r-- | src/freebsd/up-util.c (renamed from src/freebsd/dkp-util.c) | 2 | ||||
-rw-r--r-- | src/freebsd/up-util.h (renamed from src/freebsd/dkp-util.h) | 0 | ||||
-rw-r--r-- | src/linux/Makefile.am | 24 | ||||
-rw-r--r-- | src/linux/up-backend.c (renamed from src/linux/dkp-backend.c) | 20 | ||||
-rw-r--r-- | src/linux/up-device-csr.c (renamed from src/linux/dkp-device-csr.c) | 4 | ||||
-rw-r--r-- | src/linux/up-device-csr.h (renamed from src/linux/dkp-device-csr.h) | 2 | ||||
-rw-r--r-- | src/linux/up-device-hid.c (renamed from src/linux/dkp-device-hid.c) | 4 | ||||
-rw-r--r-- | src/linux/up-device-hid.h (renamed from src/linux/dkp-device-hid.h) | 2 | ||||
-rw-r--r-- | src/linux/up-device-supply.c (renamed from src/linux/dkp-device-supply.c) | 4 | ||||
-rw-r--r-- | src/linux/up-device-supply.h (renamed from src/linux/dkp-device-supply.h) | 2 | ||||
-rw-r--r-- | src/linux/up-device-wup.c (renamed from src/linux/dkp-device-wup.c) | 4 | ||||
-rw-r--r-- | src/linux/up-device-wup.h (renamed from src/linux/dkp-device-wup.h) | 2 | ||||
-rw-r--r-- | src/linux/up-input.c (renamed from src/linux/dkp-input.c) | 8 | ||||
-rw-r--r-- | src/linux/up-input.h (renamed from src/linux/dkp-input.h) | 2 | ||||
-rw-r--r-- | src/linux/up-native.c (renamed from src/linux/dkp-native.c) | 2 | ||||
-rw-r--r-- | src/up-backend.h (renamed from src/dkp-backend.h) | 4 | ||||
-rw-r--r-- | src/up-daemon.c (renamed from src/dkp-daemon.c) | 16 | ||||
-rw-r--r-- | src/up-daemon.h (renamed from src/dkp-daemon.h) | 4 | ||||
-rw-r--r-- | src/up-device-list.c (renamed from src/dkp-device-list.c) | 4 | ||||
-rw-r--r-- | src/up-device-list.h (renamed from src/dkp-device-list.h) | 0 | ||||
-rw-r--r-- | src/up-device.c (renamed from src/dkp-device.c) | 14 | ||||
-rw-r--r-- | src/up-device.h (renamed from src/dkp-device.h) | 2 | ||||
-rw-r--r-- | src/up-history.c (renamed from src/dkp-history.c) | 6 | ||||
-rw-r--r-- | src/up-history.h (renamed from src/dkp-history.h) | 0 | ||||
-rw-r--r-- | src/up-main.c (renamed from src/dkp-main.c) | 6 | ||||
-rw-r--r-- | src/up-marshal.list (renamed from src/dkp-marshal.list) | 0 | ||||
-rw-r--r-- | src/up-native.h (renamed from src/dkp-native.h) | 0 | ||||
-rw-r--r-- | src/up-polkit.c (renamed from src/dkp-polkit.c) | 4 | ||||
-rw-r--r-- | src/up-polkit.h (renamed from src/dkp-polkit.h) | 0 | ||||
-rw-r--r-- | src/up-qos.c (renamed from src/dkp-qos.c) | 12 | ||||
-rw-r--r-- | src/up-qos.h (renamed from src/dkp-qos.h) | 0 | ||||
-rw-r--r-- | src/up-self-test.c (renamed from src/dkp-self-test.c) | 18 | ||||
-rw-r--r-- | src/up-wakeups.c (renamed from src/dkp-wakeups.c) | 10 | ||||
-rw-r--r-- | src/up-wakeups.h (renamed from src/dkp-wakeups.h) | 0 | ||||
-rw-r--r-- | tools/Makefile.am | 16 | ||||
-rw-r--r-- | tools/up-tool.c (renamed from tools/dkp-tool.c) | 8 |
62 files changed, 223 insertions, 204 deletions
diff --git a/devkit-power-gobject/.gitignore b/devkit-power-gobject/.gitignore index 2455079..8eb6524 100644 --- a/devkit-power-gobject/.gitignore +++ b/devkit-power-gobject/.gitignore @@ -9,4 +9,6 @@ *.gcda *.gcno dkp-version.h +*.gir +*.typelib diff --git a/devkit-power-gobject/Makefile.am b/devkit-power-gobject/Makefile.am index 52492b2..ecb57d8 100644 --- a/devkit-power-gobject/Makefile.am +++ b/devkit-power-gobject/Makefile.am @@ -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) diff --git a/devkit-power-gobject/up-client.h b/devkit-power-gobject/up-client.h new file mode 120000 index 0000000..92b51d0 --- /dev/null +++ b/devkit-power-gobject/up-client.h @@ -0,0 +1 @@ +dkp-client.h
\ No newline at end of file diff --git a/devkit-power-gobject/up-device.h b/devkit-power-gobject/up-device.h new file mode 120000 index 0000000..3234769 --- /dev/null +++ b/devkit-power-gobject/up-device.h @@ -0,0 +1 @@ +dkp-device.h
\ No newline at end of file diff --git a/devkit-power-gobject/up-enum.h b/devkit-power-gobject/up-enum.h new file mode 120000 index 0000000..7732128 --- /dev/null +++ b/devkit-power-gobject/up-enum.h @@ -0,0 +1 @@ +dkp-enum.h
\ No newline at end of file diff --git a/devkit-power-gobject/up-history-obj.h b/devkit-power-gobject/up-history-obj.h new file mode 120000 index 0000000..b686e24 --- /dev/null +++ b/devkit-power-gobject/up-history-obj.h @@ -0,0 +1 @@ +dkp-history-obj.h
\ No newline at end of file diff --git a/devkit-power-gobject/up-qos-obj.h b/devkit-power-gobject/up-qos-obj.h new file mode 120000 index 0000000..d44eeaf --- /dev/null +++ b/devkit-power-gobject/up-qos-obj.h @@ -0,0 +1 @@ +dkp-qos-obj.h
\ No newline at end of file diff --git a/devkit-power-gobject/up-stats-obj.h b/devkit-power-gobject/up-stats-obj.h new file mode 120000 index 0000000..1b8d1fb --- /dev/null +++ b/devkit-power-gobject/up-stats-obj.h @@ -0,0 +1 @@ +dkp-stats-obj.h
\ No newline at end of file diff --git a/devkit-power-gobject/up-wakeups-obj.h b/devkit-power-gobject/up-wakeups-obj.h new file mode 120000 index 0000000..82532de --- /dev/null +++ b/devkit-power-gobject/up-wakeups-obj.h @@ -0,0 +1 @@ +dkp-wakeups-obj.h
\ No newline at end of file diff --git a/devkit-power-gobject/up-wakeups.h b/devkit-power-gobject/up-wakeups.h new file mode 120000 index 0000000..66a8fcb --- /dev/null +++ b/devkit-power-gobject/up-wakeups.h @@ -0,0 +1 @@ +dkp-wakeups.h
\ No newline at end of file diff --git a/po/POTFILES.in b/po/POTFILES.in index 72595a1..82b5b87 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index 2c4caae..535af27 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 - -dkp-marshal.h: dkp-marshal.list + up-daemon-glue.h \ + up-device-glue.h \ + up-qos-glue.h \ + up-wakeups-glue.h \ + up-marshal.h \ + up-marshal.c + +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) diff --git a/src/dummy/Makefile.am b/src/dummy/Makefile.am index 25afad6..9799cdf 100644 --- a/src/dummy/Makefile.am +++ b/src/dummy/Makefile.am @@ -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 : diff --git a/src/dummy/dkp-backend.c b/src/dummy/up-backend.c index 06d4890..80a0975 100644 --- a/src/dummy/dkp-backend.c +++ b/src/dummy/up-backend.c @@ -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); diff --git a/src/dummy/dkp-native.c b/src/dummy/up-native.c index 4388a41..15c4fad 100644 --- a/src/dummy/dkp-native.c +++ b/src/dummy/up-native.c @@ -20,7 +20,7 @@ #include <glib.h> -#include "dkp-native.h" +#include "up-native.h" /** * dkp_native_get_native_path: diff --git a/src/freebsd/Makefile.am b/src/freebsd/Makefile.am index 32016bb..abf2bd4 100644 --- a/src/freebsd/Makefile.am +++ b/src/freebsd/Makefile.am @@ -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 : diff --git a/src/freebsd/dkp-acpi-native.c b/src/freebsd/up-acpi-native.c index c6b4968..c6b4968 100644 --- a/src/freebsd/dkp-acpi-native.c +++ b/src/freebsd/up-acpi-native.c diff --git a/src/freebsd/dkp-acpi-native.h b/src/freebsd/up-acpi-native.h index 987e330..987e330 100644 --- a/src/freebsd/dkp-acpi-native.h +++ b/src/freebsd/up-acpi-native.h diff --git a/src/freebsd/dkp-acpi-native.vala b/src/freebsd/up-acpi-native.vala index 7710798..7710798 100644 --- a/src/freebsd/dkp-acpi-native.vala +++ b/src/freebsd/up-acpi-native.vala diff --git a/src/freebsd/dkp-backend-acpi.h b/src/freebsd/up-backend-acpi.h index 44efe91..8058169 100644 --- a/src/freebsd/dkp-backend-acpi.h +++ b/src/freebsd/up-backend-acpi.h @@ -25,7 +25,7 @@ #include "config.h" -#include "dkp-devd.h" +#include "up-devd.h" extern DkpDevdHandler dkp_backend_acpi_devd_handler; diff --git a/src/freebsd/dkp-backend.c b/src/freebsd/up-backend.c index 5aa8e9f..d44c9ab 100644 --- a/src/freebsd/dkp-backend.c +++ b/src/freebsd/up-backend.c @@ -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" diff --git a/src/freebsd/dkp-devd.c b/src/freebsd/up-devd.c index 1559d27..db885aa 100644 --- a/src/freebsd/dkp-devd.c +++ b/src/freebsd/up-devd.c @@ -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" diff --git a/src/freebsd/dkp-devd.h b/src/freebsd/up-devd.h index 79ebf6c..688b024 100644 --- a/src/freebsd/dkp-devd.h +++ b/src/freebsd/up-devd.h @@ -25,7 +25,7 @@ #include "config.h" -#include "dkp-backend.h" +#include "up-backend.h" #include <glib.h> diff --git a/src/freebsd/dkp-device-supply.c b/src/freebsd/up-device-supply.c index 44ad64e..69eb092 100644 --- a/src/freebsd/dkp-device-supply.c +++ b/src/freebsd/up-device-supply.c @@ -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" diff --git a/src/freebsd/dkp-device-supply.h b/src/freebsd/up-device-supply.h index b767eac..e1b042f 100644 --- a/src/freebsd/dkp-device-supply.h +++ b/src/freebsd/up-device-supply.h @@ -23,7 +23,7 @@ #define __DKP_DEVICE_SUPPLY_H__ #include <glib-object.h> -#include "dkp-device.h" +#include "up-device.h" G_BEGIN_DECLS diff --git a/src/freebsd/dkp-native.c b/src/freebsd/up-native.c index 944111a..caa1fbd 100644 --- a/src/freebsd/dkp-native.c +++ b/src/freebsd/up-native.c @@ -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: diff --git a/src/freebsd/dkp-util.c b/src/freebsd/up-util.c index a452f50..e1f3a6b 100644 --- a/src/freebsd/dkp-util.c +++ b/src/freebsd/up-util.c @@ -31,7 +31,7 @@ #include "egg-debug.h" -#include "dkp-util.h" +#include "up-util.h" gboolean dkp_has_sysctl (const gchar *format, ...) diff --git a/src/freebsd/dkp-util.h b/src/freebsd/up-util.h index 24385d8..24385d8 100644 --- a/src/freebsd/dkp-util.h +++ b/src/freebsd/up-util.h diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am index 039cccb..da74584 100644 --- a/src/linux/Makefile.am +++ b/src/linux/Makefile.am @@ -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) diff --git a/src/linux/dkp-backend.c b/src/linux/up-backend.c index a14ca9a..22fbaa3 100644 --- a/src/linux/dkp-backend.c +++ b/src/linux/up-backend.c @@ -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 "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-backend.h" +#include "up-daemon.h" +#include "up-marshal.h" +#include "up-device.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); diff --git a/src/linux/dkp-device-csr.c b/src/linux/up-device-csr.c index 69582c8..2c67174 100644 --- a/src/linux/dkp-device-csr.c +++ b/src/linux/up-device-csr.c @@ -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 diff --git a/src/linux/dkp-device-csr.h b/src/linux/up-device-csr.h index 04e101b..d605853 100644 --- a/src/linux/dkp-device-csr.h +++ b/src/linux/up-device-csr.h @@ -23,7 +23,7 @@ #define __DKP_DEVICE_CSR_H__ #include <glib-object.h> -#include "dkp-device.h" +#include "up-device.h" G_BEGIN_DECLS diff --git a/src/linux/dkp-device-hid.c b/src/linux/up-device-hid.c index c258fef..7e88d0c 100644 --- a/src/linux/dkp-device-hid.c +++ b/src/linux/up-device-hid.c @@ -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 diff --git a/src/linux/dkp-device-hid.h b/src/linux/up-device-hid.h index 8607331..7736c94 100644 --- a/src/linux/dkp-device-hid.h +++ b/src/linux/up-device-hid.h @@ -22,7 +22,7 @@ #define __DKP_DEVICE_HID_H__ #include <glib-object.h> -#include "dkp-device.h" +#include "up-device.h" G_BEGIN_DECLS diff --git a/src/linux/dkp-device-supply.c b/src/linux/up-device-supply.c index c562088..c7ca2e1 100644 --- a/src/linux/dkp-device-supply.c +++ b/src/linux/up-device-supply.c @@ -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 */ diff --git a/src/linux/dkp-device-supply.h b/src/linux/up-device-supply.h index b767eac..e1b042f 100644 --- a/src/linux/dkp-device-supply.h +++ b/src/linux/up-device-supply.h @@ -23,7 +23,7 @@ #define __DKP_DEVICE_SUPPLY_H__ #include <glib-object.h> -#include "dkp-device.h" +#include "up-device.h" G_BEGIN_DECLS diff --git a/src/linux/dkp-device-wup.c b/src/linux/up-device-wup.c index df34fa0..8fc3296 100644 --- a/src/linux/dkp-device-wup.c +++ b/src/linux/up-device-wup.c @@ -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 diff --git a/src/linux/dkp-device-wup.h b/src/linux/up-device-wup.h index 02eaa4b..9d39360 100644 --- a/src/linux/dkp-device-wup.h +++ b/src/linux/up-device-wup.h @@ -22,7 +22,7 @@ #define __DKP_DEVICE_WUP_H__ #include <glib-object.h> -#include "dkp-device.h" +#include "up-device.h" G_BEGIN_DECLS diff --git a/src/linux/dkp-input.c b/src/linux/up-input.c index e213033..78194d6 100644 --- a/src/linux/dkp-input.c +++ b/src/linux/up-input.c @@ -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 { diff --git a/src/linux/dkp-input.h b/src/linux/up-input.h index bae5005..c064d8f 100644 --- a/src/linux/dkp-input.h +++ b/src/linux/up-input.h @@ -23,7 +23,7 @@ #include <glib-object.h> -#include "dkp-daemon.h" +#include "up-daemon.h" G_BEGIN_DECLS diff --git a/src/linux/dkp-native.c b/src/linux/up-native.c index f41b972..7419889 100644 --- a/src/linux/dkp-native.c +++ b/src/linux/up-native.c @@ -21,7 +21,7 @@ #include <glib.h> #include <gudev/gudev.h> -#include "dkp-native.h" +#include "up-native.h" /** * dkp_native_get_native_path: diff --git a/src/dkp-backend.h b/src/up-backend.h index c03bac9..8c92835 100644 --- a/src/dkp-backend.h +++ b/src/up-backend.h @@ -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 diff --git a/src/dkp-daemon.c b/src/up-daemon.c index 47d84d5..bd9a2e7 100644 --- a/src/dkp-daemon.c +++ b/src/up-daemon.c @@ -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 "dkp-daemon-glue.h" -#include "dkp-marshal.h" +#include "up-polkit.h" +#include "up-device-list.h" +#include "up-device.h" +#include "up-backend.h" +#include "up-daemon.h" + +#include "up-daemon-glue.h" +#include "up-marshal.h" enum { diff --git a/src/dkp-daemon.h b/src/up-daemon.h index 0e70194..3452a0c 100644 --- a/src/dkp-daemon.h +++ b/src/up-daemon.h @@ -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 diff --git a/src/dkp-device-list.c b/src/up-device-list.c index 74956f5..beecbc4 100644 --- a/src/dkp-device-list.c +++ b/src/up-device-list.c @@ -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); diff --git a/src/dkp-device-list.h b/src/up-device-list.h index aac2a6c..aac2a6c 100644 --- a/src/dkp-device-list.h +++ b/src/up-device-list.h diff --git a/src/dkp-device.c b/src/up-device.c index 563dac9..2a5d0d6 100644 --- a/src/dkp-device.c +++ b/src/up-device.c @@ -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 { diff --git a/src/dkp-device.h b/src/up-device.h index 1688fa5..9509417 100644 --- a/src/dkp-device.h +++ b/src/up-device.h @@ -26,7 +26,7 @@ #include <polkit/polkit.h> #include <dbus/dbus-glib.h> -#include "dkp-daemon.h" +#include "up-daemon.h" G_BEGIN_DECLS diff --git a/src/dkp-history.c b/src/up-history.c index b851642..6f2581a 100644 --- a/src/dkp-history.c +++ b/src/up-history.c @@ -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); diff --git a/src/dkp-history.h b/src/up-history.h index afabaca..afabaca 100644 --- a/src/dkp-history.h +++ b/src/up-history.h diff --git a/src/dkp-main.c b/src/up-main.c index 7117509..b3a9f12 100644 --- a/src/dkp-main.c +++ b/src/up-main.c @@ -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; diff --git a/src/dkp-marshal.list b/src/up-marshal.list index 86ba607..86ba607 100644 --- a/src/dkp-marshal.list +++ b/src/up-marshal.list diff --git a/src/dkp-native.h b/src/up-native.h index ea729e9..ea729e9 100644 --- a/src/dkp-native.h +++ b/src/up-native.h diff --git a/src/dkp-polkit.c b/src/up-polkit.c index 4245d95..f2282a1 100644 --- a/src/dkp-polkit.c +++ b/src/up-polkit.c @@ -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)) diff --git a/src/dkp-polkit.h b/src/up-polkit.h index e628890..e628890 100644 --- a/src/dkp-polkit.h +++ b/src/up-polkit.h diff --git a/src/dkp-qos.c b/src/up-qos.c index a9ea985..271f79e 100644 --- a/src/dkp-qos.c +++ b/src/up-qos.c @@ -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); diff --git a/src/dkp-qos.h b/src/up-qos.h index 68f4251..68f4251 100644 --- a/src/dkp-qos.h +++ b/src/up-qos.h diff --git a/src/dkp-self-test.c b/src/up-self-test.c index bcbb7b2..efa09cf 100644 --- a/src/dkp-self-test.c +++ b/src/up-self-test.c @@ -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) diff --git a/src/dkp-wakeups.c b/src/up-wakeups.c index eb50a9c..8f88cef 100644 --- a/src/dkp-wakeups.c +++ b/src/up-wakeups.c @@ -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); diff --git a/src/dkp-wakeups.h b/src/up-wakeups.h index d66aacd..d66aacd 100644 --- a/src/dkp-wakeups.h +++ b/src/up-wakeups.h diff --git a/tools/Makefile.am b/tools/Makefile.am index e21a9a6..38335e9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -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 = \ diff --git a/tools/dkp-tool.c b/tools/up-tool.c index a2d700c..92d930d 100644 --- a/tools/dkp-tool.c +++ b/tools/up-tool.c @@ -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" |