AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-20 05:50:11 +00:00
Code Issues Projects Releases Wiki Activity

Use getters for http fields where available. (#364866, Björn Lindqvist)

Browse Source 
2006-12-27  Matthias Clasen  <mclasen@redhat.com>

        * modules/printbackends/cups/gtkprintbackendcups.c: Use
        getters for http fields where available.  (#364866,
        Björn Lindqvist)
This commit is contained in:
Matthias Clasen 2006-12-27 06:49:49 +00:00 committed by Matthias Clasen
parent 6ef83209bd
commit c5ef6f4b39
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-12-27 Matthias Clasen <mclasen@redhat.com>
* modules/printbackends/cups/gtkprintbackendcups.c: Use
getters for http fields where available. (#364866,
Björn Lindqvist)
2006-12-27 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwidget.c (gtk_widget_show): Add a g_return_if_fail.

35
modules/printbackends/cups/gtkprintbackendcups.c
View File

@ -270,7 +270,7 @@ _cairo_write_to_cups (void *closure,
while (length > 0)
{
g_io_channel_write_chars (io, data, length, &written, &error);
g_io_channel_write_chars (io, (gchar *)data, length, &written, &error);
if (error != NULL)
{
@ -504,26 +504,23 @@ cups_dispatch_watch_check (GSource *source)
poll_state = gtk_cups_request_get_poll_state (dispatch->request);
if (dispatch->data_poll == NULL &&
dispatch->request->http != NULL)
if (dispatch->request->http != NULL)
{
dispatch->data_poll = g_new0 (GPollFD, 1);
dispatch->data_poll->fd = dispatch->request->http->fd;
g_source_add_poll (source, dispatch->data_poll);
}
if (dispatch->data_poll != NULL && dispatch->request->http != NULL)
{
if (dispatch->data_poll->fd != dispatch->request->http->fd)
dispatch->data_poll->fd = dispatch->request->http->fd;
if (poll_state == GTK_CUPS_HTTP_READ)
dispatch->data_poll->events = G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI;
else if (poll_state == GTK_CUPS_HTTP_WRITE)
dispatch->data_poll->events = G_IO_OUT | G_IO_ERR;
if (dispatch->data_poll == NULL)
{
dispatch->data_poll = g_new0 (GPollFD, 1);
g_source_add_poll (source, dispatch->data_poll);
}
else
dispatch->data_poll->events = 0;
{
if (poll_state == GTK_CUPS_HTTP_READ)
dispatch->data_poll->events = G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI;
else if (poll_state == GTK_CUPS_HTTP_WRITE)
dispatch->data_poll->events = G_IO_OUT | G_IO_ERR;
else
dispatch->data_poll->events = 0;
}
dispatch->data_poll->fd = httpGetFd (dispatch->request->http);
}
if (poll_state != GTK_CUPS_HTTP_IDLE)