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

printing: Check connection to remote CUPS server on correct port

Browse Source 
Add parameter for specification of port to gtk_cups_connection_cups_new().
Use default port returned by ippPort() if the given port is lower than 0.

https://bugzilla.gnome.org/show_bug.cgi?id=693738
This commit is contained in:
Marek Kasik 2014-07-11 11:33:30 +02:00
parent 36678306a0
commit b4f06ca49f
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/printbackends/cups/gtkcupsutils.c
View File

@ -1522,14 +1522,18 @@ gtk_cups_result_get_error_string (GtkCupsResult *result)
* a socket for communication with a CUPS server 'server'. * a socket for communication with a CUPS server 'server'.
*/ */
GtkCupsConnectionTest * GtkCupsConnectionTest *
gtk_cups_connection_test_new (const char *server) gtk_cups_connection_test_new (const char *server,
const int port)
{ {
GtkCupsConnectionTest *result = NULL; GtkCupsConnectionTest *result = NULL;
gchar *port_str = NULL; gchar *port_str = NULL;
result = g_new (GtkCupsConnectionTest, 1); result = g_new (GtkCupsConnectionTest, 1);
port_str = g_strdup_printf ("%d", ippPort ()); if (port >= 0)
port_str = g_strdup_printf ("%d", port);
else
port_str = g_strdup_printf ("%d", ippPort ());
if (server != NULL) if (server != NULL)
result->addrlist = httpAddrGetList (server, AF_UNSPEC, port_str); result->addrlist = httpAddrGetList (server, AF_UNSPEC, port_str);

3
modules/printbackends/cups/gtkcupsutils.h
View File

@ -187,7 +187,8 @@ GtkCupsErrorType gtk_cups_result_get_error_type (GtkCupsResult *
int gtk_cups_result_get_error_status (GtkCupsResult *result); int gtk_cups_result_get_error_status (GtkCupsResult *result);
int gtk_cups_result_get_error_code (GtkCupsResult *result); int gtk_cups_result_get_error_code (GtkCupsResult *result);
const char * gtk_cups_result_get_error_string (GtkCupsResult *result); const char * gtk_cups_result_get_error_string (GtkCupsResult *result);
GtkCupsConnectionTest * gtk_cups_connection_test_new (const char *server); GtkCupsConnectionTest * gtk_cups_connection_test_new (const char *server,
const int port);
GtkCupsConnectionState gtk_cups_connection_test_get_state (GtkCupsConnectionTest *test); GtkCupsConnectionState gtk_cups_connection_test_get_state (GtkCupsConnectionTest *test);
void gtk_cups_connection_test_free (GtkCupsConnectionTest *test); void gtk_cups_connection_test_free (GtkCupsConnectionTest *test);

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

@ -3609,7 +3609,7 @@ cups_get_printer_list (GtkPrintBackend *backend)
cups_backend = GTK_PRINT_BACKEND_CUPS (backend); cups_backend = GTK_PRINT_BACKEND_CUPS (backend);
if (cups_backend->cups_connection_test == NULL) if (cups_backend->cups_connection_test == NULL)
cups_backend->cups_connection_test = gtk_cups_connection_test_new (NULL); cups_backend->cups_connection_test = gtk_cups_connection_test_new (NULL, -1);
if (cups_backend->list_printers_poll == 0) if (cups_backend->list_printers_poll == 0)
{ {
@ -4019,7 +4019,7 @@ cups_get_default_printer (GtkPrintBackendCups *backend)
cups_backend = backend; cups_backend = backend;
if (cups_backend->cups_connection_test == NULL) if (cups_backend->cups_connection_test == NULL)
cups_backend->cups_connection_test = gtk_cups_connection_test_new (NULL); cups_backend->cups_connection_test = gtk_cups_connection_test_new (NULL, -1);
if (cups_backend->default_printer_poll == 0) if (cups_backend->default_printer_poll == 0)
{ {
@ -4161,7 +4161,9 @@ cups_printer_request_details (GtkPrinter *printer)
{ {
if (cups_printer->get_remote_ppd_poll == 0) if (cups_printer->get_remote_ppd_poll == 0)
{ {
cups_printer->remote_cups_connection_test = gtk_cups_connection_test_new (cups_printer->hostname); cups_printer->remote_cups_connection_test =
gtk_cups_connection_test_new (cups_printer->hostname,
cups_printer->port);
if (cups_request_ppd (printer)) if (cups_request_ppd (printer))
{ {