callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further updates from the GtkPrintContext functions rename.

Browse Source 
2006-05-31  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtk.symbols:
	* demos/gtk-demo/printing.c:
	* tests/print-editor.c:
	* tests/testnouiprint.c:
	* tests/testprint.c:
	* tests/testprintfileoperation.c:
	Further updates from the GtkPrintContext functions rename.

	* modules/printbackends/cups/gtkcupsutils.c:
	Always set requesting-user-name when doing cups requests.
This commit is contained in:
Alexander Larsson
2006-05-31 14:06:02 +00:00
committed by Alexander Larsson
parent df6580e5ff
commit 50d17b73b6
9 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2006-05-31 Alexander Larsson <alexl@redhat.com>
* gtk/gtk.symbols:
* demos/gtk-demo/printing.c:
* tests/print-editor.c:
* tests/testnouiprint.c:
* tests/testprint.c:
* tests/testprintfileoperation.c:
Further updates from the GtkPrintContext functions rename.
* modules/printbackends/cups/gtkcupsutils.c:
Always set requesting-user-name when doing cups requests.
2006-05-31 Alexander Larsson <alexl@redhat.com> 2006-05-31 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c: * gtk/gtkpagesetupunixdialog.c:

13
ChangeLog.pre-2-10
View File

@ -1,3 +1,16 @@
2006-05-31 Alexander Larsson <alexl@redhat.com>
* gtk/gtk.symbols:
* demos/gtk-demo/printing.c:
* tests/print-editor.c:
* tests/testnouiprint.c:
* tests/testprint.c:
* tests/testprintfileoperation.c:
Further updates from the GtkPrintContext functions rename.
* modules/printbackends/cups/gtkcupsutils.c:
Always set requesting-user-name when doing cups requests.
2006-05-31 Alexander Larsson <alexl@redhat.com> 2006-05-31 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c: * gtk/gtkpagesetupunixdialog.c:

6
demos/gtk-demo/printing.c
View File

