diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-04-30 06:03:01 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-04-30 06:03:01 +0000 |
| commit | 7253a5a2928f8dd555b43fcc92b01593ce1a22ec (patch) | |
| tree | 6e960f15840d1c9f0d672cfc0e4aa13206f3e2f8 /gtk/gtkpapersize.c | |
| parent | 23263cd43c0aa753d1901f8c286a4d9109f81b25 (diff) | |
| download | gtk+-7253a5a2928f8dd555b43fcc92b01593ce1a22ec.tar.gz | |
Rename gtk_paper_size_get_builtins() to gtk_paper_size_get_paper_sizes()
2007-04-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk.symbols:
* gtk/gtkpapersize.[hc]: Rename gtk_paper_size_get_builtins()
to gtk_paper_size_get_paper_sizes() and optionally include
custom paper sizes.
* gtk/gtkpagesetupunixdialog.c: Internally export a function
to load custom paper sizes.
* modules/printbackends/file/gtkprintbackendfile.c: Implement
printer_list_papers, returning all paper sizes. (#434329,
Christian Persch)
svn path=/trunk/; revision=17728
Diffstat (limited to 'gtk/gtkpapersize.c')
| -rw-r--r-- | gtk/gtkpapersize.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index c0045dc3df..12d23f2244 100644 --- a/gtk/gtkpapersize.c +++ b/gtk/gtkpapersize.c @@ -433,10 +433,14 @@ gtk_paper_size_is_equal (GtkPaperSize *size1, gtk_paper_size_get_name (size2)) == 0; } +GList * _gtk_load_custom_papers (void); + /** - * gtk_paper_size_get_builtins: + * gtk_paper_size_get_paper_sizes: + * @include_custom: whether to include custom paper sizes + * as defined in the page setup dialog * - * Creates a list of builtin paper sizes. + * Creates a list of known paper sizes. * * Return value: a newly allocated list of newly * allocated #GtkPaperSize objects @@ -444,11 +448,14 @@ gtk_paper_size_is_equal (GtkPaperSize *size1, * Since: 2.12 */ GList * -gtk_paper_size_get_builtins (void) +gtk_paper_size_get_paper_sizes (gboolean include_custom) { GList *list = NULL; guint i; + if (include_custom) + list = _gtk_load_custom_papers (); + for (i = 0; i < G_N_ELEMENTS (standard_names_offsets); ++i) { GtkPaperSize *size; @@ -457,9 +464,10 @@ gtk_paper_size_get_builtins (void) list = g_list_prepend (list, size); } - return list; + return g_list_reverse (list); } + /** * gtk_paper_size_get_name: * @size: a #GtkPaperSize object |