Comment 2 for bug 802477

nih_watch_add() should return the NihWatchHandle * rather than an int indicating success; this structure should have a destructor so that when freed, it's both removed from the linked list (it doesn't even do this right now) and inotify_rm_watch() called