[Pkg-utopia-commits] r1425 - in /packages/unstable/avahi/debian: changelog patches/20_avahi-ui-non-existing-domain-segv.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Fri Apr 20 19:06:37 2007
New Revision: 1425

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1425
Log:
* debian/patches/20_avahi-ui-non-existing-domain-segv.patch:
  + Patch from upstream SVN (r1448): fix segfault when browsing for services
    on non-existing domains or domains that don't have any services assigned.

Added:
    packages/unstable/avahi/debian/patches/20_avahi-ui-non-existing-domain-segv.patch
Modified:
    packages/unstable/avahi/debian/changelog

Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=1425&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Fri Apr 20 19:06:37 2007
@@ -1,10 +1,16 @@
-avahi (0.6.18-3) UNRELEASED; urgency=low
-
+avahi (0.6.18-3) unstable; urgency=low
+
+  [ Sjoerd Simons ]
   * debian/avahi-daemon.postinst:
     + Don't let adduser create avahi-daemon's homedir. This prevents it from
       being created with the wrong permissions. (Closes: #419935)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 19 Apr 2007 21:21:21 +0200
+  [ Sebastian Dröge ]
+  * debian/patches/20_avahi-ui-non-existing-domain-segv.patch:
+    + Patch from upstream SVN (r1448): fix segfault when browsing for services
+      on non-existing domains or domains that don't have any services assigned.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 20 Apr 2007 21:05:05 +0200
 
 avahi (0.6.18-2) unstable; urgency=low
 

Added: packages/unstable/avahi/debian/patches/20_avahi-ui-non-existing-domain-segv.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/20_avahi-ui-non-existing-domain-segv.patch?rev=1425&op=file
==============================================================================
--- packages/unstable/avahi/debian/patches/20_avahi-ui-non-existing-domain-segv.patch (added)
+++ packages/unstable/avahi/debian/patches/20_avahi-ui-non-existing-domain-segv.patch Fri Apr 20 19:06:37 2007
@@ -1,0 +1,26 @@
+Index: /trunk/avahi-ui/avahi-ui.c
+===================================================================
+--- /trunk/avahi-ui/avahi-ui.c (revision 1431)
++++ /trunk/avahi-ui/avahi-ui.c (revision 1448)
+@@ -609,4 +609,5 @@
+     
+     g_return_val_if_fail(d, NULL);
++    g_return_val_if_fail(AUI_IS_SERVICE_DIALOG(d), NULL);
+     
+     if (d->priv->domain)
+@@ -693,5 +694,5 @@
+ 
+     if (d->priv->service_pulse_timeout <= 0)
+-        d->priv->service_pulse_timeout = g_timeout_add(100, service_pulse_callback, d->priv);
++        d->priv->service_pulse_timeout = g_timeout_add(100, service_pulse_callback, d);
+ 
+     for (i = 0; d->priv->browse_service_types[i]; i++)
+@@ -873,5 +874,5 @@
+ }
+ 
+-static void domain_button_clicked(GtkButton *button,  gpointer user_data) {
++static void domain_button_clicked(GtkButton *button, gpointer user_data) {
+     GtkWidget *vbox, *vbox2, *scrolled_window;
+     GtkTreeSelection *selection;
+
+