diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-11 07:32:21 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-11 07:32:21 +0800 |
commit | 78136728c9847026705abca3cb78567952e6e5c9 (patch) | |
tree | 4be787e1cad72c20e37d19f27db127f7b139e60e /devel/gnome-vfs/files | |
parent | fd31ea595d5f518b3b7da5fd32b0aa70b8e36dd1 (diff) | |
download | marcuscom-ports-78136728c9847026705abca3cb78567952e6e5c9.tar marcuscom-ports-78136728c9847026705abca3cb78567952e6e5c9.tar.gz marcuscom-ports-78136728c9847026705abca3cb78567952e6e5c9.tar.bz2 marcuscom-ports-78136728c9847026705abca3cb78567952e6e5c9.tar.lz marcuscom-ports-78136728c9847026705abca3cb78567952e6e5c9.tar.xz marcuscom-ports-78136728c9847026705abca3cb78567952e6e5c9.tar.zst marcuscom-ports-78136728c9847026705abca3cb78567952e6e5c9.zip |
Update to 2.5.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1309 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gnome-vfs/files')
3 files changed, 45 insertions, 67 deletions
diff --git a/devel/gnome-vfs/files/patch-daemon_gnome-vfs-async-daemon.c b/devel/gnome-vfs/files/patch-daemon_gnome-vfs-async-daemon.c deleted file mode 100644 index 588665856..000000000 --- a/devel/gnome-vfs/files/patch-daemon_gnome-vfs-async-daemon.c +++ /dev/null @@ -1,67 +0,0 @@ ---- daemon/gnome-vfs-async-daemon.c.orig Thu Oct 23 16:17:06 2003 -+++ daemon/gnome-vfs-async-daemon.c Thu Oct 23 16:19:26 2003 -@@ -23,23 +23,23 @@ - * the context object that has been looked up */ - G_LOCK_DEFINE_STATIC (client_call_context); - --static GnomeVFSAsyncDaemon *async_daemon = NULL; -+static GnomeVFSAsyncDaemon *g_vfs_async_daemon = NULL; - - static void - gnome_vfs_async_daemon_finalize (GObject *object) - { - /* All client calls should have finished before we kill this object */ -- g_assert (g_hash_table_size (async_daemon->client_call_context) == 0); -- g_hash_table_destroy (async_daemon->client_call_context); -+ g_assert (g_hash_table_size (g_vfs_async_daemon->client_call_context) == 0); -+ g_hash_table_destroy (g_vfs_async_daemon->client_call_context); - BONOBO_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); -- async_daemon = NULL; -+ g_vfs_async_daemon = NULL; - } - - static void - gnome_vfs_async_daemon_instance_init (GnomeVFSAsyncDaemon *daemon) - { - daemon->client_call_context = g_hash_table_new (NULL, NULL); -- async_daemon = daemon; -+ g_vfs_async_daemon = daemon; - } - - GnomeVFSContext * -@@ -48,13 +48,13 @@ - { - GnomeVFSContext *context; - -- if (async_daemon == NULL) { -+ if (g_vfs_async_daemon == NULL) { - return NULL; - } - - context = gnome_vfs_context_new (); - G_LOCK (client_call_context); -- g_hash_table_insert (async_daemon->client_call_context, client_call, context); -+ g_hash_table_insert (g_vfs_async_daemon->client_call_context, client_call, context); - G_UNLOCK (client_call_context); - - gnome_vfs_daemon_add_context (client, context); -@@ -72,8 +72,8 @@ - _gnome_vfs_daemon_set_current_daemon_client_call (NULL); - gnome_vfs_daemon_remove_context (client, context); - G_LOCK (client_call_context); -- if (async_daemon != NULL) { -- g_hash_table_remove (async_daemon->client_call_context, client_call); -+ if (g_vfs_async_daemon != NULL) { -+ g_hash_table_remove (g_vfs_async_daemon->client_call_context, client_call); - } - gnome_vfs_context_free (context); - G_UNLOCK (client_call_context); -@@ -176,7 +176,7 @@ - client_call = data; - - G_LOCK (client_call_context); -- context = g_hash_table_lookup (async_daemon->client_call_context, client_call); -+ context = g_hash_table_lookup (g_vfs_async_daemon->client_call_context, client_call); - if (context != NULL) { - cancellation = gnome_vfs_context_get_cancellation (context); - if (cancellation) { diff --git a/devel/gnome-vfs/files/patch-daemon_gnome-vfs-daemon.c b/devel/gnome-vfs/files/patch-daemon_gnome-vfs-daemon.c new file mode 100644 index 000000000..697e54db0 --- /dev/null +++ b/devel/gnome-vfs/files/patch-daemon_gnome-vfs-daemon.c @@ -0,0 +1,26 @@ +--- daemon/gnome-vfs-daemon.c.orig Mon Nov 10 18:17:52 2003 ++++ daemon/gnome-vfs-daemon.c Mon Nov 10 18:18:30 2003 +@@ -14,7 +14,7 @@ + + /* Global daemon */ + static GnomeVFSDaemon *the_daemon = NULL; +-static GnomeVFSAsyncDaemon *async_daemon = NULL; ++static GnomeVFSAsyncDaemon *gnomevfs_async_daemon = NULL; + + typedef struct { + GNOME_VFS_Client client; +@@ -534,12 +534,12 @@ + the_daemon = g_object_new (GNOME_TYPE_VFS_DAEMON, NULL); + + poa = bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST); +- async_daemon = g_object_new (GNOME_TYPE_VFS_ASYNC_DAEMON, ++ gnomevfs_async_daemon = g_object_new (GNOME_TYPE_VFS_ASYNC_DAEMON, + "poa", poa, + NULL); + CORBA_Object_release ((CORBA_Object)poa, NULL); + bonobo_object_add_interface (BONOBO_OBJECT (the_daemon), +- BONOBO_OBJECT (async_daemon)); ++ BONOBO_OBJECT (gnomevfs_async_daemon)); + } + return BONOBO_OBJECT (the_daemon); + } diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c new file mode 100644 index 000000000..650aea16c --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c @@ -0,0 +1,19 @@ +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Nov 10 18:09:17 2003 ++++ libgnomevfs/gnome-vfs-unix-mounts.c Mon Nov 10 18:13:26 2003 +@@ -398,16 +398,6 @@ + mount_entry->is_read_only = TRUE; + } + +-#ifdef HAVE_SYS_SYSCTL_H +- if (usermnt != 0) { +- if (stat (fstab->fs_file, &sb) == 0) { +- if (sb.st_uid != 0) { +- mount_entry->is_user_mountable = TRUE; +- } +- } +- } +-#endif +- + *return_list = g_list_prepend (*return_list, mount_entry); + } + |