Attachment 147470 Details for Bug 204906 – gam_poll_basic_conditional_callback.diff

[patch] gam_poll_basic_conditional_callback.diff

gam_poll_basic_conditional_callback.diff (text/plain), 1.56 KB, created by John McCutchan on 2007-02-06 15:14:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John McCutchan

Created: 2007-02-06 15:14:57 UTC

Size: 1.56 KB

patch

obsolete

>Index: server/gam_poll_basic.c
>===================================================================
>--- server/gam_poll_basic.c	(revision 320)
>+++ server/gam_poll_basic.c	(working copy)
>@@ -45,6 +45,8 @@
> static gboolean gam_poll_basic_remove_all_for(GamListener * listener);
> static GaminEventType gam_poll_basic_poll_file(GamNode * node);
> static gboolean gam_poll_basic_scan_callback(gpointer data);
>+static GList* all_subscriptions = NULL;
>+static gboolean scan_callback_running = FALSE;
> 
> gboolean
> gam_poll_basic_init ()
>@@ -55,8 +57,6 @@
> 				       gam_poll_basic_remove_subscription,
> 				       gam_poll_basic_remove_all_for,
> 				       gam_poll_basic_poll_file);
>-
>-	g_timeout_add(1000, gam_poll_basic_scan_callback, NULL);
> 	GAM_DEBUG(DEBUG_INFO, "basic poll backend initialized\n");
> 	return TRUE;
> }
>@@ -116,6 +116,13 @@
> 
> 	gam_poll_generic_add (node);
> 
>+	all_subscriptions = g_list_prepend (all_subscriptions, sub);
>+	if (!scan_callback_running)
>+	{
>+		scan_callback_running = TRUE;
>+		g_timeout_add(1000, gam_poll_basic_scan_callback, NULL);
>+	}
>+
> 	GAM_DEBUG(DEBUG_INFO, "Poll: added subscription for %s\n", path);
> 	return TRUE;
> }
>@@ -173,6 +180,9 @@
> 	const char *path = gam_subscription_get_path (sub);
> 	GamNode *node = gam_tree_get_at_path (gam_poll_generic_get_tree(), path);
> 
>+	all_subscriptions = g_list_remove_all (all_subscriptions, sub);
>+
>+
> 	if (node == NULL) {
> 		/* free directly */
> 		gam_subscription_free(sub);
>@@ -412,5 +422,11 @@
> 		}
> 	}
> 
>+	if (all_subscriptions == NULL)
>+	{
>+		scan_callback_running = FALSE;
>+		return FALSE;
>+	}
>+
> 	return TRUE;
> }

Actions: View | Diff

Attachments on bug 204906: 135450 | 135463 | 135464 | 135533 | 147470 | 149440