openoffice.org-neon.diff

   1 --- ucb/source/ucp/webdav/NeonSession.cxx       18 Jul 2007 07:55:41 -0000      1.49
   2 +++ ucb/source/ucp/webdav/NeonSession.cxx       23 Aug 2007 09:48:56 -0000
   3 @@ -364,32 +364,6 @@
   4  }
   5
   6  // -------------------------------------------------------------------
   7 -extern "C" void NeonSession_ProgressNotify( void *,
   8 -                                            off_t,
   9 -                                            off_t )
  10 -{
  11 -    // progress: bytes read so far
  12 -    // total:    total bytes to read, -1 -> total count not known
  13 -}
  14 -
  15 -// -------------------------------------------------------------------
  16 -extern "C" void NeonSession_StatusNotify( void *,
  17 -                                          ne_conn_status,
  18 -                                          const char * )
  19 -{
  20 -#if 0
  21 -    typedef enum {
  22 -        ne_conn_namelookup, /* lookup up hostname (info = hostname) */
  23 -        ne_conn_connecting, /* connecting to host (info = hostname) */
  24 -        ne_conn_connected, /* connected to host (info = hostname) */
  25 -        ne_conn_secure /* connection now secure (info = crypto level) */
  26 -    } ne_conn_status;
  27 -#endif
  28 -
  29 -    // info: hostname
  30 -}
  31 -
  32 -// -------------------------------------------------------------------
  33  extern "C" void NeonSession_PreSendRequest( ne_request * req,
  34                                              void * userdata,
  35                                              ne_buffer * headers )
  36 @@ -578,13 +552,6 @@
  37                                  NeonUri::makeConnectionEndPointString(
  38                                      m_aHostName, m_nPort ) );
  39
  40 -        // Set a progress callback for the session.
  41 -        ne_set_progress( m_pHttpSession, NeonSession_ProgressNotify, this );
  42 -
  43 -        // Set a status notification callback for the session, to report
  44 -        // connection status.
  45 -        ne_set_status( m_pHttpSession, NeonSession_StatusNotify, this );
  46 -
  47          // Add hooks (i.e. for adding additional headers to the request)
  48
  49  #if 0
  50 diff -ru config_office/configure.in config_office/configure.in
  51 --- config_office/configure.in  2007-08-23 11:49:35.000000000 +0100
  52 +++ config_office/configure.in  2007-08-23 11:50:28.000000000 +0100
  53 @@ -4019,8 +4019,7 @@
  54  if test -n "$with_system_neon" -o -n "$with_system_libs" && \
  55         test "$with_system_neon" != "no"; then
  56          AC_MSG_RESULT([external])
  57 -        PKG_CHECK_MODULES(NEON, neon >= 0.26.0)
  58 -        PKG_CHECK_MODULES(NEON, neon < 0.27.0, , AC_MSG_ERROR([you need neon 0.26.x for system-neon]))
  59 +        PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
  60          NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
  61          NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
  62          SYSTEM_NEON=YES