From f7d932d49999447a3a5236aa885301fbc5bbcb28 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 17 Jan 2007 06:10:08 +0000 Subject: [PATCH] Don't use httpGetFd() when building against cups 1.1 2007-01-17 Matthias Clasen * modules/printbackends/cups/gtkprintbackendcups.c: Don't use httpGetFd() when building against cups 1.1 svn path=/trunk/; revision=17170 --- ChangeLog | 5 +++++ modules/printbackends/cups/gtkprintbackendcups.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7bce967f10..48300a2a75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-17 Matthias Clasen + + * modules/printbackends/cups/gtkprintbackendcups.c: Don't use + httpGetFd() when building against cups 1.1 + 2007-01-17 Tor Lillqvist Proper fix for #396175: diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c index 6a31463aca..a758e0e6ad 100644 --- a/modules/printbackends/cups/gtkprintbackendcups.c +++ b/modules/printbackends/cups/gtkprintbackendcups.c @@ -519,7 +519,12 @@ cups_dispatch_watch_check (GSource *source) else dispatch->data_poll->events = 0; } + +#ifdef HAVE_CUPS_API_1_2 dispatch->data_poll->fd = httpGetFd (dispatch->request->http); +#else + dispatch->data_poll->fd = dispatch->request->http->fd; +#fi } if (poll_state != GTK_CUPS_HTTP_IDLE)