================================
gnome-vfs:source=2.14.0-0.2 (previous: 2.14.0-0.1)
cvc rdiff gnome-vfs -1 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/2.14.0-0.2
================================
2.14.0-0.2 Ken VanDine ([EMAIL PROTECTED]) Fri Apr 7 14:53:29 2006
Updated patches for 2.14
12_user_visible_drives.patch: new
Nur in gnome-vfs2-2.8.1.old/debian/patches: 12_user_visible_drives.patch.
diff -ru gnome-vfs2-2.8.1.old/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
gnome-vfs2-2.8.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
--- gnome-vfs2-2.8.1.old/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
2004-09-23 15:20:46.099901960 +0200
+++ gnome-vfs2-2.8.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
2004-09-23 15:23:00.649447320 +0200
@@ -954,6 +954,10 @@
vol->priv->is_user_visible = 1;
break;
default:
+ /* additionally mark devices below /media/ as user visible, in
+ * case they are not recognized as devices above */
+ if (!strncmp (mount->mount_path, "/media/", 7))
+ vol->priv->is_user_visible = 1;
break;
}
04_moniker_libexecdir.patch: new
--- monikers/GNOME_VFS_Moniker_std.server.in.in.orig 2006-01-09
22:49:38.000000000 +0100
+++ monikers/GNOME_VFS_Moniker_std.server.in.in 2006-01-09 22:51:51.000000000
+0100
@@ -1,7 +1,7 @@
<oaf_info>
<oaf_server iid="OAFIID:GNOME_VFS_Moniker_std_Factory"
- type="shlib" location="@MONIKER_LIBDIR@/libmoniker_gnome_vfs_std">
+ type="shlib" location="/usr/lib/gnome-vfs-2.0/libmoniker_gnome_vfs_std">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/GenericFactory:1.0"/>
</oaf_attribute>
19_hurd_path_max.patch: new
--- libgnomevfs/gnome-vfs-unix-mounts.c.orig 2005-03-24 15:49:19.000000000
+0100
+++ libgnomevfs/gnome-vfs-unix-mounts.c 2005-03-24 15:49:55.000000000 +0100
@@ -85,6 +85,9 @@
#define STAT_TIMEOUT_SECONDS 3
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
/* Ideally this should not nonblocking stat, since that can block on
* downed NFS mounts forever, however there seems to be no good way
--- modules/file-method.c.orig 2005-04-01 02:24:13.000000000 +0200
+++ modules/file-method.c 2005-04-01 02:23:33.000000000 +0200
@@ -87,7 +87,11 @@
if (x > 0)
value = x;
else
+#ifdef MAXPATHLEN
return MAXPATHLEN;
+#else
+ return 4096;
+#endif
}
return value;
@@ -1357,7 +1357,7 @@
char *cache_file_path;
FILE *cache_file;
char buffer[2048];
- char escaped_mount_point[PATH_MAX], escaped_trash_path[PATH_MAX];
+ char escaped_mount_point[GET_PATH_MAX()],
escaped_trash_path[GET_PATH_MAX()];
char *mount_point, *trash_path;
struct stat stat_buffer;
gboolean removed_item;
gnome-vfs.recipe: changed
Index: gnome-vfs.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- gnome-vfs.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/2.14.0-0.1
+++ gnome-vfs.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/2.14.0-0.2
@@ -9,12 +9,12 @@
buildRequires = GnomePackageRecipe.buildRequires
buildRequires.extend([ 'libbonobo:devel', 'GConf:devel',
- 'gnome-mime-data:runtime', 'glib:devel',
- 'libxml2:devel', 'zlib:devel', 'popt:devel',
- 'bzip2:devel', 'ORBit2:devel', 'avahi:devel',
- 'xorg-x11:devel', 'dbus-glib:devellib',
- 'dbus:devel', 'gamin:devel', 'hal:devel',
- 'krb5:devel', 'openssl:devel', 'samba:devel' ])
+ 'gnome-mime-data:runtime', 'glib:devel',
+ 'libxml2:devel', 'zlib:devel', 'popt:devel',
+ 'bzip2:devel', 'ORBit2:devel', 'avahi:devel',
+ 'xorg-x11:devel', 'dbus-glib:devellib',
+ 'dbus:devel', 'gamin:devel', 'hal:devel',
+ 'krb5:devel', 'openssl:devel', 'samba:devel' ])
extraConfig = GnomePackageRecipe.extraConfig
extraConfig += ' --with-gtk=no --enable-hal
--with-hal-mount=/usr/bin/pmount --with-hal-umount=/usr/bin/custom_umount.sh
--disable-howl'
@@ -25,29 +25,23 @@
docs = ['AUTHORS', 'COPYING', 'ChangeLog', 'NEWS', 'README']
def unpack(r):
- GnomePackageRecipe.unpack(r)
- #r.addPatch('00_gnome-vfs-hal0.5.patch', level=0)
- #r.addPatch('01_fstab_edit_crash.patch', level=1)
- #r.addPatch('02_get_volume_for_path.patch', level=1)
- #r.addPatch('09_pmount.patch', level=1)
- #r.addPatch('12_user_visible_drives.patch', level=1)
- #r.addPatch('13_resolve_fstab_symlinks.patch', level=1)
- #r.addPatch('14_null_volume_crash.patch', level=0)
- #r.addPatch('15_cddb_bufferoverflow.patch', level=0)
- #r.addPatch('16_preserve_timestamps.patch', level=0)
- #r.addPatch('18_cdrom_fallback.patch', level=0)
- #r.addPatch('19_hurd_path_max.patch', level=0)
- #r.addPatch('20_fadvise_linux26.patch', level=0)
- #r.addPatch('21_kfreebsd_cdrom.patch', level=0)
- #r.addPatch('neon-0.24.7-gssapi.patch', level=0)
- r.addSource('custom_umount.sh')
- #r.addPatch('volume.patch')
- r.macros.optflags = '-g -Os'
+ GnomePackageRecipe.unpack(r)
+ r.addPatch('02_get_volume_for_path.patch')
+ r.addPatch('03_app_cdda.patch')
+ r.addPatch('04_moniker_libexecdir.patch', level=0)
+ r.addPatch('05_default-browser.patch', level=0)
+ r.addPatch('11_network-volumes-in-network.patch', level=0)
+ r.addPatch('12_user_visible_drives.patch')
+ r.addPatch('13_resolve_fstab_symlinks.patch')
+ r.addPatch('14_export_needs_eject.patch')
+ r.addPatch('19_hurd_path_max.patch', level=0)
+ r.addSource('custom_umount.sh')
+ r.macros.optflags = '-g -Os'
def install(r):
- GnomePackageRecipe.install(r)
- r.Run('chmod +x custom_umount.sh')
- r.Install('custom_umount.sh','%(bindir)s')
+ GnomePackageRecipe.install(r)
+ r.Run('chmod +x custom_umount.sh')
+ r.Install('custom_umount.sh','%(bindir)s')
- # remove bogus empty directory
- r.Remove('%(prefix)s/doc', recursive=True)
+ # remove bogus empty directory
+ r.Remove('%(prefix)s/doc', recursive=True)
14_export_needs_eject.patch: new
diff -Nurp gnome-vfs2-2.13.92/libgnomevfs/gnome-vfs-drive.c
gnome-vfs2-2.13.92.new/libgnomevfs/gnome-vfs-drive.c
--- gnome-vfs2-2.13.92/libgnomevfs/gnome-vfs-drive.c 2006-02-24
13:54:46.000000000 +0100
+++ gnome-vfs2-2.13.92.new/libgnomevfs/gnome-vfs-drive.c 2006-03-03
13:30:53.000000000 +0100
@@ -327,6 +327,26 @@ gnome_vfs_drive_is_mounted (GnomeVFSDriv
return res;
}
+/**
+ * gnome_vfs_drive_needs_eject:
+ * @drive: a #GnomeVFSDrive.
+ *
+ * Returns: %TRUE if the @drive needs to be ejected, %FALSE otherwise.
+ *
+ * Since: 2.6
+ */
+gboolean
+gnome_vfs_drive_needs_eject (GnomeVFSDrive *drive)
+{
+ gboolean res;
+
+ G_LOCK (drives);
+ res = drive->priv->must_eject_at_unmount;
+ G_UNLOCK (drives);
+
+ return res;
+}
+
void
gnome_vfs_drive_remove_volume_private (GnomeVFSDrive *drive,
GnomeVFSVolume *volume)
diff -Nurp gnome-vfs2-2.13.92/libgnomevfs/gnome-vfs-drive.h
gnome-vfs2-2.13.92.new/libgnomevfs/gnome-vfs-drive.h
--- gnome-vfs2-2.13.92/libgnomevfs/gnome-vfs-drive.h 2004-09-16
20:17:27.000000000 +0200
+++ gnome-vfs2-2.13.92.new/libgnomevfs/gnome-vfs-drive.h 2006-03-03
13:22:09.000000000 +0100
@@ -79,6 +79,7 @@ char * gnome_vfs_drive_get_h
gboolean gnome_vfs_drive_is_user_visible (GnomeVFSDrive *drive);
gboolean gnome_vfs_drive_is_connected (GnomeVFSDrive *drive);
gboolean gnome_vfs_drive_is_mounted (GnomeVFSDrive *drive);
+gboolean gnome_vfs_drive_needs_eject (GnomeVFSDrive *drive);
gint gnome_vfs_drive_compare (GnomeVFSDrive *a,
GnomeVFSDrive *b);
11_network-volumes-in-network.patch: new
diff -Nur modules.orig/computer-method.c modules/computer-method.c
--- modules.orig/computer-method.c 2004-08-12 11:08:56.000000000 +0200
+++ modules/computer-method.c 2005-02-09 23:46:57.697485936 +0100
@@ -260,12 +260,14 @@
if (gnome_vfs_volume_is_user_visible (volume)) {
drive = gnome_vfs_volume_get_drive (volume);
if (drive == NULL) {
+ if (gnome_vfs_volume_get_volume_type (volume) !=
GNOME_VFS_VOLUME_TYPE_CONNECTED_SERVER) {
file = computer_file_new (COMPUTER_VOLUME);
name = gnome_vfs_volume_get_display_name (volume);
file->file_name = build_file_name (name, ".volume");
g_free (name);
file->volume = gnome_vfs_volume_ref (volume);
computer_file_add (dir, file);
+ }
} else {
file = get_drive_file (dir, drive);
if (file != NULL) {
@@ -360,10 +362,11 @@
file->file_name = g_strdup ("Filesystem.desktop");
computer_file_add (dir, file);
+ /*
file = computer_file_new (COMPUTER_NETWORK_LINK);
file->file_name = g_strdup ("Network.desktop");
computer_file_add (dir, file);
-
+ */
volumes = gnome_vfs_volume_monitor_get_mounted_volumes (monitor);
drives = gnome_vfs_volume_monitor_get_connected_drives (monitor);
@@ -384,12 +387,14 @@
if (gnome_vfs_volume_is_user_visible (volume)) {
drive = gnome_vfs_volume_get_drive (volume);
if (drive == NULL) {
+ if (gnome_vfs_volume_get_volume_type (volume)
!= GNOME_VFS_VOLUME_TYPE_CONNECTED_SERVER) {
file = computer_file_new (COMPUTER_VOLUME);
name = gnome_vfs_volume_get_display_name
(volume);
file->file_name = build_file_name (name,
".volume");
g_free (name);
file->volume = gnome_vfs_volume_ref (volume);
computer_file_add (dir, file);
+ }
}
gnome_vfs_drive_unref (drive);
}
diff -Nur modules.orig/network-method.c modules/network-method.c
--- modules.orig/network-method.c 2004-10-07 17:08:38.000000000 +0200
+++ modules/network-method.c 2005-02-09 23:46:37.620538096 +0100
@@ -51,6 +51,7 @@
char *icon;
char *target_uri;
char *filename;
+ gint vol_id;
} NetworkLink;
typedef struct {
@@ -154,7 +155,8 @@
static char *
get_data_for_link (const char *uri,
const char *display_name,
- const char *icon)
+ const char *icon,
+ gint vol_id)
{
char *data;
@@ -163,10 +165,13 @@
"Name=%s\n"
"Type=FSDevice\n"
"Icon=%s\n"
- "URL=%s\n",
+ "URL=%s\n"
+ "%sX-Gnome-Volume=%d\n",
display_name,
icon,
- uri);
+ uri,
+ vol_id >= 0 ? "" : "#",
+ vol_id);
return data;
}
@@ -235,7 +240,8 @@
add_link (const char *filename,
const char *target_uri,
const char *display_name,
- const char *icon)
+ const char *icon,
+ gint vol_id)
{
NetworkLink *link;
@@ -244,6 +250,7 @@
link->target_uri = g_strdup (target_uri);
link->display_name = g_strdup (display_name);
link->icon = g_strdup (icon);
+ link->vol_id = vol_id;
active_links = g_list_prepend (active_links, link);
do_link_event (filename,
@@ -264,7 +271,8 @@
add_link (filename,
link_uri,
domain,
- "gnome-fs-network");
+ "gnome-fs-network",
+ -1);
g_free (filename);
g_free (link_uri);
}
@@ -356,7 +364,8 @@
{
return get_data_for_link (link->target_uri,
link->display_name,
- link->icon);
+ link->icon,
+ link->vol_id);
}
/* Call with lock held */
@@ -477,6 +486,63 @@
}
+/* functions to handle volumes */
+static char *
+build_volume_filename (GnomeVFSVolume *volume)
+{
+ char *name, *escaped, *ret;
+
+ name = gnome_vfs_volume_get_display_name (volume);
+ escaped = gnome_vfs_escape_string (name);
+ ret = g_strconcat ("volume-", escaped, NULL);
+ g_free(escaped);
+ g_free(name);
+
+ return ret;
+}
+
+static void
+volume_mounted (GnomeVFSVolumeMonitor *monitor,
+ GnomeVFSVolume *volume,
+ gpointer user_data)
+{
+ char *volume_file, *volume_uri;
+ char *volume_name, *volume_icon;
+
+ G_LOCK (network);
+ if (gnome_vfs_volume_is_user_visible (volume) &&
+ gnome_vfs_volume_get_volume_type (volume) ==
GNOME_VFS_VOLUME_TYPE_CONNECTED_SERVER) {
+ volume_file = build_volume_filename (volume);
+ volume_uri = gnome_vfs_volume_get_activation_uri (volume);
+ volume_name = gnome_vfs_volume_get_display_name (volume);
+ volume_icon = gnome_vfs_volume_get_icon (volume);
+
+ add_link (volume_file, volume_uri,
+ volume_name, volume_icon,
+ gnome_vfs_volume_get_id (volume));
+ g_free (volume_icon);
+ g_free (volume_name);
+ g_free (volume_uri);
+ g_free (volume_file);
+ }
+ G_UNLOCK (network);
+}
+
+static void
+volume_unmounted (GnomeVFSVolumeMonitor *volume_monitor,
+ GnomeVFSVolume *volume,
+ gpointer user_data)
+{
+ char *volume_file;
+
+ G_LOCK (network);
+
+ volume_file = build_volume_filename (volume);
+ remove_link (volume_file);
+ g_free (volume_file);
+
+ G_UNLOCK (network);
+}
static GnomeVFSResult
do_open (GnomeVFSMethod *method,
@@ -1338,6 +1404,8 @@
GConfClient *gconf_client;
GnomeVFSURI *uri;
char *workgroup_uri, *workgroup_escaped, *setting;
+ GnomeVFSVolumeMonitor *monitor;
+ GList *volumes, *l;
gconf_client = gconf_client_get_default ();
@@ -1394,10 +1462,43 @@
add_link ("smblink-root",
"smb://",
_("Windows Network"),
- "gnome-fs-network");
+ "gnome-fs-network",
+ -1);
}
-
+ /* add non-drive volumes to network:/// folder */
+ monitor = gnome_vfs_get_volume_monitor ();
+ volumes = gnome_vfs_volume_monitor_get_mounted_volumes (monitor);
+ for (l = volumes; l != NULL; l = l->next) {
+ GnomeVFSVolume *volume = l->data;
+
+ if (gnome_vfs_volume_is_user_visible (volume) &&
+ gnome_vfs_volume_get_volume_type (volume) ==
GNOME_VFS_VOLUME_TYPE_CONNECTED_SERVER) {
+ gchar *volume_file, *volume_uri;
+ gchar *volume_name, *volume_icon;
+
+ volume_file = build_volume_filename (volume);
+ volume_uri = gnome_vfs_volume_get_activation_uri
(volume);
+ volume_name = gnome_vfs_volume_get_display_name
(volume);
+ volume_icon = gnome_vfs_volume_get_icon (volume);
+
+ add_link (volume_file, volume_uri,
+ volume_name, volume_icon,
+ gnome_vfs_volume_get_id (volume));
+ g_free (volume_icon);
+ g_free (volume_name);
+ g_free (volume_uri);
+ g_free (volume_file);
+ }
+ }
+ g_list_foreach (volumes, (GFunc) gnome_vfs_volume_unref, NULL);
+ g_list_free (volumes);
+
+ g_signal_connect (monitor, "volume_mounted",
+ G_CALLBACK (volume_mounted), NULL);
+ g_signal_connect (monitor, "volume_unmounted",
+ G_CALLBACK (volume_unmounted), NULL);
+
return &method;
}
02_get_volume_for_path.patch: new
diff -Nur
gnome-vfs2-2.10.1cvs20050510.orig/libgnomevfs/gnome-vfs-volume-monitor.c
gnome-vfs2-2.10.1cvs20050510/libgnomevfs/gnome-vfs-volume-monitor.c
--- gnome-vfs2-2.10.1cvs20050510.orig/libgnomevfs/gnome-vfs-volume-monitor.c
2005-04-21 01:58:14.000000000 +0200
+++ gnome-vfs2-2.10.1cvs20050510/libgnomevfs/gnome-vfs-volume-monitor.c
2005-05-10 15:30:29.165933432 +0200
@@ -26,6 +26,7 @@
#include <string.h>
#include "gnome-vfs-private.h"
+#include "gnome-vfs-utils.h"
#include "gnome-vfs-volume-monitor.h"
#include "gnome-vfs-volume-monitor-private.h"
#include "gnome-vfs-volume-monitor-client.h"
@@ -868,22 +869,28 @@
dev_t device;
GList *l;
GnomeVFSVolume *volume, *res;
+ char *uri;
if (g_stat (path, &statbuf) != 0)
return NULL;
device = statbuf.st_dev;
+ uri = gnome_vfs_get_uri_from_local_path(path);
+
res = NULL;
g_mutex_lock (volume_monitor->priv->mutex);
for (l = volume_monitor->priv->mtab_volumes; l != NULL; l = l->next) {
volume = l->data;
- if (volume->priv->unix_device == device) {
+ if (volume->priv->unix_device == device &&
+
strncmp(volume->priv->activation_uri,uri,strlen(volume->priv->activation_uri))
== 0) {
res = gnome_vfs_volume_ref (volume);
break;
}
}
g_mutex_unlock (volume_monitor->priv->mutex);
+ g_free(uri);
+
return res;
}
03_app_cdda.patch: new
diff -Nur gnome-vfs2-2.12.0.orig/schemas/desktop_gnome_url_handlers.schemas.in
gnome-vfs2-2.12.0/schemas/desktop_gnome_url_handlers.schemas.in
--- gnome-vfs2-2.12.0.orig/schemas/desktop_gnome_url_handlers.schemas.in
2004-08-14 16:08:28.000000000 +0200
+++ gnome-vfs2-2.12.0/schemas/desktop_gnome_url_handlers.schemas.in
2005-09-29 15:16:04.000000000 +0200
@@ -172,6 +172,40 @@
</schema>
<schema>
+ <key>/schemas/desktop/gnome/url-handlers/cdda/enabled</key>
+ <applyto>/desktop/gnome/url-handlers/cdda/enabled</applyto>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Whether the specified command should handle "cdda" URLs</short>
+ <long>True if the command specified in the "command" key should handle
"cdda" URLs.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/cdda/command</key>
+ <applyto>/desktop/gnome/url-handlers/cdda/command</applyto>
+ <owner>gnome</owner>
+ <type>string</type>
+ <default>sound-juicer %s</default>
+ <locale name="C">
+ <short>The handler for "cdda" URLs</short>
+ <long>The command used to handle "cdda" URLs, if enabled.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/cdda/needs_terminal</key>
+ <applyto>/desktop/gnome/url-handlers/cdda/needs_terminal</applyto>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run the command in a terminal</short>
+ <long>True if the command used to handle this type of URL should be
run in a terminal.</long>
+ </locale>
+ </schema>
+
+ <schema>
<key>/schemas/desktop/gnome/url-handlers/https/enabled</key>
<applyto>/desktop/gnome/url-handlers/https/enabled</applyto>
<owner>gnome</owner>
13_resolve_fstab_symlinks.patch: new
diff -Nur gnome-vfs2-2.8.3/libgnomevfs/gnome-vfs-unix-mounts.c
gnome-vfs2-2.8.3.new/libgnomevfs/gnome-vfs-unix-mounts.c
--- gnome-vfs2-2.8.3/libgnomevfs/gnome-vfs-unix-mounts.c 2004-10-15
10:00:02.000000000 +0200
+++ gnome-vfs2-2.8.3.new/libgnomevfs/gnome-vfs-unix-mounts.c 2004-11-23
17:19:09.426568360 +0100
@@ -538,6 +538,7 @@
char *opt, *opt_end;
struct stat sb;
GnomeVFSUnixMountPoint *mount_entry;
+ char rpath[PATH_MAX];
stat_file = read_file = get_fstab_file ();
@@ -569,7 +570,12 @@
mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1);
- mount_entry->mount_path = g_strdup (mntent->mnt_dir);
+ /* resolve symlinks */
+ if (realpath (mntent->mnt_dir, rpath))
+ mount_entry->mount_path = g_strdup (rpath);
+ else
+ mount_entry->mount_path = g_strdup (mntent->mnt_dir);
+
mount_entry->device_path = g_strdup (mntent->mnt_fsname);
mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
05_default-browser.patch: new
--- schemas/desktop_gnome_url_handlers.schemas.in.orig 2004-09-15
11:47:20.000000000 +0200
+++ schemas/desktop_gnome_url_handlers.schemas.in 2004-09-15
11:47:47.000000000 +0200
@@ -153,7 +153,7 @@
<applyto>/desktop/gnome/url-handlers/http/command</applyto>
<owner>gnome</owner>
<type>string</type>
- <default>epiphany %s</default>
+ <default>firefox %s</default>
<locale name="C">
<short>The handler for "http" URLs</short>
<long>The command used to handle "http" URLs, if enabled.</long>
@@ -187,7 +187,7 @@
<applyto>/desktop/gnome/url-handlers/https/command</applyto>
<owner>gnome</owner>
<type>string</type>
- <default>epiphany %s</default>
+ <default>firefox %s</default>
<locale name="C">
<short>The handler for "https" URLs</short>
<long>The command used to handle "https" URLs, if enabled.</long>
01_fstab_edit_crash.patch: new
# upstream http://bugzilla.gnome.org/show_bug.cgi?id=300547
diff -Nur gnome-vfs2-2.10.0/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
gnome-vfs2-2.10.0.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
--- gnome-vfs2-2.10.0/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
2004-12-14 17:23:33.000000000 +0100
+++ gnome-vfs2-2.10.0.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
2005-03-17 12:01:07.245801992 +0100
@@ -718,6 +718,9 @@
mount = l->data;
uri = gnome_vfs_get_uri_from_local_path
(mount->mount_path);
+ if (uri == NULL)
+ continue;
+
drive =
_gnome_vfs_volume_monitor_find_fstab_drive_by_activation_uri (volume_monitor,
uri);
if (drive != NULL) {
volume.patch: removed
13_resolve_fstab_symlinks.patch: removed
15_cddb_bufferoverflow.patch: removed
14_null_volume_crash.patch: removed
neon-0.24.7-gssapi.patch: removed
12_user_visible_drives.patch: removed
01_fstab_edit_crash.patch: removed
18_cdrom_fallback.patch: removed
02_get_volume_for_path.patch: removed
20_fadvise_linux26.patch: removed
09_pmount.patch: removed
16_preserve_timestamps.patch: removed
21_kfreebsd_cdrom.patch: removed
00_gnome-vfs-hal0.5.patch: removed
19_hurd_path_max.patch: removed
Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
