diff options
author | Colin Walters <walters@verbum.org> | 2009-12-10 08:23:40 -0200 |
---|---|---|
committer | Johan Dahlin <johan@gnome.org> | 2009-12-16 17:22:01 -0200 |
commit | 6529c07614ebfbfac73f526efb057d8a8e3a7354 (patch) | |
tree | 6470d8b8af29900905a07ff7838d180cec8fd36e /gtk/gtkprintoperation.c | |
parent | b3c48a4501d77c15ae236f1fe4514cc02de187f3 (diff) | |
download | gtk+-6529c07614ebfbfac73f526efb057d8a8e3a7354.tar.gz |
[introspection] Merge in Gtk-custom.c annotations
The Gtk-custom.c file in gir-repository contained a number of
introspection annotations. Merge those into the GTK source files.
Some documentation was moved from the tmpl/ files to accomodate
the addition of annotations.
Diffstat (limited to 'gtk/gtkprintoperation.c')
-rw-r--r-- | gtk/gtkprintoperation.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 9e7b58137c..bc1b27f57d 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -1361,8 +1361,8 @@ gtk_print_operation_new (void) /** * gtk_print_operation_set_default_page_setup: * @op: a #GtkPrintOperation - * @default_page_setup: a #GtkPageSetup, or %NULL - * + * @default_page_setup: (allow-none): a #GtkPageSetup, or %NULL + * * Makes @default_page_setup the default page setup for @op. * * This page setup will be used by gtk_print_operation_run(), @@ -1420,8 +1420,8 @@ gtk_print_operation_get_default_page_setup (GtkPrintOperation *op) /** * gtk_print_operation_set_print_settings: * @op: a #GtkPrintOperation - * @print_settings: #GtkPrintSettings, or %NULL - * + * @print_settings: (allow-none): #GtkPrintSettings + * * Sets the print settings for @op. This is typically used to * re-establish print settings from a previous print operation, * see gtk_print_operation_run(). @@ -2992,9 +2992,9 @@ gtk_print_operation_get_error (GtkPrintOperation *op, * gtk_print_operation_run: * @op: a #GtkPrintOperation * @action: the action to start - * @parent: Transient parent of the dialog, or %NULL + * @parent: (allow-none): Transient parent of the dialog * @error: Return location for errors, or %NULL - * + * * Runs the print operation, by first letting the user modify * print settings in the print dialog, and then print the document. * |