Don't use httpGetFd() when building against cups 1.1

2007-01-17  Matthias Clasen  <mclasen@redhat.com>

        * modules/printbackends/cups/gtkprintbackendcups.c: Don't use
        httpGetFd() when building against cups 1.1

svn path=/trunk/; revision=17170

diff --git a/ChangeLog b/ChangeLog
index 7bce967f10d23ed6aafd47a4123eb54036c66679..48300a2a75bc422b760ccc9ac07a5e2ec90e9ff1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/printbackends/cups/gtkprintbackendcups.c: Don't use
+       httpGetFd() when building against cups 1.1
+
 2007-01-17  Tor Lillqvist  <tml@novell.com>
 
        Proper fix for #396175:

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 6a31463acaa1a90c2e10c71a3d3d86a1434fc424..a758e0e6ad97dc712efdcd44c1bcd0fe3fbb9075 100644 (file)
--- 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)