gtk/gtkfilesel.c | 291 264 + 27 - 0 !
gtk/stock-icons/ximian-icons.h | 825 825 + 0 - 0 !
2 files changed, 1089 insertions(+), 27 deletions(-)

 ximian patch to improve the gtkfilesel ui

Requested by Ross Burton in 2003.

TODO: What does this patch do and why do we have it?

[Jonathan Brandmeyer: Use ~/Desktop instead of ~/.gnome2-desktop]

configure.ac | 23 19 + 4 - 0 !
1 file changed, 19 insertions(+), 4 deletions(-)

 support disabling x11 extensions

We want this in Debian as we build GTK with extensions enabled for the
normal build, but disable them for the special build that will be used
in the graphical installer, because it needs to be as small as possible.

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=612918

gtk/gtksettings.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 set the default gtk-fallback-icon-theme

[jbicha: Use Adwaita instead of gnome to match gtk3]

Similar to GTK 3 commit 2488b954f24c01f99995ff22898628c57b4aedc1 in
3.13.2.

Bug-Debian: https://bugs.debian.org/421353

gtk/gtktreeview.c | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 don't select the focused item for gtk_selection_single type
 treeviews

This allows the fix in 040_filechooser_single-click.patch to work.

gtk/gtksearchenginetracker.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 enable tracker full text search

Tracker in Debian is compiled with FTS support, so we make use of that in
GTK3's file selector dialog.
This way files can be found by their content and not only their file name.

gtk/updateiconcache.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 don't list images from unknown directories in icon cache

After GTK 2.12.0, gtk-update-icon-cache fails if there is a PNG file
placed directly in /usr/share/icons/hicolor (not in a correct
subdirectory like 48x48/apps).

modules/printbackends/lpr/gtkprintbackendlpr.c | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 use pdf as default printing standard

Original author unknown. https://wiki.ubuntu.com/PDFasStandardPrintJobFormat

gtk/gtkmisc.c | 32 32 + 0 - 0 !
1 file changed, 32 insertions(+)

 reinstate marshallers that accidentally became part of the abi

gtkmarshal.c in GTK 2.24.32 was generated by a version of
glib-genmarshal that produced unintended symbols. It was regenerated
for 2.24.33, but it looks as though a few packages might already be
referring to those symbols. Patch them back in for ABI compatibility.

gtk/gtktextlayout.c | 11 11 + 0 - 0 !
1 file changed, 11 insertions(+)

 textlayout: clamp width to the value we asked for, as a hack for d-i

When we ask Pango to lay out text with a particular width in mind, if
the width is really narrow then reducing it can result in Pango asking
for *more* space. This can result in a relayout loop in the Debian
installer. Avoid this by restricting the width to be no more than what
we asked for, which might result in text being clipped or overlapping
with an adjacent widget but is better than an infinite loop.

Signed-off-by: Simon McVittie <smcv@debian.org>
Bug-Debian: https://bugs.debian.org/988786

gtk/gtkfilechooserdefault.c | 6 4 + 2 - 0 !
gtk/gtkfilesystemmodel.c | 7 6 + 1 - 0 !
gtk/gtkpathbar.c | 3 2 + 1 - 0 !
3 files changed, 12 insertions(+), 4 deletions(-)

 check for attribute availability before accessing it

Starting from GLib 2.76, the standard attribute getters in the GFileInfo
object will warn if the attribute is unset, instead of silently bailing
out and returning a default value.

Ported to GTK2 by futalas

gtk/gtkmodules.c | 9 2 + 7 - 0 !
1 file changed, 2 insertions(+), 7 deletions(-)

 stop looking for modules in cwd

This is just not a good idea. It is surprising, and can be misused.

Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/6786
(cherry picked from commit 3bbf0b6176d42836d23c36a6ac410e807ec0a7a7)

tests/testmenubars.c | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 gtk2-c99

tests: Too many arguments in call to 'create_menu'

gtk/gtkcellrendererspin.c | 3 2 + 1 - 0 !
gtk/gtkcomboboxtext.c | 2 1 + 1 - 0 !
gtk/gtklabel.c | 2 1 + 1 - 0 !
gtk/gtktoolpalette.c | 2 1 + 1 - 0 !
gtk/gtktreeview.c | 2 1 + 1 - 0 !
gtk/gtkwidget.c | 2 1 + 1 - 0 !
modules/printbackends/cups/gtkprintbackendcups.c | 2 1 + 1 - 0 !
tests/testentrycompletion.c | 2 1 + 1 - 0 !
8 files changed, 9 insertions(+), 8 deletions(-)

 gtk2-c89

Fix fallout from g_object_ref change

g_object_ref now returns the type of the object that was
passed. Introduce cast as necessary to avoid warnings due
to this.

gtk/gtkimmodule.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 gtk2-c89-2

immodule: fix a GCC warning

gtk/gtkscale.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 gtk2-c89-3

Partial backport of:

commit 345d865ac6b2f7760503ab144dd68e6062438b80

gtk/gtkuimanager.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 gtk2-c89-4

Return the expected GObject * type.  This was not fixed upstream before
this file was removed.

gtk/tests/defaultvalue.c | 10 5 + 5 - 0 !
1 file changed, 5 insertions(+), 5 deletions(-)

 gtk2-c89-5

Part of this commit upstream:

commit ca94ff10ce2ea57bfde7692aaa558b1260c9ff75

modules/other/gail/gailtreeview.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 gtk2-c89-6

Convert to the expected pointer.  This was not fixed before the file
was removed upstream.