Attachment 293469 Details for Bug 430943 – patch to build buoh with libsoup 2.4

[patch] patch to build buoh with libsoup 2.4

buoh.diff (text/plain), 2.14 KB, created by Dan Winship on 2008-01-30 18:56:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Winship

Created: 2008-01-30 18:56:52 UTC

Size: 2.14 KB

patch

obsolete

>diff -ur buoh-0.8.2.orig/configure.in buoh-0.8.2/configure.in
>--- buoh-0.8.2.orig/configure.in	2006-10-22 17:59:48.000000000 -0400
>+++ buoh-0.8.2/configure.in	2008-01-30 13:39:23.000000000 -0500
>@@ -29,13 +29,13 @@
> 
> GLIB_REQUIRED=2.6.0
> GTK_REQUIRED=2.6.0
>-LIBSOUP_REQUIRED=2.2.0
>+LIBSOUP_REQUIRED=2.3.0.1
> GCONF_REQUIRED=2.2.0
> 
> PKG_CHECK_MODULES(BUOH, 
> 		  glib-2.0       >= $GLIB_REQUIRED
> 		  gtk+-2.0       >= $GTK_REQUIRED 
>-		  libsoup-2.2    >= $LIBSOUP_REQUIRED
>+		  libsoup-2.4    >= $LIBSOUP_REQUIRED
> 		  gconf-2.0      >= $GCONF_REQUIRED) 
> AC_SUBST(BUOH_CFLAGS)
> AC_SUBST(BUOH_LIBS)
>diff -ur buoh-0.8.2.orig/src/buoh-comic-loader.c buoh-0.8.2/src/buoh-comic-loader.c
>--- buoh-0.8.2.orig/src/buoh-comic-loader.c	2006-10-21 10:56:37.000000000 -0400
>+++ buoh-0.8.2/src/buoh-comic-loader.c	2008-01-30 13:41:22.000000000 -0500
>@@ -202,7 +202,7 @@
> 
> 	proxy_uri = buoh_get_http_proxy_uri (BUOH);
> 	if (proxy_uri) {
>-		SoupUri *soup_uri = soup_uri_new (proxy_uri);
>+		SoupURI *soup_uri = soup_uri_new (proxy_uri);
> 
> 		job->session = soup_session_sync_new_with_options (SOUP_SESSION_PROXY_URI, soup_uri, NULL);
> 		
>@@ -235,6 +235,7 @@
> 
> static void
> buoh_comic_loader_job_read_next (SoupMessage        *msg,
>+				 SoupBuffer         *chunk,
> 				 BuohComicLoaderJob *job)
> {
> 	gboolean success;
>@@ -252,15 +253,14 @@
> 						  msg->reason_phrase);
> 		}
> 
>-		soup_message_set_status (msg, SOUP_STATUS_CANCELLED);
>-		soup_session_cancel_message (job->session, msg);
>+		soup_session_cancel_message (job->session, msg, SOUP_STATUS_CANCELLED);
> 
> 		return;
> 	}
> 
> 	if (job->callback) {
>-		job->callback (msg->response.body,
>-			       msg->response.length,
>+		job->callback (chunk->data,
>+			       chunk->length,
> 			       job->callback_data);
> 	}
> }
>@@ -275,9 +275,9 @@
> 	msg = soup_message_new (SOUP_METHOD_GET, job->uri);
> 	
> 	soup_message_set_flags (msg, SOUP_MESSAGE_OVERWRITE_CHUNKS);
>-	soup_message_add_handler (msg, SOUP_HANDLER_BODY_CHUNK,
>-				  (SoupMessageCallbackFn)buoh_comic_loader_job_read_next,
>-				  (gpointer) job);
>+	g_signal_connect (msg, "got-chunk",
>+			  G_CALLBACK (buoh_comic_loader_job_read_next),
>+			  (gpointer) job);
> 
> 	buoh_debug ("resolving . . .");
>

Actions: View | Diff

Attachments on bug 430943: 293469