1 --- server/gam_server.c.orig	2007-07-04 09:36:49.000000000 -0400
2 +++ server/gam_server.c	2009-05-01 20:25:41.000000000 -0400
3 @@ -32,7 +32,7 @@
4  #include "gam_server.h"
5  #include "gam_channel.h"
6  #include "gam_subscription.h"
7 -#include "gam_poll_generic.h"
8 +#include "gam_poll_basic.h"
9  #ifdef ENABLE_INOTIFY
10  #include "gam_inotify.h"
11  #endif
12 @@ -200,7 +200,8 @@ gam_add_subscription(GamSubscription * s
13  			return gam_poll_add_subscription (sub);
14  		else
15  #endif
16 -			return gam_kernel_add_subscription (sub);
17 +			/*return gam_kernel_add_subscription (sub);*/
18 +			return gam_poll_add_subscription (sub);
19  	} else {
20  		gam_fs_mon_type type;
21  		type = gam_fs_get_mon_type (path);
22 @@ -243,7 +244,8 @@ gam_remove_subscription(GamSubscription
23  			return gam_poll_remove_subscription (sub);
24  		else
25  #endif
26 -			return gam_kernel_remove_subscription(sub);
27 +			/*return gam_kernel_remove_subscription(sub);*/
28 +			return gam_poll_remove_subscription (sub);
29  	} else {
30  		gam_fs_mon_type type;
31  		type = gam_fs_get_mon_type (path);
32 @@ -438,7 +440,7 @@ gam_server_get_kernel_handler (void)
33  GamPollHandler
34  gam_server_get_poll_handler (void)
35  {
36 -	return __gam_kernel_handler;
37 +	return __gam_poll_handler;
38  }
39 
40  gboolean
41