r35285 - in /desktop/unstable/mutter/debian: changelog patches/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch patches/series

[ricotz-guest at users.alioth.debian.org]

Author: ricotz-guest
Date: Fri Jun  8 20:04:54 2012
New Revision: 35285

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35285
Log:
add upstream crash-fix

Added:
    desktop/unstable/mutter/debian/patches/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch
Modified:
    desktop/unstable/mutter/debian/changelog
    desktop/unstable/mutter/debian/patches/series

Modified: desktop/unstable/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/changelog?rev=35285&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog [utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog [utf-8] Fri Jun  8 20:04:54 2012
@@ -1,3 +1,10 @@
+mutter (3.4.1-5) UNRELEASED; urgency=low
+
+  * debian/patches: Add upstream patch
+    00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch 
+
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Fri, 08 Jun 2012 12:31:16 +0200
+
 mutter (3.4.1-4) unstable; urgency=low
 
   * Clean up /etc/sgml/mutter-common.cat and /etc/sgml/mutter-common.cat.old

Added: desktop/unstable/mutter/debian/patches/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch?rev=35285&op=file
==============================================================================
--- desktop/unstable/mutter/debian/patches/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch (added)
+++ desktop/unstable/mutter/debian/patches/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch [utf-8] Fri Jun  8 20:04:54 2012
@@ -1,0 +1,53 @@
+From 5e453f41befcd86f96ab0f0493fa64ac0f45d87b Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor at fishsoup.net>
+Date: Tue, 1 May 2012 13:40:08 -0400
+Subject: [PATCH] meta_window_move_frame(): fix crash when frame is NULL
+
+When meta_frame_calc_borders() was made to take a NULL frame argument,
+a crash was accidentally introduced into meta_window_move_frame().
+
+This partially reverts 8c1b2d5.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=675254
+---
+ src/core/window.c |   22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/src/core/window.c b/src/core/window.c
+index 204bc0c..9e4b93c 100644
+--- a/src/core/window.c
++++ b/src/core/window.c
+@@ -5108,18 +5108,20 @@ meta_window_move_frame (MetaWindow  *window,
+ {
+   int x = root_x_nw;
+   int y = root_y_nw;
+-  MetaFrameBorders borders;
+-
+-  meta_frame_calc_borders (window->frame, &borders);
+ 
+-  /* root_x_nw and root_y_nw correspond to where the top of
+-   * the visible frame should be. Offset by the distance between
+-   * the origin of the window and the origin of the enclosing
+-   * window decorations.
+-   */
+-  x += window->frame->child_x - borders.invisible.left;
+-  y += window->frame->child_y - borders.invisible.top;
++  if (window->frame)
++    {
++      MetaFrameBorders borders;
++      meta_frame_calc_borders (window->frame, &borders);
+ 
++      /* root_x_nw and root_y_nw correspond to where the top of
++       * the visible frame should be. Offset by the distance between
++       * the origin of the window and the origin of the enclosing
++       * window decorations.
++       */
++      x += window->frame->child_x - borders.invisible.left;
++      y += window->frame->child_y - borders.invisible.top;
++    }
+   meta_window_move (window, user_op, x, y);
+ }
+ 
+-- 
+1.7.10
+

Modified: desktop/unstable/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/series?rev=35285&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/series [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/series [utf-8] Fri Jun  8 20:04:54 2012
@@ -1,1 +1,2 @@
+00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch
 01_Wcast-align.patch