diff options
| author | Richard Hughes <richard@hughsie.com> | 2010-01-18 13:08:31 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2010-01-18 13:08:31 +0000 |
| commit | 13f7addd6291812032a0d42926a24909b3034b90 (patch) | |
| tree | 1a616fa125e7eaa8ff3b95c62a3dbfd73ba78203 /src | |
| parent | 2a9dff08f61002f495f3a55ace168e21fc249902 (diff) | |
trivial: switch to using the new marshal names internally (no ABI or API break)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/dummy/up-backend.c | 4 | ||||
| -rw-r--r-- | src/freebsd/up-backend.c | 4 | ||||
| -rw-r--r-- | src/linux/up-backend.c | 4 | ||||
| -rw-r--r-- | src/up-qos.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ac20da9..9db9918 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,10 +39,10 @@ BUILT_SOURCES = \ up-marshal.c up-marshal.h: up-marshal.list - glib-genmarshal $< --prefix=dkp_marshal --header > $@ + glib-genmarshal $< --prefix=up_marshal --header > $@ up-marshal.c: up-marshal.list - echo "#include \"up-marshal.h\"" > $@ && glib-genmarshal $< --prefix=dkp_marshal --body >> $@ + echo "#include \"up-marshal.h\"" > $@ && glib-genmarshal $< --prefix=up_marshal --body >> $@ up-daemon-glue.h: org.freedesktop.DeviceKit.Power.xml Makefile.am dbus-binding-tool --prefix=up_daemon --mode=glib-server --output=up-daemon-glue.h org.freedesktop.DeviceKit.Power.xml diff --git a/src/dummy/up-backend.c b/src/dummy/up-backend.c index 62f24f0..b8bef27 100644 --- a/src/dummy/up-backend.c +++ b/src/dummy/up-backend.c @@ -136,13 +136,13 @@ up_backend_class_init (UpBackendClass *klass) g_signal_new ("device-added", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (UpBackendClass, device_added), - NULL, NULL, dkp_marshal_VOID__POINTER_POINTER, + NULL, NULL, up_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); signals [SIGNAL_DEVICE_REMOVED] = g_signal_new ("device-removed", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (UpBackendClass, device_removed), - NULL, NULL, dkp_marshal_VOID__POINTER_POINTER, + NULL, NULL, up_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); g_type_class_add_private (klass, sizeof (UpBackendPrivate)); diff --git a/src/freebsd/up-backend.c b/src/freebsd/up-backend.c index e34d2c9..78dab1a 100644 --- a/src/freebsd/up-backend.c +++ b/src/freebsd/up-backend.c @@ -419,13 +419,13 @@ up_backend_class_init (UpBackendClass *klass) g_signal_new ("device-added", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (UpBackendClass, device_added), - NULL, NULL, dkp_marshal_VOID__POINTER_POINTER, + NULL, NULL, up_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); signals [SIGNAL_DEVICE_REMOVED] = g_signal_new ("device-removed", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (UpBackendClass, device_removed), - NULL, NULL, dkp_marshal_VOID__POINTER_POINTER, + NULL, NULL, up_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); g_type_class_add_private (klass, sizeof (UpBackendPrivate)); diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c index 34daf4b..368c205 100644 --- a/src/linux/up-backend.c +++ b/src/linux/up-backend.c @@ -321,13 +321,13 @@ up_backend_class_init (UpBackendClass *klass) g_signal_new ("device-added", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (UpBackendClass, device_added), - NULL, NULL, dkp_marshal_VOID__POINTER_POINTER, + NULL, NULL, up_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); signals [SIGNAL_DEVICE_REMOVED] = g_signal_new ("device-removed", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (UpBackendClass, device_removed), - NULL, NULL, dkp_marshal_VOID__POINTER_POINTER, + NULL, NULL, up_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); g_type_class_add_private (klass, sizeof (UpBackendPrivate)); diff --git a/src/up-qos.c b/src/up-qos.c index 63fba62..9fe5757 100644 --- a/src/up-qos.c +++ b/src/up-qos.c @@ -530,7 +530,7 @@ dkp_qos_class_init (DkpQosClass *klass) g_signal_new ("latency-changed", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DkpQosClass, latency_changed), - NULL, NULL, dkp_marshal_VOID__STRING_INT, + NULL, NULL, up_marshal_VOID__STRING_INT, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN); signals [REQUESTS_CHANGED] = g_signal_new ("requests-changed", |