r12074 - in /desktop/unstable/nautilus/debian: changelog control control.in patches/14_sidebar_network-protocol.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Jul 22 13:30:36 2007
New Revision: 12074

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12074
Log:
* 14_sidebar_network-protocol.patch: fix systematic segfault.
  Closes: #434123.
* Enable tracker support by build-depending on libtrackerclient-dev.

Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/control
    desktop/unstable/nautilus/debian/control.in
    desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=12074&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Sun Jul 22 13:30:36 2007
@@ -1,3 +1,11 @@
+nautilus (2.18.3-2) unstable; urgency=low
+
+  * 14_sidebar_network-protocol.patch: fix systematic segfault.
+    Closes: #434123.
+  * Enable tracker support by build-depending on libtrackerclient-dev.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 22 Jul 2007 15:17:31 +0200
+
 nautilus (2.18.3-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control?rev=12074&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control (original)
+++ desktop/unstable/nautilus/debian/control Sun Jul 22 13:30:36 2007
@@ -32,7 +32,8 @@
                libglib2.0-dev (>= 2.6.0),
                libgnome2-dev (>= 2.14.0),
                libpango1.0-dev (>= 1.1.2),
-               x11proto-core-dev
+               x11proto-core-dev,
+	       libtrackerclient-dev (>= 0.0.1)
 Standards-Version: 3.7.2
 
 Package: nautilus

Modified: desktop/unstable/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control.in?rev=12074&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control.in (original)
+++ desktop/unstable/nautilus/debian/control.in Sun Jul 22 13:30:36 2007
@@ -32,7 +32,8 @@
                libglib2.0-dev (>= 2.6.0),
                libgnome2-dev (>= 2.14.0),
                libpango1.0-dev (>= 1.1.2),
-               x11proto-core-dev
+               x11proto-core-dev,
+	       libtrackerclient-dev (>= 0.0.1)
 Standards-Version: 3.7.2
 
 Package: nautilus

Modified: desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch?rev=12074&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch (original)
+++ desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch Sun Jul 22 13:30:36 2007
@@ -1,13 +1,13 @@
 Index: nautilus-2.18.3/src/nautilus-places-sidebar.c
 ===================================================================
---- nautilus-2.18.3.orig/src/nautilus-places-sidebar.c	2007-07-18 23:35:17.891816979 +0200
-+++ nautilus-2.18.3/src/nautilus-places-sidebar.c	2007-07-18 23:35:43.557279570 +0200
+--- nautilus-2.18.3.orig/src/nautilus-places-sidebar.c	2007-07-22 15:02:02.701996181 +0200
++++ nautilus-2.18.3/src/nautilus-places-sidebar.c	2007-07-22 15:15:47.224983069 +0200
 @@ -315,6 +315,14 @@
  	}
  	g_list_free (drives);
  
 +       mount_uri = "network:///";
-+       last_iter = add_place (sidebar->store, PLACES_BUILT_IN,
++       last_iter = add_place (sidebar, PLACES_BUILT_IN,
 +                              _("Network Servers"), "gnome-fs-network",
 +                              mount_uri, NULL, NULL, 0);
 +	if (strcmp (location, mount_uri) == 0) {