From 505c6149ccb651e9b9c0d19c6f82da5b43016ac9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 17 Jun 2006 01:04:50 +0000 Subject: [PATCH] Use stock print icons; make it compile --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ modules/printbackends/cups/gtkprintbackendcups.c | 2 +- modules/printbackends/lpr/gtkprintbackendlpr.c | 5 ++--- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e218906a4..cbeba40194 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-06-16 Matthias Clasen + * modules/printbackends/cups/gtkprintbackendcups.c: + * modules/printbackends/lpr/gtkprintbackendlpr.c: Use a stock icon + for printers. + * gtk/gtkprintunixdialog.c (add_option_to_table): Don't grow additional columns. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3e218906a4..cbeba40194 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-06-16 Matthias Clasen + * modules/printbackends/cups/gtkprintbackendcups.c: + * modules/printbackends/lpr/gtkprintbackendlpr.c: Use a stock icon + for printers. + * gtk/gtkprintunixdialog.c (add_option_to_table): Don't grow additional columns. diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c index 8bd7b79f68..c649746330 100644 --- a/modules/printbackends/cups/gtkprintbackendcups.c +++ b/modules/printbackends/cups/gtkprintbackendcups.c @@ -648,7 +648,7 @@ cups_request_printer_info_cb (GtkPrintBackendCups *backend, response = gtk_cups_result_get_response (result); /* TODO: determine printer type and use correct icon */ - gtk_printer_set_icon_name (printer, "printer"); + gtk_printer_set_icon_name (printer, "gtk-print"); state_msg = ""; loc = ""; diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.c b/modules/printbackends/lpr/gtkprintbackendlpr.c index c4b6bda5b1..f864637553 100644 --- a/modules/printbackends/lpr/gtkprintbackendlpr.c +++ b/modules/printbackends/lpr/gtkprintbackendlpr.c @@ -34,10 +34,9 @@ #include #include "gtkprintoperation.h" - #include "gtkprintbackendlpr.h" - #include "gtkprinter.h" +#include "gtkprinter-private.h" typedef struct _GtkPrintBackendLprClass GtkPrintBackendLprClass; @@ -384,7 +383,7 @@ gtk_print_backend_lpr_init (GtkPrintBackendLpr *backend) GTK_PRINT_BACKEND (backend), TRUE); gtk_printer_set_has_details (printer, TRUE); - gtk_printer_set_icon_name (printer, "printer"); + gtk_printer_set_icon_name (printer, "gtk-print"); gtk_printer_set_is_active (printer, TRUE); gtk_printer_set_is_default (printer, TRUE);