+++ /dev/null
---- gnome-vfs-1.0.5/libgnomevfs/libcharset/codeset.m4.codeset Thu Jan 31 08:58:30 2002
-+++ gnome-vfs-1.0.5/libgnomevfs/libcharset/codeset.m4 Wed Mar 20 17:08:34 2002
-@@ -18,3 +18,23 @@
- [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
- fi
- ])
-+#serial 2
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([jm_LANGINFO_CODESET],
-+[
-+ AC_CHECK_HEADERS(langinfo.h)
-+ AC_CHECK_FUNCS(nl_langinfo)
-+
-+ AC_CACHE_CHECK([for nl_langinfo and CODESET], jm_cv_langinfo_codeset,
-+ [AC_TRY_LINK([#include <langinfo.h>],
-+ [char* cs = nl_langinfo(CODESET);],
-+ jm_cv_langinfo_codeset=yes,
-+ jm_cv_langinfo_codeset=no)
-+ ])
-+ if test $jm_cv_langinfo_codeset = yes; then
-+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-+ fi
-+])
---- gnome-vfs-1.0.5/acinclude.m4.codeset Wed Jul 11 19:02:41 2001
-+++ gnome-vfs-1.0.5/acinclude.m4 Wed Mar 20 17:08:34 2002
-@@ -23,3 +23,23 @@
- AC_PROVIDE([AC_TYPE_OFF_T])
- ])
-
-+#serial 2
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([jm_LANGINFO_CODESET],
-+[
-+ AC_CHECK_HEADERS(langinfo.h)
-+ AC_CHECK_FUNCS(nl_langinfo)
-+
-+ AC_CACHE_CHECK([for nl_langinfo and CODESET], jm_cv_langinfo_codeset,
-+ [AC_TRY_LINK([#include <langinfo.h>],
-+ [char* cs = nl_langinfo(CODESET);],
-+ jm_cv_langinfo_codeset=yes,
-+ jm_cv_langinfo_codeset=no)
-+ ])
-+ if test $jm_cv_langinfo_codeset = yes; then
-+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-+ fi
-+])
---- gnome-vfs-1.0.5/acconfig.h.codeset Wed Mar 20 17:12:08 2002
-+++ gnome-vfs-1.0.5/acconfig.h Wed Mar 20 17:12:30 2002
-@@ -17,3 +17,4 @@
- #undef ENABLE_PROFILER
- #undef HAVE_OPENSSL
- #undef USE_LIBICONV
-+#undef HAVE_LANGINFO_CODESET
+++ /dev/null
---- gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-mime-magic.c.orig 2003-01-02 01:59:52.000000000 +0200
-+++ gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-mime-magic.c 2003-01-02 02:03:24.000000000 +0200
-@@ -196,6 +196,11 @@
- fmttype = 'u';
- }
-
-+ printf ("offset: %p, bsize: %i, result: %p\n", offset, bsize, result);
-+
-+ if ((offset <= 0) || (bsize <= 0) || (result <= 0))
-+ return FALSE;
-+
- switch (bsize) {
- case 1:
- fmtstr[0] = '%';
+++ /dev/null
---- gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-private-utils.c 2001-07-16 13:21:07.000000000 -0500
-+++ gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-private-utils.c 2004-06-05 12:17:48.810517416 -0500
-@@ -263,7 +263,7 @@
- *
- * Return value:
- **/
--GnomeVFSProcessResult
-+GnomeVFSProcessRunResult
- gnome_vfs_process_run_cancellable (const gchar *file_name,
- const gchar * const argv[],
- GnomeVFSProcessOptions options,
---- gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-process.c 2001-07-16 13:21:07.000000000 -0500
-+++ gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-process.c 2004-06-05 12:17:37.643215104 -0500
-@@ -258,7 +258,7 @@
- *
- * Return value: A numeric value reporting the result of the operation.
- **/
--GnomeVFSProcessRunResult
-+GnomeVFSProcessResult
- gnome_vfs_process_signal (GnomeVFSProcess *process,
- guint signal_number)
- {
+++ /dev/null
-diff -NurB gnome-vfs-1.0.5-orig/doc/about.sgml gnome-vfs-1.0.5/doc/about.sgml
---- gnome-vfs-1.0.5-orig/doc/about.sgml 2004-04-01 02:12:47.000000000 -0500
-+++ gnome-vfs-1.0.5/doc/about.sgml 2004-04-01 02:13:19.000000000 -0500
-@@ -83,7 +83,7 @@
- <para>
- The GnomeVFS equivalent is very similar, but you will notice slightly different data types. The
- consistent returning of a GnomeVFSResult also necessitated moving the return value of read into
-- a pass-back-value pointer <variable>bytes_read</variable>:
-+ a pass-back-value pointer <varname>bytes_read</varname>:
- <programlisting>
- GnomeVFSResult gnome_vfs_read (GnomeVFSHandle *handle,
- gpointer buffer,
-diff -NurB gnome-vfs-1.0.5-orig/doc/gnome-vfs-docs.sgml gnome-vfs-1.0.5/doc/gnome-vfs-docs.sgml
---- gnome-vfs-1.0.5-orig/doc/gnome-vfs-docs.sgml 2004-04-01 02:12:47.000000000 -0500
-+++ gnome-vfs-1.0.5/doc/gnome-vfs-docs.sgml 2004-04-01 02:40:00.000000000 -0500
-@@ -18,7 +18,6 @@
- <!entity gnome-vfs-inet-connection SYSTEM "sgml/inet-connection.sgml">
- <!entity gnome-vfs-init SYSTEM "sgml/init.sgml">
- <!entity gnome-vfs-iobuf SYSTEM "sgml/iobuf.sgml">
--<!entity gnome-vfs-list-sort SYSTEM "sgml/list-sort.sgml">
- <!entity gnome-vfs-method SYSTEM "sgml/method.sgml">
- <!entity gnome-vfs-mime-handlers SYSTEM "sgml/mime-handlers.sgml">
- <!entity gnome-vfs-mime-info SYSTEM "sgml/mime-info.sgml">
-@@ -94,7 +93,7 @@
- without the use of threads.
- </para>
- &gnome-vfs-async-ops;
-- <--FIXME: should we display this?gnome-vfs-cancellable-ops-->
-+ <!--FIXME: should we display this?gnome-vfs-cancellable-ops-->
- &gnome-vfs-ops;
- &gnome-vfs-directory;
- &gnome-vfs-xfer;
-@@ -136,12 +135,12 @@
- read-write, seeking, etc). Modules are dynamically loaded based upon the URI
- scheme passed into the high-level GnomeVFS APIs.
- </para>
-- &writing-modules;
- &gnome-vfs-method;
- &gnome-vfs-module-shared;
- &gnome-vfs-module;
- &gnome-vfs-module-callback-module-api;
- </chapter>
-+ &writing-modules;
-
- <chapter id="everything-else">
- <title>Other APIs</title>
-@@ -152,11 +151,10 @@
- &gnome-vfs-directory-filter;
- &gnome-vfs-file-size;
- &gnome-vfs-find-directory;
-- <--FIXME: I think this should be private: gnome-vfs-handle-->
-+ <!--FIXME: I think this should be private: gnome-vfs-handle-->
- &gnome-vfs-inet-connection;
- &gnome-vfs-init;
- &gnome-vfs-iobuf;
-- &gnome-vfs-list-sort;
- &gnome-vfs-module-callback;
- &gnome-vfs-standard-callbacks;
- &gnome-vfs-parse-ls;
-diff -NurB gnome-vfs-1.0.5-orig/doc/gnome-vfs-sections.txt gnome-vfs-1.0.5/doc/gnome-vfs-sections.txt
---- gnome-vfs-1.0.5-orig/doc/gnome-vfs-sections.txt 2004-04-01 02:12:47.000000000 -0500
-+++ gnome-vfs-1.0.5/doc/gnome-vfs-sections.txt 2004-04-01 03:16:07.000000000 -0500
-@@ -194,7 +194,7 @@
-
- <SECTION>
- <FILE>find-directory</FILE>
--<TITLE>Find Directory</TITLE>
-+<TITLE>Find Directory Section</TITLE>
- gnome_vfs_find_directory
- </SECTION>
-
-@@ -224,6 +224,7 @@
-
- <SECTION>
- <FILE>init</FILE>
-+<TITLE>Init Section</TITLE>
- gnome_vfs_init
- gnome_vfs_initialized
- gnome_vfs_shutdown
-diff -NurB gnome-vfs-1.0.5-orig/doc/tmpl/list-sort.sgml gnome-vfs-1.0.5/doc/tmpl/list-sort.sgml
---- gnome-vfs-1.0.5-orig/doc/tmpl/list-sort.sgml 2004-04-01 02:12:47.000000000 -0500
-+++ gnome-vfs-1.0.5/doc/tmpl/list-sort.sgml 1969-12-31 19:00:00.000000000 -0500
-@@ -1,38 +0,0 @@
--<!-- ##### SECTION Title ##### -->
--list-sort
--
--<!-- ##### SECTION Short_Description ##### -->
--
--
--<!-- ##### SECTION Long_Description ##### -->
--<para>
--
--</para>
--
--<!-- ##### SECTION See_Also ##### -->
--<para>
--
--</para>
--
--<!-- ##### USER_FUNCTION GnomeVFSListCompareFunc ##### -->
--<para>
--
--</para>
--
--@a:
--@b:
--@data:
--@Returns:
--
--
--<!-- ##### FUNCTION gnome_vfs_list_sort ##### -->
--<para>
--
--</para>
--
--@list:
--@compare_func:
--@data:
--@Returns:
--
--
-diff -NurB gnome-vfs-1.0.5-orig/doc/tmpl/standard-callbacks.sgml gnome-vfs-1.0.5/doc/tmpl/standard-callbacks.sgml
---- gnome-vfs-1.0.5-orig/doc/tmpl/standard-callbacks.sgml 2004-04-01 02:12:47.000000000 -0500
-+++ gnome-vfs-1.0.5/doc/tmpl/standard-callbacks.sgml 2004-04-01 02:32:34.000000000 -0500
-@@ -24,7 +24,7 @@
- </para>
-
-
--</para><informaltable pgwide=1 frame="none" role="params">
-+<informaltable pgwide=1 frame="none" role="params">
- <tgroup cols="2">
- <colspec colwidth="2*">
- <colspec colwidth="8*">
-diff -NurB gnome-vfs-1.0.5-orig/doc/writing-modules.sgml gnome-vfs-1.0.5/doc/writing-modules.sgml
---- gnome-vfs-1.0.5-orig/doc/writing-modules.sgml 2004-04-01 02:12:47.000000000 -0500
-+++ gnome-vfs-1.0.5/doc/writing-modules.sgml 2004-04-01 02:21:20.000000000 -0500
-@@ -6,7 +6,6 @@
- GNOME Virtual File System.
- </para>
- </abstract>
-- </artheader>
-
- <sect1 id="Introduction">
- <title>Introduction</title>
+++ /dev/null
---- gnome-vfs-1.0.5/modules/http-method.c.proxy 2001-09-05 22:06:14.000000000 +0200
-+++ gnome-vfs-1.0.5/modules/http-method.c 2002-09-12 18:35:28.000000000 +0200
-@@ -125,18 +125,18 @@
- #define DEFAULT_HTTP_PROXY_PORT 8080
-
- /* GConf paths and keys */
--#define PATH_GCONF_GNOME_VFS "/system/gnome-vfs"
--#define ITEM_GCONF_HTTP_PROXY_PORT "http-proxy-port"
--#define ITEM_GCONF_HTTP_PROXY_HOST "http-proxy-host"
-+#define PATH_GCONF_GNOME_VFS "/system/http_proxy"
-+#define ITEM_GCONF_HTTP_PROXY_PORT "port"
-+#define ITEM_GCONF_HTTP_PROXY_HOST "host"
- #define KEY_GCONF_HTTP_PROXY_PORT (PATH_GCONF_GNOME_VFS "/" ITEM_GCONF_HTTP_PROXY_PORT)
- #define KEY_GCONF_HTTP_PROXY_HOST (PATH_GCONF_GNOME_VFS "/" ITEM_GCONF_HTTP_PROXY_HOST)
-
--#define ITEM_GCONF_USE_HTTP_PROXY "use-http-proxy"
-+#define ITEM_GCONF_USE_HTTP_PROXY "use_http_proxy"
- #define KEY_GCONF_USE_HTTP_PROXY (PATH_GCONF_GNOME_VFS "/" ITEM_GCONF_USE_HTTP_PROXY)
-
--#define KEY_GCONF_HTTP_AUTH_USER (PATH_GCONF_GNOME_VFS "/" "http-proxy-authorization-user")
--#define KEY_GCONF_HTTP_AUTH_PW (PATH_GCONF_GNOME_VFS "/" "http-proxy-authorization-password")
--#define KEY_GCONF_HTTP_USE_AUTH (PATH_GCONF_GNOME_VFS "/" "use-http-proxy-authorization")
-+#define KEY_GCONF_HTTP_AUTH_USER (PATH_GCONF_GNOME_VFS "/" "authentication_user")
-+#define KEY_GCONF_HTTP_AUTH_PW (PATH_GCONF_GNOME_VFS "/" "authentication_password")
-+#define KEY_GCONF_HTTP_USE_AUTH (PATH_GCONF_GNOME_VFS "/" "use_authentication")
-
-
- /* Some status code validation macros. */
---- gnome-vfs-1.0.5/modules/ftp-method.c.proxy 2001-08-06 23:02:04.000000000 +0200
-+++ gnome-vfs-1.0.5/modules/ftp-method.c 2002-09-12 18:27:20.000000000 +0200
-@@ -76,8 +76,8 @@
- #define IS_400(X) ((X) >= 400 && (X) < 500)
- #define IS_500(X) ((X) >= 500 && (X) < 600)
-
--static const char PROXY_KEY[] = "/system/gnome-vfs/http-proxy";
--static const char USE_PROXY_KEY[] = "/system/gnome-vfs/use-http-proxy";
-+static const char PROXY_KEY[] = "/system/http_proxy/host";
-+static const char USE_PROXY_KEY[] = "/system/http_proxy/use_http_proxy";
-
-
- static GnomeVFSResult do_open (GnomeVFSMethod *method,
---- gnome-vfs-1.0.5/modules/cdda-method.c.proxy 2001-07-16 20:22:27.000000000 +0200
-+++ gnome-vfs-1.0.5/modules/cdda-method.c 2002-09-12 18:27:20.000000000 +0200
-@@ -99,9 +99,9 @@
- long bytes);
-
-
--static const char PROXY_HOST_KEY[] = "/apps/nautilus/preferences/http-proxy-host";
--static const char PROXY_PORT_KEY[] = "/apps/nautilus/preferenceshttp-proxy-port";
--static const char USE_PROXY_KEY[] = "/apps/nautilus/preferencesuse-http-proxy";
-+static const char PROXY_HOST_KEY[] = "/system/http_proxy/host";
-+static const char PROXY_PORT_KEY[] = "/system/http_proxy/port";
-+static const char USE_PROXY_KEY[] = "/system/http_proxy/use_http_proxy";
-
- static CDDAContext *
- cdda_context_new (cdrom_drive *drive, GnomeVFSURI *uri)
projects / gentoo.git / commitdiff