Attachment #50551 for bug #118246

View | Details | Raw Unified | Return to bug 118246
Collapse All | Expand All

Lines 15-20 Link Here

(-)gamin-0.1.5/server/gam_connection.c (+7 lines)
15	#ifdef GAMIN_DEBUG_API	15	#ifdef GAMIN_DEBUG_API
16	#include "gam_debugging.h"	16	#include "gam_debugging.h"
17	#endif	17	#endif
		18	#ifdef ENABLE_INOTIFY
		19	#include "gam_inotify.h"
		20	#endif
18	#include "fam.h"	21	#include "fam.h"
19		22
20	/************************************************************************	23	/************************************************************************
Lines 383-388 Link Here
383		386
384	gam_listener_remove_subscription(conn->listener, sub);	387	gam_listener_remove_subscription(conn->listener, sub);
385	gam_remove_subscription(sub);	388	gam_remove_subscription(sub);
		389	#ifdef ENABLE_INOTIFY
		390	if ((gam_inotify_is_running()) && (!gam_exclude_check(path)))
		391	gam_subscription_free(sub);
		392	#endif
386		393
387	if (gam_send_ack(conn, req->seq, path, pathlen) < 0) {	394	if (gam_send_ack(conn, req->seq, path, pathlen) < 0) {
388	GAM_DEBUG(DEBUG_INFO, "Failed to send cancel ack to PID %d\n",	395	GAM_DEBUG(DEBUG_INFO, "Failed to send cancel ack to PID %d\n",

Lines 25-30 Link Here

(-)gamin-0.1.5/server/gam_listener.c (+7 lines)
25	#include "gam_server.h"	25	#include "gam_server.h"
26	#include "gam_error.h"	26	#include "gam_error.h"
27	#include "gam_pidname.h"	27	#include "gam_pidname.h"
		28	#ifdef ENABLE_INOTIFY
		29	#include "gam_inotify.h"
		30	#endif
28		31
29	// #define GAM_LISTENER_VERBOSE	32	// #define GAM_LISTENER_VERBOSE
30	/* private struct representing a single listener */	33	/* private struct representing a single listener */
Lines 90-95 Link Here
90	g_assert(sub);	93	g_assert(sub);
91	g_assert(g_list_find(listener->subs, sub));	94	g_assert(g_list_find(listener->subs, sub));
92	gam_remove_subscription(sub);	95	gam_remove_subscription(sub);
		96	#ifdef ENABLE_INOTIFY
		97	if (gam_inotify_is_running())
		98	gam_subscription_free(sub);
		99	#endif
93	}	100	}
94		101
95	/**	102	/**

Return to bug 118246