[Pkg-utopia-commits] r839 - in packages/unstable/avahi-sharp/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-05-15 15:28:58 +0000 (Mon, 15 May 2006)
New Revision: 839

Added:
   packages/unstable/avahi-sharp/debian/patches/01_processes_thread.patch
Modified:
   packages/unstable/avahi-sharp/debian/changelog
Log:
  request.
* debian/patches/01_processes_thread.patch (from avahi svn)
  + ensure the event loop is finished before freeing the poll object
  + set Client.Handle to null immediately after freeing it

Modified: packages/unstable/avahi-sharp/debian/changelog
===================================================================
--- packages/unstable/avahi-sharp/debian/changelog	2006-05-15 15:24:52 UTC (rev 838)
+++ packages/unstable/avahi-sharp/debian/changelog	2006-05-15 15:28:58 UTC (rev 839)
@@ -1,9 +1,12 @@
-avahi-sharp (0.6.10-2) unstable; urgency=low
+avahi-sharp (0.6.10-2) UNRELEASED; urgency=low
 
   * debian/copyright: Obfuscate Lennart poettering's e-mail address on his
-    request. 
+    request.
+  * debian/patches/01_processes_thread.patch (from avahi svn)
+    + ensure the event loop is finished before freeing the poll object
+    + set Client.Handle to null immediately after freeing it
 
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 15 May 2006 17:24:12 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 15 May 2006 17:26:03 +0200
 
 avahi-sharp (0.6.10-1) unstable; urgency=low
   

Added: packages/unstable/avahi-sharp/debian/patches/01_processes_thread.patch
===================================================================
--- packages/unstable/avahi-sharp/debian/patches/01_processes_thread.patch	2006-05-15 15:24:52 UTC (rev 838)
+++ packages/unstable/avahi-sharp/debian/patches/01_processes_thread.patch	2006-05-15 15:28:58 UTC (rev 839)
@@ -0,0 +1,44 @@
+Index: avahi-sharp/Client.cs
+===================================================================
+--- avahi-sharp/Client.cs	(revision 1214)
++++ avahi-sharp/Client.cs	(revision 1216)
+@@ -286,10 +286,15 @@
+         public void Dispose ()
+         {
+             if (handle != IntPtr.Zero) {
+-                avahi_client_free (handle);
+-                avahi_simple_poll_quit (spoll);
+-                avahi_simple_poll_free (spoll);
+-                handle = IntPtr.Zero;
++                lock (this) {
++                    avahi_client_free (handle);
++                    handle = IntPtr.Zero;
++
++                    avahi_simple_poll_quit (spoll);
++                    Monitor.Wait (this);
++                    
++                    avahi_simple_poll_free (spoll);
++                }
+             }
+         }
+ 
+@@ -370,6 +375,7 @@
+             try {
+                 lock (this) {
+                     avahi_simple_poll_loop (spoll);
++                    Monitor.Pulse (this);
+                 }
+             } catch (Exception e) {
+                 Console.Error.WriteLine ("Error in avahi-sharp event loop: " + e);
+Index: avahi-sharp/AvahiTest.cs
+===================================================================
+--- avahi-sharp/AvahiTest.cs	(revision 1214)
++++ avahi-sharp/AvahiTest.cs	(revision 1216)
+@@ -42,6 +42,7 @@
+         BrowseServiceTypes ("local");
+         Console.WriteLine ("Press enter to quit");
+         Console.ReadLine ();
++        client.Dispose ();
+     }
+ 
+     private static void OnEntryGroupChanged (object o, EntryGroupStateArgs args)