@ -66,7 +66,7 @@ draw_page (GtkPrintOperation *operation,
PangoFontDescription *desc; PangoFontDescription *desc;
gchar *page_str; gchar *page_str;
cr = gtk_print_context_get_cairo (context); cr = gtk_print_context_get_cairo_context (context);
width = gtk_print_context_get_width (context); width = gtk_print_context_get_width (context);
cairo_rectangle (cr, 0, 0, width, HEADER_HEIGHT); cairo_rectangle (cr, 0, 0, width, HEADER_HEIGHT);
@ -78,7 +78,7 @@ draw_page (GtkPrintOperation *operation,
cairo_set_line_width (cr, 1); cairo_set_line_width (cr, 1);
cairo_stroke (cr); cairo_stroke (cr);
layout = gtk_print_context_create_layout (context); layout = gtk_print_context_create_pango_layout (context);
desc = pango_font_description_from_string ("sans 14"); desc = pango_font_description_from_string ("sans 14");
pango_layout_set_font_description (layout, desc); pango_layout_set_font_description (layout, desc);
@ -104,7 +104,7 @@ draw_page (GtkPrintOperation *operation,
g_object_unref (layout); g_object_unref (layout);
layout = gtk_print_context_create_layout (context); layout = gtk_print_context_create_pango_layout (context);
desc = pango_font_description_from_string ("mono"); desc = pango_font_description_from_string ("mono");
pango_font_description_set_size (desc, data->font_size * PANGO_SCALE); pango_font_description_set_size (desc, data->font_size * PANGO_SCALE);

8
gtk/gtk.symbols
View File

@ -2569,15 +2569,15 @@ gtk_print_backend_load_modules
#if IN_HEADER(__GTK_PRINT_CONTEXT_H__) #if IN_HEADER(__GTK_PRINT_CONTEXT_H__)
#if IN_FILE(__GTK_PRINT_CONTEXT_C__) #if IN_FILE(__GTK_PRINT_CONTEXT_C__)
gtk_print_context_get_type G_GNUC_CONST gtk_print_context_get_type G_GNUC_CONST
gtk_print_context_get_cairo gtk_print_context_get_cairo_context
gtk_print_context_get_page_setup gtk_print_context_get_page_setup
gtk_print_context_get_width gtk_print_context_get_width
gtk_print_context_get_height gtk_print_context_get_height
gtk_print_context_get_dpi_x gtk_print_context_get_dpi_x
gtk_print_context_get_dpi_y gtk_print_context_get_dpi_y
gtk_print_context_get_fontmap gtk_print_context_get_pango_fontmap
gtk_print_context_create_context gtk_print_context_create_pango_context
gtk_print_context_create_layout gtk_print_context_create_pango_layout
#endif #endif
#endif #endif

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

@ -151,6 +151,10 @@ gtk_cups_request_new (http_t *connection,
"attributes-natural-language", "attributes-natural-language",
NULL, language->language); NULL, language->language);
gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name",
NULL, cupsUser());
cupsLangFree (language); cupsLangFree (language);
return request; return request;

4
tests/print-editor.c
View File

@ -265,7 +265,7 @@ begin_print (GtkPrintOperation *operation,
width = gtk_print_context_get_width (context); width = gtk_print_context_get_width (context);
height = gtk_print_context_get_height (context); height = gtk_print_context_get_height (context);
print_data->layout = gtk_print_context_create_layout (context); print_data->layout = gtk_print_context_create_pango_layout (context);
desc = pango_font_description_from_string (print_data->font); desc = pango_font_description_from_string (print_data->font);
pango_layout_set_font_description (print_data->layout, desc); pango_layout_set_font_description (print_data->layout, desc);
@ -331,7 +331,7 @@ draw_page (GtkPrintOperation *operation,
else else
end = GPOINTER_TO_INT (pagebreak->data); end = GPOINTER_TO_INT (pagebreak->data);
cr = gtk_print_context_get_cairo (context); cr = gtk_print_context_get_cairo_context (context);
cairo_set_source_rgb (cr, 0, 0, 0); cairo_set_source_rgb (cr, 0, 0, 0);

4
tests/testnouiprint.c
View File

@ -31,7 +31,7 @@ draw_page (GtkPrintOperation *operation,
PangoLayout *layout; PangoLayout *layout;
PangoFontDescription *desc; PangoFontDescription *desc;
cr = gtk_print_context_get_cairo (context); cr = gtk_print_context_get_cairo_context (context);
/* Draw a red rectangle, as wide as the paper (inside the margins) */ /* Draw a red rectangle, as wide as the paper (inside the margins) */
cairo_set_source_rgb (cr, 1.0, 0, 0); cairo_set_source_rgb (cr, 1.0, 0, 0);
@ -54,7 +54,7 @@ draw_page (GtkPrintOperation *operation,
/* Draw some text */ /* Draw some text */
layout = gtk_print_context_create_layout (context); layout = gtk_print_context_create_pango_layout (context);
pango_layout_set_text (layout, "Hello World! Printing is easy", -1); pango_layout_set_text (layout, "Hello World! Printing is easy", -1);
desc = pango_font_description_from_string ("sans 28"); desc = pango_font_description_from_string ("sans 28");
pango_layout_set_font_description (layout, desc); pango_layout_set_font_description (layout, desc);

4
tests/testprint.c
View File

@ -51,7 +51,7 @@ draw_page (GtkPrintOperation *operation,
PangoLayout *layout; PangoLayout *layout;
PangoFontDescription *desc; PangoFontDescription *desc;
cr = gtk_print_context_get_cairo (context); cr = gtk_print_context_get_cairo_context (context);
/* Draw a red rectangle, as wide as the paper (inside the margins) */ /* Draw a red rectangle, as wide as the paper (inside the margins) */
cairo_set_source_rgb (cr, 1.0, 0, 0); cairo_set_source_rgb (cr, 1.0, 0, 0);
@ -74,7 +74,7 @@ draw_page (GtkPrintOperation *operation,
/* Draw some text */ /* Draw some text */
layout = gtk_print_context_create_layout (context); layout = gtk_print_context_create_pango_layout (context);
pango_layout_set_text (layout, "Hello World! Printing is easy", -1); pango_layout_set_text (layout, "Hello World! Printing is easy", -1);
desc = pango_font_description_from_string ("sans 28"); desc = pango_font_description_from_string ("sans 28");
pango_layout_set_font_description (layout, desc); pango_layout_set_font_description (layout, desc);

6
tests/testprintfileoperation.c
View File

@ -86,7 +86,7 @@ test_print_file_operation_draw_page (GtkPrintOperation *operation,
PangoFontDescription *desc; PangoFontDescription *desc;
char *page_str; char *page_str;
cr = gtk_print_context_get_cairo (context); cr = gtk_print_context_get_cairo_context (context);
width = gtk_print_context_get_width (context); width = gtk_print_context_get_width (context);
cairo_rectangle (cr, 0, 0, width, HEADER_HEIGHT); cairo_rectangle (cr, 0, 0, width, HEADER_HEIGHT);
@ -98,7 +98,7 @@ test_print_file_operation_draw_page (GtkPrintOperation *operation,
cairo_set_line_width (cr, 1); cairo_set_line_width (cr, 1);
cairo_stroke (cr); cairo_stroke (cr);
layout = gtk_print_context_create_layout (context); layout = gtk_print_context_create_pango_layout (context);
desc = pango_font_description_from_string ("sans 14"); desc = pango_font_description_from_string ("sans 14");
pango_layout_set_font_description (layout, desc); pango_layout_set_font_description (layout, desc);
@ -124,7 +124,7 @@ test_print_file_operation_draw_page (GtkPrintOperation *operation,
g_object_unref (layout); g_object_unref (layout);
layout = gtk_print_context_create_layout (context); layout = gtk_print_context_create_pango_layout (context);
desc = pango_font_description_from_string ("mono"); desc = pango_font_description_from_string ("mono");
pango_font_description_set_size (desc, op->font_size * PANGO_SCALE); pango_font_description_set_size (desc, op->font_size * PANGO_SCALE);