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

Close the http connection after getting the PPD.

Browse Source 
2007-01-03  Matthias Clasen  <mclasen@redhat.com>

        * modules/printbackends/cups/gtkprintbackendcups.c: Close
        the http connection after getting the PPD.

 

svn path=/trunk/; revision=17042
This commit is contained in:
Matthias Clasen 2007-01-04 00:12:04 +00:00 committed by Matthias Clasen
parent e9f1fe16bc
commit d6b33b2ad5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2007-01-03 Matthias Clasen <mclasen@redhat.com> 2007-01-03 Matthias Clasen <mclasen@redhat.com>
* modules/printbackends/cups/gtkprintbackendcups.c: Close
the http connection after getting the PPD.
* gtk/gtkprinteroptionwidget.c (filesave_changed_cb): * gtk/gtkprinteroptionwidget.c (filesave_changed_cb):
Fix memory leaks. Fix memory leaks.

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

@ -1202,6 +1202,7 @@ cups_get_printer_list (GtkPrintBackend *backend)
typedef struct { typedef struct {
GtkPrinterCups *printer; GtkPrinterCups *printer;
GIOChannel *ppd_io; GIOChannel *ppd_io;
http_t *http;
} GetPPDData; } GetPPDData;
static void static void
@ -1209,7 +1210,7 @@ get_ppd_data_free (GetPPDData *data)
{ {
GTK_NOTE (PRINTING, GTK_NOTE (PRINTING,
g_print ("CUPS Backend: %s\n", G_STRFUNC)); g_print ("CUPS Backend: %s\n", G_STRFUNC));
httpClose (data->http);
g_io_channel_unref (data->ppd_io); g_io_channel_unref (data->ppd_io);
g_object_unref (data->printer); g_object_unref (data->printer);
g_free (data); g_free (data);
@ -1265,11 +1266,10 @@ cups_request_ppd (GtkPrinter *printer)
GTK_NOTE (PRINTING, GTK_NOTE (PRINTING,
g_print ("CUPS Backend: %s\n", G_STRFUNC)); g_print ("CUPS Backend: %s\n", G_STRFUNC));
/* FIXME this can return NULL! */
http = httpConnectEncrypt (cups_printer->hostname, http = httpConnectEncrypt (cups_printer->hostname,
cups_printer->port, cups_printer->port,
cupsEncryption ()); cupsEncryption ());
data = g_new0 (GetPPDData, 1); data = g_new0 (GetPPDData, 1);
fd = g_file_open_tmp ("gtkprint_ppd_XXXXXX", fd = g_file_open_tmp ("gtkprint_ppd_XXXXXX",
@ -1296,6 +1296,7 @@ cups_request_ppd (GtkPrinter *printer)
return; return;
} }
data->http = http;
fchmod (fd, S_IRUSR | S_IWUSR); fchmod (fd, S_IRUSR | S_IWUSR);
data->ppd_io = g_io_channel_unix_new (fd); data->ppd_io = g_io_channel_unix_new (fd);
g_io_channel_set_encoding (data->ppd_io, NULL, NULL); g_io_channel_set_encoding (data->ppd_io, NULL, NULL);
@ -1304,8 +1305,9 @@ cups_request_ppd (GtkPrinter *printer)
data->printer = g_object_ref (printer); data->printer = g_object_ref (printer);
resource = g_strdup_printf ("/printers/%s.ppd", resource = g_strdup_printf ("/printers/%s.ppd",
gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS(printer))); gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
request = gtk_cups_request_new (http,
request = gtk_cups_request_new (data->http,
GTK_CUPS_GET, GTK_CUPS_GET,
0, 0,
data->ppd_io, data->ppd_io,