gvfs r1517 - in trunk: . client daemon
- From: alexl svn gnome org
- To: svn-commits-list gnome org
- Subject: gvfs r1517 - in trunk: . client daemon
- Date: Tue, 4 Mar 2008 08:08:45 +0000 (GMT)
Author: alexl
Date: Tue Mar 4 08:08:45 2008
New Revision: 1517
URL: http://svn.gnome.org/viewvc/gvfs?rev=1517&view=rev
Log:
2008-03-04 Alexander Larsson <alexl redhat com>
* client/gdaemonvfs.c:
Avoid duplications in supported_uris.
* daemon/smb-browse.mount.in:
* daemon/smb.mount.in:
Add scheme info so smb is listed in supported_uris again.
Modified:
trunk/ChangeLog
trunk/client/gdaemonvfs.c
trunk/daemon/smb-browse.mount.in
trunk/daemon/smb.mount.in
Modified: trunk/client/gdaemonvfs.c
==============================================================================
--- trunk/client/gdaemonvfs.c (original)
+++ trunk/client/gdaemonvfs.c Tue Mar 4 08:08:45 2008
@@ -524,6 +524,23 @@
return scheme;
}
+static int
+find_string (GPtrArray *array, const char *find_me)
+{
+ int i;
+
+ g_return_val_if_fail (find_me != NULL, -1);
+
+ for (i = 0; i < array->len; ++i)
+ {
+ if (strcmp (g_ptr_array_index (array, i), find_me) == 0)
+ return i;
+ }
+
+ return -1;
+}
+
+
static void
fill_mountable_info (GDaemonVfs *vfs)
{
@@ -593,7 +610,8 @@
if (*scheme != 0)
{
info->scheme = g_strdup (scheme);
- g_ptr_array_add (uri_schemes, g_strdup (scheme));
+ if (find_string (uri_schemes, scheme) == -1)
+ g_ptr_array_add (uri_schemes, g_strdup (scheme));
}
if (scheme_aliases_len > 0)
@@ -602,7 +620,8 @@
for (i = 0; i < scheme_aliases_len; i++)
{
info->scheme_aliases[i] = g_strdup (scheme_aliases[i]);
- g_ptr_array_add (uri_schemes, g_strdup (scheme_aliases[i]));
+ if (find_string (uri_schemes, scheme_aliases[i]) == -1)
+ g_ptr_array_add (uri_schemes, g_strdup (scheme_aliases[i]));
}
info->scheme_aliases[scheme_aliases_len] = NULL;
}
Modified: trunk/daemon/smb-browse.mount.in
==============================================================================
--- trunk/daemon/smb-browse.mount.in (original)
+++ trunk/daemon/smb-browse.mount.in Tue Mar 4 08:08:45 2008
@@ -3,4 +3,4 @@
Exec= libexecdir@/gvfsd-smb-browse
DBusName=org.gtk.vfs.mountpoint.smb_browse
AutoMount=true
-
+Scheme=smb
Modified: trunk/daemon/smb.mount.in
==============================================================================
--- trunk/daemon/smb.mount.in (original)
+++ trunk/daemon/smb.mount.in Tue Mar 4 08:08:45 2008
@@ -2,3 +2,4 @@
Type=smb-share
Exec= libexecdir@/gvfsd-smb
AutoMount=false
+Scheme=smb
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]