commit 3319bcf033351b02bcbe155dde0bdb0f824a7a99
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Mon Feb 6 09:44:09 2012 -0500

    Fix doc build

 docs/reference/gdk/tmpl/x_interaction.sgml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 2624136a992df11ef63ca14893fa68803a8b31fa
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Mon Feb 6 09:12:35 2012 -0500

    Updates

 NEWS |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

commit 66c99016d3d063aee0e00793da8f087c80172012
Author: Marek Kasik <mkasik@redhat.com>
Date:   Tue Jan 31 12:01:43 2012 +0100

    printing: Don't crash when printing

    This commit fixes crash which occurs in Firefox, Thunderbird and
    Inkscape
    during printing. This crash was caused because of wrong handling
    of Custom
    CUPS options. (#543520)

 modules/printbackends/cups/gtkprintbackendcups.c |   62
 ++++++++++++++--------
 1 files changed, 40 insertions(+), 22 deletions(-)

commit 5f48cfe4918d54d91ec2a87877be6a19b6d43b45
Author: Michael Natterer <mitch@lanedo.com>
Date:   Thu Jan 26 10:11:17 2012 +0100

    Bug 667691 - implement gdk_window_restack() for Quartz

    Apply patch from Paul Davis which implements this missing function.

 gdk/quartz/gdkwindow-quartz.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

commit fc3cff11b5145241912377bde1a66d4d6a14d006
Author: LRN <lrn1986@gmail.com>
Date:   Sun Dec 11 18:22:43 2011 +0100

    win32: Draw arrows as polygons, not as rows of pixels

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

 modules/engines/ms-windows/msw_style.c |   34
 ++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 12 deletions(-)

commit fb87d9c90153dcfd2e126c5bca9ad2d4ffbdfdff
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Tue Dec 20 23:02:46 2011 +0100

    win32: fix gdk_win32_window_raise

    When calling gtk_window_present(), gdk_win32_window_raise did not
    actually raise the window anymore. Replacing BringWindowToTop() with
    SetForegroundWindow() fixes this.

    During testing, we also discovered that sometimes
    SetForeGroundWindow()
    will (correctly) refuse to raise the window and fail(for example:
    sometimes
    when dragging a different application at the time of a
    gtk_window_present()
    call). To prevent a GdkWarning from being produced, usage of the
    API_CALL
    macro has been removed for this case.

    Additional goodies of SetForeGroundWindow:
    - it brings the window to the front when the process owning the
      window to raise is the foreground process (for example when
      gtk_window_present is called from a GtkStatusIcon's activate
      signal handler)
    - it limits itself to flashing the task bar button associated
      with the window if the process owning the window to raise
      is *not* the foreground process (for example when gtk_window_present
      is called from a g_timeout_add callback function)

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

 gdk/win32/gdkwindow-win32.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

commit a3cbaa5956fda48f8df11d05851d9603c22e2398
Author: Javier Jardón <jjardon@gnome.org>
Date:   Tue Jan 24 20:29:12 2012 +0000

    Post release version bump

 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 131f24a4f50c9a0d2f17e9711c10378800f04075
Author: Javier Jardón <jjardon@gnome.org>
Date:   Tue Jan 24 18:52:48 2012 +0000

    docs: Fix libgail-utils doc generation

 .../libgail-util/gail-libgail-util-docs.sgml       |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 745a9fc6fe6f96232b196f2cf34ed32dc97aa6c8
Author: Javier Jardón <jjardon@gnome.org>
Date:   Tue Jan 24 19:16:56 2012 +0000

    Update NEWS

 NEWS                                               |   27
 ++++++++++++++++++++
 docs/reference/gdk/tmpl/x_interaction.sgml         |    2 +-
 docs/reference/gtk/tmpl/gtkbindings.sgml           |    2 +-
 docs/reference/gtk/tmpl/gtkcelllayout.sgml         |    2 +-
 docs/reference/gtk/tmpl/gtkcontainer.sgml          |    6 ++--
 docs/reference/gtk/tmpl/gtkdialog.sgml             |    6 ++--
 docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml  |    4 +-
 docs/reference/gtk/tmpl/gtkliststore.sgml          |    6 ++--
 docs/reference/gtk/tmpl/gtkobject.sgml             |   14 +++++++---
 .../reference/gtk/tmpl/gtkrecentchooserdialog.sgml |    4 +-
 docs/reference/gtk/tmpl/gtksignal.sgml             |   12 ++++++--
 docs/reference/gtk/tmpl/gtkstyle.sgml              |    2 +-
 docs/reference/gtk/tmpl/gtktextbuffer.sgml         |    6 ++--
 docs/reference/gtk/tmpl/gtktreemodel.sgml          |    4 +-
 docs/reference/gtk/tmpl/gtktreestore.sgml          |    6 ++--
 docs/reference/gtk/tmpl/gtktreeview.sgml           |    2 +-
 docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml     |    4 +-
 17 files changed, 74 insertions(+), 35 deletions(-)

commit b96f4233434da4ce9be789f7d740cbb410196042
Author: Benjamin Otte <otte@redhat.com>
Date:   Sat Jan 21 21:08:11 2012 +0100

    modules: Fix memleak

    Modules would leak if they were specified twice in the same command,
    so ie this would leak:
      GTK_MODULES=gail,gail

 gtk/gtkmodules.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit ab6007f0528b9c87d9d433de29c0b591795495a0
Author: Benjamin Otte <otte@redhat.com>
Date:   Sat Jan 21 21:05:37 2012 +0100

    modules: break when finding the right module

    This way, we don't use the wrong module. In particular we don't
    screw up
    refcounts that lead to crashes later on.

 gtk/gtkmodules.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 308d1950144d5d7350d1b03f4f5e28ba4d07d723
Author: Stefan Sauer <ensonic@users.sf.net>
Date:   Mon Jan 16 22:10:29 2012 +0100

    scale: Fix marks for inverted scales

    This is a backport of the fix from gtk-3.

 gtk/gtkscale.c |   87
 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 62 insertions(+), 25 deletions(-)

commit 9adc078e2512099f33fcbd4ca5e8160eeb6e6243
Author: Stefan Sauer <ensonic@users.sf.net>
Date:   Mon Jan 9 18:54:49 2012 +0100

    scale: remove the match argument from find_next_pos()

    Using the 'pos' argument is enough.

 gtk/gtkscale.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

commit 165d2c0ca278ada18f2b53f4be086abcd9b9f5ff
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Fri Jan 14 20:24:26 2011 -0500

    Implement the editing-canceled property in GtkCellEditableEventBox

    https://bugzilla.gnome.org/show_bug.cgi?id=639455
    (cherry picked from commit 8f6a8441a24b40003b8ec4128931fb2601bc0d30)

 gtk/gtkcellrendereraccel.c |  200
 ++++++++++++++++++++++++++++----------------
 1 files changed, 128 insertions(+), 72 deletions(-)

commit 0488c284889e28b77763a3f131af44e9ac5ce488
Author: Michael Natterer <mitch@lanedo.com>
Date:   Thu Jan 19 16:12:11 2012 +0100

    quartz: add virtual modifiers already in GDK, just as X11 does it

    Key event states  will now always contain GDK_META_MASK in addition
    to GDK_MOD2_MASK.

 gdk/quartz/gdkevents-quartz.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit 85099bf6a64720a881e1897be21dca77765e78c3
Author: Benjamin Berg <benjamin@sipsolutions.net>
Date:   Tue Jan 17 20:33:32 2012 +0100

    Strip "Custom." prefix when getting default options from cups.

 modules/printbackends/cups/gtkprintbackendcups.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

commit 5123cfe5e608a842dc0ea9646e46a1a86fbcb8df
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Wed Jan 11 14:37:08 2012 +0100

    printing: gtk_print_settings_load_key_file() ignores group_name

 gtk/gtkprintsettings.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 03fae9086f8888829563f719d9435177964a5719
Author: Stefan Sauer <ensonic@users.sf.net>
Date:   Mon Jan 9 18:39:13 2012 +0100

    scale: backport orientation fix for vertical scales

 gtk/gtkscale.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit 92412d23b7fb1bc7edfd87bf8a523284afdf7777
Author: Stefan Sauer <ensonic@users.sf.net>
Date:   Mon Jan 9 18:16:53 2012 +0100

    gtkscale: fix bogus compare func

    The GtkScaleMark values are gdouble, a simple a-b compare func would
    fail for
    values with the same integer value. This breaks the sorting and
    causes random
    marker label placement.

 gtk/gtkscale.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 986072b36194e307a6c5902693da4ed9468c9fa4
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Sat Jan 7 21:38:39 2012 -0500

    introspection: Fix srcdir != builddir builds

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

 gdk/Makefile.am |    1 +
 gtk/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

commit 1e731a34007fc6e11307b59635a15f946c5f10cc
Author: Benjamin Berg <benjamin@sipsolutions.net>
Date:   Wed Dec 28 01:02:28 2011 +0100

    Improve PICKONE_* handling in GtkPrinterOptionWidget (bug #543520)

    This patch modifies GtkPrinterOptionWidget to support loading them
    again. It also allows the user to enter values from the dropdown list
    to select the item.

 gtk/gtkprinteroptionwidget.c |   93
 +++++++++++++++++++++++++++++++----------
 1 files changed, 70 insertions(+), 23 deletions(-)

commit 8170436e61ea68c713d75ad374d22c3261be9203
Author: Benjamin Berg <benjamin@sipsolutions.net>
Date:   Sat Dec 24 17:26:32 2011 +0100

    Set cups Custom print options correctly (bug #543520, patch by
    Marek Kašík)

    This patch fixes the cups print backend to pass Custom options with
    the "Custom." prefix to cups if neccessary.

 modules/printbackends/cups/gtkprintbackendcups.c |   46
 ++++++++++++++++++++--
 1 files changed, 42 insertions(+), 4 deletions(-)

commit fcd01e97187a0c58dfc5c0a4db29d2e92ec3c3de
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Thu Jan 5 14:05:47 2012 -0500

    Use the right icon-name for missing images

    Patch by Erik van Pienbroek, bug 629878.

 gtk/gtkiconfactory.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

commit 2a9bf2619a742be3dbc41bab5854eb0d8b5689bb
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Tue Jan 3 10:51:13 2012 -0500

    Fix problems with DND on some X servers

    When the X server does not support the shape extension (as some
    vnc implementations seem to), our DND code was always seeing
    an empty input shape, so drops always missed their target.

    http://bugzilla.gnome.org/show_bug.cgi?id=620240

 gdk/x11/gdkdnd-x11.c    |   13 +++++++++----
 gdk/x11/gdkwindow-x11.c |   27 +++++++++++++++++----------
 2 files changed, 26 insertions(+), 14 deletions(-)

commit 8f3f5fab27662fdc25769367929e9704314d9422
Author: Javier Jardón <jjardon@gnome.org>
Date:   Mon Jan 2 02:49:20 2012 +0100

    migrating-GtkComboBox.sgml: Do not use deprecated API in the examples

 docs/reference/gtk/migrating-GtkComboBox.sgml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

commit e9b0f9e81aab098462cfc0117c449e7597858438
Author: Alexander Larsson <alexl@redhat.com>
Date:   Fri Dec 16 09:08:50 2011 +0100

    [win32] Fix win32 theme crash on offscreen windows

    We add _gdk_offscreen_window_get_real_drawable to get the real
    pixmap impl for offscreen windows, then we use this
    in gdkgc-win32.c:get_impl_drawable() for offscreen windows
    This fixes a crash when rendering win32 theme parts on
    offscreen windows (bug #623563)

 gdk/gdkinternals.h       |    1 +
 gdk/gdkoffscreenwindow.c |    6 ++++++
 gdk/win32/gdkgc-win32.c  |    2 ++
 3 files changed, 9 insertions(+), 0 deletions(-)

commit f8170ee87388653cfef605636520b7b6fba955cf
Author: Alexander Larsson <alexl@redhat.com>
Date:   Fri Dec 16 09:07:55 2011 +0100

    Move GdkOffscreenWindow basic type info to gdkinternals.h

    This is needed to handle runtime checks for GdkOffscreenWindows
    outside of gdkoffscreenwindow.c

 gdk/gdkinternals.h       |    4 ++++
 gdk/gdkoffscreenwindow.c |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 400e53c568be2270d9bd3e19cc76957032959085
Author: Federico Mena Quintero <federico@gnome.org>
Date:   Wed Nov 23 09:44:26 2011 -0600

    bgo#662814 - Don't print a g_warning() when GtkRecentManager can't
    find a file

    Also, *do* add the file to the recently-used list, even if the file
    does not
    exist yet.  This is used from the Save dialog, so even shitty apps
    which don't
    add the file to GtkRecentManager, will get the file added from the
    Save dialog.

    Signed-off-by: Federico Mena Quintero <federico@gnome.org>

 gtk/gtkrecentmanager.c |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

commit 4eae58ab43fadd90bb7b99ea9f24d6a86341d8c6
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Thu Dec 8 12:46:55 2011 -0500

    Revert be1eea612cb7beacffdc0b31e7158195004f5e2d

    Calling gdk_keymap_add_virtual_modifiers causes _all_ virtual
    modifiers to be added, which causes problem when they are co-located
    on the same real modifier (as Super and Hyper often are). Effectively,
    this made it impossible to enter key combinations involving Super,
    since they all turn into Super+Hyper.

 gtk/gtkcellrendereraccel.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

commit 7c9f317b64aff73d34c61269680535a51b256ad3
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Thu Dec 8 08:03:56 2011 -0500

    Test some virtual modifiers

    This adds some accelerators involving Super and Hyper to testmerge.
    This helps in testing our accel matching for those.

 tests/testmerge.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 81955757bc2a5e23ffdc793d9f343f7302fd38de
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Wed Dec 7 13:05:09 2011 +0100

    win32: don't rely on GTK_IS_H* or GTK_IS_V_* macros

    But use the orientable interface instead. This has already proven
    usefull for GtkVolumeButton widgets (see previous commit) so apply
    the same logic all over the place.

 modules/engines/ms-windows/msw_style.c |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

commit 60d471b2d00ce3a42e017a333fa4518429aacd93
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Wed Dec 7 12:50:34 2011 +0100

    win32: Fix vertical GtkVolumeButton widget rendering.

    The trough was being rendered horizontal for vertical
    GtkVolumeButton widgets. Not relying on GTK_IS_VSCALE
    but using the orientable interface instead fixes this.

 modules/engines/ms-windows/msw_style.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit af309a50af1aaf958bdfe2e5a353b4bc9d787f3a
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Wed Dec 7 12:22:26 2011 +0100

    win32: correct the notebook tab gap_side vs tab_pos comment

 modules/engines/ms-windows/msw_style.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 7cfefd6e98e02c3dc3f80673f70ca6789d12bccc
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Wed Dec 7 11:30:31 2011 +0100

    win32: fix expander rendering for horizontal GtkToolItemGroups

    Expanders are usually drawn as little triangles and unfortunately
    do not support rotated drawing modes. So a hack is applied (see
    gtk_tool_item_group_header_expose_event_cb for details) when
    drawing a GtkToolItemGroup's header for horizontal GtkToolShells,
    forcing the triangle to point in the right direction. Except we
    don't draw expanders as triangles on Windows. Usually, expanders
    are represented as "+" and "-". It sucks for "+" to become "-" and
    the inverse when we don't want to, so reverse the hack here.

 modules/engines/ms-windows/msw_style.c |   40
 +++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 8 deletions(-)

commit d9906a9ac4bc6c4b3af6de33b43c4e0da695408c
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Tue Dec 6 22:32:52 2011 +0100

    win32: clean up detail checks

    By borrowing the DETAIL macro from clearlooks' clearlooks_style.c

 modules/engines/ms-windows/msw_style.c |   87
 +++++++++++++++-----------------
 1 files changed, 40 insertions(+), 47 deletions(-)

commit 980133d7321224a6327ef67252f7904a05044c21
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Tue Dec 6 17:34:11 2011 +0100

    win32: set msw-button child-displacement-x & y to 0 when XP theme
    is active

    Active buttons have not had their contents (icon & label)
    displaced ever since uxtheming became available in Windows XP.

    We still care about this displacement for classic themes
    though (even on Vista/7 where classic themes are used to
    implement High Contrast support).

 modules/engines/ms-windows/msw_style.c |   39
 ++++++++++++++++---------------
 1 files changed, 20 insertions(+), 19 deletions(-)

commit 3df3cafdbb4886efe92a5cd62237cfc04ec6967e
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Tue Dec 6 17:06:56 2011 +0100

    win32: Make all GDK_WINDOW_TEMP always on top

    This makes menus, popups and tooltips show above the windows
    task bar.

    Backported from commit 62b505174f16743833467290f49c1ae09c25448e
    on master branch.

 gdk/win32/gdkwindow-win32.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

commit f7354da57421a485eb3aa820fcda1ffedbbc3909
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Tue Nov 8 10:11:57 2011 +0100

    win32: remove unused (and commented out) combo_box_draw_arrow

 modules/engines/ms-windows/msw_style.c |   33
 --------------------------------
 1 files changed, 0 insertions(+), 33 deletions(-)

commit ba8c4bb049b36b3707c2c8f22c5c66b497e2d2cf
Author: Alexander Larsson <alexl@redhat.com>
Date:   Tue Dec 6 11:27:53 2011 +0100

    win32: Fix 16bit pixmaps

    This reverts to the old dibsection creation code for 16bit depth.
    This makes the non-cairo stuff work, we then access the bits as
    a cairo image surface, which isn't 100% right, but might be good
    enough.

    Fixes bug 665013

 gdk/win32/gdkpixmap-win32.c |  107
 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 92 insertions(+), 15 deletions(-)

commit 4fc684943b3b8969b7ac9ce9fa8dfe7312c76ebc
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Wed Nov 30 12:09:21 2011 -0500

    Fix gtk-demo drawingarea example

    Patch by Martin Schlemmer, bug 665011.

 demos/gtk-demo/drawingarea.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 26b749440bb61c59f79d8be93ddf7bc529085c3e
Author: Florian Müllner <fmuellner@gnome.org>
Date:   Thu Nov 24 16:31:47 2011 +0100

    build: Add gmodule-2.0 dependency for gtk-query-immodules-2.0

 configure.in    |    2 ++
 gtk/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

commit 7c77f9a69ab4dfea9f015cf09db6d501576523aa
Author: John Ralls <jralls@ceridwen.us>
Date:   Sat Nov 19 11:33:28 2011 -0800

    [Bug 664238] GTK apps crash when dragging something

    Corrects a bad condition in a test in fadc82ad.

 gtk/gtkquartz.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 2e06f63743010da065f59234e7f5062205e31b43
Author: Michael Natterer <mitch@gimp.org>
Date:   Fri Nov 18 12:25:03 2011 +0100

    Bug 663856 - Make option-foo accelerators use the right symbol

    If the keyboard group shifting modifier is *also* a normal
    accelerator modifier, we need to special case it when calling
    gdk_keymap_translate_keyboard_state(), so we get the right
    key symbol for accelerators (for example we want Option-O,
    not Option-Ø displayed in menu items). This patch should only
    affect quartz where the Alt key both shifts the group and can
    be used as accel modifier, and not X11 or Win32 where AltGr
    is not used for accelerators.

    - fix quartz' gdk_keymap_translate_keyboard_state() to return
      the right consumed_modifiers
    - add _gtk_translate_keyboard_accel_state() which does the
      special casing
    - use it everywhere instead of gdk_keymap_translate_keyboard_state()

 gdk/quartz/gdkkeys-quartz.c |   16 ++++++++++----
 gtk/gtkcellrendereraccel.c  |   17 +++++++++------
 gtk/gtkkeyhash.c            |   35 +++++++++++++++++++++++++++------
 gtk/gtkmain.c               |   44
 +++++++++++++++++++++++++++++++++++++++++++
 gtk/gtkmenu.c               |   21 ++++++++++++-------
 gtk/gtkprivate.h            |   17 ++++++++++++++++
 6 files changed, 123 insertions(+), 27 deletions(-)

commit 4c35d987dfe3b169f0448d5c27e5ebad06f91cab
Author: Michael Natterer <mitch@gimp.org>
Date:   Thu Nov 17 00:49:42 2011 +0100

    notebook: don't leak the action widgets

    The notebook owns them, so it must destroy them in destroy().

 gtk/gtknotebook.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

commit 5c3bb1839cac52828756f9ddb98f49d586853991
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Nov 16 17:38:45 2011 -0500

    Revert "iconview: layout items immediately when setting a
    GtkTreeModel"

    It makes GtkIconView segfault on GTK 2.24.

    gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if
    there's a layout queued anyway, so we wouldn't end up in the same
    situation causing the crash the original patch is supposed to fix.

    This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1.

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

 gtk/gtkiconview.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 0729cdc9a1e8003c41d3ebf20eecfe2d1b29ffbe
Author: Michael Natterer <mitch@gimp.org>
Date:   Fri Nov 11 23:49:21 2011 +0100

    quartz: fix a race condition when waking up the CGRunLoop

    Wake up the run loop unconditionally (don't check if it is waiting)
    because
    it might go into waiting state right after we checked for it. Fixes
    GIMP
    startup (which has a lot of GIOChannel I/O but zero NSEvents)
    from several
    minutes to a few seconds.

 gdk/quartz/gdkeventloop-quartz.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

commit 7546eeaa62cbee2f7776053f5850f12127cf8bf6
Author: Alexander Larsson <alexl@redhat.com>
Date:   Thu Nov 10 19:54:38 2011 +0100

    Post release version bump

 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 758fec0a2d78efdf3c585cbe2a3e8be332266f56
Author: Alexander Larsson <alexl@redhat.com>
Date:   Thu Nov 10 19:49:52 2011 +0100

    Update docs from release

 docs/reference/gdk/tmpl/cairo_interaction.sgml |   23 ++++
 docs/reference/gdk/tmpl/cursors.sgml           |    9 ++
 docs/reference/gdk/tmpl/gdkdisplay.sgml        |    9 ++
 docs/reference/gdk/tmpl/general.sgml           |    2 +-
 docs/reference/gdk/tmpl/images.sgml            |   90 +++++++++++++
 docs/reference/gdk/tmpl/input_devices.sgml     |   57 ++++++++
 docs/reference/gdk/tmpl/pixmaps.sgml           |   14 ++-
 docs/reference/gdk/tmpl/visuals.sgml           |   78 +++++++++++
 docs/reference/gdk/tmpl/windows.sgml           |  169
 +++++++++++++++++++++++-
 docs/reference/gdk/tmpl/x_interaction.sgml     |   29 ++++-
 docs/reference/gtk/tmpl/gtkaccelmap.sgml       |    6 +-
 docs/reference/gtk/tmpl/gtkbutton.sgml         |    9 ++
 docs/reference/gtk/tmpl/gtkcalendar.sgml       |   15 ++
 docs/reference/gtk/tmpl/gtkcombobox.sgml       |   55 ++++++++
 docs/reference/gtk/tmpl/gtkentry.sgml          |    1 -
 docs/reference/gtk/tmpl/gtkexpander.sgml       |   23 ++++
 docs/reference/gtk/tmpl/gtkfilesel.sgml        |   10 +-
 docs/reference/gtk/tmpl/gtkfontseldlg.sgml     |    9 ++
 docs/reference/gtk/tmpl/gtkhruler.sgml         |    1 -
 docs/reference/gtk/tmpl/gtkiconfactory.sgml    |    7 +-
 docs/reference/gtk/tmpl/gtkicontheme.sgml      |   21 +---
 docs/reference/gtk/tmpl/gtkiconview.sgml       |   23 ++++
 docs/reference/gtk/tmpl/gtkitem.sgml           |    2 +
 docs/reference/gtk/tmpl/gtkmain.sgml           |    1 +
 docs/reference/gtk/tmpl/gtknotebook.sgml       |   41 ++++++
 docs/reference/gtk/tmpl/gtkobject.sgml         |    2 -
 docs/reference/gtk/tmpl/gtkrange.sgml          |   44 +++++-
 docs/reference/gtk/tmpl/gtkrc.sgml             |    9 +-
 docs/reference/gtk/tmpl/gtkruler.sgml          |    3 -
 docs/reference/gtk/tmpl/gtkselection.sgml      |    2 -
 docs/reference/gtk/tmpl/gtkstatusbar.sgml      |    9 ++
 docs/reference/gtk/tmpl/gtkstyle.sgml          |    4 -
 docs/reference/gtk/tmpl/gtktable.sgml          |   10 ++
 docs/reference/gtk/tmpl/gtktextview.sgml       |   18 +++
 docs/reference/gtk/tmpl/gtktreemodel.sgml      |   14 ++-
 docs/reference/gtk/tmpl/gtkuimanager.sgml      |    5 +-
 docs/reference/gtk/tmpl/gtkwindow.sgml         |   18 ++-
 docs/reference/gtk/tmpl/gtkwindowgroup.sgml    |    9 ++
 38 files changed, 770 insertions(+), 81 deletions(-)

commit 4edbdeff64a685da60e0f03e8a15fad3825b0b7b
Author: Alexander Larsson <alexl@redhat.com>
Date:   Thu Nov 10 19:29:10 2011 +0100

    Update NEWS for release

 NEWS |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

commit 1b58117bbf9c7216df42f897a72e66638278803a
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Wed Nov 9 14:43:28 2011 +0100

    win32: fix GDK_DEBUG="draw" crasher

    When running with GDK_DUBUG="draw", gdk_win32_draw_rectangle
    calls _gdk_win32_drawable_description, which calls
    gdk_drawable_get_size for a GdkWindowImplWin32.

    gdk_drawable_get_size then tries to call
    GDK_DRAWABLE_GET_CLASS (drawable)->get_size, which points
    to NULL for GdkWindowImplWin32.

    Adding the missing drawable_class->get_size implementation
    fixes this.

 gdk/win32/gdkwindow-win32.c |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

commit d8c2db333521063b6cce5355b749e40bd6c011f4
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Tue Nov 8 10:11:11 2011 +0100

    win32: plug leak when drawing handles

    The cairo context was always created but only ever used
    and destroyed(!) in the second if block (!GTK_IS_PANED (widget))
    so moving around the gdk_cairo_create call would have
    been the obvious fix.

    However, said if block is not used at all, so clean
    up draw_handle instead.

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

 modules/engines/ms-windows/msw_style.c |   97
 ++++++--------------------------
 1 files changed, 17 insertions(+), 80 deletions(-)

commit 2ae574ab6dd1f9810c4667920f9984ed1e95d0f7
Author: Alexander Larsson <alexl@redhat.com>
Date:   Wed Nov 9 13:25:02 2011 +0100

    win32: Let cairo create DIBs for GdkPixmap

    The win32 code for GdkPixmap dib creation workes as such, but
    when creating a cairo surface for it with cairo_win32_surface_create
    from the HDC it fails for any bitmap format than RGB24, due to
    assumptions in cairo.

    In order to create a cairo surface for e.g. A1 formats we need
    to let cairo create the surface via
    cairo_win32_surface_create_with_dib.
    Additionally, we must then make sure to use this surface in
    gdk_drawable_ref_cairo_surface, and to not create a new HDC for
    it but reuse the cairo one (as only one HDC can write to a bitmap).

    Even with this fixed there are some issues with current cairo, as
    cairo A1 format isn't quite the same as win32 monochrome bitmaps.
    Fixes for cairo will be submitted.

 gdk/win32/gdkpixmap-win32.c |  166
 +++++++++++-------------------------------
 1 files changed, 44 insertions(+), 122 deletions(-)

commit 36f2f822f2fdd789791a0248e33815366e325e1f
Author: Alexander Larsson <alexl@redhat.com>
Date:   Wed Nov 9 13:20:38 2011 +0100

    win32: Make sure to set is_foreign for foreign pixmaps

 gdk/win32/gdkpixmap-win32.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit a9b127660b034bccabc3480c6193e87a90aa50b0
Author: Alexander Larsson <alexl@redhat.com>
Date:   Wed Nov 9 13:20:14 2011 +0100

    win32: Fix up error message

 gdk/win32/gdkdrawable-win32.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit b2f91bcb8fa5ecaa444d2137b222def31550871c
Author: Alexander Larsson <alexl@redhat.com>
Date:   Wed Nov 9 13:19:46 2011 +0100

    win32: GDIFlush before accessing pixmap bits

 gdk/win32/gdkcursor-win32.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 013c9169f6c7e524a529b1ec3b9e199e20a67a60
Author: Kristian Rietveld <kris@loopnest.org>
Date:   Wed Nov 9 08:44:28 2011 +0100

    Bug 661997 - Gtk crashes when changing the TreeView model while ...

    Simply stopping rubber banding in gtk_tree_view_set_model() eliminates
    the crash.  Reported by Thomas Perl.
    (cherry picked from commit 91ae19768e715f71d7944fc000358dd6bdbe0ea3)

 gtk/gtktreeview.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 3b5c5710daa337b61c9e2135e3e55c380e5bc991
Author: Michael Natterer <mitch@gimp.org>
Date:   Wed Nov 9 00:34:45 2011 +0100

    quartz: include all buttons' state in GdkEventMotion.state

 gdk/quartz/gdkevents-quartz.c |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

commit a381e8ea62441b6715ba9bcb0e04332fd914f8b1
Author: Michael Natterer <mitch@gimp.org>
Date:   Wed Nov 9 00:25:01 2011 +0100

    quartz: include all buttons' states in GdkEventButton.state

 gdk/quartz/gdkevents-quartz.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

commit d8cf87983e3f137c7a7861b344c46161d1b8a79e
Author: Michael Natterer <mitch@gimp.org>
Date:   Tue Nov 8 21:41:19 2011 +0100

    Bug 663605 - Fix event->state of many event types on quartz

    Don't try to remember the current keyboard modifier and mouse button
    states from the last event, because that isn't always right, and don't
    set event.state = 0 for generated events. Instead, add private
    functions
    to get the current states, and implement them with API that retrieves
    these states independently from an event.

 gdk/quartz/gdkevents-quartz.c  |  103
 ++++++++++++++++++++++++++++-----------
 gdk/quartz/gdkprivate-quartz.h |    3 +
 2 files changed, 77 insertions(+), 29 deletions(-)

commit 7e1e5451d44c933669a75f74f48ab074e7cc6f85
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Tue Nov 1 21:22:14 2011 -0400

    Don't use deprecated Pango api

 gtk/gtkprintcontext.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit e4cee92e2285fb5f3713fa9023e7079187afe730
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Tue Nov 1 21:13:35 2011 -0400

    Don't use deprecated Pango api

 gdk/gdkpango.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

commit 5a03f4a6a50237d86959f596dda143dfc2f040d1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Mon Oct 31 20:33:41 2011 -0400

    iconview: layout items immediately when setting a GtkTreeModel

    As the draw handler expects the items to be laid out already,
    we cannot
    queue a layout here to avoid a race condition with the resize that is
    queued immediately after, which in turn would lead to a segfault later
    in the paint_item() implementation.

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

 gtk/gtkiconview.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit b424735a39316e1c3000ae0aea3f85e2239f5d85
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Wed Oct 26 21:51:36 2011 -0400

    Print dialog: small keynav improvement

    Mark the page range entry and the copies spin button as
    activates-default.

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

 gtk/gtkprintunixdialog.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 0f22ef3f31650a40686603a513e19eedcdee0f74
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Tue Nov 8 12:36:23 2011 -0500

    GtkSearchEngineTracker: port to tracker 0.12

    We simply use the Tracker DBus api here, caching and direct
    access that come with libtracker-sparql are probably not needed
    here. Based on a patch by Martyn Russell.

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

 gtk/gtksearchenginetracker.c |  563
 +++++++++++++++++++++---------------------
 1 files changed, 287 insertions(+), 276 deletions(-)

commit 4a22e2ceab7e52e700bba4cb8e61ebfb508c05fb
Author: Antoine Jacoutot <ajacoutot@openbsd.org>
Date:   Tue Sep 20 11:57:49 2011 +0200

    gtkmountoperation-x11: unbreak compilation on OpenBSD.

    Add missing header to prevent undeclared definitions.
    Bug #659565

 gtk/gtkmountoperation-x11.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 6a4a78d6a2e9f95d161ae3aeb0665adad9a8512a
Author: Richard Hughes <richard@hughsie.com>
Date:   Tue Sep 13 16:16:28 2011 +0100

    Fix a segfault if the GAppInfo does not have an icon

    This fixes the following backtrace:

     0  g_logv (log_domain=0x7ffff60461a4 "GLib-GObject",
     log_level=<optimized out>,
        format=0x7ffff599c322 "%s: assertion `%s' failed",
        args1=0x7fffffffc418) at gmessages.c:577
     1  0x00007ffff59312d2 in g_log (log_domain=<optimized out>,
     log_level=<optimized out>,
        format=<optimized out>) at gmessages.c:591
     2  0x00007ffff601c3c7 in g_object_ref (_object=0x0) at gobject.c:2648
     3  0x00007ffff7721e22
     in gdk_x11_app_launch_context_get_startup_notify_id
     (context=<optimized out>,
        info=0x7fffe8004b40, files=<optimized out>) at
        gdkapplaunchcontext-x11.c:331
     4  0x00007ffff62e60d0 in _g_desktop_app_info_launch_uris_internal
     (appinfo=0x7fffe8004b40, uris=0x0,
        launch_context=0x7fffe401c800, spawn_flags=G_SPAWN_SEARCH_PATH,
        user_setup=0, user_setup_data=0x0,
        pid_callback=0, pid_callback_data=0x0, error=0x7fffffffc848)
        at gdesktopappinfo.c:1269
     5  0x00007ffff62e630a in g_desktop_app_info_launch_uris
     (appinfo=<optimized out>, uris=<optimized out>,
        launch_context=<optimized out>, error=<optimized out>) at
        gdesktopappinfo.c:1341
     6  0x00007ffff62e636b in g_desktop_app_info_launch
     (appinfo=0x7fffe8004b40, files=<optimized out>,
        launch_context=0x7fffe401c800, error=0x7fffffffc848) at
        gdesktopappinfo.c:1388

 gdk/x11/gdkapplaunchcontext-x11.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

commit 278325f611020cba8347d0f2e169630eef3aedb5
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date:   Tue Nov 8 12:37:15 2011 +0800

    msw_style.c: Use G_PI rather than M_PI

    M_PI is not universally available...

 modules/engines/ms-windows/msw_style.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 7e8d3aa812056f4048c441df277651490d35c315
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date:   Tue Nov 8 11:09:56 2011 +0800

    Update GTK+ DLL Visual C++ projects

    Include the MS-Windows themes engine into the main GTK+ DLL in
    the build

 build/win32/vs10/gtk.vcxproj.filtersin |    4 ++++
 build/win32/vs10/gtk.vcxprojin         |    4 ++++
 build/win32/vs9/gtk.vcprojin           |    4 ++++
 3 files changed, 12 insertions(+), 0 deletions(-)

commit fadc82ad2647277628fd140514b54473dbeb2f4c
Author: John Ralls <jralls@ceridwen.us>
Date:   Mon Nov 7 13:04:59 2011 -0800

    [Quartz Bug 663182] NSImage throws an exception from
    _gtk_quartz_create_image_from_pixbuf()

    If _gtk_quartz_create_image_from_pixbuf is given a pixbuf with size
    0, 0
    or which produces an NSImage with size 0.0, 0.0, it throws an
    exception
    which Gtk doesn't handle.
