X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service%2Fwatch.c;h=349b484a788edb8080835b294d8132a67f6f5f04;hp=b5f4ae3b8f7b03710e2a20650fd547fbe1ba3cf1;hb=d80aaf4dc5ab00d65c0ae40dd7d6006155caa33b;hpb=919eb0f0f58c36f4b05a11a06f12429a8a863bdf

diff --git a/service/watch.c b/service/watch.c
index b5f4ae3..349b484 100644
--- a/service/watch.c
+++ b/service/watch.c
@@ -26,11 +26,6 @@ struct watch_object {
 	char *name;
 };
 
-struct watch_subscribe {
-	struct uloop_timeout t;
-	uint32_t id;
-};
-
 static struct ubus_event_handler watch_event;
 static struct ubus_subscriber watch_subscribe;
 static LIST_HEAD(watch_objects);
@@ -117,8 +112,8 @@ watch_ubus(struct ubus_context *ctx)
 {
 	watch_event.cb = watch_subscribe_cb;
 	watch_subscribe.cb = watch_notify_cb;
-	if (ubus_register_event_handler(ctx, &watch_event, "ubus.object.add"))
-		ERROR("failed to add ubus event handler\n");
 	if (ubus_register_subscriber(ctx, &watch_subscribe))
 		ERROR("failed to register ubus subscriber\n");
+	if (ubus_register_event_handler(ctx, &watch_event, "ubus.object.add"))
+		ERROR("failed to add ubus event handler\n");
 }