Bug#398125: gaim-librvp will not run or build with gaim 2.0.0beta5

[Ari Pollak]

Package: gaim-librvp
Version: 0.9.5-1
Severity: grave
Tags: patch

With the upload of gaim 2.0.0beta5, gaim-librvp will not build or run
due to a gaim ABI change. Attached is a patch which will fix the
problem.

diff -ur librvp-0.9.5.orig/rvp.c librvp-0.9.5/rvp.c
--- librvp-0.9.5.orig/rvp.c	2006-11-11 16:18:29.000000000 -0500
+++ librvp-0.9.5/rvp.c	2006-11-11 16:25:24.000000000 -0500
@@ -2465,7 +2465,7 @@
               }
             }
           } else { /* type = RECV */
-            gaim_proxy_connect( xfer->account, ipaddr, atoi( port ),
+            gaim_proxy_connect( NULL, xfer->account, ipaddr, atoi( port ),
                                 rvp_xfer_connect_callback, xfer );
           }
         }
@@ -5609,7 +5609,7 @@
           gaim_debug_misc( __FUNCTION__, "Reconnection required (%s)\n",
                            gfd->website.address );
 
-          if (( sock = gaim_proxy_connect( ac, gfd->website.address,
+          if (( sock = gaim_proxy_connect( NULL, ac, gfd->website.address,
                                            gfd->website.port, url_fetched_cb,
                                            gfd )) < 0 ) {
             rvp_async_data( gc, gfd, 0 );
@@ -5825,7 +5825,7 @@
           gfd->parsedheaders = NULL;
         }
 
-        if (( sock = gaim_proxy_connect( ac, gfd->website.address,
+        if (( sock = gaim_proxy_connect( NULL, ac, gfd->website.address,
                                          gfd->website.port, url_fetched_cb,
                                          gfd )) < 0 ) {
           rvp_async_data( gc, gfd, 0 );
@@ -6476,7 +6476,7 @@
   }
 
   if (( sock =
-        gaim_proxy_connect( ac, gfud->website.address,
+        gaim_proxy_connect( NULL, ac, gfud->website.address,
                             gfud->website.port, url_fetched_cb, gfud )) < 0 ) {
     rvp_async_data( gc, gfud, 0 );
     destroy_fetch_url_data( gfud );
@@ -6725,7 +6725,7 @@
   rd->domain = g_strdup( domain );
   rd->authid = g_strdup( id );
 
-  if ( gaim_proxy_connect( account, rd->authhost, rd->port,
+  if ( gaim_proxy_connect( NULL, account, rd->authhost, rd->port,
                            rvp_login_connect, gc ) < 0 ) {
     gaim_connection_error(gc, _("Failed to connect to server."));
   }