projects / packages / buoh.git / blame
| Commit | Line | Data |
|---|---|---|
| f93a75fc MB |
1 | diff -ur buoh-0.8.2.orig/configure.in buoh-0.8.2/configure.in |
| 2 | --- buoh-0.8.2.orig/configure.in 2006-10-22 17:59:48.000000000 -0400 | |
| 3 | +++ buoh-0.8.2/configure.in 2008-01-30 13:39:23.000000000 -0500 | |
| 4 | @@ -29,13 +29,13 @@ | |
| 5 | ||
| 6 | GLIB_REQUIRED=2.6.0 | |
| 7 | GTK_REQUIRED=2.6.0 | |
| 8 | -LIBSOUP_REQUIRED=2.2.0 | |
| 9 | +LIBSOUP_REQUIRED=2.3.0.1 | |
| 10 | GCONF_REQUIRED=2.2.0 | |
| 11 | ||
| 12 | PKG_CHECK_MODULES(BUOH, | |
| 13 | glib-2.0 >= $GLIB_REQUIRED | |
| 14 | gtk+-2.0 >= $GTK_REQUIRED | |
| 15 | - libsoup-2.2 >= $LIBSOUP_REQUIRED | |
| 16 | + libsoup-2.4 >= $LIBSOUP_REQUIRED | |
| 17 | gconf-2.0 >= $GCONF_REQUIRED) | |
| 18 | AC_SUBST(BUOH_CFLAGS) | |
| 19 | AC_SUBST(BUOH_LIBS) | |
| 20 | diff -ur buoh-0.8.2.orig/src/buoh-comic-loader.c buoh-0.8.2/src/buoh-comic-loader.c | |
| 21 | --- buoh-0.8.2.orig/src/buoh-comic-loader.c 2006-10-21 10:56:37.000000000 -0400 | |
| 22 | +++ buoh-0.8.2/src/buoh-comic-loader.c 2008-01-30 13:41:22.000000000 -0500 | |
| 23 | @@ -202,7 +202,7 @@ | |
| 24 | ||
| 25 | proxy_uri = buoh_get_http_proxy_uri (BUOH); | |
| 26 | if (proxy_uri) { | |
| 27 | - SoupUri *soup_uri = soup_uri_new (proxy_uri); | |
| 28 | + SoupURI *soup_uri = soup_uri_new (proxy_uri); | |
| 29 | ||
| 30 | job->session = soup_session_sync_new_with_options (SOUP_SESSION_PROXY_URI, soup_uri, NULL); | |
| 31 | ||
| 32 | @@ -235,6 +235,7 @@ | |
| 33 | ||
| 34 | static void | |
| 35 | buoh_comic_loader_job_read_next (SoupMessage *msg, | |
| 36 | + SoupBuffer *chunk, | |
| 37 | BuohComicLoaderJob *job) | |
| 38 | { | |
| 39 | gboolean success; | |
| 40 | @@ -252,15 +253,14 @@ | |
| 41 | msg->reason_phrase); | |
| 42 | } | |
| 43 | ||
| 44 | - soup_message_set_status (msg, SOUP_STATUS_CANCELLED); | |
| 45 | - soup_session_cancel_message (job->session, msg); | |
| 46 | + soup_session_cancel_message (job->session, msg, SOUP_STATUS_CANCELLED); | |
| 47 | ||
| 48 | return; | |
| 49 | } | |
| 50 | ||
| 51 | if (job->callback) { | |
| 52 | - job->callback (msg->response.body, | |
| 53 | - msg->response.length, | |
| 54 | + job->callback (chunk->data, | |
| 55 | + chunk->length, | |
| 56 | job->callback_data); | |
| 57 | } | |
| 58 | } | |
| 59 | @@ -275,9 +275,9 @@ | |
| 60 | msg = soup_message_new (SOUP_METHOD_GET, job->uri); | |
| 61 | ||
| 62 | soup_message_set_flags (msg, SOUP_MESSAGE_OVERWRITE_CHUNKS); | |
| 63 | - soup_message_add_handler (msg, SOUP_HANDLER_BODY_CHUNK, | |
| 64 | - (SoupMessageCallbackFn)buoh_comic_loader_job_read_next, | |
| 65 | - (gpointer) job); | |
| 66 | + g_signal_connect (msg, "got-chunk", | |
| 67 | + G_CALLBACK (buoh_comic_loader_job_read_next), | |
| 68 | + (gpointer) job); | |
| 69 | ||
| 70 | buoh_debug ("resolving . . ."); | |
| 71 |